- 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
master
temitchell 2003-07-21 00:46:27 +00:00
parent b25833574f
commit 7862628d11
164 changed files with 136 additions and 106 deletions

View File

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 181 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 402 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 257 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 189 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 265 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 180 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 405 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 380 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 386 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 201 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 210 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 356 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 367 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 383 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 200 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 564 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 97 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 171 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 166 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 141 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 97 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 97 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 201 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 174 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 186 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 97 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 97 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 145 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 114 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 153 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 97 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 516 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 274 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 285 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 357 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 437 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 162 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 141 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 207 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 222 B

View File

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 378 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 280 B

View File

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 675 B

View File

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 337 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 379 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 392 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 395 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 483 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 405 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 383 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 418 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 360 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 175 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 229 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 204 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 188 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 323 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 225 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 193 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 245 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 161 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 947 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 444 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 446 B

View File

@ -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

Binary file not shown.

After

Width:  |  Height:  |  Size: 414 B

View File

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1023 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 595 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 224 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 246 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 231 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 209 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 509 B

View File

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 454 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 271 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 301 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 238 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 424 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 509 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 437 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 577 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 405 B

Some files were not shown because too many files have changed in this diff Show More