diff --git a/dat/faction.xml b/dat/faction.xml index bab9386..119d215 100644 --- a/dat/faction.xml +++ b/dat/faction.xml @@ -1,10 +1,10 @@ - - 0 - - - + + 0 + + + 0 @@ -13,10 +13,9 @@ Pirate Collective - DLF - Collective + FLF - + Frontier Alliance 0 @@ -29,41 +28,46 @@ - Space Traders Guild + Space Traders Guild 0 Independent Empire Soromid + Frontier Pirate - DLF + FLF Collective - Galactic Pirates + Galactic Pirates -20 Empire - Draktharr - Tex'nus + Dvaered + Za'lek Collective Soromid + Sirius + Frontier + empire 0 - Draktharr + Dvaered Soromid - Tex'nus + Za'lek Trader + Sirius Pirate - DLF + FLF Collective @@ -71,38 +75,42 @@ -100 Empire - Draktharr - Tex'nus + Dvaered + Za'lek Soromid Pirate - DLF + FLF + Sirius + Frontier - + Frontier Liberation Front -10 Empire - Draktharr - Tex'nus + Dvaered + Za'lek Collective Soromid - - House Draktharr + + dvaered + House Dvaered 0 Empire Pirate - DLF + FLF Collective - - House Tex'nus + + zalek + House Za'lek 0 Empire @@ -110,7 +118,20 @@ Pirate Collective - DLF + FLF + + + + sirius + House Sirius + 0 + + Empire + + + Pirate + Collective + FLF @@ -122,11 +143,12 @@ Pirate - DLF + FLF Collective + goddard House Goddard 0 @@ -135,7 +157,7 @@ Pirate - DLF + FLF Collective diff --git a/dat/fleet.xml b/dat/fleet.xml index 9f2743e..00f6848 100644 --- a/dat/fleet.xml +++ b/dat/fleet.xml @@ -13,12 +13,12 @@ Llama - - + + trader Trader - Koala + Koala @@ -34,66 +34,64 @@ Llama Llama - Llama Koala Mule - Mule - - - dlf - DLF - - Pacifier - - - - dlf - DLF - - Vendetta - - - - dlf - DLF - - Hyena - Hyena - Admonisher - Vendetta - - - - dlf - DLF - - Hyena - Hyena - Hyena - Admonisher - Vendetta - Vendetta - Pacifier - - - - dlf - DLF - - Hyena - Hyena - Hyena - Hyena - Admonisher - Admonisher - Vendetta - Vendetta - Vendetta - Pacifier - Hawking - - + + + flf + FLF + + Pacifier + + + + flf + FLF + + Vendetta + + + + flf + FLF + + Hyena + Hyena + Admonisher + Vendetta + + + + flf + FLF + + Hyena + Hyena + Hyena + Admonisher + Vendetta + Vendetta + Pacifier + + + + flf + FLF + + Hyena + Hyena + Hyena + Hyena + Admonisher + Admonisher + Vendetta + Vendetta + Vendetta + Pacifier + Hawking + + pirate Pirate @@ -140,6 +138,32 @@ Drone + + collective + Collective + + Drone + Drone + Drone + Drone + Drone + Drone + Drone + Drone + Drone + Drone + Drone + Drone + Drone + Drone + Drone + Drone + Drone + Drone + Drone + Drone + + collective Collective @@ -152,45 +176,45 @@ Drone - - draktharr - Draktharr + + dvaered + Dvaered - Draktharr Vendetta + Dvaered Vendetta - - draktharr - Draktharr + + dvaered + Dvaered - Draktharr Ancestor + Dvaered Ancestor - - draktharr - Draktharr + + dvaered + Dvaered - Draktharr Goddard - Draktharr Ancestor - Draktharr Ancestor + Dvaered Goddard + Dvaered Ancestor + Dvaered Ancestor - - draktharr - Draktharr + + dvaered + Dvaered - Draktharr Vendetta - Draktharr Vendetta - Draktharr Ancestor - Draktharr Ancestor - Draktharr Goddard + Dvaered Vendetta + Dvaered Vendetta + Dvaered Ancestor + Dvaered Ancestor + Dvaered Goddard empire Empire - Empire Lancelot + Empire Lancelot @@ -204,11 +228,54 @@ Empire Hawking + + empire + Empire + + Empire Lancelot + Empire Lancelot + Empire Lancelot + Empire Lancelot + Empire Lancelot + Empire Lancelot + Empire Lancelot + Empire Admonisher + Empire Admonisher + Empire Admonisher + Empire Pacifier + Empire Hawking + Empire Hawking + + + + empire + Empire + + Empire Lancelot + Empire Lancelot + Empire Lancelot + Empire Lancelot + Empire Admonisher + Empire Admonisher + Empire Pacifier + Empire Hawking + + + + empire + Empire + + Empire Lancelot + Empire Lancelot + Empire Admonisher + Empire Pacifier + + empire Empire - Empire Pacifier + Empire Pacifier @@ -217,19 +284,19 @@ Empire Admonisher - - - collective - Collective - - Empire Hawking - - - - collective - Collective - - Goddard - - + + + collective + Collective + + Empire Hawking + + + + collective + Collective + + Goddard + + diff --git a/dat/intro b/dat/intro index 91b6c91..5a3dbe5 100644 --- a/dat/intro +++ b/dat/intro @@ -1,24 +1,23 @@ -Humans had always looked up at the skies at night, dreaming of being one with the stars. Yet they never imagined what their dreams had in them. + Humans had always looked up at the skies at night, dreaming of being one with the stars. Yet they could never imagine what their dreams got them in. -They ended up getting into space and the revolution that this provoked. With the advent of terraforming technologies, colonists began flocking to the stars en masse. Many worlds were colonized and humanity expanded. -It was still slow travelling and time was starting to erode humanity's unity. + They ended getting into space and the revolution that this provoked. With the advent of terraforming technologies colonists began flocking to the stars en masse. Many worlds were colonized and humanity expanded. It was still slow traveling and time was starting to erode humanity's unity. -Then.. Came the great advance in travel. Light speeds were finally broken. This technology spread quickly and reignited the colonization spree. Humans had conquered a great part of the galaxy. Things were hectic though, with mankind fragmented in many factions. A federation was created to attempt to affront this. + Then came the great advance in travel. Light speeds were finally broken. This technology spread quickly and reignited the colonization spree. Humans had conquered a great part of the galaxy. Things were hectic though, with mankind fragmented in many factions. A federation was created to attempt to affront this. -Yet, this only incremented tension. Man was too fractured to be weaved together with diplomacy. War broke out, timidly at first, but quickly gathering momentum. Thus began the Great Faction War! + Yet this only incremented tension. Man was too fractured to be weaved together with diplomacy. War broke out, timidly at first, but quickly gathering momentum. Thus began the Great Faction War. -Being the first space-era all out global war, the Faction War brought much pain and misery to humanity. Many plants were annihilated, trillions killed, all in the name of each faction. Mankind started becoming tribal and isolated, seperated by vast space filled with the debris of battleships and smoldering planets. Then came hope at the hand of the Emperor Daedris. + Being the first space-era all out global war, the Faction War brought much pain and misery to humanity. Many planets were annihilated, trillions killed, all in the name each faction. Mankind started becoming tribal and isolated, separated by vast space filled with the debris of battleships and smoldering planets. Then came hope at the hand of Emperor Daedris. -A newly forged Empire began sweeping the factions, dominating with clear military superioriy. Some factions resisted at first, but most saw the only way was to sumbit to the iron fist of the Emperor. Eventually there was only the Empire. Those who helped in the birth of this Empire were given the status of Great House, and the golden age began. + A newly forged Empire began sweeping the factions, dominating with clear military superiority. Some factions resisted at first, but most saw the only way was to submit to the iron fist of the Emperor. Eventually there was only the Empire. Those who helped in the birth of this Empire were given the status of Great House, and the golden age began. -Trade routes were created, patrols were installed and piracy was non-existant. Supplies were being moved all around the Empire and population was booming. Technology advanced quickly and permitted the terraforming of many new planets. All was working well. + Trade routes were created, patrols were installed and piracy was non-existent. Supplies were being moved all around the Empire and population was booming. Technology advanced quickly and permitted the terraforming of many new planets. All was working well. -Eventually, corruption started to appear, slowly at first, but ended up avalanching. The Great Houses started bickering between each other. Privateers and Pirates started appearing, while the Emperor started to get drowned in burocracy. Terrorism also began to appear by sectors of the Empire not content with their status. + Eventually corruption started to appear, slowly at first, but ended up avalanching. The Great Houses started bickering between each other. Privateers and Pirates started appearing, while the Emperor started to get drowned in bureaucracy. Terrorism also began to appear by sectors of the Empire not content with their status. -Then suddenly, silence. No one knows exactly what happened, but a gigantic explosion shook the foundations of the universe. The magnitude of the explosion was so enormous that it quickly annihilated many planets, leaving a gigantic void in the center of the Empire. Humanity's birthplace was near the epicenter, and the entire area was covered in a gigantic nebulae. It is referred to as 'The Incident' and marks the end of the golden age. + Then suddenly, silence. No one knows exactly what happened, but a gigantic explosion shook the foundations of the universe. The magnitude of the explosion was so enormous that it quickly annihilated many planets leaving a gigantic void in the center of the Empire. Humanity's birthplace was near the epicenter, and the entire area was covered in a gigantic nebulae. It is referred to as The Incident and marks the end of the golden age. -You find yourself in a universe with a decaying Empire, full of piracy and corruption, shaken to it's very bones by the Incident. However, where there is chaos, there is also oportunity. + You find yourself in a universe with a decaying Empire, full of piracy and corruption shaken to it's very bones by the Incident. However where there is chaos, there is also opportunity. -WELCOME!! To the universe of Lephisto!! + Welcome to the universe of Lephisto... diff --git a/dat/mission.xml b/dat/mission.xml index 9f55ad7..4d200a6 100644 --- a/dat/mission.xml +++ b/dat/mission.xml @@ -10,19 +10,19 @@ - neutral/cargo + neutral/cargo 960 Computer Independent Empire Soromid - Draktharr + Dvaered Frontier - empire/emp_cargo00 + empire/emp_cargo00 1 @@ -33,7 +33,7 @@ - empire/es_cargo + empire/es_cargo player.getFaction("Empire") >= 0 and var.peek("es_cargo") == true 350 @@ -43,7 +43,7 @@ - empire/collective/ec00 + empire/collective/ec00 1 @@ -55,7 +55,7 @@ - empire/collective/ec01 + empire/collective/ec01 1 @@ -68,7 +68,7 @@ - empire/collective/ec02 + empire/collective/ec02 1 @@ -81,12 +81,12 @@ - empire/collective/ec03 + empire/collective/ec03 1 - player.getFaction("Empire") > 5 and var.peek("collective_fail") ~= true + player.getFaction("Empire") > 5 and var.peek("collective_fail") ~= true Collective Espionage 2 100 Bar @@ -94,7 +94,7 @@ - empire/collective/ec04 + empire/collective/ec04 1 @@ -107,12 +107,12 @@ - empire/collective/ec05 + empire/collective/ec05 1 - player.getFaction("Empire") > 5 and var.peek("collective_fail") ~= true + player.getFaction("Empire") > 5 and var.peek("collective_fail") ~= true Collective Distraction 100 Bar @@ -120,7 +120,7 @@ - empire/collective/ec06 + empire/collective/ec06 1 @@ -131,20 +131,20 @@ Bar Omega Station - - + + neutral/nebu_satellite - 1 + 1 - 15 - Bar - Independent - Empire - Soromid - Draktharr - Frontier + 15 + Bar + Independent + Empire + Soromid + Dvaered + Frontier - + diff --git a/dat/missions/empire/collective/ec06.lua b/dat/missions/empire/collective/ec06.lua index 8922a17..b5ad6fe 100644 --- a/dat/missions/empire/collective/ec06.lua +++ b/dat/missions/empire/collective/ec06.lua @@ -100,7 +100,7 @@ function jump() emp_fleets = {} emp_fleets[1] = "Empire Sml Attack" emp_fleets[2] = "Empire Sml Attack" - emp_fleets[3] = "Draktharr Goddard" -- They help empire. + emp_fleets[3] = "Dvaered Goddard" -- They help empire. -- Get position x, y = enter_vect:get() -- Add pilots. @@ -141,7 +141,7 @@ function jump() emp_fleets = {} emp_fleets[1] = "Empire Lge Attack" emp_fleets[2] = "Empire Med Attack" - emp_fleets[3] = "Draktharr Goddard" -- They help empire. + emp_fleets[3] = "Dvaered Goddard" -- They help empire. -- Get position. x, y = enter_vect:get() spawn_vect = enter_vect.new(x, y) diff --git a/dat/missions/neutral/cargo.lua b/dat/missions/neutral/cargo.lua index 9a004f4..888ea8a 100644 --- a/dat/missions/neutral/cargo.lua +++ b/dat/missions/neutral/cargo.lua @@ -42,8 +42,8 @@ end function create() landed = space.getPlanet() -- Get landed planet. - -- Only 50% chance of appearing on Draktharr systems. - dv = faction.get("Draktharr") + -- Only 50% chance of appearing on Dvaered systems. + dv = faction.get("Dvaered") if landed:faction() == dv and rnd.int(1) == 0 then misn.finish(false) end diff --git a/dat/outfit.xml b/dat/outfit.xml index 13924bd..458fa68 100644 --- a/dat/outfit.xml +++ b/dat/outfit.xml @@ -97,8 +97,8 @@ Medium Weapon License 9 15000 - Ion pulses were originally intended only to deactivate shields since they had completely nullified the old radiation technology weapons. It was thought that by figuring out a way to deactivate shields fast the radiation technology would still be able to destroy the armour. By combining shield destruction power and armour destruction power, the perfect weopns could be designed. The Ion pulses ended up being very effective against armour and electronics. With the invention of the latest generation shields and armour materials, Ion pulses have lost much of the terrain they had as newfound technology. - ion + Ion pulses were originally intended only to deactivate shields since they had completely nullified the old radiation technology weapons. It was thought that by figuring out a way to deactivate shields fast the radiation technology would still be able to destroy the armour. By combining shield destruction power and armour destruction power, the perfect weapons could be designed. The Ion pulses ended up being very effective against armour and electronics. With the invention of the latest generation shields and armour materials, Ion pulses have lost much of the terrain they had as newfound technology. + medium ion @@ -117,11 +117,11 @@ 3 11 - Heavy Weapon License 35 + Heavy Weapon License 75000 - The heavy Ion Turret uses a bigger generator for each cannon giving it more punch then the Ion cannnon. The drawback is that this augments the power usage considerably. Being designed for capital ships, this doesn't seem to worry the makers too much. - turret3 + The heavy Ion Turret uses a bigger generator for each cannon giving it more punch then the Ion cannon. The drawback is that this augments the power usage considerably. Being designed for capital ships, this doesn't seem to worry the makers too much. + turret2 ion @@ -158,7 +158,7 @@ 35 40 - + 1 @@ -166,20 +166,20 @@ Heavy Weapon License 20 184000 - One of the more popular beam weapons for its simplicity and size. Most heavy fightershave no trouble fitting one of these. Being fixed mounted it inherits their maneuverability, allowing for greater precision on agile ships. - heavy + One of the more popular beam weapons for it's simplicity and size. Most heavy fighters have no trouble fitting one of these. Being fixed mounted it inherits their maneuverability, allowing for greater precision on agile ships. + orion - 6000 - 3 - 300 - 70 - 40 - ShiS - ExpS - beam_orion - beam0 - beam_off0 + 6000 + 3 + 300 + 70 + 40 + ShiS + ExpS + beam_orion + beam0 + beam_off0 @@ -188,21 +188,21 @@ 13 60 745000 - Ragnorak beam is one of the most powerful beam class weapons on the market. It's designed for capital ship combat, although it's exremely high payload makes it also somewhat useful for clearing enemy fighters. + The Ragnorak Beam is one of the most powerful beam class weapons on the market. It's designed for capital ship combat, although its extremely large payload makes it also somewhat useful for clearing enemy fighters. turret3 - 7000 - 3 - 400 - 50 - 130 - 100 - ShiS - ExpS - beam_ragnarok - beam0 - beam_off0 + 10000 + 5 + 400 + 50 + 130 + 100 + ShiS + ExpS + beam_ragnarok + beam0 + beam_off0 @@ -248,7 +248,7 @@ Medium Weapon License 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. + The Headhunter Launcher is one of the most used missile launchers 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 @@ -279,7 +279,7 @@ 550 20 - + 2 @@ -358,11 +358,11 @@ 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. + A big panel that will generate energy based off solar energy. This will allow your ship to regenerate its energy supplies faster. solar - 125 + 75 @@ -384,7 +384,7 @@ 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. + 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 ship's energy. shield @@ -428,7 +428,7 @@ 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. + With the adding of a couple of additional steering thrusters you can make your ship very agile at turning. thruster @@ -493,7 +493,7 @@ 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 Pods are big containers you can attach to dedicated weapon space allowing you to transport more cargo. The drawback is that you lose a lot of weapon space and won't be able to defend your cargo as well... cargo_pod @@ -532,7 +532,7 @@ 7 2 40000 - This jammer allows you to block the targetting systems of some of the missiles headed towards you, causing them to do unpredictable behaviours and not impact against your ship. + This jammer allows you to block the targetting systems of some of the missiles headed towards you, giving them unpredictable behaviors, likely not to impact with your ship. jammer0 @@ -563,7 +563,7 @@ Medium Weapon License 10 19000 - A base for launching Draktharr Mace rockets. + A base for launching Dvaered Mace rockets. mace @@ -578,7 +578,7 @@ Medium Weapon License 2 700 - The Mace rocket is a very heavy fast accelerating rocket designed for high speed collisions. The rockets doesn't have too much explosive, instead it has a lot of fuel for the acceleration it uses to combust. Most of the damage it does is from the impact and not the explosion though. + The Mace rocket is a very heavy, fast accelerating rocket designed for high speed collisions. The rockets doesn't have too much explosive, instead it has a lot of fuel it uses for the acceleration. Most of the damage it does is from the impact and not the explosion though. mace @@ -591,15 +591,15 @@ 1000 35 - - + + 2 7 17 31000 empgrenadelauncher - This launcher can fire EMP grenades in any direction using a unique internal guidance system. These are favored by Traders for escaping from pirates. + This launcher can fire EMP grenades in any direction using a unique internal guidance system. These are favored by traders for escaping from pirates. EMP Grenade @@ -613,7 +613,7 @@ 1 600 empgrenade - This is a grenade that can be launched to unleash EMP blasts rendering most electronics in the area useless. Good for taking ships alive instead of killing them as the EMP blasts rarely destroy the ship instead leaving it intact with non-working electronics. + This is a grenade that can be launched to unleash EMP blasts rendering most electronics in the area useless. Good for taking ships alive instead of killing them, as the EMP blasts rarely destroy the ship, leaving it intact with non-working electronics instead. empgrenade @@ -633,7 +633,7 @@ 15 65000 plasteel - Plasteel was one of man's greatest improvements on materials. It's a cheap, very strong armour that seems to take the best from both the plastic and steel. You can bend it relatively easily while keeping it's incredible strength. The Second Growth was only possible with this amazing new material. + Plasteel was one of man's greatest improvements on materials. It's a cheap, very strong armour that seems to take the best from both plastic and steel. You can bend it relatively easily while keeping it's incredible strength. The Second Growth was only possible with this amazing new material. By adding quite a dense layer of Plasteel to your ship you can increase it's sturdiness by a lot. Although with the advent of even newer materials Plasteel is starting to fade in popularity, although it's lower price tag always seems to keep a loyal customer base. @@ -647,7 +647,7 @@ By adding quite a dense layer of Plasteel to your ship you can increase it's stu 35 365000 nanobond - Nanobond is the succesor to Plasteel. It follows the same approach but has a much more refined manufacturing process with much more control on the small scale. The result is a much more robust and dense material although much more expensive. + Nanobond is the successor to Plasteel. It follows the same approach but has a much more refined manufacturing process with much more control on the small scale. The result is a much more robust and dense material although much more expensive. 120 @@ -660,7 +660,7 @@ By adding quite a dense layer of Plasteel to your ship you can increase it's stu 57 1120000 biometal - Biometal is a metal armour that will actually regenerate itself thanks to some special bacteria it uses. The downside is that this makes it much bulkier and expensive then just using more refined Nanobond. The results are pretty formidable, but it's hard to equip such an armour on anything short of a Destroyer. + Biometal is a metal armour that will actually regenerate itself thanks to some special bacteria it uses. The downside is that this makes it much bulkier and more expensive then just using a more refined Nanobond. The results are pretty formidable, but it's hard to equip such armour on anything short of a Destroyer. 150 @@ -674,7 +674,7 @@ By adding quite a dense layer of Plasteel to your ship you can increase it's stu 3 430000 droid - The low maintenance droid crew will scour your ship to repair any damages caused by space hazards. They are very small and able to work both on interior or exterior of the ship. Power is drawn from the ship to feed the robots, although the load is generally very low compared to the benefits of having a robotic repair crew. + This low maintenance droid crew will scour your ship to repair any damages caused by space hazards. They are very small and able to work both on the interior or exterior of the ship. Power is drawn from the ship to feed the robots, although the load is generally very low compared to the benefits of having a robotic repair crew. 30 @@ -689,7 +689,7 @@ By adding quite a dense layer of Plasteel to your ship you can increase it's stu 12 170000 reactor_i - Adding a complementary reactor to your ship is a great way to get that extra energy boost you need. This do not replace the existing reactor but work alongside it and hook up directly to the energy flux. + Adding a complementary reactor to your ship is a great way to get that extra energy boost you need. This do not replace the existing reactor but works alongside it and hooks up directly to the energy flux. 20 @@ -717,7 +717,7 @@ By adding quite a dense layer of Plasteel to your ship you can increase it's stu 46 970000 reactor_iii - The class III reactor pretty much makes all your energy worries negligable. It follows the traditional fusion approach of the class I reactor, only making it much bigger. The size increase makes it only fit comfortably on large vessels, but the energy output is also suited for those. + The class III reactor pretty much makes all your energy worries negligible. It follows the traditional fusion approach of the class I reactor, only making it much bigger. The size increase makes it only fit comfortably on large vessels, but the energy output is also suited for those. 100 @@ -752,7 +752,7 @@ By adding quite a dense layer of Plasteel to your ship you can increase it's stu Lancelot - + 1 @@ -763,7 +763,7 @@ By adding quite a dense layer of Plasteel to your ship you can increase it's stu This license will authorize you to buy Cruise Ship and Bulk Carrier class ships. - + 1 diff --git a/dat/planet.xml b/dat/planet.xml index b92983b..18f035a 100644 --- a/dat/planet.xml +++ b/dat/planet.xml @@ -10,10 +10,9 @@ 0 - 17000000 - 0.5 - 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. - 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. + 0.5 + The bar is just off the starport with a great view of the harbor. 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 characterized by abundant precipitation and strong winds, yet tolerable enough to make special and expensive weather control measures unnecessary. Habitable land is often characterized 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. Empire Food @@ -27,6 +26,7 @@ 31 M + 17000000 @@ -77,8 +77,7 @@ -97 - 50000000 - 0.5 + 0.5 The Jorlan people don't really have a habit for drinking. You only seem to see other spacefarers in the bar, but no natives. Jorlan is a small moon that orbits Haleb IV. It's inhabitants are mostly part of the ore refining process, as it supplies most of the Frontier with all sorts of alloys. Gas miners are also sent down to Haleb IV every dozen STU when the planetary conditions are favorable, otherwise the incredible winds can crush many ships like tin cans. Frontier @@ -93,6 +92,7 @@ 15 D + 5000000 @@ -105,8 +105,7 @@ 0 - 27000 - 0.3 + 0.3 Most of the drinks served at the bar are served very warm with heavy infusions of all kinds of spices. They are designed to give a lot of energy to keep the body warm when walking in the cold base. Selphod is a very harsh and barren ice planet. Most of the locals have never ventured outside the established bases. The reason is that to be able to venture outside you have to wear really heavy thermal protection with a personal generator to keep the body temperature at optimal. Even then, if the gear isn't worn properly the cold will quickly enter and kill the living being in less then a mTSU. Empire @@ -121,29 +120,33 @@ 7 P + 27000 - + - station00.png - 000.png + lava.png + A01.png - 17 - 394 + 0 + 0 - 7000 - 0.5 - The Raglan bar is a pretty small bar for Draktharr standards, and quite empty too. - Raglan Outpost was established after the Draktharr-Frontier war broke out before the Incident. To this day the Frontier still is demanding for it's dismantling in the halls of the Emperor, although he has yet to make a statement. Meanwhile the Draktharrs use this base intensively in their fight against the DLF. - Draktharr + 0.7 + The drinks served in the Furnance, as the bar calls itself are of a pretty strange variety. They are generally very strong and served at a warm temperature. The house specialties also contain volcanic ash which is harvested on the planet surface. A strange bar indeed. + Doranthex Prime is a mostly molten planet. The only exception is a small island that drifts around the surface mainly around the polar regions. On this island the Dvaered have established a small base, mainly for research and military prototyping, although civilians are allowed in the main facilities. Due to the intense temperatures they are shielded by over 50m of temperature isolating plating, which doesn't allow any views of the planet itself once you've landed. + Dvaered + + Food + -
7
+
0
0 3 - 1 + A + 20000 @@ -156,10 +159,9 @@ 0 - 700 - 0.5 + 0.5 The bar is maintained by off-duty scientists and soldiers. It's very small and doesn't have much offerings. There's not much ambient noise, it seems like the boredom has gotten the best of most of the people. - Named after the guardian dog of hell for it's role in monitoring and observing the immense Sol nebulae. It was created shortly after the nebulae stabilized. Exact details are confidential and there's more then enough military influence to make it suspicious. With all the conspiration theories around the Incident, one can never be too sure where reality ends and fiction starts. + Named after the guardian dog of hell for its role in monitoring and observing the immense Sol nebulae. It was created shortly after the nebulae stabilized. Exact details are confidential and there's more then enough military influence to make it suspicious. With all the conspiracy theories around the Incident, one can never be too sure where reality ends and fiction starts. Empire
0
@@ -167,6 +169,7 @@ 3 0 + 700 @@ -196,10 +199,9 @@ 47 - 12000 - 0.8 - The Tau Prime algae has a very strong stench which seems to envelope the bar completely. The smell is soo strong you can actually taste it. It doesn't taste nearly as good unprocessed. Most algae runners stop to grab drinks between runs to try to get the taste of the algae out of their mouth, although the usually use licor made out of processed algae to do that. - Tau Station was constructed with the sole purpose of exploiting the algae produced on Tau Prime. Being a completely watery algae world with a very corrosive environment, it was deemed more profitable to build a space station then a city on the planet surface. From the station windows you can see heavy algae collectors flying to and from the surface on their endless algae runs. + 0.8 + The Tau Prime algae has a very strong stench which seems to envelope the bar completely. The smell is so strong you can actually taste it. It doesn't taste nearly as good unprocessed. Most algae runners stop to grab drinks between runs to try to get the taste of the algae out of their mouth, although the usually use liquor made out of processed algae to do that. + Tau Station was constructed with the sole purpose of exploiting the algae produced on Tau Prime. Being a completely watery algae world with a very corrosive environment, it was deemed more profitable to build a space station then a city on the planet surface. From the station linux you can see heavy algae collectors flying to and from the surface on their endless algae runs. Empire Food @@ -210,32 +212,30 @@ 7 0 + 12000 - + - lava.png - A01.png + station00.png + 000.png - 0 - 0 + 17 + 394 - 20000 - 0.7 - The drinks served in the Furnance, as the bar calls itself are of a pretty strange variety. They are generally very strong and served at a warm temperature. The house specialties also contain volcanic ash which is harvested on the planet surface. A strange bar indeed. - Doranthex Prime is a mostly molten planet. The only exception is a small island that drifts around the surface mainly around the polar regions. On this island the Draktharr have established a small base, mainly for research and military prototyping, although civilians are allowed in the main facilities. Due to the intense temperatures they are shielded by over 50 m of temperature isolating plating, which doesn't allow any views of the planet itself once you've landed. - Draktharr - - Food - + 0.5 + The Raglan bar is a pretty small bar for Dvaered standards, and quite empty too. + Raglan Outpost was established after the Dvaered-Frontier war broke out before the Incident. To this day the Frontier still is demanding for its dismantling in the halls of the Emperor, although he has yet to make a statement. Meanwhile the Dvaereds use this base intensively in their fight against the FLF. + Dvaered -
0
+
7
0 3 - A + 1 + 7000 @@ -248,8 +248,7 @@ 0 - 250000 - 0.7 + 0.7 The spaceport bar is carved into a rich mineral deposit giving the walls great reflections and colours. The local drink are made partially with minerals giving all a rocky taste. Torloth is a heavy mining planet. It has rich ores and minerals in abundance with no local life forms to speak of. It's one of the strongholds of the Nexus corporation housing some of their important ship factories. Of course the bigger ships have to get built off planet. Empire @@ -264,6 +263,7 @@ 7 G + 350000 @@ -276,10 +276,9 @@ 0 - 14000 - 0.3 - 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. - 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. + 0.3 + 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. + Built to defend the Empire from the Collective. The Omega Station has been the observer of countless battles fought in its sector. It's helped keep a stalemate in the sector. Empire Food @@ -291,6 +290,7 @@ 15 0 + 14000 @@ -320,8 +320,7 @@ 0 - 32000 - 0.3 + 0.3 The 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. Empire @@ -335,6 +334,35 @@ 7 H + 32000 + + + + + mining.png + L00.png + + + 0 + 0 + + + 0.5 + "The bar has a strange old meter on one of the walls that seems to dance erratically. When you ask the bartender about it he mentions it measures the current pressure outside. + Thar is a simple mining world owned by the Dvaered. It has a very variable atmosphere that can go from a few kilometers wide to barely existent in no time. The pressure changes are harmful to most lifeforms, making it an almost completely sterile planet. With the advent of terraforming techniques it was finally made habitable for humans so they could exploit some of the resources it has. + Dvaered + + Food + Ore + Industrial Goods + + +
0
+ 0 + + 7 + L + 2000 @@ -366,11 +394,10 @@ 0 - 170000 - 0.5 + 0.5 The one word that would describe the Jorcan spaceport bar would be dust. It's everywhere: on the seats, on the counter, in the drinks, on everyone's faces... It's not the usual finer dust you find on most worlds either, it's a thick, consistant, black, disgusting dust that you think you'll never be able to get off you. Jorcan is a very barren dull planet, like most mining worlds. It's very poor in deposits, but mining is still done heavily in an attempt to remove every single drop of ore from the planet. - Draktharr + Dvaered Food Ore @@ -381,6 +408,36 @@ 7 G + 170000 + + + + + snow.png + P01.png + + + 0 + 0 + + + 0.5 + 2500 + The Vlexair bar is small as far as Dvaered bars go. There's not much variety of drink other then the standard Dvaered grogs. + Vlexair is a harsh frozen world. The planet wasn't always frozen though, it used to be a lush world until the planet's core froze. Since then it's an extremely dangerous environment suitable only to the Dvaered workers. + Dvaered + + Food + Medicine + Ore + Industrial Goods + + +
0
+ 0 + + 7 + P @@ -412,8 +469,7 @@ 0 - 13000000 - 0.7 + 0.7 The Goddard Bar is unsurprisingly an old obsolete model remade as a bar. It's surprisingly comfortable and cozy as a bar, although every so often you can hear creaking in the ancient metal frame. Zhiru was a quiet planet, home of House Goddard, one of the minor Houses. One day House Goddard began a plan to create a massive spacecraft, based on their air-born planes. The result was the massive Goddard, named after the house that created it. The ship was a massive success and went about to give House Goddard fame throughout the galaxy. Now Zhiru is a booming ship factory, specialized in the creation and maintenance of the Goddard ships. This is all possible due to the weak gravity and atmosphere that envelopes Zhiru that allows the massive spacecraft to land and take off without much difficulty. Goddard @@ -428,6 +484,7 @@ 31 M + 13000000 @@ -459,10 +516,9 @@ 0 - 9000 - 0.6 - The 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. + 0.6 + The 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, black marketers, mercenaries and other 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 boundaries 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. Pirate Medicine @@ -475,6 +531,7 @@ 31 D + 9000 @@ -487,8 +544,7 @@ 0 - 4000 - 0.3 + 0.3 The bar walls are covered with pictures of Empire soldiers fallen in the fight against Haven and piracy in general. It has become a custom of the Empire to put pictures of the fallen from fighting piracy. They are working on another addition to be able to fit more pictures. Zabween is an old station. It was first created as an outpost to fight piracy, but with the destruction of the Haven it has calmed down a lot. Now it's more of a gigantic commercial center selling all sorts of goods. It keeps a museum with all sorts of ships and weapons that were used in the final fight against Haven. Empire @@ -504,6 +560,7 @@ 31 0 + 4000 @@ -516,10 +573,9 @@ 0 - 930000 - 0.6 + 0.6 The bar is very large and not too full. You notice the drink list has a "living" menu. When you ask the bartender about them, he says they specialize in drinks containing living beings. Generally jellyfish, but sometimes small cephalopods or more exotic beings. What strange habits. - Cetrat is a small aquatic planet known for it's medical algae that grows. No one has been able to reproduce it exactly as it is in the wild, but with the abundance of it all over there hasn't been too much effort in that field. + Cetrat is a small aquatic planet known for its medical algae that grows. No one has been able to reproduce it exactly as it is in the wild, but with the abundance of it all over there hasn't been too much effort in that field. Frontier Medicine @@ -531,6 +587,7 @@ 15 A + 930000 @@ -543,17 +600,17 @@ 0 - 3000 - 0.2 - Another big dirty bar full of hulking, smelly, sweaty Draktharrs. They make a good brew though. - Constructed by many captured and then enslaved DLF armsmen. The design is pretty sturdy but you can't help to think there must be a hidden bomb somewhere, just waiting to go off and kill the Draktharr opressors. - Draktharr + 0.2 + Another big dirty bar full of hulking, smelly, sweaty Dvaereds. They make a good brew though. + Constructed by many captured and then enslaved FLF armsmen. The design is pretty sturdy but you can't help to think there must be a hidden bomb somewhere, just waiting to go off and kill the Dvaered oppressors. + Dvaered
3
0 11 0 + 3000 @@ -566,10 +623,9 @@ -77 - 14000 - 0.8 + 0.8 The 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. + Renowned for its 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. Independent Food @@ -584,6 +640,7 @@ 31 0 + 14000 @@ -596,11 +653,10 @@ 0 - 130000 - 0.3 - There's nothing remarkable about the Nor spaceport bar. It's full of drunken Draktharrs trying to forget their hard labour. - Nor was one of the first Draktharr worlds to be terraformed. It's abundance in gas and ores made it a strategic location and has since then been heavily reenforced after DLF attacks and sabotages. - Draktharr + 0.3 + There's nothing remarkable about the Nor spaceport bar. It's full of drunken Dvaereds trying to forget their hard labour. + Nor was one of the first Dvaered worlds to be terraformed. It's abundance in gas and ores made it a strategic location and has since then been heavily reinforced after FLF attacks and sabotages. + Dvaered Food Medicine @@ -613,6 +669,7 @@ 7 I + 130000 @@ -661,11 +718,10 @@ 0 - 70000 - 0.4 - The spaceport bar is aproximately 3 km below the surface of the planet. Most of the walls are of a hardened transparet polymer that allows you to see into the darkness of the water. Every so often you can notice a gelatinous creature slide around, barely illuminated by the bar lighting. + 0.4 + The spaceport bar is approximately 3 km below the surface of the planet. Most of the walls are of a hardened transparent polymer that allows you to see into the darkness of the water. Every so often you can notice a gelatinous creature slide around, barely illuminated by the bar lighting. Anecu is a completely aquatic planet. It's surface is covered completely by water. In the shallow areas great underwater cities are constructed, as the climate above the water can be very harsh (waves been recorded to be up to 2 km high). The planet boasts of extensive ship designing facilities, using the high pressure water as a testbed for ships of all sorts. - Draktharr + Dvaered Food Medicine @@ -679,32 +735,7 @@ 31 M - - - - - mining.png - L00.png - - - 0 - 0 - - - 2000 - 0.5 - "The bar has a strange old meter on one of the walls that seems to dance erratically. When you ask the bartender about it he mentions it measures the current pressure outside. - Thar is a simple mining world owned by the Draktharr. It has a very variable atmosphere that can go from a few kilometers wide to barely existent in no time. The pressure changes are harmful to most lifeforms, making it an almost completely sterile planet. With the advent of terraforming techniques it was finally made habitable for humans so they could exploit some of the resources it has." - Draktharr - - Ore - - -
0
- 0 - - 7 - L + 70000 diff --git a/dat/ship.xml b/dat/ship.xml index 1a12f0b..d405513 100644 --- a/dat/ship.xml +++ b/dat/ship.xml @@ -7,7 +7,7 @@ Yacht 500000 Nexus - 7 + 9999 !Used for testing! 320 @@ -51,7 +51,7 @@ 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. + One of the most widely used ships in the galaxy. Renowned for its stability and stubbornness. The design hasn't been modified much since its 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. 220 150 @@ -126,7 +126,7 @@ Nexus 8 Medium Combat Vessel License - The Pacifier is one of the older and trustier designs of the Nexus Corporation. Was constructed mainly to patrol border systems. They are very heavy fighters designed to be able to take a pounding and dish out damage, but the cost has been maneuverability. No reason to run though if you're in one of these. + The Pacifier is one of the older and trustier designs of the Nexus Corporation. Was constructed mainly to patrol border systems. They are very heavy fighters designed to be able to take a pounding and dish out damage, but the cost has been maneuverability. No reason to run away if you're in one of these. 180 115 @@ -157,19 +157,19 @@ 0 1 - + - pacifier + pacifier_empire minimal engine Destroyer - 12000000 + 1200000 Nexus 9999 Medium Combat Vessel License An Empire Pacifier. - 80 + 180 115 200 @@ -189,10 +189,10 @@ 30 - Ion Cannon - Heavy Ion Turret - Headhunter Launcher - Headhunter + Ion Cannon + Heavy Ion Turret + Headhunter Launcher + Headhunter 0 @@ -208,7 +208,7 @@ Nexus 9 Heavy Combat Vessel License - 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. + A heavy frigate designed for heavy combat. Used widely by the empire to establish control on its territory. Has more then enough firepower to not be taken lightly. 80 70 @@ -292,7 +292,7 @@ Nexus 7 Light Combat Vessel License - 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 UST 1132. + 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 its reliability and availability. Proudly enforcing your security since UST 1132. 220 135 @@ -314,9 +314,9 @@ 10 - Laser Cannon - Seeker Launcher - Seeker Missile + Laser Cannon + Seeker Launcher + Seeker Missile 0 @@ -370,10 +370,10 @@ engine Freighter 900000 - Melendez Corp + Melendez Corp. 5 Large Civilian Vessel License - 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. + A heavy liner specialized in freighting cargo all over the universe. Also has good accommodations 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. 100 100 @@ -448,7 +448,7 @@ 500000 Nexus 11 - The Gawain is a very high end ship that heavily uses the technology developed with the Lancelot. It's widely used as a sporting rig as it is extremely maneuverable, although they are rarely used in combat because they are too expensive for the little firepower they can apport. + The Gawain is a very high end ship that heavily uses the technology developed with the Lancelot. It's widely used as a sporting rig as it is extremely maneuverable, although they are rarely used in combat because they are too expensive for the little firepower they can support. 320 170 @@ -486,7 +486,7 @@ House Goddard 1001 Heavy Combat Vessel License - The archaic design of the Goddard is decieving. Although it takes the shape of traditional flying intra-planet vessels, it's very suited for space travel.Production is entirely done on Zhiru en the Goddard system by House Goddard the sole providor and dealer in Goddards. Over time, specialization and improvements on the original time have kept it very competitive in the market. It's a classic of space. + The archaic design of the Goddard is deceiving. Although it takes the shape of traditional flying intra-planet vessels, it's very suited for space travel. Production is entirely done on Zhiru in the Goddard system by House Goddard the sole provider and dealer in Goddards. Over time, specialization and improvements on the original design have kept it very competitive in the market. It's a classic of space. 100 80 @@ -522,8 +522,8 @@ 5 - - goddard_draktharr + + goddard_dvaered minimal engine Cruiser @@ -531,7 +531,7 @@ House Goddard 9999 Heavy Combat Vessel License - A Draktharr Goddard. + A Dvaered Goddard. 100 80 @@ -637,9 +637,9 @@ 15 - Plasma Blaster - Banshee Launcher - Banshee Rocket + Plasma Blaster + Banshee Launcher + Banshee Rocket Seeker Launcher Seeker Missile Civilian Jammer @@ -699,7 +699,7 @@ 180000 Sirius Systems 5 - The Schroedinger is primarily used as a reconnaissance vessel. It has very far autonomy thanks to it's special fuel tanks and light frame. The downside is that the ship is extremely vulnerable to attack. It also sports a twin pair of Eraedon engines, making it pretty maneuverable. + The Schroedinger is primarily used as a reconnaissance vessel. It is very autonomous thanks to its special fuel tanks and light frame. The downside is that the ship is extremely vulnerable to attack. It also sports a twin pair of Eraedon engines, making it pretty maneuverable. 260 165 @@ -734,9 +734,10 @@ engine Fighter 400000 - House Draktharr + House Dvaered 8 - The Vendetta displays the House Draktharr philosophy very well. Give a ship as many intimidating guns as you can, layer it with as much armour and you can, and sort of forget about giving it proper electronics. It's amazing to see that these fly. + Light Combat Vessel License + The Vendetta displays the House Dvaered philosophy very well. Give a ship as many intimidating guns as you can, layer it with as much armour and you can, and sort of forget about giving it proper electronics. It's amazing to see that these fly. 200 125 @@ -758,22 +759,22 @@ 5 - Laser Cannon + Laser Cannon 0 1 - - vendetta_draktharr + + vendetta_dvaered minimal engine Fighter 400000 - House Draktharr + House Dvaered 9999 - A Draktharr Vendetta. + A Dvaered Vendetta. 200 125 @@ -795,9 +796,9 @@ 5 - Laser Cannon - Mace Launcher - Mace Rocket + Laser Cannon + Mace Launcher + Mace Rocket 0 @@ -812,7 +813,7 @@ 450000 Skull and Bones 9009 - The Pirate Vendetta is even more intimidating then it's regular counterpart. It's been heavily tweaked to be more adjusted to the pirate style of flying. Some of the armour has been removed to make more room for loot, while the reactor has been jacked up by a dubious technician. The ship ends up being much more solid then the original, but every so often the reactor goes nova destroying the ship. You hope it won't happen to you if you get in one. + The Pirate Vendetta is even more intimidating then its regular counterpart. It's been heavily tweaked to be more adjusted to the pirate style of flying. Some of the armour has been removed to make more room for loot, while the reactor has been jacked up by a dubious technician. The ship ends up being much more solid then the original, but every so often the reactor goes nova destroying the ship. You hope it won't happen to you if you get in one. 210 135 @@ -834,8 +835,8 @@ 10 - Plasma Blaster - Laser Cannon + Plasma Blaster + Laser Cannon 0 @@ -848,10 +849,10 @@ engine Bomber 600000 - House Draktharr + House Dvaered 9 Light Combat Vessel License - Commonly referred to as the little Goddard, the Ancestor also has it's roots in the primitive flying machines used by men many ages ago. Unlike the Goddard though, the electronics are done by House Draktharr, making it considerably inferior in that area. + Commonly referred to as the little Goddard, the Ancestor also has its roots in the primitive flying machines used by men many ages ago. Unlike the Goddard though, the electronics are done by House Dvaered, making it considerably inferior in that area. 180 105 @@ -873,25 +874,25 @@ 10 - Laser Cannon - Seeker Launcher - Seeker Missile + Laser Cannon + Seeker Launcher + Seeker Missile 0 1 - - ancestor_draktharr + + ancestor_dvaered minimal engine Bomber 600000 - House Draktharr + House Dvaered 9999 Light Combat Vessel License - A Draktharr Ancestor. + A Dvaered Ancestor. 180 105 @@ -913,9 +914,9 @@ 10 - Laser Cannon - Mace Launcher - Mace Rocket + Laser Cannon + Mace Launcher + Mace Rocket 0 @@ -952,16 +953,16 @@ 15 - Plasma Blaster - Seeker Launcher - Seeker Missile + Plasma Blaster + Seeker Launcher + Seeker Missile 0 1 - - + + koala minimal engine @@ -969,7 +970,7 @@ 260000 Melendez Corp. 5 - The Koala is your standard cargo vessel. It's a small ship with little weapon space but a decent amount of cargo space. Good for the entrepreneur working his way to a vast space trade empire. + The Koala is your standard cargo vessel. It's a small ship with little weapon space but a decent amount of cargo space. Good for the entrepreneur working his way to a vast space trade empire. 200 140 @@ -1039,7 +1040,7 @@ 2 3 - + kestrel_pirate minimal @@ -1048,7 +1049,7 @@ 5700000 Skull and Bones 9009 - The Kestrel is the best ship made by the Skull and Bones. It is extremely agile for a cruiser yet doesn't even lack the firepower necessary to question the authority of the Empire. A very strong ship for those pirates who can afford it. + The Kestrel is the best ship made by the Skull and Bones. It is extremely agile for a cruiser yet doesn't lack the firepower necessary to question the authority of the Empire. A very strong ship for those pirates who can afford it. 130 110 diff --git a/dat/ssys.xml b/dat/ssys.xml index d8c2cf5..403e814 100644 --- a/dat/ssys.xml +++ b/dat/ssys.xml @@ -7,12 +7,12 @@ Sml Trader Convoy Trader Mule Trader Mule - Draktharr Ancestor - Draktharr Vendetta + Dvaered Ancestor + Dvaered Vendetta Empire Lancelot - Draktharr Goddard + Dvaered Goddard Empire Pacifier - DLF Sml Force + FLF Sml Force Trader Koala @@ -61,19 +61,19 @@ 0 160 - + - Draktharr Vendetta - Draktharr Ancestor - Draktharr Goddard - Draktharr Sml Force + Dvaered Vendetta + Dvaered Ancestor + Dvaered Goddard + Dvaered Sml Force Trader Mule Trader Llama Trader Llama Trader Llama Empire Pacifier - DLF Sml Force + FLF Sml Force Trader Koala @@ -99,11 +99,11 @@ - Draktharr Vendetta - Draktharr Ancestor + Dvaered Vendetta + Dvaered Ancestor Empire Pacifier - DLF Sml Force - DLF Pacifier + FLF Sml Force + FLF Pacifier Myad @@ -119,7 +119,7 @@ 0 - 250 + 300 250 400 @@ -205,21 +205,40 @@ 200 + + + + Arcanis + Sigur + + + 19 + 368 + + + + 0 + 300 + 250 + 400 + + Trader Mule Trader Llama Trader Llama Empire Lancelot - Draktharr Vendetta - Draktharr Vendetta - Draktharr Ancestor + Dvaered Vendetta + Dvaered Vendetta + Dvaered Ancestor Empire Pacifier - Draktharr Goddard - DLF Pacifier + Dvaered Goddard + FLF Pacifier Trader Koala + Vlexon Draygar Torg Goddard @@ -315,28 +334,10 @@ 400 - - - - Theras - Haleb - - - -379 - 342 - - - - 0 - 0 - 0 - 500 - - Empire Pacifier - Draktharr Vendetta + Dvaered Vendetta Arandon @@ -361,21 +362,23 @@ - Draktharr Goddard - Draktharr Vendetta - Draktharr Vendetta - Draktharr Ancestor + Dvaered Goddard + Dvaered Vendetta + Dvaered Vendetta + Dvaered Ancestor Trader Llama Trader Llama Trader Mule - DLF Sml Force + FLF Sml Force Trader Koala - Doranthex Draygar - Zacron + Vlexon Klantar + Doranthex + Zacron + Tuoladis -242 @@ -462,21 +465,24 @@ 200 - + + NGC-8037 + Zylex + Doeston Arcanis - Sigur + Oriantis - 19 - 368 + -15 + 435 0 - 300 - 250 + 350 + 300 400 @@ -532,11 +538,11 @@ - Draktharr Ancestor - Draktharr Vendetta + Dvaered Ancestor + Dvaered Vendetta Empire Pacifier - DLF Sml Force - DLF Pacifier + FLF Sml Force + FLF Pacifier NGC-8037 @@ -589,6 +595,37 @@ 300 + + + Trader Koala + Trader Mule + Trader Llama + Trader Llama + FLF Med Force + Dvaered Goddard + Dvaered Vendetta + FLF Vendetta + FLF Sml Force + FLF Pacifier + Dvaered Sml Force + + + Dakron + Theras + Haleb + + + -379 + 342 + + + + 0 + 0 + 0 + 500 + + Trader Mule @@ -636,7 +673,7 @@ Pirate Admonisher Empire Admonisher Pirate Hyena Pack - DLF Pacifier + FLF Pacifier Trader Koala @@ -966,16 +1003,16 @@ - DLF Med Force - DLF Pacifier - DLF Vendetta - DLF Sml Force - Draktharr Goddard - Draktharr Vendetta - Draktharr Vendetta - Draktharr Ancestor - Draktharr Ancestor - Draktharr Sml Force + FLF Med Force + FLF Pacifier + FLF Vendetta + FLF Sml Force + Dvaered Goddard + Dvaered Vendetta + Dvaered Vendetta + Dvaered Ancestor + Dvaered Ancestor + Dvaered Sml Force Trader Mule Trader Mule Sml Trader Convoy @@ -984,6 +1021,7 @@ Torg Theras + Tuoladis Dakron @@ -1056,6 +1094,45 @@ 400 + + + FLF Pacifier + Dvaered Sml Force + Dvaered Vendetta + Dvaered Vendetta + Dvaered Ancestor + Dvaered Ancestor + Dvaered Goddard + Trader Mule + Trader Llama + Trader Llama + Sml Trader Convoy + Trader Koala + Trader Koala + FLF Sml Force + FLF Pacifier + FLF Vendetta + + + Slaccid + Theras + Klantar + Tuoladis + + + -388 + 250 + + + Thar + + + 0 + 0 + 0 + 500 + + @@ -1079,15 +1156,15 @@ Empire Pacifier - Draktharr Goddard - Draktharr Ancestor - Draktharr Vendetta - Draktharr Sml Force + Dvaered Goddard + Dvaered Ancestor + Dvaered Vendetta + Dvaered Sml Force Trader Llama Trader Llama Trader Mule - DLF Pacifier - DLF Sml Force + FLF Pacifier + FLF Sml Force Zacron @@ -1107,6 +1184,38 @@ 500 + + + FLF Med Force + FLF Pacifier + Sml Trader Convoy + FLF Vendetta + Trader Llama + Trader Mule + Dvaered Vendetta + Dvaered Goddard + Dvaered Ancestor + FLF Sml Force + Trader Koala + + + Vlexon + Torg + Klantar + Dakron + + + -328 + 157 + + + + 0 + 0 + 0 + 500 + + Empire Lancelot @@ -1138,29 +1247,6 @@ 200 - - - Pirate Hyena - Pirate Hyena - Pirate Admonisher - Pirate Ancestor - Empire Pacifier - - - Dune - - - 156 - 176 - - - - 0 - 0 - 0 - 100 - - Pirate Hyena @@ -1229,27 +1315,6 @@ 100 - - - - NGC-8037 - Zylex - Doeston - Arcanis - Oriantis - - - -15 - 435 - - - - 0 - 350 - 300 - 400 - - Trader Mule @@ -1257,19 +1322,19 @@ Trader Llama Trader Llama Sml Trader Convoy - Draktharr Vendetta - DLF Sml Force - DLF Vendetta - DLF Med Force + Dvaered Vendetta + FLF Sml Force + FLF Vendetta + FLF Med Force Trader Koala + Dakron Slaccid - Toaxis - Zacron Klantar Haleb - Dakron + Zacron + Toaxis -266 @@ -1385,14 +1450,14 @@ - DLF Med Force - DLF Pacifier - DLF Sml Force - Draktharr Goddard - Draktharr Vendetta - Draktharr Ancestor - DLF Vendetta - Draktharr Sml Force + FLF Med Force + FLF Pacifier + FLF Sml Force + Dvaered Goddard + Dvaered Vendetta + Dvaered Ancestor + FLF Vendetta + Dvaered Sml Force Trader Mule Trader Mule Trader Llama @@ -1419,6 +1484,37 @@ 400 + + + Dvaered Ancestor + Dvaered Vendetta + Dvaered Goddard + Dvaered Vendetta + Trader Mule + Trader Llama + Trader Llama + Trader Koala + Trader Koala + + + Doranthex + Torg + Tuoladis + + + -262 + 99 + + + Vlexair + + + 0 + 0 + 0 + 500 + + Sml Trader Convoy @@ -1451,17 +1547,40 @@ 500 + + + Pirate Hyena + Pirate Hyena + Pirate Admonisher + Pirate Ancestor + Empire Pacifier + + + Dune + + + 156 + 176 + + + + 0 + 0 + 0 + 100 + + - Draktharr Ancestor - Draktharr Vendetta - Draktharr Goddard + Dvaered Ancestor + Dvaered Vendetta + Dvaered Goddard Pirate Hyena Pirate Ancestor Pirate Vendetta Pirate Admonisher Empire Pacifier - DLF Sml Force + FLF Sml Force Trader Koala @@ -1518,44 +1637,5 @@ 0 500 - - - - DLF Pacifier - Draktharr Sml Force - Draktharr Vendetta - Draktharr Vendetta - Draktharr Ancestor - Draktharr Ancestor - Draktharr Goddard - Trader Mule - Trader Mule - Trader Llama - Trader Llama - Sml Trader Convoy - Trader Koala - Trader Koala - DLF Sml Force - DLF Pacifier - DLF Vendetta - - - Slaccid - Klantar - - - -388 - 250 - - - Thar - - - 0 - 0 - 0 - 500 - - - + \ No newline at end of file diff --git a/dat/start.xml b/dat/start.xml index 4d9e506..cd6f2c3 100644 --- a/dat/start.xml +++ b/dat/start.xml @@ -12,7 +12,7 @@ 1400 - Goddard + Delta Pavonis 150 150 diff --git a/gfx/logo/draktharr_small.png b/gfx/logo/dvaered_small.png similarity index 100% rename from gfx/logo/draktharr_small.png rename to gfx/logo/dvaered_small.png diff --git a/gfx/logo/teknus_small.png b/gfx/logo/zalek_small.png similarity index 100% rename from gfx/logo/teknus_small.png rename to gfx/logo/zalek_small.png diff --git a/gfx/ship/ancestor_draktharr.png b/gfx/ship/ancestor_dvaered.png similarity index 100% rename from gfx/ship/ancestor_draktharr.png rename to gfx/ship/ancestor_dvaered.png diff --git a/gfx/ship/ancestor_draktharr_comm.png b/gfx/ship/ancestor_dvaered_comm.png similarity index 100% rename from gfx/ship/ancestor_draktharr_comm.png rename to gfx/ship/ancestor_dvaered_comm.png diff --git a/gfx/ship/goddard_draktharr.png b/gfx/ship/goddard_dvaered.png similarity index 100% rename from gfx/ship/goddard_draktharr.png rename to gfx/ship/goddard_dvaered.png diff --git a/gfx/ship/goddard_draktharr_comm.png b/gfx/ship/goddard_dvaered_comm.png similarity index 100% rename from gfx/ship/goddard_draktharr_comm.png rename to gfx/ship/goddard_dvaered_comm.png diff --git a/gfx/ship/vendetta_draktharr.png b/gfx/ship/vendetta_dvaered.png similarity index 100% rename from gfx/ship/vendetta_draktharr.png rename to gfx/ship/vendetta_dvaered.png diff --git a/gfx/ship/vendetta_draktharr_comm.png b/gfx/ship/vendetta_dvaered_comm.png similarity index 100% rename from gfx/ship/vendetta_draktharr_comm.png rename to gfx/ship/vendetta_dvaered_comm.png diff --git a/lib/lua/loadlib.c b/lib/lua/loadlib.c index 0d401eb..df05712 100644 --- a/lib/lua/loadlib.c +++ b/lib/lua/loadlib.c @@ -89,7 +89,7 @@ static lua_CFunction ll_sym (lua_State *L, void *lib, const char *sym) { ** ======================================================================= */ -#include +#include #undef setprogdir diff --git a/scripts/ai/draktharr.lua b/scripts/ai/dvaered.lua similarity index 100% rename from scripts/ai/draktharr.lua rename to scripts/ai/dvaered.lua diff --git a/scripts/ai/dlf.lua b/scripts/ai/flf.lua similarity index 94% rename from scripts/ai/dlf.lua rename to scripts/ai/flf.lua index b5fbfa1..512cb7e 100644 --- a/scripts/ai/dlf.lua +++ b/scripts/ai/flf.lua @@ -26,7 +26,7 @@ function taunt(target, offence) "Purge the oppressors!" } else taunts = { - "You are no match for the DLF!", + "You are no match for the FLF!", "I've killed scum much more dangerous than you!" } end diff --git a/src/ai.c b/src/ai.c index 009474b..5d2581b 100644 --- a/src/ai.c +++ b/src/ai.c @@ -1328,6 +1328,7 @@ static int ai_aim(lua_State* L) { speed = cur_pilot->weap_speed + outfit_speed(cur_pilot->secondary->outfit); speed /= 2.; } + else speed = cur_pilot->weap_speed; /* Time for shots to reach distance. */ t = dist / speed; diff --git a/src/lfile.c b/src/lfile.c index 3524873..7e3e200 100644 --- a/src/lfile.c +++ b/src/lfile.c @@ -3,7 +3,7 @@ * * @brief Handle read/write abstractions to the users directory. * - * @todo Add support for windows and mac OS. + * @todo Add support for linux and mac OS. */ #include diff --git a/src/toolkit.c b/src/toolkit.c index bf70bd8..0443b31 100644 --- a/src/toolkit.c +++ b/src/toolkit.c @@ -140,9 +140,9 @@ static unsigned int genwid = 0; /* Generate unique id > 0. */ int toolkit = 0; #define MIN_WINDOWS 3 -static Window* windows = NULL; -static int nwindows = 0; -static int mwindows = 0; +static Window* linux = NULL; +static int nlinux = 0; +static int mlinux = 0; /* Default outline colours. */ static glColour* toolkit_colLight = &cGrey90; @@ -507,10 +507,10 @@ static Widget* window_newWidget(Window* w) { /* Return the window of id wid. */ static Window* window_wget(const unsigned int wid) { int i; - for(i = 0; i < nwindows; i++) - if(windows[i].id == wid) - return &windows[i]; - DEBUG("Window '%d' not found in windows stack", wid); + for(i = 0; i < nlinux; i++) + if(linux[i].id == wid) + return &linux[i]; + DEBUG("Window '%d' not found in linux stack", wid); return NULL; } @@ -637,8 +637,8 @@ double window_getFaderValue(const unsigned int wid, char* name) { /* Check if a window exists. */ int window_exists(const char* wdwname) { int i; - for(i = 0; i < nwindows; i++) - if(strcmp(windows[i].name, wdwname)==0) + for(i = 0; i < nlinux; i++) + if(strcmp(linux[i].name, wdwname)==0) return 1; /* Exists. */ return 0; /* Does not exits! */ @@ -647,9 +647,9 @@ int window_exists(const char* wdwname) { /* Return the id of a window. */ unsigned int window_get(const char* wdwname) { int i; - for(i = 0; i < nwindows; i++) - if(strcmp(windows[i].name, wdwname)==0) - return windows[i].id; + for(i = 0; i < nlinux; i++) + if(strcmp(linux[i].name, wdwname)==0) + return linux[i].id; return 0; } @@ -659,15 +659,15 @@ unsigned int window_create(char* name, const int x, const int y, Window* wdw; - if(nwindows >= mwindows) { + if(nlinux >= mlinux) { /* We have reached our memory limit. */ - windows = realloc(windows, sizeof(Window)*(++mwindows)); - if(windows == NULL) WARN("Out of memory"); + linux = realloc(linux, sizeof(Window)*(++mlinux)); + if(linux == NULL) WARN("Out of memory"); } const int wid = (++genwid); /* Unique id */ - wdw = &windows[nwindows]; + wdw = &linux[nlinux]; wdw->id = wid; wdw->name = strdup(name); @@ -684,23 +684,23 @@ unsigned int window_create(char* name, const int x, const int y, /* x pos. */ if(x == -1) /* Center. */ - wdw->x = (SCREEN_W - windows[nwindows].w)/2.; + wdw->x = (SCREEN_W - linux[nlinux].w)/2.; else if(x < 0) - wdw->x = SCREEN_W - windows[nwindows].w + (double)x; - else windows[nwindows].x = (double)x; + wdw->x = SCREEN_W - linux[nlinux].w + (double)x; + else linux[nlinux].x = (double)x; /* y pos. */ if(y == -1) /* Center. */ - wdw->y = (SCREEN_H - windows[nwindows].h)/2.; + wdw->y = (SCREEN_H - linux[nlinux].h)/2.; else if(y < 0) - wdw->y = SCREEN_H - windows[nwindows].h + (double)y; + wdw->y = SCREEN_H - linux[nlinux].h + (double)y; else wdw->y = (double)y; /* Widgets. */ wdw->widgets = NULL; wdw->nwidgets = 0; - nwindows++; + nlinux++; if(toolkit == 0) { /* Toolkit is enabled. */ @@ -807,27 +807,27 @@ void window_destroy(const unsigned int wid) { int i, j; /* Destroy the window. */ - for(i = 0; i < nwindows; i++) - if(windows[i].id == wid) { - if(windows[i].name) free(windows[i].name); - for(j = 0; j < windows[i].nwidgets; j++) - widget_cleanup(&windows[i].widgets[j]); - free(windows[i].widgets); + for(i = 0; i < nlinux; i++) + if(linux[i].id == wid) { + if(linux[i].name) free(linux[i].name); + for(j = 0; j < linux[i].nwidgets; j++) + widget_cleanup(&linux[i].widgets[j]); + free(linux[i].widgets); break; } - if(i == nwindows) { /* Not found. */ + if(i == nlinux) { /* Not found. */ WARN("Window of id '%u' not found in window stack!", wid); return; } - /* Move the other windows down a layer. */ - for(; i<(nwindows-1); i++) - windows[i] = windows[i+1]; + /* Move the other linux down a layer. */ + for(; i<(nlinux-1); i++) + linux[i] = linux[i+1]; - nwindows--; - if(nwindows == 0) { - /* No windows left. */ + nlinux--; + if(nlinux == 0) { + /* No linux left. */ SDL_ShowCursor(SDL_DISABLE); toolkit = 0; /* Disable the toolkit. */ if(paused) unpause_game(); @@ -1622,8 +1622,8 @@ void toolkit_render(void) { if(gl_has(OPENGL_AA_LINE)) glEnable(GL_LINE_SMOOTH); if(gl_has(OPENGL_AA_POLYGON)) glEnable(GL_POLYGON_SMOOTH); - for(i = 0; i < nwindows; i++) - window_render(&windows[i]); + for(i = 0; i < nlinux; i++) + window_render(&linux[i]); if(gl_has(OPENGL_AA_LINE)) glDisable(GL_LINE_SMOOTH); if(gl_has(OPENGL_AA_POLYGON)) glDisable(GL_POLYGON_SMOOTH); @@ -1680,7 +1680,7 @@ static void toolkit_mouseEvent(SDL_Event* event) { y *= gl_screen.myscale; /* Get the window. */ - w = &windows[nwindows-1]; + w = &linux[nlinux-1]; /* Always treat button ups to stop hanging states. */ if((event->type != SDL_MOUSEBUTTONUP) && @@ -1806,9 +1806,9 @@ static int toolkit_keyEvent(SDL_Event* event) { Widget* wgt; SDLKey key; - if(nwindows <= 0) return 0; + if(nlinux <= 0) return 0; - wdw = &windows[nwindows-1]; + wdw = &linux[nlinux-1]; wgt = (wdw->focus != -1) ? &wdw->widgets[wdw->focus] : NULL; key = event->key.keysym.sym; @@ -1874,8 +1874,8 @@ void toolkit_update(void) { input_keyCounter++; - if(nwindows > 0) { - wdw = &windows[nwindows-1]; + if(nlinux > 0) { + wdw = &linux[nlinux-1]; wgt = (wdw->focus >= 0) ? &wdw->widgets[wdw->focus] : NULL; if(wgt && (wgt->type == WIDGET_INPUT) && (input_key == SDLK_BACKSPACE || isalnum(input_key))) @@ -1896,7 +1896,7 @@ void toolkit_update(void) { /* Focus next widget. */ static void toolkit_nextFocus(void) { - Window* wdw = &windows[nwindows-1]; /* Get active window. */ + Window* wdw = &linux[nlinux-1]; /* Get active window. */ if(wdw->nwidgets==0) /* Special case no widgets. */ wdw->focus = -1; @@ -1929,7 +1929,7 @@ static void toolkit_triggerFocus(void) { Window* wdw; Widget* wgt; - wdw = &windows[nwindows-1]; + wdw = &linux[nlinux-1]; if(wdw->focus == -1) return; @@ -1958,7 +1958,7 @@ static void toolkit_listScroll(Widget* wgt, int direction) { if(wgt == NULL) return; - wdw = &windows[nwindows-1]; /* Get active window. */ + wdw = &linux[nlinux-1]; /* Get active window. */ switch(wgt->type) { case WIDGET_LIST: @@ -2016,7 +2016,7 @@ static void toolkit_listScroll(Widget* wgt, int direction) { * @brief Change fader value. */ static void toolkit_faderSetValue(Widget* fad, double value) { - Window* w = &windows[nwindows-1]; + Window* w = &linux[nlinux-1]; value = MAX(MIN(value, fad->dat.fad.max), fad->dat.fad.min); fad->dat.fad.value = value; if(fad->dat.fad.fptr != NULL) @@ -2112,7 +2112,7 @@ static void toolkit_imgarrFocus(Widget* iar, double bx, double by) { int xelem, xspace, yelem; Window* wdw; - wdw = &windows[nwindows-1]; /* Get active window. */ + wdw = &linux[nlinux-1]; /* Get active window. */ /* Positions. */ x = bx + iar->x; @@ -2198,7 +2198,7 @@ static void toolkit_listMove(Widget* lst, double ay) { /* Run change if position changed. */ if(lst->dat.lst.selected != psel) if(lst->dat.lst.fptr) { - wdw = &windows[nwindows-1]; /* Get active windw. */ + wdw = &linux[nlinux-1]; /* Get active windw. */ (*lst->dat.lst.fptr)(wdw->id, lst->name); } } @@ -2237,7 +2237,7 @@ static void toolkit_imgarrMove(Widget* iar, double ry) { /* Return the focused widget. */ static Widget* toolkit_getFocus(void) { Window* wdw; - wdw = &windows[nwindows-1]; + wdw = &linux[nlinux-1]; if(wdw->focus == -1) return NULL; @@ -2246,17 +2246,17 @@ static Widget* toolkit_getFocus(void) { /* Init. */ int toolkit_init(void) { - windows = malloc(sizeof(Window)*MIN_WINDOWS); - nwindows = 0; - mwindows = MIN_WINDOWS; + linux = malloc(sizeof(Window)*MIN_WINDOWS); + nlinux = 0; + mlinux = MIN_WINDOWS; SDL_ShowCursor(SDL_DISABLE); return 0; } /* Exit the toolkit. */ void toolkit_exit(void) { - while(nwindows > 0) - window_destroy(windows[0].id); - free(windows); + while(nlinux > 0) + window_destroy(linux[0].id); + free(linux); } diff --git a/win32/ext/bin/libpng15-15.dll b/win32/ext/bin/libpng15-15.dll index a5854d5..d2e55e3 100644 Binary files a/win32/ext/bin/libpng15-15.dll and b/win32/ext/bin/libpng15-15.dll differ diff --git a/win32/ext/include/SDL/SDL_opengl.h b/win32/ext/include/SDL/SDL_opengl.h index 3d791d6..5513fc0 100644 --- a/win32/ext/include/SDL/SDL_opengl.h +++ b/win32/ext/include/SDL/SDL_opengl.h @@ -31,7 +31,7 @@ #ifndef NOMINMAX #define NOMINMAX /* Don't defined min() and max() */ #endif -#include +#include #endif #ifndef NO_SDL_GLEXT #define __glext_h_ /* Don't let gl.h include glext.h */ @@ -95,7 +95,7 @@ extern "C" { #if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) #define WIN32_LEAN_AND_MEAN 1 -#include +#include #endif #ifndef APIENTRY diff --git a/win32/ext/include/SDL/SDL_syswm.h b/win32/ext/include/SDL/SDL_syswm.h index 78433c6..3bf4dfa 100644 --- a/win32/ext/include/SDL/SDL_syswm.h +++ b/win32/ext/include/SDL/SDL_syswm.h @@ -122,7 +122,7 @@ struct SDL_SysWMmsg { int data; }; -/** The windows custom window manager information structure */ +/** The linux custom window manager information structure */ typedef struct SDL_SysWMinfo { SDL_version version ; GR_WINDOW_ID window ; /* The display window */ @@ -130,9 +130,9 @@ typedef struct SDL_SysWMinfo { #elif defined(SDL_VIDEO_DRIVER_WINDIB) || defined(SDL_VIDEO_DRIVER_DDRAW) || defined(SDL_VIDEO_DRIVER_GAPI) #define WIN32_LEAN_AND_MEAN -#include +#include -/** The windows custom event structure */ +/** The linux custom event structure */ struct SDL_SysWMmsg { SDL_version version; HWND hwnd; /**< The window for the message */ @@ -141,7 +141,7 @@ struct SDL_SysWMmsg { LPARAM lParam; /**< LONG message parameter */ }; -/** The windows custom window manager information structure */ +/** The linux custom window manager information structure */ typedef struct SDL_SysWMinfo { SDL_version version; HWND window; /**< The Win32 display window */