From d4e46a6210d78bc86cd6e135fd47dee116d1043d Mon Sep 17 00:00:00 2001
From: Allanis <allanis@saracraft.net>
Date: Sat, 25 May 2013 18:01:25 +0100
Subject: [PATCH] [Clean] WTF is this?!
---
dat/commodity.xml | 71 +-
dat/faction.xml | 94 +--
dat/fleet.xml | 147 ++--
dat/gui.xml | 134 ++--
dat/mission.xml | 105 ++-
dat/missions/emp_scout00.lua | 2 +-
dat/outfit.xml | 640 ++++++++++--------
dat/planet.xml | 274 ++++----
dat/ship.xml | 12 +-
dat/ssys.xml | 161 +----
dat/start.xml | 35 +-
gfx/outfit/store/cargo_pod.png | Bin 0 -> 8655 bytes
gfx/ship/{leapard.png => hyena.png} | Bin
.../{leapard_target.png => hyena_target.png} | Bin
gfx/ship/{lancer.png => lancelot.png} | Bin
...{lancer_target.png => lancelot_target.png} | Bin
src/space.c | 31 +-
17 files changed, 824 insertions(+), 882 deletions(-)
create mode 100644 gfx/outfit/store/cargo_pod.png
rename gfx/ship/{leapard.png => hyena.png} (100%)
rename gfx/ship/{leapard_target.png => hyena_target.png} (100%)
rename gfx/ship/{lancer.png => lancelot.png} (100%)
rename gfx/ship/{lancer_target.png => lancelot_target.png} (100%)
diff --git a/dat/commodity.xml b/dat/commodity.xml
index e675783..a9b1966 100644
--- a/dat/commodity.xml
+++ b/dat/commodity.xml
@@ -1,42 +1,51 @@
<?xml version="1.0" encoding="UTF-8"?>
<Commodities>
- <commodity name="Food">
- <description>Airtight compressed nutrient packets. Very nutritious.</description>
- <high>160</high>
- <medium>140</medium>
- <low>120</low>
- </commodity>
- <commodity name="Ore">
- <description>An assortment of ores. Needed for all kinds of processes.</description>
- <high>240</high>
- <medium>210</medium>
- <low>180</low>
+<commodity name="Food">
+<description>
+Airtight compressed nutrient packets. Very nutricious.
+</description>
+<high>160</high>
+<medium>140</medium>
+<low>120</low>
</commodity>
- <commodity name="Industrial Goods">
- <description>Your basic industrial goods. From cutting lasers to prcessed metals.</description>
- <high>420</high>
- <medium>340</medium>
- <low>280</low>
+<commodity name="Ore">
+<description>
+All sorts of assorted ores. Needed for all sorts of production processes.
+</description>
+<high>240</high>
+<medium>210</medium>
+<low>180</low>
</commodity>
- <commodity name="Medicine">
- <description>An assortment of medicines sutable for curing all sorts of ailments.</description>
- <high>900</high>
- <medium>750</medium>
- <low>550</low>
+<commodity name="Industrial Goods">
+<description>
+Your basic industrial goods. From cutting lasers to processed metals.
+</description>
+<high>420</high>
+<medium>340</medium>
+<low>280</low>
</commodity>
- <commodity name="Luxury Goods">
- <description>All kinds of high quality luxary goods.</description>
- <high>760</high>
- <medium>630</medium>
- <low>470</low>
+<commodity name="Medicine">
+<description>
+An assortment of medicines suitable for curing all sorts of ailments.
+</description>
+<high>900</high>
+<medium>750</medium>
+<low>550</low>
</commodity>
-<commodity name = "Parcels">
+<commodity name="Luxury Goods">
+<description>
+All sorts of high quality luxury goods.
+</description>
+<high>760</high>
+<medium>630</medium>
+<low>470</low>
</commodity>
-<commodity name = "Colonists">
+<commodity name="Parcels">
</commodity>
-<commodity name = "Tourists">
+<commodity name="Colonists">
</commodity>
-<commodity name = "Pilgrims">
+<commodity name="Tourists">
+</commodity>
+<commodity name="Pilgrims">
</commodity>
</Commodities>
-
diff --git a/dat/faction.xml b/dat/faction.xml
index 94c7f04..0c21aa4 100644
--- a/dat/faction.xml
+++ b/dat/faction.xml
@@ -1,50 +1,50 @@
<?xml version="1.0" encoding="UTF-8"?>
<Factions>
- <faction name = "Independent">
- <player>0</player>
- </faction>
- <faction name = "Merchant">
- <player>0</player>
- </faction>
- <faction name = "Pirate">
- <player>-20</player>
- </faction>
- <faction name = "Militia">
- <player>0</player>
- </faction>
- <faction name = "Empire">
- <player>0</player>
- </faction>
- <faction name = "Collective">
- <player>-100</player>
- </faction>
- <Alliances>
- <alliance name = "Neutral">
- <ally>Independent</ally>
- <ally>Merchant</ally>
- <ally>Militia</ally>
- </alliance>
- <alliance name = "Empire United">
- <ally>Empire</ally>
- <ally>Merchant</ally>
- </alliance>
- </Alliances>
- <Enemies>
- <enemies>
- <enemy type="faction">Collective</enemy>
- <enemy type="alliance">Neutral</enemy>
- </enemies>
- <enemies>
- <enemy type="faction">Collective</enemy>
- <enemy type="alliance">Empire United</enemy>
- </enemies>
- <enemies>
- <enemy type="alliance">Neutral</enemy>
- <enemy type="faction">Pirate</enemy>
- </enemies>
- <enemies>
- <enemy type="alliance">Empire United</enemy>
- <enemy type="faction">Pirate</enemy>
- </enemies>
- </Enemies>
+<faction name="Independent">
+<player>0</player>
+</faction>
+<faction name="Merchant">
+<player>0</player>
+</faction>
+<faction name="Pirate">
+<player>-20</player>
+</faction>
+<faction name="Militia">
+<player>0</player>
+</faction>
+<faction name="Empire">
+<player>0</player>
+</faction>
+<faction name="Collective">
+<player>-100</player>
+</faction>
+<Alliances>
+<alliance name="Neutral">
+<ally>Independent</ally>
+<ally>Merchant</ally>
+<ally>Militia</ally>
+</alliance>
+<alliance name="Empire United">
+<ally>Empire</ally>
+<ally>Merchant</ally>
+</alliance>
+</Alliances>
+<Enemies>
+<enemies>
+<enemy type="faction">Collective</enemy>
+<enemy type="alliance">Neutral</enemy>
+</enemies>
+<enemies>
+<enemy type="faction">Collective</enemy>
+<enemy type="alliance">Empire United</enemy>
+</enemies>
+<enemies>
+<enemy type="alliance">Neutral</enemy>
+<enemy type="faction">Pirate</enemy>
+</enemies>
+<enemies>
+<enemy type="alliance">Empire United</enemy>
+<enemy type="faction">Pirate</enemy>
+</enemies>
+</Enemies>
</Factions>
diff --git a/dat/fleet.xml b/dat/fleet.xml
index ea91fd0..5050046 100644
--- a/dat/fleet.xml
+++ b/dat/fleet.xml
@@ -1,76 +1,77 @@
<?xml version="1.0" encoding="UTF-8"?>
<Fleets>
- <fleet name="Militia Lancer">
- <ai>militia</ai>
- <faction>Militia</faction>
- <pilots>
- <pilot chance='100' name="Lancer">Lancer</pilot>
- </pilots>
- </fleet>
- <fleet name="Merchant Ship">
- <ai>merchant</ai>
- <faction>Merchant</faction>
- <pilots>
- <pilot chance='100'>Merchant Ship</pilot>
- </pilots>
- </fleet>
- <fleet name="Merchant Mule">
- <ai>merchant</ai>
- <faction>Merchant</faction>
- <pilots>
- <pilot chance='100'>Merchant Mule</pilot>
- </pilots>
- </fleet>
- <fleet name="Sml Merchant Convoy">
- <ai>merchant</ai>
- <faction>Merchant</faction>
- <pilots>
- <pilot chance='100'>Merchant Ship</pilot>
- </pilots>
- </fleet>
- <fleet name="Pirate">
- <ai>pirate</ai>
- <faction>Pirate</faction>
- <pilots>
- <pilot chance='100'>Leapard</pilot>
- <pilot chance='70'>Leapard</pilot>
- <pilot chance='80'>Leapard</pilot>
- </pilots>
- </fleet>
- <fleet name="Collective Drone">
- <ai>collective</ai>
- <faction>Collective</faction>
- <pilots>
- <pilot chance='100'>Drone</pilot>
- </pilots>
- </fleet>
- <fleet name="Collective Sml Swarm">
- <ai>collective</ai>
- <faction>Collective</faction>
- <pilots>
- <pilot chance='100'>Drone</pilot>
- <pilot chance='90'>Drone</pilot>
- <pilot chance='80'>Drone</pilot>
- <pilot chance='70'>Drone</pilot>
- <pilot chance='60'>Drone</pilot>
- <pilot chance='50'>Drone</pilot>
- </pilots>
- </fleet>
- <fleet name="Empire Lancer">
- <ai>empire</ai>
- <faction>Empire</faction>
- <pilots>
- <pilot chance='100'>Lancer</pilot>
- </pilots>
- </fleet>
- <fleet name="Empire Sml Defence">
- <ai>empire</ai>
- <faction>Empire</faction>
- <pilots>
- <pilot chance='100'>Lancer</pilot>
- <pilot chance='80'>Lancer</pilot>
- <pilot chance='60'>Lancer</pilot>
- <pilot chance='50'>Hawking</pilot>
- </pilots>
- </fleet>
+<fleet name="Militia Lancelot">
+<ai>militia</ai>
+<faction>Militia</faction>
+<pilots>
+<pilot chance='100'>Lancelot</pilot>
+</pilots>
+</fleet>
+<fleet name="Merchant Llama">
+<ai>merchant</ai>
+<faction>Merchant</faction>
+<pilots>
+<pilot chance='100'>Llama</pilot>
+</pilots>
+</fleet>
+<fleet name="Merchant Mule">
+<ai>merchant</ai>
+<faction>Merchant</faction>
+<pilots>
+<pilot chance='100'>Mule</pilot>
+</pilots>
+</fleet>
+<fleet name="Sml Merchant Convoy">
+<ai>merchant</ai>
+<faction>Merchant</faction>
+<pilots>
+<pilot chance='80'>Llama</pilot>
+<pilot chance='80'>Llama</pilot>
+<pilot chance='80'>Mule</pilot>
+<pilot chance='80'>Mule</pilot>
+</pilots>
+</fleet>
+<fleet name="Pirate Hyena">
+<ai>pirate</ai>
+<faction>Pirate</faction>
+<pilots>
+<pilot chance='100'>Hyena</pilot>
+</pilots>
+</fleet>
+<fleet name="Collective Drone">
+<ai>collective</ai>
+<faction>Collective</faction>
+<pilots>
+<pilot chance='100'>Drone</pilot>
+</pilots>
+</fleet>
+<fleet name="Collective Sml Swarm">
+<ai>collective</ai>
+<faction>Collective</faction>
+<pilots>
+<pilot chance='100'>Drone</pilot>
+<pilot chance='90'>Drone</pilot>
+<pilot chance='80'>Drone</pilot>
+<pilot chance='70'>Drone</pilot>
+<pilot chance='60'>Drone</pilot>
+<pilot chance='50'>Drone</pilot>
+</pilots>
+</fleet>
+<fleet name="Empire Lancelot">
+<ai>empire</ai>
+<faction>Empire</faction>
+<pilots>
+<pilot chance='100'>Lancelot</pilot>
+</pilots>
+</fleet>
+<fleet name="Empire Sml Defense">
+<ai>empire</ai>
+<faction>Empire</faction>
+<pilots>
+<pilot chance='100'>Lancelot</pilot>
+<pilot chance='80'>Lancelot</pilot>
+<pilot chance='60'>Lancelot</pilot>
+<pilot chance='50'>Hawking</pilot>
+</pilots>
+</fleet>
</Fleets>
diff --git a/dat/gui.xml b/dat/gui.xml
index 4fabb5e..2f77092 100644
--- a/dat/gui.xml
+++ b/dat/gui.xml
@@ -1,69 +1,69 @@
<GUIs>
- <gui name="minimal" gfx="minimal">
- <offset>
- <x>-65</x>
- <y>0</y>
- </offset>
- <radar type="circle">
- <w>70</w>
- <x>72</x>
- <y>72</y>
- </radar>
- <nav>
- <x>40</x>
- <y>151</y>
- <w>112</w>
- <h>42</h>
- </nav>
- <health>
- <shield>
- <w>98</w>
- <h>8</h>
- <x>52</x>
- <y>201</y>
- </shield>
- <armour>
- <w>98</w>
- <h>8</h>
- <x>52</x>
- <y>212</y>
- </armour>
- <energy>
- <w>98</w>
- <h>8</h>
- <x>52</x>
- <y>223</y>
- </energy>
- </health>
- <weapon>
- <x>40</x>
- <y>239</y>
- <w>112</w>
- <h>42</h>
- </weapon>
- <target>
- <gfx>
- <x>34</x>
- <y>312</y>
- </gfx>
- <name>
- <x>40</x>
- <y>291</y>
- </name>
- <faction>
- <x>40</x>
- <y>304</y>
- </faction>
- <health>
- <x>40</x>
- <y>401</y>
- </health>
- </target>
- <misc>
- <x>40</x>
- <y>424</y>
- <w>112</w>
- <h>100</h>
- </misc>
- </gui>
+<gui name="minimal" gfx="minimal">
+<offset>
+<x>-65</x>
+<y>0</y>
+</offset>
+<radar type="circle">
+<w>70</w>
+<x>72</x>
+<y>72</y>
+</radar>
+<nav>
+<x>40</x>
+<y>151</y>
+<w>112</w>
+<h>42</h>
+</nav>
+<health>
+<shield>
+<w>98</w>
+<h>8</h>
+<x>52</x>
+<y>201</y>
+</shield>
+<armour>
+<w>98</w>
+<h>8</h>
+<x>52</x>
+<y>212</y>
+</armour>
+<energy>
+<w>98</w>
+<h>8</h>
+<x>52</x>
+<y>223</y>
+</energy>
+</health>
+<weapon>
+<x>40</x>
+<y>239</y>
+<w>112</w>
+<h>42</h>
+</weapon>
+<target>
+<gfx>
+<x>34</x>
+<y>312</y>
+</gfx>
+<name>
+<x>40</x>
+<y>291</y>
+</name>
+<faction>
+<x>40</x>
+<y>304</y>
+</faction>
+<health>
+<x>40</x>
+<y>401</y>
+</health>
+</target>
+<misc>
+<x>40</x>
+<y>424</y>
+<w>112</w>
+<h>100</h>
+</misc>
+</gui>
</GUIs>
diff --git a/dat/mission.xml b/dat/mission.xml
index 957c8e6..46ff145 100644
--- a/dat/mission.xml
+++ b/dat/mission.xml
@@ -1,55 +1,54 @@
<Missions>
- <mission name="Welcome">
- <flags>
- <unique>1</unique>
- </flags>
- <lua>welcome</lua>
- <avail>
- <location>None</location>
- </avail>
- </mission>
- <mission name="Cargo">
- <lua>cargo</lua>
- <avail>
- <chance>960</chance>
- <location>Computer</location>
- <alliance>Neutral</alliance>
- <alliance>Empire United</alliance>
- </avail>
- </mission>
- <mission name = "Empire Recruitment">
- <lua>emp_cargo00</lua>
- <flags>
- <unique>1</unique>
- </flags>
- <avail>
- <chance>80</chance>
- <location>Bar</location>
- <alliance>Empire United</alliance>
- <alliance>Neutral</alliance>
- </avail>
- </mission>
- <mission name = "Empire Shipping">
- <lua>es_cargo</lua>
- <avail>
- <req>es_cargo</req>
- <chance>350</chance>
- <location>Computer</location>
- <alliance>Empire United</alliance>
- <alliance>Neutral</alliance>
- </avail>
- </mission>
- <mission name = "Empire Scouting">
- <lua>emp_scout00</lua>
- <flags>
- <unique>1</unique>
- </flags>
- <avail>
- <req>es_cargo</req>
- <chance>70</chance>
- <location>Bar</location>
- <alliance>Empire United</alliance>
- </avail>
- </mission>
+<mission name="Welcome">
+<lua>welcome</lua>
+<flags>
+<unique>1</unique>
+</flags>
+<avail>
+<location>None</location>
+</avail>
+</mission>
+<mission name="Cargo">
+<lua>cargo</lua>
+<avail>
+<chance>960</chance>
+<location>Computer</location>
+<alliance>Neutral</alliance>
+<alliance>Empire United</alliance>
+</avail>
+</mission>
+<mission name="Empire Recruitment">
+<lua>emp_cargo00</lua>
+<flags>
+<unique>1</unique>
+</flags>
+<avail>
+<chance>80</chance>
+<location>Bar</location>
+<alliance>Empire United</alliance>
+<alliance>Neutral</alliance>
+</avail>
+</mission>
+<mission name="Empire Shipping">
+<lua>es_cargo</lua>
+<avail>
+<req>es_cargo</req>
+<chance>350</chance>
+<location>Computer</location>
+<alliance>Empire United</alliance>
+<alliance>Neutral</alliance>
+</avail>
+</mission>
+<mission name="Empire Scouting">
+<lua>emp_scout00</lua>
+<flags>
+<unique>1</unique>
+</flags>
+<avail>
+<req>es_cargo</req>
+<chance>70</chance>
+<location>Bar</location>
+<alliance>Empire United</alliance>
+</avail>
+</mission>
</Missions>
-
diff --git a/dat/missions/emp_scout00.lua b/dat/missions/emp_scout00.lua
index 3efadeb..37e0035 100644
--- a/dat/missions/emp_scout00.lua
+++ b/dat/missions/emp_scout00.lua
@@ -29,7 +29,7 @@ function create()
misn.accept()
misn_stage = 0
- misn_nearby = "KonoSphere"
+ misn_nearby = "Coriolis"
misn_target = "Dune"
misn_base = "Omega Station"
misn_base_sys = "NCG-7291"
diff --git a/dat/outfit.xml b/dat/outfit.xml
index 2aa1455..f9389ec 100644
--- a/dat/outfit.xml
+++ b/dat/outfit.xml
@@ -1,285 +1,361 @@
<?xml version="1.0" encoding="UTF-8"?>
<Outfits>
- <outfit name="Laser">
- <general>
- <max>5</max>
- <tech>2</tech>
- <mass>5</mass>
- <price>5000</price>
- <description>Your basic laser. Fires charges energy beams that do a decent amount of damage to both shield and amour.</description>
- <gfx_store>laser</gfx_store>
- </general>
- <specific type="1">
- <gfx>lasergreen</gfx>
- <sound>laser</sound>
- <spfx>ExpS</spfx>
- <delay>500</delay>
- <speed>550</speed>
- <range>300</range>
- <accuracy>1</accuracy>
- <energy>8</energy>
- <damage>
- <armour>10</armour>
- <shield>13</shield>
- </damage>
- </specific>
- </outfit>
- <outfit name="Laser Turret">
- <general>
- <max>4</max>
- <tech>4</tech>
- <mass>20</mass>
- <price>25000</price>
- <description>Two laser cannons added on a rotating turret, allowing for 360 degrees of firepower!</description>
- <gfx_store>laser_turret</gfx_store>
- </general>
- <specific type="13">
- <gfx>lasergreen</gfx>
- <sound>laser</sound>
- <spfx>ExpS</spfx>
- <delay>300</delay>
- <speed>550</speed>
- <range>300</range>
- <accuracy>30</accuracy>
- <energy>10</energy>
- <damage>
- <armour>13</armour>
- <shield>10</shield>
- </damage>
- </specific>
- </outfit>
- <outfit name="Missile Launcher">
- <general>
- <max>2</max>
- <tech>4</tech>
- <mass>10</mass>
- <price>25000</price>
- <description>Base for launching dumb missiles.</description>
- <gfx_store>missile</gfx_store>
- </general>
- <specific type="5" secondary="1">
- <ammo>Missile</ammo>
- <delay>1200</delay>
- </specific>
- </outfit>
- <outfit name="Missile">
- <general>
- <max>60</max>
- <tech>2</tech>
- <mass>1</mass>
- <price>800</price>
- <description>The cheapest missile on the market, what it lacks in a decent tracking system it makes up for in affordability and firepower.</description>
- <gfx_store>missile</gfx_store>
- </general>
- <specific type="6">
- <gfx>missile</gfx>
- <sound>missile</sound>
- <spfx>ExpM</spfx>
- <duration>5</duration>
- <lockon>1</lockon>
- <thrust>1600</thrust>
- <turn>200</turn>
- <speed>800</speed>
- <damage>
- <armour>25</armour>
- <shield>20</shield>
- </damage>
- </specific>
- </outfit>
- <outfit name="Headhunter Launcher">
- <general>
- <max>2</max>
- <tech>5</tech>
- <mass>12</mass>
- <price>40000</price>
- <description>The Headhunter Launcher is one of the most used missile launcher by the security companies. Much more reliable then the regular missiles, Headhunters feature more sensors and an advanced tracking system making them much better at hitting their targets.</description>
- <gfx_store>missile</gfx_store>
- </general>
- <specific type="7" secondary="1">
- <ammo>Headhunter</ammo>
- <delay>1400</delay>
- </specific>
- </outfit>
- <outfit name="Headhunter">
- <general>
- <max>40</max>
- <tech>5</tech>
- <mass>1</mass>
- <price>2000</price>
- <description>Headhunters first gained fame in the crush of the Vroen, a fearsome battle against a pirate stronghold where the Empire crushed the pirates thanks to the advanced guidance system on the Headhunter. Now used by mercenaries and bounty hunters all over.</description>
- <gfx_store>missile</gfx_store>
- </general>
- <specific type="8">
- <gfx>headhunter</gfx>
- <sound>missile</sound>
- <spfx>ExpM</spfx>
- <duration>7</duration>
- <lockon>0.5</lockon>
- <thrust>1300</thrust>
- <turn>200</turn>
- <speed>650</speed>
- <damage>
- <armour>23</armour>
- <shield>18</shield>
- </damage>
- </specific>
- </outfit>
- <outfit name="Neutron Disruptor">
- <general>
- <max>3</max>
- <tech>99</tech>
- <mass>8</mass>
- <price>25000</price>
- <description>Neutron Disruptor.</description>
- <gfx_store>neutron</gfx_store>
- </general>
- <specific type="1">
- <gfx>neutron</gfx>
- <sound>laser</sound>
- <spfx>ExpS</spfx>
- <delay>400</delay>
- <speed>650</speed>
- <range>200</range>
- <accuracy>15</accuracy>
- <energy>5</energy>
- <damage>
- <armour>7</armour>
- <shield>7</shield>
- </damage>
- </specific>
- </outfit>
- <outfit name="Battery">
- <general>
- <max>10</max>
- <tech>3</tech>
- <mass>2</mass>
- <price>22500</price>
- <description>A heavy battery that will increase your ships energy allowing you to pack more firepower.</description>
- <gfx_store>capacitor</gfx_store>
- </general>
- <specific type="15">
- <energy>30</energy>
- </specific>
- </outfit>
- <outfit name="Solar Panel">
- <general>
- <max>5</max>
- <tech>5</tech>
- <mass>3</mass>
- <price>55000</price>
- <description>A big panel that will generate energy based off solar energy. This will allow ships to regenerate it's enrgy supplies faster.</description>
- <gfx_store>solar</gfx_store>
- </general>
- <specific type="15">
- <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>
- <gfx_store>capacitor</gfx_store>
- </general>
- <specific type="15">
- <shield>15</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>
- <gfx_store>shield</gfx_store>
- </general>
- <specific type="15">
- <shield>15</shield>
- <shield_regen>15</shield_regen>
- <energy_regen>-50</energy_regen>
- </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>
- <gfx_store>reroute</gfx_store>
- </general>
- <specific type="15">
- <thrust>70</thrust>
- <energy_regen>-50</energy_regen>
- </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>
- <gfx_store>stabilizer</gfx_store>
- </general>
- <specific type="15">
- <speed>50</speed>
- <turn>5</turn>
- <energy_regen>-10</energy_regen>
- </specific>
- </outfit>
- <outfit name="Steering Thrusters">
- <general>
- <max>1</max>
- <tech>13</tech>
- <mass>1</mass>
- <price>130000</price>
- <description>With the addition of a coule steering thrusters you can make your ship's turning more agile.</description>
- <gfx_store>thruster</gfx_store>
- </general>
- <specific type="15">
- <turn>25</turn>
- <energy_regen>-10</energy_regen>
- </specific>
- </outfit>
- <outfit name="Generic Afterburner">
- <general>
- <max>1</max>
- <tech>3</tech>
- <mass>2</mass>
- <price>20000</price>
- <description>Being able to run from your enemies is a very powerful ability. A generic afterburner will allow you to do that. It may not be as powerful as some of the more high-end afterburners, but ther're not nearly as affordable as a generic one.</description>
- <gfx_store>afterburner</gfx_store>
- </general>
- <specific type="16">
- <rumble>30</rumble>
- <thrust_perc>100</thrust_perc>
- <thrust_abs>50</thrust_abs>
- <speed_perc>50</speed_perc>
- <speed_abs>30</speed_abs>
- <energy>60</energy>
- </specific>
- </outfit>
- <outfit name="Hellburner">
- <general>
- <max>1</max>
- <tech>13</tech>
- <mass>1</mass>
- <price>95000</price>
- <description>The Hellburner is one of the best afterburners available in the market. They have a much better energy to speed ratio then the generics and are much stronger. A must for any spacefarer who is proud of thier ship.</description>
- <gfx_store>afterburner</gfx_store>
- </general>
- <specific type="16">
- <rumble>50</rumble>
- <thrust_perc>185</thrust_perc>
- <thrust_abs>100</thrust_abs>
- <speed_perc>85</speed_perc>
- <speed_abs>50</speed_abs>
- <energy>65</energy>
- </specific>
- </outfit>
+<outfit name="Laser">
+<general>
+<max>5</max>
+<tech>2</tech>
+<mass>5</mass>
+<price>5000</price>
+<description>
+Your basic laser. Fires charged energy beams that do a decent amount of damage to both shield and armour.
+</description>
+<gfx_store>laser</gfx_store>
+</general>
+<specific type="1">
+<gfx>lasergreen</gfx>
+<sound>laser</sound>
+<spfx>ExpS</spfx>
+<delay>500</delay>
+<speed>550</speed>
+<range>300</range>
+<accuracy>30</accuracy>
+<energy>8</energy>
+<damage>
+<armour>10</armour>
+<shield>13</shield>
+</damage>
+</specific>
+</outfit>
+<outfit name="Laser Turret">
+<general>
+<max>4</max>
+<tech>4</tech>
+<mass>20</mass>
+<price>25000</price>
+<description>
+Two laser cannons added on a rotating turret, allowing for 360 degrees of firepower.
+</description>
+<gfx_store>laser_turret</gfx_store>
+</general>
+<specific type="13">
+<gfx>lasergreen</gfx>
+<sound>laser</sound>
+<spfx>ExpS</spfx>
+<delay>300</delay>
+<speed>550</speed>
+<range>300</range>
+<accuracy>30</accuracy>
+<energy>10</energy>
+<damage>
+<armour>13</armour>
+<shield>10</shield>
+</damage>
+</specific>
+</outfit>
+<outfit name="Missile Launcher">
+<general>
+<max>2</max>
+<tech>4</tech>
+<mass>10</mass>
+<price>25000</price>
+<description>
+Base for launching dumb missiles.
+</description>
+<gfx_store>missile</gfx_store>
+</general>
+<specific type="5" secondary="1">
+<ammo>Missile</ammo>
+<delay>1200</delay>
+</specific>
+</outfit>
+<outfit name="Missile">
+<general>
+<max>60</max>
+<tech>2</tech>
+<mass>1</mass>
+<price>800</price>
+<description>
+The cheapest missile on the market, what it lacks in a decent tracking system it makes up for in affordability and firepower.
+</description>
+<gfx_store>missile</gfx_store>
+</general>
+<specific type="6">
+<gfx>missile</gfx>
+<sound>missile</sound>
+<spfx>ExpM</spfx>
+<duration>5</duration>
+<lockon>1</lockon>
+<thrust>1600</thrust>
+<turn>200</turn>
+<speed>800</speed>
+<damage>
+<armour>25</armour>
+<shield>20</shield>
+</damage>
+</specific>
+</outfit>
+<outfit name="Headhunter Launcher">
+<general>
+<max>2</max>
+<tech>5</tech>
+<mass>12</mass>
+<price>40000</price>
+<description>
+The Headhunter Launcher is one of the most used missile launcher by the security companies. Much more reliable then the regular missiles, Headhunters feature more sensors and an advanced tracking system making them much better at hitting their targets.
+</description>
+<gfx_store>missile</gfx_store>
+</general>
+<specific type="7" secondary="1">
+<ammo>Headhunter</ammo>
+<delay>1400</delay>
+</specific>
+</outfit>
+<outfit name="Headhunter">
+<general>
+<max>40</max>
+<tech>5</tech>
+<mass>1</mass>
+<price>2000</price>
+<description>
+Headhunters first gained fame in the crush of the Araknoid, a fearsome battle against a pirate stronghold where the Empire crushed the pirates thanks to the advanced guidance system on the Headhunter. Now used by mercenaries and bounty hunters all over.
+</description>
+<gfx_store>missile</gfx_store>
+</general>
+<specific type="8">
+<gfx>headhunter</gfx>
+<sound>missile</sound>
+<spfx>ExpM</spfx>
+<duration>7</duration>
+<lockon>0.5</lockon>
+<thrust>1300</thrust>
+<turn>200</turn>
+<speed>650</speed>
+<damage>
+<armour>23</armour>
+<shield>18</shield>
+</damage>
+</specific>
+</outfit>
+<outfit name="Neutron Disruptor">
+<general>
+<max>3</max>
+<tech>99</tech>
+<mass>8</mass>
+<price>25000</price>
+<description>
+Neutron Disruptor.
+</description>
+<gfx_store>neutron</gfx_store>
+</general>
+<specific type="1">
+<gfx>neutron</gfx>
+<sound>laser</sound>
+<spfx>ExpS</spfx>
+<delay>400</delay>
+<speed>650</speed>
+<range>200</range>
+<accuracy>15</accuracy>
+<energy>5</energy>
+<damage>
+<armour>7</armour>
+<shield>7</shield>
+</damage>
+</specific>
+</outfit>
+<outfit name="Battery">
+<general>
+<max>10</max>
+<tech>3</tech>
+<mass>2</mass>
+<price>22500</price>
+<description>
+A heavy battery that will increase your ship's energy to allow you to pack more firepower.
+</description>
+<gfx_store>capacitor</gfx_store>
+</general>
+<specific type="15">
+<energy>30</energy>
+</specific>
+</outfit>
+<outfit name="Solar Panel">
+<general>
+<max>5</max>
+<tech>5</tech>
+<mass>3</mass>
+<price>55000</price>
+<description>
+A big panel that will generate energy based off solar energy. This will allow your ship te regenerate it's energy supplies faster.
+</description>
+<gfx_store>solar</gfx_store>
+</general>
+<specific type="15">
+<energy_regen>125</energy_regen>
+</specific>
+</outfit>
+<outfit name="Shield capacitor">
+<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>
+<gfx_store>capacitor</gfx_store>
+</general>
+<specific type="15">
+<shield>15</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 osem of the ship's energy.
+</description>
+<gfx_store>shield</gfx_store>
+</general>
+<specific type="15">
+<shield>15</shield>
+<shield_regen>15</shield_regen>
+<energy_regen>-50</energy_regen>
+</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>
+<gfx_store>reroute</gfx_store>
+</general>
+<specific type="15">
+<thrust>70</thrust>
+<energy_regen>-50</energy_regen>
+</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>
+<gfx_store>stabilizer</gfx_store>
+</general>
+<specific type="15">
+<speed>50</speed>
+<turn>5</turn>
+<energy_regen>-10</energy_regen>
+</specific>
+</outfit>
+<outfit name="Steering Thrusters">
+<general>
+<max>1</max>
+<tech>13</tech>
+<mass>1</mass>
+<price>130000</price>
+<description>
+With the adding of a couple additional steering thruster you can make it so that your ship is much agile at turning.
+</description>
+<gfx_store>thruster</gfx_store>
+</general>
+<specific type="15">
+<turn>25</turn>
+<energy_regen>-10</energy_regen>
+</specific>
+</outfit>
+<outfit name="Generic Afterburner">
+<general>
+<max>1</max>
+<tech>3</tech>
+<mass>2</mass>
+<price>20000</price>
+<description>
+Being able to run from your enemies is a very powerful ability. A generic afterburner will allow you to do that. It may not be as powerful as some of the more high-end afterburners, but they're not nearly as affordable as a generic one.
+</description>
+<gfx_store>afterburner</gfx_store>
+</general>
+<specific type="16">
+<rumble>30</rumble>
+<thrust_perc>100</thrust_perc>
+<thrust_abs>50</thrust_abs>
+<speed_perc>50</speed_perc>
+<speed_abs>30</speed_abs>
+<energy>60</energy>
+</specific>
+</outfit>
+<outfit name="Hellburner">
+<general>
+<max>1</max>
+<tech>13</tech>
+<mass>4</mass>
+<price>95000</price>
+<description>
+The Hellburner is one of the best afterburners available in the market. They have a much better energy to speed ratio then the generics and are much stronger. A must for any spacefarer who is proud of his ship.
+</description>
+<gfx_store>afterburner2</gfx_store>
+</general>
+<specific type="16">
+<rumble>50</rumble>
+<thrust_perc>185</thrust_perc>
+<thrust_abs>100</thrust_abs>
+<speed_perc>85</speed_perc>
+<speed_abs>50</speed_abs>
+<energy>65</energy>
+</specific>
+</outfit>
+<outfit name="Fuel Pod">
+<general>
+<max>2</max>
+<tech>3</tech>
+<mass>5</mass>
+<price>15000</price>
+<description>
+The Fuel Pod allows a ship to store more fuel for hyperspace jumps. Each pod effectively increases a ship's range by a jump.
+</description>
+<gfx_store>fuel_pod</gfx_store>
+</general>
+<specific type="15">
+<fuel>100</fuel>
+</specific>
+</outfit>
+<outfit name="Cargo Pod">
+<general>
+<max>4</max>
+<tech>6</tech>
+<mass>15</mass>
+<price>35000</price>
+<description>
+Cargo Pods are big containers you can attach to dedicated weapon space allowing you to transport more cargo. The drawback is that you lose alot of weapon space and won't be able to defend your cargo as well...
+</description>
+<gfx_store>cargo_pod</gfx_store>
+</general>
+<specific type="15">
+<cargo>15</cargo>
+</specific>
+</outfit>
+<outfit name="Weapon Rack">
+<general>
+<max>4</max>
+<tech>8</tech>
+<mass>-10</mass>
+<price>65000</price>
+<description>
+Adding a Weapon Rack to your ship will allow you to enjoy the benefits of more weapon space at the cost of cargo space. It's often more wiser to have less cargo, but to guard it well.
+</description>
+<gfx_store>weapon_rack</gfx_store>
+</general>
+<specific type="15">
+<cargo>-15</cargo>
+</specific>
+</outfit>
</Outfits>
-
diff --git a/dat/planet.xml b/dat/planet.xml
index 0505c15..6c20e63 100644
--- a/dat/planet.xml
+++ b/dat/planet.xml
@@ -1,132 +1,148 @@
<?xml version="1.0" encoding="UTF-8"?>
<Planets>
- <planet name="KonoSphere">
- <pos>
- <x>0</x>
- <y>0</y>
- </pos>
- <general>
- <class>A</class>
- <description>The surface of the planet is predominantly covered with water and the planetary climate is characterised by abundant precipitation and strong winds, yet tolerable enough to make special and expensive weather control measurements unnecessary. Habitable land is characterised by soft meadows, swamps and dense forests. The resource base of KonoSphere consits mainly of agriculture and biomass, with the locally bred and grown kono rice being its main export, and fishing a traditional source of sustenance for its people. Other traditional products include wine, and various livestock, most prominently cattle. Cuisine on KonoSphere is rather refined, with most dishes containing meat.</description>
- <bar>The bar is just off the starport with a fantastic view of the harbour. You could watch the fishermen run frantically about attending their duties for hours.</bar>
- <faction>Independent</faction>
- <services>31</services>
- <tech>
- <main>3</main>
- </tech>
- <commodities>
- <commodity>Food</commodity>
- <commodity>Ore</commodity>
- <commodity>Industrial Goods</commodity>
- <commodity>Medicine</commodity>
- </commodities>
- </general>
- <GFX>
- <space>M01.png</space>
- <exterior>oceanic.png</exterior>
- </GFX>
- </planet>
- <planet name="SaraCraft">
- <pos>
- <x>0</x>
- <y>0</y>
- </pos>
- <general>
- <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>
- <services>7</services>
- <tech>
- <main>4</main>
- </tech>
- <commodities>
- <commodity>Food</commodity>
- <commodity>Ore</commodity>
- </commodities>
- </general>
- <GFX>
- <space>H00.png</space>
- <exterior>desertic.png</exterior>
- </GFX>
- </planet>
- <planet name="Omega Station">
- <pos>
- <x>0</x>
- <y>0</y>
- </pos>
- <general>
- <class>A</class>
- <description>Built to defend the Empire from the Collective. The Omega Station has been the observer of countless battles fought in it's sector. It's helped keep a stalemate in the sector.</description>
- <bar>The Omega Canteen is a dark place that seems calm, although everytime a robotic drone approaches, an alarm is sounded, sending pilots to man their ships to fight off the menace.</bar>
- <faction>Empire</faction>
- <services>15</services>
- <tech>
- <main>5</main>
- </tech>
- <commodities>
- <commodity>Food</commodity>
- <commodity>Medicine</commodity>
- </commodities>
- </general>
- <GFX>
- <space>000.png</space>
- <exterior>station00.png</exterior>
- </GFX>
- </planet>
- <planet name="S72839">
- <pos>
- <x>0</x>
- <y>0</y>
- </pos>
- <general>
- <class>0</class>
- <faction>Collective</faction>
- <services>0</services>
- </general>
- <GFX>
- <space>001.png</space>
- <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>
- <commodity>Industrial Goods</commodity>
- <commodity>Medicine</commodity>
- <commodity>Luxury Goods</commodity>
- </commodities>
- </general>
- <GFX>
- <space>002.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>
+<planet name="Caladan">
+<pos>
+<x>0</x>
+<y>0</y>
+</pos>
+<general>
+<class>A</class>
+<description>
+The surface of the planet is predominantly covered with water and the planetary climate is characterised by abundant precipitation and strong winds, yet tolerable enough to make special and expensive weather control measures unnecessary. Habitable land is often characterised by soft meadows, swamps and dense forests. The resource base of Caladan consists mainly of agriculture and biomass, with the locally bred and grown pundi rice being its main export, and fishing a traditional source of sustenance for its people. Other traditional products include wine and various livestock, most prominently cattle. Cuisine on Caladan is rather refined, with most dishes containing meat.
+</description>
+<bar>
+The bar is just off the starport with a great view of the harbour. You could watch the fishermen run frantically about attending their duties for hours.
+</bar>
+<faction>Independent</faction>
+<services>31</services>
+<tech>
+<main>3</main>
+</tech>
+<commodities>
+<commodity>Food</commodity>
+<commodity>Ore</commodity>
+<commodity>Industrial Goods</commodity>
+<commodity>Medicine</commodity>
+</commodities>
+</general>
+<GFX>
+<space>M01.png</space>
+<exterior>oceanic.png</exterior>
+</GFX>
+</planet>
+<planet name="Arrakis">
+<pos>
+<x>0</x>
+<y>0</y>
+</pos>
+<general>
+<class>H</class>
+<description>
+Arrakis is a desert planet with no natural precipitation.
+</description>
+<bar>
+The Arrakeen canteen is a shady place. Many scoundrels and lowlifes make this their home to avoid notice from the universal police.
+</bar>
+<faction>Independent</faction>
+<services>7</services>
+<tech>
+<main>4</main>
+</tech>
+<commodities>
+<commodity>Food</commodity>
+<commodity>Ore</commodity>
+</commodities>
+</general>
+<GFX>
+<space>H00.png</space>
+<exterior>desertic.png</exterior>
+</GFX>
+</planet>
+<planet name="Omega Station">
+<pos>
+<x>0</x>
+<y>0</y>
+</pos>
+<general>
+<class>0</class>
+<description>
+Built to defend the Empire from the Collective. The Omega Station has been the observer of countless battles fought in it's sector. It's helped keep a stalemate in the sector.
+</description>
+<bar>
+The Omega Canteen is a dark place that seems calm, although everytime a robotic drone approaches an alarm sounds sending pilots to man their ships to fight off the menace.
+</bar>
+<faction>Empire</faction>
+<services>15</services>
+<commodities>
+<commodity>Food</commodity>
+<commodity>Medicine</commodity>
+</commodities>
+<tech>
+<main>5</main>
+</tech>
+</general>
+<GFX>
+<space>000.png</space>
+<exterior>station00.png</exterior>
+</GFX>
+</planet>
+<planet name="S72839">
+<pos>
+<x>0</x>
+<y>0</y>
+</pos>
+<general>
+<class>0</class>
+<faction>Collective</faction>
+<services>0</services>
+</general>
+<GFX>
+<space>001.png</space>
+<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 galaxy come here to see the newest enhancements available in 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 bought outfits.
+</description>
+<bar>
+The Darkshed cantina is decorated with all sorts of odd artifacts that marked different tendencies in spaceship outfitting.
+</bar>
+<faction>Independent</faction>
+<services>31</services>
+<tech>
+<main>13</main>
+</tech>
+<commodities>
+<commodity>Food</commodity>
+<commodity>Ore</commodity>
+<commodity>Industrial Goods</commodity>
+<commodity>Medicine</commodity>
+<commodity>Luxury Goods</commodity>
+</commodities>
+</general>
+<GFX>
+<space>002.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>
diff --git a/dat/ship.xml b/dat/ship.xml
index 1290f72..99113d1 100644
--- a/dat/ship.xml
+++ b/dat/ship.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Ships>
- <ship name="Merchant Ship">
+ <ship name="Llama">
<GFX>llama</GFX>
<GUI>minimal</GUI>
<sound>engine</sound>
@@ -33,8 +33,8 @@
<outfit quantity='1'>Laser</outfit>
</outfits>
</ship>
- <ship name = "Leapard">
- <GFX>leapard</GFX>
+ <ship name = "Hyena">
+ <GFX>hyena</GFX>
<GUI>minimal</GUI>
<sound>engine</sound>
<class>1</class>
@@ -101,8 +101,8 @@
<outfit quantity="40">Headhunter</outfit>
</outfits>
</ship>
- <ship name="Lancer">
- <GFX>lancer</GFX>
+ <ship name="Lancelot">
+ <GFX>lancelot</GFX>
<GUI>minimal</GUI>
<sound>engine</sound>
<class>2</class>
@@ -136,7 +136,7 @@
<outfit quantity="20">Headhunter</outfit>
</outfits>
</ship>
- <ship name="Merchant Mule">
+ <ship name="Mule">
<GFX>mule</GFX>
<GUI>minimal</GUI>
<sound>engine</sound>
diff --git a/dat/ssys.xml b/dat/ssys.xml
index 5bd9399..167c994 100644
--- a/dat/ssys.xml
+++ b/dat/ssys.xml
@@ -1,160 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Systems>
- <ssys name="KonoSys">
- <pos>
- <x>15</x>
- <y>8</y>
- </pos>
- <general>
- <stars>500</stars>
- <asteroids>0</asteroids>
- <interference>0</interference>
- </general>
- <planets>
- <planet>KonoSphere</planet>
- </planets>
- <fleets>
- <fleet chance="100">Militia Lancer</fleet>
- <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>NCG-7291</jump>
- <jump>SaraSys</jump>
- </jumps>
-</ssys>
- <ssys name="SaraSys">
- <pos>
- <x>120</x>
- <y>90</y>
- </pos>
- <general>
- <stars>27</stars>
- <asteroids>0</asteroids>
- <interference>0</interference>
- </general>
- <planets>
- <planet>SaraCraft</planet>
- </planets>
- <fleets>
- <fleet chance="80">Merchant Ship</fleet>
- <fleet chance="60">Merchant Mule</fleet>
- <fleet chance="60">Merchant Ship</fleet>
- </fleets>
- <jumps>
- <jump>Alteris</jump>
- </jumps>
- </ssys>
- <ssys name="NCG-7291">
- <pos>
- <x>-23</x>
- <y>24</y>
- </pos>
- <general>
- <stars>230</stars>
- <asteroids>0</asteroids>
- <interference>0</interference>
- </general>
- <planets>
- <planet>Omega Station</planet>
- </planets>
- <fleets>
- <fleet chance="80">Merchant Mule</fleet>
- <fleet chance="60">Merchant Ship</fleet>
- <fleet chance="80">Empire Lancer</fleet>
- <fleet chance="60">Empire Lancer</fleet>
- <fleet chance="50">Empire Sml Defence</fleet>
- <fleet chance="80">Collective Drone</fleet>
- <fleet chance="60">Collective Drone</fleet>
- <fleet chance="50">Collective Sml Swarm</fleet>
-
- </fleets>
- <jumps>
- <jump>Alteris</jump>
- <jump>KonoSys</jump>
- <jump>NCG-7292</jump>
- </jumps>
- </ssys>
- <ssys name="NCG-7292">
- <pos>
- <x>-67</x>
- <y>20</y>
- </pos>
- <general>
- <stars>230</stars>
- <asteroids>0</asteroids>
- <interference>0</interference>
- </general>
- <planets>
- </planets>
- <fleets>
- <fleet chance="60">Empire Lancer</fleet>
- <fleet chance="40">Empire Lancer</fleet>
- <fleet chance="80">Collective Drone</fleet>
- <fleet chance="80">Collective Drone</fleet>
- <fleet chance="60">Collective Drone</fleet>
- <fleet chance="60">Collective Sml Swarm</fleet>
-
- </fleets>
- <jumps>
- <jump>NCG-7291</jump>
- <jump>C-59</jump>
- </jumps>
- </ssys>
- <ssys name="C-59">
- <pos>
- <x>-90</x>
- <y>50</y>
- </pos>
- <general>
- <stars>200</stars>
- <asteroids>0</asteroids>
- <interference>0</interference>
- </general>
- <planets>
- <planet>S72839</planet>
- </planets>
- <fleets>
- <fleet chance="80">Collective Drone</fleet>
- <fleet chance="80">Collective Drone</fleet>
- <fleet chance="80">Collective Drone</fleet>
- <fleet chance="60">Collective Sml Swarm</fleet>
- </fleets>
- <jumps>
- <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>
-
+<?xml version="1.0" encoding="UTF-8"?><Systems><ssys name="Dune"><fleets><fleet chance="60">Merchant Llama</fleet><fleet chance="60">Merchant Mule</fleet></fleets><jumps><jump>Coriolis</jump><jump>Alteris</jump></jumps><pos><y>90</y><x>120</x></pos><planets><planet>Arrakis</planet></planets><general><asteroids>0</asteroids><interference>0</interference><stars>200</stars></general></ssys><ssys name="Coriolis"><fleets/><jumps><jump>NCG-7291</jump><jump>Dune</jump><jump>Alteris</jump></jumps><pos><y>73</y><x>46</x></pos><planets/><general><asteroids>0</asteroids><interference>0</interference><stars>300</stars></general></ssys><ssys name="C-59"><fleets><fleet chance="60">Collective Sml Swarm</fleet><fleet chance="80">Collective Drone</fleet></fleets><jumps><jump>NCG-7292</jump></jumps><pos><y>50</y><x>-90</x></pos><planets><planet>S72839</planet></planets><general><asteroids>0</asteroids><interference>0</interference><stars>200</stars></general></ssys><ssys name="Alteris"><fleets><fleet chance="40">Sml Merchant Convoy</fleet><fleet chance="40">Merchant Llama</fleet><fleet chance="60">Pirate Hyena</fleet><fleet chance="50">Merchant Mule</fleet></fleets><jumps><jump>NCG-7291</jump><jump>Delta Pavonis</jump><jump>Dune</jump><jump>Coriolis</jump></jumps><pos><y>33</y><x>47</x></pos><planets><planet>Darkshed</planet><planet>Ozogo X</planet></planets><general><asteroids>0</asteroids><interference>0</interference><stars>300</stars></general></ssys><ssys name="NCG-7291"><fleets><fleet chance="60">Merchant Llama</fleet><fleet chance="60">Collective Drone</fleet><fleet chance="80">Merchant Mule</fleet><fleet chance="50">Collective Sml Swarm</fleet><fleet chance="50">Empire Sml Defense</fleet><fleet chance="60">Empire Lancelot</fleet></fleets><jumps><jump>Coriolis</jump><jump>Delta Pavonis</jump><jump>NCG-7292</jump><jump>Alteris</jump></jumps><pos><y>24</y><x>-23</x></pos><planets><planet>Omega Station</planet></planets><general><asteroids>0</asteroids><interference>0</interference><stars>300</stars></general></ssys><ssys name="Delta Pavonis"><fleets><fleet chance="40">Sml Merchant Convoy</fleet><fleet chance="50">Merchant Mule</fleet><fleet chance="40">Merchant Llama</fleet><fleet chance="60">Pirate Hyena</fleet><fleet chance="100">Militia Lancelot</fleet></fleets><jumps><jump>NCG-7291</jump><jump>Alteris</jump></jumps><pos><y>-10</y><x>28</x></pos><planets><planet>Caladan</planet></planets><general><asteroids>0</asteroids><interference>0</interference><stars>500</stars></general></ssys><ssys name="NCG-7292"><fleets><fleet chance="60">Collective Sml Swarm</fleet><fleet chance="40">Empire Lancelot</fleet><fleet chance="60">Collective Drone</fleet></fleets><jumps><jump>NCG-7291</jump><jump>C-59</jump></jumps><pos><y>20</y><x>-67</x></pos><planets/><general><asteroids>0</asteroids><interference>0</interference><stars>200</stars></general></ssys></Systems>
\ No newline at end of file
diff --git a/dat/start.xml b/dat/start.xml
index 466e9d0..f2165f3 100644
--- a/dat/start.xml
+++ b/dat/start.xml
@@ -1,20 +1,19 @@
<Start>
- <name>Dark Tides</name>
- <player>
- <ship>Lancer</ship>
- <credits>
- <low>500000</low>
- <high>1500000</high>
- </credits>
- <date>
- <low>1300</low>
- <high>1400</high>
- </date>
- <system>
- <name>KonoSys</name>
- <x>0</x>
- <y>0</y>
- </system>
- </player>
+<name>Dark Tides</name>
+<player>
+<ship>Lancelot</ship>
+<credits>
+<low>500000</low>
+<high>1500000</high>
+</credits>
+<date>
+<low>1300</low>
+<high>1400</high>
+</date>
+<system>
+<name>Delta Pavonis</name>
+<x>0</x>
+<y>0</y>
+</system>
+</player>
</Start>
-
diff --git a/gfx/outfit/store/cargo_pod.png b/gfx/outfit/store/cargo_pod.png
new file mode 100644
index 0000000000000000000000000000000000000000..da5bd3b360ad19c6dc94fc521a57570daaee4dee
GIT binary patch
literal 8655
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
BWB~vG
literal 0
HcmV?d00001
diff --git a/gfx/ship/leapard.png b/gfx/ship/hyena.png
similarity index 100%
rename from gfx/ship/leapard.png
rename to gfx/ship/hyena.png
diff --git a/gfx/ship/leapard_target.png b/gfx/ship/hyena_target.png
similarity index 100%
rename from gfx/ship/leapard_target.png
rename to gfx/ship/hyena_target.png
diff --git a/gfx/ship/lancer.png b/gfx/ship/lancelot.png
similarity index 100%
rename from gfx/ship/lancer.png
rename to gfx/ship/lancelot.png
diff --git a/gfx/ship/lancer_target.png b/gfx/ship/lancelot_target.png
similarity index 100%
rename from gfx/ship/lancer_target.png
rename to gfx/ship/lancelot_target.png
diff --git a/src/space.c b/src/space.c
index 4038bdc..09bfce1 100644
--- a/src/space.c
+++ b/src/space.c
@@ -658,7 +658,7 @@ static Planet* planet_pull(const char* name) {
PLANET_GFX_EXTERIOR"%s", xml_get(cur));
tmp->gfx_exterior = gl_newImage(str);
}
- } while((cur = cur->next));
+ } while(xml_nextNode(cur));
}
else if(xml_isNode(node, "pos")) {
cur = node->children;
@@ -671,7 +671,7 @@ static Planet* planet_pull(const char* name) {
flags |= FLAG_YSET;
tmp->pos.y = xml_getFloat(cur);
}
- } while((cur = cur->next));
+ } while(xml_nextNode(cur));
}
else if(xml_isNode(node, "general")) {
cur = node->children;
@@ -703,7 +703,7 @@ static Planet* planet_pull(const char* name) {
tmp->tech[i] = xml_getInt(ccur);
break;
}
- if(i == PLANET_TECH_MAX) WARN("Planet '%s' has tooo many"
+ if(i == PLANET_TECH_MAX) WARN("Planet '%s' has too many"
"'special tech' entries", tmp->name);
}
} while((ccur = ccur->next));
@@ -720,14 +720,14 @@ static Planet* planet_pull(const char* name) {
}
} while((ccur = ccur->next));
}
- } while((cur = cur->next));
+ } while(xml_nextNode(cur));
}
- } while((node = node->next));
+ } while(xml_nextNode(node));
break;
} else
free(tstr); // xmlGetProp mallocs the string.
}
- } while((node = node->next));
+ } while(xml_nextNode(node));
xmlFreeDoc(doc);
free(buf);
@@ -790,7 +790,7 @@ static StarSystem* system_parse(const xmlNodePtr parent) {
flags |= FLAG_YSET;
tmp->pos.y = xml_getFloat(cur);
}
- } while((cur = cur->next));
+ } while(xml_nextNode(cur));
}
else if(xml_isNode(node, "general")) {
cur = node->children;
@@ -805,7 +805,7 @@ static StarSystem* system_parse(const xmlNodePtr parent) {
flags |= FLAG_INTEFERENCESET;
tmp->interference = xml_getFloat(cur)/100;
}
- }while((cur = cur->next));
+ }while(xml_nextNode(cur));
}
// Load all the planets.
else if(xml_isNode(node, "planets")) {
@@ -828,7 +828,7 @@ static StarSystem* system_parse(const xmlNodePtr parent) {
systemname_stack[spacename_nstack-1] = tmp->name;
free(planet);
}
- } while((cur = cur->next));
+ } while(xml_nextNode(cur));
}
// Load all the fleets.
else if(xml_isNode(node, "fleets")) {
@@ -851,9 +851,10 @@ static StarSystem* system_parse(const xmlNodePtr parent) {
memcpy(tmp->fleets+(tmp->nfleets-1), fleet, sizeof(SystemFleet));
free(fleet);
}
- } while((cur = cur->next));
+ } while(xml_nextNode(cur));
}
- } while((node = node->next));
+ } while(xml_nextNode(node));
+
// Check elements.
#define MELEMENT(o,s) if((o) == 0) WARN("Star System '%s' missing '"s"' element", tmp->name)
MELEMENT(flags&FLAG_XSET, "x");
@@ -905,9 +906,9 @@ static void system_parseJumps(const xmlNodePtr parent) {
if(i == systems_nstack)
WARN("System '%s' not found for jump linking", xml_get(cur));
}
- } while((cur = cur->next));
+ } while(xml_nextNode(cur));
}
- } while((node = node->next));
+ } while(xml_nextNode(node));
}
// Load the ENTIRE universe into RAM. -- WOAH!
@@ -939,14 +940,14 @@ int space_load(void) {
memcpy(systems_stack+systems_nstack-1, tmp, sizeof(StarSystem));
free(tmp);
}
- } while((node = node->next));
+ } while(xml_nextNode(node));
// Second pass - Load all the jump routes.
node = doc->xmlChildrenNode->xmlChildrenNode;
do {
if(xml_isNode(node, XML_SYSTEM_TAG))
system_parseJumps(node); // Automatically load the jumps into the system.
- } while((node = node->next));
+ } while(xml_nextNode(node));
// Cleanup.
xmlFreeDoc(doc);