Merge lp:~widelands-dev/widelands/rework-resource-indicators into lp:widelands

[Benedikt Straub]

Removed name and amount restrictions for resource indicators. Created a different set of resi graphics for each tribe.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3854. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/422215867.
Appveyor build 3652. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_rework_resource_indicators-3652.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3858. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/422459572.
Appveyor build 3656. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_rework_resource_indicators-3656.

[GunChleoc (gunchleoc)]

I have done some in-game testing now - the code is almost ready, but still needs some tweaking. I'll add my comments for the graphics to the bug.

Code review of the C++ bits to follow.

Barbarian scenario 1 is fixed correctly, but the indicators are huge. They are also huge in the Encyclopedia. Please make them to scale - we can have bigger ones once we have mipmaps, which are pretty much ready but targeted for Build 21. https://code.launchpad.net/~widelands-dev/widelands/mipmaps

I have fixed the seafaring tutorial.

In-game help for mines is broken. I have fixed it for the Atlanteans, but the Barbarians don't follow the naming scheme. We can bzr mv the pictures, but I think the better solution would be to get the immovables by name and then get their representative_image.

Please rename the "png" folder to "pics" for consistency and fix the scripts accordingly. May sound like nitpicking, but it does make the file structure easier to navigate ;)

review: Needs Fixing

[GunChleoc (gunchleoc)]

Code review on the diff done - see comments.

[Benedikt Straub (nordfriese)]

Implemented most of your comments, and changed the graphics. Didn´t touch the atlantean images yet, will do so now.

I disagree about hardcoding the none-resi as "none". Hardcoded name restrictions are always a bad thing; it should be possible for a future modder to create a new resource named "none" if they want. Better not to have any hardcoded names and use the only string that makes no sense at all as a resource name, "".

[Benedikt Straub (nordfriese)]

Remaining graphics changed. Please test again.

review: Needs Resubmitting

[GunChleoc (gunchleoc)]

For fixing the help, add definitions for the icon to the init.lua, like this:

    icon = dirname .. "coal.png",

You can then reference it via

    immovable_description.icon_name

Maybe we should use the same trick in the Barbarian scenario too, that will make it more resistant against changes in the implementation details.

[Benedikt Straub (nordfriese)]

OK, refactored the building help so it now queries the highest resi for the given resource from the given TribeDescr and uses its representative_image. The barbarian scenario also uses representative_image for each resi now instead of fixed image paths.
There was no need to define an icon, as representative_image points to the first idle frame by default.

[GunChleoc (gunchleoc)]

Code looks good to me - I have removed the iterators and pushed a commit.

- Barbarian indicators are good.
- Empire: I still have a bit of difficulty seeing the difference between no resources and stones. Maybe give them a bevel or something? Or give the marble a bit of color. The Arena's color might work better.
- Atlanteans: I still can't see the indicators for stones on a grey mountain. They need brighter colors overall. Lay the borders on thick.
- Frisians are good now

[GunChleoc (gunchleoc)]

I like the design for empire, but we still need more contrast. Make the colors pop, including the line for the "no resources" indicator - I can hardly see that it's there, and people who have trouble seeing contrasts will not see that it's there at all ;)

http://accessibility.psu.edu/color/contrasthtml/

[Benedikt Straub (nordfriese)]

Uploaded new graphics for empire and atlantean resis. How about these?

[GunChleoc (gunchleoc)]

I have made some quick and dirty adjustments in Gimp for some Empire resis so you see what I mean. The increased saturation makes it possible to see them without strain, but they will need to be done properly in Blender and also more tweaks for color balancing so that they will look harmonious.

I think the Atlantean colors are OK now. I am having trouble seeing the "none" indicators though, and I couldn't make it better. Maybe basing the poles off the flags' poles will work better?

I think we should also give this branch to the forum community for testing before we merge.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3912. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/426196539.
Appveyor build 3710. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_rework_resource_indicators-3710.

[Benedikt Straub (nordfriese)]

I can´t reproduce these saturation improvements in Blender well enough, so I used GIMP to edit my renders now. Also gave the atlanteans a new none resi that is better visible because it´s animated.

[GunChleoc (gunchleoc)]

We're getting there :)

I still have trouble seeing the differences between little stone and lots of stone for the Empire. Maybe make the dark frame around the inner color a bit wider?

The Atlantean "none" is well visible now, but since it has more cloth than the others, it implies that it has lots and lost of something... maybe give it some ropes without cloth, as if they got ready to hang a cloth for the resources, but there was nothing there? Or a really thin horizontal band of cloth.

[Benedikt Straub (nordfriese)]

And another attempt ;)

[GunChleoc (gunchleoc)]

Empire is good now :)

Atlantean "none" still signals to me that there is something important there - it's visually too busy. Try just 1 strip of cloth in the middle and remove the 3rd pole?

[Benedikt Straub (nordfriese)]

I´ve lost count the how-many-th version this is ;)
I find only one strip of cloth hard to see, unless it´s very broad. How about these new crossed silk strips?

[GunChleoc (gunchleoc)]

Yes, we have a winner :D

@bunnybot merge

> I´ve lost count the how-many-th version this is ;)

Me too... I find code easier to review *lol*

review: Approve

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3963. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/428098620.
Appveyor build 3761. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_rework_resource_indicators-3761.

[bunnybot (widelandsofficial)]

Refusing to merge, since Travis is not green. Use @bunnybot merge force for merging anyways.

Travis build 3963. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/428098620.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3968. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/428511168.
Appveyor build 3766. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_rework_resource_indicators-3766.

[GunChleoc (gunchleoc)]

@bunnybot merge

=== modified file 'data/campaigns/bar01.wmf/scripting/texts.lua'
--- data/campaigns/bar01.wmf/scripting/texts.lua	2018-08-13 16:44:58 +0000
+++ data/campaigns/bar01.wmf/scripting/texts.lua	2018-09-14 06:31:21 +0000
@@ -43,16 +43,16 @@
    body = objective_text(_"Build coal and iron mines",
       li(_"Build a coal mine and an iron mine.") ..
       li_arrow(_"To do so, place a flag up on the mountain’s flank to the east (on mountain terrain though, not mountain meadow). When you click on the new flag, you can send geologists there. Because the flag is on a mountain, the geologists will search for ores; otherwise, they would search for water. Then build a mine for both kinds of resources that they will find, choosing the appropriate mine to be built:") ..
-      li_image("tribes/immovables/resi_coal1/idle_00.png", _"a bit of coal") ..
-      li_image("tribes/immovables/resi_coal2/idle_00.png", _"a lot of coal") ..
-      li_image("tribes/immovables/resi_iron1/idle_00.png", _"a bit of iron") ..
-      li_image("tribes/immovables/resi_iron2/idle_00.png", _"a lot of iron") ..
-      li_image("tribes/immovables/resi_gold1/idle_00.png", _"a bit of gold") ..
-      li_image("tribes/immovables/resi_gold2/idle_00.png", _"a lot of gold") ..
-      li_image("tribes/immovables/resi_stones1/idle_00.png", _"a bit of granite") ..
-      li_image("tribes/immovables/resi_stones2/idle_00.png", _"a lot of granite") ..
-      li_image("tribes/immovables/resi_water1/idle_00.png", _"water") ..
-      li_image("tribes/immovables/resi_none/idle_00.png", _"nothing was found here") ..
+      li_image(wl.Game():get_immovable_description("barbarians_resi_coal_1").representative_image, _"a bit of coal") ..
+      li_image(wl.Game():get_immovable_description("barbarians_resi_coal_2").representative_image, _"a lot of coal") ..
+      li_image(wl.Game():get_immovable_description("barbarians_resi_iron_1").representative_image, _"a bit of iron") ..
+      li_image(wl.Game():get_immovable_description("barbarians_resi_iron_2").representative_image, _"a lot of iron") ..
+      li_image(wl.Game():get_immovable_description("barbarians_resi_gold_1").representative_image, _"a bit of gold") ..
+      li_image(wl.Game():get_immovable_description("barbarians_resi_gold_2").representative_image, _"a lot of gold") ..
+      li_image(wl.Game():get_immovable_description("barbarians_resi_stones_1").representative_image, _"a bit of granite") ..
+      li_image(wl.Game():get_immovable_description("barbarians_resi_stones_2").representative_image, _"a lot of granite") ..
+      li_image(wl.Game():get_immovable_description("barbarians_resi_water").representative_image, _"water") ..
+      li_image(wl.Game():get_immovable_description("barbarians_resi_none").representative_image, _"nothing was found here") ..
       p(_[[Mines can only be built on mountain terrain. Suitable places for mines are displayed as orange mine symbols.]]))
 }
 
 
=== modified file 'data/campaigns/tutorial03_seafaring.wmf/scripting/mission_thread.lua'
--- data/campaigns/tutorial03_seafaring.wmf/scripting/mission_thread.lua	2017-05-07 10:30:33 +0000
+++ data/campaigns/tutorial03_seafaring.wmf/scripting/mission_thread.lua	2018-09-14 06:31:21 +0000
@@ -75,7 +75,7 @@
          local idx = math.random(#fields)
          f = fields[idx]
          if ((f.resource == "iron") and not f.immovable) then
-            map:place_immovable("resi_iron2",f,"tribes")
+            map:place_immovable("atlanteans_resi_iron_2",f,"tribes")
             successful = true
          end
          table.remove(fields,idx)
 
=== modified file 'data/images/wui/overlays/mine.png'
 Binary files data/images/wui/overlays/mine.png	2014-12-03 20:13:06 +0000 and data/images/wui/overlays/mine.png	2018-09-14 06:31:21 +0000 differ
=== modified file 'data/tribes/atlanteans.lua'
--- data/tribes/atlanteans.lua	2017-11-23 09:13:06 +0000
+++ data/tribes/atlanteans.lua	2018-09-14 06:31:21 +0000
@@ -22,6 +22,8 @@
 --
 --    **roads**: The file paths for the tribes' road textures in 2 subtables ``busy`` and ``normal``
 --
+--    **resource_indicators**: The names for the resource indicators. This table contains a subtable for each resource name plus a subtable named "" for no resources. Each subtable is an array, in which the index of each entry is the highest amount of resources the indicator may indicate.
+--
 --    **wares_order**: This defines all the wares that this tribe uses and their display order in the user interface. Each subtable defines a column in the user interface.
 --
 --    **workers_order**:  This defines all the workers that this tribe uses and their display order in the user interface. Each subtable defines a column in the user interface.
@@ -73,6 +75,31 @@
       },
    },
 
+   resource_indicators = {
+      [""] = {
+         [0] = "atlanteans_resi_none",
+      },
+      coal = {
+         [10] = "atlanteans_resi_coal_1",
+         [20] = "atlanteans_resi_coal_2",
+      },
+      iron = {
+         [10] = "atlanteans_resi_iron_1",
+         [20] = "atlanteans_resi_iron_2",
+      },
+      gold = {
+         [10] = "atlanteans_resi_gold_1",
+         [20] = "atlanteans_resi_gold_2",
+      },
+      stones = {
+         [10] = "atlanteans_resi_stones_1",
+         [20] = "atlanteans_resi_stones_2",
+      },
+      water = {
+         [100] = "atlanteans_resi_water",
+      },
+   },
+
    -- Wares positions in wares windows.
    -- This also gives us the information which wares the tribe uses.
    -- Each subtable is a column in the wares windows.
@@ -205,16 +232,16 @@
       "cornfield_ripe",
       "cornfield_harvested",
       "destroyed_building",
-      "resi_coal1",
-      "resi_coal2",
-      "resi_gold1",
-      "resi_gold2",
-      "resi_iron1",
-      "resi_iron2",
-      "resi_none",
-      "resi_water1",
-      "resi_stones1",
-      "resi_stones2",
+      "atlanteans_resi_none",
+      "atlanteans_resi_water",
+      "atlanteans_resi_coal_1",
+      "atlanteans_resi_iron_1",
+      "atlanteans_resi_gold_1",
+      "atlanteans_resi_stones_1",
+      "atlanteans_resi_coal_2",
+      "atlanteans_resi_iron_2",
+      "atlanteans_resi_gold_2",
+      "atlanteans_resi_stones_2",
       "atlanteans_shipconstruction",
    },
 
 
=== modified file 'data/tribes/barbarians.lua'
--- data/tribes/barbarians.lua	2018-07-15 10:32:12 +0000
+++ data/tribes/barbarians.lua	2018-09-14 06:31:21 +0000
@@ -26,6 +26,31 @@
       },
    },
 
+   resource_indicators = {
+      [""] = {
+         [0] = "barbarians_resi_none",
+      },
+      coal = {
+         [10] = "barbarians_resi_coal_1",
+         [20] = "barbarians_resi_coal_2",
+      },
+      iron = {
+         [10] = "barbarians_resi_iron_1",
+         [20] = "barbarians_resi_iron_2",
+      },
+      gold = {
+         [10] = "barbarians_resi_gold_1",
+         [20] = "barbarians_resi_gold_2",
+      },
+      stones = {
+         [10] = "barbarians_resi_stones_1",
+         [20] = "barbarians_resi_stones_2",
+      },
+      water = {
+         [100] = "barbarians_resi_water",
+      },
+   },
+
    -- Wares positions in wares windows.
    -- This also gives us the information which wares the tribe uses.
    -- Each subtable is a column in the wares windows.
@@ -155,16 +180,16 @@
       "reed_small",
       "reed_medium",
       "reed_ripe",
-      "resi_coal1",
-      "resi_coal2",
-      "resi_gold1",
-      "resi_gold2",
-      "resi_iron1",
-      "resi_iron2",
-      "resi_none",
-      "resi_water1",
-      "resi_stones1",
-      "resi_stones2",
+      "barbarians_resi_none",
+      "barbarians_resi_water",
+      "barbarians_resi_coal_1",
+      "barbarians_resi_iron_1",
+      "barbarians_resi_gold_1",
+      "barbarians_resi_stones_1",
+      "barbarians_resi_coal_2",
+      "barbarians_resi_iron_2",
+      "barbarians_resi_gold_2",
+      "barbarians_resi_stones_2",
       "barbarians_shipconstruction",
    },
 
 
=== modified file 'data/tribes/empire.lua'
--- data/tribes/empire.lua	2017-11-25 23:32:30 +0000
+++ data/tribes/empire.lua	2018-09-14 06:31:21 +0000
@@ -29,6 +29,31 @@
       },
    },
 
+   resource_indicators = {
+      [""] = {
+         [0] = "empire_resi_none",
+      },
+      coal = {
+         [10] = "empire_resi_coal_1",
+         [20] = "empire_resi_coal_2",
+      },
+      iron = {
+         [10] = "empire_resi_iron_1",
+         [20] = "empire_resi_iron_2",
+      },
+      gold = {
+         [10] = "empire_resi_gold_1",
+         [20] = "empire_resi_gold_2",
+      },
+      stones = {
+         [10] = "empire_resi_stones_1",
+         [20] = "empire_resi_stones_2",
+      },
+      water = {
+         [100] = "empire_resi_water",
+      },
+   },
+
    -- Wares positions in wares windows.
    -- This also gives us the information which wares the tribe uses.
    -- Each subtable is a column in the wares windows.
@@ -163,16 +188,16 @@
       "grapevine_small",
       "grapevine_medium",
       "grapevine_ripe",
-      "resi_coal1",
-      "resi_coal2",
-      "resi_gold1",
-      "resi_gold2",
-      "resi_iron1",
-      "resi_iron2",
-      "resi_none",
-      "resi_water1",
-      "resi_stones1",
-      "resi_stones2",
+      "empire_resi_none",
+      "empire_resi_water",
+      "empire_resi_coal_1",
+      "empire_resi_iron_1",
+      "empire_resi_gold_1",
+      "empire_resi_stones_1",
+      "empire_resi_coal_2",
+      "empire_resi_iron_2",
+      "empire_resi_gold_2",
+      "empire_resi_stones_2",
       "empire_shipconstruction",
    },
 
 
=== modified file 'data/tribes/frisians.lua'
--- data/tribes/frisians.lua	2018-05-17 11:02:45 +0000
+++ data/tribes/frisians.lua	2018-09-14 06:31:21 +0000
@@ -27,6 +27,31 @@
       },
    },
 
+   resource_indicators = {
+      [""] = {
+         [0] = "frisians_resi_none",
+      },
+      coal = {
+         [10] = "frisians_resi_coal_1",
+         [20] = "frisians_resi_coal_2",
+      },
+      iron = {
+         [10] = "frisians_resi_iron_1",
+         [20] = "frisians_resi_iron_2",
+      },
+      gold = {
+         [10] = "frisians_resi_gold_1",
+         [20] = "frisians_resi_gold_2",
+      },
+      stones = {
+         [10] = "frisians_resi_stones_1",
+         [20] = "frisians_resi_stones_2",
+      },
+      water = {
+         [100] = "frisians_resi_water",
+      },
+   },
+
    -- Wares positions in wares windows.
    -- This also gives us the information which wares the tribe uses.
    -- Each subtable is a column in the wares windows.
@@ -201,16 +226,16 @@
       "reed_small",
       "reed_medium",
       "reed_ripe",
-      "resi_coal1",
-      "resi_coal2",
-      "resi_gold1",
-      "resi_gold2",
-      "resi_iron1",
-      "resi_iron2",
-      "resi_none",
-      "resi_water1",
-      "resi_stones1",
-      "resi_stones2",
+      "frisians_resi_none",
+      "frisians_resi_water",
+      "frisians_resi_coal_1",
+      "frisians_resi_iron_1",
+      "frisians_resi_gold_1",
+      "frisians_resi_stones_1",
+      "frisians_resi_coal_2",
+      "frisians_resi_iron_2",
+      "frisians_resi_gold_2",
+      "frisians_resi_stones_2",
       "frisians_shipconstruction",
       --These non-frisian immovables can be used by bee-keepers
       "field_medium",
 
=== added directory 'data/tribes/immovables/resi'
=== added directory 'data/tribes/immovables/resi/atlanteans'
=== added file 'data/tribes/immovables/resi/atlanteans/init.lua'
--- data/tribes/immovables/resi/atlanteans/init.lua	1970-01-01 00:00:00 +0000
+++ data/tribes/immovables/resi/atlanteans/init.lua	2018-09-14 06:31:21 +0000
@@ -0,0 +1,230 @@
+dirname = path.dirname(__file__)
+
+tribes:new_immovable_type {
+   msgctxt = "immovable",
+   name = "atlanteans_resi_none",
+   -- TRANSLATORS: This is a resource name used in lists of resources
+   descname = pgettext("immovable", "Resources: None"),
+   helptext_script = dirname .. "../helptexts/none.lua",
+   attributes = { "resi" },
+   programs = {
+      program = {
+         "animate=idle 600000",
+         "remove="
+      }
+   },
+
+   animations = {
+      idle = {
+         pictures = path.list_files(dirname .. "pics/none_?.png"),
+         hotspot = {10, 36},
+      },
+   }
+}
+
+tribes:new_immovable_type {
+   msgctxt = "immovable",
+   name = "atlanteans_resi_water",
+   -- TRANSLATORS: This is a resource name used in lists of resources
+   descname = pgettext("immovable", "Resources: Water Vein"),
+   helptext_script = dirname .. "../helptexts/water.lua",
+   attributes = { "resi" },
+   programs = {
+      program = {
+         "animate=idle 600000",
+         "remove="
+      }
+   },
+
+   animations = {
+      idle = {
+         pictures = path.list_files(dirname .. "pics/water_?.png"),
+         hotspot = {10, 36},
+         fps = 4,
+      },
+   }
+}
+
+tribes:new_immovable_type {
+   msgctxt = "immovable",
+   name = "atlanteans_resi_coal_1",
+   -- TRANSLATORS: This is a resource name used in lists of resources
+   descname = pgettext("immovable", "Resources: Coal Vein"),
+   helptext_script = dirname .. "../helptexts/coal_1.lua",
+   attributes = { "resi" },
+   programs = {
+      program = {
+         "animate=idle 600000",
+         "remove="
+      }
+   },
+
+   animations = {
+      idle = {
+         pictures = path.list_files(dirname .. "pics/coal_1_?.png"),
+         hotspot = {10, 36},
+         fps = 4,
+      },
+   }
+}
+
+tribes:new_immovable_type {
+   msgctxt = "immovable",
+   name = "atlanteans_resi_gold_1",
+   -- TRANSLATORS: This is a resource name used in lists of resources
+   descname = pgettext("immovable", "Resources: Gold Vein"),
+   helptext_script = dirname .. "../helptexts/gold_1.lua",
+   attributes = { "resi" },
+   programs = {
+      program = {
+         "animate=idle 600000",
+         "remove="
+      }
+   },
+
+   animations = {
+      idle = {
+         pictures = path.list_files(dirname .. "pics/gold_1_?.png"),
+         hotspot = {10, 36},
+         fps = 4,
+      },
+   }
+}
+
+tribes:new_immovable_type {
+   msgctxt = "immovable",
+   name = "atlanteans_resi_iron_1",
+   -- TRANSLATORS: This is a resource name used in lists of resources
+   descname = pgettext("immovable", "Resources: Iron Vein"),
+   helptext_script = dirname .. "../helptexts/iron_1.lua",
+   attributes = { "resi" },
+   programs = {
+      program = {
+         "animate=idle 600000",
+         "remove="
+      }
+   },
+
+   animations = {
+      idle = {
+         pictures = path.list_files(dirname .. "pics/iron_1_?.png"),
+         hotspot = {10, 36},
+         fps = 4,
+      },
+   }
+}
+
+tribes:new_immovable_type {
+   msgctxt = "immovable",
+   name = "atlanteans_resi_stones_1",
+   -- TRANSLATORS: This is a resource name used in lists of resources
+   descname = pgettext("immovable", "Resources: Some Stones"),
+   helptext_script = dirname .. "../helptexts/stones_1.lua",
+   attributes = { "resi" },
+   programs = {
+      program = {
+         "animate=idle 600000",
+         "remove="
+      }
+   },
+
+   animations = {
+      idle = {
+         pictures = path.list_files(dirname .. "pics/stones_1_?.png"),
+         hotspot = {10, 36},
+         fps = 4,
+      },
+   }
+}
+
+tribes:new_immovable_type {
+   msgctxt = "immovable",
+   name = "atlanteans_resi_coal_2",
+   -- TRANSLATORS: This is a resource name used in lists of resources
+   descname = pgettext("immovable", "Resources: Main Coal Vein"),
+   helptext_script = dirname .. "../helptexts/coal_2.lua",
+   attributes = { "resi" },
+   programs = {
+      program = {
+         "animate=idle 600000",
+         "remove="
+      }
+   },
+
+   animations = {
+      idle = {
+         pictures = path.list_files(dirname .. "pics/coal_2_?.png"),
+         hotspot = {10, 36},
+         fps = 4,
+      },
+   }
+}
+
+tribes:new_immovable_type {
+   msgctxt = "immovable",
+   name = "atlanteans_resi_gold_2",
+   -- TRANSLATORS: This is a resource name used in lists of resources
+   descname = pgettext("immovable", "Resources: Main Gold Vein"),
+   helptext_script = dirname .. "../helptexts/gold_2.lua",
+   attributes = { "resi" },
+   programs = {
+      program = {
+         "animate=idle 600000",
+         "remove="
+      }
+   },
+
+   animations = {
+      idle = {
+         pictures = path.list_files(dirname .. "pics/gold_2_?.png"),
+         hotspot = {10, 36},
+         fps = 4,
+      },
+   }
+}
+
+tribes:new_immovable_type {
+   msgctxt = "immovable",
+   name = "atlanteans_resi_iron_2",
+   -- TRANSLATORS: This is a resource name used in lists of resources
+   descname = pgettext("immovable", "Resources: Main Iron Vein"),
+   helptext_script = dirname .. "../helptexts/iron_2.lua",
+   attributes = { "resi" },
+   programs = {
+      program = {
+         "animate=idle 600000",
+         "remove="
+      }
+   },
+
+   animations = {
+      idle = {
+         pictures = path.list_files(dirname .. "pics/iron_2_?.png"),
+         hotspot = {10, 36},
+         fps = 4,
+      },
+   }
+}
+
+tribes:new_immovable_type {
+   msgctxt = "immovable",
+   name = "atlanteans_resi_stones_2",
+   -- TRANSLATORS: This is a resource name used in lists of resources
+   descname = pgettext("immovable", "Resources: A Lot of Stones"),
+   helptext_script = dirname .. "../helptexts/stones_2.lua",
+   attributes = { "resi" },
+   programs = {
+      program = {
+         "animate=idle 600000",
+         "remove="
+      }
+   },
+
+   animations = {
+      idle = {
+         pictures = path.list_files(dirname .. "pics/stones_2_?.png"),
+         hotspot = {10, 36},
+         fps = 4,
+      },
+   }
+}
 
=== added directory 'data/tribes/immovables/resi/atlanteans/pics'
=== added file 'data/tribes/immovables/resi/atlanteans/pics/coal_1_0.png'
 Binary files data/tribes/immovables/resi/atlanteans/pics/coal_1_0.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/atlanteans/pics/coal_1_0.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/atlanteans/pics/coal_1_1.png'
 Binary files data/tribes/immovables/resi/atlanteans/pics/coal_1_1.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/atlanteans/pics/coal_1_1.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/atlanteans/pics/coal_1_2.png'
 Binary files data/tribes/immovables/resi/atlanteans/pics/coal_1_2.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/atlanteans/pics/coal_1_2.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/atlanteans/pics/coal_1_3.png'
 Binary files data/tribes/immovables/resi/atlanteans/pics/coal_1_3.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/atlanteans/pics/coal_1_3.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/atlanteans/pics/coal_2_0.png'
 Binary files data/tribes/immovables/resi/atlanteans/pics/coal_2_0.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/atlanteans/pics/coal_2_0.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/atlanteans/pics/coal_2_1.png'
 Binary files data/tribes/immovables/resi/atlanteans/pics/coal_2_1.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/atlanteans/pics/coal_2_1.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/atlanteans/pics/coal_2_2.png'
 Binary files data/tribes/immovables/resi/atlanteans/pics/coal_2_2.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/atlanteans/pics/coal_2_2.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/atlanteans/pics/coal_2_3.png'
 Binary files data/tribes/immovables/resi/atlanteans/pics/coal_2_3.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/atlanteans/pics/coal_2_3.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/atlanteans/pics/gold_1_0.png'
 Binary files data/tribes/immovables/resi/atlanteans/pics/gold_1_0.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/atlanteans/pics/gold_1_0.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/atlanteans/pics/gold_1_1.png'
 Binary files data/tribes/immovables/resi/atlanteans/pics/gold_1_1.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/atlanteans/pics/gold_1_1.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/atlanteans/pics/gold_1_2.png'
 Binary files data/tribes/immovables/resi/atlanteans/pics/gold_1_2.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/atlanteans/pics/gold_1_2.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/atlanteans/pics/gold_1_3.png'
 Binary files data/tribes/immovables/resi/atlanteans/pics/gold_1_3.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/atlanteans/pics/gold_1_3.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/atlanteans/pics/gold_2_0.png'
 Binary files data/tribes/immovables/resi/atlanteans/pics/gold_2_0.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/atlanteans/pics/gold_2_0.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/atlanteans/pics/gold_2_1.png'
 Binary files data/tribes/immovables/resi/atlanteans/pics/gold_2_1.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/atlanteans/pics/gold_2_1.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/atlanteans/pics/gold_2_2.png'
 Binary files data/tribes/immovables/resi/atlanteans/pics/gold_2_2.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/atlanteans/pics/gold_2_2.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/atlanteans/pics/gold_2_3.png'
 Binary files data/tribes/immovables/resi/atlanteans/pics/gold_2_3.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/atlanteans/pics/gold_2_3.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/atlanteans/pics/iron_1_0.png'
 Binary files data/tribes/immovables/resi/atlanteans/pics/iron_1_0.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/atlanteans/pics/iron_1_0.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/atlanteans/pics/iron_1_1.png'
 Binary files data/tribes/immovables/resi/atlanteans/pics/iron_1_1.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/atlanteans/pics/iron_1_1.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/atlanteans/pics/iron_1_2.png'
 Binary files data/tribes/immovables/resi/atlanteans/pics/iron_1_2.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/atlanteans/pics/iron_1_2.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/atlanteans/pics/iron_1_3.png'
 Binary files data/tribes/immovables/resi/atlanteans/pics/iron_1_3.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/atlanteans/pics/iron_1_3.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/atlanteans/pics/iron_2_0.png'
 Binary files data/tribes/immovables/resi/atlanteans/pics/iron_2_0.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/atlanteans/pics/iron_2_0.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/atlanteans/pics/iron_2_1.png'
 Binary files data/tribes/immovables/resi/atlanteans/pics/iron_2_1.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/atlanteans/pics/iron_2_1.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/atlanteans/pics/iron_2_2.png'
 Binary files data/tribes/immovables/resi/atlanteans/pics/iron_2_2.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/atlanteans/pics/iron_2_2.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/atlanteans/pics/iron_2_3.png'
 Binary files data/tribes/immovables/resi/atlanteans/pics/iron_2_3.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/atlanteans/pics/iron_2_3.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/atlanteans/pics/none_0.png'
 Binary files data/tribes/immovables/resi/atlanteans/pics/none_0.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/atlanteans/pics/none_0.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/atlanteans/pics/none_1.png'
 Binary files data/tribes/immovables/resi/atlanteans/pics/none_1.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/atlanteans/pics/none_1.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/atlanteans/pics/none_2.png'
 Binary files data/tribes/immovables/resi/atlanteans/pics/none_2.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/atlanteans/pics/none_2.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/atlanteans/pics/none_3.png'
 Binary files data/tribes/immovables/resi/atlanteans/pics/none_3.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/atlanteans/pics/none_3.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/atlanteans/pics/stones_1_0.png'
 Binary files data/tribes/immovables/resi/atlanteans/pics/stones_1_0.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/atlanteans/pics/stones_1_0.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/atlanteans/pics/stones_1_1.png'
 Binary files data/tribes/immovables/resi/atlanteans/pics/stones_1_1.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/atlanteans/pics/stones_1_1.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/atlanteans/pics/stones_1_2.png'
 Binary files data/tribes/immovables/resi/atlanteans/pics/stones_1_2.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/atlanteans/pics/stones_1_2.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/atlanteans/pics/stones_1_3.png'
 Binary files data/tribes/immovables/resi/atlanteans/pics/stones_1_3.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/atlanteans/pics/stones_1_3.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/atlanteans/pics/stones_2_0.png'
 Binary files data/tribes/immovables/resi/atlanteans/pics/stones_2_0.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/atlanteans/pics/stones_2_0.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/atlanteans/pics/stones_2_1.png'
 Binary files data/tribes/immovables/resi/atlanteans/pics/stones_2_1.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/atlanteans/pics/stones_2_1.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/atlanteans/pics/stones_2_2.png'
 Binary files data/tribes/immovables/resi/atlanteans/pics/stones_2_2.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/atlanteans/pics/stones_2_2.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/atlanteans/pics/stones_2_3.png'
 Binary files data/tribes/immovables/resi/atlanteans/pics/stones_2_3.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/atlanteans/pics/stones_2_3.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/atlanteans/pics/water_0.png'
 Binary files data/tribes/immovables/resi/atlanteans/pics/water_0.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/atlanteans/pics/water_0.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/atlanteans/pics/water_1.png'
 Binary files data/tribes/immovables/resi/atlanteans/pics/water_1.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/atlanteans/pics/water_1.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/atlanteans/pics/water_2.png'
 Binary files data/tribes/immovables/resi/atlanteans/pics/water_2.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/atlanteans/pics/water_2.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/atlanteans/pics/water_3.png'
 Binary files data/tribes/immovables/resi/atlanteans/pics/water_3.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/atlanteans/pics/water_3.png	2018-09-14 06:31:21 +0000 differ
=== added directory 'data/tribes/immovables/resi/barbarians'
=== added file 'data/tribes/immovables/resi/barbarians/init.lua'
--- data/tribes/immovables/resi/barbarians/init.lua	1970-01-01 00:00:00 +0000
+++ data/tribes/immovables/resi/barbarians/init.lua	2018-09-14 06:31:21 +0000
@@ -0,0 +1,221 @@
+dirname = path.dirname(__file__)
+
+tribes:new_immovable_type {
+   msgctxt = "immovable",
+   name = "barbarians_resi_none",
+   -- TRANSLATORS: This is a resource name used in lists of resources
+   descname = pgettext("immovable", "Resources: None"),
+   helptext_script = dirname .. "../helptexts/none.lua",
+   attributes = { "resi" },
+   programs = {
+      program = {
+         "animate=idle 600000",
+         "remove="
+      }
+   },
+
+   animations = {
+      idle = {
+         pictures = { dirname .. "pics/none.png" },
+         hotspot = {9, 28},
+      },
+   }
+}
+
+tribes:new_immovable_type {
+   msgctxt = "immovable",
+   name = "barbarians_resi_water",
+   -- TRANSLATORS: This is a resource name used in lists of resources
+   descname = pgettext("immovable", "Resources: Water Vein"),
+   helptext_script = dirname .. "../helptexts/water.lua",
+   attributes = { "resi" },
+   programs = {
+      program = {
+         "animate=idle 600000",
+         "remove="
+      }
+   },
+
+   animations = {
+      idle = {
+         pictures = { dirname .. "pics/water.png" },
+         hotspot = {9, 28},
+      },
+   }
+}
+
+tribes:new_immovable_type {
+   msgctxt = "immovable",
+   name = "barbarians_resi_coal_1",
+   -- TRANSLATORS: This is a resource name used in lists of resources
+   descname = pgettext("immovable", "Resources: Coal Vein"),
+   helptext_script = dirname .. "../helptexts/coal_1.lua",
+   attributes = { "resi" },
+   programs = {
+      program = {
+         "animate=idle 600000",
+         "remove="
+      }
+   },
+
+   animations = {
+      idle = {
+         pictures = { dirname .. "pics/coal_1.png" },
+         hotspot = {9, 28},
+      },
+   }
+}
+
+tribes:new_immovable_type {
+   msgctxt = "immovable",
+   name = "barbarians_resi_gold_1",
+   -- TRANSLATORS: This is a resource name used in lists of resources
+   descname = pgettext("immovable", "Resources: Gold Vein"),
+   helptext_script = dirname .. "../helptexts/gold_1.lua",
+   attributes = { "resi" },
+   programs = {
+      program = {
+         "animate=idle 600000",
+         "remove="
+      }
+   },
+
+   animations = {
+      idle = {
+         pictures = { dirname .. "pics/gold_1.png" },
+         hotspot = {9, 28},
+      },
+   }
+}
+
+tribes:new_immovable_type {
+   msgctxt = "immovable",
+   name = "barbarians_resi_iron_1",
+   -- TRANSLATORS: This is a resource name used in lists of resources
+   descname = pgettext("immovable", "Resources: Iron Vein"),
+   helptext_script = dirname .. "../helptexts/iron_1.lua",
+   attributes = { "resi" },
+   programs = {
+      program = {
+         "animate=idle 600000",
+         "remove="
+      }
+   },
+
+   animations = {
+      idle = {
+         pictures = { dirname .. "pics/iron_1.png" },
+         hotspot = {9, 28},
+      },
+   }
+}
+
+tribes:new_immovable_type {
+   msgctxt = "immovable",
+   name = "barbarians_resi_stones_1",
+   -- TRANSLATORS: This is a resource name used in lists of resources
+   descname = pgettext("immovable", "Resources: Some Stones"),
+   helptext_script = dirname .. "../helptexts/stones_1.lua",
+   attributes = { "resi" },
+   programs = {
+      program = {
+         "animate=idle 600000",
+         "remove="
+      }
+   },
+
+   animations = {
+      idle = {
+         pictures = { dirname .. "pics/stones_1.png" },
+         hotspot = {9, 28},
+      },
+   }
+}
+
+tribes:new_immovable_type {
+   msgctxt = "immovable",
+   name = "barbarians_resi_coal_2",
+   -- TRANSLATORS: This is a resource name used in lists of resources
+   descname = pgettext("immovable", "Resources: Main Coal Vein"),
+   helptext_script = dirname .. "../helptexts/coal_2.lua",
+   attributes = { "resi" },
+   programs = {
+      program = {
+         "animate=idle 600000",
+         "remove="
+      }
+   },
+
+   animations = {
+      idle = {
+         pictures = { dirname .. "pics/coal_2.png" },
+         hotspot = {9, 28},
+      },
+   }
+}
+
+tribes:new_immovable_type {
+   msgctxt = "immovable",
+   name = "barbarians_resi_gold_2",
+   -- TRANSLATORS: This is a resource name used in lists of resources
+   descname = pgettext("immovable", "Resources: Main Gold Vein"),
+   helptext_script = dirname .. "../helptexts/gold_2.lua",
+   attributes = { "resi" },
+   programs = {
+      program = {
+         "animate=idle 600000",
+         "remove="
+      }
+   },
+
+   animations = {
+      idle = {
+         pictures = { dirname .. "pics/gold_2.png" },
+         hotspot = {9, 28},
+      },
+   }
+}
+
+tribes:new_immovable_type {
+   msgctxt = "immovable",
+   name = "barbarians_resi_iron_2",
+   -- TRANSLATORS: This is a resource name used in lists of resources
+   descname = pgettext("immovable", "Resources: Main Iron Vein"),
+   helptext_script = dirname .. "../helptexts/iron_2.lua",
+   attributes = { "resi" },
+   programs = {
+      program = {
+         "animate=idle 600000",
+         "remove="
+      }
+   },
+
+   animations = {
+      idle = {
+         pictures = { dirname .. "pics/iron_2.png" },
+         hotspot = {9, 28},
+      },
+   }
+}
+
+tribes:new_immovable_type {
+   msgctxt = "immovable",
+   name = "barbarians_resi_stones_2",
+   -- TRANSLATORS: This is a resource name used in lists of resources
+   descname = pgettext("immovable", "Resources: A Lot of Stones"),
+   helptext_script = dirname .. "../helptexts/stones_2.lua",
+   attributes = { "resi" },
+   programs = {
+      program = {
+         "animate=idle 600000",
+         "remove="
+      }
+   },
+
+   animations = {
+      idle = {
+         pictures = { dirname .. "pics/stones_2.png" },
+         hotspot = {9, 28},
+      },
+   }
+}
 
=== added directory 'data/tribes/immovables/resi/barbarians/pics'
=== added file 'data/tribes/immovables/resi/barbarians/pics/coal_1.png'
 Binary files data/tribes/immovables/resi/barbarians/pics/coal_1.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/barbarians/pics/coal_1.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/barbarians/pics/coal_2.png'
 Binary files data/tribes/immovables/resi/barbarians/pics/coal_2.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/barbarians/pics/coal_2.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/barbarians/pics/gold_1.png'
 Binary files data/tribes/immovables/resi/barbarians/pics/gold_1.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/barbarians/pics/gold_1.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/barbarians/pics/gold_2.png'
 Binary files data/tribes/immovables/resi/barbarians/pics/gold_2.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/barbarians/pics/gold_2.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/barbarians/pics/iron_1.png'
 Binary files data/tribes/immovables/resi/barbarians/pics/iron_1.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/barbarians/pics/iron_1.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/barbarians/pics/iron_2.png'
 Binary files data/tribes/immovables/resi/barbarians/pics/iron_2.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/barbarians/pics/iron_2.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/barbarians/pics/none.png'
 Binary files data/tribes/immovables/resi/barbarians/pics/none.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/barbarians/pics/none.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/barbarians/pics/stones_1.png'
 Binary files data/tribes/immovables/resi/barbarians/pics/stones_1.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/barbarians/pics/stones_1.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/barbarians/pics/stones_2.png'
 Binary files data/tribes/immovables/resi/barbarians/pics/stones_2.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/barbarians/pics/stones_2.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/barbarians/pics/water.png'
 Binary files data/tribes/immovables/resi/barbarians/pics/water.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/barbarians/pics/water.png	2018-09-14 06:31:21 +0000 differ
=== added directory 'data/tribes/immovables/resi/empire'
=== added file 'data/tribes/immovables/resi/empire/init.lua'
--- data/tribes/immovables/resi/empire/init.lua	1970-01-01 00:00:00 +0000
+++ data/tribes/immovables/resi/empire/init.lua	2018-09-14 06:31:21 +0000
@@ -0,0 +1,221 @@
+dirname = path.dirname(__file__)
+
+tribes:new_immovable_type {
+   msgctxt = "immovable",
+   name = "empire_resi_none",
+   -- TRANSLATORS: This is a resource name used in lists of resources
+   descname = pgettext("immovable", "Resources: None"),
+   helptext_script = dirname .. "../helptexts/none.lua",
+   attributes = { "resi" },
+   programs = {
+      program = {
+         "animate=idle 600000",
+         "remove="
+      }
+   },
+
+   animations = {
+      idle = {
+         pictures = { dirname .. "pics/none.png" },
+         hotspot = {8, 22},
+      },
+   }
+}
+
+tribes:new_immovable_type {
+   msgctxt = "immovable",
+   name = "empire_resi_water",
+   -- TRANSLATORS: This is a resource name used in lists of resources
+   descname = pgettext("immovable", "Resources: Water Vein"),
+   helptext_script = dirname .. "../helptexts/water.lua",
+   attributes = { "resi" },
+   programs = {
+      program = {
+         "animate=idle 600000",
+         "remove="
+      }
+   },
+
+   animations = {
+      idle = {
+         pictures = { dirname .. "pics/water.png" },
+         hotspot = {8, 22},
+      },
+   }
+}
+
+tribes:new_immovable_type {
+   msgctxt = "immovable",
+   name = "empire_resi_coal_1",
+   -- TRANSLATORS: This is a resource name used in lists of resources
+   descname = pgettext("immovable", "Resources: Coal Vein"),
+   helptext_script = dirname .. "../helptexts/coal_1.lua",
+   attributes = { "resi" },
+   programs = {
+      program = {
+         "animate=idle 600000",
+         "remove="
+      }
+   },
+
+   animations = {
+      idle = {
+         pictures = { dirname .. "pics/coal_1.png" },
+         hotspot = {8, 22},
+      },
+   }
+}
+
+tribes:new_immovable_type {
+   msgctxt = "immovable",
+   name = "empire_resi_gold_1",
+   -- TRANSLATORS: This is a resource name used in lists of resources
+   descname = pgettext("immovable", "Resources: Gold Vein"),
+   helptext_script = dirname .. "../helptexts/gold_1.lua",
+   attributes = { "resi" },
+   programs = {
+      program = {
+         "animate=idle 600000",
+         "remove="
+      }
+   },
+
+   animations = {
+      idle = {
+         pictures = { dirname .. "pics/gold_1.png" },
+         hotspot = {8, 22},
+      },
+   }
+}
+
+tribes:new_immovable_type {
+   msgctxt = "immovable",
+   name = "empire_resi_iron_1",
+   -- TRANSLATORS: This is a resource name used in lists of resources
+   descname = pgettext("immovable", "Resources: Iron Vein"),
+   helptext_script = dirname .. "../helptexts/iron_1.lua",
+   attributes = { "resi" },
+   programs = {
+      program = {
+         "animate=idle 600000",
+         "remove="
+      }
+   },
+
+   animations = {
+      idle = {
+         pictures = { dirname .. "pics/iron_1.png" },
+         hotspot = {8, 22},
+      },
+   }
+}
+
+tribes:new_immovable_type {
+   msgctxt = "immovable",
+   name = "empire_resi_stones_1",
+   -- TRANSLATORS: This is a resource name used in lists of resources
+   descname = pgettext("immovable", "Resources: Some Stones"),
+   helptext_script = dirname .. "../helptexts/stones_1.lua",
+   attributes = { "resi" },
+   programs = {
+      program = {
+         "animate=idle 600000",
+         "remove="
+      }
+   },
+
+   animations = {
+      idle = {
+         pictures = { dirname .. "pics/stones_1.png" },
+         hotspot = {8, 22},
+      },
+   }
+}
+
+tribes:new_immovable_type {
+   msgctxt = "immovable",
+   name = "empire_resi_coal_2",
+   -- TRANSLATORS: This is a resource name used in lists of resources
+   descname = pgettext("immovable", "Resources: Main Coal Vein"),
+   helptext_script = dirname .. "../helptexts/coal_2.lua",
+   attributes = { "resi" },
+   programs = {
+      program = {
+         "animate=idle 600000",
+         "remove="
+      }
+   },
+
+   animations = {
+      idle = {
+         pictures = { dirname .. "pics/coal_2.png" },
+         hotspot = {8, 22},
+      },
+   }
+}
+
+tribes:new_immovable_type {
+   msgctxt = "immovable",
+   name = "empire_resi_gold_2",
+   -- TRANSLATORS: This is a resource name used in lists of resources
+   descname = pgettext("immovable", "Resources: Main Gold Vein"),
+   helptext_script = dirname .. "../helptexts/gold_2.lua",
+   attributes = { "resi" },
+   programs = {
+      program = {
+         "animate=idle 600000",
+         "remove="
+      }
+   },
+
+   animations = {
+      idle = {
+         pictures = { dirname .. "pics/gold_2.png" },
+         hotspot = {8, 22},
+      },
+   }
+}
+
+tribes:new_immovable_type {
+   msgctxt = "immovable",
+   name = "empire_resi_iron_2",
+   -- TRANSLATORS: This is a resource name used in lists of resources
+   descname = pgettext("immovable", "Resources: Main Iron Vein"),
+   helptext_script = dirname .. "../helptexts/iron_2.lua",
+   attributes = { "resi" },
+   programs = {
+      program = {
+         "animate=idle 600000",
+         "remove="
+      }
+   },
+
+   animations = {
+      idle = {
+         pictures = { dirname .. "pics/iron_2.png" },
+         hotspot = {8, 22},
+      },
+   }
+}
+
+tribes:new_immovable_type {
+   msgctxt = "immovable",
+   name = "empire_resi_stones_2",
+   -- TRANSLATORS: This is a resource name used in lists of resources
+   descname = pgettext("immovable", "Resources: A Lot of Stones"),
+   helptext_script = dirname .. "../helptexts/stones_2.lua",
+   attributes = { "resi" },
+   programs = {
+      program = {
+         "animate=idle 600000",
+         "remove="
+      }
+   },
+
+   animations = {
+      idle = {
+         pictures = { dirname .. "pics/stones_2.png" },
+         hotspot = {8, 22},
+      },
+   }
+}
 
=== added directory 'data/tribes/immovables/resi/empire/pics'
=== added file 'data/tribes/immovables/resi/empire/pics/coal_1.png'
 Binary files data/tribes/immovables/resi/empire/pics/coal_1.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/empire/pics/coal_1.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/empire/pics/coal_2.png'
 Binary files data/tribes/immovables/resi/empire/pics/coal_2.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/empire/pics/coal_2.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/empire/pics/gold_1.png'
 Binary files data/tribes/immovables/resi/empire/pics/gold_1.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/empire/pics/gold_1.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/empire/pics/gold_2.png'
 Binary files data/tribes/immovables/resi/empire/pics/gold_2.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/empire/pics/gold_2.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/empire/pics/iron_1.png'
 Binary files data/tribes/immovables/resi/empire/pics/iron_1.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/empire/pics/iron_1.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/empire/pics/iron_2.png'
 Binary files data/tribes/immovables/resi/empire/pics/iron_2.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/empire/pics/iron_2.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/empire/pics/none.png'
 Binary files data/tribes/immovables/resi/empire/pics/none.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/empire/pics/none.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/empire/pics/stones_1.png'
 Binary files data/tribes/immovables/resi/empire/pics/stones_1.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/empire/pics/stones_1.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/empire/pics/stones_2.png'
 Binary files data/tribes/immovables/resi/empire/pics/stones_2.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/empire/pics/stones_2.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/empire/pics/water.png'
 Binary files data/tribes/immovables/resi/empire/pics/water.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/empire/pics/water.png	2018-09-14 06:31:21 +0000 differ
=== added directory 'data/tribes/immovables/resi/frisians'
=== added file 'data/tribes/immovables/resi/frisians/init.lua'
--- data/tribes/immovables/resi/frisians/init.lua	1970-01-01 00:00:00 +0000
+++ data/tribes/immovables/resi/frisians/init.lua	2018-09-14 06:31:21 +0000
@@ -0,0 +1,230 @@
+dirname = path.dirname(__file__)
+
+tribes:new_immovable_type {
+   msgctxt = "immovable",
+   name = "frisians_resi_none",
+   -- TRANSLATORS: This is a resource name used in lists of resources
+   descname = pgettext("immovable", "Resources: None"),
+   helptext_script = dirname .. "../helptexts/none.lua",
+   attributes = { "resi" },
+   programs = {
+      program = {
+         "animate=idle 600000",
+         "remove="
+      }
+   },
+
+   animations = {
+      idle = {
+         pictures = { dirname .. "pics/none.png" },
+         hotspot = {2, 49},
+      },
+   }
+}
+
+tribes:new_immovable_type {
+   msgctxt = "immovable",
+   name = "frisians_resi_water",
+   -- TRANSLATORS: This is a resource name used in lists of resources
+   descname = pgettext("immovable", "Resources: Water Vein"),
+   helptext_script = dirname .. "../helptexts/water.lua",
+   attributes = { "resi" },
+   programs = {
+      program = {
+         "animate=idle 600000",
+         "remove="
+      }
+   },
+
+   animations = {
+      idle = {
+         pictures = path.list_files(dirname .. "pics/water_?.png"),
+         hotspot = {2, 49},
+         fps = 4,
+      },
+   }
+}
+
+tribes:new_immovable_type {
+   msgctxt = "immovable",
+   name = "frisians_resi_coal_1",
+   -- TRANSLATORS: This is a resource name used in lists of resources
+   descname = pgettext("immovable", "Resources: Coal Vein"),
+   helptext_script = dirname .. "../helptexts/coal_1.lua",
+   attributes = { "resi" },
+   programs = {
+      program = {
+         "animate=idle 600000",
+         "remove="
+      }
+   },
+
+   animations = {
+      idle = {
+         pictures = path.list_files(dirname .. "pics/coal_1_?.png"),
+         hotspot = {2, 49},
+         fps = 4,
+      },
+   }
+}
+
+tribes:new_immovable_type {
+   msgctxt = "immovable",
+   name = "frisians_resi_gold_1",
+   -- TRANSLATORS: This is a resource name used in lists of resources
+   descname = pgettext("immovable", "Resources: Gold Vein"),
+   helptext_script = dirname .. "../helptexts/gold_1.lua",
+   attributes = { "resi" },
+   programs = {
+      program = {
+         "animate=idle 600000",
+         "remove="
+      }
+   },
+
+   animations = {
+      idle = {
+         pictures = path.list_files(dirname .. "pics/gold_1_?.png"),
+         hotspot = {2, 49},
+         fps = 4,
+      },
+   }
+}
+
+tribes:new_immovable_type {
+   msgctxt = "immovable",
+   name = "frisians_resi_iron_1",
+   -- TRANSLATORS: This is a resource name used in lists of resources
+   descname = pgettext("immovable", "Resources: Iron Vein"),
+   helptext_script = dirname .. "../helptexts/iron_1.lua",
+   attributes = { "resi" },
+   programs = {
+      program = {
+         "animate=idle 600000",
+         "remove="
+      }
+   },
+
+   animations = {
+      idle = {
+         pictures = path.list_files(dirname .. "pics/iron_1_?.png"),
+         hotspot = {2, 49},
+         fps = 4,
+      },
+   }
+}
+
+tribes:new_immovable_type {
+   msgctxt = "immovable",
+   name = "frisians_resi_stones_1",
+   -- TRANSLATORS: This is a resource name used in lists of resources
+   descname = pgettext("immovable", "Resources: Some Stones"),
+   helptext_script = dirname .. "../helptexts/stones_1.lua",
+   attributes = { "resi" },
+   programs = {
+      program = {
+         "animate=idle 600000",
+         "remove="
+      }
+   },
+
+   animations = {
+      idle = {
+         pictures = path.list_files(dirname .. "pics/stones_1_?.png"),
+         hotspot = {2, 49},
+         fps = 4,
+      },
+   }
+}
+
+tribes:new_immovable_type {
+   msgctxt = "immovable",
+   name = "frisians_resi_coal_2",
+   -- TRANSLATORS: This is a resource name used in lists of resources
+   descname = pgettext("immovable", "Resources: Main Coal Vein"),
+   helptext_script = dirname .. "../helptexts/coal_2.lua",
+   attributes = { "resi" },
+   programs = {
+      program = {
+         "animate=idle 600000",
+         "remove="
+      }
+   },
+
+   animations = {
+      idle = {
+         pictures = path.list_files(dirname .. "pics/coal_2_?.png"),
+         hotspot = {2, 49},
+         fps = 4,
+      },
+   }
+}
+
+tribes:new_immovable_type {
+   msgctxt = "immovable",
+   name = "frisians_resi_gold_2",
+   -- TRANSLATORS: This is a resource name used in lists of resources
+   descname = pgettext("immovable", "Resources: Main Gold Vein"),
+   helptext_script = dirname .. "../helptexts/gold_2.lua",
+   attributes = { "resi" },
+   programs = {
+      program = {
+         "animate=idle 600000",
+         "remove="
+      }
+   },
+
+   animations = {
+      idle = {
+         pictures = path.list_files(dirname .. "pics/gold_2_?.png"),
+         hotspot = {2, 49},
+         fps = 4,
+      },
+   }
+}
+
+tribes:new_immovable_type {
+   msgctxt = "immovable",
+   name = "frisians_resi_iron_2",
+   -- TRANSLATORS: This is a resource name used in lists of resources
+   descname = pgettext("immovable", "Resources: Main Iron Vein"),
+   helptext_script = dirname .. "../helptexts/iron_2.lua",
+   attributes = { "resi" },
+   programs = {
+      program = {
+         "animate=idle 600000",
+         "remove="
+      }
+   },
+
+   animations = {
+      idle = {
+         pictures = path.list_files(dirname .. "pics/iron_2_?.png"),
+         hotspot = {2, 49},
+         fps = 4,
+      },
+   }
+}
+
+tribes:new_immovable_type {
+   msgctxt = "immovable",
+   name = "frisians_resi_stones_2",
+   -- TRANSLATORS: This is a resource name used in lists of resources
+   descname = pgettext("immovable", "Resources: A Lot of Stones"),
+   helptext_script = dirname .. "../helptexts/stones_2.lua",
+   attributes = { "resi" },
+   programs = {
+      program = {
+         "animate=idle 600000",
+         "remove="
+      }
+   },
+
+   animations = {
+      idle = {
+         pictures = path.list_files(dirname .. "pics/stones_2_?.png"),
+         hotspot = {2, 49},
+         fps = 4,
+      },
+   }
+}
 
=== added directory 'data/tribes/immovables/resi/frisians/pics'
=== added file 'data/tribes/immovables/resi/frisians/pics/coal_1_0.png'
 Binary files data/tribes/immovables/resi/frisians/pics/coal_1_0.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/frisians/pics/coal_1_0.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/frisians/pics/coal_1_1.png'
 Binary files data/tribes/immovables/resi/frisians/pics/coal_1_1.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/frisians/pics/coal_1_1.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/frisians/pics/coal_1_2.png'
 Binary files data/tribes/immovables/resi/frisians/pics/coal_1_2.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/frisians/pics/coal_1_2.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/frisians/pics/coal_1_3.png'
 Binary files data/tribes/immovables/resi/frisians/pics/coal_1_3.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/frisians/pics/coal_1_3.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/frisians/pics/coal_2_0.png'
 Binary files data/tribes/immovables/resi/frisians/pics/coal_2_0.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/frisians/pics/coal_2_0.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/frisians/pics/coal_2_1.png'
 Binary files data/tribes/immovables/resi/frisians/pics/coal_2_1.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/frisians/pics/coal_2_1.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/frisians/pics/coal_2_2.png'
 Binary files data/tribes/immovables/resi/frisians/pics/coal_2_2.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/frisians/pics/coal_2_2.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/frisians/pics/coal_2_3.png'
 Binary files data/tribes/immovables/resi/frisians/pics/coal_2_3.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/frisians/pics/coal_2_3.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/frisians/pics/gold_1_0.png'
 Binary files data/tribes/immovables/resi/frisians/pics/gold_1_0.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/frisians/pics/gold_1_0.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/frisians/pics/gold_1_1.png'
 Binary files data/tribes/immovables/resi/frisians/pics/gold_1_1.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/frisians/pics/gold_1_1.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/frisians/pics/gold_1_2.png'
 Binary files data/tribes/immovables/resi/frisians/pics/gold_1_2.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/frisians/pics/gold_1_2.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/frisians/pics/gold_1_3.png'
 Binary files data/tribes/immovables/resi/frisians/pics/gold_1_3.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/frisians/pics/gold_1_3.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/frisians/pics/gold_2_0.png'
 Binary files data/tribes/immovables/resi/frisians/pics/gold_2_0.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/frisians/pics/gold_2_0.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/frisians/pics/gold_2_1.png'
 Binary files data/tribes/immovables/resi/frisians/pics/gold_2_1.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/frisians/pics/gold_2_1.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/frisians/pics/gold_2_2.png'
 Binary files data/tribes/immovables/resi/frisians/pics/gold_2_2.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/frisians/pics/gold_2_2.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/frisians/pics/gold_2_3.png'
 Binary files data/tribes/immovables/resi/frisians/pics/gold_2_3.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/frisians/pics/gold_2_3.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/frisians/pics/iron_1_0.png'
 Binary files data/tribes/immovables/resi/frisians/pics/iron_1_0.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/frisians/pics/iron_1_0.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/frisians/pics/iron_1_1.png'
 Binary files data/tribes/immovables/resi/frisians/pics/iron_1_1.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/frisians/pics/iron_1_1.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/frisians/pics/iron_1_2.png'
 Binary files data/tribes/immovables/resi/frisians/pics/iron_1_2.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/frisians/pics/iron_1_2.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/frisians/pics/iron_1_3.png'
 Binary files data/tribes/immovables/resi/frisians/pics/iron_1_3.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/frisians/pics/iron_1_3.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/frisians/pics/iron_2_0.png'
 Binary files data/tribes/immovables/resi/frisians/pics/iron_2_0.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/frisians/pics/iron_2_0.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/frisians/pics/iron_2_1.png'
 Binary files data/tribes/immovables/resi/frisians/pics/iron_2_1.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/frisians/pics/iron_2_1.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/frisians/pics/iron_2_2.png'
 Binary files data/tribes/immovables/resi/frisians/pics/iron_2_2.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/frisians/pics/iron_2_2.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/frisians/pics/iron_2_3.png'
 Binary files data/tribes/immovables/resi/frisians/pics/iron_2_3.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/frisians/pics/iron_2_3.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/frisians/pics/none.png'
 Binary files data/tribes/immovables/resi/frisians/pics/none.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/frisians/pics/none.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/frisians/pics/stones_1_0.png'
 Binary files data/tribes/immovables/resi/frisians/pics/stones_1_0.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/frisians/pics/stones_1_0.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/frisians/pics/stones_1_1.png'
 Binary files data/tribes/immovables/resi/frisians/pics/stones_1_1.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/frisians/pics/stones_1_1.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/frisians/pics/stones_1_2.png'
 Binary files data/tribes/immovables/resi/frisians/pics/stones_1_2.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/frisians/pics/stones_1_2.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/frisians/pics/stones_1_3.png'
 Binary files data/tribes/immovables/resi/frisians/pics/stones_1_3.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/frisians/pics/stones_1_3.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/frisians/pics/stones_2_0.png'
 Binary files data/tribes/immovables/resi/frisians/pics/stones_2_0.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/frisians/pics/stones_2_0.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/frisians/pics/stones_2_1.png'
 Binary files data/tribes/immovables/resi/frisians/pics/stones_2_1.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/frisians/pics/stones_2_1.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/frisians/pics/stones_2_2.png'
 Binary files data/tribes/immovables/resi/frisians/pics/stones_2_2.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/frisians/pics/stones_2_2.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/frisians/pics/stones_2_3.png'
 Binary files data/tribes/immovables/resi/frisians/pics/stones_2_3.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/frisians/pics/stones_2_3.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/frisians/pics/water_0.png'
 Binary files data/tribes/immovables/resi/frisians/pics/water_0.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/frisians/pics/water_0.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/frisians/pics/water_1.png'
 Binary files data/tribes/immovables/resi/frisians/pics/water_1.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/frisians/pics/water_1.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/frisians/pics/water_2.png'
 Binary files data/tribes/immovables/resi/frisians/pics/water_2.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/frisians/pics/water_2.png	2018-09-14 06:31:21 +0000 differ
=== added file 'data/tribes/immovables/resi/frisians/pics/water_3.png'
 Binary files data/tribes/immovables/resi/frisians/pics/water_3.png	1970-01-01 00:00:00 +0000 and data/tribes/immovables/resi/frisians/pics/water_3.png	2018-09-14 06:31:21 +0000 differ
=== added directory 'data/tribes/immovables/resi/helptexts'
=== added file 'data/tribes/immovables/resi/helptexts/coal_1.lua'
--- data/tribes/immovables/resi/helptexts/coal_1.lua	1970-01-01 00:00:00 +0000
+++ data/tribes/immovables/resi/helptexts/coal_1.lua	2018-09-14 06:31:21 +0000
@@ -0,0 +1,17 @@
+function immovable_helptext(tribe)
+   local helptext = {
+      default = pgettext("sentence_separator", "%s %s"):bformat(
+         -- TRANSLATORS: Helptext for a resource: Coal
+         _("Coal veins contain coal that can be dug up by coal mines."),
+         -- TRANSLATORS: Helptext for a resource: Coal
+         _("There is only a little bit of coal here."))
+   }
+   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/resi/helptexts/coal_2.lua'
--- data/tribes/immovables/resi/helptexts/coal_2.lua	1970-01-01 00:00:00 +0000
+++ data/tribes/immovables/resi/helptexts/coal_2.lua	2018-09-14 06:31:21 +0000
@@ -0,0 +1,17 @@
+function immovable_helptext(tribe)
+   local helptext = {
+      default = pgettext("sentence_separator", "%s %s"):bformat(
+         -- TRANSLATORS: Helptext for a resource: Coal
+         _("Coal veins contain coal that can be dug up by coal mines."),
+         -- TRANSLATORS: Helptext for a resource: Coal
+         _("There is a lot of coal here."))
+   }
+   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/resi/helptexts/gold_1.lua'
--- data/tribes/immovables/resi/helptexts/gold_1.lua	1970-01-01 00:00:00 +0000
+++ data/tribes/immovables/resi/helptexts/gold_1.lua	2018-09-14 06:31:21 +0000
@@ -0,0 +1,17 @@
+function immovable_helptext(tribe)
+   local helptext = {
+      default = pgettext("sentence_separator", "%s %s"):bformat(
+         -- TRANSLATORS: Helptext for a resource: Gold
+         _("Gold veins contain gold ore that can be dug up by gold mines."),
+         -- TRANSLATORS: Helptext for a resource: Gold
+         _("There is only a little bit of gold here."))
+   }
+   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/resi/helptexts/gold_2.lua'
--- data/tribes/immovables/resi/helptexts/gold_2.lua	1970-01-01 00:00:00 +0000
+++ data/tribes/immovables/resi/helptexts/gold_2.lua	2018-09-14 06:31:21 +0000
@@ -0,0 +1,17 @@
+function immovable_helptext(tribe)
+   local helptext = {
+      default = pgettext("sentence_separator", "%s %s"):bformat(
+         -- TRANSLATORS: Helptext for a resource: Gold
+         _("Gold veins contain gold ore that can be dug up by gold mines."),
+         -- TRANSLATORS: Helptext for a resource: Gold
+         _("There is a lot of gold here."))
+   }
+   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/resi/helptexts/iron_1.lua'
--- data/tribes/immovables/resi/helptexts/iron_1.lua	1970-01-01 00:00:00 +0000
+++ data/tribes/immovables/resi/helptexts/iron_1.lua	2018-09-14 06:31:21 +0000
@@ -0,0 +1,17 @@
+function immovable_helptext(tribe)
+   local helptext = {
+      default = pgettext("sentence_separator", "%s %s"):bformat(
+         -- TRANSLATORS: Helptext for a resource: Iron
+         _("Iron veins contain iron ore that can be dug up by iron mines."),
+         -- TRANSLATORS: Helptext for a resource: Iron
+         _("There is only a little bit of iron here."))
+   }
+   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/resi/helptexts/iron_2.lua'
--- data/tribes/immovables/resi/helptexts/iron_2.lua	1970-01-01 00:00:00 +0000
+++ data/tribes/immovables/resi/helptexts/iron_2.lua	2018-09-14 06:31:21 +0000
@@ -0,0 +1,17 @@
+function immovable_helptext(tribe)
+   local helptext = {
+      default = pgettext("sentence_separator", "%s %s"):bformat(
+         -- TRANSLATORS: Helptext for a resource: Iron
+         _("Iron veins contain iron ore that can be dug up by iron mines."),
+         -- TRANSLATORS: Helptext for a resource: Iron
+         _("There is a lot of iron here."))
+   }
+   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/resi/helptexts/none.lua'
--- data/tribes/immovables/resi/helptexts/none.lua	1970-01-01 00:00:00 +0000
+++ data/tribes/immovables/resi/helptexts/none.lua	2018-09-14 06:31:21 +0000
@@ -0,0 +1,14 @@
+function immovable_helptext(tribe)
+   local helptext = {
+      -- TRANSLATORS: Helptext for a resource: No resources
+      default = _("There are no resources in the ground here.")
+   }
+   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/resi/helptexts/stones_1.lua'
--- data/tribes/immovables/resi/helptexts/stones_1.lua	1970-01-01 00:00:00 +0000
+++ data/tribes/immovables/resi/helptexts/stones_1.lua	2018-09-14 06:31:21 +0000
@@ -0,0 +1,32 @@
+function immovable_helptext(tribe)
+   local helptext = {
+      atlanteans = pgettext("sentence_separator", "%s %s"):bformat(
+         -- TRANSLATORS: Helptext for an Atlantean resource: Stones
+         _("Precious stones are used in the construction of big buildings. They can be dug up by a crystal mine. You will also get granite from the mine."),
+         -- TRANSLATORS: Helptext for an Atlantean resource: Stones
+         _("There are only a few precious stones here.")),
+      barbarians = pgettext("sentence_separator", "%s %s"):bformat(
+         -- TRANSLATORS: Helptext for a Barbarian resource: Stones
+         _("Granite is a basic building material and can be dug up by a granite mine."),
+         -- TRANSLATORS: Helptext for a Barbarian resource: Stones
+         _("There is only a little bit of granite here.")),
+      empire = pgettext("sentence_separator", "%s %s"):bformat(
+         -- TRANSLATORS: Helptext for an Empire resource: Stones
+         _("Marble is a basic building material and can be dug up by a marble mine. You will also get granite from the mine."),
+         -- TRANSLATORS: Helptext for an Empire resource: Stones
+         _("There is only a little bit of marble here.")),
+      frisians = pgettext("sentence_separator", "%s %s"):bformat(
+         -- TRANSLATORS: Helptext for a Frisian resource: Stones
+         _("Granite is a basic building material and can be dug up by a rock mine."),
+         -- TRANSLATORS: Helptext for a Frisian resource: Stones
+         _("There is only a little bit of granite here.")),
+   }
+   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/resi/helptexts/stones_2.lua'
--- data/tribes/immovables/resi/helptexts/stones_2.lua	1970-01-01 00:00:00 +0000
+++ data/tribes/immovables/resi/helptexts/stones_2.lua	2018-09-14 06:31:21 +0000
@@ -0,0 +1,32 @@
+function immovable_helptext(tribe)
+   local helptext = {
+      atlanteans = pgettext("sentence_separator", "%s %s"):bformat(
+         -- TRANSLATORS: Helptext for an Atlantean resource: Stones
+         _("Precious stones are used in the construction of big buildings. They can be dug up by a crystal mine. You will also get granite from the mine."),
+         -- TRANSLATORS: Helptext for an Atlantean resource: Stones
+         _("There are many precious stones here.")),
+      barbarians = pgettext("sentence_separator", "%s %s"):bformat(
+         -- TRANSLATORS: Helptext for a Barbarian resource: Stones
+         _("Granite is a basic building material and can be dug up by a granite mine."),
+         -- TRANSLATORS: Helptext for a Barbarian resource: Stones
+         _("There is a lot of granite here.")),
+      empire = pgettext("sentence_separator", "%s %s"):bformat(
+         -- TRANSLATORS: Helptext for an Empire resource: Stones
+         _("Marble is a basic building material and can be dug up by a marble mine. You will also get granite from the mine."),
+         -- TRANSLATORS: Helptext for an Empire resource: Stones
+         _("There is a lot of marble here.")),
+      frisians = pgettext("sentence_separator", "%s %s"):bformat(
+         -- TRANSLATORS: Helptext for a Frisian resource: Stones
+         _("Granite is a basic building material and can be dug up by a rock mine."),
+         -- TRANSLATORS: Helptext for a Frisian resource: Stones
+         _("There is a lot of granite here.")),
+   }
+   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/resi/helptexts/water.lua'
--- data/tribes/immovables/resi/helptexts/water.lua	1970-01-01 00:00:00 +0000
+++ data/tribes/immovables/resi/helptexts/water.lua	2018-09-14 06:31:21 +0000
@@ -0,0 +1,14 @@
+function immovable_helptext(tribe)
+   local helptext = {
+      -- TRANSLATORS: Helptext for a resource: Water
+      default = _("There is water in the ground here that can be pulled up by a well.")
+   }
+   local result = ""
+   if tribe then
+      result = helptext[tribe]
+   else
+      result = helptext["default"]
+   end
+   if (result == nil) then result = "" end
+   return result
+end
 
=== removed directory 'data/tribes/immovables/resi_coal1'
=== removed file 'data/tribes/immovables/resi_coal1/helptexts.lua'
--- data/tribes/immovables/resi_coal1/helptexts.lua	2017-11-12 16:21:28 +0000
+++ data/tribes/immovables/resi_coal1/helptexts.lua	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-function immovable_helptext(tribe)
-   local helptext = {
-      default = pgettext("sentence_separator", "%s %s"):bformat(
-         -- TRANSLATORS: Helptext for a resource: Coal
-         _("Coal veins contain coal that can be dug up by coal mines."),
-         -- TRANSLATORS: Helptext for a resource: Coal
-         _("There is only a little bit of coal here."))
-   }
-   local result = ""
-   if tribe then
-      result = helptext[tribe]
-   else
-      result = helptext["default"]
-   end
-   if (result == nil) then result = "" end
-   return result
-end
 
=== removed file 'data/tribes/immovables/resi_coal1/idle_00.png'
 Binary files data/tribes/immovables/resi_coal1/idle_00.png	2014-12-12 10:21:43 +0000 and data/tribes/immovables/resi_coal1/idle_00.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/tribes/immovables/resi_coal1/init.lua'
--- data/tribes/immovables/resi_coal1/init.lua	2017-11-18 14:19:28 +0000
+++ data/tribes/immovables/resi_coal1/init.lua	1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-dirname = path.dirname(__file__)
-
-tribes:new_immovable_type {
-   msgctxt = "immovable",
-   name = "resi_coal1",
-   -- TRANSLATORS: This is a resource name used in lists of resources
-   descname = pgettext("immovable", "Resources: Coal Vein"),
-   helptext_script = dirname .. "helptexts.lua",
-   attributes = { "resi" },
-   programs = {
-      program = {
-         "animate=idle 600000",
-         "remove="
-      }
-   },
-
-   animations = {
-      idle = {
-         pictures = path.list_files(dirname .. "idle_??.png"),
-         hotspot = { 7, 10 },
-      },
-   }
-}
 
=== removed directory 'data/tribes/immovables/resi_coal2'
=== removed file 'data/tribes/immovables/resi_coal2/helptexts.lua'
--- data/tribes/immovables/resi_coal2/helptexts.lua	2017-11-12 16:21:28 +0000
+++ data/tribes/immovables/resi_coal2/helptexts.lua	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-function immovable_helptext(tribe)
-   local helptext = {
-      default = pgettext("sentence_separator", "%s %s"):bformat(
-         -- TRANSLATORS: Helptext for a resource: Coal
-         _("Coal veins contain coal that can be dug up by coal mines."),
-         -- TRANSLATORS: Helptext for a resource: Coal
-         _("There is a lot of coal here."))
-   }
-   local result = ""
-   if tribe then
-      result = helptext[tribe]
-   else
-      result = helptext["default"]
-   end
-   if (result == nil) then result = "" end
-   return result
-end
 
=== removed file 'data/tribes/immovables/resi_coal2/idle_00.png'
 Binary files data/tribes/immovables/resi_coal2/idle_00.png	2014-12-12 10:21:43 +0000 and data/tribes/immovables/resi_coal2/idle_00.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/tribes/immovables/resi_coal2/init.lua'
--- data/tribes/immovables/resi_coal2/init.lua	2017-11-18 14:19:28 +0000
+++ data/tribes/immovables/resi_coal2/init.lua	1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-dirname = path.dirname(__file__)
-
-tribes:new_immovable_type {
-   msgctxt = "immovable",
-   name = "resi_coal2",
-   -- TRANSLATORS: This is a resource name used in lists of resources
-   descname = pgettext("immovable", "Resources: Main Coal Vein"),
-   helptext_script = dirname .. "helptexts.lua",
-   attributes = { "resi" },
-   programs = {
-      program = {
-         "animate=idle 600000",
-         "remove="
-      }
-   },
-
-   animations = {
-      idle = {
-         pictures = path.list_files(dirname .. "idle_??.png"),
-         hotspot = { 7, 10 },
-      },
-   }
-}
 
=== removed directory 'data/tribes/immovables/resi_gold1'
=== removed file 'data/tribes/immovables/resi_gold1/helptexts.lua'
--- data/tribes/immovables/resi_gold1/helptexts.lua	2017-11-12 16:21:28 +0000
+++ data/tribes/immovables/resi_gold1/helptexts.lua	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-function immovable_helptext(tribe)
-   local helptext = {
-      default = pgettext("sentence_separator", "%s %s"):bformat(
-         -- TRANSLATORS: Helptext for a resource: Gold
-         _("Gold veins contain gold ore that can be dug up by gold mines."),
-         -- TRANSLATORS: Helptext for a resource: Gold
-         _("There is only a little bit of gold here."))
-   }
-   local result = ""
-   if tribe then
-      result = helptext[tribe]
-   else
-      result = helptext["default"]
-   end
-   if (result == nil) then result = "" end
-   return result
-end
 
=== removed file 'data/tribes/immovables/resi_gold1/idle_00.png'
 Binary files data/tribes/immovables/resi_gold1/idle_00.png	2014-12-12 10:21:43 +0000 and data/tribes/immovables/resi_gold1/idle_00.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/tribes/immovables/resi_gold1/init.lua'
--- data/tribes/immovables/resi_gold1/init.lua	2017-11-18 14:19:28 +0000
+++ data/tribes/immovables/resi_gold1/init.lua	1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-dirname = path.dirname(__file__)
-
-tribes:new_immovable_type {
-   msgctxt = "immovable",
-   name = "resi_gold1",
-   -- TRANSLATORS: This is a resource name used in lists of resources
-   descname = pgettext("immovable", "Resources: Gold Vein"),
-   helptext_script = dirname .. "helptexts.lua",
-   attributes = { "resi" },
-   programs = {
-      program = {
-         "animate=idle 600000",
-         "remove="
-      }
-   },
-
-   animations = {
-      idle = {
-         pictures = path.list_files(dirname .. "idle_??.png"),
-         hotspot = { 7, 10 },
-      },
-   }
-}
 
=== removed directory 'data/tribes/immovables/resi_gold2'
=== removed file 'data/tribes/immovables/resi_gold2/helptexts.lua'
--- data/tribes/immovables/resi_gold2/helptexts.lua	2017-11-12 16:21:28 +0000
+++ data/tribes/immovables/resi_gold2/helptexts.lua	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-function immovable_helptext(tribe)
-   local helptext = {
-      default = pgettext("sentence_separator", "%s %s"):bformat(
-         -- TRANSLATORS: Helptext for a resource: Gold
-         _("Gold veins contain gold ore that can be dug up by gold mines."),
-         -- TRANSLATORS: Helptext for a resource: Gold
-         _("There is a lot of gold here."))
-   }
-   local result = ""
-   if tribe then
-      result = helptext[tribe]
-   else
-      result = helptext["default"]
-   end
-   if (result == nil) then result = "" end
-   return result
-end
 
=== removed file 'data/tribes/immovables/resi_gold2/idle_00.png'
 Binary files data/tribes/immovables/resi_gold2/idle_00.png	2014-12-12 10:21:43 +0000 and data/tribes/immovables/resi_gold2/idle_00.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/tribes/immovables/resi_gold2/init.lua'
--- data/tribes/immovables/resi_gold2/init.lua	2017-11-18 14:19:28 +0000
+++ data/tribes/immovables/resi_gold2/init.lua	1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-dirname = path.dirname(__file__)
-
-tribes:new_immovable_type {
-   msgctxt = "immovable",
-   name = "resi_gold2",
-   -- TRANSLATORS: This is a resource name used in lists of resources
-   descname = pgettext("immovable", "Resources: Main Gold Vein"),
-   helptext_script = dirname .. "helptexts.lua",
-   attributes = { "resi" },
-   programs = {
-      program = {
-         "animate=idle 600000",
-         "remove="
-      }
-   },
-
-   animations = {
-      idle = {
-         pictures = path.list_files(dirname .. "idle_??.png"),
-         hotspot = { 7, 10 },
-      },
-   }
-}
 
=== removed directory 'data/tribes/immovables/resi_iron1'
=== removed file 'data/tribes/immovables/resi_iron1/helptexts.lua'
--- data/tribes/immovables/resi_iron1/helptexts.lua	2017-11-12 16:21:28 +0000
+++ data/tribes/immovables/resi_iron1/helptexts.lua	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-function immovable_helptext(tribe)
-   local helptext = {
-      default = pgettext("sentence_separator", "%s %s"):bformat(
-         -- TRANSLATORS: Helptext for a resource: Iron
-         _("Iron veins contain iron ore that can be dug up by iron mines."),
-         -- TRANSLATORS: Helptext for a resource: Iron
-         _("There is only a little bit of iron here."))
-   }
-   local result = ""
-   if tribe then
-      result = helptext[tribe]
-   else
-      result = helptext["default"]
-   end
-   if (result == nil) then result = "" end
-   return result
-end
 
=== removed file 'data/tribes/immovables/resi_iron1/idle_00.png'
 Binary files data/tribes/immovables/resi_iron1/idle_00.png	2014-12-12 10:21:43 +0000 and data/tribes/immovables/resi_iron1/idle_00.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/tribes/immovables/resi_iron1/init.lua'
--- data/tribes/immovables/resi_iron1/init.lua	2017-11-18 14:19:28 +0000
+++ data/tribes/immovables/resi_iron1/init.lua	1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-dirname = path.dirname(__file__)
-
-tribes:new_immovable_type {
-   msgctxt = "immovable",
-   name = "resi_iron1",
-   -- TRANSLATORS: This is a resource name used in lists of resources
-   descname = pgettext("immovable", "Resources: Iron Vein"),
-   helptext_script = dirname .. "helptexts.lua",
-   attributes = { "resi" },
-   programs = {
-      program = {
-         "animate=idle 600000",
-         "remove="
-      }
-   },
-
-   animations = {
-      idle = {
-         pictures = path.list_files(dirname .. "idle_??.png"),
-         hotspot = { 7, 10 },
-      },
-   }
-}
 
=== removed directory 'data/tribes/immovables/resi_iron2'
=== removed file 'data/tribes/immovables/resi_iron2/helptexts.lua'
--- data/tribes/immovables/resi_iron2/helptexts.lua	2017-11-12 16:21:28 +0000
+++ data/tribes/immovables/resi_iron2/helptexts.lua	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-function immovable_helptext(tribe)
-   local helptext = {
-      default = pgettext("sentence_separator", "%s %s"):bformat(
-         -- TRANSLATORS: Helptext for a resource: Iron
-         _("Iron veins contain iron ore that can be dug up by iron mines."),
-         -- TRANSLATORS: Helptext for a resource: Iron
-         _("There is a lot of iron here."))
-   }
-   local result = ""
-   if tribe then
-      result = helptext[tribe]
-   else
-      result = helptext["default"]
-   end
-   if (result == nil) then result = "" end
-   return result
-end
 
=== removed file 'data/tribes/immovables/resi_iron2/idle_00.png'
 Binary files data/tribes/immovables/resi_iron2/idle_00.png	2014-12-12 10:21:43 +0000 and data/tribes/immovables/resi_iron2/idle_00.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/tribes/immovables/resi_iron2/init.lua'
--- data/tribes/immovables/resi_iron2/init.lua	2017-11-18 14:19:28 +0000
+++ data/tribes/immovables/resi_iron2/init.lua	1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-dirname = path.dirname(__file__)
-
-tribes:new_immovable_type {
-   msgctxt = "immovable",
-   name = "resi_iron2",
-   -- TRANSLATORS: This is a resource name used in lists of resources
-   descname = pgettext("immovable", "Resources: Main Iron Vein"),
-   helptext_script = dirname .. "helptexts.lua",
-   attributes = { "resi" },
-   programs = {
-      program = {
-         "animate=idle 600000",
-         "remove="
-      }
-   },
-
-   animations = {
-      idle = {
-         pictures = path.list_files(dirname .. "idle_??.png"),
-         hotspot = { 7, 10 },
-      },
-   }
-}
 
=== removed directory 'data/tribes/immovables/resi_none'
=== removed file 'data/tribes/immovables/resi_none/helptexts.lua'
--- data/tribes/immovables/resi_none/helptexts.lua	2017-11-12 16:21:28 +0000
+++ data/tribes/immovables/resi_none/helptexts.lua	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-function immovable_helptext(tribe)
-   local helptext = {
-      -- TRANSLATORS: Helptext for a resource: No resources
-      default = _("There are no resources in the ground here.")
-   }
-   local result = ""
-   if tribe then
-      result = helptext[tribe]
-   else
-      result = helptext["default"]
-   end
-   if (result == nil) then result = "" end
-   return result
-end
 
=== removed file 'data/tribes/immovables/resi_none/idle_00.png'
 Binary files data/tribes/immovables/resi_none/idle_00.png	2014-12-12 10:21:43 +0000 and data/tribes/immovables/resi_none/idle_00.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/tribes/immovables/resi_none/init.lua'
--- data/tribes/immovables/resi_none/init.lua	2017-11-18 14:19:28 +0000
+++ data/tribes/immovables/resi_none/init.lua	1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-dirname = path.dirname(__file__)
-
-tribes:new_immovable_type {
-   msgctxt = "immovable",
-   name = "resi_none",
-   -- TRANSLATORS: This is a resource name used in lists of resources
-   descname = pgettext("immovable", "Resources: None"),
-   helptext_script = dirname .. "helptexts.lua",
-   attributes = { "resi" },
-   programs = {
-      program = {
-         "animate=idle 600000",
-         "remove="
-      }
-   },
-
-   animations = {
-      idle = {
-         pictures = path.list_files(dirname .. "idle_??.png"),
-         hotspot = { 7, 10 },
-      },
-   }
-}
 
=== removed directory 'data/tribes/immovables/resi_stones1'
=== removed file 'data/tribes/immovables/resi_stones1/helptexts.lua'
--- data/tribes/immovables/resi_stones1/helptexts.lua	2017-11-18 14:19:28 +0000
+++ data/tribes/immovables/resi_stones1/helptexts.lua	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-function immovable_helptext(tribe)
-   local helptext = {
-      atlanteans = pgettext("sentence_separator", "%s %s"):bformat(
-         -- TRANSLATORS: Helptext for an Atlantean resource: Stones
-         _("Precious stones are used in the construction of big buildings. They can be dug up by a crystal mine. You will also get granite from the mine."),
-         -- TRANSLATORS: Helptext for an Atlantean resource: Stones
-         _("There are only a few precious stones here.")),
-      barbarians = pgettext("sentence_separator", "%s %s"):bformat(
-         -- TRANSLATORS: Helptext for a Barbarian resource: Stones
-         _("Granite is a basic building material and can be dug up by a granite mine."),
-         -- TRANSLATORS: Helptext for a Barbarian resource: Stones
-         _("There is only a little bit of granite here.")),
-      empire = pgettext("sentence_separator", "%s %s"):bformat(
-         -- TRANSLATORS: Helptext for an Empire resource: Stones
-         _("Marble is a basic building material and can be dug up by a marble mine. You will also get granite from the mine."),
-         -- TRANSLATORS: Helptext for an Empire resource: Stones
-         _("There is only a little bit of marble here."))
-   }
-   local result = ""
-   if tribe then
-      result = helptext[tribe]
-   else
-      result = helptext["default"]
-   end
-   if (result == nil) then result = "" end
-   return result
-end
 
=== removed file 'data/tribes/immovables/resi_stones1/idle_00.png'
 Binary files data/tribes/immovables/resi_stones1/idle_00.png	2014-12-12 10:21:43 +0000 and data/tribes/immovables/resi_stones1/idle_00.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/tribes/immovables/resi_stones1/init.lua'
--- data/tribes/immovables/resi_stones1/init.lua	2017-11-18 14:19:28 +0000
+++ data/tribes/immovables/resi_stones1/init.lua	1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-dirname = path.dirname(__file__)
-
-tribes:new_immovable_type {
-   msgctxt = "immovable",
-   name = "resi_stones1",
-   -- TRANSLATORS: This is a resource name used in lists of resources
-   descname = pgettext("immovable", "Resources: Some Stones"),
-   helptext_script = dirname .. "helptexts.lua",
-   attributes = { "resi" },
-   programs = {
-      program = {
-         "animate=idle 600000",
-         "remove="
-      }
-   },
-
-   animations = {
-      idle = {
-         pictures = path.list_files(dirname .. "idle_??.png"),
-         hotspot = { 7, 10 },
-      },
-   }
-}
 
=== removed directory 'data/tribes/immovables/resi_stones2'
=== removed file 'data/tribes/immovables/resi_stones2/helptexts.lua'
--- data/tribes/immovables/resi_stones2/helptexts.lua	2017-11-18 14:19:28 +0000
+++ data/tribes/immovables/resi_stones2/helptexts.lua	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-function immovable_helptext(tribe)
-   local helptext = {
-      atlanteans = pgettext("sentence_separator", "%s %s"):bformat(
-         -- TRANSLATORS: Helptext for an Atlantean resource: Stones
-         _("Precious stones are used in the construction of big buildings. They can be dug up by a crystal mine. You will also get granite from the mine."),
-         -- TRANSLATORS: Helptext for an Atlantean resource: Stones
-         _("There are many precious stones here.")),
-      barbarians = pgettext("sentence_separator", "%s %s"):bformat(
-         -- TRANSLATORS: Helptext for a Barbarian resource: Stones
-         _("Granite is a basic building material and can be dug up by a granite mine."),
-         -- TRANSLATORS: Helptext for a Barbarian resource: Stones
-         _("There is a lot of granite here.")),
-      empire = pgettext("sentence_separator", "%s %s"):bformat(
-         -- TRANSLATORS: Helptext for an Empire resource: Stones
-         _("Marble is a basic building material and can be dug up by a marble mine. You will also get granite from the mine."),
-         -- TRANSLATORS: Helptext for an Empire resource: Stones
-         _("There is a lot of marble here."))
-   }
-   local result = ""
-   if tribe then
-      result = helptext[tribe]
-   else
-      result = helptext["default"]
-   end
-   if (result == nil) then result = "" end
-   return result
-end
 
=== removed file 'data/tribes/immovables/resi_stones2/idle_00.png'
 Binary files data/tribes/immovables/resi_stones2/idle_00.png	2014-12-12 10:21:43 +0000 and data/tribes/immovables/resi_stones2/idle_00.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/tribes/immovables/resi_stones2/init.lua'
--- data/tribes/immovables/resi_stones2/init.lua	2017-11-18 14:19:28 +0000
+++ data/tribes/immovables/resi_stones2/init.lua	1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-dirname = path.dirname(__file__)
-
-tribes:new_immovable_type {
-   msgctxt = "immovable",
-   name = "resi_stones2",
-   -- TRANSLATORS: This is a resource name used in lists of resources
-   descname = pgettext("immovable", "Resources: A Lot of Stones"),
-   helptext_script = dirname .. "helptexts.lua",
-   attributes = { "resi" },
-   programs = {
-      program = {
-         "animate=idle 600000",
-         "remove="
-      }
-   },
-
-   animations = {
-      idle = {
-         pictures = path.list_files(dirname .. "idle_??.png"),
-         hotspot = { 7, 10 },
-      },
-   }
-}
 
=== removed directory 'data/tribes/immovables/resi_water1'
=== removed file 'data/tribes/immovables/resi_water1/helptexts.lua'
--- data/tribes/immovables/resi_water1/helptexts.lua	2017-11-12 16:21:28 +0000
+++ data/tribes/immovables/resi_water1/helptexts.lua	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-function immovable_helptext(tribe)
-   local helptext = {
-      -- TRANSLATORS: Helptext for a resource: Water
-      default = _("There is water in the ground here that can be pulled up by a well.")
-   }
-   local result = ""
-   if tribe then
-      result = helptext[tribe]
-   else
-      result = helptext["default"]
-   end
-   if (result == nil) then result = "" end
-   return result
-end
 
=== removed file 'data/tribes/immovables/resi_water1/idle_00.png'
 Binary files data/tribes/immovables/resi_water1/idle_00.png	2014-12-12 10:21:43 +0000 and data/tribes/immovables/resi_water1/idle_00.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/tribes/immovables/resi_water1/init.lua'
--- data/tribes/immovables/resi_water1/init.lua	2017-11-18 14:19:28 +0000
+++ data/tribes/immovables/resi_water1/init.lua	1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-dirname = path.dirname(__file__)
-
-tribes:new_immovable_type {
-   msgctxt = "immovable",
-   name = "resi_water1",
-   -- TRANSLATORS: This is a resource name used in lists of resources
-   descname = pgettext("immovable", "Resources: Water Vein"),
-   helptext_script = dirname .. "helptexts.lua",
-   attributes = { "resi" },
-   programs = {
-      program = {
-         "animate=idle 600000",
-         "remove="
-      }
-   },
-
-   animations = {
-      idle = {
-         pictures = path.list_files(dirname .. "idle_??.png"),
-         hotspot = { 7, 10 },
-      },
-   }
-}
 
=== modified file 'data/tribes/init.lua'
--- data/tribes/init.lua	2018-07-15 10:32:12 +0000
+++ data/tribes/init.lua	2018-09-14 06:31:21 +0000
@@ -179,16 +179,10 @@
       include "tribes/immovables/reed_ripe/init.lua"
       include "tribes/immovables/reed_small/init.lua"
       include "tribes/immovables/reed_tiny/init.lua"
-      include "tribes/immovables/resi_coal1/init.lua"
-      include "tribes/immovables/resi_coal2/init.lua"
-      include "tribes/immovables/resi_gold1/init.lua"
-      include "tribes/immovables/resi_gold2/init.lua"
-      include "tribes/immovables/resi_iron1/init.lua"
-      include "tribes/immovables/resi_iron2/init.lua"
-      include "tribes/immovables/resi_none/init.lua"
-      include "tribes/immovables/resi_stones1/init.lua"
-      include "tribes/immovables/resi_stones2/init.lua"
-      include "tribes/immovables/resi_water1/init.lua"
+      include "tribes/immovables/resi/atlanteans/init.lua"
+      include "tribes/immovables/resi/barbarians/init.lua"
+      include "tribes/immovables/resi/empire/init.lua"
+      include "tribes/immovables/resi/frisians/init.lua"
       include "tribes/immovables/shipconstruction_atlanteans/init.lua"
       include "tribes/immovables/shipconstruction_barbarians/init.lua"
       include "tribes/immovables/shipconstruction_empire/init.lua"
 
=== modified file 'data/tribes/scripting/help/building_help.lua'
--- data/tribes/scripting/help/building_help.lua	2018-03-24 14:31:37 +0000
+++ data/tribes/scripting/help/building_help.lua	2018-09-14 06:31:21 +0000
@@ -1,5 +1,3 @@
--- TODO(GunChleoc): get resi_00.png from C++
-
 include "tribes/scripting/help/format_help.lua"
 
 -- RST
@@ -46,15 +44,24 @@
 --    :arg text: comment of the image.
 --    :returns: a row of pictures connected by arrows.
 --
-function dependencies_resi(resource, items, text)
+function dependencies_resi(tribename, resource, items, text)
    if not text then
       text = ""
    end
-   local items_with_resouce = { "tribes/immovables/" .. resource  .. "/idle_00.png" }
+   local tribe_descr = wl.Game():get_tribe_description(tribename)
+   local resi
+   local am = 0
+   for amount,name in pairs(tribe_descr.resource_indicators[resource]) do
+      if amount > am then
+         resi = name
+         am = amount
+      end
+   end
+   local items_with_resource = { wl.Game():get_immovable_description(resi).representative_image }
    for count, item in pairs(items) do
-      table.insert(items_with_resouce, item.icon_name)
+      table.insert(items_with_resource, item.icon_name)
    end
-   return dependencies_basic(items_with_resouce, text)
+   return dependencies_basic(items_with_resource, text)
 end
 
 
@@ -301,8 +308,8 @@
          elseif(resi_name == "quartz") then resi_name = "stones"
          elseif(resi_name == "marble") then resi_name = "stones"
          elseif(resi_name == "gold_ore") then resi_name = "gold" end
-         result = result .. dependencies_resi(
-            "resi_"..resi_name.."2",
+         result = result .. dependencies_resi(tribe.name,
+            resi_name,
             {building_description, ware_description},
             ware_description.descname
          )
 
=== modified file 'src/logic/editor_game_base.cc'
--- src/logic/editor_game_base.cc	2018-04-27 06:11:05 +0000
+++ src/logic/editor_game_base.cc	2018-09-14 06:31:21 +0000
@@ -42,6 +42,7 @@
 #include "logic/map_objects/tribes/ware_descr.h"
 #include "logic/map_objects/tribes/worker.h"
 #include "logic/map_objects/world/critter.h"
+#include "logic/map_objects/world/resource_description.h"
 #include "logic/map_objects/world/world.h"
 #include "logic/mapregion.h"
 #include "logic/player.h"
@@ -199,6 +200,20 @@
 	assert(tribes_);
 	tribes_->postload();
 
+	for (DescriptionIndex i = 0; i < tribes_->nrtribes(); i++) {
+		const TribeDescr* tribe = tribes_->get_tribe_descr(i);
+		for (DescriptionIndex j = 0; j < world_->get_nr_resources(); j++) {
+			const ResourceDescription* res = world_->get_resource(j);
+			if (res->detectable()) {
+				// This function will throw an exception if this tribe doesn't
+				// have a high enough resource indicator for this resource
+				tribe->get_resource_indicator(res, res->max_amount());
+			}
+		}
+		// For the "none" indicator
+		tribe->get_resource_indicator(nullptr, 0);
+	}
+
 	// TODO(unknown): postload players? (maybe)
 }
 
 
=== modified file 'src/logic/map_objects/tribes/tribe_descr.cc'
--- src/logic/map_objects/tribes/tribe_descr.cc	2018-04-07 16:59:00 +0000
+++ src/logic/map_objects/tribes/tribe_descr.cc	2018-09-14 06:31:21 +0000
@@ -162,6 +162,20 @@
 			}
 		}
 
+		items_table = table.get_table("resource_indicators");
+		for (std::string resource : items_table->keys<std::string>()) {
+			ResourceIndicatorList resis;
+			std::unique_ptr<LuaTable> tbl = items_table->get_table(resource);
+			const std::set<int> keys = tbl->keys<int>();
+			for (int upper_limit : keys) {
+				resis[upper_limit] = tribes_.safe_immovable_index(tbl->get_string(upper_limit));
+			}
+			if (resis.empty()) {
+				throw GameDataError("Tribe has no indicators for resource %s.", resource.c_str());
+			}
+			resource_indicators_[resource] = resis;
+		};
+
 		ship_names_ = table.get_table("ship_names")->array_entries<std::string>();
 
 		for (const std::string& buildingname :
@@ -226,6 +240,9 @@
 const std::set<DescriptionIndex>& TribeDescr::immovables() const {
 	return immovables_;
 }
+const ResourceIndicatorSet& TribeDescr::resource_indicators() const {
+	return resource_indicators_;
+}
 
 bool TribeDescr::has_building(const DescriptionIndex& index) const {
 	return std::find(buildings_.begin(), buildings_.end(), index) != buildings_.end();
@@ -374,41 +391,35 @@
 DescriptionIndex TribeDescr::get_resource_indicator(ResourceDescription const* const res,
                                                     const ResourceAmount amount) const {
 	if (!res || !amount) {
-		DescriptionIndex idx = immovable_index("resi_none");
-		if (!has_immovable(idx)) {
-			throw GameDataError("There is no resource indicator for resi_none!");
-		}
-		return idx;
-	}
-
-	int32_t i = 1;
-	int32_t num_indicators = 0;
-	for (;;) {
-		const std::string resi_filename =
-		   (boost::format("resi_%s%i") % res->name().c_str() % i).str();
-		if (!has_immovable(immovable_index(resi_filename))) {
-			break;
-		}
-		++i;
-		++num_indicators;
-	}
-
-	if (!num_indicators) {
-		throw GameDataError("There is no resource indicator for resource %s", res->name().c_str());
-	}
-
-	int32_t bestmatch =
-	   static_cast<int32_t>((static_cast<float>(amount) / res->max_amount()) * num_indicators);
-	if (bestmatch > num_indicators) {
-		throw GameDataError("Amount of %s is %i but max amount is %i", res->name().c_str(),
-		                    static_cast<unsigned int>(amount),
-		                    static_cast<unsigned int>(res->max_amount()));
-	}
-	if (amount < res->max_amount()) {
-		bestmatch += 1;  // Resi start with 1, not 0
-	}
-
-	return immovable_index((boost::format("resi_%s%i") % res->name().c_str() % bestmatch).str());
+		auto list = resource_indicators_.find("");
+		if (list == resource_indicators_.end() || list->second.empty()) {
+			throw GameDataError("Tribe '%s' has no indicator for no resources!", descname_.c_str());
+		}
+		return list->second.begin()->second;
+	}
+
+	auto list = resource_indicators_.find(res->name());
+	if (list == resource_indicators_.end() || list->second.empty()) {
+		throw GameDataError("Tribe '%s' has no indicators for resource '%s'!", descname_.c_str(), res->name().c_str());
+	}
+
+	uint32_t lowest = 0;
+	for (const auto& resi : list->second) {
+		if (resi.first < amount) {
+			continue;
+		}
+		else if (lowest < amount || resi.first < lowest) {
+			lowest = resi.first;
+		}
+	}
+
+	if (lowest < amount) {
+		throw GameDataError(
+				"Tribe '%s' has no indicators for amount %i of resource '%s' (highest possible amount is %i)!",
+				descname_.c_str(), amount, res->name().c_str(), lowest);
+	}
+
+	return list->second.find(lowest)->second;
 }
 
 void TribeDescr::resize_ware_orders(size_t maxLength) {
 
=== modified file 'src/logic/map_objects/tribes/tribe_descr.h'
--- src/logic/map_objects/tribes/tribe_descr.h	2018-04-07 16:59:00 +0000
+++ src/logic/map_objects/tribes/tribe_descr.h	2018-09-14 06:31:21 +0000
@@ -49,6 +49,16 @@
 struct Event;
 
 /*
+ * Resource indicators:
+ * A ResourceIndicatorSet maps the resource name to a ResourceIndicatorList.
+ * A ResourceIndicatorList maps resource amounts to the DescriptionIndex of an immovable this player uses.
+ * Special case: The ResourceIndicatorList mapped to "" contains resis that will be used in locations
+ * without resources. If it has several entries, result is arbitrary.
+*/
+using ResourceIndicatorList = std::map<uint32_t, DescriptionIndex>;
+using ResourceIndicatorSet = std::map<std::string, ResourceIndicatorList>;
+
+/*
 Tribes
 ------
 
@@ -72,6 +82,7 @@
 	const std::set<DescriptionIndex>& wares() const;
 	const std::set<DescriptionIndex>& workers() const;
 	const std::set<DescriptionIndex>& immovables() const;
+	const ResourceIndicatorSet& resource_indicators() const;
 
 	bool has_building(const DescriptionIndex& index) const;
 	bool has_ware(const DescriptionIndex& index) const;
@@ -184,6 +195,7 @@
 	std::vector<std::string> ship_names_;
 	std::set<DescriptionIndex> workers_;
 	std::set<DescriptionIndex> wares_;
+	ResourceIndicatorSet resource_indicators_;
 	// The wares that are used by construction sites
 	std::set<DescriptionIndex> construction_materials_;
 	// Special units. Some of them are used by the engine, some are only used by the AI.
 
=== modified file 'src/map_io/tribes_legacy_lookup_table.cc'
--- src/map_io/tribes_legacy_lookup_table.cc	2018-04-07 16:59:00 +0000
+++ src/map_io/tribes_legacy_lookup_table.cc	2018-09-14 06:31:21 +0000
@@ -194,9 +194,19 @@
                           {"cornfield_m", "cornfield_medium"},
                           {"cornfield_s", "cornfield_small"},
                           {"cornfield_t", "cornfield_tiny"},
-                          {"resi_granite1", "resi_stones1"},
-                          {"resi_granite2", "resi_stones2"},
+                          {"resi_granite1", "atlanteans_resi_stones_1"},
+                          {"resi_granite2", "atlanteans_resi_stones_2"},
                           {"shipconstruction", "atlanteans_shipconstruction"},
+                          {"resi_coal1", "atlanteans_resi_coal_1"},
+                          {"resi_iron1", "atlanteans_resi_iron_1"},
+                          {"resi_gold1", "atlanteans_resi_gold_1"},
+                          {"resi_stones1", "atlanteans_resi_stones_1"},
+                          {"resi_coal2", "atlanteans_resi_coal_2"},
+                          {"resi_iron2", "atlanteans_resi_iron_2"},
+                          {"resi_gold2", "atlanteans_resi_gold_2"},
+                          {"resi_stones2", "atlanteans_resi_stones_2"},
+                          {"resi_none", "atlanteans_resi_none"},
+                          {"resi_water1", "atlanteans_resi_water"},
                        }),
         std::make_pair("barbarians",
                        std::map<std::string, std::string>{
@@ -209,9 +219,19 @@
                           {"reed0s", "reed_small"},
                           {"reed0t", "reed_tiny"},
                           {"reed1", "reed_ripe"},
-                          {"resi_granite1", "resi_stones1"},
-                          {"resi_granite2", "resi_stones2"},
+                          {"resi_granite1", "barbarians_resi_stones_1"},
+                          {"resi_granite2", "barbarians_resi_stones_2"},
                           {"shipconstruction", "barbarians_shipconstruction"},
+                          {"resi_coal1", "barbarians_resi_coal_1"},
+                          {"resi_iron1", "barbarians_resi_iron_1"},
+                          {"resi_gold1", "barbarians_resi_gold_1"},
+                          {"resi_stones1", "barbarians_resi_stones_1"},
+                          {"resi_coal2", "barbarians_resi_coal_2"},
+                          {"resi_iron2", "barbarians_resi_iron_2"},
+                          {"resi_gold2", "barbarians_resi_gold_2"},
+                          {"resi_stones2", "barbarians_resi_stones_2"},
+                          {"resi_none", "barbarians_resi_none"},
+                          {"resi_water1", "barbarians_resi_water"},
                        }),
         std::make_pair("empire",
                        std::map<std::string, std::string>{
@@ -224,9 +244,32 @@
                           {"wine0s", "grapevine_small"},
                           {"wine0t", "grapevine_tiny"},
                           {"wine1", "grapevine_ripe"},
-                          {"resi_granite1", "resi_stones1"},
-                          {"resi_granite2", "resi_stones2"},
+                          {"resi_granite1", "empire_resi_stones_1"},
+                          {"resi_granite2", "empire_resi_stones_2"},
                           {"shipconstruction", "empire_shipconstruction"},
+                          {"resi_coal1", "empire_resi_coal_1"},
+                          {"resi_iron1", "empire_resi_iron_1"},
+                          {"resi_gold1", "empire_resi_gold_1"},
+                          {"resi_stones1", "empire_resi_stones_1"},
+                          {"resi_coal2", "empire_resi_coal_2"},
+                          {"resi_iron2", "empire_resi_iron_2"},
+                          {"resi_gold2", "empire_resi_gold_2"},
+                          {"resi_stones2", "empire_resi_stones_2"},
+                          {"resi_none", "empire_resi_none"},
+                          {"resi_water1", "empire_resi_water"},
+                       }),
+        std::make_pair("frisians",
+                       std::map<std::string, std::string>{
+                          {"resi_coal1", "frisians_resi_coal_1"},
+                          {"resi_iron1", "frisians_resi_iron_1"},
+                          {"resi_gold1", "frisians_resi_gold_1"},
+                          {"resi_stones1", "frisians_resi_stones_1"},
+                          {"resi_coal2", "frisians_resi_coal_2"},
+                          {"resi_iron2", "frisians_resi_iron_2"},
+                          {"resi_gold2", "frisians_resi_gold_2"},
+                          {"resi_stones2", "frisians_resi_stones_2"},
+                          {"resi_none", "frisians_resi_none"},
+                          {"resi_water1", "frisians_resi_water"},
                        }),
      } {
 }
 
=== modified file 'src/scripting/lua_map.cc'
--- src/scripting/lua_map.cc	2018-09-04 15:48:47 +0000
+++ src/scripting/lua_map.cc	2018-09-14 06:31:21 +0000
@@ -1386,6 +1386,7 @@
    PROP_RO(LuaTribeDescription, descname),
    PROP_RO(LuaTribeDescription, geologist),
    PROP_RO(LuaTribeDescription, immovables),
+   PROP_RO(LuaTribeDescription, resource_indicators),
    PROP_RO(LuaTribeDescription, name),
    PROP_RO(LuaTribeDescription, port),
    PROP_RO(LuaTribeDescription, ship),
@@ -1496,6 +1497,29 @@
 }
 
 /* RST
+   .. attribute:: resource_indicators
+
+      (RO) the table `resource_indicators` as defined in the tribe's `tribename.lua`.
+      See `data/tribes/atlanteans.lua` for more information on the table structure.
+*/
+int LuaTribeDescription::get_resource_indicators(lua_State* L) {
+	const TribeDescr& tribe = *get();
+	lua_newtable(L);
+	const ResourceIndicatorSet resis = tribe.resource_indicators();
+	for (const auto& resilist : resis) {
+		lua_pushstring(L, resilist.first);
+		lua_newtable(L);
+		for (const auto& resi : resilist.second) {
+			lua_pushinteger(L, resi.first);
+			lua_pushstring(L, tribe.get_immovable_descr(resi.second)->name());
+			lua_settable(L, -3);
+		}
+		lua_settable(L, -3);
+	}
+	return 1;
+}
+
+/* RST
    .. attribute:: name
 
          (RO) a :class:`string` with the tribe's internal name
 
=== modified file 'src/scripting/lua_map.h'
--- src/scripting/lua_map.h	2018-04-11 06:55:01 +0000
+++ src/scripting/lua_map.h	2018-09-14 06:31:21 +0000
@@ -134,6 +134,7 @@
 	int get_carrier2(lua_State*);
 	int get_descname(lua_State*);
 	int get_immovables(lua_State*);
+	int get_resource_indicators(lua_State*);
 	int get_geologist(lua_State*);
 	int get_name(lua_State*);
 	int get_port(lua_State*);