diff --git a/dat/outfit.xml b/dat/outfit.xml index 5e1b42a..e9bdb5a 100644 --- a/dat/outfit.xml +++ b/dat/outfit.xml @@ -165,4 +165,71 @@ 125 + + + 12 + 9 + 3 + 75000 + An enhancement for the shield power system, allowing it to resist much heavier fire. + + + 30 + + + + + 4 + 10 + 5 + 145000 + A shield generator that feeds off the ship's main energy line. It will allow you to generate your shield faster and give you a small maximum shield boost at the expense of draining some of the ships energy. + + + 15 + 10 + -50 + + + + + 1 + 13 + 1 + 125000 + This enhancement routes energy from the ship's energy supplies to the engine, giving the ship an increased thrust. It does not increase the ship's max speed nor turn abilities. + + + 60 + -75 + + + + + 1 + 13 + 1 + 135000 + By improving your ship's stabilization systems drastically, this modification will allow you to reach higher speeds while still keeping the ship stable. + + + 50 + 5 + -10 + + + + + 1 + 13 + 1 + 130000 + + + + 25 + -10 + + + diff --git a/dat/planet.xml b/dat/planet.xml index 60a363b..53a889b 100644 --- a/dat/planet.xml +++ b/dat/planet.xml @@ -30,7 +30,7 @@ 0 - A + H SaraCraft is a desert planet with no natural precipitation. The SaraCraft canteen is a shady place. Many scoundrels and lowlifes make this thier home to avoid notice from the universal police. Independent @@ -86,4 +86,41 @@ station01.png + + + 57 + 33 + + + 0 + Reknown for it's outfit market and shipyards. Almost the entire Darkshed station is dedicated to trading outfits and ships. Mercenaries and bounty hunters from all over the galazy come here to see the newest enhancementes available on the market. This tends to also attract many of the shadier characters in the universe winding up with frequent fights where they test their newly purchased outfits. + The Darkshed cantine is decorated with all sorts of odd artifacts that marks different tendencies in spaceship outfitting. + Independent + 31 + +
13
+ + + Food + Ore + + + + station02.png + station02.png + + + + + 23 + 17 + + + J + 0 + + + J00.png + + diff --git a/dat/ssys.xml b/dat/ssys.xml index 9e0a872..458eb4c 100644 --- a/dat/ssys.xml +++ b/dat/ssys.xml @@ -29,8 +29,8 @@ - 47 - 33 + 120 + 90 27 @@ -46,8 +46,7 @@ Merchant Ship - NCG-7291 - KonoSys + Alteris @@ -75,7 +74,7 @@ - SaraSys + Alteris KonoSys NCG-7292 @@ -129,5 +128,33 @@ NCG-7292 + + + 47 + 33 + + + 255 + 0 + 0 + + + Darkshed + Ozogo X + + + Pirate + Merchant Ship + Merchant Mule + Merchant Ship + Sml Merchant Convoy + Sml Merchant Convoy + + + SaraSys + NCG-7291 + KonoSys + + diff --git a/dat/start.xml b/dat/start.xml index 96aca8c..fe33a39 100644 --- a/dat/start.xml +++ b/dat/start.xml @@ -3,8 +3,8 @@ Lancer - 50000 - 150000 + 500000 + 1500000 KonoSys diff --git a/gfx/planet/exterior/saracraft.png b/gfx/planet/exterior/saracraft.png index 55f4e1a..e9e1fe6 100644 Binary files a/gfx/planet/exterior/saracraft.png and b/gfx/planet/exterior/saracraft.png differ diff --git a/gfx/planet/exterior/station02.png b/gfx/planet/exterior/station02.png new file mode 100644 index 0000000..009ec4a Binary files /dev/null and b/gfx/planet/exterior/station02.png differ diff --git a/gfx/planet/space/J00.png b/gfx/planet/space/J00.png new file mode 100644 index 0000000..30df902 Binary files /dev/null and b/gfx/planet/space/J00.png differ diff --git a/gfx/planet/space/station02.png b/gfx/planet/space/station02.png new file mode 100644 index 0000000..25af29f Binary files /dev/null and b/gfx/planet/space/station02.png differ diff --git a/src/ai.c b/src/ai.c index b43ec1d..a708382 100644 --- a/src/ai.c +++ b/src/ai.c @@ -731,7 +731,8 @@ static int ai_getrndplanet(lua_State* L) { planets = malloc(sizeof(Planet*) * cur_system->nplanets); for(nplanets = 0, i = 0; i < cur_system->nplanets; i++) - if(!areEnemies(cur_pilot->faction, cur_system->planets[i].faction)) + if(planet_hasService(&cur_system->planets[i], PLANET_SERVICE_BASIC) && + !areEnemies(cur_pilot->faction, cur_system->planets[i].faction)) planets[nplanets++] = &cur_system->planets[i]; // No planet to land on found. diff --git a/src/faction.c b/src/faction.c index fff8cd7..86a73ab 100644 --- a/src/faction.c +++ b/src/faction.c @@ -66,6 +66,7 @@ int areEnemies(Faction* a, Faction* b) { int i = 0; if(a == b) return 0; + else if((a == NULL) || (b == NULL)) return 0; for(i = 0; i < a->nenemies; i++) if(a->enemies[i] == b) @@ -82,6 +83,7 @@ int areAllies(Faction* a, Faction* b) { int i = 0; if(a == b) return 0; + else if((a == NULL) || (b == NULL)) return 0; for(i = 0; i < a->nallies; i++) if(a->allies[i] == b) diff --git a/src/space.c b/src/space.c index 0a35264..330fa2e 100644 --- a/src/space.c +++ b/src/space.c @@ -420,11 +420,17 @@ static Planet* planet_get(const char* name) { if(tmp) { #define MELEMENT(o,s) if(o) WARN("Planet '%s' missing '"s"' element", tmp->name) MELEMENT(tmp->gfx_space==NULL, "GFX_space"); - MELEMENT(tmp->gfx_exterior==NULL, "GFX_exterior"); + MELEMENT(planet_hasService(tmp, PLANET_SERVICE_LAND) && + tmp->gfx_exterior==NULL, "GFX exterior"); MELEMENT((flags&FLAG_XSET)==0, "x"); MELEMENT((flags&FLAG_YSET)==0, "y"); MELEMENT(tmp->class==PLANET_CLASS_NULL, "class"); - MELEMENT(tmp->faction==NULL, "faction"); + MELEMENT(planet_hasService(tmp, PLANET_SERVICE_LAND) && + tmp->description==NULL, "description"); + MELEMENT(planet_hasService(tmp, PLANET_SERVICE_BASIC) && + tmp->bar_description==NULL, "bar"); + MELEMENT(planet_hasService(tmp, PLANET_SERVICE_BASIC) && + tmp->faction==NULL, "faction"); MELEMENT((flags&FLAG_SERVICESET)==0, "services"); MELEMENT((planet_hasService(tmp, PLANET_SERVICE_OUTFITS) ||