[Clean] WTF is this?!

dat/commodity.xml

@@ -1,31 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Commodities>
 <commodity name="Food">
-  <description>Airtight compressed nutrient packets. Very nutritious.</description>
+<description>
+Airtight compressed nutrient packets.  Very nutricious.
+</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>
+<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="Industrial Goods">
-  <description>Your basic industrial goods. From cutting lasers to prcessed metals.</description>
+<description>
+Your basic industrial goods.  From cutting lasers to processed metals.
+</description>
 <high>420</high>
 <medium>340</medium>
 <low>280</low>
 </commodity>
 <commodity name="Medicine">
-  <description>An assortment of medicines sutable for curing all sorts of ailments.</description>
+<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="Luxury Goods">
-  <description>All kinds of high quality luxary goods.</description>
+<description>
+All sorts of high quality luxury goods.
+</description>
 <high>760</high>
 <medium>630</medium>
 <low>470</low>
@@ -39,4 +49,3 @@
 <commodity name="Pilgrims">
 </commodity>
 </Commodities>
-

dat/fleet.xml

@@ -1,40 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Fleets>
-  <fleet name="Militia Lancer">
+<fleet name="Militia Lancelot">
 <ai>militia</ai>
 <faction>Militia</faction>
 <pilots>
-        <pilot chance='100' name="Lancer">Lancer</pilot>
+<pilot chance='100'>Lancelot</pilot>
 </pilots>
 </fleet>
-  <fleet name="Merchant Ship">
+<fleet name="Merchant Llama">
 <ai>merchant</ai>
 <faction>Merchant</faction>
 <pilots>
-      <pilot chance='100'>Merchant Ship</pilot>
+<pilot chance='100'>Llama</pilot>
 </pilots>
 </fleet>
 <fleet name="Merchant Mule">
 <ai>merchant</ai>
 <faction>Merchant</faction>
 <pilots>
-   <pilot chance='100'>Merchant Mule</pilot>
+<pilot chance='100'>Mule</pilot>
 </pilots>
 </fleet>
 <fleet name="Sml Merchant Convoy">
 <ai>merchant</ai>
 <faction>Merchant</faction>
 <pilots>
-      <pilot chance='100'>Merchant Ship</pilot>
+<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">
+<fleet name="Pirate Hyena">
 <ai>pirate</ai>
 <faction>Pirate</faction>
 <pilots>
-     <pilot chance='100'>Leapard</pilot>
+<pilot chance='100'>Hyena</pilot>
-     <pilot chance='70'>Leapard</pilot>
-     <pilot chance='80'>Leapard</pilot>
 </pilots>
 </fleet>
 <fleet name="Collective Drone">
@@ -56,20 +57,20 @@
 <pilot chance='50'>Drone</pilot>
 </pilots>
 </fleet>
- <fleet name="Empire Lancer">
+<fleet name="Empire Lancelot">
 <ai>empire</ai>
 <faction>Empire</faction>
 <pilots>
-   <pilot chance='100'>Lancer</pilot>
+<pilot chance='100'>Lancelot</pilot>
 </pilots>
 </fleet>
- <fleet name="Empire Sml Defence">
+<fleet name="Empire Sml Defense">
 <ai>empire</ai>
 <faction>Empire</faction>
 <pilots>
-   <pilot chance='100'>Lancer</pilot>
+<pilot chance='100'>Lancelot</pilot>
-   <pilot chance='80'>Lancer</pilot>
+<pilot chance='80'>Lancelot</pilot>
-   <pilot chance='60'>Lancer</pilot>
+<pilot chance='60'>Lancelot</pilot>
 <pilot chance='50'>Hawking</pilot>
 </pilots>
 </fleet>

dat/mission.xml

@@ -1,9 +1,9 @@
 <Missions>
 <mission name="Welcome">
+<lua>welcome</lua>
 <flags>
 <unique>1</unique>
 </flags>
-    <lua>welcome</lua>
 <avail>
 <location>None</location>
 </avail>
@@ -52,4 +52,3 @@
 </avail>
 </mission>
 </Missions>
-

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"

dat/outfit.xml

@@ -6,7 +6,9 @@
 <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>
+<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">
@@ -16,7 +18,7 @@
 <delay>500</delay>
 <speed>550</speed>
 <range>300</range>
-   <accuracy>1</accuracy>
+<accuracy>30</accuracy>
 <energy>8</energy>
 <damage>
 <armour>10</armour>
@@ -30,7 +32,9 @@
 <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>
+<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">
@@ -54,7 +58,9 @@
 <tech>4</tech>
 <mass>10</mass>
 <price>25000</price>
-   <description>Base for launching dumb missiles.</description>
+<description>
+Base for launching dumb missiles.
+</description>
 <gfx_store>missile</gfx_store>
 </general>
 <specific type="5" secondary="1">
@@ -68,7 +74,9 @@
 <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>
+<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">
@@ -92,7 +100,9 @@
 <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>
+<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">
@@ -106,7 +116,9 @@
 <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>
+<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">
@@ -130,7 +142,9 @@
 <tech>99</tech>
 <mass>8</mass>
 <price>25000</price>
-   <description>Neutron Disruptor.</description>
+<description>
+Neutron Disruptor.
+</description>
 <gfx_store>neutron</gfx_store>
 </general>
 <specific type="1">
@@ -154,7 +168,9 @@
 <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>
+<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">
@@ -167,20 +183,24 @@
 <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>
+<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 Capacitator">
+<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>
+<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">
@@ -193,7 +213,9 @@
 <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>
+<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">
@@ -208,7 +230,9 @@
 <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>
+<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">
@@ -222,7 +246,9 @@
 <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>
+<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">
@@ -237,7 +263,9 @@
 <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>
+<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">
@@ -251,7 +279,9 @@
 <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>
+<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">
@@ -267,10 +297,12 @@
 <general>
 <max>1</max>
 <tech>13</tech>
-      <mass>1</mass>
+<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 thier ship.</description>
+<description>
-   <gfx_store>afterburner</gfx_store>
+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>
@@ -281,5 +313,49 @@
 <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>
-

dat/planet.xml

@@ -1,14 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Planets>
- <planet name="KonoSphere">
+<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 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>
+<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>
+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>
@@ -26,15 +30,19 @@
 <exterior>oceanic.png</exterior>
 </GFX>
 </planet>
- <planet name="SaraCraft">
+<planet name="Arrakis">
 <pos>
 <x>0</x>
 <y>0</y>
 </pos>
 <general>
 <class>H</class>
-      <description>SaraCraft is a desert planet with no natural precipitation.</description>
+<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>
+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>
@@ -56,18 +64,22 @@
 <y>0</y>
 </pos>
 <general>
-   <class>A</class>
+<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>
+<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>
+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>
-   <tech>
-    <main>5</main>
-   </tech>
 <commodities>
 <commodity>Food</commodity>
 <commodity>Medicine</commodity>
 </commodities>
+<tech>
+<main>5</main>
+</tech>
 </general>
 <GFX>
 <space>000.png</space>
@@ -91,13 +103,17 @@
 </planet>
 <planet name="Darkshed">
 <pos>
-   <x>57</x>
+<x>-57</x>
-   <y>33</y>
+<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>
+<description>
-   <bar>The Darkshed cantine is decorated with all sorts of odd artifacts that marks different tendencies in spaceship outfitting.</bar>
+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>

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">
+  <ship name = "Hyena">
-    <GFX>leapard</GFX>
+    <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">
+ <ship name="Lancelot">
-  <GFX>lancer</GFX>
+  <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>

dat/ssys.xml

@@ -1,160 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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>
-<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>
-

dat/start.xml

@@ -1,7 +1,7 @@
 <Start>
 <name>Dark Tides</name>
 <player>
-    <ship>Lancer</ship>
+<ship>Lancelot</ship>
 <credits>
 <low>500000</low>
 <high>1500000</high>
@@ -11,10 +11,9 @@
 <high>1400</high>
 </date>
 <system>
-      <name>KonoSys</name>
+<name>Delta Pavonis</name>
 <x>0</x>
 <y>0</y>
 </system>
 </player>
 </Start>
-

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