widelands-dev team mailing list archive

[kaputtnik <somal@xxxxxxxx>]

kaputtnik has proposed merging lp:~widelands-dev/widelands/resource_water into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1532417 in widelands: "complete indicators for resource water"
  https://bugs.launchpad.net/widelands/+bug/1532417

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/resource_water/+merge/282361

Completed indicators for resource water. Using different values when the images are used regarding that water have max_amount of 50 whereas ore and fish has 20. Added comments to world/resources/init.lua
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/resource_water into lp:widelands.

=== modified file 'pics/editor_menu_tool_change_resources.png'
Binary files pics/editor_menu_tool_change_resources.png	2009-11-09 19:01:11 +0000 and pics/editor_menu_tool_change_resources.png	2016-01-12 19:27:12 +0000 differ
=== modified file 'world/resources/init.lua'
--- world/resources/init.lua	2015-10-31 12:11:44 +0000
+++ world/resources/init.lua	2016-01-12 19:27:12 +0000
@@ -1,10 +1,17 @@
 pics_dir = path.dirname(__file__) .. "pics/"
 
 world:new_resource_type{
+   -- Internal name, must be unique
    name = "coal",
+   -- The name that will be used in UI and translated.
    descname = _ "Coal",
+   -- Maximum possible amount
    max_amount = 20,
+   -- A geologist can find it, otherwise false (see Fish)
    detectable = true,
+   -- Picture that is used to indicate the amount of resource on the map
+   -- [5] means amount 0 to 5; next line means amount 6 to 10 and so on
+   -- The picture with highest number is additionally used in ui
    editor_pictures = {
       [5] = pics_dir .. "coal1.png",
       [10] = pics_dir .. "coal2.png",
@@ -58,7 +65,10 @@
    max_amount = 50,
    detectable = true,
    editor_pictures = {
-      [1000] = pics_dir .. "water.png",
+      [10] = pics_dir .."water1.png",
+      [20] = pics_dir .."water2.png",
+      [30] = pics_dir .."water3.png",
+      [1000] = pics_dir .. "water4.png",
    }
 }
 

=== added file 'world/resources/pics/water.png'
Binary files world/resources/pics/water.png	1970-01-01 00:00:00 +0000 and world/resources/pics/water.png	2016-01-12 19:27:12 +0000 differ
=== removed file 'world/resources/pics/water.png'
Binary files world/resources/pics/water.png	2014-03-29 15:22:53 +0000 and world/resources/pics/water.png	1970-01-01 00:00:00 +0000 differ
=== added file 'world/resources/pics/water1.png'
Binary files world/resources/pics/water1.png	1970-01-01 00:00:00 +0000 and world/resources/pics/water1.png	2016-01-12 19:27:12 +0000 differ
=== added file 'world/resources/pics/water2.png'
Binary files world/resources/pics/water2.png	1970-01-01 00:00:00 +0000 and world/resources/pics/water2.png	2016-01-12 19:27:12 +0000 differ
=== added file 'world/resources/pics/water3.png'
Binary files world/resources/pics/water3.png	1970-01-01 00:00:00 +0000 and world/resources/pics/water3.png	2016-01-12 19:27:12 +0000 differ