widelands-dev team mailing list archive
-
widelands-dev team
-
Mailing list archive
-
Message #17427
[Merge] lp:~widelands-dev/widelands/immovables_icon_wrong_path_menu into lp:widelands
Toni Förster has proposed merging lp:~widelands-dev/widelands/immovables_icon_wrong_path_menu into lp:widelands.
Commit message:
Fixes wrong path for encyclopedia immovables icon.
Added missing menu icons for immovables.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/immovables_icon_wrong_path_menu/+merge/368011
--
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/immovables_icon_wrong_path_menu into lp:widelands.
=== modified file 'data/tribes/immovables/ashes/init.lua'
--- data/tribes/immovables/ashes/init.lua 2017-11-12 16:21:28 +0000
+++ data/tribes/immovables/ashes/init.lua 2019-05-28 19:51:40 +0000
@@ -41,6 +41,8 @@
-- TRANSLATORS: This is an immovable name used in lists of immovables
descname = pgettext("immovable", "Ashes"),
helptext_script = dirname .. "helptexts.lua",
+ icon = dirname .. "menu.png",
+ size = "small",
programs = {
program = {
"animate=idle 45000",
=== added file 'data/tribes/immovables/ashes/menu.png'
Binary files data/tribes/immovables/ashes/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/ashes/menu.png 2019-05-28 19:51:40 +0000 differ
=== modified file 'data/tribes/immovables/barleyfield/harvested/init.lua'
--- data/tribes/immovables/barleyfield/harvested/init.lua 2018-04-09 09:11:29 +0000
+++ data/tribes/immovables/barleyfield/harvested/init.lua 2019-05-28 19:51:40 +0000
@@ -5,6 +5,7 @@
name = "barleyfield_harvested",
-- TRANSLATORS: This is an immovable name used in lists of immovables
descname = pgettext("immovable", "Barley Field (harvested)"),
+ icon = dirname .. "menu.png",
helptext_script = dirname .. "helptexts.lua",
attributes = { "field" },
programs = {
=== added file 'data/tribes/immovables/barleyfield/harvested/menu.png'
Binary files data/tribes/immovables/barleyfield/harvested/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/barleyfield/harvested/menu.png 2019-05-28 19:51:40 +0000 differ
=== modified file 'data/tribes/immovables/barleyfield/medium/init.lua'
--- data/tribes/immovables/barleyfield/medium/init.lua 2018-04-09 09:11:29 +0000
+++ data/tribes/immovables/barleyfield/medium/init.lua 2019-05-28 19:51:40 +0000
@@ -5,6 +5,7 @@
name = "barleyfield_medium",
-- TRANSLATORS: This is an immovable name used in lists of immovables
descname = pgettext("immovable", "Barley Field (medium)"),
+ icon = dirname .. "menu.png",
size = "small",
helptext_script = dirname .. "helptexts.lua",
attributes = { "field", "flowering" },
=== added file 'data/tribes/immovables/barleyfield/medium/menu.png'
Binary files data/tribes/immovables/barleyfield/medium/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/barleyfield/medium/menu.png 2019-05-28 19:51:40 +0000 differ
=== modified file 'data/tribes/immovables/barleyfield/ripe/init.lua'
--- data/tribes/immovables/barleyfield/ripe/init.lua 2018-04-09 09:11:29 +0000
+++ data/tribes/immovables/barleyfield/ripe/init.lua 2019-05-28 19:51:40 +0000
@@ -6,6 +6,7 @@
-- TRANSLATORS: This is an immovable name used in lists of immovables
descname = pgettext("immovable", "Barley Field (ripe)"),
size = "small",
+ icon = dirname .. "menu.png",
helptext_script = dirname .. "helptexts.lua",
attributes = { "ripe_barley", "field" },
programs = {
=== added file 'data/tribes/immovables/barleyfield/ripe/menu.png'
Binary files data/tribes/immovables/barleyfield/ripe/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/barleyfield/ripe/menu.png 2019-05-28 19:51:40 +0000 differ
=== modified file 'data/tribes/immovables/barleyfield/small/init.lua'
--- data/tribes/immovables/barleyfield/small/init.lua 2018-04-09 09:11:29 +0000
+++ data/tribes/immovables/barleyfield/small/init.lua 2019-05-28 19:51:40 +0000
@@ -5,6 +5,7 @@
name = "barleyfield_small",
-- TRANSLATORS: This is an immovable name used in lists of immovables
descname = pgettext("immovable", "Barley Field (small)"),
+ icon = dirname .. "menu.png",
size = "small",
helptext_script = dirname .. "helptexts.lua",
attributes = { "field" },
=== added file 'data/tribes/immovables/barleyfield/small/menu.png'
Binary files data/tribes/immovables/barleyfield/small/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/barleyfield/small/menu.png 2019-05-28 19:51:40 +0000 differ
=== modified file 'data/tribes/immovables/barleyfield/tiny/init.lua'
--- data/tribes/immovables/barleyfield/tiny/init.lua 2018-04-09 09:11:29 +0000
+++ data/tribes/immovables/barleyfield/tiny/init.lua 2019-05-28 19:51:40 +0000
@@ -5,6 +5,7 @@
name = "barleyfield_tiny",
-- TRANSLATORS: This is an immovable name used in lists of immovables
descname = pgettext("immovable", "Barley Field (tiny)"),
+ icon = dirname .. "menu.png",
size = "small",
helptext_script = dirname .. "helptexts.lua",
attributes = { "field", "seed_barley" },
=== added file 'data/tribes/immovables/barleyfield/tiny/menu.png'
Binary files data/tribes/immovables/barleyfield/tiny/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/barleyfield/tiny/menu.png 2019-05-28 19:51:40 +0000 differ
=== modified file 'data/tribes/immovables/blackrootfield/harvested/init.lua'
--- data/tribes/immovables/blackrootfield/harvested/init.lua 2017-11-12 16:21:28 +0000
+++ data/tribes/immovables/blackrootfield/harvested/init.lua 2019-05-28 19:51:40 +0000
@@ -6,6 +6,7 @@
-- TRANSLATORS: This is an immovable name used in lists of immovables
descname = pgettext("immovable", "Blackroot Field (harvested)"),
helptext_script = dirname .. "helptexts.lua",
+ icon = dirname .. "menu.png",
attributes = { "field" },
programs = {
program = {
=== added file 'data/tribes/immovables/blackrootfield/harvested/menu.png'
Binary files data/tribes/immovables/blackrootfield/harvested/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/blackrootfield/harvested/menu.png 2019-05-28 19:51:40 +0000 differ
=== modified file 'data/tribes/immovables/blackrootfield/medium/init.lua'
--- data/tribes/immovables/blackrootfield/medium/init.lua 2017-11-12 19:37:34 +0000
+++ data/tribes/immovables/blackrootfield/medium/init.lua 2019-05-28 19:51:40 +0000
@@ -6,6 +6,7 @@
-- TRANSLATORS: This is an immovable name used in lists of immovables
descname = pgettext("immovable", "Blackroot Field (medium)"),
helptext_script = dirname .. "helptexts.lua",
+ icon = dirname .. "menu.png",
size = "small",
attributes = { "field", "flowering" },
programs = {
=== added file 'data/tribes/immovables/blackrootfield/medium/menu.png'
Binary files data/tribes/immovables/blackrootfield/medium/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/blackrootfield/medium/menu.png 2019-05-28 19:51:40 +0000 differ
=== modified file 'data/tribes/immovables/blackrootfield/ripe/init.lua'
--- data/tribes/immovables/blackrootfield/ripe/init.lua 2017-11-12 16:21:28 +0000
+++ data/tribes/immovables/blackrootfield/ripe/init.lua 2019-05-28 19:51:40 +0000
@@ -6,6 +6,7 @@
-- TRANSLATORS: This is an immovable name used in lists of immovables
descname = pgettext("immovable", "Blackroot Field (ripe)"),
helptext_script = dirname .. "helptexts.lua",
+ icon = dirname .. "menu.png",
size = "small",
attributes = { "ripe_blackroot", "field" },
programs = {
=== added file 'data/tribes/immovables/blackrootfield/ripe/menu.png'
Binary files data/tribes/immovables/blackrootfield/ripe/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/blackrootfield/ripe/menu.png 2019-05-28 19:51:40 +0000 differ
=== modified file 'data/tribes/immovables/blackrootfield/small/init.lua'
--- data/tribes/immovables/blackrootfield/small/init.lua 2017-11-12 16:21:28 +0000
+++ data/tribes/immovables/blackrootfield/small/init.lua 2019-05-28 19:51:40 +0000
@@ -6,6 +6,7 @@
-- TRANSLATORS: This is an immovable name used in lists of immovables
descname = pgettext("immovable", "Blackroot Field (small)"),
helptext_script = dirname .. "helptexts.lua",
+ icon = dirname .. "menu.png",
size = "small",
attributes = { "field" },
programs = {
=== added file 'data/tribes/immovables/blackrootfield/small/menu.png'
Binary files data/tribes/immovables/blackrootfield/small/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/blackrootfield/small/menu.png 2019-05-28 19:51:40 +0000 differ
=== modified file 'data/tribes/immovables/blackrootfield/tiny/init.lua'
--- data/tribes/immovables/blackrootfield/tiny/init.lua 2017-11-12 16:21:28 +0000
+++ data/tribes/immovables/blackrootfield/tiny/init.lua 2019-05-28 19:51:40 +0000
@@ -6,6 +6,7 @@
-- TRANSLATORS: This is an immovable name used in lists of immovables
descname = pgettext("immovable", "Blackroot Field (tiny)"),
helptext_script = dirname .. "helptexts.lua",
+ icon = dirname .. "menu.png",
size = "small",
attributes = { "field", "seed_blackroot" },
programs = {
=== added file 'data/tribes/immovables/blackrootfield/tiny/menu.png'
Binary files data/tribes/immovables/blackrootfield/tiny/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/blackrootfield/tiny/menu.png 2019-05-28 19:51:40 +0000 differ
=== modified file 'data/tribes/immovables/cornfield/harvested/init.lua'
--- data/tribes/immovables/cornfield/harvested/init.lua 2017-11-12 16:21:28 +0000
+++ data/tribes/immovables/cornfield/harvested/init.lua 2019-05-28 19:51:40 +0000
@@ -6,6 +6,7 @@
-- TRANSLATORS: This is an immovable name used in lists of immovables
descname = pgettext("immovable", "Cornfield (harvested)"),
helptext_script = dirname .. "helptexts.lua",
+ icon = dirname .. "menu.png",
attributes = { "field" },
programs = {
program = {
=== added file 'data/tribes/immovables/cornfield/harvested/menu.png'
Binary files data/tribes/immovables/cornfield/harvested/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/cornfield/harvested/menu.png 2019-05-28 19:51:40 +0000 differ
=== modified file 'data/tribes/immovables/cornfield/medium/init.lua'
--- data/tribes/immovables/cornfield/medium/init.lua 2017-11-12 19:37:34 +0000
+++ data/tribes/immovables/cornfield/medium/init.lua 2019-05-28 19:51:40 +0000
@@ -6,6 +6,7 @@
-- TRANSLATORS: This is an immovable name used in lists of immovables
descname = pgettext("immovable", "Cornfield (medium)"),
helptext_script = dirname .. "helptexts.lua",
+ icon = dirname .. "menu.png",
size = "small",
attributes = { "field", "flowering" },
programs = {
=== added file 'data/tribes/immovables/cornfield/medium/menu.png'
Binary files data/tribes/immovables/cornfield/medium/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/cornfield/medium/menu.png 2019-05-28 19:51:40 +0000 differ
=== modified file 'data/tribes/immovables/cornfield/ripe/init.lua'
--- data/tribes/immovables/cornfield/ripe/init.lua 2017-11-12 16:21:28 +0000
+++ data/tribes/immovables/cornfield/ripe/init.lua 2019-05-28 19:51:40 +0000
@@ -6,6 +6,7 @@
-- TRANSLATORS: This is an immovable name used in lists of immovables
descname = pgettext("immovable", "Cornfield (ripe)"),
helptext_script = dirname .. "helptexts.lua",
+ icon = dirname .. "menu.png",
size = "small",
attributes = { "ripe_corn", "field" },
programs = {
=== added file 'data/tribes/immovables/cornfield/ripe/menu.png'
Binary files data/tribes/immovables/cornfield/ripe/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/cornfield/ripe/menu.png 2019-05-28 19:51:40 +0000 differ
=== modified file 'data/tribes/immovables/cornfield/small/init.lua'
--- data/tribes/immovables/cornfield/small/init.lua 2017-11-12 16:21:28 +0000
+++ data/tribes/immovables/cornfield/small/init.lua 2019-05-28 19:51:40 +0000
@@ -6,6 +6,7 @@
-- TRANSLATORS: This is an immovable name used in lists of immovables
descname = pgettext("immovable", "Cornfield (small)"),
helptext_script = dirname .. "helptexts.lua",
+ icon = dirname .. "menu.png",
size = "small",
attributes = { "field" },
programs = {
=== added file 'data/tribes/immovables/cornfield/small/menu.png'
Binary files data/tribes/immovables/cornfield/small/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/cornfield/small/menu.png 2019-05-28 19:51:40 +0000 differ
=== modified file 'data/tribes/immovables/cornfield/tiny/init.lua'
--- data/tribes/immovables/cornfield/tiny/init.lua 2017-11-12 16:21:28 +0000
+++ data/tribes/immovables/cornfield/tiny/init.lua 2019-05-28 19:51:40 +0000
@@ -6,6 +6,7 @@
-- TRANSLATORS: This is an immovable name used in lists of immovables
descname = pgettext("immovable", "Cornfield (tiny)"),
helptext_script = dirname .. "helptexts.lua",
+ icon = dirname .. "menu.png",
size = "small",
attributes = { "field", "seed_corn" },
programs = {
=== added file 'data/tribes/immovables/cornfield/tiny/menu.png'
Binary files data/tribes/immovables/cornfield/tiny/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/cornfield/tiny/menu.png 2019-05-28 19:51:40 +0000 differ
=== modified file 'data/tribes/immovables/destroyed_building/init.lua'
--- data/tribes/immovables/destroyed_building/init.lua 2017-11-12 16:21:28 +0000
+++ data/tribes/immovables/destroyed_building/init.lua 2019-05-28 19:51:40 +0000
@@ -6,6 +6,7 @@
-- TRANSLATORS: This is an immovable name used in lists of immovables
descname = pgettext("immovable", "Destroyed building"),
helptext_script = dirname .. "helptexts.lua",
+ icon = dirname .. "menu.png",
size = "big",
programs = {
program = {
=== modified file 'data/tribes/immovables/grapevine/medium/init.lua'
--- data/tribes/immovables/grapevine/medium/init.lua 2017-11-12 19:37:34 +0000
+++ data/tribes/immovables/grapevine/medium/init.lua 2019-05-28 19:51:40 +0000
@@ -6,6 +6,7 @@
-- TRANSLATORS: This is an immovable name used in lists of immovables
descname = pgettext("immovable", "Grapevine (medium)"),
helptext_script = dirname .. "helptexts.lua",
+ icon = dirname .. "menu.png",
size = "medium",
attributes = { "field", "flowering" },
programs = {
=== added file 'data/tribes/immovables/grapevine/medium/menu.png'
Binary files data/tribes/immovables/grapevine/medium/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/grapevine/medium/menu.png 2019-05-28 19:51:40 +0000 differ
=== modified file 'data/tribes/immovables/grapevine/ripe/init.lua'
--- data/tribes/immovables/grapevine/ripe/init.lua 2018-02-02 09:25:13 +0000
+++ data/tribes/immovables/grapevine/ripe/init.lua 2019-05-28 19:51:40 +0000
@@ -6,6 +6,7 @@
-- TRANSLATORS: This is an immovable name used in lists of immovables
descname = pgettext("immovable", "Grapevine (ripe)"),
helptext_script = dirname .. "helptexts.lua",
+ icon = dirname .. "menu.png",
size = "medium",
attributes = { "ripe_grapes", "ripe_bush", "field" },
programs = {
=== added file 'data/tribes/immovables/grapevine/ripe/menu.png'
Binary files data/tribes/immovables/grapevine/ripe/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/grapevine/ripe/menu.png 2019-05-28 19:51:40 +0000 differ
=== modified file 'data/tribes/immovables/grapevine/small/init.lua'
--- data/tribes/immovables/grapevine/small/init.lua 2017-11-12 16:21:28 +0000
+++ data/tribes/immovables/grapevine/small/init.lua 2019-05-28 19:51:40 +0000
@@ -6,6 +6,7 @@
-- TRANSLATORS: This is an immovable name used in lists of immovables
descname = pgettext("immovable", "Grapevine (small)"),
helptext_script = dirname .. "helptexts.lua",
+ icon = dirname .. "menu.png",
size = "medium",
attributes = { "field" },
programs = {
=== added file 'data/tribes/immovables/grapevine/small/menu.png'
Binary files data/tribes/immovables/grapevine/small/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/grapevine/small/menu.png 2019-05-28 19:51:40 +0000 differ
=== modified file 'data/tribes/immovables/grapevine/tiny/init.lua'
--- data/tribes/immovables/grapevine/tiny/init.lua 2017-11-12 16:21:28 +0000
+++ data/tribes/immovables/grapevine/tiny/init.lua 2019-05-28 19:51:40 +0000
@@ -6,6 +6,7 @@
-- TRANSLATORS: This is an immovable name used in lists of immovables
descname = pgettext("immovable", "Grapevine (tiny)"),
helptext_script = dirname .. "helptexts.lua",
+ icon = dirname .. "menu.png",
size = "medium",
attributes = { "field", "seed_grapes" },
programs = {
=== added file 'data/tribes/immovables/grapevine/tiny/menu.png'
Binary files data/tribes/immovables/grapevine/tiny/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/grapevine/tiny/menu.png 2019-05-28 19:51:40 +0000 differ
=== modified file 'data/tribes/immovables/pond/dry/init.lua'
--- data/tribes/immovables/pond/dry/init.lua 2018-04-09 09:11:29 +0000
+++ data/tribes/immovables/pond/dry/init.lua 2019-05-28 19:51:40 +0000
@@ -5,6 +5,7 @@
name = "pond_dry",
-- TRANSLATORS: This is an immovable name used in lists of immovables
descname = pgettext ("immovable", "Dry Pond"),
+ icon = dirname .. "menu.png",
size = "small",
helptext_script = dirname .. "helptexts.lua",
attributes = { "pond_dry" },
=== added file 'data/tribes/immovables/pond/dry/menu.png'
Binary files data/tribes/immovables/pond/dry/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/pond/dry/menu.png 2019-05-28 19:51:40 +0000 differ
=== modified file 'data/tribes/immovables/pond/growing/init.lua'
--- data/tribes/immovables/pond/growing/init.lua 2018-04-09 09:11:29 +0000
+++ data/tribes/immovables/pond/growing/init.lua 2019-05-28 19:51:40 +0000
@@ -5,6 +5,7 @@
name = "pond_growing",
-- TRANSLATORS: This is an immovable name used in lists of immovables
descname = pgettext ("immovable", "Pond With Fish Spawn"),
+ icon = dirname .. "menu.png",
size = "small",
helptext_script = dirname .. "helptexts.lua",
attributes = {},
=== added file 'data/tribes/immovables/pond/growing/menu.png'
Binary files data/tribes/immovables/pond/growing/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/pond/growing/menu.png 2019-05-28 19:51:40 +0000 differ
=== modified file 'data/tribes/immovables/pond/mature/init.lua'
--- data/tribes/immovables/pond/mature/init.lua 2018-04-09 09:11:29 +0000
+++ data/tribes/immovables/pond/mature/init.lua 2019-05-28 19:51:40 +0000
@@ -5,6 +5,7 @@
name = "pond_mature",
-- TRANSLATORS: This is an immovable name used in lists of immovables
descname = pgettext ("immovable", "Pond With Fish"),
+ icon = dirname .. "menu.png",
size = "small",
helptext_script = dirname .. "helptexts.lua",
attributes = { "pond_mature" },
=== added file 'data/tribes/immovables/pond/mature/menu.png'
Binary files data/tribes/immovables/pond/mature/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/pond/mature/menu.png 2019-05-28 19:51:40 +0000 differ
=== modified file 'data/tribes/immovables/reedfield/medium/init.lua'
--- data/tribes/immovables/reedfield/medium/init.lua 2019-05-19 10:36:50 +0000
+++ data/tribes/immovables/reedfield/medium/init.lua 2019-05-28 19:51:40 +0000
@@ -6,6 +6,7 @@
-- TRANSLATORS: This is an immovable name used in lists of immovables
descname = pgettext("immovable", "Reed Field (medium)"),
helptext_script = dirname .. "helptexts.lua",
+ icon = dirname .. "menu.png",
size = "small",
attributes = { "field", "flowering" },
programs = {
=== added file 'data/tribes/immovables/reedfield/medium/menu.png'
Binary files data/tribes/immovables/reedfield/medium/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/reedfield/medium/menu.png 2019-05-28 19:51:40 +0000 differ
=== modified file 'data/tribes/immovables/reedfield/ripe/init.lua'
--- data/tribes/immovables/reedfield/ripe/init.lua 2019-05-19 10:36:50 +0000
+++ data/tribes/immovables/reedfield/ripe/init.lua 2019-05-28 19:51:40 +0000
@@ -6,6 +6,7 @@
-- TRANSLATORS: This is an immovable name used in lists of immovables
descname = pgettext("immovable", "Reed Field (ripe)"),
helptext_script = dirname .. "helptexts.lua",
+ icon = dirname .. "menu.png",
size = "small",
attributes = { "ripe_reed", "field" },
programs = {
=== added file 'data/tribes/immovables/reedfield/ripe/menu.png'
Binary files data/tribes/immovables/reedfield/ripe/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/reedfield/ripe/menu.png 2019-05-28 19:51:40 +0000 differ
=== modified file 'data/tribes/immovables/reedfield/small/init.lua'
--- data/tribes/immovables/reedfield/small/init.lua 2019-05-19 10:36:50 +0000
+++ data/tribes/immovables/reedfield/small/init.lua 2019-05-28 19:51:40 +0000
@@ -6,6 +6,7 @@
-- TRANSLATORS: This is an immovable name used in lists of immovables
descname = pgettext("immovable", "Reed Field (small)"),
helptext_script = dirname .. "helptexts.lua",
+ icon = dirname .. "menu.png",
size = "small",
attributes = { "field" },
programs = {
=== added file 'data/tribes/immovables/reedfield/small/menu.png'
Binary files data/tribes/immovables/reedfield/small/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/reedfield/small/menu.png 2019-05-28 19:51:40 +0000 differ
=== modified file 'data/tribes/immovables/reedfield/tiny/init.lua'
--- data/tribes/immovables/reedfield/tiny/init.lua 2019-05-19 10:36:50 +0000
+++ data/tribes/immovables/reedfield/tiny/init.lua 2019-05-28 19:51:40 +0000
@@ -6,6 +6,7 @@
-- TRANSLATORS: This is an immovable name used in lists of immovables
descname = pgettext("immovable", "Reed Field (tiny)"),
helptext_script = dirname .. "helptexts.lua",
+ icon = dirname .. "menu.png",
size = "small",
attributes = { "field", "seed_reed" },
programs = {
=== added file 'data/tribes/immovables/reedfield/tiny/menu.png'
Binary files data/tribes/immovables/reedfield/tiny/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/reedfield/tiny/menu.png 2019-05-28 19:51:40 +0000 differ
=== modified file 'data/tribes/immovables/shipconstruction_atlanteans/init.lua'
--- data/tribes/immovables/shipconstruction_atlanteans/init.lua 2019-04-20 08:40:37 +0000
+++ data/tribes/immovables/shipconstruction_atlanteans/init.lua 2019-05-28 19:51:40 +0000
@@ -6,6 +6,7 @@
-- TRANSLATORS: This is an immovable name used in lists of immovables
descname = pgettext("immovable", "Ship Under Construction"),
helptext_script = dirname .. "helptexts.lua",
+ icon = dirname .. "menu.png",
size = "small",
attributes = { "shipconstruction" },
programs = {
=== added file 'data/tribes/immovables/shipconstruction_atlanteans/menu.png'
Binary files data/tribes/immovables/shipconstruction_atlanteans/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/shipconstruction_atlanteans/menu.png 2019-05-28 19:51:40 +0000 differ
=== modified file 'data/tribes/immovables/shipconstruction_barbarians/init.lua'
--- data/tribes/immovables/shipconstruction_barbarians/init.lua 2019-04-20 08:40:37 +0000
+++ data/tribes/immovables/shipconstruction_barbarians/init.lua 2019-05-28 19:51:40 +0000
@@ -6,6 +6,7 @@
-- TRANSLATORS: This is an immovable name used in lists of immovables
descname = pgettext("immovable", "Ship Under Construction"),
helptext_script = dirname .. "helptexts.lua",
+ icon = dirname .. "menu.png",
size = "small",
attributes = { "shipconstruction" },
programs = {
=== added file 'data/tribes/immovables/shipconstruction_barbarians/menu.png'
Binary files data/tribes/immovables/shipconstruction_barbarians/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/shipconstruction_barbarians/menu.png 2019-05-28 19:51:40 +0000 differ
=== modified file 'data/tribes/immovables/shipconstruction_empire/init.lua'
--- data/tribes/immovables/shipconstruction_empire/init.lua 2019-04-20 08:40:37 +0000
+++ data/tribes/immovables/shipconstruction_empire/init.lua 2019-05-28 19:51:40 +0000
@@ -6,6 +6,7 @@
-- TRANSLATORS: This is an immovable name used in lists of immovables
descname = pgettext("immovable", "Ship Under Construction"),
helptext_script = dirname .. "helptexts.lua",
+ icon = dirname .. "menu.png",
size = "small",
attributes = { "shipconstruction" },
programs = {
=== added file 'data/tribes/immovables/shipconstruction_empire/menu.png'
Binary files data/tribes/immovables/shipconstruction_empire/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/shipconstruction_empire/menu.png 2019-05-28 19:51:40 +0000 differ
=== modified file 'data/tribes/immovables/shipconstruction_frisians/init.lua'
--- data/tribes/immovables/shipconstruction_frisians/init.lua 2019-04-26 05:32:54 +0000
+++ data/tribes/immovables/shipconstruction_frisians/init.lua 2019-05-28 19:51:40 +0000
@@ -5,6 +5,7 @@
name = "frisians_shipconstruction",
-- TRANSLATORS: This is an immovable name used in lists of immovables
descname = pgettext("immovable", "Ship Under Construction"),
+ icon = dirname .. "menu.png",
size = "small",
helptext_script = dirname .. "helptexts.lua",
attributes = { "shipconstruction" },
=== added file 'data/tribes/immovables/shipconstruction_frisians/menu.png'
Binary files data/tribes/immovables/shipconstruction_frisians/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/shipconstruction_frisians/menu.png 2019-05-28 19:51:40 +0000 differ
=== modified file 'data/tribes/immovables/wheatfield/harvested/init.lua'
--- data/tribes/immovables/wheatfield/harvested/init.lua 2019-05-19 10:36:50 +0000
+++ data/tribes/immovables/wheatfield/harvested/init.lua 2019-05-28 19:51:40 +0000
@@ -6,6 +6,7 @@
-- TRANSLATORS: This is an immovable name used in lists of immovables
descname = pgettext("immovable", "Wheat Field (harvested)"),
helptext_script = dirname .. "helptexts.lua",
+ icon = dirname .. "menu.png",
attributes = { "field" },
programs = {
program = {
=== added file 'data/tribes/immovables/wheatfield/harvested/menu.png'
Binary files data/tribes/immovables/wheatfield/harvested/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/wheatfield/harvested/menu.png 2019-05-28 19:51:40 +0000 differ
=== modified file 'data/tribes/immovables/wheatfield/medium/init.lua'
--- data/tribes/immovables/wheatfield/medium/init.lua 2019-05-19 10:36:50 +0000
+++ data/tribes/immovables/wheatfield/medium/init.lua 2019-05-28 19:51:40 +0000
@@ -6,6 +6,7 @@
-- TRANSLATORS: This is an immovable name used in lists of immovables
descname = pgettext("immovable", "Wheat Field (medium)"),
helptext_script = dirname .. "helptexts.lua",
+ icon = dirname .. "menu.png",
size = "small",
attributes = { "field", "flowering" },
programs = {
=== added file 'data/tribes/immovables/wheatfield/medium/menu.png'
Binary files data/tribes/immovables/wheatfield/medium/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/wheatfield/medium/menu.png 2019-05-28 19:51:40 +0000 differ
=== modified file 'data/tribes/immovables/wheatfield/ripe/init.lua'
--- data/tribes/immovables/wheatfield/ripe/init.lua 2019-05-19 10:36:50 +0000
+++ data/tribes/immovables/wheatfield/ripe/init.lua 2019-05-28 19:51:40 +0000
@@ -6,6 +6,7 @@
-- TRANSLATORS: This is an immovable name used in lists of immovables
descname = pgettext("immovable", "Wheat Field (ripe)"),
helptext_script = dirname .. "helptexts.lua",
+ icon = dirname .. "menu.png",
size = "small",
attributes = { "ripe_wheat", "field" },
programs = {
=== added file 'data/tribes/immovables/wheatfield/ripe/menu.png'
Binary files data/tribes/immovables/wheatfield/ripe/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/wheatfield/ripe/menu.png 2019-05-28 19:51:40 +0000 differ
=== modified file 'data/tribes/immovables/wheatfield/small/init.lua'
--- data/tribes/immovables/wheatfield/small/init.lua 2019-05-19 10:36:50 +0000
+++ data/tribes/immovables/wheatfield/small/init.lua 2019-05-28 19:51:40 +0000
@@ -6,6 +6,7 @@
-- TRANSLATORS: This is an immovable name used in lists of immovables
descname = pgettext("immovable", "Wheat Field (small)"),
helptext_script = dirname .. "helptexts.lua",
+ icon = dirname .. "menu.png",
size = "small",
attributes = { "field" },
programs = {
=== added file 'data/tribes/immovables/wheatfield/small/menu.png'
Binary files data/tribes/immovables/wheatfield/small/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/wheatfield/small/menu.png 2019-05-28 19:51:40 +0000 differ
=== modified file 'data/tribes/immovables/wheatfield/tiny/init.lua'
--- data/tribes/immovables/wheatfield/tiny/init.lua 2019-05-19 10:36:50 +0000
+++ data/tribes/immovables/wheatfield/tiny/init.lua 2019-05-28 19:51:40 +0000
@@ -6,9 +6,9 @@
-- TRANSLATORS: This is an immovable name used in lists of immovables
descname = pgettext("immovable", "Wheat Field (tiny)"),
helptext_script = dirname .. "helptexts.lua",
+ icon = dirname .. "menu.png",
size = "small",
attributes = { "field", "seed_wheat" },
-
programs = {
program = {
"animate=idle 30000",
=== added file 'data/tribes/immovables/wheatfield/tiny/menu.png'
Binary files data/tribes/immovables/wheatfield/tiny/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/wheatfield/tiny/menu.png 2019-05-28 19:51:40 +0000 differ
=== modified file 'data/tribes/scripting/help/init.lua'
--- data/tribes/scripting/help/init.lua 2017-11-12 16:21:28 +0000
+++ data/tribes/scripting/help/init.lua 2019-05-28 19:51:40 +0000
@@ -104,7 +104,7 @@
name = "immovables",
-- TRANSLATORS Tab title: immovable help
title = _"Immovables",
- icon = "tribes/immovables/field_ripe/idle_00.png",
+ icon = "tribes/immovables/wheatfield/ripe/idle_00.png",
entries = immovable_entries(tribename)
},
}
Follow ups
-
[Merge] lp:~widelands-dev/widelands/immovables_icon_wrong_path_menu into lp:widelands
From: noreply, 2019-06-06
-
Re: [Merge] lp:~widelands-dev/widelands/immovables_icon_wrong_path_menu into lp:widelands
From: GunChleoc, 2019-06-06
-
[Merge] lp:~widelands-dev/widelands/immovables_icon_wrong_path_menu into lp:widelands
From: bunnybot, 2019-06-02
-
Re: [Merge] lp:~widelands-dev/widelands/immovables_icon_wrong_path_menu into lp:widelands
From: GunChleoc, 2019-06-02
-
Re: [Merge] lp:~widelands-dev/widelands/immovables_icon_wrong_path_menu into lp:widelands
From: Toni Förster, 2019-06-01
-
[Merge] lp:~widelands-dev/widelands/immovables_icon_wrong_path_menu into lp:widelands
From: bunnybot, 2019-05-30
-
Re: [Merge] lp:~widelands-dev/widelands/immovables_icon_wrong_path_menu into lp:widelands
From: Toni Förster, 2019-05-29
-
Re: [Merge] lp:~widelands-dev/widelands/immovables_icon_wrong_path_menu into lp:widelands
From: GunChleoc, 2019-05-29
-
Re: [Merge] lp:~widelands-dev/widelands/immovables_icon_wrong_path_menu into lp:widelands
From: Toni Förster, 2019-05-29
-
Re: [Merge] lp:~widelands-dev/widelands/immovables_icon_wrong_path_menu into lp:widelands
From: Toni Förster, 2019-05-29
-
Re: [Merge] lp:~widelands-dev/widelands/immovables_icon_wrong_path_menu into lp:widelands
From: GunChleoc, 2019-05-29
-
Re: [Merge] lp:~widelands-dev/widelands/immovables_icon_wrong_path_menu into lp:widelands
From: Toni Förster, 2019-05-29
-
Re: [Merge] lp:~widelands-dev/widelands/immovables_icon_wrong_path_menu into lp:widelands
From: GunChleoc, 2019-05-29
-
Re: [Merge] lp:~widelands-dev/widelands/immovables_icon_wrong_path_menu into lp:widelands
From: Toni Förster, 2019-05-29
-
Re: [Merge] lp:~widelands-dev/widelands/immovables_icon_wrong_path_menu into lp:widelands
From: GunChleoc, 2019-05-29
-
[Merge] lp:~widelands-dev/widelands/immovables_icon_wrong_path_menu into lp:widelands
From: bunnybot, 2019-05-29