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
=== modified file 'tribes/barbarians/bakery/conf'
--- tribes/barbarians/bakery/conf 2009-12-31 18:15:29 +0000
+++ tribes/barbarians/bakery/conf 2010-04-09 03:59:17 +0000
@@ -32,8 +32,8 @@
3232
33[idle]33[idle]
34pics=bakery_i_??.png # ???34pics=bakery_i_??.png # ???
35hotspot=40 6035hotspot=61 66
3636
37[working]37[working]
38pics=bakery_i_??.png # ???38pics=bakery_i_??.png # ???
39hotspot=40 6039hotspot=61 66
4040
=== modified file 'tribes/barbarians/battlearena/conf'
--- tribes/barbarians/battlearena/conf 2009-03-09 10:12:41 +0000
+++ tribes/barbarians/battlearena/conf 2010-04-09 03:59:17 +0000
@@ -61,4 +61,4 @@
6161
62[idle]62[idle]
63pics=battlearena_i_??.png # ???63pics=battlearena_i_??.png # ???
64hotspot=80 7764hotspot=93 62
6565
=== modified file 'tribes/barbarians/big_inn/conf'
--- tribes/barbarians/big_inn/conf 2009-04-11 17:14:21 +0000
+++ tribes/barbarians/big_inn/conf 2010-04-09 03:59:17 +0000
@@ -52,4 +52,4 @@
5252
53[idle]53[idle]
54pics=big_inn_i_??.png # ???54pics=big_inn_i_??.png # ???
55hotspot=53 6655hotspot=53 62
5656
=== modified file 'tribes/barbarians/brewery/conf'
--- tribes/barbarians/brewery/conf 2009-12-03 11:58:28 +0000
+++ tribes/barbarians/brewery/conf 2010-04-09 03:59:17 +0000
@@ -29,8 +29,7 @@
2929
30[idle]30[idle]
31pics=brewery_i_??.png # ???31pics=brewery_i_??.png # ???
32hotspot=58 5632hotspot=57 48
33
34[working]33[working]
35pics=brewery_i_??.png # ???34pics=brewery_i_??.png # ???
36hotspot=58 5635hotspot=57 48
3736
=== modified file 'tribes/barbarians/burners_house/conf'
--- tribes/barbarians/burners_house/conf 2009-12-15 16:36:12 +0000
+++ tribes/barbarians/burners_house/conf 2010-04-09 03:59:17 +0000
@@ -27,8 +27,8 @@
2727
28[idle]28[idle]
29pics=burner_i_??.png # ???29pics=burner_i_??.png # ???
30hotspot=44 5130hotspot=53 54
3131
32[working]32[working]
33pics=burner_i_??.png # ???33pics=burner_i_??.png # ???
34hotspot=44 5134hotspot=53 54
3535
=== modified file 'tribes/barbarians/citadel/conf'
--- tribes/barbarians/citadel/conf 2009-01-25 19:40:02 +0000
+++ tribes/barbarians/citadel/conf 2010-04-09 03:59:17 +0000
@@ -15,4 +15,4 @@
1515
16[idle]16[idle]
17pics=citadel_i_??.png17pics=citadel_i_??.png
18hotspot=81 9018hotspot=94 101
1919
=== modified file 'tribes/barbarians/donjon/conf'
--- tribes/barbarians/donjon/conf 2009-01-25 19:40:02 +0000
+++ tribes/barbarians/donjon/conf 2010-04-09 03:59:17 +0000
@@ -13,4 +13,4 @@
1313
14[idle]14[idle]
15pics=i_??.png15pics=i_??.png
16hotspot=56 5816hotspot=68 70
17\ No newline at end of file17\ No newline at end of file
1818
=== modified file 'tribes/barbarians/fernery/conf'
--- tribes/barbarians/fernery/conf 2009-03-18 12:12:14 +0000
+++ tribes/barbarians/fernery/conf 2010-04-09 03:59:17 +0000
@@ -61,4 +61,4 @@
6161
62[idle]62[idle]
63pics=fernery_i_??.png # ???63pics=fernery_i_??.png # ???
64hotspot=54 5164hotspot=64 60
6565
=== modified file 'tribes/barbarians/fortress/conf'
--- tribes/barbarians/fortress/conf 2009-01-25 19:40:02 +0000
+++ tribes/barbarians/fortress/conf 2010-04-09 03:59:17 +0000
@@ -14,4 +14,4 @@
1414
15[idle]15[idle]
16pics=fortress_i_??.png16pics=fortress_i_??.png
17hotspot=81 6617hotspot=94 78
1818
=== modified file 'tribes/barbarians/gamekeepers_hut/conf'
--- tribes/barbarians/gamekeepers_hut/conf 2010-01-01 12:32:23 +0000
+++ tribes/barbarians/gamekeepers_hut/conf 2010-04-09 03:59:17 +0000
@@ -20,8 +20,8 @@
2020
21[idle]21[idle]
22pics=gamekeeper_i_??.png22pics=gamekeeper_i_??.png
23hotspot=49 4523hotspot=48 44
2424
25[build]25[build]
26pics=gamekeeper_i_??.png26pics=gamekeeper_i_??.png
27hotspot=49 4527hotspot=48 44
2828
=== modified file 'tribes/barbarians/hardener/conf'
--- tribes/barbarians/hardener/conf 2009-12-15 16:36:12 +0000
+++ tribes/barbarians/hardener/conf 2010-04-09 03:59:17 +0000
@@ -26,8 +26,8 @@
2626
27[idle]27[idle]
28pics=hardener_i_??.png # ???28pics=hardener_i_??.png # ???
29hotspot=41 5229hotspot=38 50
3030
31[working]31[working]
32pics=hardener_i_??.png # ???32pics=hardener_i_??.png # ???
33hotspot=41 5233hotspot=38 50
3434
=== modified file 'tribes/barbarians/headquarters/conf'
--- tribes/barbarians/headquarters/conf 2009-12-31 18:36:51 +0000
+++ tribes/barbarians/headquarters/conf 2010-04-09 03:59:17 +0000
@@ -11,4 +11,5 @@
11[idle]11[idle]
12pics=headquarters_i_??.png12pics=headquarters_i_??.png
13# sfx=0 ../../../sound/spoken/warehouse-bringitin13# sfx=0 ../../../sound/spoken/warehouse-bringitin
14hotspot=83 11314hotspot=83 105
15
1516
=== modified file 'tribes/barbarians/headquarters_interim/conf'
--- tribes/barbarians/headquarters_interim/conf 2009-12-31 18:36:51 +0000
+++ tribes/barbarians/headquarters_interim/conf 2010-04-09 03:59:17 +0000
@@ -8,5 +8,5 @@
88
9[idle]9[idle]
10pics=headquarters_interim_i_??.png10pics=headquarters_interim_i_??.png
11hotspot=70 11011hotspot=52 92
12playercolor=true12playercolor=true
1313
=== modified file 'tribes/barbarians/helmsmithy/conf'
--- tribes/barbarians/helmsmithy/conf 2009-12-15 16:36:12 +0000
+++ tribes/barbarians/helmsmithy/conf 2010-04-09 03:59:17 +0000
@@ -57,12 +57,12 @@
5757
58[idle]58[idle]
59pics=helmsmith_i_??.png # ???59pics=helmsmith_i_??.png # ???
60hotspot=50 6860hotspot=65 75
6161
62[build]62[build]
63pics=helmsmith_b_??.png # ???63pics=helmsmith_b_??.png # ???
64hotspot=50 6864hotspot=65 75
6565
66[working]66[working]
67pics=helmsmith_w_??.png # ???67pics=helmsmith_w_??.png # ???
68hotspot=50 6868hotspot=65 75
6969
=== modified file 'tribes/barbarians/lime_kiln/conf'
--- tribes/barbarians/lime_kiln/conf 2009-01-25 19:40:02 +0000
+++ tribes/barbarians/lime_kiln/conf 2010-04-09 03:59:17 +0000
@@ -26,8 +26,8 @@
2626
27[idle]27[idle]
28pics=stonegrinder_i_??.png # ???28pics=stonegrinder_i_??.png # ???
29hotspot=43 5029hotspot=47 52
3030
31[working]31[working]
32pics=stonegrinder_i_??.png # ???32pics=stonegrinder_i_??.png # ???
33hotspot=43 5033hotspot=47 52
3434
=== modified file 'tribes/barbarians/metalworks/conf'
--- tribes/barbarians/metalworks/conf 2010-01-01 12:32:23 +0000
+++ tribes/barbarians/metalworks/conf 2010-04-09 03:59:17 +0000
@@ -137,8 +137,8 @@
137137
138[idle]138[idle]
139pics=metalworks_i_??.png139pics=metalworks_i_??.png
140hotspot=40 54140hotspot=37 51
141141
142[working]142[working]
143pics=metalworks_i_??.png143pics=metalworks_i_??.png
144hotspot=40 54144hotspot=37 51
145145
=== modified file 'tribes/barbarians/quarry/conf'
--- tribes/barbarians/quarry/conf 2009-12-31 18:15:29 +0000
+++ tribes/barbarians/quarry/conf 2010-04-09 03:59:17 +0000
@@ -1,27 +1,27 @@
1size=small1size=small
2output=raw_stone2output=raw_stone
33
4[buildcost]4[buildcost]
5trunk=45trunk=4
66
7[working positions]7[working positions]
8stonemason=18stonemason=1
99
10[aihints]10[aihints]
11is_basic=true11is_basic=true
12stoneproducer=true12stoneproducer=true
1313
14[programs]14[programs]
15work=_Work15work=_Work
1616
17[work]17[work]
18sleep=2500018sleep=25000
19worker=cut19worker=cut
2020
21[idle]21[idle]
22pics=b_quarry_i_??.png # ???22pics=b_quarry_i_??.png # ???
23hotspot=47 4523hotspot=47 45
2424
25[build]25[build]
26pics=b_quarry_b_??.png # ???26pics=b_quarry_b_??.png # ???
27hotspot=48 4327hotspot=41 36
2828
=== modified file 'tribes/barbarians/rangers_hut/b_ranger_b_00.png'
29Binary 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 differ29Binary 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
=== modified file 'tribes/barbarians/rangers_hut/b_ranger_b_01.png'
30Binary 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 differ30Binary 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
=== modified file 'tribes/barbarians/rangers_hut/b_ranger_i_00.png'
31Binary 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 differ31Binary 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
=== modified file 'tribes/barbarians/rangers_hut/conf'
--- tribes/barbarians/rangers_hut/conf 2009-05-02 14:09:26 +0000
+++ tribes/barbarians/rangers_hut/conf 2010-04-09 03:59:17 +0000
@@ -18,7 +18,7 @@
1818
19[idle]19[idle]
20pics=b_ranger_i_??.png # ???20pics=b_ranger_i_??.png # ???
21hotspot=45 4421hotspot=43 43
2222
23[build]23[build]
24pics=b_ranger_b_??.png # ???24pics=b_ranger_b_??.png # ???
2525
=== modified file 'tribes/barbarians/smelting_works/conf'
--- tribes/barbarians/smelting_works/conf 2009-12-31 18:15:29 +0000
+++ tribes/barbarians/smelting_works/conf 2010-04-09 03:59:17 +0000
@@ -47,8 +47,8 @@
4747
48[idle]48[idle]
49pics=smelting_works_i_??.png # ???49pics=smelting_works_i_??.png # ???
50hotspot=50 5350hotspot=44 58
5151
52[working]52[working]
53pics=smelting_works_i_??.png # ???53pics=smelting_works_i_??.png # ???
54hotspot=50 5354hotspot=44 58
5555
=== modified file 'tribes/barbarians/stronghold/conf'
--- tribes/barbarians/stronghold/conf 2009-01-25 19:40:02 +0000
+++ tribes/barbarians/stronghold/conf 2010-04-09 03:59:17 +0000
@@ -12,8 +12,8 @@
1212
13[idle]13[idle]
14pics=stronghold_i_??.png14pics=stronghold_i_??.png
15hotspot=46 5215hotspot=50 59
1616
17[build]17[build]
18pics=stronghold_b_??.png18pics=stronghold_b_??.png
19hotspot=46 5219hotspot=50 59
2020
=== modified file 'tribes/barbarians/trainingscamp/conf'
--- tribes/barbarians/trainingscamp/conf 2009-03-09 10:12:41 +0000
+++ tribes/barbarians/trainingscamp/conf 2010-04-09 03:59:17 +0000
@@ -168,4 +168,4 @@
168168
169[idle]169[idle]
170pics=trainingscamp_i_??.png # ???170pics=trainingscamp_i_??.png # ???
171hotspot=77 76171hotspot=89 85
172\ No newline at end of file172\ No newline at end of file
173173
=== modified file 'tribes/barbarians/warehouse/conf'
--- tribes/barbarians/warehouse/conf 2009-05-12 07:54:58 +0000
+++ tribes/barbarians/warehouse/conf 2010-04-09 03:59:17 +0000
@@ -9,8 +9,8 @@
99
10[idle]10[idle]
11pics=warehouse_i_??.png # ???11pics=warehouse_i_??.png # ???
12hotspot=56 7712hotspot=58 75
1313
14[build]14[build]
15pics=warehouse_b_??.png # ???15pics=warehouse_b_??.png # ???
16hotspot=56 7216hotspot=58 70
1717
=== modified file 'tribes/barbarians/warehouse/warehouse_b_00.png'
18Binary 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 differ18Binary 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
=== modified file 'tribes/barbarians/warehouse/warehouse_i_00.png'
19Binary 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 differ19Binary 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
=== modified file 'tribes/barbarians/warmill/conf'
--- tribes/barbarians/warmill/conf 2009-12-15 16:36:12 +0000
+++ tribes/barbarians/warmill/conf 2010-04-09 03:59:17 +0000
@@ -103,8 +103,8 @@
103103
104[idle]104[idle]
105pics=i_??.png # ???105pics=i_??.png # ???
106hotspot=39 60106hotspot=38 54
107107
108[working]108[working]
109pics=i_??.png # ???109pics=i_??.png # ???
110hotspot=39 60110hotspot=38 54
111111
=== modified file 'tribes/barbarians/weaving-mill/conf'
--- tribes/barbarians/weaving-mill/conf 2009-12-15 16:36:12 +0000
+++ tribes/barbarians/weaving-mill/conf 2010-04-09 03:59:17 +0000
@@ -26,12 +26,12 @@
2626
27[idle]27[idle]
28pics=i_??.png28pics=i_??.png
29hotspot=36 7829hotspot=33 76
3030
31[build]31[build]
32pics=b_??.png32pics=b_??.png
33hotspot=36 7833hotspot=33 76
3434
35[working]35[working]
36pics=w_??.png36pics=w_??.png
37hotspot=36 7837hotspot=33 76

Subscribers

People subscribed via source and target branches

to status/vote changes: