widelands-dev team mailing list archive

[Benedikt Straub <benedikt-straub@xxxxxx>]

Benedikt Straub has proposed merging lp:~widelands-dev/widelands/frisians-fix into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1765403 in widelands: "ERROR: Unused key "requires_helper" in LuaTable. Please report as a bug."
  https://bugs.launchpad.net/widelands/+bug/1765403

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/frisians-fix/+merge/343755

Three small changes to the frisians tribe:
· Corrected requires_supporters AI hint in aqua farm, beekeeper, fruit collector
· Corrected drinking hall helptext
· New juniper shrub
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/frisians-fix into lp:widelands.

=== modified file 'data/tribes/buildings/productionsites/frisians/aqua_farm/init.lua'
--- data/tribes/buildings/productionsites/frisians/aqua_farm/init.lua	2018-04-15 18:38:30 +0000
+++ data/tribes/buildings/productionsites/frisians/aqua_farm/init.lua	2018-04-21 19:41:31 +0000
@@ -33,7 +33,7 @@
 
    aihints = {
       prohibited_till = 760,
-      requires_helper = true
+      requires_supporters = true
    },
 
    working_positions = {

=== modified file 'data/tribes/buildings/productionsites/frisians/beekeepers_house/init.lua'
--- data/tribes/buildings/productionsites/frisians/beekeepers_house/init.lua	2018-04-15 18:38:30 +0000
+++ data/tribes/buildings/productionsites/frisians/beekeepers_house/init.lua	2018-04-21 19:41:31 +0000
@@ -33,7 +33,7 @@
 
    aihints = {
       prohibited_till = 620,
-      requires_helper = true
+      requires_supporters = true
    },
 
    working_positions = {

=== modified file 'data/tribes/buildings/productionsites/frisians/collectors_house/init.lua'
--- data/tribes/buildings/productionsites/frisians/collectors_house/init.lua	2018-04-15 18:38:30 +0000
+++ data/tribes/buildings/productionsites/frisians/collectors_house/init.lua	2018-04-21 19:41:31 +0000
@@ -33,7 +33,7 @@
 
    aihints = {
       prohibited_till = 470,
-      requires_helper = true
+      requires_supporters = true
    },
 
    working_positions = {

=== modified file 'data/tribes/buildings/productionsites/frisians/drinking_hall/helptexts.lua'
--- data/tribes/buildings/productionsites/frisians/drinking_hall/helptexts.lua	2018-01-22 13:40:13 +0000
+++ data/tribes/buildings/productionsites/frisians/drinking_hall/helptexts.lua	2018-04-21 19:41:31 +0000
@@ -13,7 +13,7 @@
 
 function building_helptext_purpose()
    -- TRANSLATORS: Purpose helptext for a building
-   return pgettext("building", "Prepares rations and meals to feed the miners in the basic and deep mines.")
+   return pgettext("frisians_building", "Prepares rations for scouts and rations and meals to feed the miners in all mines.")
 end
 
 function building_helptext_note()

=== modified file 'data/tribes/frisians.lua'
--- data/tribes/frisians.lua	2018-03-27 08:12:55 +0000
+++ data/tribes/frisians.lua	2018-04-21 19:41:31 +0000
@@ -164,6 +164,10 @@
       "berry_bush_currant_red_small",
       "berry_bush_currant_red_medium",
       "berry_bush_currant_red_ripe",
+      "berry_bush_juniper_tiny",
+      "berry_bush_juniper_small",
+      "berry_bush_juniper_medium",
+      "berry_bush_juniper_ripe",
       "berry_bush_raspberry_tiny",
       "berry_bush_raspberry_small",
       "berry_bush_raspberry_medium",

=== added directory 'data/tribes/immovables/berry_bushes/juniper'
=== added file 'data/tribes/immovables/berry_bushes/juniper/helptexts.lua'
--- data/tribes/immovables/berry_bushes/juniper/helptexts.lua	1970-01-01 00:00:00 +0000
+++ data/tribes/immovables/berry_bushes/juniper/helptexts.lua	2018-04-21 19:41:31 +0000
@@ -0,0 +1,13 @@
+function immovable_helptext(tribe)
+   local helptext = {
+      default = ""
+   }
+   local result = ""
+   if tribe then
+      result = helptext[tribe]
+   else
+      result = helptext["default"]
+   end
+   if (result == nil) then result = "" end
+   return result
+end

=== added file 'data/tribes/immovables/berry_bushes/juniper/init.lua'
--- data/tribes/immovables/berry_bushes/juniper/init.lua	1970-01-01 00:00:00 +0000
+++ data/tribes/immovables/berry_bushes/juniper/init.lua	2018-04-21 19:41:31 +0000
@@ -0,0 +1,106 @@
+dirname = path.dirname (__file__)
+
+terrain_affinity = {
+   preferred_temperature = 115,
+   preferred_humidity = 0.6,
+   preferred_fertility = 0.2,
+   pickiness = 0.15,
+}
+
+tribes:new_immovable_type {
+   msgctxt = "immovable",
+   name = "berry_bush_juniper_tiny",
+   descname = _ "Juniper (tiny)",
+   size = "small",
+   helptext_script = dirname .. "helptexts.lua",
+   attributes = { "seed_berrybush" },
+   terrain_affinity = terrain_affinity,
+   programs = {
+      program = {
+         "animate=idle 10000",
+         "remove=60",
+         "grow=berry_bush_juniper_small",
+      },
+   },
+   animations = {
+      idle = {
+         pictures = path.list_files (dirname .. "tiny/idle_?.png"),
+         hotspot = {3, 15},
+         scale = 2,
+      },
+   },
+}
+
+tribes:new_immovable_type {
+   msgctxt = "immovable",
+   name = "berry_bush_juniper_small",
+   descname = _ "Juniper (small)",
+   size = "small",
+   helptext_script = dirname .. "helptexts.lua",
+   attributes = {},
+   terrain_affinity = terrain_affinity,
+   programs = {
+      program = {
+         "animate=idle 10000",
+         "remove=20",
+         "grow=berry_bush_juniper_medium",
+      },
+   },
+   animations = {
+      idle = {
+         pictures = path.list_files (dirname .. "small/idle_?.png"),
+         hotspot = {6, 30},
+         scale = 2,
+      },
+   },
+}
+
+tribes:new_immovable_type {
+   msgctxt = "immovable",
+   name = "berry_bush_juniper_medium",
+   descname = _ "Juniper (medium)",
+   size = "small",
+   helptext_script = dirname .. "helptexts.lua",
+   attributes = { "flowering" },
+   terrain_affinity = terrain_affinity,
+   programs = {
+      program = {
+         "animate=idle 70000",
+         "remove=10",
+         "grow=berry_bush_juniper_ripe",
+      },
+   },
+   animations = {
+      idle = {
+         pictures = path.list_files (dirname .. "medium/idle_?.png"),
+         hotspot = {10, 47},
+         scale = 2,
+      },
+   },
+}
+
+tribes:new_immovable_type {
+   msgctxt = "immovable",
+   name = "berry_bush_juniper_ripe",
+   descname = _ "Juniper (ripe)",
+   size = "small",
+   helptext_script = dirname .. "helptexts.lua",
+   attributes = { "ripe_bush" },
+   terrain_affinity = terrain_affinity,
+   programs = {
+      program = {
+         "animate=idle 800000",
+         "remove=",
+      },
+      harvest = {
+         "remove=",
+      }
+   },
+   animations = {
+      idle = {
+         pictures = path.list_files (dirname .. "ripe/idle_?.png"),
+         hotspot = {11, 49},
+         scale = 2,
+      },
+   },
+}

=== added directory 'data/tribes/immovables/berry_bushes/juniper/medium'
=== added file 'data/tribes/immovables/berry_bushes/juniper/medium/idle_0.png'
Binary files data/tribes/immovables/berry_bushes/juniper/medium/idle_0.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/medium/idle_0.png	2018-04-21 19:41:31 +0000 differ
=== added file 'data/tribes/immovables/berry_bushes/juniper/medium/idle_1.png'
Binary files data/tribes/immovables/berry_bushes/juniper/medium/idle_1.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/medium/idle_1.png	2018-04-21 19:41:31 +0000 differ
=== added file 'data/tribes/immovables/berry_bushes/juniper/medium/idle_2.png'
Binary files data/tribes/immovables/berry_bushes/juniper/medium/idle_2.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/medium/idle_2.png	2018-04-21 19:41:31 +0000 differ
=== added file 'data/tribes/immovables/berry_bushes/juniper/medium/idle_3.png'
Binary files data/tribes/immovables/berry_bushes/juniper/medium/idle_3.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/medium/idle_3.png	2018-04-21 19:41:31 +0000 differ
=== added directory 'data/tribes/immovables/berry_bushes/juniper/ripe'
=== added file 'data/tribes/immovables/berry_bushes/juniper/ripe/idle_0.png'
Binary files data/tribes/immovables/berry_bushes/juniper/ripe/idle_0.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/ripe/idle_0.png	2018-04-21 19:41:31 +0000 differ
=== added file 'data/tribes/immovables/berry_bushes/juniper/ripe/idle_1.png'
Binary files data/tribes/immovables/berry_bushes/juniper/ripe/idle_1.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/ripe/idle_1.png	2018-04-21 19:41:31 +0000 differ
=== added file 'data/tribes/immovables/berry_bushes/juniper/ripe/idle_2.png'
Binary files data/tribes/immovables/berry_bushes/juniper/ripe/idle_2.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/ripe/idle_2.png	2018-04-21 19:41:31 +0000 differ
=== added file 'data/tribes/immovables/berry_bushes/juniper/ripe/idle_3.png'
Binary files data/tribes/immovables/berry_bushes/juniper/ripe/idle_3.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/ripe/idle_3.png	2018-04-21 19:41:31 +0000 differ
=== added directory 'data/tribes/immovables/berry_bushes/juniper/small'
=== added file 'data/tribes/immovables/berry_bushes/juniper/small/idle_0.png'
Binary files data/tribes/immovables/berry_bushes/juniper/small/idle_0.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/small/idle_0.png	2018-04-21 19:41:31 +0000 differ
=== added file 'data/tribes/immovables/berry_bushes/juniper/small/idle_1.png'
Binary files data/tribes/immovables/berry_bushes/juniper/small/idle_1.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/small/idle_1.png	2018-04-21 19:41:31 +0000 differ
=== added file 'data/tribes/immovables/berry_bushes/juniper/small/idle_2.png'
Binary files data/tribes/immovables/berry_bushes/juniper/small/idle_2.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/small/idle_2.png	2018-04-21 19:41:31 +0000 differ
=== added file 'data/tribes/immovables/berry_bushes/juniper/small/idle_3.png'
Binary files data/tribes/immovables/berry_bushes/juniper/small/idle_3.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/small/idle_3.png	2018-04-21 19:41:31 +0000 differ
=== added directory 'data/tribes/immovables/berry_bushes/juniper/tiny'
=== added file 'data/tribes/immovables/berry_bushes/juniper/tiny/idle_0.png'
Binary files data/tribes/immovables/berry_bushes/juniper/tiny/idle_0.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/tiny/idle_0.png	2018-04-21 19:41:31 +0000 differ
=== added file 'data/tribes/immovables/berry_bushes/juniper/tiny/idle_1.png'
Binary files data/tribes/immovables/berry_bushes/juniper/tiny/idle_1.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/tiny/idle_1.png	2018-04-21 19:41:31 +0000 differ
=== added file 'data/tribes/immovables/berry_bushes/juniper/tiny/idle_2.png'
Binary files data/tribes/immovables/berry_bushes/juniper/tiny/idle_2.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/tiny/idle_2.png	2018-04-21 19:41:31 +0000 differ
=== added file 'data/tribes/immovables/berry_bushes/juniper/tiny/idle_3.png'
Binary files data/tribes/immovables/berry_bushes/juniper/tiny/idle_3.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/tiny/idle_3.png	2018-04-21 19:41:31 +0000 differ
=== modified file 'data/tribes/init.lua'
--- data/tribes/init.lua	2018-03-06 09:50:54 +0000
+++ data/tribes/init.lua	2018-04-21 19:41:31 +0000
@@ -200,6 +200,7 @@
       include "tribes/immovables/berry_bushes/strawberry/init.lua"
       include "tribes/immovables/berry_bushes/sea_buckthorn/init.lua"
       include "tribes/immovables/berry_bushes/desert_hackberry/init.lua"
+      include "tribes/immovables/berry_bushes/juniper/init.lua"
       include "tribes/immovables/barleyfield_tiny/init.lua"
       include "tribes/immovables/barleyfield_small/init.lua"
       include "tribes/immovables/barleyfield_medium/init.lua"