widelands

Merge lp:~chuckw20/widelands/fix_barbarian_hotspots into lp:widelands

  1. fix_barbarian_hotspots
  2. Merge into trunk
Proposed by Chuck Wilder
Status: Merged
Merged at revision: not available
Proposed branch: lp:~chuckw20/widelands/fix_barbarian_hotspots
Merge into: lp:widelands
Diff against target: 380 lines (+66/-66)
24 files modified
tribes/barbarians/bakery/conf (+2/-2)
tribes/barbarians/battlearena/conf (+1/-1)
tribes/barbarians/big_inn/conf (+1/-1)
tribes/barbarians/brewery/conf (+2/-3)
tribes/barbarians/burners_house/conf (+2/-2)
tribes/barbarians/citadel/conf (+1/-1)
tribes/barbarians/donjon/conf (+1/-1)
tribes/barbarians/fernery/conf (+1/-1)
tribes/barbarians/fortress/conf (+1/-1)
tribes/barbarians/gamekeepers_hut/conf (+2/-2)
tribes/barbarians/hardener/conf (+2/-2)
tribes/barbarians/headquarters/conf (+2/-1)
tribes/barbarians/headquarters_interim/conf (+1/-1)
tribes/barbarians/helmsmithy/conf (+3/-3)
tribes/barbarians/lime_kiln/conf (+2/-2)
tribes/barbarians/metalworks/conf (+2/-2)
tribes/barbarians/quarry/conf (+27/-27)
tribes/barbarians/rangers_hut/conf (+1/-1)
tribes/barbarians/smelting_works/conf (+2/-2)
tribes/barbarians/stronghold/conf (+2/-2)
tribes/barbarians/trainingscamp/conf (+1/-1)
tribes/barbarians/warehouse/conf (+2/-2)
tribes/barbarians/warmill/conf (+2/-2)
tribes/barbarians/weaving-mill/conf (+3/-3)
To merge this branch: bzr merge lp:~chuckw20/widelands/fix_barbarian_hotspots
Reviewer Review Type Date Requested Status
Widelands Developers Pending
Review via email: mp+23067@code.launchpad.net

Description of the change

In response to bug #558706, hotspots for 23 barbarian buildings were adjusted to better position the builder and deliveries. A review of empire and atlantean buildings remains to be done.

Discovered and corrected size discrepancies between the build and idle pngs for the barbarian rangers-hut and warehouse. They had contributed to visual shifts of the structures between the build phase and the idle phase.

Elements in the images for the brewery (boiler), the hardeners_house (pit?), and the warmill (stone anvil?) were found to obstruct nearby roads but those images were not edited for this commit.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tribes/barbarians/bakery/conf'
2--- tribes/barbarians/bakery/conf 2009-12-31 18:15:29 +0000
3+++ tribes/barbarians/bakery/conf 2010-04-09 03:59:17 +0000
4@@ -32,8 +32,8 @@
5
6 [idle]
7 pics=bakery_i_??.png # ???
8-hotspot=40 60
9+hotspot=61 66
10
11 [working]
12 pics=bakery_i_??.png # ???
13-hotspot=40 60
14+hotspot=61 66
15
16=== modified file 'tribes/barbarians/battlearena/conf'
17--- tribes/barbarians/battlearena/conf 2009-03-09 10:12:41 +0000
18+++ tribes/barbarians/battlearena/conf 2010-04-09 03:59:17 +0000
19@@ -61,4 +61,4 @@
20
21 [idle]
22 pics=battlearena_i_??.png # ???
23-hotspot=80 77
24+hotspot=93 62
25
26=== modified file 'tribes/barbarians/big_inn/conf'
27--- tribes/barbarians/big_inn/conf 2009-04-11 17:14:21 +0000
28+++ tribes/barbarians/big_inn/conf 2010-04-09 03:59:17 +0000
29@@ -52,4 +52,4 @@
30
31 [idle]
32 pics=big_inn_i_??.png # ???
33-hotspot=53 66
34+hotspot=53 62
35
36=== modified file 'tribes/barbarians/brewery/conf'
37--- tribes/barbarians/brewery/conf 2009-12-03 11:58:28 +0000
38+++ tribes/barbarians/brewery/conf 2010-04-09 03:59:17 +0000
39@@ -29,8 +29,7 @@
40
41 [idle]
42 pics=brewery_i_??.png # ???
43-hotspot=58 56
44-
45+hotspot=57 48
46 [working]
47 pics=brewery_i_??.png # ???
48-hotspot=58 56
49+hotspot=57 48
50
51=== modified file 'tribes/barbarians/burners_house/conf'
52--- tribes/barbarians/burners_house/conf 2009-12-15 16:36:12 +0000
53+++ tribes/barbarians/burners_house/conf 2010-04-09 03:59:17 +0000
54@@ -27,8 +27,8 @@
55
56 [idle]
57 pics=burner_i_??.png # ???
58-hotspot=44 51
59+hotspot=53 54
60
61 [working]
62 pics=burner_i_??.png # ???
63-hotspot=44 51
64+hotspot=53 54
65
66=== modified file 'tribes/barbarians/citadel/conf'
67--- tribes/barbarians/citadel/conf 2009-01-25 19:40:02 +0000
68+++ tribes/barbarians/citadel/conf 2010-04-09 03:59:17 +0000
69@@ -15,4 +15,4 @@
70
71 [idle]
72 pics=citadel_i_??.png
73-hotspot=81 90
74+hotspot=94 101
75
76=== modified file 'tribes/barbarians/donjon/conf'
77--- tribes/barbarians/donjon/conf 2009-01-25 19:40:02 +0000
78+++ tribes/barbarians/donjon/conf 2010-04-09 03:59:17 +0000
79@@ -13,4 +13,4 @@
80
81 [idle]
82 pics=i_??.png
83-hotspot=56 58
84+hotspot=68 70
85\ No newline at end of file
86
87=== modified file 'tribes/barbarians/fernery/conf'
88--- tribes/barbarians/fernery/conf 2009-03-18 12:12:14 +0000
89+++ tribes/barbarians/fernery/conf 2010-04-09 03:59:17 +0000
90@@ -61,4 +61,4 @@
91
92 [idle]
93 pics=fernery_i_??.png # ???
94-hotspot=54 51
95+hotspot=64 60
96
97=== modified file 'tribes/barbarians/fortress/conf'
98--- tribes/barbarians/fortress/conf 2009-01-25 19:40:02 +0000
99+++ tribes/barbarians/fortress/conf 2010-04-09 03:59:17 +0000
100@@ -14,4 +14,4 @@
101
102 [idle]
103 pics=fortress_i_??.png
104-hotspot=81 66
105+hotspot=94 78
106
107=== modified file 'tribes/barbarians/gamekeepers_hut/conf'
108--- tribes/barbarians/gamekeepers_hut/conf 2010-01-01 12:32:23 +0000
109+++ tribes/barbarians/gamekeepers_hut/conf 2010-04-09 03:59:17 +0000
110@@ -20,8 +20,8 @@
111
112 [idle]
113 pics=gamekeeper_i_??.png
114-hotspot=49 45
115+hotspot=48 44
116
117 [build]
118 pics=gamekeeper_i_??.png
119-hotspot=49 45
120+hotspot=48 44
121
122=== modified file 'tribes/barbarians/hardener/conf'
123--- tribes/barbarians/hardener/conf 2009-12-15 16:36:12 +0000
124+++ tribes/barbarians/hardener/conf 2010-04-09 03:59:17 +0000
125@@ -26,8 +26,8 @@
126
127 [idle]
128 pics=hardener_i_??.png # ???
129-hotspot=41 52
130+hotspot=38 50
131
132 [working]
133 pics=hardener_i_??.png # ???
134-hotspot=41 52
135+hotspot=38 50
136
137=== modified file 'tribes/barbarians/headquarters/conf'
138--- tribes/barbarians/headquarters/conf 2009-12-31 18:36:51 +0000
139+++ tribes/barbarians/headquarters/conf 2010-04-09 03:59:17 +0000
140@@ -11,4 +11,5 @@
141 [idle]
142 pics=headquarters_i_??.png
143 # sfx=0 ../../../sound/spoken/warehouse-bringitin
144-hotspot=83 113
145+hotspot=83 105
146+
147
148=== modified file 'tribes/barbarians/headquarters_interim/conf'
149--- tribes/barbarians/headquarters_interim/conf 2009-12-31 18:36:51 +0000
150+++ tribes/barbarians/headquarters_interim/conf 2010-04-09 03:59:17 +0000
151@@ -8,5 +8,5 @@
152
153 [idle]
154 pics=headquarters_interim_i_??.png
155-hotspot=70 110
156+hotspot=52 92
157 playercolor=true
158
159=== modified file 'tribes/barbarians/helmsmithy/conf'
160--- tribes/barbarians/helmsmithy/conf 2009-12-15 16:36:12 +0000
161+++ tribes/barbarians/helmsmithy/conf 2010-04-09 03:59:17 +0000
162@@ -57,12 +57,12 @@
163
164 [idle]
165 pics=helmsmith_i_??.png # ???
166-hotspot=50 68
167+hotspot=65 75
168
169 [build]
170 pics=helmsmith_b_??.png # ???
171-hotspot=50 68
172+hotspot=65 75
173
174 [working]
175 pics=helmsmith_w_??.png # ???
176-hotspot=50 68
177+hotspot=65 75
178
179=== modified file 'tribes/barbarians/lime_kiln/conf'
180--- tribes/barbarians/lime_kiln/conf 2009-01-25 19:40:02 +0000
181+++ tribes/barbarians/lime_kiln/conf 2010-04-09 03:59:17 +0000
182@@ -26,8 +26,8 @@
183
184 [idle]
185 pics=stonegrinder_i_??.png # ???
186-hotspot=43 50
187+hotspot=47 52
188
189 [working]
190 pics=stonegrinder_i_??.png # ???
191-hotspot=43 50
192+hotspot=47 52
193
194=== modified file 'tribes/barbarians/metalworks/conf'
195--- tribes/barbarians/metalworks/conf 2010-01-01 12:32:23 +0000
196+++ tribes/barbarians/metalworks/conf 2010-04-09 03:59:17 +0000
197@@ -137,8 +137,8 @@
198
199 [idle]
200 pics=metalworks_i_??.png
201-hotspot=40 54
202+hotspot=37 51
203
204 [working]
205 pics=metalworks_i_??.png
206-hotspot=40 54
207+hotspot=37 51
208
209=== modified file 'tribes/barbarians/quarry/conf'
210--- tribes/barbarians/quarry/conf 2009-12-31 18:15:29 +0000
211+++ tribes/barbarians/quarry/conf 2010-04-09 03:59:17 +0000
212@@ -1,27 +1,27 @@
213-size=small
214-output=raw_stone
215-
216-[buildcost]
217-trunk=4
218-
219-[working positions]
220-stonemason=1
221-
222-[aihints]
223-is_basic=true
224-stoneproducer=true
225-
226-[programs]
227-work=_Work
228-
229-[work]
230-sleep=25000
231-worker=cut
232-
233-[idle]
234-pics=b_quarry_i_??.png # ???
235-hotspot=47 45
236-
237-[build]
238-pics=b_quarry_b_??.png # ???
239-hotspot=48 43
240+size=small
241+output=raw_stone
242+
243+[buildcost]
244+trunk=4
245+
246+[working positions]
247+stonemason=1
248+
249+[aihints]
250+is_basic=true
251+stoneproducer=true
252+
253+[programs]
254+work=_Work
255+
256+[work]
257+sleep=25000
258+worker=cut
259+
260+[idle]
261+pics=b_quarry_i_??.png # ???
262+hotspot=47 45
263+
264+[build]
265+pics=b_quarry_b_??.png # ???
266+hotspot=41 36
267
268=== modified file 'tribes/barbarians/rangers_hut/b_ranger_b_00.png'
269Binary files tribes/barbarians/rangers_hut/b_ranger_b_00.png 2009-11-11 21:29:34 +0000 and tribes/barbarians/rangers_hut/b_ranger_b_00.png 2010-04-09 03:59:17 +0000 differ
270=== modified file 'tribes/barbarians/rangers_hut/b_ranger_b_01.png'
271Binary files tribes/barbarians/rangers_hut/b_ranger_b_01.png 2009-11-11 21:29:34 +0000 and tribes/barbarians/rangers_hut/b_ranger_b_01.png 2010-04-09 03:59:17 +0000 differ
272=== modified file 'tribes/barbarians/rangers_hut/b_ranger_i_00.png'
273Binary files tribes/barbarians/rangers_hut/b_ranger_i_00.png 2008-11-24 17:43:38 +0000 and tribes/barbarians/rangers_hut/b_ranger_i_00.png 2010-04-09 03:59:17 +0000 differ
274=== modified file 'tribes/barbarians/rangers_hut/conf'
275--- tribes/barbarians/rangers_hut/conf 2009-05-02 14:09:26 +0000
276+++ tribes/barbarians/rangers_hut/conf 2010-04-09 03:59:17 +0000
277@@ -18,7 +18,7 @@
278
279 [idle]
280 pics=b_ranger_i_??.png # ???
281-hotspot=45 44
282+hotspot=43 43
283
284 [build]
285 pics=b_ranger_b_??.png # ???
286
287=== modified file 'tribes/barbarians/smelting_works/conf'
288--- tribes/barbarians/smelting_works/conf 2009-12-31 18:15:29 +0000
289+++ tribes/barbarians/smelting_works/conf 2010-04-09 03:59:17 +0000
290@@ -47,8 +47,8 @@
291
292 [idle]
293 pics=smelting_works_i_??.png # ???
294-hotspot=50 53
295+hotspot=44 58
296
297 [working]
298 pics=smelting_works_i_??.png # ???
299-hotspot=50 53
300+hotspot=44 58
301
302=== modified file 'tribes/barbarians/stronghold/conf'
303--- tribes/barbarians/stronghold/conf 2009-01-25 19:40:02 +0000
304+++ tribes/barbarians/stronghold/conf 2010-04-09 03:59:17 +0000
305@@ -12,8 +12,8 @@
306
307 [idle]
308 pics=stronghold_i_??.png
309-hotspot=46 52
310+hotspot=50 59
311
312 [build]
313 pics=stronghold_b_??.png
314-hotspot=46 52
315+hotspot=50 59
316
317=== modified file 'tribes/barbarians/trainingscamp/conf'
318--- tribes/barbarians/trainingscamp/conf 2009-03-09 10:12:41 +0000
319+++ tribes/barbarians/trainingscamp/conf 2010-04-09 03:59:17 +0000
320@@ -168,4 +168,4 @@
321
322 [idle]
323 pics=trainingscamp_i_??.png # ???
324-hotspot=77 76
325+hotspot=89 85
326\ No newline at end of file
327
328=== modified file 'tribes/barbarians/warehouse/conf'
329--- tribes/barbarians/warehouse/conf 2009-05-12 07:54:58 +0000
330+++ tribes/barbarians/warehouse/conf 2010-04-09 03:59:17 +0000
331@@ -9,8 +9,8 @@
332
333 [idle]
334 pics=warehouse_i_??.png # ???
335-hotspot=56 77
336+hotspot=58 75
337
338 [build]
339 pics=warehouse_b_??.png # ???
340-hotspot=56 72
341+hotspot=58 70
342
343=== modified file 'tribes/barbarians/warehouse/warehouse_b_00.png'
344Binary files tribes/barbarians/warehouse/warehouse_b_00.png 2009-11-12 01:02:38 +0000 and tribes/barbarians/warehouse/warehouse_b_00.png 2010-04-09 03:59:17 +0000 differ
345=== modified file 'tribes/barbarians/warehouse/warehouse_i_00.png'
346Binary files tribes/barbarians/warehouse/warehouse_i_00.png 2008-11-24 17:43:38 +0000 and tribes/barbarians/warehouse/warehouse_i_00.png 2010-04-09 03:59:17 +0000 differ
347=== modified file 'tribes/barbarians/warmill/conf'
348--- tribes/barbarians/warmill/conf 2009-12-15 16:36:12 +0000
349+++ tribes/barbarians/warmill/conf 2010-04-09 03:59:17 +0000
350@@ -103,8 +103,8 @@
351
352 [idle]
353 pics=i_??.png # ???
354-hotspot=39 60
355+hotspot=38 54
356
357 [working]
358 pics=i_??.png # ???
359-hotspot=39 60
360+hotspot=38 54
361
362=== modified file 'tribes/barbarians/weaving-mill/conf'
363--- tribes/barbarians/weaving-mill/conf 2009-12-15 16:36:12 +0000
364+++ tribes/barbarians/weaving-mill/conf 2010-04-09 03:59:17 +0000
365@@ -26,12 +26,12 @@
366
367 [idle]
368 pics=i_??.png
369-hotspot=36 78
370+hotspot=33 76
371
372 [build]
373 pics=b_??.png
374-hotspot=36 78
375+hotspot=33 76
376
377 [working]
378 pics=w_??.png
379-hotspot=36 78
380+hotspot=33 76

Subscribers

People subscribed via source and target branches

to status/vote changes: