diff --git a/construct/Palace/palace.arc b/construct/Palace/palace.arc index c80d3d5d6..f71e2acdb 100644 --- a/construct/Palace/palace.arc +++ b/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 diff --git a/construct/Palace/palace.base.111.png b/construct/Palace/palace.base.111.png deleted file mode 100644 index f4bcf0d29..000000000 Binary files a/construct/Palace/palace.base.111.png and /dev/null differ diff --git a/construct/Palace/palace.base.211.png b/construct/Palace/palace.base.211.png deleted file mode 100644 index 84b75a14a..000000000 Binary files a/construct/Palace/palace.base.211.png and /dev/null differ diff --git a/construct/Palace/palace.base.311.png b/construct/Palace/palace.base.311.png deleted file mode 100644 index 6fb5e8a0a..000000000 Binary files a/construct/Palace/palace.base.311.png and /dev/null differ diff --git a/construct/Palace/palace.base.411.png b/construct/Palace/palace.base.411.png deleted file mode 100644 index 1f000492e..000000000 Binary files a/construct/Palace/palace.base.411.png and /dev/null differ diff --git a/construct/Palace/palace.base.511.png b/construct/Palace/palace.base.511.png deleted file mode 100644 index 93b990f64..000000000 Binary files a/construct/Palace/palace.base.511.png and /dev/null differ diff --git a/construct/Palace/palace.base.611.png b/construct/Palace/palace.base.611.png deleted file mode 100644 index 490c3a199..000000000 Binary files a/construct/Palace/palace.base.611.png and /dev/null differ diff --git a/construct/Palace/palace.base.711.png b/construct/Palace/palace.base.711.png deleted file mode 100644 index d181ad65c..000000000 Binary files a/construct/Palace/palace.base.711.png and /dev/null differ diff --git a/construct/Palace/palace.base.811.png b/construct/Palace/palace.base.811.png deleted file mode 100644 index 9139f8bf2..000000000 Binary files a/construct/Palace/palace.base.811.png and /dev/null differ diff --git a/construct/Palace/palace.base.911.png b/construct/Palace/palace.base.911.png deleted file mode 100644 index cb53a9a32..000000000 Binary files a/construct/Palace/palace.base.911.png and /dev/null differ diff --git a/construct/Palace/palace.base.A11.png b/construct/Palace/palace.base.A11.png deleted file mode 100644 index 809c40bb9..000000000 Binary files a/construct/Palace/palace.base.A11.png and /dev/null differ diff --git a/construct/Palace/palace.base.B11.png b/construct/Palace/palace.base.B11.png deleted file mode 100644 index 86c594bd5..000000000 Binary files a/construct/Palace/palace.base.B11.png and /dev/null differ diff --git a/construct/Palace/palace.base.C11.png b/construct/Palace/palace.base.C11.png deleted file mode 100644 index 5a17a9137..000000000 Binary files a/construct/Palace/palace.base.C11.png and /dev/null differ diff --git a/construct/Palace/palace.base.D11.png b/construct/Palace/palace.base.D11.png deleted file mode 100644 index bf7eeb333..000000000 Binary files a/construct/Palace/palace.base.D11.png and /dev/null differ diff --git a/construct/Palace/palace.base.E11.png b/construct/Palace/palace.base.E11.png deleted file mode 100644 index dd4bfde39..000000000 Binary files a/construct/Palace/palace.base.E11.png and /dev/null differ diff --git a/construct/Palace/palace.base.F11.png b/construct/Palace/palace.base.F11.png deleted file mode 100644 index 1d0713bd2..000000000 Binary files a/construct/Palace/palace.base.F11.png and /dev/null differ diff --git a/construct/Palace/palace.base.x11.png b/construct/Palace/palace.base.x11.png new file mode 100644 index 000000000..f278ca2fe Binary files /dev/null and b/construct/Palace/palace.base.x11.png differ diff --git a/construct/Palace/palace.clsc.111.png b/construct/Palace/palace.clsc.111.png deleted file mode 100644 index 1b6a23b14..000000000 Binary files a/construct/Palace/palace.clsc.111.png and /dev/null differ diff --git a/construct/Palace/palace.clsc.211.png b/construct/Palace/palace.clsc.211.png deleted file mode 100644 index 0ecca2771..000000000 Binary files a/construct/Palace/palace.clsc.211.png and /dev/null differ diff --git a/construct/Palace/palace.clsc.311.png b/construct/Palace/palace.clsc.311.png deleted file mode 100644 index 4e0471e7c..000000000 Binary files a/construct/Palace/palace.clsc.311.png and /dev/null differ diff --git a/construct/Palace/palace.clsc.411.png b/construct/Palace/palace.clsc.411.png deleted file mode 100644 index f7527b9cb..000000000 Binary files a/construct/Palace/palace.clsc.411.png and /dev/null differ diff --git a/construct/Palace/palace.clsc.511.png b/construct/Palace/palace.clsc.511.png deleted file mode 100644 index 1b6a23b14..000000000 Binary files a/construct/Palace/palace.clsc.511.png and /dev/null differ diff --git a/construct/Palace/palace.clsc.611.png b/construct/Palace/palace.clsc.611.png deleted file mode 100644 index 1b6a23b14..000000000 Binary files a/construct/Palace/palace.clsc.611.png and /dev/null differ diff --git a/construct/Palace/palace.clsc.711.png b/construct/Palace/palace.clsc.711.png deleted file mode 100644 index 6a581e1d3..000000000 Binary files a/construct/Palace/palace.clsc.711.png and /dev/null differ diff --git a/construct/Palace/palace.clsc.811.png b/construct/Palace/palace.clsc.811.png deleted file mode 100644 index 6791ac465..000000000 Binary files a/construct/Palace/palace.clsc.811.png and /dev/null differ diff --git a/construct/Palace/palace.clsc.911.png b/construct/Palace/palace.clsc.911.png deleted file mode 100644 index 2773af4cc..000000000 Binary files a/construct/Palace/palace.clsc.911.png and /dev/null differ diff --git a/construct/Palace/palace.clsc.A11.png b/construct/Palace/palace.clsc.A11.png deleted file mode 100644 index 1b6a23b14..000000000 Binary files a/construct/Palace/palace.clsc.A11.png and /dev/null differ diff --git a/construct/Palace/palace.clsc.B11.png b/construct/Palace/palace.clsc.B11.png deleted file mode 100644 index 1b6a23b14..000000000 Binary files a/construct/Palace/palace.clsc.B11.png and /dev/null differ diff --git a/construct/Palace/palace.clsc.C11.png b/construct/Palace/palace.clsc.C11.png deleted file mode 100644 index 3d601686c..000000000 Binary files a/construct/Palace/palace.clsc.C11.png and /dev/null differ diff --git a/construct/Palace/palace.clsc.D11.png b/construct/Palace/palace.clsc.D11.png deleted file mode 100644 index 107e5971c..000000000 Binary files a/construct/Palace/palace.clsc.D11.png and /dev/null differ diff --git a/construct/Palace/palace.clsc.E11.png b/construct/Palace/palace.clsc.E11.png deleted file mode 100644 index 9126f571d..000000000 Binary files a/construct/Palace/palace.clsc.E11.png and /dev/null differ diff --git a/construct/Palace/palace.clsc.F11.png b/construct/Palace/palace.clsc.F11.png deleted file mode 100644 index 1b6a23b14..000000000 Binary files a/construct/Palace/palace.clsc.F11.png and /dev/null differ diff --git a/construct/Palace/palace.clsc.x11.png b/construct/Palace/palace.clsc.x11.png new file mode 100644 index 000000000..c64489664 Binary files /dev/null and b/construct/Palace/palace.clsc.x11.png differ diff --git a/construct/barrack/barn.base.111.png b/construct/barrack/barn.base.111.png deleted file mode 100644 index 4cf06c8cf..000000000 Binary files a/construct/barrack/barn.base.111.png and /dev/null differ diff --git a/construct/barrack/barn.base.211.png b/construct/barrack/barn.base.211.png deleted file mode 100644 index 9acab8169..000000000 Binary files a/construct/barrack/barn.base.211.png and /dev/null differ diff --git a/construct/barrack/barn.base.311.png b/construct/barrack/barn.base.311.png deleted file mode 100644 index 8d20f1d5f..000000000 Binary files a/construct/barrack/barn.base.311.png and /dev/null differ diff --git a/construct/barrack/barn.base.411.png b/construct/barrack/barn.base.411.png deleted file mode 100644 index ae1be033d..000000000 Binary files a/construct/barrack/barn.base.411.png and /dev/null differ diff --git a/construct/barrack/barn.clsc.111.png b/construct/barrack/barn.clsc.111.png deleted file mode 100644 index 45bd179b1..000000000 Binary files a/construct/barrack/barn.clsc.111.png and /dev/null differ diff --git a/construct/barrack/barn.clsc.211.png b/construct/barrack/barn.clsc.211.png deleted file mode 100644 index f968f5eca..000000000 Binary files a/construct/barrack/barn.clsc.211.png and /dev/null differ diff --git a/construct/barrack/barn.clsc.311.png b/construct/barrack/barn.clsc.311.png deleted file mode 100644 index d81d5467d..000000000 Binary files a/construct/barrack/barn.clsc.311.png and /dev/null differ diff --git a/construct/barrack/barn.clsc.411.png b/construct/barrack/barn.clsc.411.png deleted file mode 100644 index 7db0aee3f..000000000 Binary files a/construct/barrack/barn.clsc.411.png and /dev/null differ diff --git a/construct/barrack/barrack_l.arc b/construct/barrack/barrack_l.arc index 32ef1a295..835fd7274 100644 --- a/construct/barrack/barrack_l.arc +++ b/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 diff --git a/construct/barrack/barrack_l.base.111.png b/construct/barrack/barrack_l.base.111.png deleted file mode 100644 index a92ec47f6..000000000 Binary files a/construct/barrack/barrack_l.base.111.png and /dev/null differ diff --git a/construct/barrack/barrack_l.base.211.png b/construct/barrack/barrack_l.base.211.png deleted file mode 100644 index ace4695dc..000000000 Binary files a/construct/barrack/barrack_l.base.211.png and /dev/null differ diff --git a/construct/barrack/barrack_u.arc b/construct/barrack/barrack_u.arc index a44f19c46..62c781561 100644 --- a/construct/barrack/barrack_u.arc +++ b/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 diff --git a/construct/barrack/barrack_u.base.111.png b/construct/barrack/barrack_u.base.111.png deleted file mode 100644 index 1edb90873..000000000 Binary files a/construct/barrack/barrack_u.base.111.png and /dev/null differ diff --git a/construct/barrack/barrack_u.base.211.png b/construct/barrack/barrack_u.base.211.png deleted file mode 100644 index fb76e27f7..000000000 Binary files a/construct/barrack/barrack_u.base.211.png and /dev/null differ diff --git a/construct/tower/out_tower.base.111.png b/construct/tower/out_tower.base.111.png deleted file mode 100644 index 2f4f3ebf9..000000000 Binary files a/construct/tower/out_tower.base.111.png and /dev/null differ diff --git a/construct/tower/out_tower.base.211.png b/construct/tower/out_tower.base.211.png deleted file mode 100644 index 33555d242..000000000 Binary files a/construct/tower/out_tower.base.211.png and /dev/null differ diff --git a/construct/tower/out_tower.base.311.png b/construct/tower/out_tower.base.311.png deleted file mode 100644 index a56798afc..000000000 Binary files a/construct/tower/out_tower.base.311.png and /dev/null differ diff --git a/construct/tower/out_tower.base.411.png b/construct/tower/out_tower.base.411.png deleted file mode 100644 index fc14776de..000000000 Binary files a/construct/tower/out_tower.base.411.png and /dev/null differ diff --git a/construct/tower/out_tower.base.x11.png b/construct/tower/out_tower.base.x11.png new file mode 100644 index 000000000..293911aea Binary files /dev/null and b/construct/tower/out_tower.base.x11.png differ diff --git a/construct/town/a_civic.arc b/construct/town/a_civic.arc index 82e26955d..83355c0a6 100644 --- a/construct/town/a_civic.arc +++ b/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 diff --git a/construct/town/a_civic.base.111.png b/construct/town/a_civic.base.111.png deleted file mode 100644 index 4bed27ad0..000000000 Binary files a/construct/town/a_civic.base.111.png and /dev/null differ diff --git a/construct/town/a_civic.base.211.png b/construct/town/a_civic.base.211.png deleted file mode 100644 index bb593c484..000000000 Binary files a/construct/town/a_civic.base.211.png and /dev/null differ diff --git a/construct/town/a_civic.base.311.png b/construct/town/a_civic.base.311.png deleted file mode 100644 index 2a9a1f61e..000000000 Binary files a/construct/town/a_civic.base.311.png and /dev/null differ diff --git a/construct/town/a_civic.base.411.png b/construct/town/a_civic.base.411.png deleted file mode 100644 index 4c9c3c27f..000000000 Binary files a/construct/town/a_civic.base.411.png and /dev/null differ diff --git a/construct/town/a_civic.base.511.png b/construct/town/a_civic.base.511.png deleted file mode 100644 index ed9c61580..000000000 Binary files a/construct/town/a_civic.base.511.png and /dev/null differ diff --git a/construct/town/a_civic.base.611.png b/construct/town/a_civic.base.611.png deleted file mode 100644 index e8b0597be..000000000 Binary files a/construct/town/a_civic.base.611.png and /dev/null differ diff --git a/construct/town/a_civic.base.711.png b/construct/town/a_civic.base.711.png deleted file mode 100644 index 88f052083..000000000 Binary files a/construct/town/a_civic.base.711.png and /dev/null differ diff --git a/construct/town/a_civic.base.811.png b/construct/town/a_civic.base.811.png deleted file mode 100644 index 37406ef37..000000000 Binary files a/construct/town/a_civic.base.811.png and /dev/null differ diff --git a/construct/town/a_civic.base.911.png b/construct/town/a_civic.base.911.png deleted file mode 100644 index 5cab3b92c..000000000 Binary files a/construct/town/a_civic.base.911.png and /dev/null differ diff --git a/construct/town/a_civic.base.x11.png b/construct/town/a_civic.base.x11.png new file mode 100644 index 000000000..cba819594 Binary files /dev/null and b/construct/town/a_civic.base.x11.png differ diff --git a/construct/town/a_civic.clsc.111.png b/construct/town/a_civic.clsc.111.png deleted file mode 100644 index 8d8046c88..000000000 Binary files a/construct/town/a_civic.clsc.111.png and /dev/null differ diff --git a/construct/town/a_civic.clsc.211.png b/construct/town/a_civic.clsc.211.png deleted file mode 100644 index 67f2be3cb..000000000 Binary files a/construct/town/a_civic.clsc.211.png and /dev/null differ diff --git a/construct/town/a_civic.clsc.311.png b/construct/town/a_civic.clsc.311.png deleted file mode 100644 index 2fb52c432..000000000 Binary files a/construct/town/a_civic.clsc.311.png and /dev/null differ diff --git a/construct/town/a_civic.clsc.411.png b/construct/town/a_civic.clsc.411.png deleted file mode 100644 index 64d1453ff..000000000 Binary files a/construct/town/a_civic.clsc.411.png and /dev/null differ diff --git a/construct/town/a_civic.clsc.511.png b/construct/town/a_civic.clsc.511.png deleted file mode 100644 index 1794e33e5..000000000 Binary files a/construct/town/a_civic.clsc.511.png and /dev/null differ diff --git a/construct/town/a_civic.clsc.611.png b/construct/town/a_civic.clsc.611.png deleted file mode 100644 index 5f06e7da4..000000000 Binary files a/construct/town/a_civic.clsc.611.png and /dev/null differ diff --git a/construct/town/a_civic.clsc.711.png b/construct/town/a_civic.clsc.711.png deleted file mode 100644 index ee6df0637..000000000 Binary files a/construct/town/a_civic.clsc.711.png and /dev/null differ diff --git a/construct/town/a_civic.clsc.811.png b/construct/town/a_civic.clsc.811.png deleted file mode 100644 index 0b58da66f..000000000 Binary files a/construct/town/a_civic.clsc.811.png and /dev/null differ diff --git a/construct/town/a_civic.clsc.911.png b/construct/town/a_civic.clsc.911.png deleted file mode 100644 index 7216ae658..000000000 Binary files a/construct/town/a_civic.clsc.911.png and /dev/null differ diff --git a/construct/town/a_civic.clsc.x11.png b/construct/town/a_civic.clsc.x11.png new file mode 100644 index 000000000..1694d24c8 Binary files /dev/null and b/construct/town/a_civic.clsc.x11.png differ diff --git a/construct/town/a_civic2.base.x11.png b/construct/town/a_civic2.base.x11.png new file mode 100644 index 000000000..2c3af9158 Binary files /dev/null and b/construct/town/a_civic2.base.x11.png differ diff --git a/construct/barrack/barn.arc b/construct/town/barn.arc similarity index 85% rename from construct/barrack/barn.arc rename to construct/town/barn.arc index 9622a5df7..223c29e9b 100644 --- a/construct/barrack/barn.arc +++ b/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 diff --git a/construct/town/barn.base.x11.png b/construct/town/barn.base.x11.png new file mode 100644 index 000000000..90e2fe484 Binary files /dev/null and b/construct/town/barn.base.x11.png differ diff --git a/construct/town/barn.clsc.x11.png b/construct/town/barn.clsc.x11.png new file mode 100644 index 000000000..f5dd3362d Binary files /dev/null and b/construct/town/barn.clsc.x11.png differ diff --git a/construct/town/barn2.arc b/construct/town/barn2.arc new file mode 100644 index 000000000..82df91406 --- /dev/null +++ b/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 diff --git a/construct/town/barn2.base.x11.png b/construct/town/barn2.base.x11.png new file mode 100644 index 000000000..3c1f0d939 Binary files /dev/null and b/construct/town/barn2.base.x11.png differ diff --git a/construct/town/t_house2.arc b/construct/town/t_house2.arc index 9724a036a..8d215bc4c 100644 --- a/construct/town/t_house2.arc +++ b/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 diff --git a/construct/town/t_house2.base.111.png b/construct/town/t_house2.base.111.png deleted file mode 100644 index 57a8e383a..000000000 Binary files a/construct/town/t_house2.base.111.png and /dev/null differ diff --git a/construct/town/t_house2.base.211.png b/construct/town/t_house2.base.211.png deleted file mode 100644 index 67bd11f88..000000000 Binary files a/construct/town/t_house2.base.211.png and /dev/null differ diff --git a/construct/town/t_house2.base.311.png b/construct/town/t_house2.base.311.png deleted file mode 100644 index 255ed5174..000000000 Binary files a/construct/town/t_house2.base.311.png and /dev/null differ diff --git a/construct/town/t_house2.base.411.png b/construct/town/t_house2.base.411.png deleted file mode 100644 index dc5537798..000000000 Binary files a/construct/town/t_house2.base.411.png and /dev/null differ diff --git a/construct/town/t_house2.base.x11.png b/construct/town/t_house2.base.x11.png new file mode 100644 index 000000000..12c844329 Binary files /dev/null and b/construct/town/t_house2.base.x11.png differ diff --git a/construct/town/t_house2.clsc.111.png b/construct/town/t_house2.clsc.111.png deleted file mode 100644 index 308573a17..000000000 Binary files a/construct/town/t_house2.clsc.111.png and /dev/null differ diff --git a/construct/town/t_house2.clsc.211.png b/construct/town/t_house2.clsc.211.png deleted file mode 100644 index fc304c7c7..000000000 Binary files a/construct/town/t_house2.clsc.211.png and /dev/null differ diff --git a/construct/town/t_house2.clsc.311.png b/construct/town/t_house2.clsc.311.png deleted file mode 100644 index 25a69132a..000000000 Binary files a/construct/town/t_house2.clsc.311.png and /dev/null differ diff --git a/construct/town/t_house2.clsc.411.png b/construct/town/t_house2.clsc.411.png deleted file mode 100644 index 92fd1c7fb..000000000 Binary files a/construct/town/t_house2.clsc.411.png and /dev/null differ diff --git a/construct/town/t_house2.clsc.x11.png b/construct/town/t_house2.clsc.x11.png new file mode 100644 index 000000000..d07da7266 Binary files /dev/null and b/construct/town/t_house2.clsc.x11.png differ diff --git a/construct/town/university.arc b/construct/town/university.arc index 01971275d..f830f92ef 100644 --- a/construct/town/university.arc +++ b/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 diff --git a/construct/town/university.base.111.png b/construct/town/university.base.111.png deleted file mode 100644 index f7c5c089d..000000000 Binary files a/construct/town/university.base.111.png and /dev/null differ diff --git a/construct/town/university.base.211.png b/construct/town/university.base.211.png deleted file mode 100644 index 987192953..000000000 Binary files a/construct/town/university.base.211.png and /dev/null differ diff --git a/construct/town/university.base.311.png b/construct/town/university.base.311.png deleted file mode 100644 index 812b4f58f..000000000 Binary files a/construct/town/university.base.311.png and /dev/null differ diff --git a/construct/town/university.base.411.png b/construct/town/university.base.411.png deleted file mode 100644 index e5358286d..000000000 Binary files a/construct/town/university.base.411.png and /dev/null differ diff --git a/construct/town/university.base.511.png b/construct/town/university.base.511.png deleted file mode 100644 index e1e22d847..000000000 Binary files a/construct/town/university.base.511.png and /dev/null differ diff --git a/construct/town/university.base.611.png b/construct/town/university.base.611.png deleted file mode 100644 index 012510c7d..000000000 Binary files a/construct/town/university.base.611.png and /dev/null differ diff --git a/construct/town/university.base.711.png b/construct/town/university.base.711.png deleted file mode 100644 index d76ac1591..000000000 Binary files a/construct/town/university.base.711.png and /dev/null differ diff --git a/construct/town/university.base.811.png b/construct/town/university.base.811.png deleted file mode 100644 index 5ddd003eb..000000000 Binary files a/construct/town/university.base.811.png and /dev/null differ diff --git a/construct/town/university.base.911.png b/construct/town/university.base.911.png deleted file mode 100644 index 66c99d47c..000000000 Binary files a/construct/town/university.base.911.png and /dev/null differ diff --git a/construct/town/university.base.A11.png b/construct/town/university.base.A11.png deleted file mode 100644 index a60d85d51..000000000 Binary files a/construct/town/university.base.A11.png and /dev/null differ diff --git a/construct/town/university.base.B11.png b/construct/town/university.base.B11.png deleted file mode 100644 index c6110f384..000000000 Binary files a/construct/town/university.base.B11.png and /dev/null differ diff --git a/construct/town/university.base.C11.png b/construct/town/university.base.C11.png deleted file mode 100644 index f6cbdf5f4..000000000 Binary files a/construct/town/university.base.C11.png and /dev/null differ diff --git a/construct/town/university.base.D11.png b/construct/town/university.base.D11.png deleted file mode 100644 index 46c10cdfc..000000000 Binary files a/construct/town/university.base.D11.png and /dev/null differ diff --git a/construct/town/university.base.E11.png b/construct/town/university.base.E11.png deleted file mode 100644 index 85bfc9b2e..000000000 Binary files a/construct/town/university.base.E11.png and /dev/null differ diff --git a/construct/town/university.base.F11.png b/construct/town/university.base.F11.png deleted file mode 100644 index 7ca0e8b33..000000000 Binary files a/construct/town/university.base.F11.png and /dev/null differ diff --git a/construct/town/university.base.G11.png b/construct/town/university.base.G11.png deleted file mode 100644 index 79fdbbbcb..000000000 Binary files a/construct/town/university.base.G11.png and /dev/null differ diff --git a/construct/town/university.base.H11.png b/construct/town/university.base.H11.png deleted file mode 100644 index b5031ceb4..000000000 Binary files a/construct/town/university.base.H11.png and /dev/null differ diff --git a/construct/town/university.base.I11.png b/construct/town/university.base.I11.png deleted file mode 100644 index ef4fe979e..000000000 Binary files a/construct/town/university.base.I11.png and /dev/null differ diff --git a/construct/town/university.base.J11.png b/construct/town/university.base.J11.png deleted file mode 100644 index 6a98d57d9..000000000 Binary files a/construct/town/university.base.J11.png and /dev/null differ diff --git a/construct/town/university.base.K11.png b/construct/town/university.base.K11.png deleted file mode 100644 index 0ef8b2119..000000000 Binary files a/construct/town/university.base.K11.png and /dev/null differ diff --git a/construct/town/university.base.x11.png b/construct/town/university.base.x11.png new file mode 100644 index 000000000..6a7dee08e Binary files /dev/null and b/construct/town/university.base.x11.png differ diff --git a/construct/town/university.clsc.111.png b/construct/town/university.clsc.111.png deleted file mode 100644 index 17b751807..000000000 Binary files a/construct/town/university.clsc.111.png and /dev/null differ diff --git a/construct/town/university.clsc.211.png b/construct/town/university.clsc.211.png deleted file mode 100644 index 9fd824b14..000000000 Binary files a/construct/town/university.clsc.211.png and /dev/null differ diff --git a/construct/town/university.clsc.311.png b/construct/town/university.clsc.311.png deleted file mode 100644 index 307cc3476..000000000 Binary files a/construct/town/university.clsc.311.png and /dev/null differ diff --git a/construct/town/university.clsc.411.png b/construct/town/university.clsc.411.png deleted file mode 100644 index 307cc3476..000000000 Binary files a/construct/town/university.clsc.411.png and /dev/null differ diff --git a/construct/town/university.clsc.511.png b/construct/town/university.clsc.511.png deleted file mode 100644 index 8c0eafd21..000000000 Binary files a/construct/town/university.clsc.511.png and /dev/null differ diff --git a/construct/town/university.clsc.611.png b/construct/town/university.clsc.611.png deleted file mode 100644 index 15d4e6bc3..000000000 Binary files a/construct/town/university.clsc.611.png and /dev/null differ diff --git a/construct/town/university.clsc.711.png b/construct/town/university.clsc.711.png deleted file mode 100644 index 31ee27343..000000000 Binary files a/construct/town/university.clsc.711.png and /dev/null differ diff --git a/construct/town/university.clsc.811.png b/construct/town/university.clsc.811.png deleted file mode 100644 index 49e9be1e6..000000000 Binary files a/construct/town/university.clsc.811.png and /dev/null differ diff --git a/construct/town/university.clsc.911.png b/construct/town/university.clsc.911.png deleted file mode 100644 index cf3f599db..000000000 Binary files a/construct/town/university.clsc.911.png and /dev/null differ diff --git a/construct/town/university.clsc.A11.png b/construct/town/university.clsc.A11.png deleted file mode 100644 index 4e543e3a8..000000000 Binary files a/construct/town/university.clsc.A11.png and /dev/null differ diff --git a/construct/town/university.clsc.B11.png b/construct/town/university.clsc.B11.png deleted file mode 100644 index d28e80bbc..000000000 Binary files a/construct/town/university.clsc.B11.png and /dev/null differ diff --git a/construct/town/university.clsc.C11.png b/construct/town/university.clsc.C11.png deleted file mode 100644 index 0073f4b0d..000000000 Binary files a/construct/town/university.clsc.C11.png and /dev/null differ diff --git a/construct/town/university.clsc.D11.png b/construct/town/university.clsc.D11.png deleted file mode 100644 index 2cde521be..000000000 Binary files a/construct/town/university.clsc.D11.png and /dev/null differ diff --git a/construct/town/university.clsc.E11.png b/construct/town/university.clsc.E11.png deleted file mode 100644 index ba058a517..000000000 Binary files a/construct/town/university.clsc.E11.png and /dev/null differ diff --git a/construct/town/university.clsc.F11.png b/construct/town/university.clsc.F11.png deleted file mode 100644 index 8a50a51d3..000000000 Binary files a/construct/town/university.clsc.F11.png and /dev/null differ diff --git a/construct/town/university.clsc.G11.png b/construct/town/university.clsc.G11.png deleted file mode 100644 index 6932aa428..000000000 Binary files a/construct/town/university.clsc.G11.png and /dev/null differ diff --git a/construct/town/university.clsc.H11.png b/construct/town/university.clsc.H11.png deleted file mode 100644 index b5913b1a7..000000000 Binary files a/construct/town/university.clsc.H11.png and /dev/null differ diff --git a/construct/town/university.clsc.I11.png b/construct/town/university.clsc.I11.png deleted file mode 100644 index bc69d67ee..000000000 Binary files a/construct/town/university.clsc.I11.png and /dev/null differ diff --git a/construct/town/university.clsc.J11.png b/construct/town/university.clsc.J11.png deleted file mode 100644 index c7bf0b907..000000000 Binary files a/construct/town/university.clsc.J11.png and /dev/null differ diff --git a/construct/town/university.clsc.K11.png b/construct/town/university.clsc.K11.png deleted file mode 100644 index 0e3fde191..000000000 Binary files a/construct/town/university.clsc.K11.png and /dev/null differ diff --git a/construct/town/university.clsc.x11.png b/construct/town/university.clsc.x11.png new file mode 100644 index 000000000..1eb572691 Binary files /dev/null and b/construct/town/university.clsc.x11.png differ diff --git a/construct/town/zoo.base.x11.png b/construct/town/zoo.base.x11.png index eb2545e88..e21f145d3 100644 Binary files a/construct/town/zoo.base.x11.png and b/construct/town/zoo.base.x11.png differ diff --git a/shop/store_alch.arc b/shop/store_alch.arc index 18a7fe2f4..6f730f373 100644 --- a/shop/store_alch.arc +++ b/shop/store_alch.arc @@ -1,6 +1,6 @@ Object store_alchemy name shop -face store_alch.111 +face store_alch.x11 color_fg red type 66 no_pick 1 @@ -11,7 +11,7 @@ end More Object store_alchemy_2 name shop -face store_alch.211 +face store_alch.x11 color_fg red type 66 x 1 @@ -22,7 +22,7 @@ end More Object store_alchemy_3 name shop -face store_alch.311 +face store_alch.x11 color_fg red type 66 y 1 @@ -32,7 +32,7 @@ end More Object store_alchemy_4 name shop -face store_alch.411 +face store_alch.x11 color_fg red type 66 x 1 diff --git a/shop/store_alch.base.111.png b/shop/store_alch.base.111.png deleted file mode 100644 index 0f19ffd18..000000000 Binary files a/shop/store_alch.base.111.png and /dev/null differ diff --git a/shop/store_alch.base.211.png b/shop/store_alch.base.211.png deleted file mode 100644 index 2ef173ae6..000000000 Binary files a/shop/store_alch.base.211.png and /dev/null differ diff --git a/shop/store_alch.base.311.png b/shop/store_alch.base.311.png deleted file mode 100644 index 09fe14448..000000000 Binary files a/shop/store_alch.base.311.png and /dev/null differ diff --git a/shop/store_alch.base.411.png b/shop/store_alch.base.411.png deleted file mode 100644 index 5f63fe164..000000000 Binary files a/shop/store_alch.base.411.png and /dev/null differ diff --git a/shop/store_alch.clsc.111.png b/shop/store_alch.clsc.111.png deleted file mode 100644 index 0f19ffd18..000000000 Binary files a/shop/store_alch.clsc.111.png and /dev/null differ diff --git a/shop/store_alch.clsc.211.png b/shop/store_alch.clsc.211.png deleted file mode 100644 index 2ef173ae6..000000000 Binary files a/shop/store_alch.clsc.211.png and /dev/null differ diff --git a/shop/store_alch.clsc.311.png b/shop/store_alch.clsc.311.png deleted file mode 100644 index 09fe14448..000000000 Binary files a/shop/store_alch.clsc.311.png and /dev/null differ diff --git a/shop/store_alch.clsc.411.png b/shop/store_alch.clsc.411.png deleted file mode 100644 index 5f63fe164..000000000 Binary files a/shop/store_alch.clsc.411.png and /dev/null differ diff --git a/shop/store_armo.arc b/shop/store_armo.arc index 7f42e84d5..83270999a 100644 --- a/shop/store_armo.arc +++ b/shop/store_armo.arc @@ -1,6 +1,6 @@ Object store_armour name shop -face store_armo.111 +face store_armo.x11 color_fg brown type 66 no_pick 1 @@ -11,7 +11,7 @@ end More Object store_armour_2 name shop -face store_armo.211 +face store_armo.x11 color_fg brown type 66 x 1 @@ -22,7 +22,7 @@ end More Object store_armour_3 name shop -face store_armo.311 +face store_armo.x11 color_fg brown type 66 y 1 @@ -32,7 +32,7 @@ end More Object store_armour_4 name shop -face store_armo.411 +face store_armo.x11 color_fg brown type 66 x 1 diff --git a/shop/store_armo.base.111.png b/shop/store_armo.base.111.png deleted file mode 100644 index 7c1ecc0e3..000000000 Binary files a/shop/store_armo.base.111.png and /dev/null differ diff --git a/shop/store_armo.base.211.png b/shop/store_armo.base.211.png deleted file mode 100644 index 010b341f7..000000000 Binary files a/shop/store_armo.base.211.png and /dev/null differ diff --git a/shop/store_armo.base.311.png b/shop/store_armo.base.311.png deleted file mode 100644 index 3b47e0598..000000000 Binary files a/shop/store_armo.base.311.png and /dev/null differ diff --git a/shop/store_armo.base.411.png b/shop/store_armo.base.411.png deleted file mode 100644 index 84b19e46d..000000000 Binary files a/shop/store_armo.base.411.png and /dev/null differ diff --git a/shop/store_armo.clsc.111.png b/shop/store_armo.clsc.111.png deleted file mode 100644 index 7c1ecc0e3..000000000 Binary files a/shop/store_armo.clsc.111.png and /dev/null differ diff --git a/shop/store_armo.clsc.211.png b/shop/store_armo.clsc.211.png deleted file mode 100644 index 010b341f7..000000000 Binary files a/shop/store_armo.clsc.211.png and /dev/null differ diff --git a/shop/store_armo.clsc.311.png b/shop/store_armo.clsc.311.png deleted file mode 100644 index 3b47e0598..000000000 Binary files a/shop/store_armo.clsc.311.png and /dev/null differ diff --git a/shop/store_armo.clsc.411.png b/shop/store_armo.clsc.411.png deleted file mode 100644 index 84b19e46d..000000000 Binary files a/shop/store_armo.clsc.411.png and /dev/null differ diff --git a/shop/store_gene.arc b/shop/store_gene.arc index c23893810..3c6edbb72 100644 --- a/shop/store_gene.arc +++ b/shop/store_gene.arc @@ -1,6 +1,6 @@ Object store_general name shop -face store_gene.111 +face store_gene.x11 type 66 no_pick 1 no_pass 1 @@ -11,7 +11,7 @@ end More Object store_general_2 name shop -face store_gene.211 +face store_gene.x11 type 66 x 1 no_pick 1 @@ -22,7 +22,7 @@ end More Object store_general_3 name shop -face store_gene.311 +face store_gene.x11 type 66 y 1 no_pick 1 @@ -32,7 +32,7 @@ end More Object store_general_4 name shop -face store_gene.411 +face store_gene.x11 type 66 x 1 y 1 diff --git a/shop/store_gene.base.111.png b/shop/store_gene.base.111.png deleted file mode 100644 index 4684e84e4..000000000 Binary files a/shop/store_gene.base.111.png and /dev/null differ diff --git a/shop/store_gene.base.211.png b/shop/store_gene.base.211.png deleted file mode 100644 index 9a46d2e2c..000000000 Binary files a/shop/store_gene.base.211.png and /dev/null differ diff --git a/shop/store_gene.base.311.png b/shop/store_gene.base.311.png deleted file mode 100644 index a7feb9d9f..000000000 Binary files a/shop/store_gene.base.311.png and /dev/null differ diff --git a/shop/store_gene.base.411.png b/shop/store_gene.base.411.png deleted file mode 100644 index 4ed362d74..000000000 Binary files a/shop/store_gene.base.411.png and /dev/null differ diff --git a/shop/store_gene.base.x11.png b/shop/store_gene.base.x11.png new file mode 100644 index 000000000..ffad364bc Binary files /dev/null and b/shop/store_gene.base.x11.png differ diff --git a/shop/store_magi.arc b/shop/store_magi.arc index 78b6162f7..e3b37361a 100644 --- a/shop/store_magi.arc +++ b/shop/store_magi.arc @@ -1,6 +1,6 @@ Object store_magic name shop -face store_magi.111 +face store_magi.x11 color_fg blue type 66 no_pick 1 @@ -11,7 +11,7 @@ end More Object store_magic_2 name shop -face store_magi.211 +face store_magi.x11 color_fg blue type 66 x 1 @@ -22,7 +22,7 @@ end More Object store_magic_3 name shop -face store_magi.311 +face store_magi.x11 color_fg blue type 66 y 1 @@ -32,7 +32,7 @@ end More Object store_magic_4 name shop -face store_magi.411 +face store_magi.x11 color_fg blue type 66 x 1 diff --git a/shop/store_magi.base.111.png b/shop/store_magi.base.111.png deleted file mode 100644 index 0dc7d9839..000000000 Binary files a/shop/store_magi.base.111.png and /dev/null differ diff --git a/shop/store_magi.base.211.png b/shop/store_magi.base.211.png deleted file mode 100644 index 2289c7302..000000000 Binary files a/shop/store_magi.base.211.png and /dev/null differ diff --git a/shop/store_magi.base.311.png b/shop/store_magi.base.311.png deleted file mode 100644 index dc46c87d1..000000000 Binary files a/shop/store_magi.base.311.png and /dev/null differ diff --git a/shop/store_magi.base.411.png b/shop/store_magi.base.411.png deleted file mode 100644 index 95b836d9a..000000000 Binary files a/shop/store_magi.base.411.png and /dev/null differ diff --git a/shop/store_magi.base.x11.png b/shop/store_magi.base.x11.png new file mode 100644 index 000000000..afded7056 Binary files /dev/null and b/shop/store_magi.base.x11.png differ