From f06a174fa82d43ed8550b95a2cedc8753aa81900 Mon Sep 17 00:00:00 2001 From: eracc Date: Mon, 9 Apr 2007 21:32:13 +0000 Subject: [PATCH] Fix broken pentagram in trunk only. Branches still use old pentagram arch with multiple images. git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@5985 282e977c-c81d-0410-88c4-b93c2d0d6712 --- quests/mak/chaos/down5 | 106 +++-------------------------------------- quests/mak/chaos/up5 | 100 +------------------------------------- 2 files changed, 8 insertions(+), 198 deletions(-) diff --git a/quests/mak/chaos/down5 b/quests/mak/chaos/down5 index 87b722657..99847d91a 100644 --- a/quests/mak/chaos/down5 +++ b/quests/mak/chaos/down5 @@ -1240,13 +1240,17 @@ y 12 end arch afloor_right name floor +slaying fallen +hp 2 +sp 31 x 10 y 13 +speed 0.000000 +connected 1 +is_animated 0 end -arch teleporter -name pentagram +arch pentagram_111 slaying fallen -face pentagram.111 hp 2 sp 31 x 10 @@ -1260,35 +1264,11 @@ name floor x 10 y 14 end -arch teleporter -name pentagram -slaying fallen -face pentagram.121 -hp 2 -sp 31 -x 10 -y 14 -speed 0.000000 -connected 1 -is_animated 0 -end arch afloor_right name floor x 10 y 15 end -arch teleporter -name pentagram -slaying fallen -face pentagram.131 -hp 2 -sp 31 -x 10 -y 15 -speed 0.000000 -connected 1 -is_animated 0 -end arch afloor_right name floor x 10 @@ -1476,18 +1456,6 @@ name floor x 11 y 13 end -arch teleporter -name pentagram -slaying fallen -face pentagram.112 -hp 2 -sp 31 -x 11 -y 13 -speed 0.000000 -connected 1 -is_animated 0 -end arch magic_mouth msg This pentagram seems to hunger for @@ -1509,35 +1477,11 @@ name floor x 11 y 14 end -arch teleporter -name pentagram -slaying fallen -face pentagram.122 -hp 2 -sp 31 -x 11 -y 14 -speed 0.000000 -connected 1 -is_animated 0 -end arch afloor_right name floor x 11 y 15 end -arch teleporter -name pentagram -slaying fallen -face pentagram.132 -hp 2 -sp 31 -x 11 -y 15 -speed 0.000000 -connected 1 -is_animated 0 -end arch afloor_right name floor x 11 @@ -1660,52 +1604,16 @@ name floor x 12 y 13 end -arch teleporter -name pentagram -slaying fallen -face pentagram.113 -hp 2 -sp 31 -x 12 -y 13 -speed 0.000000 -connected 1 -is_animated 0 -end arch afloor_right name floor x 12 y 14 end -arch teleporter -name pentagram -slaying fallen -face pentagram.123 -hp 2 -sp 31 -x 12 -y 14 -speed 0.000000 -connected 1 -is_animated 0 -end arch afloor_right name floor x 12 y 15 end -arch teleporter -name pentagram -slaying fallen -face pentagram.133 -hp 2 -sp 31 -x 12 -y 15 -speed 0.000000 -connected 1 -is_animated 0 -end arch afloor_right name floor x 12 diff --git a/quests/mak/chaos/up5 b/quests/mak/chaos/up5 index 9cbafd4bc..10e2b4d74 100644 --- a/quests/mak/chaos/up5 +++ b/quests/mak/chaos/up5 @@ -1243,10 +1243,8 @@ name floor x 10 y 13 end -arch teleporter -name pentagram +arch pentagram_111 slaying fallen -face pentagram.111 hp 29 sp 31 x 10 @@ -1260,35 +1258,11 @@ name floor x 10 y 14 end -arch teleporter -name pentagram -slaying fallen -face pentagram.121 -hp 29 -sp 31 -x 10 -y 14 -speed 0.000000 -connected 1 -is_animated 0 -end arch afloor_right name floor x 10 y 15 end -arch teleporter -name pentagram -slaying fallen -face pentagram.131 -hp 29 -sp 31 -x 10 -y 15 -speed 0.000000 -connected 1 -is_animated 0 -end arch afloor_right name floor x 10 @@ -1467,18 +1441,6 @@ name floor x 11 y 13 end -arch teleporter -name pentagram -slaying fallen -face pentagram.112 -hp 29 -sp 31 -x 11 -y 13 -speed 0.000000 -connected 1 -is_animated 0 -end arch magic_mouth msg This pentagram seems to hunger for @@ -1500,35 +1462,11 @@ name floor x 11 y 14 end -arch teleporter -name pentagram -slaying fallen -face pentagram.122 -hp 29 -sp 31 -x 11 -y 14 -speed 0.000000 -connected 1 -is_animated 0 -end arch afloor_right name floor x 11 y 15 end -arch teleporter -name pentagram -slaying fallen -face pentagram.132 -hp 29 -sp 31 -x 11 -y 15 -speed 0.000000 -connected 1 -is_animated 0 -end arch afloor_right name floor x 11 @@ -1651,52 +1589,16 @@ name floor x 12 y 13 end -arch teleporter -name pentagram -slaying fallen -face pentagram.113 -hp 29 -sp 31 -x 12 -y 13 -speed 0.000000 -connected 1 -is_animated 0 -end arch afloor_right name floor x 12 y 14 end -arch teleporter -name pentagram -slaying fallen -face pentagram.123 -hp 29 -sp 31 -x 12 -y 14 -speed 0.000000 -connected 1 -is_animated 0 -end arch afloor_right name floor x 12 y 15 end -arch teleporter -name pentagram -slaying fallen -face pentagram.133 -hp 29 -sp 31 -x 12 -y 15 -speed 0.000000 -connected 1 -is_animated 0 -end arch afloor_right name floor x 12