widelands

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

  1. workerwarehotspots
  2. Merge into trunk
Proposed by Benedikt Straub
Status: Merged
Merged at revision: 8965
Proposed branch: lp:~widelands-dev/widelands/workerwarehotspots
Merge into: lp:widelands
Diff against target: 357 lines (+37/-9)
31 files modified
data/tribes/workers/atlanteans/carrier/init.lua (+1/-9)
data/tribes/workers/frisians/baker/init.lua (+1/-0)
data/tribes/workers/frisians/baker_master/init.lua (+1/-0)
data/tribes/workers/frisians/beekeeper/init.lua (+1/-0)
data/tribes/workers/frisians/blacksmith/init.lua (+1/-0)
data/tribes/workers/frisians/blacksmith_master/init.lua (+1/-0)
data/tribes/workers/frisians/brewer/init.lua (+1/-0)
data/tribes/workers/frisians/brewer_master/init.lua (+1/-0)
data/tribes/workers/frisians/brickmaker/init.lua (+1/-0)
data/tribes/workers/frisians/builder/init.lua (+1/-0)
data/tribes/workers/frisians/charcoal_burner/init.lua (+1/-0)
data/tribes/workers/frisians/claydigger/init.lua (+1/-0)
data/tribes/workers/frisians/farmer/init.lua (+1/-0)
data/tribes/workers/frisians/fisher/init.lua (+1/-0)
data/tribes/workers/frisians/fruit_collector/init.lua (+1/-0)
data/tribes/workers/frisians/hunter/init.lua (+1/-0)
data/tribes/workers/frisians/landlady/init.lua (+1/-0)
data/tribes/workers/frisians/miner/init.lua (+1/-0)
data/tribes/workers/frisians/miner_master/init.lua (+1/-0)
data/tribes/workers/frisians/reed_farmer/init.lua (+1/-0)
data/tribes/workers/frisians/reindeer_breeder/init.lua (+1/-0)
data/tribes/workers/frisians/scout/init.lua (+1/-0)
data/tribes/workers/frisians/seamstress/init.lua (+1/-0)
data/tribes/workers/frisians/seamstress_master/init.lua (+1/-0)
data/tribes/workers/frisians/shipwright/init.lua (+1/-0)
data/tribes/workers/frisians/smelter/init.lua (+1/-0)
data/tribes/workers/frisians/smoker/init.lua (+1/-0)
data/tribes/workers/frisians/stonemason/init.lua (+1/-0)
data/tribes/workers/frisians/trainer/init.lua (+1/-0)
data/tribes/workers/frisians/woodcutter/init.lua (+1/-0)
doc/sphinx/source/lua_tribes_workers.rst.org (+7/-0)
To merge this branch: bzr merge lp:~widelands-dev/widelands/workerwarehotspots
Reviewer Review Type Date Requested Status
hessenfarmer test review Approve
GunChleoc code Approve
Review via email: mp+359915@code.launchpad.net

Commit message

Fix the ware hotspots for frisian workers and update the documentation

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

Continuous integration builds have changed state:

Travis build 4312. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/461756507.
Appveyor build 4107. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_workerwarehotspots-4107.

Revision history for this message
GunChleoc (gunchleoc) wrote :

Code LGTM, not tested.

review: Approve (code)
Revision history for this message
hessenfarmer (stephan-lutz) wrote :

tested it. Looks good now. So if CI is green we should merge.

Thanks for fixing

review: Approve (test review)
Revision history for this message
kaputtnik (franku) wrote :

The bug is targeted to build 21 and we are in first feature freeze. Please do not merge before we have build20 released :)

If possible, everyone should focus his work now on the desyncs, imho.

Revision history for this message
hessenfarmer (stephan-lutz) wrote :

@ Kaputtnik:
In my opinion feature freaze means bugfixing mode. I agree that this bug isn't targeted for b20 due to not beeing important enough. But this should not hinder us fixing a bug if a solution is there. like we did with the resis and frisian bushes. So for me we could and should merge this but I will wait for GunChleoc to decide.
I further agree on the desync issues but as I can't help there, so I can't do just nothing else until b20 is out. Perhaps I am able to do some playtesst tomorrow but that's it then.

As there are so much branches for review with our Chief busy with real life I just looked in something where I am able to help. (Furthermore I reported this bug)

Revision history for this message
kaputtnik (franku) wrote :

I understand your point and i wanted to have also some bugs fixed. The problem: Each code change, even it looks very small and secure, has the potential to break some other thing.

> In my opinion feature freaze means bugfixing mode.

Yes, outstanding bugs targeted for build20 and new critical bugs.

> I agree that this bug isn't targeted for b20 due to not beeing important enough. But this should not hinder us fixing a bug if a solution is there.

If we are going in this direction we won't need any feature freeze ;) Maybe except one for the translations...

> like we did with the resis and frisian bushes

That bug was targeted for build20

For the desyncs: Yes, we need playtesting. This would be very welcome.

Revision history for this message
GunChleoc (gunchleoc) wrote :

I don't think that this will mess up anything, so let's have it anyway.

@bunnybot merge

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 2019-01-18 22:04:05 +0000
@@ -31,15 +31,7 @@
31-- This function adds the definition of a carrier to the engine.31-- This function adds the definition of a carrier to the engine.
32--32--
33-- :arg table: This table contains all the data that the game engine will add33-- :arg table: This table contains all the data that the game engine will add
34-- to this carrier. It contains the :ref:`lua_tribes_workers_common`,34-- to this carrier. It contains the :ref:`lua_tribes_workers_common`.
35-- plus the following additional property:
36--
37-- **ware_hotspot**
38-- *Optional*. The x, y coordinates for adjusting the placement of the
39-- ware being carried. The default value is ``{0, 15}``. Increase ``x``
40-- to shift the ware to the left and ``y`` to shift it upwards. For example::
41--
42-- ware_hotspot = { -2, 13 },
43--35--
44tribes:new_carrier_type {36tribes:new_carrier_type {
45 msgctxt = "atlanteans_worker",37 msgctxt = "atlanteans_worker",
4638
=== 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 2019-01-18 22:04:05 +0000
@@ -26,5 +26,6 @@
26 experience = 13,26 experience = 13,
27 becomes = "frisians_baker_master",27 becomes = "frisians_baker_master",
2828
29 ware_hotspot = {0, 20},
29 animations = animations,30 animations = animations,
30}31}
3132
=== 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 2019-01-18 22:04:05 +0000
@@ -18,5 +18,6 @@
18 icon = dirname .. "menu.png",18 icon = dirname .. "menu.png",
19 vision_range = 2,19 vision_range = 2,
2020
21 ware_hotspot = {0, 20},
21 animations = animations,22 animations = animations,
22}23}
2324
=== 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 2019-01-18 22:04:05 +0000
@@ -37,5 +37,6 @@
37 }37 }
38 },38 },
3939
40 ware_hotspot = {0, 20},
40 animations = animations,41 animations = animations,
41}42}
4243
=== 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 2019-01-18 22:04:05 +0000
@@ -26,5 +26,6 @@
26 experience = 18,26 experience = 18,
27 becomes = "frisians_blacksmith_master",27 becomes = "frisians_blacksmith_master",
2828
29 ware_hotspot = {0, 20},
29 animations = animations,30 animations = animations,
30}31}
3132
=== 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 2019-01-18 22:04:05 +0000
@@ -18,5 +18,6 @@
18 icon = dirname .. "menu.png",18 icon = dirname .. "menu.png",
19 vision_range = 2,19 vision_range = 2,
2020
21 ware_hotspot = {0, 20},
21 animations = animations,22 animations = animations,
22}23}
2324
=== 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 2019-01-18 22:04:05 +0000
@@ -25,5 +25,6 @@
25 experience = 15,25 experience = 15,
26 becomes = "frisians_brewer_master",26 becomes = "frisians_brewer_master",
2727
28 ware_hotspot = {0, 20},
28 animations = animations,29 animations = animations,
29}30}
3031
=== 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 2019-01-18 22:04:05 +0000
@@ -18,5 +18,6 @@
18 icon = dirname .. "menu.png",18 icon = dirname .. "menu.png",
19 vision_range = 2,19 vision_range = 2,
2020
21 ware_hotspot = {0, 20},
21 animations = animations,22 animations = animations,
22}23}
2324
=== 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 2019-01-18 22:04:05 +0000
@@ -23,5 +23,6 @@
23 fire_tongs = 123 fire_tongs = 1
24 },24 },
2525
26 ware_hotspot = {0, 20},
26 animations = animations,27 animations = animations,
27}28}
2829
=== 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 2019-01-18 22:04:05 +0000
@@ -33,5 +33,6 @@
33 hammer = 133 hammer = 1
34 },34 },
3535
36 ware_hotspot = {0, 20},
36 animations = animations,37 animations = animations,
37}38}
3839
=== 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 2019-01-18 22:04:05 +0000
@@ -22,5 +22,6 @@
22 frisians_carrier = 122 frisians_carrier = 1
23 },23 },
2424
25 ware_hotspot = {0, 20},
25 animations = animations,26 animations = animations,
26}27}
2728
=== 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 2019-01-18 22:04:05 +0000
@@ -38,5 +38,6 @@
38 }38 }
39 },39 },
4040
41 ware_hotspot = {0, 20},
41 animations = animations,42 animations = animations,
42}43}
4344
=== 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 2019-01-18 22:04:05 +0000
@@ -58,5 +58,6 @@
58 }58 }
59 },59 },
6060
61 ware_hotspot = {0, 20},
61 animations = animations,62 animations = animations,
62}63}
6364
=== 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 2019-01-18 22:04:05 +0000
@@ -59,5 +59,6 @@
59 }59 }
60 },60 },
6161
62 ware_hotspot = {0, 20},
62 animations = animations,63 animations = animations,
63}64}
6465
=== 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 2019-01-18 22:04:05 +0000
@@ -41,5 +41,6 @@
41 }41 }
42 },42 },
4343
44 ware_hotspot = {0, 20},
44 animations = animations,45 animations = animations,
45}46}
4647
=== 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 2019-01-18 22:04:05 +0000
@@ -35,5 +35,6 @@
35 }35 }
36 },36 },
3737
38 ware_hotspot = {0, 20},
38 animations = animations,39 animations = animations,
39}40}
4041
=== 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 2019-01-18 22:04:05 +0000
@@ -23,5 +23,6 @@
23 kitchen_tools = 123 kitchen_tools = 1
24 },24 },
2525
26 ware_hotspot = {0, 20},
26 animations = animations,27 animations = animations,
27}28}
2829
=== 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 2019-01-18 22:04:05 +0000
@@ -26,5 +26,6 @@
26 experience = 26,26 experience = 26,
27 becomes = "frisians_miner_master",27 becomes = "frisians_miner_master",
2828
29 ware_hotspot = {0, 20},
29 animations = animations,30 animations = animations,
30}31}
3132
=== 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 2019-01-18 22:04:05 +0000
@@ -18,5 +18,6 @@
18 icon = dirname .. "menu.png",18 icon = dirname .. "menu.png",
19 vision_range = 2,19 vision_range = 2,
2020
21 ware_hotspot = {0, 20},
21 animations = animations,22 animations = animations,
22}23}
2324
=== 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 2019-01-18 22:04:05 +0000
@@ -58,5 +58,6 @@
58 },58 },
59 },59 },
6060
61 ware_hotspot = {0, 20},
61 animations = animations,62 animations = animations,
62}63}
6364
=== 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 2019-01-18 22:04:05 +0000
@@ -22,5 +22,6 @@
22 frisians_carrier = 122 frisians_carrier = 1
23 },23 },
2424
25 ware_hotspot = {0, 20},
25 animations = animations,26 animations = animations,
26}27}
2728
=== 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 2019-01-18 22:04:05 +0000
@@ -29,5 +29,6 @@
29 }29 }
30 },30 },
3131
32 ware_hotspot = {0, 20},
32 animations = animations,33 animations = animations,
33}34}
3435
=== 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 2019-01-18 22:04:05 +0000
@@ -26,5 +26,6 @@
26 experience = 14,26 experience = 14,
27 becomes = "frisians_seamstress_master",27 becomes = "frisians_seamstress_master",
2828
29 ware_hotspot = {0, 20},
29 animations = animations,30 animations = animations,
30}31}
3132
=== 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 2019-01-18 22:04:05 +0000
@@ -18,5 +18,6 @@
18 icon = dirname .. "menu.png",18 icon = dirname .. "menu.png",
19 vision_range = 2,19 vision_range = 2,
2020
21 ware_hotspot = {0, 20},
21 animations = animations,22 animations = animations,
22}23}
2324
=== 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 2019-01-18 22:04:05 +0000
@@ -43,5 +43,6 @@
43 }43 }
44 },44 },
4545
46 ware_hotspot = {0, 20},
46 animations = animations,47 animations = animations,
47}48}
4849
=== 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 2019-01-18 22:04:05 +0000
@@ -23,5 +23,6 @@
23 fire_tongs = 123 fire_tongs = 1
24 },24 },
2525
26 ware_hotspot = {0, 20},
26 animations = animations,27 animations = animations,
27}28}
2829
=== 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 2019-01-18 22:04:05 +0000
@@ -23,5 +23,6 @@
23 kitchen_tools = 123 kitchen_tools = 1
24 },24 },
2525
26 ware_hotspot = {0, 20},
26 animations = animations,27 animations = animations,
27}28}
2829
=== 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 2019-01-18 22:04:05 +0000
@@ -39,5 +39,6 @@
39 }39 }
40 },40 },
4141
42 ware_hotspot = {0, 20},
42 animations = animations,43 animations = animations,
43}44}
4445
=== 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 2019-01-18 22:04:05 +0000
@@ -24,5 +24,6 @@
24 fur_garment = 124 fur_garment = 1
25 },25 },
2626
27 ware_hotspot = {0, 20},
27 animations = animations,28 animations = animations,
28}29}
2930
=== 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 2019-01-18 22:04:05 +0000
@@ -41,5 +41,6 @@
41 }41 }
42 },42 },
4343
44 ware_hotspot = {0, 20},
44 animations = animations,45 animations = animations,
45}46}
4647
=== 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 2019-01-18 22:04:05 +0000
@@ -65,6 +65,13 @@
65 on the map in order to do his work, and what that work is, including any65 on the map in order to do his work, and what that work is, including any
66 animations and sounds played.66 animations and sounds played.
6767
68 **ware_hotspot**
69 *Optional*. The x, y coordinates for adjusting the placement of the
70 ware being carried. The default value is ``{0, 15}``. Increase ``x``
71 to shift the ware to the left and ``y`` to shift it upwards. For example::
72
73 ware_hotspot = { -2, 13 },
74
68.. _lua_tribes_workers_helptexts:75.. _lua_tribes_workers_helptexts:
6976
70Help Texts77Help Texts

Subscribers

People subscribed via source and target branches

to status/vote changes: