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

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)
8940. By hessenfarmer

merged trunk

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
1=== modified file 'data/tribes/workers/atlanteans/carrier/init.lua'
2--- data/tribes/workers/atlanteans/carrier/init.lua 2017-08-30 16:46:00 +0000
3+++ data/tribes/workers/atlanteans/carrier/init.lua 2019-01-18 22:04:05 +0000
4@@ -31,15 +31,7 @@
5 -- This function adds the definition of a carrier to the engine.
6 --
7 -- :arg table: This table contains all the data that the game engine will add
8--- to this carrier. It contains the :ref:`lua_tribes_workers_common`,
9--- plus the following additional property:
10---
11--- **ware_hotspot**
12--- *Optional*. The x, y coordinates for adjusting the placement of the
13--- ware being carried. The default value is ``{0, 15}``. Increase ``x``
14--- to shift the ware to the left and ``y`` to shift it upwards. For example::
15---
16--- ware_hotspot = { -2, 13 },
17+-- to this carrier. It contains the :ref:`lua_tribes_workers_common`.
18 --
19 tribes:new_carrier_type {
20 msgctxt = "atlanteans_worker",
21
22=== modified file 'data/tribes/workers/frisians/baker/init.lua'
23--- data/tribes/workers/frisians/baker/init.lua 2018-10-04 07:14:23 +0000
24+++ data/tribes/workers/frisians/baker/init.lua 2019-01-18 22:04:05 +0000
25@@ -26,5 +26,6 @@
26 experience = 13,
27 becomes = "frisians_baker_master",
28
29+ ware_hotspot = {0, 20},
30 animations = animations,
31 }
32
33=== modified file 'data/tribes/workers/frisians/baker_master/init.lua'
34--- data/tribes/workers/frisians/baker_master/init.lua 2018-02-06 11:17:48 +0000
35+++ data/tribes/workers/frisians/baker_master/init.lua 2019-01-18 22:04:05 +0000
36@@ -18,5 +18,6 @@
37 icon = dirname .. "menu.png",
38 vision_range = 2,
39
40+ ware_hotspot = {0, 20},
41 animations = animations,
42 }
43
44=== modified file 'data/tribes/workers/frisians/beekeeper/init.lua'
45--- data/tribes/workers/frisians/beekeeper/init.lua 2018-03-25 18:28:00 +0000
46+++ data/tribes/workers/frisians/beekeeper/init.lua 2019-01-18 22:04:05 +0000
47@@ -37,5 +37,6 @@
48 }
49 },
50
51+ ware_hotspot = {0, 20},
52 animations = animations,
53 }
54
55=== modified file 'data/tribes/workers/frisians/blacksmith/init.lua'
56--- data/tribes/workers/frisians/blacksmith/init.lua 2018-10-04 07:14:23 +0000
57+++ data/tribes/workers/frisians/blacksmith/init.lua 2019-01-18 22:04:05 +0000
58@@ -26,5 +26,6 @@
59 experience = 18,
60 becomes = "frisians_blacksmith_master",
61
62+ ware_hotspot = {0, 20},
63 animations = animations,
64 }
65
66=== modified file 'data/tribes/workers/frisians/blacksmith_master/init.lua'
67--- data/tribes/workers/frisians/blacksmith_master/init.lua 2018-02-06 11:17:48 +0000
68+++ data/tribes/workers/frisians/blacksmith_master/init.lua 2019-01-18 22:04:05 +0000
69@@ -18,5 +18,6 @@
70 icon = dirname .. "menu.png",
71 vision_range = 2,
72
73+ ware_hotspot = {0, 20},
74 animations = animations,
75 }
76
77=== modified file 'data/tribes/workers/frisians/brewer/init.lua'
78--- data/tribes/workers/frisians/brewer/init.lua 2018-10-04 07:14:23 +0000
79+++ data/tribes/workers/frisians/brewer/init.lua 2019-01-18 22:04:05 +0000
80@@ -25,5 +25,6 @@
81 experience = 15,
82 becomes = "frisians_brewer_master",
83
84+ ware_hotspot = {0, 20},
85 animations = animations,
86 }
87
88=== modified file 'data/tribes/workers/frisians/brewer_master/init.lua'
89--- data/tribes/workers/frisians/brewer_master/init.lua 2018-02-06 11:17:48 +0000
90+++ data/tribes/workers/frisians/brewer_master/init.lua 2019-01-18 22:04:05 +0000
91@@ -18,5 +18,6 @@
92 icon = dirname .. "menu.png",
93 vision_range = 2,
94
95+ ware_hotspot = {0, 20},
96 animations = animations,
97 }
98
99=== modified file 'data/tribes/workers/frisians/brickmaker/init.lua'
100--- data/tribes/workers/frisians/brickmaker/init.lua 2018-07-08 16:10:50 +0000
101+++ data/tribes/workers/frisians/brickmaker/init.lua 2019-01-18 22:04:05 +0000
102@@ -23,5 +23,6 @@
103 fire_tongs = 1
104 },
105
106+ ware_hotspot = {0, 20},
107 animations = animations,
108 }
109
110=== modified file 'data/tribes/workers/frisians/builder/init.lua'
111--- data/tribes/workers/frisians/builder/init.lua 2018-02-06 11:17:48 +0000
112+++ data/tribes/workers/frisians/builder/init.lua 2019-01-18 22:04:05 +0000
113@@ -33,5 +33,6 @@
114 hammer = 1
115 },
116
117+ ware_hotspot = {0, 20},
118 animations = animations,
119 }
120
121=== modified file 'data/tribes/workers/frisians/charcoal_burner/init.lua'
122--- data/tribes/workers/frisians/charcoal_burner/init.lua 2018-02-06 11:17:48 +0000
123+++ data/tribes/workers/frisians/charcoal_burner/init.lua 2019-01-18 22:04:05 +0000
124@@ -22,5 +22,6 @@
125 frisians_carrier = 1
126 },
127
128+ ware_hotspot = {0, 20},
129 animations = animations,
130 }
131
132=== modified file 'data/tribes/workers/frisians/claydigger/init.lua'
133--- data/tribes/workers/frisians/claydigger/init.lua 2018-07-08 16:10:50 +0000
134+++ data/tribes/workers/frisians/claydigger/init.lua 2019-01-18 22:04:05 +0000
135@@ -38,5 +38,6 @@
136 }
137 },
138
139+ ware_hotspot = {0, 20},
140 animations = animations,
141 }
142
143=== modified file 'data/tribes/workers/frisians/farmer/init.lua'
144--- data/tribes/workers/frisians/farmer/init.lua 2018-09-16 13:19:53 +0000
145+++ data/tribes/workers/frisians/farmer/init.lua 2019-01-18 22:04:05 +0000
146@@ -58,5 +58,6 @@
147 }
148 },
149
150+ ware_hotspot = {0, 20},
151 animations = animations,
152 }
153
154=== modified file 'data/tribes/workers/frisians/fisher/init.lua'
155--- data/tribes/workers/frisians/fisher/init.lua 2018-03-25 18:28:00 +0000
156+++ data/tribes/workers/frisians/fisher/init.lua 2019-01-18 22:04:05 +0000
157@@ -59,5 +59,6 @@
158 }
159 },
160
161+ ware_hotspot = {0, 20},
162 animations = animations,
163 }
164
165=== modified file 'data/tribes/workers/frisians/fruit_collector/init.lua'
166--- data/tribes/workers/frisians/fruit_collector/init.lua 2018-03-25 18:28:00 +0000
167+++ data/tribes/workers/frisians/fruit_collector/init.lua 2019-01-18 22:04:05 +0000
168@@ -41,5 +41,6 @@
169 }
170 },
171
172+ ware_hotspot = {0, 20},
173 animations = animations,
174 }
175
176=== modified file 'data/tribes/workers/frisians/hunter/init.lua'
177--- data/tribes/workers/frisians/hunter/init.lua 2018-03-25 18:28:00 +0000
178+++ data/tribes/workers/frisians/hunter/init.lua 2019-01-18 22:04:05 +0000
179@@ -35,5 +35,6 @@
180 }
181 },
182
183+ ware_hotspot = {0, 20},
184 animations = animations,
185 }
186
187=== modified file 'data/tribes/workers/frisians/landlady/init.lua'
188--- data/tribes/workers/frisians/landlady/init.lua 2018-02-06 11:17:48 +0000
189+++ data/tribes/workers/frisians/landlady/init.lua 2019-01-18 22:04:05 +0000
190@@ -23,5 +23,6 @@
191 kitchen_tools = 1
192 },
193
194+ ware_hotspot = {0, 20},
195 animations = animations,
196 }
197
198=== modified file 'data/tribes/workers/frisians/miner/init.lua'
199--- data/tribes/workers/frisians/miner/init.lua 2018-02-06 11:17:48 +0000
200+++ data/tribes/workers/frisians/miner/init.lua 2019-01-18 22:04:05 +0000
201@@ -26,5 +26,6 @@
202 experience = 26,
203 becomes = "frisians_miner_master",
204
205+ ware_hotspot = {0, 20},
206 animations = animations,
207 }
208
209=== modified file 'data/tribes/workers/frisians/miner_master/init.lua'
210--- data/tribes/workers/frisians/miner_master/init.lua 2018-02-06 11:17:48 +0000
211+++ data/tribes/workers/frisians/miner_master/init.lua 2019-01-18 22:04:05 +0000
212@@ -18,5 +18,6 @@
213 icon = dirname .. "menu.png",
214 vision_range = 2,
215
216+ ware_hotspot = {0, 20},
217 animations = animations,
218 }
219
220=== modified file 'data/tribes/workers/frisians/reed_farmer/init.lua'
221--- data/tribes/workers/frisians/reed_farmer/init.lua 2018-03-25 18:28:00 +0000
222+++ data/tribes/workers/frisians/reed_farmer/init.lua 2019-01-18 22:04:05 +0000
223@@ -58,5 +58,6 @@
224 },
225 },
226
227+ ware_hotspot = {0, 20},
228 animations = animations,
229 }
230
231=== modified file 'data/tribes/workers/frisians/reindeer_breeder/init.lua'
232--- data/tribes/workers/frisians/reindeer_breeder/init.lua 2018-02-06 11:17:48 +0000
233+++ data/tribes/workers/frisians/reindeer_breeder/init.lua 2019-01-18 22:04:05 +0000
234@@ -22,5 +22,6 @@
235 frisians_carrier = 1
236 },
237
238+ ware_hotspot = {0, 20},
239 animations = animations,
240 }
241
242=== modified file 'data/tribes/workers/frisians/scout/init.lua'
243--- data/tribes/workers/frisians/scout/init.lua 2018-03-25 18:28:00 +0000
244+++ data/tribes/workers/frisians/scout/init.lua 2019-01-18 22:04:05 +0000
245@@ -29,5 +29,6 @@
246 }
247 },
248
249+ ware_hotspot = {0, 20},
250 animations = animations,
251 }
252
253=== modified file 'data/tribes/workers/frisians/seamstress/init.lua'
254--- data/tribes/workers/frisians/seamstress/init.lua 2018-02-06 11:17:48 +0000
255+++ data/tribes/workers/frisians/seamstress/init.lua 2019-01-18 22:04:05 +0000
256@@ -26,5 +26,6 @@
257 experience = 14,
258 becomes = "frisians_seamstress_master",
259
260+ ware_hotspot = {0, 20},
261 animations = animations,
262 }
263
264=== modified file 'data/tribes/workers/frisians/seamstress_master/init.lua'
265--- data/tribes/workers/frisians/seamstress_master/init.lua 2018-02-06 11:17:48 +0000
266+++ data/tribes/workers/frisians/seamstress_master/init.lua 2019-01-18 22:04:05 +0000
267@@ -18,5 +18,6 @@
268 icon = dirname .. "menu.png",
269 vision_range = 2,
270
271+ ware_hotspot = {0, 20},
272 animations = animations,
273 }
274
275=== modified file 'data/tribes/workers/frisians/shipwright/init.lua'
276--- data/tribes/workers/frisians/shipwright/init.lua 2018-03-25 18:28:00 +0000
277+++ data/tribes/workers/frisians/shipwright/init.lua 2019-01-18 22:04:05 +0000
278@@ -43,5 +43,6 @@
279 }
280 },
281
282+ ware_hotspot = {0, 20},
283 animations = animations,
284 }
285
286=== modified file 'data/tribes/workers/frisians/smelter/init.lua'
287--- data/tribes/workers/frisians/smelter/init.lua 2018-02-06 11:17:48 +0000
288+++ data/tribes/workers/frisians/smelter/init.lua 2019-01-18 22:04:05 +0000
289@@ -23,5 +23,6 @@
290 fire_tongs = 1
291 },
292
293+ ware_hotspot = {0, 20},
294 animations = animations,
295 }
296
297=== modified file 'data/tribes/workers/frisians/smoker/init.lua'
298--- data/tribes/workers/frisians/smoker/init.lua 2018-02-06 11:17:48 +0000
299+++ data/tribes/workers/frisians/smoker/init.lua 2019-01-18 22:04:05 +0000
300@@ -23,5 +23,6 @@
301 kitchen_tools = 1
302 },
303
304+ ware_hotspot = {0, 20},
305 animations = animations,
306 }
307
308=== modified file 'data/tribes/workers/frisians/stonemason/init.lua'
309--- data/tribes/workers/frisians/stonemason/init.lua 2018-03-25 18:28:00 +0000
310+++ data/tribes/workers/frisians/stonemason/init.lua 2019-01-18 22:04:05 +0000
311@@ -39,5 +39,6 @@
312 }
313 },
314
315+ ware_hotspot = {0, 20},
316 animations = animations,
317 }
318
319=== modified file 'data/tribes/workers/frisians/trainer/init.lua'
320--- data/tribes/workers/frisians/trainer/init.lua 2018-02-19 08:50:22 +0000
321+++ data/tribes/workers/frisians/trainer/init.lua 2019-01-18 22:04:05 +0000
322@@ -24,5 +24,6 @@
323 fur_garment = 1
324 },
325
326+ ware_hotspot = {0, 20},
327 animations = animations,
328 }
329
330=== modified file 'data/tribes/workers/frisians/woodcutter/init.lua'
331--- data/tribes/workers/frisians/woodcutter/init.lua 2018-07-11 16:38:17 +0000
332+++ data/tribes/workers/frisians/woodcutter/init.lua 2019-01-18 22:04:05 +0000
333@@ -41,5 +41,6 @@
334 }
335 },
336
337+ ware_hotspot = {0, 20},
338 animations = animations,
339 }
340
341=== modified file 'doc/sphinx/source/lua_tribes_workers.rst.org'
342--- doc/sphinx/source/lua_tribes_workers.rst.org 2017-08-30 16:46:00 +0000
343+++ doc/sphinx/source/lua_tribes_workers.rst.org 2019-01-18 22:04:05 +0000
344@@ -65,6 +65,13 @@
345 on the map in order to do his work, and what that work is, including any
346 animations and sounds played.
347
348+ **ware_hotspot**
349+ *Optional*. The x, y coordinates for adjusting the placement of the
350+ ware being carried. The default value is ``{0, 15}``. Increase ``x``
351+ to shift the ware to the left and ``y`` to shift it upwards. For example::
352+
353+ ware_hotspot = { -2, 13 },
354+
355 .. _lua_tribes_workers_helptexts:
356
357 Help Texts

Subscribers

People subscribed via source and target branches

to status/vote changes: