widelands

Merge lp:~widelands-dev/widelands/tree-values into lp:widelands

  1. tree-values
  2. Merge into trunk
Proposed by GunChleoc
Status: Merged
Merged at revision: 7863
Proposed branch: lp:~widelands-dev/widelands/tree-values
Merge into: lp:widelands
Diff against target: 532 lines (+74/-75)
4 files modified
data/world/immovables/trees/maple/init.lua (+1/-1)
data/world/immovables/trees/umbrella_red/init.lua (+3/-3)
data/world/terrains/init.lua (+68/-69)
test/maps/lua_testsuite.wmf/scripting/terrains_resources_descriptions.lua (+2/-2)
To merge this branch: bzr merge lp:~widelands-dev/widelands/tree-values
Reviewer Review Type Date Requested Status
TiborB Approve
Review via email: mp+287401@code.launchpad.net

Commit message

New tree/terrain values by king_of_nowhere.

Description of the change

New tree/terrain values by king_of_nowhere.

He still wants a look at the numbers, so we want a Windows build for him to test.

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

Continuous integration builds have changed state:

Travis build 777. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/112370342.
Appveyor build 623. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_tree_values-623.

Revision history for this message
TiborB (tiborb95) wrote :

I formally approve this, but I am not able to review the values. Whenever you (or guys in forum) feel that it is ready, feel free to merge it

review: Approve
Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 784. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/112787192.
Appveyor build 630. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_tree_values-630.

Revision history for this message
GunChleoc (gunchleoc) wrote :

The new values have been approved on the forum now.

@bunnybot merge

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/world/immovables/trees/maple/init.lua'
2--- data/world/immovables/trees/maple/init.lua 2016-02-10 19:50:13 +0000
3+++ data/world/immovables/trees/maple/init.lua 2016-03-01 06:51:05 +0000
4@@ -2,7 +2,7 @@
5
6 terrain_affinity = {
7 preferred_temperature = 110,
8- preferred_humidity = 0.7,
9+ preferred_humidity = 0.55,
10 preferred_fertility = 0.8,
11 pickiness = 0.8,
12 }
13
14=== modified file 'data/world/immovables/trees/umbrella_red/init.lua'
15--- data/world/immovables/trees/umbrella_red/init.lua 2016-02-10 19:50:13 +0000
16+++ data/world/immovables/trees/umbrella_red/init.lua 2016-03-01 06:51:05 +0000
17@@ -1,9 +1,9 @@
18 sedirname = path.dirname(__file__)
19
20 terrain_affinity = {
21- preferred_temperature = 110,
22- preferred_humidity = 0.25,
23- preferred_fertility = 0.75,
24+ preferred_temperature = 90,
25+ preferred_humidity = 0.15,
26+ preferred_fertility = 0.825,
27 pickiness = 0.8,
28 }
29
30
31=== modified file 'data/world/terrains/init.lua'
32--- data/world/terrains/init.lua 2016-01-28 05:24:34 +0000
33+++ data/world/terrains/init.lua 2016-03-01 06:51:05 +0000
34@@ -30,7 +30,7 @@
35 name = "wiese1",
36
37 -- The name that will be used in UI and translated.
38- descname = _ "Meadow",
39+ descname = _ "Meadow 1",
40
41 -- The category for sorting this into menus in the editor.
42 editor_category = "green",
43@@ -83,7 +83,7 @@
44
45 world:new_terrain_type{
46 name = "wiese2",
47- descname = _ "Meadow",
48+ descname = _ "Meadow 2",
49 editor_category = "green",
50 is = "arable",
51 tooltips = {
52@@ -104,7 +104,7 @@
53
54 world:new_terrain_type{
55 name = "wiese3",
56- descname = _ "Meadow",
57+ descname = _ "Meadow 3",
58 editor_category = "green",
59 is = "arable",
60 tooltips = {
61@@ -124,7 +124,7 @@
62
63 world:new_terrain_type{
64 name = "wiese4",
65- descname = _ "Meadow",
66+ descname = _ "Meadow 4",
67 editor_category = "green",
68 is = "arable",
69 tooltips = {
70@@ -184,15 +184,15 @@
71 default_resource_amount = 0,
72 textures = { pics_dir .. "green/bergwiese_00.png" },
73 dither_layer = 160,
74- temperature = 85,
75- humidity = 0.75,
76- fertility = 0.5,
77+ temperature = 75,
78+ humidity = 0.8,
79+ fertility = 0.45,
80 }
81
82
83 world:new_terrain_type{
84 name = "berg1",
85- descname = _ "Mountain",
86+ descname = _ "Mountain 1",
87 editor_category = "green",
88 is = "mineable",
89 valid_resources = { "coal", "iron", "gold", "stones" },
90@@ -208,7 +208,7 @@
91
92 world:new_terrain_type{
93 name = "berg2",
94- descname = _ "Mountain",
95+ descname = _ "Mountain 2",
96 editor_category = "green",
97 is = "mineable",
98 valid_resources = {"coal", "iron", "gold", "stones"},
99@@ -224,7 +224,7 @@
100
101 world:new_terrain_type{
102 name = "berg3",
103- descname = _ "Mountain",
104+ descname = _ "Mountain 3",
105 editor_category = "green",
106 is = "mineable",
107 valid_resources = {"coal", "iron", "gold", "stones"},
108@@ -240,7 +240,7 @@
109
110 world:new_terrain_type{
111 name = "berg4",
112- descname = _ "Mountain",
113+ descname = _ "Mountain 4",
114 editor_category = "green",
115 is = "mineable",
116 valid_resources = {"coal", "iron", "gold", "stones"},
117@@ -256,7 +256,7 @@
118
119 world:new_terrain_type{
120 name = "summer_forested_mountain1",
121- descname = _ "Forested Mountain",
122+ descname = _ "Forested Mountain 1",
123 editor_category = "green",
124 is = "mineable",
125 -- You can add custom additional tooltip entries here.
126@@ -276,7 +276,7 @@
127
128 world:new_terrain_type{
129 name = "summer_forested_mountain2",
130- descname = _ "Forested Mountain",
131+ descname = _ "Forested Mountain 2",
132 editor_category = "green",
133 is = "mineable",
134 -- You can add custom additional tooltip entries here.
135@@ -380,7 +380,7 @@
136
137 world:new_terrain_type{
138 name = "ashes",
139- descname = _ "Ashes",
140+ descname = _ "Ashes 1",
141 editor_category = "wasteland",
142 is = "arable",
143 tooltips = {
144@@ -400,7 +400,7 @@
145
146 world:new_terrain_type{
147 name = "ashes2",
148- descname = _ "Ashes",
149+ descname = _ "Ashes 2",
150 editor_category = "wasteland",
151 is = "arable",
152 tooltips = {
153@@ -412,15 +412,15 @@
154 default_resource_amount = 4,
155 textures = { pics_dir .. "wasteland/ashes2_00.png" },
156 dither_layer = 410,
157- temperature = 125,
158- humidity = 0.1,
159+ temperature = 118,
160+ humidity = 0.13,
161 fertility = 0.999,
162 }
163
164
165 world:new_terrain_type{
166 name = "hardground1",
167- descname = _ "Hard Ground",
168+ descname = _ "Hard Ground 1",
169 editor_category = "wasteland",
170 is = "arable",
171 tooltips = {
172@@ -440,7 +440,7 @@
173
174 world:new_terrain_type{
175 name = "hardground2",
176- descname = _ "Hard Ground",
177+ descname = _ "Hard Ground 2",
178 editor_category = "wasteland",
179 is = "arable",
180 tooltips = {
181@@ -460,7 +460,7 @@
182
183 world:new_terrain_type{
184 name = "hardground3",
185- descname = _ "Hard Ground",
186+ descname = _ "Hard Ground 3",
187 editor_category = "wasteland",
188 is = "arable",
189 tooltips = {
190@@ -480,7 +480,7 @@
191
192 world:new_terrain_type{
193 name = "hardground4",
194- descname = _ "Hard Ground",
195+ descname = _ "Hard Ground 4",
196 editor_category = "wasteland",
197 is = "arable",
198 tooltips = {
199@@ -510,13 +510,13 @@
200 dither_layer = 360,
201 temperature = 120,
202 humidity = 0.1,
203- fertility = 0.25,
204+ fertility = 0.2,
205 }
206
207
208 world:new_terrain_type{
209 name = "wasteland_mountain1",
210- descname = _ "Mountain",
211+ descname = _ "Mountain 1",
212 editor_category = "wasteland",
213 is = "mineable",
214 valid_resources = { "coal", "iron", "gold", "stones" },
215@@ -532,7 +532,7 @@
216
217 world:new_terrain_type{
218 name = "wasteland_mountain2",
219- descname = _ "Mountain",
220+ descname = _ "Mountain 2",
221 editor_category = "wasteland",
222 is = "mineable",
223 valid_resources = { "coal", "iron", "gold", "stones" },
224@@ -548,7 +548,7 @@
225
226 world:new_terrain_type{
227 name = "wasteland_mountain3",
228- descname = _ "Mountain",
229+ descname = _ "Mountain 3",
230 editor_category = "wasteland",
231 is = "mineable",
232 valid_resources = { "coal", "iron", "gold", "stones" },
233@@ -564,7 +564,7 @@
234
235 world:new_terrain_type{
236 name = "wasteland_mountain4",
237- descname = _ "Mountain",
238+ descname = _ "Mountain 4",
239 editor_category = "wasteland",
240 is = "mineable",
241 valid_resources = { "coal", "iron", "gold", "stones" },
242@@ -579,7 +579,7 @@
243
244 world:new_terrain_type{
245 name = "wasteland_forested_mountain1",
246- descname = _ "Forested Mountain",
247+ descname = _ "Forested Mountain 1",
248 editor_category = "wasteland",
249 is = "mineable",
250 tooltips = {
251@@ -598,7 +598,7 @@
252
253 world:new_terrain_type{
254 name = "wasteland_forested_mountain2",
255- descname = _ "Forested Mountain",
256+ descname = _ "Forested Mountain 2",
257 editor_category = "wasteland",
258 is = "mineable",
259 tooltips = {
260@@ -633,7 +633,7 @@
261
262 world:new_terrain_type{
263 name = "lava-stone1",
264- descname = _ "Lava Rocks",
265+ descname = _ "Lava Rocks 1",
266 editor_category = "wasteland",
267 is = "unreachable",
268 valid_resources = {},
269@@ -650,7 +650,7 @@
270
271 world:new_terrain_type{
272 name = "lava-stone2",
273- descname = _ "Lava Rocks",
274+ descname = _ "Lava Rocks 2",
275 editor_category = "wasteland",
276 is = "unreachable",
277 valid_resources = {},
278@@ -689,7 +689,7 @@
279
280 world:new_terrain_type{
281 name = "tundra",
282- descname = _ "Tundra",
283+ descname = _ "Tundra 1",
284 editor_category = "winter",
285 is = "arable",
286 tooltips = {
287@@ -701,15 +701,15 @@
288 default_resource_amount = 10,
289 textures = { pics_dir .. "winter/tundra_00.png" },
290 dither_layer = 230,
291- temperature = 45,
292+ temperature = 50,
293 humidity = 0.85,
294- fertility = 0.5,
295+ fertility = 0.45,
296 }
297
298
299 world:new_terrain_type{
300 name = "tundra2",
301- descname = _ "Tundra",
302+ descname = _ "Tundra 2",
303 editor_category = "winter",
304 is = "arable",
305 tooltips = {
306@@ -729,7 +729,7 @@
307
308 world:new_terrain_type{
309 name = "tundra3",
310- descname = _ "Tundra",
311+ descname = _ "Tundra 3",
312 editor_category = "winter",
313 is = "arable",
314 tooltips = {
315@@ -797,7 +797,7 @@
316
317 world:new_terrain_type{
318 name = "winter_mountain1",
319- descname = _ "Mountain",
320+ descname = _ "Mountain 1",
321 editor_category = "winter",
322 is = "mineable",
323 valid_resources = { "coal", "iron", "gold", "stones" },
324@@ -813,7 +813,7 @@
325
326 world:new_terrain_type{
327 name = "winter_mountain2",
328- descname = _ "Mountain",
329+ descname = _ "Mountain 2",
330 editor_category = "winter",
331 is = "mineable",
332 valid_resources = { "coal", "iron", "gold", "stones" },
333@@ -829,7 +829,7 @@
334
335 world:new_terrain_type{
336 name = "winter_mountain3",
337- descname = _ "Mountain",
338+ descname = _ "Mountain 3",
339 editor_category = "winter",
340 is = "mineable",
341 valid_resources = { "coal", "iron", "gold", "stones" },
342@@ -845,7 +845,7 @@
343
344 world:new_terrain_type{
345 name = "winter_mountain4",
346- descname = _ "Mountain",
347+ descname = _ "Mountain 4",
348 editor_category = "winter",
349 is = "mineable",
350 valid_resources = { "coal", "iron", "gold", "stones" },
351@@ -860,7 +860,7 @@
352
353 world:new_terrain_type{
354 name = "winter_forested_mountain1",
355- descname = _ "Forested Mountain",
356+ descname = _ "Forested Mountain 1",
357 editor_category = "winter",
358 is = "mineable",
359 tooltips = {
360@@ -879,7 +879,7 @@
361
362 world:new_terrain_type{
363 name = "winter_forested_mountain2",
364- descname = _ "Forested Mountain",
365+ descname = _ "Forested Mountain 2",
366 editor_category = "winter",
367 is = "mineable",
368 tooltips = {
369@@ -930,7 +930,7 @@
370
371 world:new_terrain_type{
372 name = "ice_floes",
373- descname = _ "Ice Floes",
374+ descname = _ "Ice Floes 1",
375 editor_category = "winter",
376 is = "water",
377 valid_resources = {"fish"},
378@@ -947,7 +947,7 @@
379
380 world:new_terrain_type{
381 name = "ice_floes2",
382- descname = _ "Ice Floes",
383+ descname = _ "Ice Floes 2",
384 editor_category = "winter",
385 is = "water",
386 valid_resources = {"fish"},
387@@ -983,23 +983,6 @@
388 -- Former Desert --
389 ---------------------
390
391-
392-world:new_terrain_type{
393- name = "desert4",
394- descname = _ "Desert",
395- editor_category = "desert",
396- is = "arable",
397- valid_resources = {"water"},
398- default_resource = "water",
399- default_resource_amount = 2,
400- textures = { pics_dir .. "desert/desert4_00.png" },
401- dither_layer = 270,
402- temperature = 168,
403- humidity = 0.001,
404- fertility = 0.1,
405-}
406-
407-
408 world:new_terrain_type{
409 name = "drysoil",
410 descname = _ "Dry Soil",
411@@ -1096,7 +1079,7 @@
412
413 world:new_terrain_type{
414 name = "mountain1",
415- descname = _ "Mountain",
416+ descname = _ "Mountain 1",
417 editor_category = "desert",
418 is = "mineable",
419 valid_resources = { "coal", "iron", "gold", "stones" },
420@@ -1112,7 +1095,7 @@
421
422 world:new_terrain_type{
423 name = "mountain2",
424- descname = _ "Mountain",
425+ descname = _ "Mountain 2",
426 editor_category = "desert",
427 is = "mineable",
428 valid_resources = { "coal", "iron", "gold", "stones" },
429@@ -1128,7 +1111,7 @@
430
431 world:new_terrain_type{
432 name = "mountain3",
433- descname = _ "Mountain",
434+ descname = _ "Mountain 3",
435 editor_category = "desert",
436 is = "mineable",
437 valid_resources = { "coal", "iron", "gold", "stones" },
438@@ -1144,7 +1127,7 @@
439
440 world:new_terrain_type{
441 name = "mountain4",
442- descname = _ "Mountain",
443+ descname = _ "Mountain 4",
444 editor_category = "desert",
445 is = "mineable",
446 valid_resources = { "coal", "iron", "gold", "stones" },
447@@ -1159,7 +1142,7 @@
448
449 world:new_terrain_type{
450 name = "desert_forested_mountain1",
451- descname = _ "Forested Mountain",
452+ descname = _ "Forested Mountain 1",
453 editor_category = "desert",
454 is = "mineable",
455 tooltips = {
456@@ -1178,7 +1161,7 @@
457
458 world:new_terrain_type{
459 name = "desert_forested_mountain2",
460- descname = _ "Forested Mountain",
461+ descname = _ "Forested Mountain 2",
462 editor_category = "desert",
463 is = "mineable",
464 tooltips = {
465@@ -1197,7 +1180,7 @@
466
467 world:new_terrain_type{
468 name = "desert1",
469- descname = _ "Desert",
470+ descname = _ "Desert 1",
471 editor_category = "desert",
472 is = "walkable",
473 valid_resources = {},
474@@ -1213,7 +1196,7 @@
475
476 world:new_terrain_type{
477 name = "desert2",
478- descname = _ "Desert",
479+ descname = _ "Desert 2",
480 editor_category = "desert",
481 is = "walkable",
482 valid_resources = {},
483@@ -1229,7 +1212,7 @@
484
485 world:new_terrain_type{
486 name = "desert3",
487- descname = _ "Desert",
488+ descname = _ "Desert 3",
489 editor_category = "desert",
490 is = "walkable",
491 valid_resources = {},
492@@ -1244,6 +1227,22 @@
493
494
495 world:new_terrain_type{
496+ name = "desert4",
497+ descname = _ "Desert 4",
498+ editor_category = "desert",
499+ is = "arable",
500+ valid_resources = {"water"},
501+ default_resource = "water",
502+ default_resource_amount = 2,
503+ textures = { pics_dir .. "desert/desert4_00.png" },
504+ dither_layer = 270,
505+ temperature = 168,
506+ humidity = 0.001,
507+ fertility = 0.1,
508+}
509+
510+
511+world:new_terrain_type{
512 name = "desert_beach",
513 descname = _ "Beach",
514 editor_category = "desert",
515
516=== modified file 'test/maps/lua_testsuite.wmf/scripting/terrains_resources_descriptions.lua'
517--- test/maps/lua_testsuite.wmf/scripting/terrains_resources_descriptions.lua 2016-02-13 11:30:01 +0000
518+++ test/maps/lua_testsuite.wmf/scripting/terrains_resources_descriptions.lua 2016-03-01 06:51:05 +0000
519@@ -85,11 +85,11 @@
520 end
521
522 function test_terrains_resource_descr:test_terrain_descname()
523- assert_equal("Meadow",
524+ assert_equal("Meadow 1",
525 egbase:get_terrain_description("wiese1").descname)
526 assert_equal("Beach",
527 egbase:get_terrain_description("wasteland_beach").descname)
528- assert_equal("Forested Mountain",
529+ assert_equal("Forested Mountain 2",
530 egbase:get_terrain_description("desert_forested_mountain2").descname)
531 assert_equal("Water",
532 egbase:get_terrain_description("winter_water").descname)

Subscribers

People subscribed via source and target branches

to status/vote changes: