widelands-dev team mailing list archive

[GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>]

GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1531312-harvested-fields into lp:widelands.

Commit message:
Fixed decay of harvested fields.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1531312 in widelands: "foresters arent planting on old fields"
  https://bugs.launchpad.net/widelands/+bug/1531312

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1531312-harvested-fields/+merge/293161

This bug was introduced by the one_tribe change - the default program for these particular immovables must be called "program". This is not true in general though, so we can't add any checks for this to C++.
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1531312-harvested-fields into lp:widelands.

=== modified file 'data/tribes/immovables/blackrootfield_harvested/init.lua'
--- data/tribes/immovables/blackrootfield_harvested/init.lua	2015-11-03 18:18:27 +0000
+++ data/tribes/immovables/blackrootfield_harvested/init.lua	2016-04-27 18:54:49 +0000
@@ -7,7 +7,7 @@
    descname = pgettext("immovable", "Blackroot Field (harvested)"),
    attributes = { "field" },
    programs = {
-      disappear = {
+      program = {
          "animate=idle 50000",
          "remove=",
       }

=== modified file 'data/tribes/immovables/cornfield_harvested/init.lua'
--- data/tribes/immovables/cornfield_harvested/init.lua	2015-11-03 18:18:27 +0000
+++ data/tribes/immovables/cornfield_harvested/init.lua	2016-04-27 18:54:49 +0000
@@ -7,7 +7,7 @@
    descname = pgettext("immovable", "Cornfield (harvested)"),
    attributes = { "field" },
    programs = {
-      disappear = {
+      program = {
          "animate=idle 50000",
          "remove=",
       }

=== modified file 'data/tribes/immovables/field_harvested/init.lua'
--- data/tribes/immovables/field_harvested/init.lua	2015-11-03 18:18:27 +0000
+++ data/tribes/immovables/field_harvested/init.lua	2016-04-27 18:54:49 +0000
@@ -7,7 +7,7 @@
    descname = pgettext("immovable", "Field (harvested)"),
    attributes = { "field" },
    programs = {
-      disappear = {
+      program = {
          "animate=idle 500000",
          "remove=",
       }