widelands

Merge lp:~widelands-dev/widelands/immovables_icon_wrong_path_menu into lp:widelands

  1. immovables_icon_wrong_path_menu
  2. Merge into trunk
Proposed by Toni Förster
Status: Merged
Merged at revision: 9144
Proposed branch: lp:~widelands-dev/widelands/immovables_icon_wrong_path_menu
Merge into: lp:widelands
Diff against target: 884 lines (+71/-2)
46 files modified
data/tribes/immovables/ashes/init.lua (+2/-0)
data/tribes/immovables/barleyfield/harvested/init.lua (+1/-0)
data/tribes/immovables/barleyfield/medium/init.lua (+1/-0)
data/tribes/immovables/barleyfield/ripe/init.lua (+1/-0)
data/tribes/immovables/barleyfield/small/init.lua (+1/-0)
data/tribes/immovables/barleyfield/tiny/init.lua (+1/-0)
data/tribes/immovables/berry_bushes/blueberry/init.lua (+4/-0)
data/tribes/immovables/berry_bushes/currant_black/init.lua (+4/-0)
data/tribes/immovables/berry_bushes/currant_red/init.lua (+4/-0)
data/tribes/immovables/berry_bushes/desert_hackberry/init.lua (+4/-0)
data/tribes/immovables/berry_bushes/juniper/init.lua (+4/-0)
data/tribes/immovables/berry_bushes/raspberry/init.lua (+4/-0)
data/tribes/immovables/berry_bushes/sea_buckthorn/init.lua (+4/-0)
data/tribes/immovables/berry_bushes/strawberry/init.lua (+4/-0)
data/tribes/immovables/blackrootfield/harvested/init.lua (+1/-0)
data/tribes/immovables/blackrootfield/medium/init.lua (+1/-0)
data/tribes/immovables/blackrootfield/ripe/init.lua (+1/-0)
data/tribes/immovables/blackrootfield/small/init.lua (+1/-0)
data/tribes/immovables/blackrootfield/tiny/init.lua (+1/-0)
data/tribes/immovables/cornfield/harvested/init.lua (+1/-0)
data/tribes/immovables/cornfield/medium/init.lua (+1/-0)
data/tribes/immovables/cornfield/ripe/init.lua (+1/-0)
data/tribes/immovables/cornfield/small/init.lua (+1/-0)
data/tribes/immovables/cornfield/tiny/init.lua (+1/-0)
data/tribes/immovables/destroyed_building/init.lua (+1/-0)
data/tribes/immovables/grapevine/medium/init.lua (+1/-0)
data/tribes/immovables/grapevine/ripe/init.lua (+1/-0)
data/tribes/immovables/grapevine/small/init.lua (+1/-0)
data/tribes/immovables/grapevine/tiny/init.lua (+1/-0)
data/tribes/immovables/pond/dry/init.lua (+1/-0)
data/tribes/immovables/pond/growing/init.lua (+1/-0)
data/tribes/immovables/pond/mature/init.lua (+1/-0)
data/tribes/immovables/reedfield/medium/init.lua (+1/-0)
data/tribes/immovables/reedfield/ripe/init.lua (+1/-0)
data/tribes/immovables/reedfield/small/init.lua (+1/-0)
data/tribes/immovables/reedfield/tiny/init.lua (+1/-0)
data/tribes/immovables/shipconstruction_atlanteans/init.lua (+1/-0)
data/tribes/immovables/shipconstruction_barbarians/init.lua (+1/-0)
data/tribes/immovables/shipconstruction_empire/init.lua (+1/-0)
data/tribes/immovables/shipconstruction_frisians/init.lua (+1/-0)
data/tribes/immovables/wheatfield/harvested/init.lua (+1/-0)
data/tribes/immovables/wheatfield/medium/init.lua (+1/-0)
data/tribes/immovables/wheatfield/ripe/init.lua (+1/-0)
data/tribes/immovables/wheatfield/small/init.lua (+1/-0)
data/tribes/immovables/wheatfield/tiny/init.lua (+1/-1)
data/tribes/scripting/help/init.lua (+1/-1)
To merge this branch: bzr merge lp:~widelands-dev/widelands/immovables_icon_wrong_path_menu
Reviewer Review Type Date Requested Status
Widelands Developers Pending
Review via email: mp+368011@code.launchpad.net

Commit message

Fixes wrong path for encyclopedia immovables icon.

Added missing menu icons for immovables.

To post a comment you must log in.
Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 5078. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/538444034.
Appveyor build 4858. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_immovables_icon_wrong_path_menu-4858.

Revision history for this message
GunChleoc (gunchleoc) wrote :

How did you encode the PNGs? I am getting warnings:

libpng warning: iCCP: CRC error

I don't get this problem when I export PNGs with GIMP, maybe try that?

Revision history for this message
Toni Förster (stonerl) wrote :

I used GIMP, already. Where do you get these warnings?

Revision history for this message
GunChleoc (gunchleoc) wrote :

When I open the encyclopedia. utils/optimize_pngs.py will also crash with these files.

Revision history for this message
Toni Förster (stonerl) wrote :

should be fixed

Revision history for this message
GunChleoc (gunchleoc) wrote :

The errors are gone :)

I think the Atlantean Ship Under Construction is hard to see, maybe lighten it up a bit?

Also, the Frisian berry bushes are still missing icons.

Note that I have run the optimizer, so you will have to pull this branch before working on it.

Revision history for this message
Toni Förster (stonerl) wrote :

Changed the icon for the ship and added menu.png for all bushes. The bushes don't appear in the encyclopedia because nordfriese needs to entangle the lua files first. Currently, all information including terrain affinity are in one file.

Revision history for this message
Toni Förster (stonerl) wrote :

untangle :D

Revision history for this message
GunChleoc (gunchleoc) wrote :

The lua files are fine as they are, I have added the missing icon paths. No untangling needed ;)

Some of the Frisian icons are hard to read though, because the lines are pretty thin. Maybe more contrast would help here too? The ship under construction is also very small, maybe cut off the mast so you can make the body of the ship bigger?

Revision history for this message
Toni Förster (stonerl) wrote :

Will look into this. :)

Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 5085. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/538821683.
Appveyor build 4865. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_immovables_icon_wrong_path_menu-4865.

Revision history for this message
Toni Förster (stonerl) wrote :

Changed the icon for the frisian's ship.

Regarding the bushes, which one in particular do you want to see changed?

Revision history for this message
GunChleoc (gunchleoc) wrote :

Almost invisible icons are:

Barleyfield (Tiny)
Blueberry bush
Desert Hackberry
Raspberry Bush (Small + Tiny)
Strawberries (Tiny)

Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 5126. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/540237101.
Appveyor build 4908. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_immovables_icon_wrong_path_menu-4908.

Revision history for this message
GunChleoc (gunchleoc) wrote :

I need this for another branch that I'm working on, so let's have this now and improve the icons later.

@bunnybot merge

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/tribes/immovables/ashes/init.lua'
2--- data/tribes/immovables/ashes/init.lua 2017-11-12 16:21:28 +0000
3+++ data/tribes/immovables/ashes/init.lua 2019-06-01 22:42:16 +0000
4@@ -41,6 +41,8 @@
5 -- TRANSLATORS: This is an immovable name used in lists of immovables
6 descname = pgettext("immovable", "Ashes"),
7 helptext_script = dirname .. "helptexts.lua",
8+ icon = dirname .. "menu.png",
9+ size = "small",
10 programs = {
11 program = {
12 "animate=idle 45000",
13
14=== added file 'data/tribes/immovables/ashes/menu.png'
15Binary files data/tribes/immovables/ashes/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/ashes/menu.png 2019-06-01 22:42:16 +0000 differ
16=== modified file 'data/tribes/immovables/barleyfield/harvested/init.lua'
17--- data/tribes/immovables/barleyfield/harvested/init.lua 2018-04-09 09:11:29 +0000
18+++ data/tribes/immovables/barleyfield/harvested/init.lua 2019-06-01 22:42:16 +0000
19@@ -5,6 +5,7 @@
20 name = "barleyfield_harvested",
21 -- TRANSLATORS: This is an immovable name used in lists of immovables
22 descname = pgettext("immovable", "Barley Field (harvested)"),
23+ icon = dirname .. "menu.png",
24 helptext_script = dirname .. "helptexts.lua",
25 attributes = { "field" },
26 programs = {
27
28=== added file 'data/tribes/immovables/barleyfield/harvested/menu.png'
29Binary files data/tribes/immovables/barleyfield/harvested/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/barleyfield/harvested/menu.png 2019-06-01 22:42:16 +0000 differ
30=== modified file 'data/tribes/immovables/barleyfield/medium/init.lua'
31--- data/tribes/immovables/barleyfield/medium/init.lua 2018-04-09 09:11:29 +0000
32+++ data/tribes/immovables/barleyfield/medium/init.lua 2019-06-01 22:42:16 +0000
33@@ -5,6 +5,7 @@
34 name = "barleyfield_medium",
35 -- TRANSLATORS: This is an immovable name used in lists of immovables
36 descname = pgettext("immovable", "Barley Field (medium)"),
37+ icon = dirname .. "menu.png",
38 size = "small",
39 helptext_script = dirname .. "helptexts.lua",
40 attributes = { "field", "flowering" },
41
42=== added file 'data/tribes/immovables/barleyfield/medium/menu.png'
43Binary files data/tribes/immovables/barleyfield/medium/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/barleyfield/medium/menu.png 2019-06-01 22:42:16 +0000 differ
44=== modified file 'data/tribes/immovables/barleyfield/ripe/init.lua'
45--- data/tribes/immovables/barleyfield/ripe/init.lua 2018-04-09 09:11:29 +0000
46+++ data/tribes/immovables/barleyfield/ripe/init.lua 2019-06-01 22:42:16 +0000
47@@ -6,6 +6,7 @@
48 -- TRANSLATORS: This is an immovable name used in lists of immovables
49 descname = pgettext("immovable", "Barley Field (ripe)"),
50 size = "small",
51+ icon = dirname .. "menu.png",
52 helptext_script = dirname .. "helptexts.lua",
53 attributes = { "ripe_barley", "field" },
54 programs = {
55
56=== added file 'data/tribes/immovables/barleyfield/ripe/menu.png'
57Binary files data/tribes/immovables/barleyfield/ripe/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/barleyfield/ripe/menu.png 2019-06-01 22:42:16 +0000 differ
58=== modified file 'data/tribes/immovables/barleyfield/small/init.lua'
59--- data/tribes/immovables/barleyfield/small/init.lua 2018-04-09 09:11:29 +0000
60+++ data/tribes/immovables/barleyfield/small/init.lua 2019-06-01 22:42:16 +0000
61@@ -5,6 +5,7 @@
62 name = "barleyfield_small",
63 -- TRANSLATORS: This is an immovable name used in lists of immovables
64 descname = pgettext("immovable", "Barley Field (small)"),
65+ icon = dirname .. "menu.png",
66 size = "small",
67 helptext_script = dirname .. "helptexts.lua",
68 attributes = { "field" },
69
70=== added file 'data/tribes/immovables/barleyfield/small/menu.png'
71Binary files data/tribes/immovables/barleyfield/small/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/barleyfield/small/menu.png 2019-06-01 22:42:16 +0000 differ
72=== modified file 'data/tribes/immovables/barleyfield/tiny/init.lua'
73--- data/tribes/immovables/barleyfield/tiny/init.lua 2018-04-09 09:11:29 +0000
74+++ data/tribes/immovables/barleyfield/tiny/init.lua 2019-06-01 22:42:16 +0000
75@@ -5,6 +5,7 @@
76 name = "barleyfield_tiny",
77 -- TRANSLATORS: This is an immovable name used in lists of immovables
78 descname = pgettext("immovable", "Barley Field (tiny)"),
79+ icon = dirname .. "menu.png",
80 size = "small",
81 helptext_script = dirname .. "helptexts.lua",
82 attributes = { "field", "seed_barley" },
83
84=== added file 'data/tribes/immovables/barleyfield/tiny/menu.png'
85Binary files data/tribes/immovables/barleyfield/tiny/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/barleyfield/tiny/menu.png 2019-06-01 22:42:16 +0000 differ
86=== modified file 'data/tribes/immovables/berry_bushes/blueberry/init.lua'
87--- data/tribes/immovables/berry_bushes/blueberry/init.lua 2019-03-27 19:12:45 +0000
88+++ data/tribes/immovables/berry_bushes/blueberry/init.lua 2019-06-01 22:42:16 +0000
89@@ -18,6 +18,7 @@
90 descname = _ "Blueberry Bush (tiny)",
91 size = "small",
92 helptext_script = dirname .. "helptexts.lua",
93+ icon = dirname .. "tiny/menu.png",
94 attributes = { "seed_berrybush" },
95 terrain_affinity = terrain_affinity,
96 programs = {
97@@ -39,6 +40,7 @@
98 descname = _ "Blueberry Bush (small)",
99 size = "small",
100 helptext_script = dirname .. "helptexts.lua",
101+ icon = dirname .. "small/menu.png",
102 attributes = {},
103 terrain_affinity = terrain_affinity,
104 programs = {
105@@ -60,6 +62,7 @@
106 descname = _ "Blueberry Bush (medium)",
107 size = "small",
108 helptext_script = dirname .. "helptexts.lua",
109+ icon = dirname .. "medium/menu.png",
110 attributes = { "flowering" },
111 terrain_affinity = terrain_affinity,
112 programs = {
113@@ -81,6 +84,7 @@
114 descname = _ "Blueberry Bush (ripe)",
115 size = "small",
116 helptext_script = dirname .. "helptexts.lua",
117+ icon = dirname .. "ripe/menu.png",
118 attributes = { "ripe_bush" },
119 terrain_affinity = terrain_affinity,
120 programs = {
121
122=== added file 'data/tribes/immovables/berry_bushes/blueberry/medium/menu.png'
123Binary files data/tribes/immovables/berry_bushes/blueberry/medium/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/blueberry/medium/menu.png 2019-06-01 22:42:16 +0000 differ
124=== added file 'data/tribes/immovables/berry_bushes/blueberry/ripe/menu.png'
125Binary files data/tribes/immovables/berry_bushes/blueberry/ripe/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/blueberry/ripe/menu.png 2019-06-01 22:42:16 +0000 differ
126=== added file 'data/tribes/immovables/berry_bushes/blueberry/small/menu.png'
127Binary files data/tribes/immovables/berry_bushes/blueberry/small/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/blueberry/small/menu.png 2019-06-01 22:42:16 +0000 differ
128=== added file 'data/tribes/immovables/berry_bushes/blueberry/tiny/menu.png'
129Binary files data/tribes/immovables/berry_bushes/blueberry/tiny/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/blueberry/tiny/menu.png 2019-06-01 22:42:16 +0000 differ
130=== modified file 'data/tribes/immovables/berry_bushes/currant_black/init.lua'
131--- data/tribes/immovables/berry_bushes/currant_black/init.lua 2019-03-27 19:12:45 +0000
132+++ data/tribes/immovables/berry_bushes/currant_black/init.lua 2019-06-01 22:42:16 +0000
133@@ -16,6 +16,7 @@
134 descname = _ "Black Currant (tiny)",
135 size = "small",
136 helptext_script = dirname .. "helptexts.lua",
137+ icon = dirname .. "tiny/menu.png",
138 attributes = { "seed_berrybush" },
139 terrain_affinity = terrain_affinity,
140 programs = {
141@@ -37,6 +38,7 @@
142 descname = _ "Black Currant (small)",
143 size = "small",
144 helptext_script = dirname .. "helptexts.lua",
145+ icon = dirname .. "small/menu.png",
146 attributes = {},
147 terrain_affinity = terrain_affinity,
148 programs = {
149@@ -58,6 +60,7 @@
150 descname = _ "Black Currant (medium)",
151 size = "small",
152 helptext_script = dirname .. "helptexts.lua",
153+ icon = dirname .. "medium/menu.png",
154 attributes = { "flowering" },
155 terrain_affinity = terrain_affinity,
156 programs = {
157@@ -79,6 +82,7 @@
158 descname = _ "Black Currant (ripe)",
159 size = "small",
160 helptext_script = dirname .. "helptexts.lua",
161+ icon = dirname .. "ripe/menu.png",
162 attributes = { "ripe_bush" },
163 terrain_affinity = terrain_affinity,
164 programs = {
165
166=== added file 'data/tribes/immovables/berry_bushes/currant_black/medium/menu.png'
167Binary files data/tribes/immovables/berry_bushes/currant_black/medium/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_black/medium/menu.png 2019-06-01 22:42:16 +0000 differ
168=== added file 'data/tribes/immovables/berry_bushes/currant_black/ripe/menu.png'
169Binary files data/tribes/immovables/berry_bushes/currant_black/ripe/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_black/ripe/menu.png 2019-06-01 22:42:16 +0000 differ
170=== added file 'data/tribes/immovables/berry_bushes/currant_black/small/menu.png'
171Binary files data/tribes/immovables/berry_bushes/currant_black/small/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_black/small/menu.png 2019-06-01 22:42:16 +0000 differ
172=== added file 'data/tribes/immovables/berry_bushes/currant_black/tiny/menu.png'
173Binary files data/tribes/immovables/berry_bushes/currant_black/tiny/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_black/tiny/menu.png 2019-06-01 22:42:16 +0000 differ
174=== modified file 'data/tribes/immovables/berry_bushes/currant_red/init.lua'
175--- data/tribes/immovables/berry_bushes/currant_red/init.lua 2019-03-27 19:12:45 +0000
176+++ data/tribes/immovables/berry_bushes/currant_red/init.lua 2019-06-01 22:42:16 +0000
177@@ -16,6 +16,7 @@
178 descname = _ "Red Currant (tiny)",
179 size = "small",
180 helptext_script = dirname .. "helptexts.lua",
181+ icon = dirname .. "tiny/menu.png",
182 attributes = { "seed_berrybush" },
183 terrain_affinity = terrain_affinity,
184 programs = {
185@@ -37,6 +38,7 @@
186 descname = _ "Red Currant (small)",
187 size = "small",
188 helptext_script = dirname .. "helptexts.lua",
189+ icon = dirname .. "small/menu.png",
190 attributes = {},
191 terrain_affinity = terrain_affinity,
192 programs = {
193@@ -58,6 +60,7 @@
194 descname = _ "Red Currant (medium)",
195 size = "small",
196 helptext_script = dirname .. "helptexts.lua",
197+ icon = dirname .. "medium/menu.png",
198 attributes = { "flowering" },
199 terrain_affinity = terrain_affinity,
200 programs = {
201@@ -79,6 +82,7 @@
202 descname = _ "Red Currant (ripe)",
203 size = "small",
204 helptext_script = dirname .. "helptexts.lua",
205+ icon = dirname .. "ripe/menu.png",
206 attributes = { "ripe_bush" },
207 terrain_affinity = terrain_affinity,
208 programs = {
209
210=== added file 'data/tribes/immovables/berry_bushes/currant_red/medium/menu.png'
211Binary files data/tribes/immovables/berry_bushes/currant_red/medium/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_red/medium/menu.png 2019-06-01 22:42:16 +0000 differ
212=== added file 'data/tribes/immovables/berry_bushes/currant_red/ripe/menu.png'
213Binary files data/tribes/immovables/berry_bushes/currant_red/ripe/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_red/ripe/menu.png 2019-06-01 22:42:16 +0000 differ
214=== added file 'data/tribes/immovables/berry_bushes/currant_red/small/menu.png'
215Binary files data/tribes/immovables/berry_bushes/currant_red/small/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_red/small/menu.png 2019-06-01 22:42:16 +0000 differ
216=== added file 'data/tribes/immovables/berry_bushes/currant_red/tiny/menu.png'
217Binary files data/tribes/immovables/berry_bushes/currant_red/tiny/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/currant_red/tiny/menu.png 2019-06-01 22:42:16 +0000 differ
218=== modified file 'data/tribes/immovables/berry_bushes/desert_hackberry/init.lua'
219--- data/tribes/immovables/berry_bushes/desert_hackberry/init.lua 2019-03-27 19:12:45 +0000
220+++ data/tribes/immovables/berry_bushes/desert_hackberry/init.lua 2019-06-01 22:42:16 +0000
221@@ -16,6 +16,7 @@
222 descname = _ "Desert Hackberry (tiny)",
223 size = "small",
224 helptext_script = dirname .. "helptexts.lua",
225+ icon = dirname .. "tiny/menu.png",
226 attributes = { "seed_berrybush" },
227 terrain_affinity = terrain_affinity,
228 programs = {
229@@ -37,6 +38,7 @@
230 descname = _ "Desert Hackberry (small)",
231 size = "small",
232 helptext_script = dirname .. "helptexts.lua",
233+ icon = dirname .. "small/menu.png",
234 attributes = {},
235 terrain_affinity = terrain_affinity,
236 programs = {
237@@ -58,6 +60,7 @@
238 descname = _ "Desert Hackberry (medium)",
239 size = "small",
240 helptext_script = dirname .. "helptexts.lua",
241+ icon = dirname .. "medium/menu.png",
242 attributes = { "flowering" },
243 terrain_affinity = terrain_affinity,
244 programs = {
245@@ -79,6 +82,7 @@
246 descname = _ "Desert Hackberry (ripe)",
247 size = "small",
248 helptext_script = dirname .. "helptexts.lua",
249+ icon = dirname .. "ripe/menu.png",
250 attributes = { "ripe_bush" },
251 terrain_affinity = terrain_affinity,
252 programs = {
253
254=== added file 'data/tribes/immovables/berry_bushes/desert_hackberry/medium/menu.png'
255Binary files data/tribes/immovables/berry_bushes/desert_hackberry/medium/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/medium/menu.png 2019-06-01 22:42:16 +0000 differ
256=== added file 'data/tribes/immovables/berry_bushes/desert_hackberry/ripe/menu.png'
257Binary files data/tribes/immovables/berry_bushes/desert_hackberry/ripe/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/ripe/menu.png 2019-06-01 22:42:16 +0000 differ
258=== added file 'data/tribes/immovables/berry_bushes/desert_hackberry/small/menu.png'
259Binary files data/tribes/immovables/berry_bushes/desert_hackberry/small/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/small/menu.png 2019-06-01 22:42:16 +0000 differ
260=== added file 'data/tribes/immovables/berry_bushes/desert_hackberry/tiny/menu.png'
261Binary files data/tribes/immovables/berry_bushes/desert_hackberry/tiny/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/desert_hackberry/tiny/menu.png 2019-06-01 22:42:16 +0000 differ
262=== modified file 'data/tribes/immovables/berry_bushes/juniper/init.lua'
263--- data/tribes/immovables/berry_bushes/juniper/init.lua 2019-03-27 19:12:45 +0000
264+++ data/tribes/immovables/berry_bushes/juniper/init.lua 2019-06-01 22:42:16 +0000
265@@ -16,6 +16,7 @@
266 descname = _ "Juniper (tiny)",
267 size = "small",
268 helptext_script = dirname .. "helptexts.lua",
269+ icon = dirname .. "tiny/menu.png",
270 attributes = { "seed_berrybush" },
271 terrain_affinity = terrain_affinity,
272 programs = {
273@@ -37,6 +38,7 @@
274 descname = _ "Juniper (small)",
275 size = "small",
276 helptext_script = dirname .. "helptexts.lua",
277+ icon = dirname .. "small/menu.png",
278 attributes = {},
279 terrain_affinity = terrain_affinity,
280 programs = {
281@@ -58,6 +60,7 @@
282 descname = _ "Juniper (medium)",
283 size = "small",
284 helptext_script = dirname .. "helptexts.lua",
285+ icon = dirname .. "medium/menu.png",
286 attributes = { "flowering" },
287 terrain_affinity = terrain_affinity,
288 programs = {
289@@ -79,6 +82,7 @@
290 descname = _ "Juniper (ripe)",
291 size = "small",
292 helptext_script = dirname .. "helptexts.lua",
293+ icon = dirname .. "ripe/menu.png",
294 attributes = { "ripe_bush" },
295 terrain_affinity = terrain_affinity,
296 programs = {
297
298=== added file 'data/tribes/immovables/berry_bushes/juniper/medium/menu.png'
299Binary files data/tribes/immovables/berry_bushes/juniper/medium/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/medium/menu.png 2019-06-01 22:42:16 +0000 differ
300=== added file 'data/tribes/immovables/berry_bushes/juniper/ripe/menu.png'
301Binary files data/tribes/immovables/berry_bushes/juniper/ripe/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/ripe/menu.png 2019-06-01 22:42:16 +0000 differ
302=== added file 'data/tribes/immovables/berry_bushes/juniper/small/menu.png'
303Binary files data/tribes/immovables/berry_bushes/juniper/small/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/small/menu.png 2019-06-01 22:42:16 +0000 differ
304=== added file 'data/tribes/immovables/berry_bushes/juniper/tiny/menu.png'
305Binary files data/tribes/immovables/berry_bushes/juniper/tiny/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/juniper/tiny/menu.png 2019-06-01 22:42:16 +0000 differ
306=== modified file 'data/tribes/immovables/berry_bushes/raspberry/init.lua'
307--- data/tribes/immovables/berry_bushes/raspberry/init.lua 2019-03-27 19:12:45 +0000
308+++ data/tribes/immovables/berry_bushes/raspberry/init.lua 2019-06-01 22:42:16 +0000
309@@ -16,6 +16,7 @@
310 descname = _ "Raspberry Bush (tiny)",
311 size = "small",
312 helptext_script = dirname .. "helptexts.lua",
313+ icon = dirname .. "tiny/menu.png",
314 attributes = { "seed_berrybush" },
315 terrain_affinity = terrain_affinity,
316 programs = {
317@@ -37,6 +38,7 @@
318 descname = _ "Raspberry Bush (small)",
319 size = "small",
320 helptext_script = dirname .. "helptexts.lua",
321+ icon = dirname .. "small/menu.png",
322 attributes = {},
323 terrain_affinity = terrain_affinity,
324 programs = {
325@@ -58,6 +60,7 @@
326 descname = _ "Raspberry Bush (medium)",
327 size = "small",
328 helptext_script = dirname .. "helptexts.lua",
329+ icon = dirname .. "medium/menu.png",
330 attributes = { "flowering" },
331 terrain_affinity = terrain_affinity,
332 programs = {
333@@ -79,6 +82,7 @@
334 descname = _ "Raspberry Bush (ripe)",
335 size = "small",
336 helptext_script = dirname .. "helptexts.lua",
337+ icon = dirname .. "ripe/menu.png",
338 attributes = { "ripe_bush" },
339 terrain_affinity = terrain_affinity,
340 programs = {
341
342=== added file 'data/tribes/immovables/berry_bushes/raspberry/medium/menu.png'
343Binary files data/tribes/immovables/berry_bushes/raspberry/medium/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/raspberry/medium/menu.png 2019-06-01 22:42:16 +0000 differ
344=== added file 'data/tribes/immovables/berry_bushes/raspberry/ripe/menu.png'
345Binary files data/tribes/immovables/berry_bushes/raspberry/ripe/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/raspberry/ripe/menu.png 2019-06-01 22:42:16 +0000 differ
346=== added file 'data/tribes/immovables/berry_bushes/raspberry/small/menu.png'
347Binary files data/tribes/immovables/berry_bushes/raspberry/small/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/raspberry/small/menu.png 2019-06-01 22:42:16 +0000 differ
348=== added file 'data/tribes/immovables/berry_bushes/raspberry/tiny/menu.png'
349Binary files data/tribes/immovables/berry_bushes/raspberry/tiny/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/raspberry/tiny/menu.png 2019-06-01 22:42:16 +0000 differ
350=== modified file 'data/tribes/immovables/berry_bushes/sea_buckthorn/init.lua'
351--- data/tribes/immovables/berry_bushes/sea_buckthorn/init.lua 2019-03-27 19:12:45 +0000
352+++ data/tribes/immovables/berry_bushes/sea_buckthorn/init.lua 2019-06-01 22:42:16 +0000
353@@ -16,6 +16,7 @@
354 descname = _ "Sea Buckthorn (tiny)",
355 size = "small",
356 helptext_script = dirname .. "helptexts.lua",
357+ icon = dirname .. "tiny/menu.png",
358 attributes = { "seed_berrybush" },
359 terrain_affinity = terrain_affinity,
360 programs = {
361@@ -37,6 +38,7 @@
362 descname = _ "Sea Buckthorn (small)",
363 size = "small",
364 helptext_script = dirname .. "helptexts.lua",
365+ icon = dirname .. "small/menu.png",
366 attributes = {},
367 terrain_affinity = terrain_affinity,
368 programs = {
369@@ -58,6 +60,7 @@
370 descname = _ "Sea Buckthorn (medium)",
371 size = "small",
372 helptext_script = dirname .. "helptexts.lua",
373+ icon = dirname .. "medium/menu.png",
374 attributes = { "flowering" },
375 terrain_affinity = terrain_affinity,
376 programs = {
377@@ -79,6 +82,7 @@
378 descname = _ "Sea Buckthorn (ripe)",
379 size = "small",
380 helptext_script = dirname .. "helptexts.lua",
381+ icon = dirname .. "ripe/menu.png",
382 attributes = { "ripe_bush" },
383 terrain_affinity = terrain_affinity,
384 programs = {
385
386=== added file 'data/tribes/immovables/berry_bushes/sea_buckthorn/medium/menu.png'
387Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/medium/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/medium/menu.png 2019-06-01 22:42:16 +0000 differ
388=== added file 'data/tribes/immovables/berry_bushes/sea_buckthorn/ripe/menu.png'
389Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/ripe/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/ripe/menu.png 2019-06-01 22:42:16 +0000 differ
390=== added file 'data/tribes/immovables/berry_bushes/sea_buckthorn/small/menu.png'
391Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/small/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/small/menu.png 2019-06-01 22:42:16 +0000 differ
392=== added file 'data/tribes/immovables/berry_bushes/sea_buckthorn/tiny/menu.png'
393Binary files data/tribes/immovables/berry_bushes/sea_buckthorn/tiny/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/sea_buckthorn/tiny/menu.png 2019-06-01 22:42:16 +0000 differ
394=== modified file 'data/tribes/immovables/berry_bushes/strawberry/init.lua'
395--- data/tribes/immovables/berry_bushes/strawberry/init.lua 2019-03-27 19:12:45 +0000
396+++ data/tribes/immovables/berry_bushes/strawberry/init.lua 2019-06-01 22:42:16 +0000
397@@ -16,6 +16,7 @@
398 descname = _ "Strawberries (tiny)",
399 size = "small",
400 helptext_script = dirname .. "helptexts.lua",
401+ icon = dirname .. "tiny/menu.png",
402 attributes = { "seed_berrybush" },
403 terrain_affinity = terrain_affinity,
404 programs = {
405@@ -37,6 +38,7 @@
406 descname = _ "Strawberries (small)",
407 size = "small",
408 helptext_script = dirname .. "helptexts.lua",
409+ icon = dirname .. "small/menu.png",
410 attributes = {},
411 terrain_affinity = terrain_affinity,
412 programs = {
413@@ -58,6 +60,7 @@
414 descname = _ "Strawberries (medium)",
415 size = "small",
416 helptext_script = dirname .. "helptexts.lua",
417+ icon = dirname .. "medium/menu.png",
418 attributes = { "flowering" },
419 terrain_affinity = terrain_affinity,
420 programs = {
421@@ -79,6 +82,7 @@
422 descname = _ "Strawberries (ripe)",
423 size = "small",
424 helptext_script = dirname .. "helptexts.lua",
425+ icon = dirname .. "ripe/menu.png",
426 attributes = { "ripe_bush" },
427 terrain_affinity = terrain_affinity,
428 programs = {
429
430=== added file 'data/tribes/immovables/berry_bushes/strawberry/medium/menu.png'
431Binary files data/tribes/immovables/berry_bushes/strawberry/medium/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/strawberry/medium/menu.png 2019-06-01 22:42:16 +0000 differ
432=== added file 'data/tribes/immovables/berry_bushes/strawberry/ripe/menu.png'
433Binary files data/tribes/immovables/berry_bushes/strawberry/ripe/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/strawberry/ripe/menu.png 2019-06-01 22:42:16 +0000 differ
434=== added file 'data/tribes/immovables/berry_bushes/strawberry/small/menu.png'
435Binary files data/tribes/immovables/berry_bushes/strawberry/small/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/strawberry/small/menu.png 2019-06-01 22:42:16 +0000 differ
436=== added file 'data/tribes/immovables/berry_bushes/strawberry/tiny/menu.png'
437Binary files data/tribes/immovables/berry_bushes/strawberry/tiny/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/berry_bushes/strawberry/tiny/menu.png 2019-06-01 22:42:16 +0000 differ
438=== modified file 'data/tribes/immovables/blackrootfield/harvested/init.lua'
439--- data/tribes/immovables/blackrootfield/harvested/init.lua 2017-11-12 16:21:28 +0000
440+++ data/tribes/immovables/blackrootfield/harvested/init.lua 2019-06-01 22:42:16 +0000
441@@ -6,6 +6,7 @@
442 -- TRANSLATORS: This is an immovable name used in lists of immovables
443 descname = pgettext("immovable", "Blackroot Field (harvested)"),
444 helptext_script = dirname .. "helptexts.lua",
445+ icon = dirname .. "menu.png",
446 attributes = { "field" },
447 programs = {
448 program = {
449
450=== added file 'data/tribes/immovables/blackrootfield/harvested/menu.png'
451Binary files data/tribes/immovables/blackrootfield/harvested/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/blackrootfield/harvested/menu.png 2019-06-01 22:42:16 +0000 differ
452=== modified file 'data/tribes/immovables/blackrootfield/medium/init.lua'
453--- data/tribes/immovables/blackrootfield/medium/init.lua 2017-11-12 19:37:34 +0000
454+++ data/tribes/immovables/blackrootfield/medium/init.lua 2019-06-01 22:42:16 +0000
455@@ -6,6 +6,7 @@
456 -- TRANSLATORS: This is an immovable name used in lists of immovables
457 descname = pgettext("immovable", "Blackroot Field (medium)"),
458 helptext_script = dirname .. "helptexts.lua",
459+ icon = dirname .. "menu.png",
460 size = "small",
461 attributes = { "field", "flowering" },
462 programs = {
463
464=== added file 'data/tribes/immovables/blackrootfield/medium/menu.png'
465Binary files data/tribes/immovables/blackrootfield/medium/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/blackrootfield/medium/menu.png 2019-06-01 22:42:16 +0000 differ
466=== modified file 'data/tribes/immovables/blackrootfield/ripe/init.lua'
467--- data/tribes/immovables/blackrootfield/ripe/init.lua 2017-11-12 16:21:28 +0000
468+++ data/tribes/immovables/blackrootfield/ripe/init.lua 2019-06-01 22:42:16 +0000
469@@ -6,6 +6,7 @@
470 -- TRANSLATORS: This is an immovable name used in lists of immovables
471 descname = pgettext("immovable", "Blackroot Field (ripe)"),
472 helptext_script = dirname .. "helptexts.lua",
473+ icon = dirname .. "menu.png",
474 size = "small",
475 attributes = { "ripe_blackroot", "field" },
476 programs = {
477
478=== added file 'data/tribes/immovables/blackrootfield/ripe/menu.png'
479Binary files data/tribes/immovables/blackrootfield/ripe/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/blackrootfield/ripe/menu.png 2019-06-01 22:42:16 +0000 differ
480=== modified file 'data/tribes/immovables/blackrootfield/small/init.lua'
481--- data/tribes/immovables/blackrootfield/small/init.lua 2017-11-12 16:21:28 +0000
482+++ data/tribes/immovables/blackrootfield/small/init.lua 2019-06-01 22:42:16 +0000
483@@ -6,6 +6,7 @@
484 -- TRANSLATORS: This is an immovable name used in lists of immovables
485 descname = pgettext("immovable", "Blackroot Field (small)"),
486 helptext_script = dirname .. "helptexts.lua",
487+ icon = dirname .. "menu.png",
488 size = "small",
489 attributes = { "field" },
490 programs = {
491
492=== added file 'data/tribes/immovables/blackrootfield/small/menu.png'
493Binary files data/tribes/immovables/blackrootfield/small/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/blackrootfield/small/menu.png 2019-06-01 22:42:16 +0000 differ
494=== modified file 'data/tribes/immovables/blackrootfield/tiny/init.lua'
495--- data/tribes/immovables/blackrootfield/tiny/init.lua 2017-11-12 16:21:28 +0000
496+++ data/tribes/immovables/blackrootfield/tiny/init.lua 2019-06-01 22:42:16 +0000
497@@ -6,6 +6,7 @@
498 -- TRANSLATORS: This is an immovable name used in lists of immovables
499 descname = pgettext("immovable", "Blackroot Field (tiny)"),
500 helptext_script = dirname .. "helptexts.lua",
501+ icon = dirname .. "menu.png",
502 size = "small",
503 attributes = { "field", "seed_blackroot" },
504 programs = {
505
506=== added file 'data/tribes/immovables/blackrootfield/tiny/menu.png'
507Binary files data/tribes/immovables/blackrootfield/tiny/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/blackrootfield/tiny/menu.png 2019-06-01 22:42:16 +0000 differ
508=== modified file 'data/tribes/immovables/cornfield/harvested/init.lua'
509--- data/tribes/immovables/cornfield/harvested/init.lua 2017-11-12 16:21:28 +0000
510+++ data/tribes/immovables/cornfield/harvested/init.lua 2019-06-01 22:42:16 +0000
511@@ -6,6 +6,7 @@
512 -- TRANSLATORS: This is an immovable name used in lists of immovables
513 descname = pgettext("immovable", "Cornfield (harvested)"),
514 helptext_script = dirname .. "helptexts.lua",
515+ icon = dirname .. "menu.png",
516 attributes = { "field" },
517 programs = {
518 program = {
519
520=== added file 'data/tribes/immovables/cornfield/harvested/menu.png'
521Binary files data/tribes/immovables/cornfield/harvested/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/cornfield/harvested/menu.png 2019-06-01 22:42:16 +0000 differ
522=== modified file 'data/tribes/immovables/cornfield/medium/init.lua'
523--- data/tribes/immovables/cornfield/medium/init.lua 2017-11-12 19:37:34 +0000
524+++ data/tribes/immovables/cornfield/medium/init.lua 2019-06-01 22:42:16 +0000
525@@ -6,6 +6,7 @@
526 -- TRANSLATORS: This is an immovable name used in lists of immovables
527 descname = pgettext("immovable", "Cornfield (medium)"),
528 helptext_script = dirname .. "helptexts.lua",
529+ icon = dirname .. "menu.png",
530 size = "small",
531 attributes = { "field", "flowering" },
532 programs = {
533
534=== added file 'data/tribes/immovables/cornfield/medium/menu.png'
535Binary files data/tribes/immovables/cornfield/medium/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/cornfield/medium/menu.png 2019-06-01 22:42:16 +0000 differ
536=== modified file 'data/tribes/immovables/cornfield/ripe/init.lua'
537--- data/tribes/immovables/cornfield/ripe/init.lua 2017-11-12 16:21:28 +0000
538+++ data/tribes/immovables/cornfield/ripe/init.lua 2019-06-01 22:42:16 +0000
539@@ -6,6 +6,7 @@
540 -- TRANSLATORS: This is an immovable name used in lists of immovables
541 descname = pgettext("immovable", "Cornfield (ripe)"),
542 helptext_script = dirname .. "helptexts.lua",
543+ icon = dirname .. "menu.png",
544 size = "small",
545 attributes = { "ripe_corn", "field" },
546 programs = {
547
548=== added file 'data/tribes/immovables/cornfield/ripe/menu.png'
549Binary files data/tribes/immovables/cornfield/ripe/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/cornfield/ripe/menu.png 2019-06-01 22:42:16 +0000 differ
550=== modified file 'data/tribes/immovables/cornfield/small/init.lua'
551--- data/tribes/immovables/cornfield/small/init.lua 2017-11-12 16:21:28 +0000
552+++ data/tribes/immovables/cornfield/small/init.lua 2019-06-01 22:42:16 +0000
553@@ -6,6 +6,7 @@
554 -- TRANSLATORS: This is an immovable name used in lists of immovables
555 descname = pgettext("immovable", "Cornfield (small)"),
556 helptext_script = dirname .. "helptexts.lua",
557+ icon = dirname .. "menu.png",
558 size = "small",
559 attributes = { "field" },
560 programs = {
561
562=== added file 'data/tribes/immovables/cornfield/small/menu.png'
563Binary files data/tribes/immovables/cornfield/small/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/cornfield/small/menu.png 2019-06-01 22:42:16 +0000 differ
564=== modified file 'data/tribes/immovables/cornfield/tiny/init.lua'
565--- data/tribes/immovables/cornfield/tiny/init.lua 2017-11-12 16:21:28 +0000
566+++ data/tribes/immovables/cornfield/tiny/init.lua 2019-06-01 22:42:16 +0000
567@@ -6,6 +6,7 @@
568 -- TRANSLATORS: This is an immovable name used in lists of immovables
569 descname = pgettext("immovable", "Cornfield (tiny)"),
570 helptext_script = dirname .. "helptexts.lua",
571+ icon = dirname .. "menu.png",
572 size = "small",
573 attributes = { "field", "seed_corn" },
574 programs = {
575
576=== added file 'data/tribes/immovables/cornfield/tiny/menu.png'
577Binary files data/tribes/immovables/cornfield/tiny/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/cornfield/tiny/menu.png 2019-06-01 22:42:16 +0000 differ
578=== modified file 'data/tribes/immovables/destroyed_building/init.lua'
579--- data/tribes/immovables/destroyed_building/init.lua 2017-11-12 16:21:28 +0000
580+++ data/tribes/immovables/destroyed_building/init.lua 2019-06-01 22:42:16 +0000
581@@ -6,6 +6,7 @@
582 -- TRANSLATORS: This is an immovable name used in lists of immovables
583 descname = pgettext("immovable", "Destroyed building"),
584 helptext_script = dirname .. "helptexts.lua",
585+ icon = dirname .. "menu.png",
586 size = "big",
587 programs = {
588 program = {
589
590=== modified file 'data/tribes/immovables/grapevine/medium/init.lua'
591--- data/tribes/immovables/grapevine/medium/init.lua 2017-11-12 19:37:34 +0000
592+++ data/tribes/immovables/grapevine/medium/init.lua 2019-06-01 22:42:16 +0000
593@@ -6,6 +6,7 @@
594 -- TRANSLATORS: This is an immovable name used in lists of immovables
595 descname = pgettext("immovable", "Grapevine (medium)"),
596 helptext_script = dirname .. "helptexts.lua",
597+ icon = dirname .. "menu.png",
598 size = "medium",
599 attributes = { "field", "flowering" },
600 programs = {
601
602=== added file 'data/tribes/immovables/grapevine/medium/menu.png'
603Binary files data/tribes/immovables/grapevine/medium/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/grapevine/medium/menu.png 2019-06-01 22:42:16 +0000 differ
604=== modified file 'data/tribes/immovables/grapevine/ripe/init.lua'
605--- data/tribes/immovables/grapevine/ripe/init.lua 2018-02-02 09:25:13 +0000
606+++ data/tribes/immovables/grapevine/ripe/init.lua 2019-06-01 22:42:16 +0000
607@@ -6,6 +6,7 @@
608 -- TRANSLATORS: This is an immovable name used in lists of immovables
609 descname = pgettext("immovable", "Grapevine (ripe)"),
610 helptext_script = dirname .. "helptexts.lua",
611+ icon = dirname .. "menu.png",
612 size = "medium",
613 attributes = { "ripe_grapes", "ripe_bush", "field" },
614 programs = {
615
616=== added file 'data/tribes/immovables/grapevine/ripe/menu.png'
617Binary files data/tribes/immovables/grapevine/ripe/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/grapevine/ripe/menu.png 2019-06-01 22:42:16 +0000 differ
618=== modified file 'data/tribes/immovables/grapevine/small/init.lua'
619--- data/tribes/immovables/grapevine/small/init.lua 2017-11-12 16:21:28 +0000
620+++ data/tribes/immovables/grapevine/small/init.lua 2019-06-01 22:42:16 +0000
621@@ -6,6 +6,7 @@
622 -- TRANSLATORS: This is an immovable name used in lists of immovables
623 descname = pgettext("immovable", "Grapevine (small)"),
624 helptext_script = dirname .. "helptexts.lua",
625+ icon = dirname .. "menu.png",
626 size = "medium",
627 attributes = { "field" },
628 programs = {
629
630=== added file 'data/tribes/immovables/grapevine/small/menu.png'
631Binary files data/tribes/immovables/grapevine/small/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/grapevine/small/menu.png 2019-06-01 22:42:16 +0000 differ
632=== modified file 'data/tribes/immovables/grapevine/tiny/init.lua'
633--- data/tribes/immovables/grapevine/tiny/init.lua 2017-11-12 16:21:28 +0000
634+++ data/tribes/immovables/grapevine/tiny/init.lua 2019-06-01 22:42:16 +0000
635@@ -6,6 +6,7 @@
636 -- TRANSLATORS: This is an immovable name used in lists of immovables
637 descname = pgettext("immovable", "Grapevine (tiny)"),
638 helptext_script = dirname .. "helptexts.lua",
639+ icon = dirname .. "menu.png",
640 size = "medium",
641 attributes = { "field", "seed_grapes" },
642 programs = {
643
644=== added file 'data/tribes/immovables/grapevine/tiny/menu.png'
645Binary files data/tribes/immovables/grapevine/tiny/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/grapevine/tiny/menu.png 2019-06-01 22:42:16 +0000 differ
646=== modified file 'data/tribes/immovables/pond/dry/init.lua'
647--- data/tribes/immovables/pond/dry/init.lua 2018-04-09 09:11:29 +0000
648+++ data/tribes/immovables/pond/dry/init.lua 2019-06-01 22:42:16 +0000
649@@ -5,6 +5,7 @@
650 name = "pond_dry",
651 -- TRANSLATORS: This is an immovable name used in lists of immovables
652 descname = pgettext ("immovable", "Dry Pond"),
653+ icon = dirname .. "menu.png",
654 size = "small",
655 helptext_script = dirname .. "helptexts.lua",
656 attributes = { "pond_dry" },
657
658=== added file 'data/tribes/immovables/pond/dry/menu.png'
659Binary files data/tribes/immovables/pond/dry/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/pond/dry/menu.png 2019-06-01 22:42:16 +0000 differ
660=== modified file 'data/tribes/immovables/pond/growing/init.lua'
661--- data/tribes/immovables/pond/growing/init.lua 2018-04-09 09:11:29 +0000
662+++ data/tribes/immovables/pond/growing/init.lua 2019-06-01 22:42:16 +0000
663@@ -5,6 +5,7 @@
664 name = "pond_growing",
665 -- TRANSLATORS: This is an immovable name used in lists of immovables
666 descname = pgettext ("immovable", "Pond With Fish Spawn"),
667+ icon = dirname .. "menu.png",
668 size = "small",
669 helptext_script = dirname .. "helptexts.lua",
670 attributes = {},
671
672=== added file 'data/tribes/immovables/pond/growing/menu.png'
673Binary files data/tribes/immovables/pond/growing/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/pond/growing/menu.png 2019-06-01 22:42:16 +0000 differ
674=== modified file 'data/tribes/immovables/pond/mature/init.lua'
675--- data/tribes/immovables/pond/mature/init.lua 2018-04-09 09:11:29 +0000
676+++ data/tribes/immovables/pond/mature/init.lua 2019-06-01 22:42:16 +0000
677@@ -5,6 +5,7 @@
678 name = "pond_mature",
679 -- TRANSLATORS: This is an immovable name used in lists of immovables
680 descname = pgettext ("immovable", "Pond With Fish"),
681+ icon = dirname .. "menu.png",
682 size = "small",
683 helptext_script = dirname .. "helptexts.lua",
684 attributes = { "pond_mature" },
685
686=== added file 'data/tribes/immovables/pond/mature/menu.png'
687Binary files data/tribes/immovables/pond/mature/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/pond/mature/menu.png 2019-06-01 22:42:16 +0000 differ
688=== modified file 'data/tribes/immovables/reedfield/medium/init.lua'
689--- data/tribes/immovables/reedfield/medium/init.lua 2019-05-19 10:36:50 +0000
690+++ data/tribes/immovables/reedfield/medium/init.lua 2019-06-01 22:42:16 +0000
691@@ -6,6 +6,7 @@
692 -- TRANSLATORS: This is an immovable name used in lists of immovables
693 descname = pgettext("immovable", "Reed Field (medium)"),
694 helptext_script = dirname .. "helptexts.lua",
695+ icon = dirname .. "menu.png",
696 size = "small",
697 attributes = { "field", "flowering" },
698 programs = {
699
700=== added file 'data/tribes/immovables/reedfield/medium/menu.png'
701Binary files data/tribes/immovables/reedfield/medium/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/reedfield/medium/menu.png 2019-06-01 22:42:16 +0000 differ
702=== modified file 'data/tribes/immovables/reedfield/ripe/init.lua'
703--- data/tribes/immovables/reedfield/ripe/init.lua 2019-05-19 10:36:50 +0000
704+++ data/tribes/immovables/reedfield/ripe/init.lua 2019-06-01 22:42:16 +0000
705@@ -6,6 +6,7 @@
706 -- TRANSLATORS: This is an immovable name used in lists of immovables
707 descname = pgettext("immovable", "Reed Field (ripe)"),
708 helptext_script = dirname .. "helptexts.lua",
709+ icon = dirname .. "menu.png",
710 size = "small",
711 attributes = { "ripe_reed", "field" },
712 programs = {
713
714=== added file 'data/tribes/immovables/reedfield/ripe/menu.png'
715Binary files data/tribes/immovables/reedfield/ripe/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/reedfield/ripe/menu.png 2019-06-01 22:42:16 +0000 differ
716=== modified file 'data/tribes/immovables/reedfield/small/init.lua'
717--- data/tribes/immovables/reedfield/small/init.lua 2019-05-19 10:36:50 +0000
718+++ data/tribes/immovables/reedfield/small/init.lua 2019-06-01 22:42:16 +0000
719@@ -6,6 +6,7 @@
720 -- TRANSLATORS: This is an immovable name used in lists of immovables
721 descname = pgettext("immovable", "Reed Field (small)"),
722 helptext_script = dirname .. "helptexts.lua",
723+ icon = dirname .. "menu.png",
724 size = "small",
725 attributes = { "field" },
726 programs = {
727
728=== added file 'data/tribes/immovables/reedfield/small/menu.png'
729Binary files data/tribes/immovables/reedfield/small/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/reedfield/small/menu.png 2019-06-01 22:42:16 +0000 differ
730=== modified file 'data/tribes/immovables/reedfield/tiny/init.lua'
731--- data/tribes/immovables/reedfield/tiny/init.lua 2019-05-19 10:36:50 +0000
732+++ data/tribes/immovables/reedfield/tiny/init.lua 2019-06-01 22:42:16 +0000
733@@ -6,6 +6,7 @@
734 -- TRANSLATORS: This is an immovable name used in lists of immovables
735 descname = pgettext("immovable", "Reed Field (tiny)"),
736 helptext_script = dirname .. "helptexts.lua",
737+ icon = dirname .. "menu.png",
738 size = "small",
739 attributes = { "field", "seed_reed" },
740 programs = {
741
742=== added file 'data/tribes/immovables/reedfield/tiny/menu.png'
743Binary files data/tribes/immovables/reedfield/tiny/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/reedfield/tiny/menu.png 2019-06-01 22:42:16 +0000 differ
744=== modified file 'data/tribes/immovables/shipconstruction_atlanteans/init.lua'
745--- data/tribes/immovables/shipconstruction_atlanteans/init.lua 2019-04-20 08:40:37 +0000
746+++ data/tribes/immovables/shipconstruction_atlanteans/init.lua 2019-06-01 22:42:16 +0000
747@@ -6,6 +6,7 @@
748 -- TRANSLATORS: This is an immovable name used in lists of immovables
749 descname = pgettext("immovable", "Ship Under Construction"),
750 helptext_script = dirname .. "helptexts.lua",
751+ icon = dirname .. "menu.png",
752 size = "small",
753 attributes = { "shipconstruction" },
754 programs = {
755
756=== added file 'data/tribes/immovables/shipconstruction_atlanteans/menu.png'
757Binary files data/tribes/immovables/shipconstruction_atlanteans/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/shipconstruction_atlanteans/menu.png 2019-06-01 22:42:16 +0000 differ
758=== modified file 'data/tribes/immovables/shipconstruction_barbarians/init.lua'
759--- data/tribes/immovables/shipconstruction_barbarians/init.lua 2019-04-20 08:40:37 +0000
760+++ data/tribes/immovables/shipconstruction_barbarians/init.lua 2019-06-01 22:42:16 +0000
761@@ -6,6 +6,7 @@
762 -- TRANSLATORS: This is an immovable name used in lists of immovables
763 descname = pgettext("immovable", "Ship Under Construction"),
764 helptext_script = dirname .. "helptexts.lua",
765+ icon = dirname .. "menu.png",
766 size = "small",
767 attributes = { "shipconstruction" },
768 programs = {
769
770=== added file 'data/tribes/immovables/shipconstruction_barbarians/menu.png'
771Binary files data/tribes/immovables/shipconstruction_barbarians/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/shipconstruction_barbarians/menu.png 2019-06-01 22:42:16 +0000 differ
772=== modified file 'data/tribes/immovables/shipconstruction_empire/init.lua'
773--- data/tribes/immovables/shipconstruction_empire/init.lua 2019-04-20 08:40:37 +0000
774+++ data/tribes/immovables/shipconstruction_empire/init.lua 2019-06-01 22:42:16 +0000
775@@ -6,6 +6,7 @@
776 -- TRANSLATORS: This is an immovable name used in lists of immovables
777 descname = pgettext("immovable", "Ship Under Construction"),
778 helptext_script = dirname .. "helptexts.lua",
779+ icon = dirname .. "menu.png",
780 size = "small",
781 attributes = { "shipconstruction" },
782 programs = {
783
784=== added file 'data/tribes/immovables/shipconstruction_empire/menu.png'
785Binary files data/tribes/immovables/shipconstruction_empire/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/shipconstruction_empire/menu.png 2019-06-01 22:42:16 +0000 differ
786=== modified file 'data/tribes/immovables/shipconstruction_frisians/init.lua'
787--- data/tribes/immovables/shipconstruction_frisians/init.lua 2019-04-26 05:32:54 +0000
788+++ data/tribes/immovables/shipconstruction_frisians/init.lua 2019-06-01 22:42:16 +0000
789@@ -5,6 +5,7 @@
790 name = "frisians_shipconstruction",
791 -- TRANSLATORS: This is an immovable name used in lists of immovables
792 descname = pgettext("immovable", "Ship Under Construction"),
793+ icon = dirname .. "menu.png",
794 size = "small",
795 helptext_script = dirname .. "helptexts.lua",
796 attributes = { "shipconstruction" },
797
798=== added file 'data/tribes/immovables/shipconstruction_frisians/menu.png'
799Binary files data/tribes/immovables/shipconstruction_frisians/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/shipconstruction_frisians/menu.png 2019-06-01 22:42:16 +0000 differ
800=== modified file 'data/tribes/immovables/wheatfield/harvested/init.lua'
801--- data/tribes/immovables/wheatfield/harvested/init.lua 2019-05-19 10:36:50 +0000
802+++ data/tribes/immovables/wheatfield/harvested/init.lua 2019-06-01 22:42:16 +0000
803@@ -6,6 +6,7 @@
804 -- TRANSLATORS: This is an immovable name used in lists of immovables
805 descname = pgettext("immovable", "Wheat Field (harvested)"),
806 helptext_script = dirname .. "helptexts.lua",
807+ icon = dirname .. "menu.png",
808 attributes = { "field" },
809 programs = {
810 program = {
811
812=== added file 'data/tribes/immovables/wheatfield/harvested/menu.png'
813Binary files data/tribes/immovables/wheatfield/harvested/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/wheatfield/harvested/menu.png 2019-06-01 22:42:16 +0000 differ
814=== modified file 'data/tribes/immovables/wheatfield/medium/init.lua'
815--- data/tribes/immovables/wheatfield/medium/init.lua 2019-05-19 10:36:50 +0000
816+++ data/tribes/immovables/wheatfield/medium/init.lua 2019-06-01 22:42:16 +0000
817@@ -6,6 +6,7 @@
818 -- TRANSLATORS: This is an immovable name used in lists of immovables
819 descname = pgettext("immovable", "Wheat Field (medium)"),
820 helptext_script = dirname .. "helptexts.lua",
821+ icon = dirname .. "menu.png",
822 size = "small",
823 attributes = { "field", "flowering" },
824 programs = {
825
826=== added file 'data/tribes/immovables/wheatfield/medium/menu.png'
827Binary files data/tribes/immovables/wheatfield/medium/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/wheatfield/medium/menu.png 2019-06-01 22:42:16 +0000 differ
828=== modified file 'data/tribes/immovables/wheatfield/ripe/init.lua'
829--- data/tribes/immovables/wheatfield/ripe/init.lua 2019-05-19 10:36:50 +0000
830+++ data/tribes/immovables/wheatfield/ripe/init.lua 2019-06-01 22:42:16 +0000
831@@ -6,6 +6,7 @@
832 -- TRANSLATORS: This is an immovable name used in lists of immovables
833 descname = pgettext("immovable", "Wheat Field (ripe)"),
834 helptext_script = dirname .. "helptexts.lua",
835+ icon = dirname .. "menu.png",
836 size = "small",
837 attributes = { "ripe_wheat", "field" },
838 programs = {
839
840=== added file 'data/tribes/immovables/wheatfield/ripe/menu.png'
841Binary files data/tribes/immovables/wheatfield/ripe/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/wheatfield/ripe/menu.png 2019-06-01 22:42:16 +0000 differ
842=== modified file 'data/tribes/immovables/wheatfield/small/init.lua'
843--- data/tribes/immovables/wheatfield/small/init.lua 2019-05-19 10:36:50 +0000
844+++ data/tribes/immovables/wheatfield/small/init.lua 2019-06-01 22:42:16 +0000
845@@ -6,6 +6,7 @@
846 -- TRANSLATORS: This is an immovable name used in lists of immovables
847 descname = pgettext("immovable", "Wheat Field (small)"),
848 helptext_script = dirname .. "helptexts.lua",
849+ icon = dirname .. "menu.png",
850 size = "small",
851 attributes = { "field" },
852 programs = {
853
854=== added file 'data/tribes/immovables/wheatfield/small/menu.png'
855Binary files data/tribes/immovables/wheatfield/small/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/wheatfield/small/menu.png 2019-06-01 22:42:16 +0000 differ
856=== modified file 'data/tribes/immovables/wheatfield/tiny/init.lua'
857--- data/tribes/immovables/wheatfield/tiny/init.lua 2019-05-19 10:36:50 +0000
858+++ data/tribes/immovables/wheatfield/tiny/init.lua 2019-06-01 22:42:16 +0000
859@@ -6,9 +6,9 @@
860 -- TRANSLATORS: This is an immovable name used in lists of immovables
861 descname = pgettext("immovable", "Wheat Field (tiny)"),
862 helptext_script = dirname .. "helptexts.lua",
863+ icon = dirname .. "menu.png",
864 size = "small",
865 attributes = { "field", "seed_wheat" },
866-
867 programs = {
868 program = {
869 "animate=idle 30000",
870
871=== added file 'data/tribes/immovables/wheatfield/tiny/menu.png'
872Binary files data/tribes/immovables/wheatfield/tiny/menu.png 1970-01-01 00:00:00 +0000 and data/tribes/immovables/wheatfield/tiny/menu.png 2019-06-01 22:42:16 +0000 differ
873=== modified file 'data/tribes/scripting/help/init.lua'
874--- data/tribes/scripting/help/init.lua 2017-11-12 16:21:28 +0000
875+++ data/tribes/scripting/help/init.lua 2019-06-01 22:42:16 +0000
876@@ -104,7 +104,7 @@
877 name = "immovables",
878 -- TRANSLATORS Tab title: immovable help
879 title = _"Immovables",
880- icon = "tribes/immovables/field_ripe/idle_00.png",
881+ icon = "tribes/immovables/wheatfield/ripe/idle_00.png",
882 entries = immovable_entries(tribename)
883 },
884 }

Subscribers

People subscribed via source and target branches

to status/vote changes: