Benedikt Straub has proposed merging lp:~widelands-dev/widelands/workerwarehotspots into lp:widelands.
Commit message: Fix the ware hotspots for frisian workers and update the documentation Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1797464 in widelands: "ware_hotspot missing in a lot of worker animations" https://bugs.launchpad.net/widelands/+bug/1797464 For more details, see: https://code.launchpad.net/~widelands-dev/widelands/workerwarehotspots/+merge/359915 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/workerwarehotspots into lp:widelands.
=== modified file 'data/tribes/workers/atlanteans/carrier/init.lua' --- data/tribes/workers/atlanteans/carrier/init.lua 2017-08-30 16:46:00 +0000 +++ data/tribes/workers/atlanteans/carrier/init.lua 2018-11-30 10:52:28 +0000 @@ -31,15 +31,7 @@ -- This function adds the definition of a carrier to the engine. -- -- :arg table: This table contains all the data that the game engine will add --- to this carrier. It contains the :ref:`lua_tribes_workers_common`, --- plus the following additional property: --- --- **ware_hotspot** --- *Optional*. The x, y coordinates for adjusting the placement of the --- ware being carried. The default value is ``{0, 15}``. Increase ``x`` --- to shift the ware to the left and ``y`` to shift it upwards. For example:: --- --- ware_hotspot = { -2, 13 }, +-- to this carrier. It contains the :ref:`lua_tribes_workers_common`. -- tribes:new_carrier_type { msgctxt = "atlanteans_worker", === modified file 'data/tribes/workers/frisians/baker/init.lua' --- data/tribes/workers/frisians/baker/init.lua 2018-10-04 07:14:23 +0000 +++ data/tribes/workers/frisians/baker/init.lua 2018-11-30 10:52:28 +0000 @@ -26,5 +26,6 @@ experience = 13, becomes = "frisians_baker_master", + ware_hotspot = {0, 20}, animations = animations, } === modified file 'data/tribes/workers/frisians/baker_master/init.lua' --- data/tribes/workers/frisians/baker_master/init.lua 2018-02-06 11:17:48 +0000 +++ data/tribes/workers/frisians/baker_master/init.lua 2018-11-30 10:52:28 +0000 @@ -18,5 +18,6 @@ icon = dirname .. "menu.png", vision_range = 2, + ware_hotspot = {0, 20}, animations = animations, } === modified file 'data/tribes/workers/frisians/beekeeper/init.lua' --- data/tribes/workers/frisians/beekeeper/init.lua 2018-03-25 18:28:00 +0000 +++ data/tribes/workers/frisians/beekeeper/init.lua 2018-11-30 10:52:28 +0000 @@ -37,5 +37,6 @@ } }, + ware_hotspot = {0, 20}, animations = animations, } === modified file 'data/tribes/workers/frisians/blacksmith/init.lua' --- data/tribes/workers/frisians/blacksmith/init.lua 2018-10-04 07:14:23 +0000 +++ data/tribes/workers/frisians/blacksmith/init.lua 2018-11-30 10:52:28 +0000 @@ -26,5 +26,6 @@ experience = 18, becomes = "frisians_blacksmith_master", + ware_hotspot = {0, 20}, animations = animations, } === modified file 'data/tribes/workers/frisians/blacksmith_master/init.lua' --- data/tribes/workers/frisians/blacksmith_master/init.lua 2018-02-06 11:17:48 +0000 +++ data/tribes/workers/frisians/blacksmith_master/init.lua 2018-11-30 10:52:28 +0000 @@ -18,5 +18,6 @@ icon = dirname .. "menu.png", vision_range = 2, + ware_hotspot = {0, 20}, animations = animations, } === modified file 'data/tribes/workers/frisians/brewer/init.lua' --- data/tribes/workers/frisians/brewer/init.lua 2018-10-04 07:14:23 +0000 +++ data/tribes/workers/frisians/brewer/init.lua 2018-11-30 10:52:28 +0000 @@ -25,5 +25,6 @@ experience = 15, becomes = "frisians_brewer_master", + ware_hotspot = {0, 20}, animations = animations, } === modified file 'data/tribes/workers/frisians/brewer_master/init.lua' --- data/tribes/workers/frisians/brewer_master/init.lua 2018-02-06 11:17:48 +0000 +++ data/tribes/workers/frisians/brewer_master/init.lua 2018-11-30 10:52:28 +0000 @@ -18,5 +18,6 @@ icon = dirname .. "menu.png", vision_range = 2, + ware_hotspot = {0, 20}, animations = animations, } === modified file 'data/tribes/workers/frisians/brickmaker/init.lua' --- data/tribes/workers/frisians/brickmaker/init.lua 2018-07-08 16:10:50 +0000 +++ data/tribes/workers/frisians/brickmaker/init.lua 2018-11-30 10:52:28 +0000 @@ -23,5 +23,6 @@ fire_tongs = 1 }, + ware_hotspot = {0, 20}, animations = animations, } === modified file 'data/tribes/workers/frisians/builder/init.lua' --- data/tribes/workers/frisians/builder/init.lua 2018-02-06 11:17:48 +0000 +++ data/tribes/workers/frisians/builder/init.lua 2018-11-30 10:52:28 +0000 @@ -33,5 +33,6 @@ hammer = 1 }, + ware_hotspot = {0, 20}, animations = animations, } === modified file 'data/tribes/workers/frisians/charcoal_burner/init.lua' --- data/tribes/workers/frisians/charcoal_burner/init.lua 2018-02-06 11:17:48 +0000 +++ data/tribes/workers/frisians/charcoal_burner/init.lua 2018-11-30 10:52:28 +0000 @@ -22,5 +22,6 @@ frisians_carrier = 1 }, + ware_hotspot = {0, 20}, animations = animations, } === modified file 'data/tribes/workers/frisians/claydigger/init.lua' --- data/tribes/workers/frisians/claydigger/init.lua 2018-07-08 16:10:50 +0000 +++ data/tribes/workers/frisians/claydigger/init.lua 2018-11-30 10:52:28 +0000 @@ -38,5 +38,6 @@ } }, + ware_hotspot = {0, 20}, animations = animations, } === modified file 'data/tribes/workers/frisians/farmer/init.lua' --- data/tribes/workers/frisians/farmer/init.lua 2018-09-16 13:19:53 +0000 +++ data/tribes/workers/frisians/farmer/init.lua 2018-11-30 10:52:28 +0000 @@ -58,5 +58,6 @@ } }, + ware_hotspot = {0, 20}, animations = animations, } === modified file 'data/tribes/workers/frisians/fisher/init.lua' --- data/tribes/workers/frisians/fisher/init.lua 2018-03-25 18:28:00 +0000 +++ data/tribes/workers/frisians/fisher/init.lua 2018-11-30 10:52:28 +0000 @@ -59,5 +59,6 @@ } }, + ware_hotspot = {0, 20}, animations = animations, } === modified file 'data/tribes/workers/frisians/fruit_collector/init.lua' --- data/tribes/workers/frisians/fruit_collector/init.lua 2018-03-25 18:28:00 +0000 +++ data/tribes/workers/frisians/fruit_collector/init.lua 2018-11-30 10:52:28 +0000 @@ -41,5 +41,6 @@ } }, + ware_hotspot = {0, 20}, animations = animations, } === modified file 'data/tribes/workers/frisians/hunter/init.lua' --- data/tribes/workers/frisians/hunter/init.lua 2018-03-25 18:28:00 +0000 +++ data/tribes/workers/frisians/hunter/init.lua 2018-11-30 10:52:28 +0000 @@ -35,5 +35,6 @@ } }, + ware_hotspot = {0, 20}, animations = animations, } === modified file 'data/tribes/workers/frisians/landlady/init.lua' --- data/tribes/workers/frisians/landlady/init.lua 2018-02-06 11:17:48 +0000 +++ data/tribes/workers/frisians/landlady/init.lua 2018-11-30 10:52:28 +0000 @@ -23,5 +23,6 @@ kitchen_tools = 1 }, + ware_hotspot = {0, 20}, animations = animations, } === modified file 'data/tribes/workers/frisians/miner/init.lua' --- data/tribes/workers/frisians/miner/init.lua 2018-02-06 11:17:48 +0000 +++ data/tribes/workers/frisians/miner/init.lua 2018-11-30 10:52:28 +0000 @@ -26,5 +26,6 @@ experience = 26, becomes = "frisians_miner_master", + ware_hotspot = {0, 20}, animations = animations, } === modified file 'data/tribes/workers/frisians/miner_master/init.lua' --- data/tribes/workers/frisians/miner_master/init.lua 2018-02-06 11:17:48 +0000 +++ data/tribes/workers/frisians/miner_master/init.lua 2018-11-30 10:52:28 +0000 @@ -18,5 +18,6 @@ icon = dirname .. "menu.png", vision_range = 2, + ware_hotspot = {0, 20}, animations = animations, } === modified file 'data/tribes/workers/frisians/reed_farmer/init.lua' --- data/tribes/workers/frisians/reed_farmer/init.lua 2018-03-25 18:28:00 +0000 +++ data/tribes/workers/frisians/reed_farmer/init.lua 2018-11-30 10:52:28 +0000 @@ -58,5 +58,6 @@ }, }, + ware_hotspot = {0, 20}, animations = animations, } === modified file 'data/tribes/workers/frisians/reindeer_breeder/init.lua' --- data/tribes/workers/frisians/reindeer_breeder/init.lua 2018-02-06 11:17:48 +0000 +++ data/tribes/workers/frisians/reindeer_breeder/init.lua 2018-11-30 10:52:28 +0000 @@ -22,5 +22,6 @@ frisians_carrier = 1 }, + ware_hotspot = {0, 20}, animations = animations, } === modified file 'data/tribes/workers/frisians/scout/init.lua' --- data/tribes/workers/frisians/scout/init.lua 2018-03-25 18:28:00 +0000 +++ data/tribes/workers/frisians/scout/init.lua 2018-11-30 10:52:28 +0000 @@ -29,5 +29,6 @@ } }, + ware_hotspot = {0, 20}, animations = animations, } === modified file 'data/tribes/workers/frisians/seamstress/init.lua' --- data/tribes/workers/frisians/seamstress/init.lua 2018-02-06 11:17:48 +0000 +++ data/tribes/workers/frisians/seamstress/init.lua 2018-11-30 10:52:28 +0000 @@ -26,5 +26,6 @@ experience = 14, becomes = "frisians_seamstress_master", + ware_hotspot = {0, 20}, animations = animations, } === modified file 'data/tribes/workers/frisians/seamstress_master/init.lua' --- data/tribes/workers/frisians/seamstress_master/init.lua 2018-02-06 11:17:48 +0000 +++ data/tribes/workers/frisians/seamstress_master/init.lua 2018-11-30 10:52:28 +0000 @@ -18,5 +18,6 @@ icon = dirname .. "menu.png", vision_range = 2, + ware_hotspot = {0, 20}, animations = animations, } === modified file 'data/tribes/workers/frisians/shipwright/init.lua' --- data/tribes/workers/frisians/shipwright/init.lua 2018-03-25 18:28:00 +0000 +++ data/tribes/workers/frisians/shipwright/init.lua 2018-11-30 10:52:28 +0000 @@ -43,5 +43,6 @@ } }, + ware_hotspot = {0, 20}, animations = animations, } === modified file 'data/tribes/workers/frisians/smelter/init.lua' --- data/tribes/workers/frisians/smelter/init.lua 2018-02-06 11:17:48 +0000 +++ data/tribes/workers/frisians/smelter/init.lua 2018-11-30 10:52:28 +0000 @@ -23,5 +23,6 @@ fire_tongs = 1 }, + ware_hotspot = {0, 20}, animations = animations, } === modified file 'data/tribes/workers/frisians/smoker/init.lua' --- data/tribes/workers/frisians/smoker/init.lua 2018-02-06 11:17:48 +0000 +++ data/tribes/workers/frisians/smoker/init.lua 2018-11-30 10:52:28 +0000 @@ -23,5 +23,6 @@ kitchen_tools = 1 }, + ware_hotspot = {0, 20}, animations = animations, } === modified file 'data/tribes/workers/frisians/stonemason/init.lua' --- data/tribes/workers/frisians/stonemason/init.lua 2018-03-25 18:28:00 +0000 +++ data/tribes/workers/frisians/stonemason/init.lua 2018-11-30 10:52:28 +0000 @@ -39,5 +39,6 @@ } }, + ware_hotspot = {0, 20}, animations = animations, } === modified file 'data/tribes/workers/frisians/trainer/init.lua' --- data/tribes/workers/frisians/trainer/init.lua 2018-02-19 08:50:22 +0000 +++ data/tribes/workers/frisians/trainer/init.lua 2018-11-30 10:52:28 +0000 @@ -24,5 +24,6 @@ fur_garment = 1 }, + ware_hotspot = {0, 20}, animations = animations, } === modified file 'data/tribes/workers/frisians/woodcutter/init.lua' --- data/tribes/workers/frisians/woodcutter/init.lua 2018-07-11 16:38:17 +0000 +++ data/tribes/workers/frisians/woodcutter/init.lua 2018-11-30 10:52:28 +0000 @@ -41,5 +41,6 @@ } }, + ware_hotspot = {0, 20}, animations = animations, } === modified file 'doc/sphinx/source/lua_tribes_workers.rst.org' --- doc/sphinx/source/lua_tribes_workers.rst.org 2017-08-30 16:46:00 +0000 +++ doc/sphinx/source/lua_tribes_workers.rst.org 2018-11-30 10:52:28 +0000 @@ -65,6 +65,13 @@ on the map in order to do his work, and what that work is, including any animations and sounds played. + **ware_hotspot** + *Optional*. The x, y coordinates for adjusting the placement of the + ware being carried. The default value is ``{0, 15}``. Increase ``x`` + to shift the ware to the left and ``y`` to shift it upwards. For example:: + + ware_hotspot = { -2, 13 }, + .. _lua_tribes_workers_helptexts: Help Texts
_______________________________________________ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp