From 2bd4edfa09b66c5782d0991e1ec61784ac9e9269 Mon Sep 17 00:00:00 2001 From: Allanis Date: Thu, 30 May 2013 15:38:19 +0100 Subject: [PATCH] [Fix] Wording in cargo missions. --- dat/commodity.xml | 71 +- dat/faction.xml | 94 +-- dat/fleet.xml | 147 ++-- dat/gui.xml | 134 ++-- dat/mission.xml | 105 +-- dat/missions/cargo.lua | 11 +- dat/outfit.xml | 640 ++++++++---------- dat/planet.xml | 274 ++++---- dat/ship.xml | 12 +- dat/ssys.xml | 161 ++++- dat/start.xml | 35 +- gfx/ship/{lancelot.png => lancer.png} | Bin ...{lancelot_target.png => lancer_target.png} | Bin gfx/ship/{hyena.png => leapard.png} | Bin .../{hyena_target.png => leapard_target.png} | Bin 15 files changed, 875 insertions(+), 809 deletions(-) rename gfx/ship/{lancelot.png => lancer.png} (100%) rename gfx/ship/{lancelot_target.png => lancer_target.png} (100%) rename gfx/ship/{hyena.png => leapard.png} (100%) rename gfx/ship/{hyena_target.png => leapard_target.png} (100%) diff --git a/dat/commodity.xml b/dat/commodity.xml index a9b1966..e675783 100644 --- a/dat/commodity.xml +++ b/dat/commodity.xml @@ -1,51 +1,42 @@ - - -Airtight compressed nutrient packets. Very nutricious. - -160 -140 -120 + + Airtight compressed nutrient packets. Very nutritious. + 160 + 140 + 120 + + + An assortment of ores. Needed for all kinds of processes. + 240 + 210 + 180 - - -All sorts of assorted ores. Needed for all sorts of production processes. - -240 -210 -180 + + Your basic industrial goods. From cutting lasers to prcessed metals. + 420 + 340 + 280 - - -Your basic industrial goods. From cutting lasers to processed metals. - -420 -340 -280 + + An assortment of medicines sutable for curing all sorts of ailments. + 900 + 750 + 550 - - -An assortment of medicines suitable for curing all sorts of ailments. - -900 -750 -550 + + All kinds of high quality luxary goods. + 760 + 630 + 470 - - -All sorts of high quality luxury goods. - -760 -630 -470 + - + - + - - - + + diff --git a/dat/faction.xml b/dat/faction.xml index 0c21aa4..94c7f04 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 5050046..ea91fd0 100644 --- a/dat/fleet.xml +++ b/dat/fleet.xml @@ -1,77 +1,76 @@ - -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 - - + + 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 + + diff --git a/dat/gui.xml b/dat/gui.xml index 2f77092..4fabb5e 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 46ff145..957c8e6 100644 --- a/dat/mission.xml +++ b/dat/mission.xml @@ -1,54 +1,55 @@ - -welcome - -1 - - -None - - - -cargo - -960 -Computer -Neutral -Empire United - - - -emp_cargo00 - -1 - - -80 -Bar -Empire United -Neutral - - - -es_cargo - -es_cargo -350 -Computer -Empire United -Neutral - - - -emp_scout00 - -1 - - -es_cargo -70 -Bar -Empire United - - + + + 1 + + welcome + + None + + + + cargo + + 960 + Computer + Neutral + Empire United + + + + emp_cargo00 + + 1 + + + 80 + Bar + Empire United + Neutral + + + + es_cargo + + es_cargo + 350 + Computer + Empire United + Neutral + + + + emp_scout00 + + 1 + + + es_cargo + 70 + Bar + Empire United + + + diff --git a/dat/missions/cargo.lua b/dat/missions/cargo.lua index 7840c6b..7bac7d0 100644 --- a/dat/missions/cargo.lua +++ b/dat/missions/cargo.lua @@ -18,7 +18,9 @@ else -- Default english. full_title = "Ship is full" full_msg = "Your ship is too full. You need to make room for %d more tons if you want to be able to accept the mission." accept_title = "Mission Accepted" - accept_msg = "The workers load the %d tons of %s onto your ship." + accept_msg = {} + accpet_msg[1] = "The Workers load the %d tons of %s onto your ship." + accpet_msg[2] = "The %s board your ship." toomany_title = "Too many missions" toomany_msg = "You have too many active missions." finish_title = "Succesful Delivery" @@ -116,7 +118,12 @@ function accept() elseif misn.accept() then -- Able to accept the mission, hooks BREAK after accepting. carg_id = player.addCargo(carg_type, carg_mass) - tk.msg(accept_title, string.format( accept_msg, carg_mass, carg_type)) + + if misn_type == "People" then + tk.msg(accpet_title, string.format(accept_msg[2], carg_type)) + else + tk.msg(accpet_title, string.format(accpet_msg[1], carg_mass, carg_type)) + end -- Set the hooks. hook.land("land") -- Only hook after accepting. diff --git a/dat/outfit.xml b/dat/outfit.xml index f9389ec..2aa1455 100644 --- a/dat/outfit.xml +++ b/dat/outfit.xml @@ -1,361 +1,285 @@ - - -5 -2 -5 -5000 - -Your basic laser. Fires charged energy beams that do a decent amount of damage to both shield and armour. - -laser - - -lasergreen -laser -ExpS -500 -550 -300 -30 -8 - -10 -13 - - - - - -4 -4 -20 -25000 - -Two laser cannons added on a rotating turret, allowing for 360 degrees of firepower. - -laser_turret - - -lasergreen -laser -ExpS -300 -550 -300 -30 -10 - -13 -10 - - - - - -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 - -25 -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 - -23 -18 - - - - - -3 -99 -8 -25000 - -Neutron Disruptor. - -neutron - - -neutron -laser -ExpS -400 -650 -200 -15 -5 - -7 -7 - - - - - -10 -3 -2 -22500 - -A heavy battery that will increase your ship's energy to allow 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 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. - -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 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 -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 -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 - - + + + 5 + 2 + 5 + 5000 + Your basic laser. Fires charges energy beams that do a decent amount of damage to both shield and amour. + laser + + + lasergreen + laser + ExpS + 500 + 550 + 300 + 1 + 8 + + 10 + 13 + + + + + + 4 + 4 + 20 + 25000 + Two laser cannons added on a rotating turret, allowing for 360 degrees of firepower! + laser_turret + + + lasergreen + laser + ExpS + 300 + 550 + 300 + 30 + 10 + + 13 + 10 + + + + + + 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 + + 25 + 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 + + 23 + 18 + + + + + + 3 + 99 + 8 + 25000 + Neutron Disruptor. + neutron + + + neutron + laser + ExpS + 400 + 650 + 200 + 15 + 5 + + 7 + 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 + 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 + 185 + 100 + 85 + 50 + 65 + + + diff --git a/dat/planet.xml b/dat/planet.xml index 6c20e63..0505c15 100644 --- a/dat/planet.xml +++ b/dat/planet.xml @@ -1,148 +1,132 @@ - - -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 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. - - -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. - -Independent -31 - -
3
- - -Food -Ore -Industrial Goods -Medicine - - - -M01.png -oceanic.png - - - - -0 -0 - - -H - -Arrakis is a desert planet with no natural precipitation. - - -The Arrakeen canteen is a shady place. Many scoundrels and lowlifes make this their home to avoid notice from the universal police. - -Independent -7 - -
4
- - -Food -Ore - - - -H00.png -desertic.png - - - - -0 -0 - - -0 - -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 sounds sending pilots to man their ships to fight off the menace. - -Empire -15 - -Food -Medicine - - -
5
- - - -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 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. - - -The Darkshed cantina is decorated with all sorts of odd artifacts that marked 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 - - + + + 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 + + diff --git a/dat/ship.xml b/dat/ship.xml index 99113d1..1290f72 100644 --- a/dat/ship.xml +++ b/dat/ship.xml @@ -1,6 +1,6 @@ - + llama minimal engine @@ -33,8 +33,8 @@ Laser - - hyena + + leapard minimal engine 1 @@ -101,8 +101,8 @@ Headhunter - - lancelot + + lancer minimal engine 2 @@ -136,7 +136,7 @@ Headhunter - + mule minimal engine diff --git a/dat/ssys.xml b/dat/ssys.xml index 167c994..5bd9399 100644 --- a/dat/ssys.xml +++ b/dat/ssys.xml @@ -1 +1,160 @@ -Merchant LlamaMerchant MuleCoriolisAlteris90120Arrakis00200NCG-7291DuneAlteris734600300Collective Sml SwarmCollective DroneNCG-729250-90S7283900200Sml Merchant ConvoyMerchant LlamaPirate HyenaMerchant MuleNCG-7291Delta PavonisDuneCoriolis3347DarkshedOzogo X00300Merchant LlamaCollective DroneMerchant MuleCollective Sml SwarmEmpire Sml DefenseEmpire LancelotCoriolisDelta PavonisNCG-7292Alteris24-23Omega Station00300Sml Merchant ConvoyMerchant MuleMerchant LlamaPirate HyenaMilitia LancelotNCG-7291Alteris-1028Caladan00500Collective Sml SwarmEmpire LancelotCollective DroneNCG-7291C-5920-6700200 \ No newline at end of file + + + + + 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 + + + + diff --git a/dat/start.xml b/dat/start.xml index f2165f3..466e9d0 100644 --- a/dat/start.xml +++ b/dat/start.xml @@ -1,19 +1,20 @@ -Dark Tides - -Lancelot - -500000 -1500000 - - -1300 -1400 - - -Delta Pavonis -0 -0 - - + Dark Tides + + Lancer + + 500000 + 1500000 + + + 1300 + 1400 + + + KonoSys + 0 + 0 + + + diff --git a/gfx/ship/lancelot.png b/gfx/ship/lancer.png similarity index 100% rename from gfx/ship/lancelot.png rename to gfx/ship/lancer.png diff --git a/gfx/ship/lancelot_target.png b/gfx/ship/lancer_target.png similarity index 100% rename from gfx/ship/lancelot_target.png rename to gfx/ship/lancer_target.png diff --git a/gfx/ship/hyena.png b/gfx/ship/leapard.png similarity index 100% rename from gfx/ship/hyena.png rename to gfx/ship/leapard.png diff --git a/gfx/ship/hyena_target.png b/gfx/ship/leapard_target.png similarity index 100% rename from gfx/ship/hyena_target.png rename to gfx/ship/leapard_target.png