diff --git a/bin/conf b/bin/conf deleted file mode 100644 index a38d327..0000000 --- a/bin/conf +++ /dev/null @@ -1,47 +0,0 @@ ---WINDOW. -width = 800 -height = 600 -fullscreen = 0 - --- SCREEN. -fps = 0 - --- SOUND. -nosound = 0 -sound = 0.7 -music = 0.5 - --- JOYSTICK. --- Can be number or substring of joystick name. -joystick = "Precision" - --- KEYBINDINGS. --- Type can be keyboard, jaxis or jbutton. --- --- If left is an axis, it will automatically set right to the same axis. --- setting both to the same axis (key). --- You can use reverse = 1 option to reverse them. --- Currently keybindings work with the number of the key only (when doing --- keyboard). Would be cool to have a gui to do this for you at some point. - --- Movement. -accel = { type = "jbutton", key = 0 } -left = { type = "jaxis", key = 0 } -right = { type = "jaxis", key = 0 } - --- Combat. -primary = { type = "jbutton", key = 1 } -target = { type = "jbutton", key = 4 } -target_nearest = { type = "jbutton", key = 3 } -face = { type = "keyboard", key = 38 } -board = { type = "keyboard", key = 57 } -secondary = { type = "jbutton", key = 7 } -secondary_next = { type = "jbutton", key = 5 } - --- Space. - --- Gui. -mapzoomin = { type = "jbutton", key = 4 } -mapzoomout = { type = "jbutton", key = 6 } -screenshot = { type = "keyboard", key = 82 } - 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 @@ - - Airtight compressed nutrient packets. Very nutritious. - 160 - 140 - 120 - - - An assortment of ores. Needed for all kinds of processes. - 240 - 210 - 180 + + +Airtight compressed nutrient packets. Very nutricious. + +160 +140 +120 - - Your basic industrial goods. From cutting lasers to prcessed metals. - 420 - 340 - 280 + + +All sorts of assorted ores. Needed for all sorts of production processes. + +240 +210 +180 - - An assortment of medicines sutable for curing all sorts of ailments. - 900 - 750 - 550 + + +Your basic industrial goods. From cutting lasers to processed metals. + +420 +340 +280 - - All kinds of high quality luxary goods. - 760 - 630 - 470 + + +An assortment of medicines suitable for curing all sorts of ailments. + +900 +750 +550 - + + +All sorts of high quality luxury goods. + +760 +630 +470 - + - + - + + + - 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 @@ - - 0 - - - 0 - - - -20 - - - 0 - - - 0 - - - -100 - - - - Independent - Merchant - Militia - - - Empire - Merchant - - - - - Collective - Neutral - - - Collective - Empire United - - - Neutral - Pirate - - - Empire United - Pirate - - + +0 + + +0 + + +-20 + + +0 + + +0 + + +-100 + + + +Independent +Merchant +Militia + + +Empire +Merchant + + + + +Collective +Neutral + + +Collective +Empire United + + +Neutral +Pirate + + +Empire United +Pirate + + 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 @@ - - militia - Militia - - Lancer - - - - merchant - Merchant - - Merchant Ship - - - - merchant - Merchant - - Merchant Mule - - - - merchant - Merchant - - Merchant Ship - - - - pirate - Pirate - - Leapard - Leapard - Leapard - - - - collective - Collective - - Drone - - - - collective - Collective - - Drone - Drone - Drone - Drone - Drone - Drone - - - - empire - Empire - - Lancer - - - - empire - Empire - - Lancer - Lancer - Lancer - Hawking - - + +militia +Militia + +Lancelot + + + +merchant +Merchant + +Llama + + + +merchant +Merchant + +Mule + + + +merchant +Merchant + +Llama +Llama +Mule +Mule + + + +pirate +Pirate + +Hyena + + + +collective +Collective + +Drone + + + +collective +Collective + +Drone +Drone +Drone +Drone +Drone +Drone + + + +empire +Empire + +Lancelot + + + +empire +Empire + +Lancelot +Lancelot +Lancelot +Hawking + + 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 @@ - - - -65 - 0 - - - 70 - 72 - 72 - - - - - 98 - 8 - 52 - 201 - - - 98 - 8 - 52 - 212 - - - 98 - 8 - 52 - 223 - - - - 40 - 239 - 112 - 42 - - - - 34 - 312 - - - 40 - 291 - - - 40 - 304 - - - 40 - 401 - - - - 40 - 424 - 112 - 100 - - + + +-65 +0 + + +70 +72 +72 + + + + +98 +8 +52 +201 + + +98 +8 +52 +212 + + +98 +8 +52 +223 + + + +40 +239 +112 +42 + + + +34 +312 + + +40 +291 + + +40 +304 + + +40 +401 + + + +40 +424 +112 +100 + + diff --git a/dat/mission.xml b/dat/mission.xml index 81c620b..7c11e76 100644 --- a/dat/mission.xml +++ b/dat/mission.xml @@ -1,55 +1,54 @@ - - - 1 - - welcome - - None - - - - cargo - - 960 - Computer - Neutral - Empire United - - - - emp_cargo00 - - 1 - - - 80 - Bar - Empire United - Neutral - - - - es_cargo - - var.peek("es_cargo") == true - 350 - Computer - Empire United - Neutral - - - - emp_scout00 - - 1 - - - es_cargo - 70 - Bar - Empire United - - + +welcome + +1 + + +None + + + +cargo + +960 +Computer +Neutral +Empire United + + + +emp_cargo00 + +1 + + +80 +Bar +Empire United +Neutral + + + +es_cargo + +var.peek("es_cargo") == true +350 +Computer +Empire United +Neutral + + + +emp_scout00 + +1 + + +es_cargo +70 +Bar +Empire United + + - diff --git a/dat/outfit.xml b/dat/outfit.xml index edcb74e..a7251a2 100644 --- a/dat/outfit.xml +++ b/dat/outfit.xml @@ -1,293 +1,371 @@ - - - 5 - 2 - 5 - 5000 - Your basic laser. Fires charges energy beams that do a decent amount of damage to both shield and amour. - laser - - - laserred - laser - ExpS - 500 - 550 - 300 - 1 - 8 - 10 - - - - - 4 - 4 - 20 - 25000 - Two laser cannons added on a rotating turret, allowing for 360 degrees of firepower! - laser_turret - - - laserred - laser - ExpS - 300 - 550 - 300 - 30 - 10 - 10 - - - - - 2 - 8 - 15 - 85000 - A rail gun is a cannon that uses heavy magnetic pulses to accelerate pieces of debris to extremely high velocities. The impact caused by the pieces of debris can tear apart even the strongest ship hulls. - heavy - - - mass - mass - ExpS - 1100 - 650 - 500 - 10 - 30 - 30 - - - - - 2 - 4 - 10 - 25000 - Base for launching dumb missiles. - missile - - - Missile - 1200 - - - - - 60 - 2 - 1 - 800 - The cheapest missile on the market, what it lacks in a decent tracking system it makes up for in affordability and firepower. - missile - - - missile - missile - ExpM - 5 - 1 - 1600 - 200 - 800 - 20 - - - - - 2 - 5 - 12 - 40000 - 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. - missile - - - Headhunter - 1400 - - - - - 40 - 5 - 1 - 2000 - 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. - missile - - - headhunter - missile - ExpM - 7 - 0.5 - 1300 - 200 - 650 - 20 - - - - - 3 - 99 - 8 - 25000 - Neutron Disruptor. - neutron - - - neutron - neutron - ExpS - 400 - 650 - 200 - 15 - 5 - 7 - - - - - 10 - 3 - 2 - 22500 - A heavy battery that will increase your ships energy allowing you to pack more firepower. - capacitor - - - 30 - - - - - 5 - 5 - 3 - 55000 - A big panel that will generate energy based off solar energy. This will allow ships to regenerate it's enrgy supplies faster. - solar - - - 125 - - - - - 12 - 9 - 3 - 75000 - An enhancement for the shield power system, allowing it to resist much heavier fire. - capacitor - - - 15 - - - - - 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. - shield - - - 15 - 15 - -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. - reroute - - - 70 - -50 - - - - - 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. - stabilizer - - - 50 - 5 - -10 - - - - - 1 - 13 - 1 - 130000 - With the addition of a coule steering thrusters you can make your ship's turning more agile. - thruster - - - 25 - -10 - - - - - 1 - 3 - 2 - 20000 - 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. - afterburner - - - 30 - afterburner - 100 - 50 - 50 - 30 - 60 - - - - - 1 - 13 - 1 - 95000 - 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. - afterburner - - - 50 - afterburner - 185 - 100 - 85 - 50 - 65 - - + + +5 +2 +5 +5000 + +Your basic laser. Fires charged energy beams that do a decent amount of damage to both shield and armour. + +laser + + +laserred +laser +ExpS +500 +550 +300 +30 +8 +10 + + + + +4 +4 +20 +25000 + +Two laser cannons added on a rotating turret, allowing for 360 degrees of firepower. + +laser_turret + + +laserred +laser +ExpS +300 +550 +300 +30 +10 +10 + + + + +2 +8 +15 +85000 + +The rail gun is a cannon that uses heavy magnetic pulses to accelerate pieces of debris to extremely high velocities. The impact caused by the pieces of debris can tear apart even the strongest ship hulls. + +heavy + + +mass +mass +ExpS +1100 +650 +500 +10 +30 +30 + + + + +2 +4 +10 +25000 + +Base for launching dumb missiles. + +missile + + +Missile +1200 + + + + +60 +2 +1 +800 + +The cheapest missile on the market, what it lacks in a decent tracking system it makes up for in affordability and firepower. + +missile + + +missile +missile +ExpM +5 +1 +1600 +200 +800 +20 + + + + +2 +5 +12 +40000 + +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. + +missile + + +Headhunter +1400 + + + + +40 +5 +1 +2000 + +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. + +missile + + +headhunter +missile +ExpM +7 +0.5 +1300 +200 +650 +20 + + + + +3 +99 +8 +25000 + +Neutron Disruptor. + +neutron + + +neutron +neutron +ExpS +400 +650 +200 +15 +5 +7 + + + + +10 +3 +2 +22500 + +A heavy battery that will increase your ship's energy to allow you to pack more firepower. + +capacitator + + +30 + + + + +5 +5 +3 +55000 + +A big panel that will generate energy based off solar energy. This will allow your ship te regenerate it's energy supplies faster. + +solar + + +125 + + + + +12 +9 +3 +75000 + +An enhancement for the shield power system, allowing it to resist much heavier fire. + +capacitator + + +15 + + + + +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 osem of the ship's energy. + +shield + + +15 +15 +-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. + +reroute + + +70 +-50 + + + + +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. + +stabilizer + + +50 +5 +-10 + + + + +1 +13 +1 +130000 + +With the adding of a couple additional steering thruster you can make it so that your ship is much agile at turning. + +thruster + + +25 +-10 + + + + +1 +3 +2 +20000 + +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. + +afterburner + + +30 +afterburner +100 +50 +50 +30 +60 + + + + +1 +13 +4 +95000 + +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. + +afterburner2 + + +50 +afterburner +185 +100 +85 +50 +65 + + + + +2 +3 +5 +15000 + +The Fuel Pod allows a ship to store more fuel for hyperspace jumps. Each pod effectively increases a ship's range by a jump. + +fuel_pod + + +100 + + + + +4 +6 +15 +35000 + +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... + +cargo_pod + + +15 + + + + +4 +8 +-10 +65000 + +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. + +weapon_rack + + +-15 + + - diff --git a/dat/planet.xml b/dat/planet.xml index 0505c15..4023efe 100644 --- a/dat/planet.xml +++ b/dat/planet.xml @@ -1,132 +1 @@ - - - - - 0 - 0 - - - A - 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. - 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. - Independent - 31 - -
3
- - - Food - Ore - Industrial Goods - Medicine - - - - M01.png - oceanic.png - - - - - 0 - 0 - - - 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 - 7 - -
4
- - - Food - Ore - - - - H00.png - desertic.png - - - - - 0 - 0 - - - A - 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. - 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. - Empire - 15 - -
5
- - - Food - Medicine - - - - 000.png - station00.png - - - - - 0 - 0 - - - 0 - Collective - 0 - - - 001.png - 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 - Industrial Goods - Medicine - Luxury Goods - - - - 002.png - station02.png - - - - - 23 - 17 - - - J - 0 - - - J00.png - - - +oceanic.pngM01.png00The 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.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.IndependentFoodOreIndustrial GoodsMedicine
3
31Agas.pngD00.png00The Slop and Grill is one of the nastiest taverns in the universe. The food and drink doesn't exactly help. Most of it is brewed on New Haven and wouldn't pass any of the minimal health insurance tests. Some of the booze even doubles as ship fuel if needed, which says a lot about the quality.The clients are also deep space thugs, pirates, contrabandiers, mercenaries and othe shady folk that insist on keeping the ground coated with blood and broken teeth. Not a great place to bring the family.New Haven is a small planet located beyond the boundries of law and justice. Founded by Bartax the Great, one of the most successful pirates to ever live after the old Haven was annihilated.The planet is mostly covered by very toxic gases and has a lot of radiation if you stray from the stronghold. These very features are what made the Empire qualify it as uninhabitable as it doesn't have any strategic resources. It's distance from other civilized worlds also gives it a nice cover from prying eyes.PirateMedicineLuxury GoodsIndustrial Goods
13
31Dsnow.pngP00.png00Great bar if you like your drinks cold.Cold place.EmpireFoodOreIndustrial Goods
0
7Pstation00.png000.png00The 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.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.EmpireFoodMedicine
5
150station02.png002.png-33-57The Darkshed cantina is decorated with all sorts of odd artifacts that marked different tendencies in spaceship outfitting.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.IndependentFoodOreIndustrial GoodsMedicineLuxury Goods
13
310station01.png001.png000
0
0CollectiveJ00.png17230
0
Jdesertic.pngH00.png00The Arrakeen canteen is a shady place. Many scoundrels and lowlifes make this their home to avoid notice from the universal police.Arrakis is a desert planet with no natural precipitation.IndependentFoodOre
4
7H diff --git a/dat/ship.xml b/dat/ship.xml index 1290f72..5585e6c 100644 --- a/dat/ship.xml +++ b/dat/ship.xml @@ -1,206 +1,218 @@ - - llama - minimal - engine - 1 - 120000 - KonoGroup - 2 - One of the most widely used ships in the galaxy. Reknown for it's stability and stubborness. The design hasn't been modified much since it's creation many years ago. It was one of the first civilian used spacecrafts, first used by the aristocracy and now used by everyone who cannot afford better. - - 320 - 150 - 360 - - - 50 - 60 - 240 - 80 - 50 - 500 - - - 2 - 32 - 400 - 25 - 20 - - - Laser - - - - leapard - minimal - engine - 1 - 180000 - SaraCraft - 2 - The star product of SaraCraft, the leapard has quickly become a favourite of pirates far and wide. Not much of a fighter, nor does it pack too much of a punch, but they like to come in swarms to overcome their enemies. While the SaraCraft official stance doesn't sell them to shady characters, it's widely known that they do as it seems there's a countless amount in the hands of pirates. - - 400 - 180 - 480 - - - 70 - 50 - 180 - 150 - 60 - 550 - - - 2 - 25 - 300 - 30 - 10 - - - Laser - - - - hawking - minimal - engine - 3 - 7500000 - VLSoft - 9 - A heavy frigate designed for heavy combat. Used widely by the Empire to esablish control on it's territory. The Hawking has more than enough firepower to not be taken lightly. - - 200 - 90 - 260 - - - 600 - 400 - 900 - 300 - 80 - 1600 - - - 35 - 500 - 300 - 180 - 70 - - - Laser Turret - Headhunter Launcher - Headhunter - - - - lancer - minimal - engine - 2 - 700000 - VLSoft - 7 - One of VLSoft's prize heavey fighters. Was originally a secret design for the Empire military, but then disclosed. Now a modified version is available for civilians, although it doesn't meet up to the original specifications. Used by security agencies all over the universe for it's reliability and availability. Proudly enforcing your security since STARDATE. - - 280 - 135 - 320 - - - 200 - 140 - 360 - 180 - 60 - 1080 - - - 9 - 130 - 400 - 90 - 20 - - - Laser - Headhunter Launcher - Headhunter - - - - mule - minimal - engine - 2 - 900000 - VLSoft - 5 - A heavy liner specialized in freighting cargo all over the universe. Also has good accomodations for passengers depending on the model, allowing for enjoyable curises. Was a favourite target of pirates until they added stick turrets to the new models which can now defend themselves effectively. - - 180 - 100 - 260 - - - 160 - 200 - 300 - 100 - 40 - 800 - - - 13 - 350 - 500 - 50 - 250 - - - Laser Turret - - - - drone - minimal - engine - 7 - 300000 - RoboSys - 99 - A robot drone. - - 450 - 200 - 430 - - - 70 - 40 - 300 - 240 - 420 - 600 - - - 1 - 15 - 1 - 24 - 1 - - - Neutron Disruptor - - + +llama +minimal +engine +1 +120000 +Melendez Corp. +2 + +One of the most widely used ships in the galaxy. Reknown for it's stability and stubborness. The design hasn't been modified much since it's creation many many years ago. It was one of the first civilian use spacecrafts, first used by aristocracy and now used by everyone who cannot afford better. + + +320 +150 +360 + + +50 +60 +240 +80 +50 +500 + + +2 +32 +400 +25 +20 + + +Laser + + + +hyena +minimal +engine +1 +180000 +Aerosys +2 + +The star product of Aerosys, the Hyena quickly has become a favorite of pirates far and wide. Not much of a fighter, nor does it pack too much of a punch, but they like to come in swarms to overcome their enemies. While the Aerosys' official stance is that it doesn't sell them to shady characters, it's widely known that they do as it seems there's a countless amount in the hands of pirates. + + +400 +180 +480 + + +70 +50 +180 +150 +60 +550 + + +2 +25 +300 +30 +10 + + +Laser + + + +hawking +minimal +engine +3 +7500000 +Nexus +9 + +A heavy frigate designed for heavy combat. Used widely by the empire to establish control on it's territory. Has more then enough firepower to not be taken lightly. + + +200 +90 +260 + + +600 +400 +900 +300 +80 +1600 + + +35 +500 +300 +180 +70 + + +Laser Turret +Headhunter Launcher +Headhunter + + + +lancelot +minimal +engine +2 +700000 +Nexus +7 + +One of the Nexus' prize heavy fighters. Was originally a secret design for the Empire military, but then disclosed. Now a modified version is available for civilians, although it doesn't meet up to the original specifications. +Used by security agencies all over the universe for it's reliability and availability. Proudly enforcing your security since STARDATE. + + +280 +135 +320 + + +200 +140 +360 +180 +60 +1080 + + +9 +130 +400 +90 +20 + + +Laser +Headhunter Launcher +Headhunter + + + +mule +minimal +engine +2 +900000 +Nexus +5 + +A heavy liner specialized in freighting cargo all over the universe. Also has good accomodations for passengers depending on the model allowing for enjoyable cruises. Was a favorite target of pirates until they added stock turrets to the new models which can now defend themselves properly. + + +180 +100 +260 + + +160 +200 +300 +100 +40 +800 + + +13 +350 +500 +50 +250 + + +Laser Turret + + + +drone +minimal +engine +7 +300000 +Robosys +99 + +A robot drone. + + +450 +200 +430 + + +70 +40 +300 +240 +420 +600 + + +1 +15 +1 +24 +1 + + +Neutron Disruptor + + - diff --git a/dat/ssys.xml b/dat/ssys.xml index 5bd9399..240648d 100644 --- a/dat/ssys.xml +++ b/dat/ssys.xml @@ -1,160 +1 @@ - - - - - 15 - 8 - - - 500 - 0 - 0 - - - KonoSphere - - - Militia Lancer - Pirate - Merchant Ship - Merchant Mule - Merchant Ship - Sml Merchant Convoy - Sml Merchant Convoy - - - NCG-7291 - SaraSys - - - - - 120 - 90 - - - 27 - 0 - 0 - - - SaraCraft - - - Merchant Ship - Merchant Mule - Merchant Ship - - - Alteris - - - - - -23 - 24 - - - 230 - 0 - 0 - - - Omega Station - - - Merchant Mule - Merchant Ship - Empire Lancer - Empire Lancer - Empire Sml Defence - Collective Drone - Collective Drone - Collective Sml Swarm - - - - Alteris - KonoSys - NCG-7292 - - - - - -67 - 20 - - - 230 - 0 - 0 - - - - - Empire Lancer - Empire Lancer - Collective Drone - Collective Drone - Collective Drone - Collective Sml Swarm - - - - NCG-7291 - C-59 - - - - - -90 - 50 - - - 200 - 0 - 0 - - - S72839 - - - Collective Drone - Collective Drone - Collective Drone - Collective Sml Swarm - - - 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 - - - - +Pirate HyenaPirate HyenaPirate HyenaPirate HyenaNCG-7843307156New Haven00100Pirate HyenaMerchant MuleMerchant LlamaEmpire LancelotCoriolisNCG-7324NCG-7549NCG-7693100-500200Merchant MulePirate HyenaMerchant LlamaCoriolisNCG-7723NCG-7690Dune1248100200NCG-77232645200140Empire LancelotEmpire LancelotPirate HyenaMerchant MuleMerchant LlamaNCG-7291AlterisNCG-7273NCG-7690NCG-741440-3100100Pirate HyenaMerchant LlamaNCG-7783NCG-7843NCG-76931988500160Pirate HyenaPirate HyenaNCG-7723New Haven23515500120Collective Sml SwarmEmpire LancelotCollective DroneC-59NCG-729135-16900200Merchant LlamaEmpire LancelotPirate HyenaNCG-7291NCG-732482-8200100Merchant LlamaEmpire LancelotMerchant MulePirate HyenaDuneNCG-7693AlterisNCG-7690734600300Empire LancelotMerchant MuleMerchant MuleMerchant LlamaMerchant LlamaSml Merchant ConvoyDelta PavonisDuneAlteris6118Selphod00100Merchant LlamaPirate HyenaNCG-7690148-7400100Merchant LlamaMerchant MuleCoriolisEridaniNCG-7693Alteris90120Arrakis00200Collective Sml SwarmCollective DroneCollective Sml SwarmNCG-713275-214S7283900200Sml Merchant ConvoyMerchant LlamaPirate HyenaMerchant MuleMerchant LlamaCoriolisDelta PavonisEridaniDuneNCG-73243347DarkshedOzogo X00300Merchant LlamaCollective DroneMerchant MuleCollective Sml SwarmEmpire Sml DefenseEmpire LancelotNCG-7324NCG-7273NCG-7132NCG-741413-117Omega Station00300Empire LancelotEmpire LancelotMerchant MuleMerchant LlamaMerchant LlamaNCG-7291Delta PavonisNCG-7324-15-3200100Sml Merchant ConvoyPirate HyenaMerchant LlamaMerchant MuleMilitia LancelotEridaniNCG-7273Alteris-1028Caladan00500 \ 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 @@ - Dark Tides - - Lancer - - 500000 - 1500000 - - - 1300 - 1400 - - - KonoSys - 0 - 0 - - +Dark Tides + +Lancelot + +500000 +1500000 + + +1300 +1400 + + +Delta Pavonis +0 +0 + + - diff --git a/gfx/outfit/store/capacitor.png b/gfx/outfit/store/capacitor.png deleted file mode 100644 index 40d027a..0000000 Binary files a/gfx/outfit/store/capacitor.png and /dev/null differ diff --git a/gfx/planet/exterior/desertic.png b/gfx/planet/exterior/desertic.png index e9e1fe6..ff229bd 100644 Binary files a/gfx/planet/exterior/desertic.png and b/gfx/planet/exterior/desertic.png differ diff --git a/gfx/planet/exterior/oceanic.png b/gfx/planet/exterior/oceanic.png index 36fa224..61b21e5 100644 Binary files a/gfx/planet/exterior/oceanic.png and b/gfx/planet/exterior/oceanic.png differ diff --git a/gfx/planet/exterior/station00.png b/gfx/planet/exterior/station00.png index 873da0b..ad4249a 100644 Binary files a/gfx/planet/exterior/station00.png and b/gfx/planet/exterior/station00.png differ diff --git a/gfx/planet/exterior/station01.png b/gfx/planet/exterior/station01.png index b218431..d8db329 100644 Binary files a/gfx/planet/exterior/station01.png and b/gfx/planet/exterior/station01.png differ diff --git a/gfx/planet/exterior/station02.png b/gfx/planet/exterior/station02.png index 009ec4a..51f87b7 100644 Binary files a/gfx/planet/exterior/station02.png and b/gfx/planet/exterior/station02.png differ diff --git a/gfx/planet/space/000.png b/gfx/planet/space/000.png index 78230a7..4727331 100644 Binary files a/gfx/planet/space/000.png and b/gfx/planet/space/000.png differ diff --git a/gfx/planet/space/001.png b/gfx/planet/space/001.png index f5b6acf..a607789 100644 Binary files a/gfx/planet/space/001.png and b/gfx/planet/space/001.png differ diff --git a/gfx/planet/space/002.png b/gfx/planet/space/002.png index 25af29f..d4e10cf 100644 Binary files a/gfx/planet/space/002.png and b/gfx/planet/space/002.png differ diff --git a/gfx/planet/space/H00.png b/gfx/planet/space/H00.png index bf6eee7..da345b5 100644 Binary files a/gfx/planet/space/H00.png and b/gfx/planet/space/H00.png differ diff --git a/gfx/planet/space/J00.png b/gfx/planet/space/J00.png index e17377b..4b868a5 100644 Binary files a/gfx/planet/space/J00.png and b/gfx/planet/space/J00.png differ diff --git a/gfx/planet/space/M00.png b/gfx/planet/space/M00.png index e54f59b..73052ea 100644 Binary files a/gfx/planet/space/M00.png and b/gfx/planet/space/M00.png differ diff --git a/gfx/planet/space/M01.png b/gfx/planet/space/M01.png index b120354..5f41eaf 100644 Binary files a/gfx/planet/space/M01.png and b/gfx/planet/space/M01.png differ diff --git a/gfx/ship/lancer.png b/gfx/ship/lancer.png deleted file mode 100644 index ebb3ee8..0000000 Binary files a/gfx/ship/lancer.png and /dev/null differ diff --git a/gfx/ship/lancer_target.png b/gfx/ship/lancer_target.png deleted file mode 100644 index 3643e49..0000000 Binary files a/gfx/ship/lancer_target.png and /dev/null differ diff --git a/gfx/ship/leapard.png b/gfx/ship/leapard.png deleted file mode 100644 index d068f66..0000000 Binary files a/gfx/ship/leapard.png and /dev/null differ diff --git a/gfx/ship/leapard_target.png b/gfx/ship/leapard_target.png deleted file mode 100644 index e2f154c..0000000 Binary files a/gfx/ship/leapard_target.png and /dev/null differ diff --git a/src/space.c b/src/space.c index ba1114e..3b7638c 100644 --- a/src/space.c +++ b/src/space.c @@ -716,7 +716,7 @@ static Planet* planet_pull(const char* name) { if(i == PLANET_TECH_MAX) WARN("Planet '%s' has too many" "'special tech' entries", tmp->name); } - } while((ccur = ccur->next)); + } while(xml_nextNode(ccur)); } else if(xml_isNode(cur, "commodities")) { ccur = cur->children; @@ -728,7 +728,7 @@ static Planet* planet_pull(const char* name) { commodity_get(xml_get(ccur)); tmp->ncommodities++; } - } while((ccur = ccur->next)); + } while(xml_nextNode(ccur)); } } while(xml_nextNode(cur)); }