widelands-dev team mailing list archive

[hessenfarmer <stephan-lutz@xxxxxx>]

hessenfarmer has proposed merging lp:~widelands-dev/widelands/emp_4_fixes into lp:widelands.

Commit message:
fixes issues described in https://www.widelands.org/forum/topic/4617/?page=1#post-29597

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/emp_4_fixes/+merge/372196

- small trainingcamp is now buildable although at very high costs. (it is not intended the player should stay with them)
- first objective done with 2 buildings still standing (although you miss the woodcutter in the new building then)
- wells have only 5 percent chance to mine water
- added some texts to not dismantle bigger buildings until we know what we are doing.
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/emp_4_fixes into lp:widelands.

=== modified file 'data/campaigns/emp04.wmf/scripting/mission_thread.lua'
--- data/campaigns/emp04.wmf/scripting/mission_thread.lua	2018-12-13 17:36:58 +0000
+++ data/campaigns/emp04.wmf/scripting/mission_thread.lua	2019-09-03 13:26:08 +0000
@@ -13,7 +13,7 @@
    local o = add_campaign_objective(obj_dismantle_buildings)
    local buildmessage = false
    sleep(5000)
-   while count_buildings(p1, {"empire_fishers_house", "empire_quarry", "empire_lumberjacks_house1", "empire_well1"}) > 0 do
+   while count_buildings(p1, {"empire_fishers_house", "empire_quarry", "empire_lumberjacks_house1", "empire_well1"}) > 2 do
       if mv.windows.field_action and mv.windows.field_action.tabs.small and not buildmessage then
          campaign_message_box(amalea_19)
          buildmessage = true
@@ -310,6 +310,7 @@
 
    -- after some training we have enough knowledge to build better training buildings
    p1:allow_buildings{"empire_trainingcamp", "empire_colosseum"}
+   p1:forbid_buildings{"empire_trainingcamp1"}
    campaign_message_box(saledus_7)
    local o2 = add_campaign_objective(obj_upgrade)
    sleep(5000)

=== modified file 'data/campaigns/emp04.wmf/scripting/texts.lua'
--- data/campaigns/emp04.wmf/scripting/texts.lua	2019-04-07 19:25:16 +0000
+++ data/campaigns/emp04.wmf/scripting/texts.lua	2019-09-03 13:26:08 +0000
@@ -308,10 +308,13 @@
       _([[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 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.]]))
+      _([[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. All of the lumberjacks’ houses and the wells seem also to be inefficient or worn out.]])
+      .. paragraphdivider() ..
+      -- TRANSLATORS: Amalea
+      _([[For the other buildings we can't tell yet, if they are working properly. We need to closely monitor them when we are able to supply them. Until then we shouldn't do anything with them.]])
+      .. paragraphdivider() ..
+      -- TRANSLATORS: Amalea
+      _([[Except, maybe 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.]]))
       .. new_objectives(obj_dismantle_buildings),
    posy=1,
    h=500,
@@ -343,7 +346,7 @@
       _([[Lutius, now we are getting somewhere. As we have gained some construction materials, we can start to rebuild our economy.]])
       .. paragraphdivider() ..
       -- TRANSLATORS: Amalea
-      _([[First of all, we need more construction materials. So, we should build at least three lumberjacks’ houses and two quarries.]])
+      _([[First of all, we need more construction materials. So, we should build at least three lumberjacks’ houses and two quarries. Be sure to have dismanteled all of the unproductive buildings though.]])
       .. paragraphdivider() ..
       -- TRANSLATORS: Amalea
       _([[Oh, before I forget, there is another task to accomplish. While our builders are doing their job, somebody should clear up our road network. They are leaving us no space to place the buildings that we need.]]))

=== modified file 'data/campaigns/emp04.wmf/scripting/tribes/trainingcamp1.lua'
--- data/campaigns/emp04.wmf/scripting/tribes/trainingcamp1.lua	2018-07-30 17:31:02 +0000
+++ data/campaigns/emp04.wmf/scripting/tribes/trainingcamp1.lua	2019-09-03 13:26:08 +0000
@@ -8,7 +8,16 @@
    icon = dirname .. "menu.png",
    size = "big",
 
-
+   buildcost = {
+      log = 3,
+      granite = 6,
+      planks = 6,
+      marble = 6,
+      gold = 5,
+      marble_column = 5,
+      cloth = 4
+   },
+   
    return_on_dismantle = {
       granite = 3,
       planks = 2,

=== modified file 'data/campaigns/emp04.wmf/scripting/tribes/well1.lua'
--- data/campaigns/emp04.wmf/scripting/tribes/well1.lua	2018-08-09 20:54:08 +0000
+++ data/campaigns/emp04.wmf/scripting/tribes/well1.lua	2019-09-03 13:26:08 +0000
@@ -47,7 +47,7 @@
          actions = {
             "sleep=30000",
             "animate=working 30000",
-            "mine=water 5 100 10 2",
+            "mine=water 5 100 5 2",
             "produce=water"
          }
       },