- more buildings consolidated and some touched up. The one thing to

note here is that the palace I dropped from 160 to 128 width as *most*
maps were showing this anyway.  The only weirdness is pupland terminal
which I will fix up (pupland and butakis maps with palace were messed up
anyway and referenced each part of the arch, not the arch itself).
- added a new barn while fixing up the old barn.


git-svn-id: svn+ssh://svn.code.sf.net/p/crossfire/code/trunk/arch@2263 282e977c-c81d-0410-88c4-b93c2d0d6712

construct/Palace/palace.arc

@@ -1,6 +1,6 @@
 Object palace
 type 66
-face palace.111
+face palace.x11
 no_pick 1
 editable 2
 visibility 100
@@ -9,7 +9,7 @@ end
 More
 Object palace_2
 type 66
-face palace.211
+face palace.x11
 x 1
 no_pick 1
 visibility 100
@@ -18,7 +18,7 @@ end
 More
 Object palace_3
 type 66
-face palace.311
+face palace.x11
 x 2
 no_pick 1
 visibility 100
@@ -27,7 +27,7 @@ end
 More
 Object palace_4
 type 66
-face palace.411
+face palace.x11
 x 3
 no_pick 1
 visibility 100
@@ -36,8 +36,8 @@ end
 More
 Object palace_5
 type 66
-face palace.511
-x 4
+face palace.x11
+y 1
 no_pick 1
 visibility 100
 magicmap white
@@ -45,7 +45,8 @@ end
 More
 Object palace_6
 type 66
-face palace.611
+face palace.x11
+x 1
 y 1
 no_pick 1
 visibility 100
@@ -54,8 +55,8 @@ end
 More
 Object palace_7
 type 66
-face palace.711
-x 1
+face palace.x11
+x 2
 y 1
 no_pick 1
 visibility 100
@@ -64,8 +65,8 @@ end
 More
 Object palace_8
 type 66
-face palace.811
-x 2
+face palace.x11
+x 3
 y 1
 no_pick 1
 visibility 100
@@ -74,9 +75,8 @@ end
 More
 Object palace_9
 type 66
-face palace.911
-x 3
-y 1
+face palace.x11
+y 2
 no_pick 1
 visibility 100
 magicmap white
@@ -84,9 +84,9 @@ end
 More
 Object palace_10
 type 66
-face palace.A11
-x 4
-y 1
+face palace.x11
+x 1
+y 2
 no_pick 1
 visibility 100
 magicmap white
@@ -94,7 +94,8 @@ end
 More
 Object palace_11
 type 66
-face palace.B11
+face palace.x11
+x 2
 y 2
 no_pick 1
 visibility 100
@@ -103,40 +104,10 @@ end
 More
 Object palace_12
 type 66
-face palace.C11
-x 1
-y 2
-no_pick 1
-visibility 100
-magicmap white
-end
-More
-Object palace_13
-type 66
-face palace.D11
-x 2
-y 2
-no_pick 1
-visibility 100
-magicmap white
-end
-More
-Object palace_14
-type 66
-face palace.E11
+face palace.x11
 x 3
 y 2
 no_pick 1
 visibility 100
 magicmap white
 end
-More
-Object palace_15
-type 66
-face palace.F11
-x 4
-y 2
-no_pick 1
-visibility 100
-magicmap white
-end

construct/barrack/barrack_l.arc

@@ -1,7 +1,12 @@
 Object barrack_long
 name barrack
 type 66
-face barrack_l.111
+face barrack_l.x11
+anim
+barrack_l.x11
+barrack_l.x12
+mina
+speed -0.1
 color_fg brown
 no_pick 1
 editable 2
@@ -11,7 +16,12 @@ More
 Object barrack_long_2
 name barrack
 type 66
-face barrack_l.211
+face barrack_l.x11
+anim
+barrack_l.x11
+barrack_l.x12
+mina
+speed -0.1
 color_fg brown
 x 1
 no_pick 1

construct/barrack/barrack_u.arc

@@ -1,7 +1,12 @@
 Object barrack_up
 name barrack
 type 66
-face barrack_u.111
+face barrack_u.x11
+anim
+barrack_u.x11
+barrack_u.x12
+mina
+speed -0.1
 color_fg brown
 no_pick 1
 editable 2
@@ -11,7 +16,12 @@ More
 Object barrack_up_2
 name barrack
 type 66
-face barrack_u.211
+face barrack_u.x11
+anim
+barrack_u.x11
+barrack_u.x12
+mina
+speed -0.1
 color_fg brown
 y 1
 no_pick 1

construct/town/a_civic.arc

@@ -1,6 +1,6 @@
 Object a_civic
 name civic building
-face a_civic.111
+face a_civic.x11
 type 66
 no_pick 1
 no_pass 1
@@ -9,7 +9,7 @@ end
 More
 Object a_civic_2
 name civic building
-face a_civic.211
+face a_civic.x11
 type 66
 no_pick 1
 no_pass 1
@@ -18,7 +18,7 @@ end
 More
 Object a_civic_3
 name civic building
-face a_civic.311
+face a_civic.x11
 type 66
 no_pick 1
 visibility 100
@@ -27,7 +27,7 @@ end
 More
 Object a_civic_4
 name civic building
-face a_civic.411
+face a_civic.x11
 type 66
 no_pick 1
 visibility 100
@@ -36,7 +36,7 @@ end
 More
 Object a_civic_5
 name civic building
-face a_civic.511
+face a_civic.x11
 type 66
 no_pick 1
 visibility 100
@@ -46,7 +46,7 @@ end
 More
 Object a_civic_6
 name civic building
-face a_civic.611
+face a_civic.x11
 type 66
 no_pick 1
 visibility 100
@@ -56,7 +56,7 @@ end
 More
 Object a_civic_7
 name civic building
-face a_civic.711
+face a_civic.x11
 type 66
 no_pick 1
 visibility 100
@@ -65,7 +65,7 @@ end
 More
 Object a_civic_8
 name civic building
-face a_civic.811
+face a_civic.x11
 type 66
 no_pick 1
 visibility 100
@@ -75,7 +75,7 @@ end
 More
 Object a_civic_9
 name civic building
-face a_civic.911
+face a_civic.x11
 type 66
 no_pick 1
 visibility 100

construct/town/barn.arc

@@ -1,6 +1,6 @@
 Object barn
 type 66
-face barn.111
+face barn.x11
 color_fg brown
 no_pick 1
 editable 2
@@ -10,7 +10,7 @@ More
 Object barn_2
 name barn
 type 66
-face barn.211
+face barn.x11
 color_fg brown
 no_pick 1
 x 1
@@ -20,7 +20,7 @@ More
 Object barn_3
 name barn
 type 66
-face barn.311
+face barn.x11
 color_fg brown
 no_pick 1
 y 1
@@ -30,7 +30,7 @@ More
 Object barn_4
 name barn
 type 66
-face barn.411
+face barn.x11
 color_fg brown
 no_pick 1
 x 1

construct/town/barn2.arc

@@ -0,0 +1,39 @@
+Object barn2
+type 66
+face barn2.x11
+color_fg brown
+no_pick 1
+editable 2
+visibility 100
+end
+More
+Object barn2_2
+name barn
+type 66
+face barn2.x11
+color_fg brown
+no_pick 1
+x 1
+visibility 100
+end
+More
+Object barn2_3
+name barn
+type 66
+face barn2.x11
+color_fg brown
+no_pick 1
+y 1
+visibility 100
+end
+More
+Object barn2_4
+name barn
+type 66
+face barn2.x11
+color_fg brown
+no_pick 1
+x 1
+y 1
+visibility 100
+end

construct/town/t_house2.arc

@@ -1,6 +1,6 @@
 Object t_house2
 name town house
-face t_house2.111
+face t_house2.x11
 type 66
 no_pick 1
 no_pass 1
@@ -9,7 +9,7 @@ end
 More
 Object t_house2_2
 name town house
-face t_house2.211
+face t_house2.x11
 type 66
 no_pick 1
 no_pass 1
@@ -18,7 +18,7 @@ end
 More
 Object t_house2_3
 name town house
-face t_house2.311
+face t_house2.x11
 type 66
 visibility 100
 no_pick 1
@@ -27,7 +27,7 @@ end
 More
 Object t_house2_4
 name town house
-face t_house2.411
+face t_house2.x11
 type 66
 no_pick 1
 visibility 100

construct/town/university.arc

@@ -1,6 +1,6 @@
 Object university
 name university
-face university.111
+face university.x11
 type 66
 no_pick 1
 editable 2
@@ -8,7 +8,7 @@ end
 More
 Object university_2
 name university
-face university.211
+face university.x11
 type 66
 no_pick 1
 x 1
@@ -16,7 +16,7 @@ end
 More
 Object university_3
 name university
-face university.311
+face university.x11
 type 66
 no_pick 1
 visibility 100
@@ -25,7 +25,7 @@ end
 More
 Object university_4
 name university
-face university.411
+face university.x11
 type 66
 no_pick 1
 visibility 100
@@ -34,7 +34,7 @@ end
 More
 Object university_5
 name university
-face university.511
+face university.x11
 type 66
 no_pick 1
 visibility 100
@@ -43,7 +43,7 @@ end
 More
 Object university_6
 name university
-face university.611
+face university.x11
 type 66
 no_pick 1
 visibility 100
@@ -52,7 +52,7 @@ end
 More
 Object university_7
 name university
-face university.711
+face university.x11
 type 66
 no_pick 1
 visibility 100
@@ -62,7 +62,7 @@ end
 More
 Object university_8
 name university
-face university.811
+face university.x11
 type 66
 no_pick 1
 visibility 100
@@ -72,7 +72,7 @@ end
 More
 Object university_9
 name university
-face university.911
+face university.x11
 type 66
 no_pick 1
 visibility 100
@@ -82,7 +82,7 @@ end
 More
 Object university_10
 name university
-face university.A11
+face university.x11
 type 66
 no_pick 1
 visibility 100
@@ -92,7 +92,7 @@ end
 More
 Object university_11
 name university
-face university.B11
+face university.x11
 type 66
 no_pick 1
 visibility 100
@@ -101,7 +101,7 @@ end
 More
 Object university_12
 name university
-face university.C11
+face university.x11
 type 66
 no_pick 1
 visibility 100
@@ -111,7 +111,7 @@ end
 More
 Object university_13
 name university
-face university.D11
+face university.x11
 type 66
 no_pick 1
 visibility 100
@@ -121,7 +121,7 @@ end
 More
 Object university_14
 name university
-face university.E11
+face university.x11
 type 66
 no_pick 1
 visibility 100
@@ -131,7 +131,7 @@ end
 More
 Object university_15
 name university
-face university.F11
+face university.x11
 type 66
 no_pick 1
 visibility 100
@@ -141,7 +141,7 @@ end
 More
 Object university_16
 name university
-face university.G11
+face university.x11
 type 66
 no_pick 1
 visibility 100
@@ -150,7 +150,7 @@ end
 More
 Object university_17
 name university
-face university.H11
+face university.x11
 type 66
 no_pick 1
 visibility 100
@@ -160,7 +160,7 @@ end
 More
 Object university_18
 name university
-face university.I11
+face university.x11
 type 66
 no_pick 1
 visibility 100
@@ -170,7 +170,7 @@ end
 More
 Object university_19
 name university
-face university.J11
+face university.x11
 type 66
 no_pick 1
 visibility 100
@@ -180,7 +180,7 @@ end
 More
 Object university_20
 name university
-face university.K11
+face university.x11
 type 66
 no_pick 1
 visibility 100