Merge lp:~widelands-dev/widelands/empire into lp:widelands

Proposed by GunChleoc on 2015-04-22
Status: Merged
Merged at revision: 7488
Proposed branch: lp:~widelands-dev/widelands/empire
Merge into: lp:widelands
Diff against target: 197 lines (+33/-33)
2 files modified
campaigns/emp01.wmf/scripting/texts.lua (+20/-20)
campaigns/emp02.wmf/scripting/texts.lua (+13/-13)
To merge this branch: bzr merge lp:~widelands-dev/widelands/empire
Reviewer Review Type Date Requested Status
GunChleoc Resubmit on 2015-07-25
TiborB 2015-04-22 Approve on 2015-04-22
Review via email: mp+257141@code.launchpad.net

Description of the change

 Rework of the dialogues in both Empire campaigns. By elizabeth.

(Sorry for double post, decided to merge trunk before; guess that was not really needed though.)

To post a comment you must log in.
TiborB (tiborb95) wrote :

I think it can go

review: Approve
GunChleoc (gunchleoc) wrote :

Not quite - I still have an open query on the forum regarding these strings:

https://wl.widelands.org/forum/topic/1568/?page=6#post-13419

I don't want to have to change them too often and break the translations again.

TiborB (tiborb95) wrote :

Alright, I did not know...

GunChleoc (gunchleoc) wrote :

No problem. Thanks for the review - things can't be proofread too often :)

lp:~widelands-dev/widelands/empire updated on 2015-07-25
7437. By GunChleoc on 2015-07-25

Merged trunk.

7438. By GunChleoc on 2015-07-25

Tweaked Amalea's greetings to Lutius.

GunChleoc (gunchleoc) wrote :

I think I'm done now. Could someone please go over my last commit?

review: Resubmit
lp:~widelands-dev/widelands/empire updated on 2015-07-25
7439. By GunChleoc on 2015-07-25

Changed "Hail, Lutius" to "Lutius".

GunChleoc (gunchleoc) wrote :

Venatrix has approved the changes on the forum, so I'm going to merge this now :)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'campaigns/emp01.wmf/scripting/texts.lua'
2--- campaigns/emp01.wmf/scripting/texts.lua 2015-01-24 11:43:42 +0000
3+++ campaigns/emp01.wmf/scripting/texts.lua 2015-07-25 18:17:24 +0000
4@@ -79,9 +79,9 @@
5 body=lutius(_"Diary of Lutius",
6 _([[What has become of our Empire? I really ask this question – why did my king forbid me from fighting against that monstrous Barbarian tribe, who first acted as a peaceful friend and then attacked my army in the darkest night?]])
7 .. paragraphdivider() ..
8- _([[With an army of 150 men, I was assigned to patrol on our northern frontier, which lies near the Galdin Mountains in a great, beautiful and ancient forest. Soon, we met a Barbarian tribe, which at first was friendly. A few of my men even traded with them and their kids came to us, to admire our clean and tidy uniforms and weapons.]])
9+ _([[With an army of 150 men, I was assigned to patrol on our northern frontier, which lies near the Galdin Mountains in a great, beautiful and ancient forest. Soon, we met a Barbarian tribe, which at first was friendly. A few of my men even traded with them and their children came to us, to admire our clean and tidy uniforms and weapons.]])
10 .. paragraphdivider() ..
11- _([[But during our fifth night in that region, they attacked us with no reason. I lost dozens of good men, and found myself imprisoned and brought to their chieftain. He spat at me, mocked me and told me to leave this land forever. He did not want new land and did not want our land, but he told me that THIS forest was their land – and it would stay theirs until the ghosts took the last man of his folk!]])
12+ _([[But during our fifth night in that region, they attacked us with no reason. I lost dozens of good men, and found myself imprisoned and brought to their chieftain. He spat at me, mocked me and told me to leave this land forever. He did not want new land and did not want our land, but he told me that THIS forest was their land – and it would stay theirs until the spirits took the last man of his folk!]])
13 .. paragraphdivider() ..
14 _([[Three weeks later, I returned to Fremil to speak with our king. He was furious at the Barbarians, yet forbade any attack on these tribes. He believed that our army was too weak to survive in a war against the Barbarians.]])
15 .. paragraphdivider() ..
16@@ -119,7 +119,7 @@
17 .. paragraphdivider() ..
18 _([[Well, perhaps my fear is misguided, but it can’t be wrong to keep watch in the forests – so that we can be sure to see any potential enemies before they can see us.]])
19 .. paragraphdivider() ..
20- _([[We really should build a barracks in the eastern portion of the forest. Then one of us can keep watch in the darkness and keep us safe from these creatures.]]))
21+ _([[You really should build a barracks in the eastern portion of the forest. Then one of my men can keep watch in the darkness and keep us safe from these creatures.]]))
22 .. new_objectives(obj_build_barracks),
23 w=400,
24 }
25@@ -130,18 +130,18 @@
26 body= saledus(_"Saledus speaks with a sigh of relief…",
27 _([[Sire, I saw that the construction of the barracks was completed, so I have assigned one of my best soldiers to it to keep watch on the desert.]])
28 .. paragraphdivider() ..
29- _([[This is a good step forward. Now we can feel a bit safer and can look forward to repairing our ship.]])),
30+ _([[This is a good step forward. Now we can feel a bit safer and can look forward to repairing our ship.]])),
31 w=400,
32 }
33
34 amalea_1 = {
35 title=_"Young Amalea",
36 body= amalea(_"Amalea smiles…",
37- _([[Hey Lutius, I just met Saledus outside.]])
38- .. paragraphdivider() ..
39- _([[He told me about the barracks. Well, I am not one of those girls who think we need more barracks – instead, we might concentrate on other things now.]])
40- .. paragraphdivider() ..
41- _([[It is absolutely clear that we need wood to repair our ship. So, I walked through the forest yesterday and found a nice place for a lumberjack’s house, south of our provisional headquarters.]]))
42+ _([[Greetings, Lutius! I just met Saledus outside.]])
43+ .. paragraphdivider() ..
44+ _([[He told me about the barracks. Well, I don’t think we need more barracks – instead, we might concentrate on other things now.]])
45+ .. paragraphdivider() ..
46+ _([[It is absolutely clear that we need wood to repair our ship. So, I walked through the forest yesterday to look for a nice place for a lumberjack’s house and found one right south of our provisional headquarters.]]))
47 .. new_objectives(obj_build_lumberjack),
48 w=400,
49 }
50@@ -149,7 +149,7 @@
51 amalea_2 = {
52 title=_"Young Amalea",
53 body= amalea(_"Amalea recommends…",
54- _([[Hey Lutius, I got the message that our first lumberjack has started his work today. Perhaps it would be a good idea to wait until he cleans enough space for constructing two more lumberjack’s houses, so that we can harvest the logs faster.]])
55+ _([[I got the message that our first lumberjack has started his work today. Perhaps it would be a good idea to wait until he cleans enough space for constructing two more lumberjack’s houses, so that we can harvest the logs faster.]])
56 .. paragraphdivider() ..
57 _([[But unfortunately the logs are useless for repairing our ship – we need refined lumber, like every ship and every bigger building needs, too. So we should build a sawmill – as soon as we have enough space for this.]]))
58 .. new_objectives(obj_build_sawmill_and_lumberjacks),
59@@ -159,15 +159,15 @@
60 amalea_3 = {
61 title=_"Young Amalea",
62 body= amalea(_"Amalea comes in…",
63- _([[Hi Lutius, I’ve got two important things to talk about… First the good news:]])
64+ _([[I’ve got two important things to talk about… First the good news:]])
65 .. paragraphdivider() ..
66 _([[I noticed that the construction of the sawmill is complete, so we can begin to refine the logs that the lumberjacks are harvesting into lumber.]])
67 .. paragraphdivider() ..
68- _([[But that’s just about the only positive thing I know to talk about. The bad news is that our lumberjacks harvest at an incredible speed. There are almost no trees left on this island.]])
69- .. paragraphdivider() ..
70- _([[Lutius, these trees provide shelter from the sandstorms that sweep in from the desert and shade on the hot days, and they are the home of so many gentle animals. We shouldn’t leave this island a complete desert.]])
71- .. paragraphdivider() ..
72- _([[Lutius, I beg you: find someone who takes care of planting new trees.]]))
73+ _([[But the bad news is that our lumberjacks harvest at an incredible speed. There are almost no trees left on this island.]])
74+ .. paragraphdivider() ..
75+ _([[These trees provide shelter from the sandstorms that sweep in from the desert, and shade on the hot days, and they are the home of many gentle animals. We shouldn’t leave this island a complete desert.]])
76+ .. paragraphdivider() ..
77+ _([[Lutius, please find someone who will take care of planting new trees.]]))
78 .. new_objectives(obj_build_forester),
79 w=400,
80 }
81@@ -175,7 +175,7 @@
82 saledus_3 = {
83 title=_"Thinking About the Future",
84 body= saledus(_"Saledus notes…",
85- _([[Hey, my good old friend. I just thought about the rocks standing on the south shore of this land. Perhaps we could cut out some useful hard stones and beautiful marble.]])
86+ _([[Sire, I just thought about the rocks standing on the south shore of this land. Perhaps we could cut out some useful hard stones and beautiful marble.]])
87 .. paragraphdivider() ..
88 _([[The repair of our ship will take a few weeks, anyway, and the resources we harvest now might be the base of strong and big buildings in another land.]]))
89 .. new_objectives(obj_build_quarry),
90@@ -184,8 +184,8 @@
91
92 saledus_4 = {
93 title=_"A Step Forward",
94- body= saledus(_"Saledus looks promising…",
95- _([[Hey Lutius, today we got a lot closer to our first castle. The quarry to the south began its work today and will soon provide us with stones and beautiful marble.]])
96+ body= saledus(_"Saledus looks excited…",
97+ _([[Sire, today we got a lot closer to our first castle. The quarry to the south began its work today and will soon provide us with stones and beautiful marble.]])
98 .. paragraphdivider() ..
99 _([[Now we truly can look forward to settling down on another island.]])),
100 w=400,
101@@ -207,5 +207,5 @@
102 safe_peninsula = {
103 title=_"Safe Peninsula",
104 body= saledus(_"Saledus speaks:",
105- _[[You have made this peninsula a very secure place. It is time to move on!]])
106+ _[[Sire, you have made this peninsula a very secure place. Now it’s time to move on!]])
107 }
108
109=== modified file 'campaigns/emp02.wmf/scripting/texts.lua'
110--- campaigns/emp02.wmf/scripting/texts.lua 2015-01-24 11:43:42 +0000
111+++ campaigns/emp02.wmf/scripting/texts.lua 2015-07-25 18:17:24 +0000
112@@ -118,9 +118,9 @@
113 body= lutius(_"Diary of Lutius",
114 _([[As Saledus and I walked through these wonderful forests in the north, we felt that our future had just begun. This land is so peaceful, good and beautiful, I could stay here until the end of my life.]])
115 .. paragraphdivider() ..
116- _([[But until that day, may many years pass! For now, we must concentrate on the present, and build a few lumberjack’s houses and a sawmill to produce some basic building materials.]])
117+ _([[But until that day, many years may pass! For now, we must concentrate on the present, and build a few lumberjack’s houses and a sawmill to produce some basic building materials.]])
118 .. paragraphdivider() ..
119- _([[But we shouldn’t forget to preserve this natural bounty. These forests should last forever, so we really should build a forester’s house too.]]))
120+ _([[But we mustn’t forget to preserve this natural bounty. These forests should last forever, so we really have to build a forester’s house too.]]))
121 .. new_objectives(obj_build_woodeconomy)
122 }
123
124@@ -145,14 +145,14 @@
125 title =_ "Stone for the Colony",
126 posy=1,
127 body= lutius(_"Diary of Lutius",
128-_[[Great! Today the building of the quarry was completed. Now we will get enough stone to construct larger buildings.]]),
129+ _[[Great! Today the building of the quarry was completed. Now we will get enough stone to construct larger buildings.]]),
130 }
131
132 saledus_1 = {
133 title =_ "Dangerous Ship Parts",
134 posy = 1,
135 body= saledus(_"Saledus looks unhappy",
136- _([[Greetings Lutius, I don’t want to start a panic, but I found something which gives me a sinking feeling in my stomach and spreads waves of fear in my heart. As I walked down to the southern shore, I found the remains of another ship. I don’t know whether these parts are all that is left of that ship. In any case, these parts do not seem to be old.]])
137+ _([[Sire, I don’t want to start a panic, but I found something which gives me a sinking feeling in my stomach and spreads waves of fear in my heart. As I walked down to the southern shore, I found the remains of another ship. I don’t know whether these parts are all that is left of that ship. In any case, these parts do not seem to be old.]])
138 .. paragraphdivider() ..
139 _([[Perhaps the people aboard that ship were caught in the same storm which brought us to Malac’ Mor – and were brought to this island.]])
140 .. paragraphdivider() ..
141@@ -163,20 +163,20 @@
142 saledus_2 = {
143 title =_ "Marble on the Mountain",
144 body= saledus(_"Saledus smiles",
145- _([[Lutius, I’ve got good news for you: As I walked to the east, I found a larger mountain. I am not absolutely sure – a geologist should check if I am right – but I believe we could mine marble from some places on the mountain.]])
146+ _([[Sire, I’ve got good news for you: As I walked to the east, I found a larger mountain. I am not absolutely sure – a geologist should check if I am right – but I believe we could mine marble from some places on the mountain.]])
147 .. paragraphdivider() ..
148 _([[It would be a good source for bolstering our supply of quality marble, beyond the meager quantities available from the quarry. Perhaps you were right when you said that this island was like paradise.]])
149 .. paragraphdivider() ..
150- _([[Let us expand to that mountain and start mining marble.]]))
151+ _([[Please, expand to that mountain and start mining marble.]]))
152 .. new_objectives(obj_build_marblemine)
153 }
154
155 saledus_3 = {
156 title =_ "Further Mountains",
157- body= saledus(_"Saledus is amazed",
158- _([[By the Gods, this is an unbelievable stroke of fortune! There are two more mountains, and it seems that one has a large quantity of coal and the other of iron ore. We should immediately start to build iron ore and coal mines (or at least charcoal kilns), smelting works, toolsmithies, armor and weapon smithies.]])
159+ body= saledus(_"Saledus is excited",
160+ _([[By the Gods, this is an unbelievable stroke of fortune! There are two more mountains, and it seems that one has a large quantity of coal and the other of iron ore. I advise you to immediately build iron ore and coal mines (or at least charcoal kilns), smelting works, toolsmithies, armor and weapon smithies.]])
161 .. paragraphdivider() ..
162- _([[However: for all these bigger buildings, we need better and more elegant building materials. So, let’s build a stonemason, who will cut columns from marble.]])
163+ _([[However: for all these bigger buildings, we need better and more elegant building materials. So you have to build a stonemason, who will cut columns from marble.]])
164 .. paragraphdivider() ..
165 _([[After everything, we can now begin to live like we did in Fremil.]]))
166 .. new_objectives(obj_build_mining_infrastructure)
167@@ -185,18 +185,18 @@
168 amalea_1 = {
169 title =_ "Food for the Miners",
170 body= amalea(_"Amalea enters…",
171- _([[Hi Lutius, I hope you forgive my criticism, but it seems to me as if you forgot something.]])
172+ _([[Lutius, don’t you think you forgot something important?]])
173 .. paragraphdivider() ..
174 _([[It’s nice, and of course a good idea, to build up mines, which will give us a more comfortable life, but the people working in the mines are unhappy with the current situation. They have to do hard work and have no time for making their own food.]])
175 .. paragraphdivider() ..
176 _([[What do you think about helping them out? I can’t tell you what we need exactly… but here are my recommendations:]]))
177- .. new_objectives(obj_build_Food_infrastructure)
178+ .. new_objectives(obj_build_food_infrastructure)
179 }
180
181 amalea_2 = {
182 title =_ "Our New Tavern",
183 body= amalea(_"Amalea smiles",
184- _([[Greetings, my friend, I just visited our new tavern ‘At the palms’. The beer they serve is really tasty. You really should have a drink there, too.]])
185+ _([[I just visited our new tavern ‘At the palms’. The beer they serve is really tasty. You really should have a drink there, too.]])
186 .. paragraphdivider() ..
187 _([[It is good to see that we have now got a warmer and more familiar environment on our island. Thank you, Lutius.]]))
188 }
189@@ -209,7 +209,7 @@
190 .. paragraphdivider() ..
191 _([[Today, as I walked down to the eastern shore, I got a shock. I caught sight of one of those hated, evil, Barbarian tribes with whom we have had so many problems before.]])
192 .. paragraphdivider() ..
193- _([[At first, I was naive and hoped that they were peaceful, but as soon as one of them saw me, they charged towards me and started attacking me with their throwing-spears. Thanks be to the Gods that I was able to flee and hide myself, before retreating back to our colony under cover of darkness.]])
194+ _([[At first, I was naive and hoped that they were peaceful, but as soon as one of them saw me, they charged towards me and started attacking me with their throwing spears. Thanks be to the Gods that I was able to flee and hide myself, before retreating back to our colony under cover of darkness.]])
195 .. paragraphdivider() ..
196 _([[Anyway, we must build up stronger military buildings as soon as possible.]]))
197 .. new_objectives(obj_build_bigger_military_buildings)