diff --git a/src/space.c b/src/space.c index 0979150..af4a70b 100644 --- a/src/space.c +++ b/src/space.c @@ -376,8 +376,11 @@ static PlanetClass planetclass_get(const char a) { case 'Y': return PLANET_CLASS_Y; 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 '1' : return STATION_CLASS_B; + case '2' : return STATION_CLASS_C; + case '3' : return STATION_CLASS_D; default: return PLANET_CLASS_NULL; }; diff --git a/src/space.h b/src/space.h index 8e119a0..e9da6bc 100644 --- a/src/space.h +++ b/src/space.h @@ -12,30 +12,33 @@ // Planet types. I didn't take them from Star Trek, I promise. typedef enum PlanetClass_ { PLANET_CLASS_NULL = 0, - PLANET_CLASS_A, // Geothermal. - PLANET_CLASS_B, // Geomorteus. - PLANET_CLASS_C, // Geoinactive. - PLANET_CLASS_D, // Asteroid/Moon. - PLANET_CLASS_E, // Geoplastic. - PLANET_CLASS_F, // Geometallic. - PLANET_CLASS_G, // GroCrystaline. - PLANET_CLASS_H, // Desert. - PLANET_CLASS_I, // Gas Supergiant. - PLANET_CLASS_J, // Gas Giant. - PLANET_CLASS_K, // Adaptable. - PLANET_CLASS_L, // Marginal. - PLANET_CLASS_M, // Terrestrial. - PLANET_CLASS_N, // Reducing. - PLANET_CLASS_O, // Pelagic. - PLANET_CLASS_P, // Glaciated. - PLANET_CLASS_Q, // Variable. - PLANET_CLASS_R, // Rogue. - PLANET_CLASS_S, // Ultragiant. - PLANET_CLASS_T, // Ultragiant. - PLANET_CLASS_X, // Demon. - PLANET_CLASS_Y, // Demon. - PLANET_CLASS_Z, // Demon. - STATION_CLASS_A // TODO. + PLANET_CLASS_A, // Geothermal. + PLANET_CLASS_B, // Geomorteus. + PLANET_CLASS_C, // Geoinactive. + PLANET_CLASS_D, // Asteroid/Moon. + PLANET_CLASS_E, // Geoplastic. + PLANET_CLASS_F, // Geometallic. + PLANET_CLASS_G, // GroCrystaline. + PLANET_CLASS_H, // Desert. + PLANET_CLASS_I, // Gas Supergiant. + PLANET_CLASS_J, // Gas Giant. + PLANET_CLASS_K, // Adaptable. + PLANET_CLASS_L, // Marginal. + PLANET_CLASS_M, // Terrestrial. + PLANET_CLASS_N, // Reducing. + PLANET_CLASS_O, // Pelagic. + PLANET_CLASS_P, // Glaciated. + PLANET_CLASS_Q, // Variable. + PLANET_CLASS_R, // Rogue. + PLANET_CLASS_S, // Ultragiant. + PLANET_CLASS_T, // Ultragiant. + PLANET_CLASS_X, // Demon. + PLANET_CLASS_Y, // Demon. + PLANET_CLASS_Z, // Demon. + STATION_CLASS_A, // Civilian station. + STATION_CLASS_B, // Military station. + STATION_CLASS_C, // Interfactional station. + STATION_CLASS_D, // Robotoc station. } PlanetClass; // Planet services. diff --git a/utils/resedit/space.py b/utils/resedit/space.py index 73222b1..4c3beb9 100644 --- a/utils/resedit/space.py +++ b/utils/resedit/space.py @@ -149,7 +149,8 @@ class Space: # Classes. 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") combo = gtk.ListStore(str) for c in classes: