Rtch/Lephisto
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Change] Formalized space station types.

Browse Source
This commit is contained in:
Allanis 2013-06-22 19:21:51 +01:00
parent badce25b9b
commit d195480622
3 changed files with 33 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/space.c
View File

@ -376,8 +376,11 @@ static PlanetClass planetclass_get(const char a) {
case 'Y': return PLANET_CLASS_Y; case 'Y': return PLANET_CLASS_Y;
case 'Z': return PLANET_CLASS_Z; case 'Z': return PLANET_CLASS_Z;
// Stations use numbers as there isn't as many. // Stations use numbers as there isn't as many.
case '0' : return STATION_CLASS_A; case '0' : return STATION_CLASS_A;
case '1' : return STATION_CLASS_B;
case '2' : return STATION_CLASS_C;
case '3' : return STATION_CLASS_D;
default: return PLANET_CLASS_NULL; default: return PLANET_CLASS_NULL;
}; };

51
src/space.h
View File

@ -12,30 +12,33 @@
// Planet types. I didn't take them from Star Trek, I promise. // Planet types. I didn't take them from Star Trek, I promise.
typedef enum PlanetClass_ { typedef enum PlanetClass_ {
PLANET_CLASS_NULL = 0, PLANET_CLASS_NULL = 0,
PLANET_CLASS_A, // Geothermal. PLANET_CLASS_A, // Geothermal.
PLANET_CLASS_B, // Geomorteus. PLANET_CLASS_B, // Geomorteus.
PLANET_CLASS_C, // Geoinactive. PLANET_CLASS_C, // Geoinactive.
PLANET_CLASS_D, // Asteroid/Moon. PLANET_CLASS_D, // Asteroid/Moon.
PLANET_CLASS_E, // Geoplastic. PLANET_CLASS_E, // Geoplastic.
PLANET_CLASS_F, // Geometallic. PLANET_CLASS_F, // Geometallic.
PLANET_CLASS_G, // GroCrystaline. PLANET_CLASS_G, // GroCrystaline.
PLANET_CLASS_H, // Desert. PLANET_CLASS_H, // Desert.
PLANET_CLASS_I, // Gas Supergiant. PLANET_CLASS_I, // Gas Supergiant.
PLANET_CLASS_J, // Gas Giant. PLANET_CLASS_J, // Gas Giant.
PLANET_CLASS_K, // Adaptable. PLANET_CLASS_K, // Adaptable.
PLANET_CLASS_L, // Marginal. PLANET_CLASS_L, // Marginal.
PLANET_CLASS_M, // Terrestrial. PLANET_CLASS_M, // Terrestrial.
PLANET_CLASS_N, // Reducing. PLANET_CLASS_N, // Reducing.
PLANET_CLASS_O, // Pelagic. PLANET_CLASS_O, // Pelagic.
PLANET_CLASS_P, // Glaciated. PLANET_CLASS_P, // Glaciated.
PLANET_CLASS_Q, // Variable. PLANET_CLASS_Q, // Variable.
PLANET_CLASS_R, // Rogue. PLANET_CLASS_R, // Rogue.
PLANET_CLASS_S, // Ultragiant. PLANET_CLASS_S, // Ultragiant.
PLANET_CLASS_T, // Ultragiant. PLANET_CLASS_T, // Ultragiant.
PLANET_CLASS_X, // Demon. PLANET_CLASS_X, // Demon.
PLANET_CLASS_Y, // Demon. PLANET_CLASS_Y, // Demon.
PLANET_CLASS_Z, // Demon. PLANET_CLASS_Z, // Demon.
STATION_CLASS_A // TODO. STATION_CLASS_A, // Civilian station.
STATION_CLASS_B, // Military station.
STATION_CLASS_C, // Interfactional station.
STATION_CLASS_D, // Robotoc station.
} PlanetClass; } PlanetClass;
// Planet services. // Planet services.

3
utils/resedit/space.py
View File

@ -149,7 +149,8 @@ class Space:
# Classes. # Classes.
classes = [ "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", classes = [ "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L",
"M", "O", "P", "Q", "R", "S", "T", "X", "Y", "Z", "0", "1"] "M", "O", "P", "Q", "R", "S", "T", "X", "Y", "Z",
"0", "1", "2", "3"]
wgt = self.__pwidget("comClass") wgt = self.__pwidget("comClass")
combo = gtk.ListStore(str) combo = gtk.ListStore(str)
for c in classes: for c in classes: