widelands-dev team mailing list archive

[kaputtnik <somal@xxxxxxxx>]

kaputtnik has proposed merging lp:~widelands-dev/widelands/bug_1784151_fix_emp04_due_to_changed_program_names into lp:widelands.

Commit message:
Fixed program names for scenario emp04

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1784151 in widelands: "error loading empire scenario 4"
  https://bugs.launchpad.net/widelands/+bug/1784151

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

fixed program names for scenario emp04
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug_1784151_fix_emp04_due_to_changed_program_names into lp:widelands.

=== modified file 'data/campaigns/emp04.wmf/scripting/tribes/brewery1.lua'
--- data/campaigns/emp04.wmf/scripting/tribes/brewery1.lua	2017-12-17 16:43:41 +0000
+++ data/campaigns/emp04.wmf/scripting/tribes/brewery1.lua	2018-07-31 06:18:42 +0000
@@ -47,7 +47,7 @@
             "sleep=30000",
             "return=skipped unless economy needs beer",
             "consume=water:3 wheat",
-            "play_sound=sound/empire beerbubble 180",
+            "playsound=sound/empire beerbubble 180",
             "animate=working 30000",
             "produce=beer"
          }

=== modified file 'data/campaigns/emp04.wmf/scripting/tribes/farm1.lua'
--- data/campaigns/emp04.wmf/scripting/tribes/farm1.lua	2017-12-17 16:43:41 +0000
+++ data/campaigns/emp04.wmf/scripting/tribes/farm1.lua	2018-07-31 06:18:42 +0000
@@ -39,23 +39,23 @@
       work = {
          descname = "working",
          actions = {
-            "call=plant_wheat",
-            "call=harvest_wheat",
+            "call=plant",
+            "call=harvest",
             "return=skipped"
          }
       },
-      plant_wheat = {
+      plant = {
          descname = "planting wheat",
          actions = {
             "sleep=14000",
-            "worker=harvest"
+            "callworker=harvest"
          }
       },
-      harvest_wheat = {
+      harvest = {
          descname = "harvesting wheat",
          actions = {
             "sleep=4000",
-            "worker=harvest"
+            "callworker=harvest"
          }
       },
    },

=== modified file 'data/campaigns/emp04.wmf/scripting/tribes/foresters_house1.lua'
--- data/campaigns/emp04.wmf/scripting/tribes/foresters_house1.lua	2017-12-17 16:43:41 +0000
+++ data/campaigns/emp04.wmf/scripting/tribes/foresters_house1.lua	2018-07-31 06:18:42 +0000
@@ -39,7 +39,7 @@
          descname = "planting trees",
          actions = {
             "sleep=66000",
-            "worker=plant"
+            "callworker=plant"
          }
       },
    },

=== modified file 'data/campaigns/emp04.wmf/scripting/tribes/foresters_house2.lua'
--- data/campaigns/emp04.wmf/scripting/tribes/foresters_house2.lua	2017-12-17 16:43:41 +0000
+++ data/campaigns/emp04.wmf/scripting/tribes/foresters_house2.lua	2018-07-31 06:18:42 +0000
@@ -37,7 +37,7 @@
          descname = "planting trees",
          actions = {
             "sleep=66000",
-            "worker=plant"
+            "callworker=plant"
          }
       },
    },

=== modified file 'data/campaigns/emp04.wmf/scripting/tribes/lumberjacks_house1.lua'
--- data/campaigns/emp04.wmf/scripting/tribes/lumberjacks_house1.lua	2017-12-17 13:25:46 +0000
+++ data/campaigns/emp04.wmf/scripting/tribes/lumberjacks_house1.lua	2018-07-31 06:18:42 +0000
@@ -42,7 +42,7 @@
          descname = "felling trees",
          actions = {
             "sleep=400000", -- Barbarian lumberjack sleeps 25000
-            "worker=chop"
+            "callworker=harvest"
          }
       },
    },

=== modified file 'data/campaigns/emp04.wmf/scripting/tribes/lumberjacks_house2.lua'
--- data/campaigns/emp04.wmf/scripting/tribes/lumberjacks_house2.lua	2017-12-17 13:25:46 +0000
+++ data/campaigns/emp04.wmf/scripting/tribes/lumberjacks_house2.lua	2018-07-31 06:18:42 +0000
@@ -41,7 +41,7 @@
          descname = "felling trees",
          actions = {
             "sleep=400000", -- Barbarian lumberjack sleeps 25000
-            "worker=chop"
+            "callworker=harvest"
          }
       },
    },

=== modified file 'data/campaigns/emp04.wmf/scripting/tribes/mill1.lua'
--- data/campaigns/emp04.wmf/scripting/tribes/mill1.lua	2017-12-17 13:25:46 +0000
+++ data/campaigns/emp04.wmf/scripting/tribes/mill1.lua	2018-07-31 06:18:42 +0000
@@ -48,7 +48,7 @@
             "sleep=5000",
             "return=skipped unless economy needs flour",
             "consume=wheat:2",
-            "play_sound=sound/mill mill_turning 240",
+            "playsound=sound/mill mill_turning 240",
             "animate=working 10000",
             "produce=flour"
          }

=== modified file 'data/campaigns/emp04.wmf/scripting/tribes/trainingcamp1.lua'
--- data/campaigns/emp04.wmf/scripting/tribes/trainingcamp1.lua	2017-12-17 13:25:46 +0000
+++ data/campaigns/emp04.wmf/scripting/tribes/trainingcamp1.lua	2018-07-31 06:18:42 +0000
@@ -82,15 +82,15 @@
          descname = "sleeping",
          actions = {
             "sleep=5000",
-            "check_soldier=soldier attack 9", -- dummy check to get sleep rated as skipped - else it will change statistics
+            "checksoldier=soldier attack 9", -- dummy check to get sleep rated as skipped - else it will change statistics
          }
       },
       upgrade_soldier_attack_0 = {
          descname = "upgrading soldier attack from level 0 to level 1",
          actions = {
-            "check_soldier=soldier attack 0", -- Fails when aren't any soldier of level 0 attack
+            "checksoldier=soldier attack 0", -- Fails when aren't any soldier of level 0 attack
             "sleep=30000",
-            "check_soldier=soldier attack 0", -- Because the soldier can be expelled by the player
+            "checksoldier=soldier attack 0", -- Because the soldier can be expelled by the player
             "consume=spear empire_bread fish,meat",
             "train=soldier attack 0 1"
          }
@@ -98,9 +98,9 @@
       upgrade_soldier_attack_1 = {
          descname = "upgrading soldier attack from level 1 to level 2",
          actions = {
-            "check_soldier=soldier attack 1",
+            "checksoldier=soldier attack 1",
             "sleep=30000",
-            "check_soldier=soldier attack 1",
+            "checksoldier=soldier attack 1",
             "consume=spear_advanced empire_bread fish,meat",
             "train=soldier attack 1 2"
          }
@@ -108,9 +108,9 @@
       upgrade_soldier_attack_2 = {
          descname = "upgrading soldier attack from level 2 to level 3",
          actions = {
-            "check_soldier=soldier attack 2",
+            "checksoldier=soldier attack 2",
             "sleep=30000",
-            "check_soldier=soldier attack 2",
+            "checksoldier=soldier attack 2",
             "consume=spear_heavy empire_bread fish,meat:2",
             "train=soldier attack 2 3"
          }
@@ -118,9 +118,9 @@
       upgrade_soldier_attack_3 = {
          descname = "upgrading soldier attack from level 3 to level 4",
          actions = {
-            "check_soldier=soldier attack 3",
+            "checksoldier=soldier attack 3",
             "sleep=30000",
-            "check_soldier=soldier attack 3",
+            "checksoldier=soldier attack 3",
             "consume=spear_war empire_bread:2 fish,meat",
             "train=soldier attack 3 4"
          }
@@ -128,9 +128,9 @@
       upgrade_soldier_health_0 = {
          descname = "upgrading soldier health from level 0 to level 1",
          actions = {
-            "check_soldier=soldier health 0",
+            "checksoldier=soldier health 0",
             "sleep=30000",
-            "check_soldier=soldier health 0",
+            "checksoldier=soldier health 0",
             "consume=armor_helmet empire_bread,fish,meat",
             "train=soldier health 0 1"
          }
@@ -138,9 +138,9 @@
       upgrade_soldier_health_1 = {
          descname = "upgrading soldier health from level 1 to level 2",
          actions = {
-            "check_soldier=soldier health 1",
+            "checksoldier=soldier health 1",
             "sleep=30000",
-            "check_soldier=soldier health 1",
+            "checksoldier=soldier health 1",
             "consume=armor empire_bread fish,meat",
             "train=soldier health 1 2"
          }
@@ -148,9 +148,9 @@
       upgrade_soldier_health_2 = {
          descname = "upgrading soldier health from level 2 to level 3",
          actions = {
-            "check_soldier=soldier health 2",
+            "checksoldier=soldier health 2",
             "sleep=30000",
-            "check_soldier=soldier health 2",
+            "checksoldier=soldier health 2",
             "consume=armor_chain empire_bread:2 fish,meat:2",
             "train=soldier health 2 3"
          }
@@ -158,9 +158,9 @@
       upgrade_soldier_health_3 = {
          descname = "upgrading soldier health from level 3 to level 4",
          actions = {
-            "check_soldier=soldier health 3",
+            "checksoldier=soldier health 3",
             "sleep=30000",
-            "check_soldier=soldier health 3",
+            "checksoldier=soldier health 3",
             "consume=armor_gilded empire_bread:2 fish,meat:2",
             "train=soldier health 3 4"
          }