← Back to team overview

widelands-dev team mailing list archive

[Merge] lp:~chuckw20/widelands/barb_tavern_inns into lp:widelands

 

Chuck Wilder has proposed merging lp:~chuckw20/widelands/barb_tavern_inns into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #677337 in widelands: "Buildings missing 3D models"
  https://bugs.launchpad.net/widelands/+bug/677337

For more details, see:
https://code.launchpad.net/~chuckw20/widelands/barb_tavern_inns/+merge/248050

New Blender 3D models have been created for the barbarian tavern, inn and big_inn buildings in response to Bug report #677337.

The new models bring build and working animation as well as player color to these buildings.
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~chuckw20/widelands/barb_tavern_inns into lp:widelands.
=== added file 'tribes/barbarians/big_inn/big_inn_b_00.png'
Binary files tribes/barbarians/big_inn/big_inn_b_00.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/big_inn/big_inn_b_00.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/big_inn/big_inn_b_00_pc.png'
Binary files tribes/barbarians/big_inn/big_inn_b_00_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/big_inn/big_inn_b_00_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/big_inn/big_inn_b_01.png'
Binary files tribes/barbarians/big_inn/big_inn_b_01.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/big_inn/big_inn_b_01.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/big_inn/big_inn_b_01_pc.png'
Binary files tribes/barbarians/big_inn/big_inn_b_01_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/big_inn/big_inn_b_01_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/big_inn/big_inn_b_02.png'
Binary files tribes/barbarians/big_inn/big_inn_b_02.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/big_inn/big_inn_b_02.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/big_inn/big_inn_b_02_pc.png'
Binary files tribes/barbarians/big_inn/big_inn_b_02_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/big_inn/big_inn_b_02_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/big_inn/big_inn_b_03.png'
Binary files tribes/barbarians/big_inn/big_inn_b_03.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/big_inn/big_inn_b_03.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/big_inn/big_inn_b_03_pc.png'
Binary files tribes/barbarians/big_inn/big_inn_b_03_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/big_inn/big_inn_b_03_pc.png	2015-01-29 20:38:38 +0000 differ
=== modified file 'tribes/barbarians/big_inn/big_inn_i_00.png'
Binary files tribes/barbarians/big_inn/big_inn_i_00.png	2013-08-05 03:26:31 +0000 and tribes/barbarians/big_inn/big_inn_i_00.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/big_inn/big_inn_i_00_pc.png'
Binary files tribes/barbarians/big_inn/big_inn_i_00_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/big_inn/big_inn_i_00_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/big_inn/big_inn_w_00.png'
Binary files tribes/barbarians/big_inn/big_inn_w_00.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/big_inn/big_inn_w_00.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/big_inn/big_inn_w_00_pc.png'
Binary files tribes/barbarians/big_inn/big_inn_w_00_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/big_inn/big_inn_w_00_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/big_inn/big_inn_w_01.png'
Binary files tribes/barbarians/big_inn/big_inn_w_01.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/big_inn/big_inn_w_01.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/big_inn/big_inn_w_01_pc.png'
Binary files tribes/barbarians/big_inn/big_inn_w_01_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/big_inn/big_inn_w_01_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/big_inn/big_inn_w_02.png'
Binary files tribes/barbarians/big_inn/big_inn_w_02.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/big_inn/big_inn_w_02.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/big_inn/big_inn_w_02_pc.png'
Binary files tribes/barbarians/big_inn/big_inn_w_02_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/big_inn/big_inn_w_02_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/big_inn/big_inn_w_03.png'
Binary files tribes/barbarians/big_inn/big_inn_w_03.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/big_inn/big_inn_w_03.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/big_inn/big_inn_w_03_pc.png'
Binary files tribes/barbarians/big_inn/big_inn_w_03_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/big_inn/big_inn_w_03_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/big_inn/big_inn_w_04.png'
Binary files tribes/barbarians/big_inn/big_inn_w_04.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/big_inn/big_inn_w_04.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/big_inn/big_inn_w_04_pc.png'
Binary files tribes/barbarians/big_inn/big_inn_w_04_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/big_inn/big_inn_w_04_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/big_inn/big_inn_w_05.png'
Binary files tribes/barbarians/big_inn/big_inn_w_05.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/big_inn/big_inn_w_05.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/big_inn/big_inn_w_05_pc.png'
Binary files tribes/barbarians/big_inn/big_inn_w_05_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/big_inn/big_inn_w_05_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/big_inn/big_inn_w_06.png'
Binary files tribes/barbarians/big_inn/big_inn_w_06.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/big_inn/big_inn_w_06.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/big_inn/big_inn_w_06_pc.png'
Binary files tribes/barbarians/big_inn/big_inn_w_06_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/big_inn/big_inn_w_06_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/big_inn/big_inn_w_07.png'
Binary files tribes/barbarians/big_inn/big_inn_w_07.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/big_inn/big_inn_w_07.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/big_inn/big_inn_w_07_pc.png'
Binary files tribes/barbarians/big_inn/big_inn_w_07_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/big_inn/big_inn_w_07_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/big_inn/big_inn_w_08.png'
Binary files tribes/barbarians/big_inn/big_inn_w_08.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/big_inn/big_inn_w_08.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/big_inn/big_inn_w_08_pc.png'
Binary files tribes/barbarians/big_inn/big_inn_w_08_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/big_inn/big_inn_w_08_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/big_inn/big_inn_w_09.png'
Binary files tribes/barbarians/big_inn/big_inn_w_09.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/big_inn/big_inn_w_09.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/big_inn/big_inn_w_09_pc.png'
Binary files tribes/barbarians/big_inn/big_inn_w_09_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/big_inn/big_inn_w_09_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/big_inn/big_inn_w_10.png'
Binary files tribes/barbarians/big_inn/big_inn_w_10.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/big_inn/big_inn_w_10.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/big_inn/big_inn_w_10_pc.png'
Binary files tribes/barbarians/big_inn/big_inn_w_10_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/big_inn/big_inn_w_10_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/big_inn/big_inn_w_11.png'
Binary files tribes/barbarians/big_inn/big_inn_w_11.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/big_inn/big_inn_w_11.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/big_inn/big_inn_w_11_pc.png'
Binary files tribes/barbarians/big_inn/big_inn_w_11_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/big_inn/big_inn_w_11_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/big_inn/big_inn_w_12.png'
Binary files tribes/barbarians/big_inn/big_inn_w_12.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/big_inn/big_inn_w_12.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/big_inn/big_inn_w_12_pc.png'
Binary files tribes/barbarians/big_inn/big_inn_w_12_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/big_inn/big_inn_w_12_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/big_inn/big_inn_w_13.png'
Binary files tribes/barbarians/big_inn/big_inn_w_13.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/big_inn/big_inn_w_13.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/big_inn/big_inn_w_13_pc.png'
Binary files tribes/barbarians/big_inn/big_inn_w_13_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/big_inn/big_inn_w_13_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/big_inn/big_inn_w_14.png'
Binary files tribes/barbarians/big_inn/big_inn_w_14.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/big_inn/big_inn_w_14.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/big_inn/big_inn_w_14_pc.png'
Binary files tribes/barbarians/big_inn/big_inn_w_14_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/big_inn/big_inn_w_14_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/big_inn/big_inn_w_15.png'
Binary files tribes/barbarians/big_inn/big_inn_w_15.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/big_inn/big_inn_w_15.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/big_inn/big_inn_w_15_pc.png'
Binary files tribes/barbarians/big_inn/big_inn_w_15_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/big_inn/big_inn_w_15_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/big_inn/big_inn_w_16.png'
Binary files tribes/barbarians/big_inn/big_inn_w_16.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/big_inn/big_inn_w_16.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/big_inn/big_inn_w_16_pc.png'
Binary files tribes/barbarians/big_inn/big_inn_w_16_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/big_inn/big_inn_w_16_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/big_inn/big_inn_w_17.png'
Binary files tribes/barbarians/big_inn/big_inn_w_17.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/big_inn/big_inn_w_17.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/big_inn/big_inn_w_17_pc.png'
Binary files tribes/barbarians/big_inn/big_inn_w_17_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/big_inn/big_inn_w_17_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/big_inn/big_inn_w_18.png'
Binary files tribes/barbarians/big_inn/big_inn_w_18.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/big_inn/big_inn_w_18.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/big_inn/big_inn_w_18_pc.png'
Binary files tribes/barbarians/big_inn/big_inn_w_18_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/big_inn/big_inn_w_18_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/big_inn/big_inn_w_19.png'
Binary files tribes/barbarians/big_inn/big_inn_w_19.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/big_inn/big_inn_w_19.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/big_inn/big_inn_w_19_pc.png'
Binary files tribes/barbarians/big_inn/big_inn_w_19_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/big_inn/big_inn_w_19_pc.png	2015-01-29 20:38:38 +0000 differ
=== modified file 'tribes/barbarians/big_inn/conf'
--- tribes/barbarians/big_inn/conf	2014-07-27 19:32:24 +0000
+++ tribes/barbarians/big_inn/conf	2015-01-29 20:38:38 +0000
@@ -35,20 +35,23 @@
 
 [produce_ration]
 return=skipped unless economy needs ration
-sleep=33000
+sleep=14000
 consume=fish,pittabread,meat
+animate=working 19000
 produce=ration
 
 [produce_snack]
 return=skipped unless economy needs snack
-sleep=35000
+sleep=15000
 consume=pittabread fish,meat beer
+animate=working 20000
 produce=snack
 
 [produce_meal]
 return=skipped unless economy needs meal
-sleep=37000
+sleep=17000
 consume=pittabread fish,meat strongbeer
+animate=working 20000
 produce=meal
 
 [work]
@@ -59,4 +62,12 @@
 
 [idle]
 pics=big_inn_i_??.png  # ???
-hotspot=53 62
+hotspot=57 88
+
+[build]
+pics=big_inn_b_??.png  # ???
+hotspot=57 88
+
+[working]
+pics=big_inn_w_??.png  # ???
+hotspot=57 88

=== modified file 'tribes/barbarians/big_inn/menu.png'
Binary files tribes/barbarians/big_inn/menu.png	2008-11-24 17:43:38 +0000 and tribes/barbarians/big_inn/menu.png	2015-01-29 20:38:38 +0000 differ
=== modified file 'tribes/barbarians/inn/conf'
--- tribes/barbarians/inn/conf	2014-07-27 19:32:24 +0000
+++ tribes/barbarians/inn/conf	2015-01-29 20:38:38 +0000
@@ -52,8 +52,12 @@
 
 [idle]
 pics=inn_i_??.png  # ???
-hotspot=48 59
+hotspot=57 88
+
+[build]
+pics=inn_b_??.png  # ???
+hotspot=57 88
 
 [working]
-pics=inn_i_??.png  # ???
-hotspot=48 59
+pics=inn_w_??.png  # ???
+hotspot=57 88

=== added file 'tribes/barbarians/inn/inn_b_00.png'
Binary files tribes/barbarians/inn/inn_b_00.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/inn/inn_b_00.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/inn/inn_b_00_pc.png'
Binary files tribes/barbarians/inn/inn_b_00_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/inn/inn_b_00_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/inn/inn_b_01.png'
Binary files tribes/barbarians/inn/inn_b_01.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/inn/inn_b_01.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/inn/inn_b_01_pc.png'
Binary files tribes/barbarians/inn/inn_b_01_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/inn/inn_b_01_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/inn/inn_b_02.png'
Binary files tribes/barbarians/inn/inn_b_02.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/inn/inn_b_02.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/inn/inn_b_02_pc.png'
Binary files tribes/barbarians/inn/inn_b_02_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/inn/inn_b_02_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/inn/inn_b_03.png'
Binary files tribes/barbarians/inn/inn_b_03.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/inn/inn_b_03.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/inn/inn_b_03_pc.png'
Binary files tribes/barbarians/inn/inn_b_03_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/inn/inn_b_03_pc.png	2015-01-29 20:38:38 +0000 differ
=== modified file 'tribes/barbarians/inn/inn_i_00.png'
Binary files tribes/barbarians/inn/inn_i_00.png	2013-08-05 03:26:31 +0000 and tribes/barbarians/inn/inn_i_00.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/inn/inn_i_00_pc.png'
Binary files tribes/barbarians/inn/inn_i_00_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/inn/inn_i_00_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/inn/inn_w_00.png'
Binary files tribes/barbarians/inn/inn_w_00.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/inn/inn_w_00.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/inn/inn_w_00_pc.png'
Binary files tribes/barbarians/inn/inn_w_00_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/inn/inn_w_00_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/inn/inn_w_01.png'
Binary files tribes/barbarians/inn/inn_w_01.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/inn/inn_w_01.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/inn/inn_w_01_pc.png'
Binary files tribes/barbarians/inn/inn_w_01_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/inn/inn_w_01_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/inn/inn_w_02.png'
Binary files tribes/barbarians/inn/inn_w_02.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/inn/inn_w_02.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/inn/inn_w_02_pc.png'
Binary files tribes/barbarians/inn/inn_w_02_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/inn/inn_w_02_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/inn/inn_w_03.png'
Binary files tribes/barbarians/inn/inn_w_03.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/inn/inn_w_03.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/inn/inn_w_03_pc.png'
Binary files tribes/barbarians/inn/inn_w_03_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/inn/inn_w_03_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/inn/inn_w_04.png'
Binary files tribes/barbarians/inn/inn_w_04.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/inn/inn_w_04.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/inn/inn_w_04_pc.png'
Binary files tribes/barbarians/inn/inn_w_04_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/inn/inn_w_04_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/inn/inn_w_05.png'
Binary files tribes/barbarians/inn/inn_w_05.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/inn/inn_w_05.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/inn/inn_w_05_pc.png'
Binary files tribes/barbarians/inn/inn_w_05_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/inn/inn_w_05_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/inn/inn_w_06.png'
Binary files tribes/barbarians/inn/inn_w_06.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/inn/inn_w_06.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/inn/inn_w_06_pc.png'
Binary files tribes/barbarians/inn/inn_w_06_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/inn/inn_w_06_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/inn/inn_w_07.png'
Binary files tribes/barbarians/inn/inn_w_07.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/inn/inn_w_07.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/inn/inn_w_07_pc.png'
Binary files tribes/barbarians/inn/inn_w_07_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/inn/inn_w_07_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/inn/inn_w_08.png'
Binary files tribes/barbarians/inn/inn_w_08.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/inn/inn_w_08.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/inn/inn_w_08_pc.png'
Binary files tribes/barbarians/inn/inn_w_08_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/inn/inn_w_08_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/inn/inn_w_09.png'
Binary files tribes/barbarians/inn/inn_w_09.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/inn/inn_w_09.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/inn/inn_w_09_pc.png'
Binary files tribes/barbarians/inn/inn_w_09_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/inn/inn_w_09_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/inn/inn_w_10.png'
Binary files tribes/barbarians/inn/inn_w_10.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/inn/inn_w_10.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/inn/inn_w_10_pc.png'
Binary files tribes/barbarians/inn/inn_w_10_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/inn/inn_w_10_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/inn/inn_w_11.png'
Binary files tribes/barbarians/inn/inn_w_11.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/inn/inn_w_11.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/inn/inn_w_11_pc.png'
Binary files tribes/barbarians/inn/inn_w_11_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/inn/inn_w_11_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/inn/inn_w_12.png'
Binary files tribes/barbarians/inn/inn_w_12.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/inn/inn_w_12.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/inn/inn_w_12_pc.png'
Binary files tribes/barbarians/inn/inn_w_12_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/inn/inn_w_12_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/inn/inn_w_13.png'
Binary files tribes/barbarians/inn/inn_w_13.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/inn/inn_w_13.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/inn/inn_w_13_pc.png'
Binary files tribes/barbarians/inn/inn_w_13_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/inn/inn_w_13_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/inn/inn_w_14.png'
Binary files tribes/barbarians/inn/inn_w_14.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/inn/inn_w_14.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/inn/inn_w_14_pc.png'
Binary files tribes/barbarians/inn/inn_w_14_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/inn/inn_w_14_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/inn/inn_w_15.png'
Binary files tribes/barbarians/inn/inn_w_15.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/inn/inn_w_15.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/inn/inn_w_15_pc.png'
Binary files tribes/barbarians/inn/inn_w_15_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/inn/inn_w_15_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/inn/inn_w_16.png'
Binary files tribes/barbarians/inn/inn_w_16.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/inn/inn_w_16.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/inn/inn_w_16_pc.png'
Binary files tribes/barbarians/inn/inn_w_16_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/inn/inn_w_16_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/inn/inn_w_17.png'
Binary files tribes/barbarians/inn/inn_w_17.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/inn/inn_w_17.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/inn/inn_w_17_pc.png'
Binary files tribes/barbarians/inn/inn_w_17_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/inn/inn_w_17_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/inn/inn_w_18.png'
Binary files tribes/barbarians/inn/inn_w_18.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/inn/inn_w_18.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/inn/inn_w_18_pc.png'
Binary files tribes/barbarians/inn/inn_w_18_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/inn/inn_w_18_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/inn/inn_w_19.png'
Binary files tribes/barbarians/inn/inn_w_19.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/inn/inn_w_19.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/inn/inn_w_19_pc.png'
Binary files tribes/barbarians/inn/inn_w_19_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/inn/inn_w_19_pc.png	2015-01-29 20:38:38 +0000 differ
=== modified file 'tribes/barbarians/inn/menu.png'
Binary files tribes/barbarians/inn/menu.png	2008-11-24 17:43:38 +0000 and tribes/barbarians/inn/menu.png	2015-01-29 20:38:38 +0000 differ
=== modified file 'tribes/barbarians/tavern/conf'
--- tribes/barbarians/tavern/conf	2014-08-02 19:55:23 +0000
+++ tribes/barbarians/tavern/conf	2015-01-29 20:38:38 +0000
@@ -37,8 +37,12 @@
 
 [idle]
 pics=tavern_i_??.png  # ???
-hotspot=32 56
+hotspot=57 88
+
+[build]
+pics=tavern_b_??.png  # ???
+hotspot=57 88
 
 [working]
-pics=tavern_i_??.png  # ???
-hotspot=32 56
+pics=tavern_w_??.png  # ???
+hotspot=57 88

=== modified file 'tribes/barbarians/tavern/menu.png'
Binary files tribes/barbarians/tavern/menu.png	2008-11-24 17:43:38 +0000 and tribes/barbarians/tavern/menu.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/tavern/tavern_b_00.png'
Binary files tribes/barbarians/tavern/tavern_b_00.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/tavern/tavern_b_00.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/tavern/tavern_b_00_pc.png'
Binary files tribes/barbarians/tavern/tavern_b_00_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/tavern/tavern_b_00_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/tavern/tavern_b_01.png'
Binary files tribes/barbarians/tavern/tavern_b_01.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/tavern/tavern_b_01.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/tavern/tavern_b_01_pc.png'
Binary files tribes/barbarians/tavern/tavern_b_01_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/tavern/tavern_b_01_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/tavern/tavern_b_02.png'
Binary files tribes/barbarians/tavern/tavern_b_02.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/tavern/tavern_b_02.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/tavern/tavern_b_02_pc.png'
Binary files tribes/barbarians/tavern/tavern_b_02_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/tavern/tavern_b_02_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/tavern/tavern_b_03.png'
Binary files tribes/barbarians/tavern/tavern_b_03.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/tavern/tavern_b_03.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/tavern/tavern_b_03_pc.png'
Binary files tribes/barbarians/tavern/tavern_b_03_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/tavern/tavern_b_03_pc.png	2015-01-29 20:38:38 +0000 differ
=== modified file 'tribes/barbarians/tavern/tavern_i_00.png'
Binary files tribes/barbarians/tavern/tavern_i_00.png	2013-08-05 03:26:31 +0000 and tribes/barbarians/tavern/tavern_i_00.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/tavern/tavern_i_00_pc.png'
Binary files tribes/barbarians/tavern/tavern_i_00_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/tavern/tavern_i_00_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/tavern/tavern_w_00.png'
Binary files tribes/barbarians/tavern/tavern_w_00.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/tavern/tavern_w_00.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/tavern/tavern_w_00_pc.png'
Binary files tribes/barbarians/tavern/tavern_w_00_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/tavern/tavern_w_00_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/tavern/tavern_w_01.png'
Binary files tribes/barbarians/tavern/tavern_w_01.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/tavern/tavern_w_01.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/tavern/tavern_w_01_pc.png'
Binary files tribes/barbarians/tavern/tavern_w_01_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/tavern/tavern_w_01_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/tavern/tavern_w_02.png'
Binary files tribes/barbarians/tavern/tavern_w_02.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/tavern/tavern_w_02.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/tavern/tavern_w_02_pc.png'
Binary files tribes/barbarians/tavern/tavern_w_02_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/tavern/tavern_w_02_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/tavern/tavern_w_03.png'
Binary files tribes/barbarians/tavern/tavern_w_03.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/tavern/tavern_w_03.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/tavern/tavern_w_03_pc.png'
Binary files tribes/barbarians/tavern/tavern_w_03_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/tavern/tavern_w_03_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/tavern/tavern_w_04.png'
Binary files tribes/barbarians/tavern/tavern_w_04.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/tavern/tavern_w_04.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/tavern/tavern_w_04_pc.png'
Binary files tribes/barbarians/tavern/tavern_w_04_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/tavern/tavern_w_04_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/tavern/tavern_w_05.png'
Binary files tribes/barbarians/tavern/tavern_w_05.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/tavern/tavern_w_05.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/tavern/tavern_w_05_pc.png'
Binary files tribes/barbarians/tavern/tavern_w_05_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/tavern/tavern_w_05_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/tavern/tavern_w_06.png'
Binary files tribes/barbarians/tavern/tavern_w_06.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/tavern/tavern_w_06.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/tavern/tavern_w_06_pc.png'
Binary files tribes/barbarians/tavern/tavern_w_06_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/tavern/tavern_w_06_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/tavern/tavern_w_07.png'
Binary files tribes/barbarians/tavern/tavern_w_07.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/tavern/tavern_w_07.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/tavern/tavern_w_07_pc.png'
Binary files tribes/barbarians/tavern/tavern_w_07_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/tavern/tavern_w_07_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/tavern/tavern_w_08.png'
Binary files tribes/barbarians/tavern/tavern_w_08.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/tavern/tavern_w_08.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/tavern/tavern_w_08_pc.png'
Binary files tribes/barbarians/tavern/tavern_w_08_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/tavern/tavern_w_08_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/tavern/tavern_w_09.png'
Binary files tribes/barbarians/tavern/tavern_w_09.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/tavern/tavern_w_09.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/tavern/tavern_w_09_pc.png'
Binary files tribes/barbarians/tavern/tavern_w_09_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/tavern/tavern_w_09_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/tavern/tavern_w_10.png'
Binary files tribes/barbarians/tavern/tavern_w_10.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/tavern/tavern_w_10.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/tavern/tavern_w_10_pc.png'
Binary files tribes/barbarians/tavern/tavern_w_10_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/tavern/tavern_w_10_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/tavern/tavern_w_11.png'
Binary files tribes/barbarians/tavern/tavern_w_11.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/tavern/tavern_w_11.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/tavern/tavern_w_11_pc.png'
Binary files tribes/barbarians/tavern/tavern_w_11_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/tavern/tavern_w_11_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/tavern/tavern_w_12.png'
Binary files tribes/barbarians/tavern/tavern_w_12.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/tavern/tavern_w_12.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/tavern/tavern_w_12_pc.png'
Binary files tribes/barbarians/tavern/tavern_w_12_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/tavern/tavern_w_12_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/tavern/tavern_w_13.png'
Binary files tribes/barbarians/tavern/tavern_w_13.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/tavern/tavern_w_13.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/tavern/tavern_w_13_pc.png'
Binary files tribes/barbarians/tavern/tavern_w_13_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/tavern/tavern_w_13_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/tavern/tavern_w_14.png'
Binary files tribes/barbarians/tavern/tavern_w_14.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/tavern/tavern_w_14.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/tavern/tavern_w_14_pc.png'
Binary files tribes/barbarians/tavern/tavern_w_14_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/tavern/tavern_w_14_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/tavern/tavern_w_15.png'
Binary files tribes/barbarians/tavern/tavern_w_15.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/tavern/tavern_w_15.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/tavern/tavern_w_15_pc.png'
Binary files tribes/barbarians/tavern/tavern_w_15_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/tavern/tavern_w_15_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/tavern/tavern_w_16.png'
Binary files tribes/barbarians/tavern/tavern_w_16.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/tavern/tavern_w_16.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/tavern/tavern_w_16_pc.png'
Binary files tribes/barbarians/tavern/tavern_w_16_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/tavern/tavern_w_16_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/tavern/tavern_w_17.png'
Binary files tribes/barbarians/tavern/tavern_w_17.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/tavern/tavern_w_17.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/tavern/tavern_w_17_pc.png'
Binary files tribes/barbarians/tavern/tavern_w_17_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/tavern/tavern_w_17_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/tavern/tavern_w_18.png'
Binary files tribes/barbarians/tavern/tavern_w_18.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/tavern/tavern_w_18.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/tavern/tavern_w_18_pc.png'
Binary files tribes/barbarians/tavern/tavern_w_18_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/tavern/tavern_w_18_pc.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/tavern/tavern_w_19.png'
Binary files tribes/barbarians/tavern/tavern_w_19.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/tavern/tavern_w_19.png	2015-01-29 20:38:38 +0000 differ
=== added file 'tribes/barbarians/tavern/tavern_w_19_pc.png'
Binary files tribes/barbarians/tavern/tavern_w_19_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/tavern/tavern_w_19_pc.png	2015-01-29 20:38:38 +0000 differ