Merge lp:~widelands-dev/widelands/frisians-fix into lp:widelands

[Benedikt Straub]

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

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

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3394. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/369582958.
Appveyor build 3200. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_frisians_fix-3200.

[GunChleoc (gunchleoc)]

Code LGTM, not tested

review: Approve

[hessenfarmer (stephan-lutz)]

please do a quick check of the lore text for the Honeybread bakery imo the honey is missing in the text would sound better ... that koneybread is sweeter

[Benedikt Straub (nordfriese)]

OK, I added the honey to the bread

[GunChleoc (gunchleoc)]

Only do this change if you like it yourself - I think it sounds less poetic, and Hessenfarmer & I don't agree on the issue. You're the author, so let's make you the arbiter.

Keep in mind that this is a flavor text and not an instruction to the player. Frisians would get the joke without "honey" in it.

[hessenfarmer (stephan-lutz)]

As we don't fully agree on the issue regarding the honey. We do fully agree on the matter that you should just implement things you are happy with.
Generally spoken: If you have something implemented intentionally I would be happy with the explanation as well instead of having things changed.

[hessenfarmer (stephan-lutz)]

Ok I did a playtest of four AI Players on Full Moon map. Beekeepers and fruit collectors were build in the vicinity of the relevant supporters.
However I noticed some things which I Need to analyze.
AI built very few claypits (only one AI built 2 of them still lacking clay extremely. This maybe fixed with Training, otherwise we Need to dig into the code.
Vicinity of supporter (supporters_nearby in the code) currently seems to be defined in a way, that it is sufficient that the working Areas just overlap by one field this is not good in terms of efficiency of the supported building, Will try to analyze this and discuss it with Tibor

review: Approve (playtest)

[GunChleoc (gunchleoc)]

Sounds good to me. Thanks for testing!

Let's have this branch and do further improvements in a follow-up branch.

@bunnybot merge

[TiborB (tiborb95)]

@hessenfarmer

the issue with working areas of supporters sound interesting - we can discuss it on forum or elsewhere...

=== 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-22 15:54:03 +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-22 15:54:03 +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-22 15:54:03 +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-22 15:54:03 +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/buildings/productionsites/frisians/honey_bread_bakery/helptexts.lua'
--- data/tribes/buildings/productionsites/frisians/honey_bread_bakery/helptexts.lua	2018-02-17 15:41:29 +0000
+++ data/tribes/buildings/productionsites/frisians/honey_bread_bakery/helptexts.lua	2018-04-22 15:54:03 +0000
@@ -3,7 +3,7 @@
 
 function building_helptext_lore ()
    -- TRANSLATORS: Lore helptext for a building
-   return pgettext ("frisians_building", "Rookies will say that vengeance is sweet. Heroes will say that bread is sweeter.")
+   return pgettext ("frisians_building", "Rookies will say that vengeance is sweet. Heroes will say that honey bread is sweeter.")
 end
 
 function building_helptext_lore_author ()

=== modified file 'data/tribes/frisians.lua'
--- data/tribes/frisians.lua	2018-03-27 08:12:55 +0000
+++ data/tribes/frisians.lua	2018-04-22 15:54:03 +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-22 15:54:03 +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-22 15:54:03 +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-22 15:54:03 +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-22 15:54:03 +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-22 15:54:03 +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-22 15:54:03 +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-22 15:54:03 +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-22 15:54:03 +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-22 15:54:03 +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-22 15:54:03 +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-22 15:54:03 +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-22 15:54:03 +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-22 15:54:03 +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-22 15:54:03 +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-22 15:54:03 +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-22 15:54:03 +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-22 15:54:03 +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-22 15:54:03 +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-22 15:54:03 +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"