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

[Add] Content heaven. New planets/systems 5 new outfits with diff stats.

Browse Source
This commit is contained in:
Allanis 2013-03-17 22:59:38 +00:00
parent 69b8e2bcd6
commit 87b10759b4
11 changed files with 151 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
dat/outfit.xml
View File

@ -165,4 +165,71 @@
<energy_regen>125</energy_regen>
</specific>
</outfit>
<outfit name="Shield Capacitator">
<general>
<max>12</max>
<tech>9</tech>
<mass>3</mass>
<price>75000</price>
<description>An enhancement for the shield power system, allowing it to resist much heavier fire.</description>
</general>
<specific type="15">
<shield>30</shield>
</specific>
</outfit>
<outfit name="Shield Booster">
<general>
<max>4</max>
<tech>10</tech>
<mass>5</mass>
<price>145000</price>
<description>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.</description>
</general>
<specific type="15">
<shield>15</shield>
<shield_regen>10</shield_regen>
<energy>-50</energy>
</specific>
</outfit>
<outfit name="Engine Reroute">
<general>
<max>1</max>
<tech>13</tech>
<mass>1</mass>
<price>125000</price>
<description>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.</description>
</general>
<specific type="15">
<thrust>60</thrust>
<energy>-75</energy>
</specific>
</outfit>
<outfit name="Improved Stabilizer">
<general>
<max>1</max>
<tech>13</tech>
<mass>1</mass>
<price>135000</price>
<description>By improving your ship's stabilization systems drastically, this modification will allow you to reach higher speeds while still keeping the ship stable.</description>
</general>
<specific type="15">
<speed>50</speed>
<turn>5</turn>
<energy>-10</energy>
</specific>
</outfit>
<outfit name="Steering Thrusters">
<general>
<max>1</max>
<tech>13</tech>
<mass>1</mass>
<price>130000</price>
<description> </description>
</general>
<specific type="15">
<turn>25</turn>
<energy>-10</energy>
</specific>
</outfit>
</Outfits>

39
dat/planet.xml
View File

@ -30,7 +30,7 @@
<y>0</y>
</pos>
<general>
<class>A</class>
<class>H</class>
<description>SaraCraft is a desert planet with no natural precipitation.</description>
<bar>The SaraCraft canteen is a shady place. Many scoundrels and lowlifes make this thier home to avoid notice from the universal police.</bar>
<faction>Independent</faction>
@ -86,4 +86,41 @@
<exterior>station01.png</exterior>
</GFX>
</planet>
<planet name="Darkshed">
<pos>
<x>57</x>
<y>33</y>
</pos>
<general>
<class>0</class>
<description>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.</description>
<bar>The Darkshed cantine is decorated with all sorts of odd artifacts that marks different tendencies in spaceship outfitting.</bar>
<faction>Independent</faction>
<services>31</services>
<tech>
<main>13</main>
</tech>
<commodities>
<commodity>Food</commodity>
<commodity>Ore</commodity>
</commodities>
</general>
<GFX>
<space>station02.png</space>
<exterior>station02.png</exterior>
</GFX>
</planet>
<planet name="Ozogo X">
<pos>
<x>23</x>
<y>17</y>
</pos>
<general>
<class>J</class>
<services>0</services>
</general>
<GFX>
<space>J00.png</space>
</GFX>
</planet>
</Planets>

37
dat/ssys.xml
View File

@ -29,8 +29,8 @@
</ssys>
<ssys name="SaraSys">
<pos>
<x>47</x>
<y>33</y>
<x>120</x>
<y>90</y>
</pos>
<general>
<stars>27</stars>
@ -46,8 +46,7 @@
<fleet chance="60">Merchant Ship</fleet>
</fleets>
<jumps>
<jump>NCG-7291</jump>
<jump>KonoSys</jump>
<jump>Alteris</jump>
</jumps>
</ssys>
<ssys name="NCG-7291">
@ -75,7 +74,7 @@
</fleets>
<jumps>
<jump>SaraSys</jump>
<jump>Alteris</jump>
<jump>KonoSys</jump>
<jump>NCG-7292</jump>
</jumps>
@ -129,5 +128,33 @@
<jump>NCG-7292</jump>
</jumps>
</ssys>
<ssys name="Alteris">
<pos>
<x>47</x>
<y>33</y>
</pos>
<general>
<stars>255</stars>
<asteroids>0</asteroids>
<interference>0</interference>
</general>
<planets>
<planet>Darkshed</planet>
<planet>Ozogo X</planet>
</planets>
<fleets>
<fleet chance="60">Pirate</fleet>
<fleet chance="60">Merchant Ship</fleet>
<fleet chance="50">Merchant Mule</fleet>
<fleet chance="40">Merchant Ship</fleet>
<fleet chance="50">Sml Merchant Convoy</fleet>
<fleet chance="40">Sml Merchant Convoy</fleet>
</fleets>
<jumps>
<jump>SaraSys</jump>
<jump>NCG-7291</jump>
<jump>KonoSys</jump>
</jumps>
</ssys>
</Systems>

4
dat/start.xml
View File

@ -3,8 +3,8 @@
<player>
<ship>Lancer</ship>
<credits>
<low>50000</low>
<high>150000</high>
<low>500000</low>
<high>1500000</high>
</credits>
<system>
<name>KonoSys</name>

BIN
gfx/planet/exterior/saracraft.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 275 KiB

BIN
gfx/planet/exterior/station02.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 233 KiB

BIN
gfx/planet/space/J00.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 27 KiB

BIN
gfx/planet/space/station02.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.4 KiB

3
src/ai.c
View File

@ -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.

2
src/faction.c
View File

@ -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)

10
src/space.c
View File

@ -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) ||