widelands-dev team mailing list archive

[hessenfarmer <stephan-lutz@xxxxxx>]

hessenfarmer has proposed merging lp:~widelands-dev/widelands/bugfix-empire-campaign into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1742273 in widelands: "wrong strings and errors in empire mission 4"
  https://bugs.launchpad.net/widelands/+bug/1742273
  Bug #1742295 in widelands: "wrong background image in empire 03"
  https://bugs.launchpad.net/widelands/+bug/1742295
  Bug #1742534 in widelands: "Objective Strings in empire Mission 3 not consistent with other Missions"
  https://bugs.launchpad.net/widelands/+bug/1742534

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bugfix-empire-campaign/+merge/336074

textual and map fixes for empire Missions 3 and 4
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bugfix-empire-campaign into lp:widelands.

=== modified file 'data/campaigns/emp03.wmf/pics/background.jpg'
Binary files data/campaigns/emp03.wmf/pics/background.jpg	2017-03-16 21:54:07 +0000 and data/campaigns/emp03.wmf/pics/background.jpg	2018-01-14 19:23:03 +0000 differ
=== modified file 'data/campaigns/emp03.wmf/scripting/texts.lua'
--- data/campaigns/emp03.wmf/scripting/texts.lua	2017-06-25 07:08:38 +0000
+++ data/campaigns/emp03.wmf/scripting/texts.lua	2018-01-14 19:23:03 +0000
@@ -48,7 +48,7 @@
    title=_"Build a quarry",
    number = 1,
    body = objective_text(_"Quarry",
-      listitem_bullet(_[[Build a quarry close to the abundant rocks, so we can free some building plots and get some valuable resources.]])
+      listitem_bullet(_[[Build a quarry close to the abundant rocks to free some building plots and get some valuable resources.]])
    ),
 }
 
@@ -63,10 +63,10 @@
 
 obj_lower_marble_column_demand = {
    name = "lower_marble_column_demand",
-   title=_"Lower the demand for marble columns",
+   title=_"Lower the demand for marble columns to 4",
    number = 1,
    body = objective_text(_"Lower Demand for Marble Columns",
-      listitem_bullet(_[[We should save some marble for buildings. So, please lower the demand for marble columns in the economy settings to four.]]) ..
+      listitem_bullet(_[[Lower the demand for marble columns in the economy settings to four. This will help to save some marble for buildings.]]) ..
       listitem_arrow(_[[Remember that you can access the economy settings by clicking on any flag.]])
    ),
 }
@@ -76,7 +76,7 @@
    title=_"Find a port space on the small island",
    number = 1,
    body = objective_text(_"Port Space",
-      listitem_bullet(_[[In order to regain access to the sea, we first must discover a port space.]])
+      listitem_bullet(_[[Search for a port space in order to regain access to the sea.]])
    ),
 }
 
@@ -86,15 +86,15 @@
    number = 2,
    body = objective_text(_"Ship Industry",
       listitem_bullet(_[[Build a port to set sail from this island.]])..
-     listitem_bullet(_[[Build a shipyard to produce the ships to sail on.]])),
+      listitem_bullet(_[[Build a shipyard to produce the ships to sail on.]])),
 }
 
 obj_produce_wheat = {
    name = "produce_50_wheat",
-   title=_"Produce at least 50 sheaves of wheat",
+   title=_"Produce wheat",
    number = 1,
    body = objective_text(_"Wheat Production",
-      listitem_bullet(_[[To get our wool production started, we need at least 50 sheaves of wheat.]])
+      listitem_bullet(_[[Produce at least 50 sheaves of wheat to get your wool production started.]])
    ),
 }
 
@@ -103,7 +103,7 @@
    title=_"Produce cloth for building our first ship",
    number = 1,
    body = objective_text(_"Cloth Production",
-      listitem_bullet(_[[Now let’s turn all the wheat into wool (at least 50 bales) and then use the wool to weave cloth in order to build a ship.]])
+      listitem_bullet(_[[Now turn all the wheat into at least 50 bales of wool and then use the wool to weave cloth in order to build a ship.]])
    ),
 }
 
@@ -112,9 +112,9 @@
    title=_"Build 2 ports on distant islands",
    number = 1,
    -- TRANSLATORS: Objective - create 2 expeditions and found new colonies with them
-   body = objective_text(_"Build 2 Expedition Ports",
-      listitem_bullet(_[[We should explore the island in the south. Use an expedition to build a port there. Afterwards, let’s try to find some mining resources.]]) ..
-     listitem_bullet(_[[We should send a ship northwards to gather some intelligence about the Barbarians. Try to build a port on the island and found an outpost.]])
+   body = objective_text(_"Build two Expedition Ports",
+      listitem_bullet(_[[Explore the island in the south. Use an expedition to build a port there. Afterwards, try to find some mining resources.]]) ..
+     listitem_bullet(_[[Send a ship northwards to gather some intelligence about the Barbarians. Try to build a port on the island and found an outpost.]])
    ),
 }
 
@@ -123,7 +123,7 @@
    title=_"Produce gold to send out expeditions",
    number = 1,
    body = objective_text(_"Gold Production",
-      listitem_bullet(_[[We need to produce at least 6 gold to be able to colonize our vicinity.]])
+      listitem_bullet(_[[Produce at least six bars of gold to be able to colonize your vicinity.]])
    ),
 }
 
@@ -132,7 +132,7 @@
    title=_"Defeat the Barbarians",
    number = 1,
    body = objective_text(_"Defeat the Enemy",
-      listitem_bullet(_[[We should end the Barbarians’ existence in this part of the world.]])
+      listitem_bullet(_[[End the Barbarians’ existence in this part of the world.]])
    ),
 }
 
@@ -141,7 +141,7 @@
    title=_"Explore further and build ports",
    number = 1,
    body = objective_text(_"Explore Additional Islands and Search for Port Spaces",
-      listitem_bullet(_[[We should discover more land and build as many ports as we can.]])
+      listitem_bullet(_[[Discover more land in your vicinity and build as many ports as you can.]])
    ),
 }
 
@@ -151,7 +151,7 @@
    title=_"Recover the shrine",
    number = 1,
    body = text_line("</p>".. h2(_"Find the Holy Shrine"),
-       listitem_bullet(_[[We need to find and secure all six pieces of the holy shrine of Neptune.]]), "map:artifacts_models.png")
+       listitem_bullet(_[[Find and secure all six pieces of the holy shrine of Neptune.]]), "map:artifacts_models.png")
 }
 
 obj_training = {
@@ -159,7 +159,7 @@
    title=_"Build a training infrastructure",
    number = 3,
    body = objective_text(_"Training Infrastructure",
-      listitem_bullet(_[[Build a training camp, some barracks and an arena or colosseum to train our soldiers.]])
+      listitem_bullet(_[[Build a training camp, some barracks and an arena or colosseum to train your soldiers.]])
    ),
 }
 
@@ -302,7 +302,7 @@
       _([[I noticed that our stonemason has started his work, finally. He will cut the number of marble columns that we request in our basic economy settings.]])
       .. paragraphdivider() ..
       -- TRANSLATORS: Amalea
-      _([[But here’s the rub, if we use up all of our marble for columns, we might run out. So, we should lower the settings for marble columns in the economy settings to a smaller amount. I think a reserve of 4 columns might be sufficient for the moment being.]]))
+      _([[But here’s the rub, if we use up all of our marble for columns, we might run out. So, we should lower the settings for marble columns in the economy settings to a smaller amount. I think a reserve of four columns might be sufficient for the moment being.]]))
       .. new_objectives(obj_lower_marble_column_demand),
    posy=1,
    w=500,
@@ -359,7 +359,7 @@
       _([[I understand the euphoria of Saledus, but we have some serious problems to solve first.]])
       .. paragraphdivider() ..
       -- TRANSLATORS: Amalea
-      _([[To send out an expeditionary ship, we first need a ship. Unfortunately, we have only 5 bales of cloth left, which we will need to build the port and the shipyard.]])
+      _([[To send out an expeditionary ship, we first need a ship. Unfortunately, we have only five bales of cloth left, which we will need to build the port and the shipyard.]])
       .. paragraphdivider() ..
       -- TRANSLATORS: Amalea
       _([[So, we need more cloth to finally be able to build ships. But there is no space on the island for building a whole economy to produce cloth. Therefore, we need to build the necessary wares step by step.]])
@@ -371,7 +371,7 @@
       _([[After the production of enough wheat, we can dismantle the farm and build a sheep farm to produce wool. Later on, we could build a weaving mill in the same spot to use our wool for weaving cloth. But for the moment being, let’s start by producing a reasonable amount of wheat.]])
      .. paragraphdivider() ..
      -- TRANSLATORS: Amalea
-      _([[I think a stock of 50 wheat would be enough for starters. Perhaps we will have to adjust the target quantity for wheat to achieve this.]]))
+      _([[I think a stock of 50 sheaves of wheat would be enough for starters. Perhaps we will have to adjust the target quantity for wheat to achieve this.]]))
       .. new_objectives(obj_produce_wheat),
    posy=1,
    w=500,
@@ -533,7 +533,7 @@
      .. paragraphdivider() ..
      _([[We need some cloth as well for producing armor in our armor smithy. We need it to build some of the training buildings for our soldiers. And most important and most imminent of all, we need it to send out expeditions.]])
      .. paragraphdivider() ..
-     _([[Therefore, I really recommend that we check our stock of cloth quite regularly to ensure that we keep enough cloth in reserve to send out some expeditions at least. As one expedition needs 3 bales of cloth, I think a reserve of 6 to 9 bales giving us 2 to 3 expeditions would be sufficient.]])),
+     _([[Therefore, I really recommend that we check our stock of cloth quite regularly to ensure that we keep enough cloth in reserve to send out some expeditions at least. As one expedition needs three bales of cloth, I think a reserve of six to nine bales giving us two to three expeditions would be sufficient.]])),
    posy=1,
    w=500,
 }

=== modified file 'data/campaigns/emp04.wmf/binary/mapobjects'
Binary files data/campaigns/emp04.wmf/binary/mapobjects	2017-12-14 07:55:19 +0000 and data/campaigns/emp04.wmf/binary/mapobjects	2018-01-14 19:23:03 +0000 differ
=== modified file 'data/campaigns/emp04.wmf/elemental'
--- data/campaigns/emp04.wmf/elemental	2017-12-14 07:55:19 +0000
+++ data/campaigns/emp04.wmf/elemental	2018-01-14 19:23:03 +0000
@@ -1,13 +1,13 @@
-# Automatically created by Widelands master-2736_Debug_x64 (Debug)
+# Automatically created by Widelands
 
 [global]
 packet_version="1"
 map_w="112"
 map_h="208"
 nr_players="3"
-name=_"Surprise, Surprise!"
+name="Surprise, Surprise!"
 author="hessenfarmer"
-descr=_"After returning home, Lutius and his crew are faced with an economy in shambles. Resolving the bottlenecks in the economy will be of utmost importance to reinstate the glory of the empire."
+descr="After returning home, Lutius and his crew are faced with an economy in shambles. Resolving the bottlenecks in the economy will be of utmost importance to reinstate the glory of the empire."
 hint=
 background="campaigns/emp04.wmf/pics/background.jpg"
-tags="artifacts,unbalanced"
+tags="artifacts,seafaring,unbalanced"

=== modified file 'data/campaigns/emp04.wmf/objective'
--- data/campaigns/emp04.wmf/objective	2017-12-14 07:55:19 +0000
+++ data/campaigns/emp04.wmf/objective	2018-01-14 19:23:03 +0000
@@ -1,4 +1,4 @@
-# Automatically created by Widelands master-2736_Debug_x64 (Debug)
+# Automatically created by Widelands master-2813_Debug_x64 (Debug)
 
 [global]
 packet_version="2"

=== modified file 'data/campaigns/emp04.wmf/pics/background.jpg'
Binary files data/campaigns/emp04.wmf/pics/background.jpg	2017-08-11 21:59:58 +0000 and data/campaigns/emp04.wmf/pics/background.jpg	2018-01-14 19:23:03 +0000 differ
=== modified file 'data/campaigns/emp04.wmf/player_names'
--- data/campaigns/emp04.wmf/player_names	2017-12-14 07:55:19 +0000
+++ data/campaigns/emp04.wmf/player_names	2018-01-14 19:23:03 +0000
@@ -1,4 +1,4 @@
-# Automatically created by Widelands master-2736_Debug_x64 (Debug)
+# Automatically created by Widelands master-2813_Debug_x64 (Debug)
 
 [global]
 packet_version="2"

=== modified file 'data/campaigns/emp04.wmf/player_position'
--- data/campaigns/emp04.wmf/player_position	2017-12-14 07:55:19 +0000
+++ data/campaigns/emp04.wmf/player_position	2018-01-14 19:23:03 +0000
@@ -1,4 +1,4 @@
-# Automatically created by Widelands master-2736_Debug_x64 (Debug)
+# Automatically created by Widelands master-2813_Debug_x64 (Debug)
 
 [global]
 packet_version="2"

=== modified file 'data/campaigns/emp04.wmf/port_spaces'
--- data/campaigns/emp04.wmf/port_spaces	2017-12-24 16:13:54 +0000
+++ data/campaigns/emp04.wmf/port_spaces	2018-01-14 19:23:03 +0000
@@ -1,4 +1,4 @@
-# Automatically created by Widelands master-2736_Debug_x64 (Debug)
+# Automatically created by Widelands master-2813_Debug_x64 (Debug)
 
 [global]
 packet_version="1"
@@ -6,4 +6,4 @@
 
 [port_spaces]
 0="12 43"
-1="20 14"
\ No newline at end of file
+1="20 14"

=== modified file 'data/campaigns/emp04.wmf/scripting/texts.lua'
--- data/campaigns/emp04.wmf/scripting/texts.lua	2017-12-18 21:27:08 +0000
+++ data/campaigns/emp04.wmf/scripting/texts.lua	2018-01-14 19:23:03 +0000
@@ -108,7 +108,7 @@
    title=_"Deal with Julia to get the technology",
    number = 1,
    body = objective_text(_"Diplomacy: Trade or War",
-      listitem_bullet(_[[Decide: Either collect 35 wheat and 15 wine for the goddess in your headquarters or conquer the monastery.]])),
+      listitem_bullet(_[[Decide: Either collect 35 sheaves of wheat and 15 bottles of wine for the goddess in your headquarters or conquer the monastery.]])),
 }
 
 obj_heroes = {
@@ -116,7 +116,7 @@
    title=_"Train at least 3 heroes",
    number = 1,
    body = objective_text(_"Hero Training",
-      listitem_bullet(_[[Use your resources wisely to train at least three heroes.]])),
+      listitem_bullet(_[[Use your resources wisely to train at least three fully promoted heroes.]])),
 }
 
 obj_produce_tools = {
@@ -165,10 +165,10 @@
 
 obj_upgrade = {
    name = "upgrade",
-   title=_"Build a training camp and upgrade the colosseum",
+   title=_"Build a training camp and enhance the arena",
    number = 1,
    body = objective_text(_"More Efficient Training Buildings",
-      listitem_bullet(_[[Build a training camp and enhance your colosseum to an arena.]])
+      listitem_bullet(_[[Build a training camp and enhance your arena to a colosseum.]])
    ),
 }
 
@@ -252,7 +252,7 @@
    title=_"Welcome Back",
    body= marcus(_"A high Fremil official is welcoming you…",
       -- TRANSLATORS: Marcus - Mayor of Fremil welcoming Lutius and explaining the chaos
-      _([[Ave Sire! The people and me are so glad to see you returning back home. We really need some good leadership around here.]])
+      _([[Ave, Sire! The people and me are so glad to see you returning back home. We really need some good leadership around here.]])
       .. paragraphdivider() ..
       _([[As you have already noticed, things have gone terribly wrong around here since you left.]])),
    posy=1,
@@ -277,7 +277,7 @@
    title=_"Amalea Looks Puzzled",
    body= amalea1(_"Amalea is doubtful…",
       -- TRANSLATORS: Amalea
-      _([[Ave Saledus. On the one hand you are right, it really is a delight to see our homeland again. But on the other hand. I have the impression that something went deeply wrong here.]])
+      _([[Ave, Saledus! On the one hand you are right, it really is a delight to see our homeland again. But on the other hand, I have the impression that something went deeply wrong here.]])
       .. paragraphdivider() ..
       -- TRANSLATORS: Amalea
       _([[Have a look at the economy. There is hardly any productivity at all. Whoever managed our country while we were absent created utter chaos. I’m not quite sure how we can fix this, if at all possible.]])),
@@ -291,7 +291,7 @@
       _([[Lutius, in my opinion this will again be a very difficult challenge. But I’m afraid that we’re doomed to manage this situation. To make things even worse, I was met with a nasty surprise at our warehouses: they’re all empty. You can hardly find a grain of dust left in there: no wares, no tools, no workers and no soldiers either.]])
       .. paragraphdivider() ..
       -- TRANSLATORS: Amalea
-      _([[So, first of all we need some building materials to start correcting the mistakes made by the infamous secretary. I think we should try dismantling unproductive small buildings to recover some building materials from them and collect them in our headquarters. As far as I can see now, the fishermen’s houses and the quarries don’t have any resources near them. The lumberjacks’ houses and the well seem also to be inefficient or worn out.]])
+      _([[So, first of all we need some building materials to start correcting the mistakes made by the infamous secretary. I think we should try dismantling unproductive small buildings to recover some building materials from them and collect them in our headquarters. As far as I can see now, the fishermen’s houses and the quarries don’t have any resources near them. The lumberjacks’ houses and the wells seem also to be inefficient or worn out.]])
       .. paragraphdivider() ..
       -- TRANSLATORS: Amalea
       _([[Additionally, we should restrict the input of all buildings which consume any of our building materials to zero. Or maybe we could even pause the production in all bigger buildings and get the workers some rest until we have produced some of their input wares.]]))
@@ -394,7 +394,7 @@
       _([[And guess what? They are very old. Their houses and tools are worn and their seed is degenerated. For this reason, they need much more time than usual for planting trees.]])
       .. paragraphdivider() ..
       -- TRANSLATORS: Amalea
-      _([[The only solution is to build 2 new forester’s houses near our lumberjacks. Be sure to first build a new forester’s house and then eventually destroy the old one or at least expel the forester to change houses. Dismantling them is also possible but will not return any wares because they are so torn.]]))
+      _([[The only solution is to build two new forester’s houses near our lumberjacks. Be sure to first build a new forester’s house and then eventually destroy the old one or at least expel the forester to change houses. Dismantling them is also possible but will not return any wares because they are so torn.]]))
       .. new_objectives(obj_replace_foresters),
    posy=1,
    h=500,
@@ -454,7 +454,7 @@
    title=_"Amalea is Very Content",
    body= amalea2(_"Amalea claps her hands…",
       -- TRANSLATORS: Amalea
-      _([[Well done. Now we are able to build more effective buildings to refine our wheat. And, best of all, we have a new ally who just provided us with lots of water, flour and beer. Now I really think that nothing can prevent us from getting stronger and conquering back our homeland.]])),
+      _([[Well done. Now we are able to build more efficient buildings to refine our wheat. And, best of all, we have a new ally who just provided us with lots of water, flour and beer. Now I really think that nothing can prevent us from getting stronger and conquering back our homeland.]])),
    posy=1,
 }
 
@@ -540,7 +540,7 @@
       _([[Look Brother, I have just realized we haven’t cleared the road network yet. I think we should do so very quickly to free enough space for new buildings.]])
       .. paragraphdivider() ..
       -- TRANSLATORS: Amalea
-      _([[To achieve this, we should make sure that there aren’t more than three deadends (flags with only one road) and not more than one flag with more than four roads attached.]])),
+      _([[To achieve this, we should make sure that there aren’t more than three dead ends (flags with only one road) and not more than one flag with more than four roads attached.]])),
    posy=1,
 }
 
@@ -637,9 +637,9 @@
    title=_"We Just Need Another Hero",
    body= saledus4(_"Saledus is in a good mood…",
       -- TRANSLATORS: Saledus
-      _([[General, now that we have more and better beer in addition to enhanced training facilities, we should train as many heroes as we can.]])
+      _([[General, now that we have more and better beer in addition to enhanced training facilities, we should train as many fully promoted soldiers as we can. I really would consider them heroes after that.]])
       .. paragraphdivider() ..
-      _([[It will give us great advantage in battle if our soldiers are much more powerful than the Barbarians’. So, we need to spend our resources wisely to get heroes as soon as we can.]])
+      _([[It will give us great advantage in battle if our soldiers are much more powerful than the Barbarians’. So, we need to spend our resources wisely to get some heroes as soon as we can.]])
       .. paragraphdivider() ..
       _([[I would say that three fully trained heroes should be sufficient to begin with. But don’t forget to send them to the front line, because they are not that useful back home.]]))
       .. new_objectives(obj_heroes),
@@ -665,7 +665,7 @@
       -- TRANSLATORS: Saledus
       _([[Sire, finally we have defeated the Barbarians. We have expelled even the last of them. May they never come back!]])
       .. paragraphdivider() ..
-      _([[Now it is time to find out why this big mess around us could have happened. But first of all we should have a beer or two to celebrate our victory and our reclaimed freedom.]])),
+      _([[Now it is time to find out why this big mess around us could have happened. But first of all we should have some wine to celebrate our victory and our reclaimed freedom.]])),
    posy=1,
 }
 
@@ -675,7 +675,7 @@
       -- TRANSLATORS: Saledus
       _([[Sire, although we don’t have enough fully trained soldiers yet, we just have made contact with the enemy.]])
       .. paragraphdivider() ..
-      _([[We have to finish them off and regain control over our lands. They shall regret deeply that they ever came.]]))
+      _([[We have to finish them off and regain control over our lands. They shall regret deeply that they ever came!]]))
       .. new_objectives(obj_conquer_all),
    posy=1,
    h=500,
@@ -689,7 +689,7 @@
    title=_"Worship to be Gifted",
    body= julia(_"Julia is demanding a sacrifice for Vesta…",
       -- TRANSLATORS: Julia - priestess of the goddess Vesta
-      _([[Ave Lutius, if you want us to help you, you first have to worship our goddess Vesta. Therefore deliver 35 wheat and 15 wine to prepare a worthy sacrifice for her.]])),
+      _([[Ave, Lutius! If you want us to help you, you first have to worship our goddess Vesta. Therefore deliver 35 sheaves of wheat and 15 bottles of wine to prepare a worthy sacrifice for her.]])),
    posy=1,
 }
 

=== modified file 'data/campaigns/emp04.wmf/version'
--- data/campaigns/emp04.wmf/version	2017-12-14 07:55:19 +0000
+++ data/campaigns/emp04.wmf/version	2018-01-14 19:23:03 +0000
@@ -1,11 +1,11 @@
-# Automatically created by Widelands master-2736_Debug_x64 (Debug)
+# Automatically created by Widelands master-2813_Debug_x64 (Debug)
 
 [global]
 map_source_url=
 map_release=
-map_creator_version="master-2736_Debug_x64"
+map_creator_version="master-2813_Debug_x64"
 map_version_major="0"
 map_version_minor="1"
-map_version_timestamp="1513191492"
+map_version_timestamp="1515617961"
 packet_version="1"
 packet_compatibility="1"