Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' of git://github.com/bobbens/naev

  • Loading branch information...
commit 183dee5470af9dec77ddf42dd133163785b57d71 2 parents 8c01b01 + dc74c3c
@Deiz authored
View
2  dat/assets/chucrchill_ii.xml → dat/assets/churchill_ii.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<asset name="Chucrchill II">
+<asset name="Churchill II">
<pos>
<x>-22400.000000</x>
<y>-8820.000000</y>
View
2  dat/assets/inss3.xml
@@ -26,7 +26,7 @@
<commodities>
<commodity>Food</commodity>
</commodities>
- <description>Somehwat curiously, Imperial Nutrient Supply Station 3 is actually owned by House Dvaered. Though initially constructed by the Empire, the station was ceded to House Dvaered as part of its official inception. INSS-3 still provides food for the Imperial colonies at Tau Prime and Draconis, though the price of food there has gone up by a fair margin ever since the change in ownership.</description>
+ <description>Somewhat curiously, Imperial Nutrient Supply Station 3 is actually owned by House Dvaered. Though initially constructed by the Empire, the station was ceded to House Dvaered as part of its official inception. INSS-3 still provides food for the Imperial colonies at Tau Prime and Draconis, though the price of food there has gone up by a fair margin ever since the change in ownership.</description>
<bar>The bar is not much to speak of. The Dvaered have shown a greater interest in farming than in public relations, so the spaceport bar has been largely neglected. It's a wonder the basic facilities are even functional at all.</bar>
</general>
</asset>
View
4 dat/assets/three_and_a_half_kings.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<asset name="Three and a half Kings">
+<asset name="Three and a Half Kings">
<pos>
<x>-19071.692886</x>
<y>12147.629022</y>
@@ -28,7 +28,7 @@
<commodities>
<commodity>Industrial Goods</commodity>
</commodities>
- <description>It's a nickname, of course. How could it not be? Trouble is, nobody remembers where the name came from, and, bizarrely, there are no records of the station's original name. It's quite a famous story, both within Hekaras and elsewhere. Meanwhile, all involved simply call it Three and a half Kings. It seems to work for them.</description>
+ <description>It's a nickname, of course. How could it not be? Trouble is, nobody remembers where the name came from, and, bizarrely, there are no records of the station's original name. It's quite a famous story, both within Hekaras and elsewhere. Meanwhile, all involved simply call it Three and a Half Kings. It seems to work for them.</description>
<bar>This is a typical stationside bar. It has viewports looking into space, which are of course ignored by everyone, since anyone who comes to a station like this has seen all the space they could possibly want to.</bar>
</general>
<tech>
View
2  dat/assets/vertigo.xml
@@ -28,7 +28,7 @@
<commodity>Food</commodity>
<commodity>Industrial Goods</commodity>
</commodities>
- <description>Vertigo is the second moon orbiting Nartur IV. While the rock itself is utterly uninteresting, it's Nartur's first moon that is. It is a semi-fluid sphere of valuable mineral that often gets used in hyperdrives. Vertigo is the closest place where a harvesting base can be set up, short of building a whole new starbase.</description>
+ <description>Vertigo is the second moon orbiting Nartur IV. While the rock itself is utterly uninteresting, Nartur's first moon is anything but. It is a semi-fluid sphere of valuable mineral that often gets used in hyperdrives. Vertigo is the closest place where a harvesting base can be set up, short of building a whole new starbase.</description>
<bar>Vertigo's spaceport bar has an excellent view of Nartur IV and IVa. Depending on the phase of the various orbital cycles, it can be quite a fetching sight. Of course, some of the time there's very little to see at all.</bar>
</general>
</asset>
View
2  dat/assets/waterholes_moon.xml
@@ -28,6 +28,6 @@
<commodity>Food</commodity>
</commodities>
<description>In the days of the Old Empire, Waterhole was the farthest outpost of the Empire. To the Imperials, it was the last outpost of civilization, the last bastion of safety before venturing out into the systems beyond. It is because of this that Waterhole, the system and the planet, derive their names. Now, centuries later, Waterhole remains at the border of Empire space. It is still the last stop for traders venturing out, and the first of those coming in.</description>
- <bar>Waterhole's moon wouldn't be Waterhole's moon if its bar wasn't called The Waterhole. Though the place is open to visitors from all origins and walks of life, the majority of the clientele is Imperial in nature. It seems that nothing creates a longing for home like being away from it for prolonged periods of time.</bar>
+ <bar>Waterhole's Moon wouldn't be Waterhole's Moon if its bar wasn't called The Waterhole. Though the place is open to visitors from all origins and walks of life, the majority of the clientele is Imperial in nature. It seems that nothing creates a longing for home like being away from it for prolonged periods of time.</bar>
</general>
</asset>
View
4 dat/events/neutral/baron_flintley.lua
@@ -8,7 +8,7 @@ if lang == "es" then
else -- default english
desc = "Flintley is here. He nervously sips from his drink, clearly uncomfortable in this environment."
title = "Flintley"
- text = [[ Flintly greets you, relieved to see a friendly face. "Hello again, %s. What brings you here today? As you can see, I'm here on business again. Nothing too interesting, I'm afraid, just everyday stuff."
+ text = [[ Flintley greets you, relieved to see a friendly face. "Hello again, %s. What brings you here today? As you can see, I'm here on business again. Nothing too interesting, I'm afraid, just everyday stuff."
You spend some time chatting with Flintley, then you get back to work.]]
end
@@ -18,4 +18,4 @@ end
function flintley()
tk.msg(title, text:format(player.name()))
-end
+end
View
2  dat/events/neutral/derelict.lua
@@ -39,7 +39,7 @@ else -- default english
btitle = "Oh no!"
btext = {}
btext[1] = [[The moment you affix your boarding clamp to the derelect ship, it triggers a boobytrap! The derelict explodes, severely damaging your ship. You escaped death this time, but it was a close call!]]
- btext[2] = [[You board the derelict ship and search its interior, but you find nothing. When you return to your ship, however, it turns out there were Space Leeches onboard the derelict - and they've now attacked themselves to your ship! You scorch them off with a plasma torch, but it's too late. The little buggers have already drunk all of your fuel. You're not jumping anywhere until you find some more!]]
+ btext[2] = [[You board the derelict ship and search its interior, but you find nothing. When you return to your ship, however, it turns out there were Space Leeches onboard the derelict - and they've now attached themselves to your ship! You scorch them off with a plasma torch, but it's too late. The little buggers have already drunk all of your fuel. You're not jumping anywhere until you find some more!]]
btext[3] = [[You affix your boarding clamp and walk aboard the derelict ship. You've only spent a couple of minutes searching the interior when there is a proximity alarm from your ship! Pirates are closing on your position! Clearly this derelict was a trap! You run back onto your ship and prepare to unboard, but you've lost precious time. The pirates are already in firing range...]]
--=== MISSION EVENTS ===--
View
2  dat/events/tutorial/tutorial-discovery.lua
@@ -16,7 +16,7 @@ Open your system map (%s key).]]
message3 = [[You're looking at the system map for this system. But it appears empty! This is because at the moment, your sensors haven't picked up anything yet. The interference is too strong to see anything from here.
A marker has been placed on your map. Navigate toward it. Remember, you can right-click on a location to get there faster.]]
- message4 = [[Something just happened. You discovered a planet in this system, it's called Tein. Planets are the biggest objects you'll encounter in any system, so you will usually discover them before anything else.
+ message4 = [[Something just happened. You discovered a planet in this system, called Tein. Planets are the biggest objects you'll encounter in any system, so you will usually discover them before anything else.
Keep going.]]
message5 = [[You've discovered something else, Tein's moon Rein. Moons are a lot smaller than planets and are therefore harder to detect.
View
2  dat/events/tutorial/tutorial-heat.lua
@@ -33,7 +33,7 @@ Heat is also reset to the base level when you land. So every time you take off,
There is a third way to lose heat, however.]]
message6 = [[Every ship has the ability to go into a special cooling mode called Active Cooldown. When in Active Cooldown, ships rapidly lose their heat. By the end of the cooldown cycle, the ship and all its outfits will have cooled to the galactic base temperature.
-Let's try this now. Enter Active Cooldown mode by pressing %s. If you are moving, you may have to brake to a near stop first.]]
+Let's try this now. Enter Active Cooldown mode by pressing %s. If you are moving, you will automatically brake to a stop.]]
message7 = [[You are now in Active Cooldown mode. You will see a progress bar above your ship. It is slowly draining. When the bar is completely empty, your ship will have cooled down. Don't touch any of the controls, or Active Cooldown will be canceled and you will have to restart it.
Wait for your ship to cool. Keep a close eye on the temperature of your ship!]]
View
2  dat/events/tutorial/tutorial-planet.lua
@@ -17,7 +17,7 @@ To access the more interesting facilities on Paul 2, you will need to click on t
Select any tab now to view a short explanation on what you can do there. Once you have seen enough, press the takeoff button to end this tutorial.]]
message3 = [[This is the outfit seller. Here you may buy and sell things such as weapons, ship upgrades and ammunition. Note that you need to visit the equipment facility to actually install most outfits into your ship.
-A particular item of interest that most outfit sellers will carry is the star map. Buying a star map will give you information remote systems and their jump points, so it's a useful item when you're just starting out.]]
+A particular item of interest that most outfit sellers will carry is the star map. Buying a star map will give you information on remote systems and their jump points, so it's a useful item when you're just starting out.]]
message4 = [[This is the spaceport bar. Here you may find people who are interested in giving you missions. You will also see a news feed on the right of the screen. You can approach patrons by clicking on their portrait and then clicking on the "approach" button.
There are no mission givers here at the moment. Missions are explained in more detail in another tutorial.]]
View
6 dat/missions/baron/baron_prince.lua
@@ -60,18 +60,18 @@ else -- default english
title[9] = "This is not the artefact you're looking for"
- text[12] = [[ "Let's see what we have here," Flintly says as you hand him the artefact you bought on %s. "Ah, I know what this is without even looking anything up. It's a piece of an old-fashioned airlock mechanism, as used on most ships during the Faction Wars. That makes it rather old, but that also makes it worthless, I'm afraid. This is just old scrap." He gives you an apologetic look. "Don't let it get you down. Not many people would know this on first sight. Those scammers can be pretty clever."
+ text[12] = [[ "Let's see what we have here," Flintley says as you hand him the artefact you bought on %s. "Ah, I know what this is without even looking anything up. It's a piece of an old-fashioned airlock mechanism, as used on most ships during the Faction Wars. That makes it rather old, but that also makes it worthless, I'm afraid. This is just old scrap." He gives you an apologetic look. "Don't let it get you down. Not many people would know this on first sight. Those scammers can be pretty clever."
You feel disappointed and frustrated, but you have no choice but to deposit the "artefact" into the nearest disintegrator inlet.]]
text[13] = [[ You hand Flintley the artefact you procured on %s. He examines it for a few moments, then enters a few queries in the info terminal in his table. Once he has found what he was looking for, he heaves a sigh. "I'm sorry, %s. It seems you've been had. What you've got here is little more than a trinket. It's a piece of 'art' created by a third-rank sculptress named Biena Gharibri who lives on Lapra. She's not very talented, I'm afraid. Her creations have been called 'worse than Dvaered opera' by a leading art critic. I really don't think you want to present his lordship with this."
You promptly decide to dispose of the thing, unwilling to carry it around with you a moment longer than necessary.]]
- text[14] = [[ Flintly studies the object on the table for a while, checking the online database a number of times in the process. Then, finally, he turns to you. "I hate to say this, but it seems you've bought a counterfeit. It's a good one, though! That seller on %s must have known his stuff. You see, this is very similar to a number plate used by hovercars on Mars at the time of the Second Growth. However, it's missing a number of vital characteristics, and some details betray its recent manufacture. Close, %s, close. But no cigar."
+ text[14] = [[ Flintley studies the object on the table for a while, checking the online database a number of times in the process. Then, finally, he turns to you. "I hate to say this, but it seems you've bought a counterfeit. It's a good one, though! That seller on %s must have known his stuff. You see, this is very similar to a number plate used by hovercars on Mars at the time of the Second Growth. However, it's missing a number of vital characteristics, and some details betray its recent manufacture. Close, %s, close. But no cigar."
You dispose of the counterfeit artefact. Hopefully the next one will be what Sauterfeldt is looking for...]]
flintdeftitle = "Just passing through"
- flintdeftext = [[ Flintley greets you. "Do you have any objects for me to look at, %s? No? Well, alright. I'll be here if you need me. Good luck out there."]]
+ flintdeftext = [[ Flintley greets you. "Do you have any objects for me to look at, %s? No? Well, all right. I'll be here if you need me. Good luck out there."]]
title[10] = "From days long gone"
View
2  dat/missions/neutral/aristodrink.lua
@@ -55,7 +55,7 @@ exworktxt = [[ You walk into the bar fully confident that this is the bar. Yo
worktitle = "This is it!"
worktxt = [[ You walk into the bar and know instantly that you are finally here! This is the place! You walk up to the bartender, a %s %s with %s hair, wearing %s, and smile. This has to be %s. You start to describe the drink to %s and %s interrupts. "A Swamp Bombing. Of course, that's my specialty." You ask if %s can make it to go, and %s laughs and says "Sure, I guess."
- Just as %s is about to start making it though, you stop %s and tell %s you'll have it right here after all. As long as you came all this way, you might as well try it. You're amazed at how quickly and gracefully %s trained hands move, flipping bottles and shaking various containers. Before you know it, %s is setting a drink before you, and closing another container for you to take with you. You taste it expecting something incredible. It's alright, but you doubt it was worth all this trouble.]]
+ Just as %s is about to start making it though, you stop %s and tell %s you'll have it right here after all. As long as you came all this way, you might as well try it. You're amazed at how quickly and gracefully %s trained hands move, flipping bottles and shaking various containers. Before you know it, %s is setting a drink before you, and closing another container for you to take with you. You taste it expecting something incredible. It's all right, but you doubt it was worth all this trouble.]]
finishedtitle = "Delivery"
finishedtxt = [[ "Ahh! I was just thinking how much I wanted one of those drinks! I'm so glad that you managed to find it. You sure seemed to take your time though." You give him his drink and tell him that it wasn't easy, and how many systems you had to go through. "Hmm. That is quite a few systems. No reason for you to be this late though." He takes a sip from his drink. "Ahh! That is good though. I suppose you'll be wanting to get paid for your troubles. You did go through a lot of trouble. Then again, you did take quite a long time. I suppose %s credits should be appropriate."
View
2  dat/missions/neutral/kidnapped/traffic_00.lua
@@ -51,7 +51,7 @@ You and the children stand off to the side and watch one of the most beautiful r
]]
title[7] = "Reunited"
-text[7] = [[You assure him that it is alright, and you will not hesitate to take him up on his offer. After a while the smile fades from his face and he says "You know how happy my family is? Well, look at all these other children here who are still separated from their parents. I want to return them all home, but that will have to wait for another day. I'm also seriously considering trying to put a stop to some of this human trafficking, but that will take a lot of planning. For now, I want to be with my family. Come back soon though, if you'd be willing, I would like to get something organized."
+text[7] = [[You assure him that it is all right, and you will not hesitate to take him up on his offer. After a while the smile fades from his face and he says, "You know how happy my family is? Well, look at all these other children here who are still separated from their parents. I want to return them all home, but that will have to wait for another day. I'm also seriously considering trying to put a stop to some of this human trafficking, but that will take a lot of planning. For now, I want to be with my family. Come back soon though, if you'd be willing, I would like to get something organized."
The father goes back to his children, and as you start walking back to your ship you notice the father and mother lavishing their children in love, and you look over at the other children now sitting around, looking on the loving family with envy. Sighing, you begin climbing into your ship as the mother runs up to you, "%s, wait a second! We know your name, but you don't know ours. I'm Janice." As she looks to her husband, who's talking animatedly with the children, she smiles and says, "My husband's name is Andrew. Thank you for everything." A tear rolls down her face as she looks at you with her bright hazel eyes and she kisses you on the cheek.
You watch her return to her family, as a child jumps into her arms, and you climb up into your ship.]]
View
8 dat/missions/shadow/shadowvigil.lua
@@ -38,14 +38,14 @@ else -- default english
Mere minutes later you find yourself back in your cockpit, and the Seiryuu is leaving. It doesn't really come as a surprise that you can't find any reference to your rendezvous with the Seiryuu in your flight logs...]]
accepttitle = "Shadow Vigil"
- accepttext = [[ "Excellent, %s," Rebina smiles at you. "I've told my crew to provide your ship's computer with the necessary navigation data. Also, note that I've taken the liberty to install a specialized IFF transponder in your ship. Don't pay it any heed, it will only serve to identify you as one of the escorts. For various reasons, it is best you refrained from communication with the other escorts as much as possible. I think you might have an inkling as to why."
- Rebina straightens up. "That will be all for now, %s," she says in a more formal, captain-like manner. "You have your assignment I suggest you go about it."
+ accepttext = [[ "Excellent, %s," Rebina smiles at you. "I've told my crew to provide your ship's computer with the necessary navigation data. Also, note that I've taken the liberty to install a specialized IFF transponder in your ship. Don't pay it any heed, it will only serve to identify you as one of the escorts. For various reasons, it is best that you refrain from communication with the other escorts as much as possible. I think you might have an inkling as to why."
+ Rebina straightens up. "That will be all for now, %s," she says in a more formal, captain-like manner. "You have your assignment; I suggest you go about it."
You are politely but efficiently escorted off the Seiryuu's bridge. Soon you settle back in your own cockpit chair, ready to do what was asked of you.]]
title[4] = "An unfortunate outcome"
text[4] = [[ Captain Rebina angrily drums her fingers on her captain's chair as she watches the reconstruction made from your sensor logs. Her eyes narrow when both diplomatic ships explode under the onslaught of weapons the escorts should not have had onboard.
"This is bad, %s," she says when the replay shuts down. "Worse than I had even thought possible. The death of the Imperial and Dvaered diplomats is going to spark a political incident, with each faction accusing the other of treachery." She stands up and begins pacing up and down the Seiryuu's bridge. "But that's not the worst of it. You saw what happened. The diplomats were killed by their own escorts - by Four Winds operatives! This is an outrage!"
- Captain Rebina brings herself back under control through an effort of will. "%s, this doesn not bode well. We have a problem, and I fear I'm going to need your help again before the end. But not yet. I have a lot to do. I have to get to the bottom of this, and I have to try to keep this situation from escalating into a disaster. I will contact you again when I know more. In the mean time, you will have the time to spend your reward - it's already in your account."
+ Captain Rebina brings herself back under control through an effort of will. "%s, this does not bode well. We have a problem, and I fear I'm going to need your help again before the end. But not yet. I have a lot to do. I have to get to the bottom of this, and I have to try to keep this situation from escalating into a disaster. I will contact you again when I know more. In the mean time, you will have the time to spend your reward - it's already in your account."
Following this, you are swiftly escorted off the Seiryuu. Back in your cockpit, you can't help feeling a little anxious about these Four Winds. Who are they, what do they want, and what is your role in all of it? Time will have to tell.]]
wrongsystitle = "You diverged!"
@@ -75,7 +75,7 @@ else -- default english
commmsg[5] = "Cut the chatter, two, three. This is a low-profile operation. Act the part, please."
-- Diplomat jumpin.
- commmsg[6] = "Alright boys, there he is. You know your orders. Stick to him, don't let anyone touch him on the way to the rendezvous."
+ commmsg[6] = "All right boys, there he is. You know your orders. Stick to him, don't let anyone touch him on the way to the rendezvous."
commmsg[7] = "Two, copy."
commmsg[8] = "Three, copy."
View
2  dat/news/news_generic.lua
@@ -96,7 +96,7 @@ function news_addGeneric( rawtable )
},
{
title = "Front Responsible for Shipping Woes",
- desc = "A spokeswoman for the separatist group says they were behind the recent series of attacks on cargo ships operating between Dacron and Theras. Dvaered officials condemned the actions."
+ desc = "A spokeswoman for the separatist group says they were behind the recent series of attacks on cargo ships operating between Dakron and Theras. Dvaered officials condemned the actions."
},
{
title = "Election on Caladan Marred by Fraud",
View
2  dat/news/news_goddard.lua
@@ -29,7 +29,7 @@ function news_addGoddard( rawtable )
--]]
{
title = "Goddard Earnings on the Rise",
- desc = "House Goddard has once again increased it's earnings. \"Our investment in technology and quality has paid off.\", said Kari Baker, responsible of House Goddard marketing."
+ desc = "House Goddard has once again increased its earnings. \"Our investment in technology and quality has paid off.\", said Kari Baker, responsible of House Goddard marketing."
},
{
title = "Goddard Awarded Best Ship",
View
2  dat/ssys/churchill.xml
@@ -11,7 +11,7 @@
<y>-664.000000</y>
</pos>
<assets>
- <asset>Chucrchill II</asset>
+ <asset>Churchill II</asset>
<asset>Churchill I</asset>
<asset>Churchill IIa</asset>
<asset>Lorelei</asset>
View
2  dat/ssys/hekaras.xml
@@ -14,7 +14,7 @@
<asset>Hekaras III</asset>
<asset>Hekaras IV</asset>
<asset>Hurada</asset>
- <asset>Three and a half Kings</asset>
+ <asset>Three and a Half Kings</asset>
<asset>Vino</asset>
<asset>Virtual Civilian Standard</asset>
<asset>Virtual Trader Area</asset>
Please sign in to comment.
Something went wrong with that request. Please try again.