From 0906875a40c28f62bd58637c26101533bcf07190 Mon Sep 17 00:00:00 2001 From: silvernexus Date: Sun, 6 Aug 2017 01:07:19 +0000 Subject: [PATCH] Update firewalls to use direction instead of sp to control direction. Depends on r20469. git-svn-id: svn+ssh://svn.code.sf.net/p/crossfire/code/arch/trunk@20470 282e977c-c81d-0410-88c4-b93c2d0d6712 --- ChangeLog | 10 ++++++++++ misc/cannon.arc | 16 ++++++++-------- monster/misc/firechest.arc | 2 +- wall/bulletwall/bulletwall.arc | 16 ++++++++-------- wall/firewall/firewall.arc | 16 ++++++++-------- wall/lbulletwall/lbull_wall.arc | 16 ++++++++-------- wall/lightningwall/light_wall.arc | 18 +++++++++--------- wall/snowstorm_x.arc | 2 +- 8 files changed, 53 insertions(+), 43 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6c344f230..c613c53de 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Change firewalls to use direction field for directional casting +misc/cannon.arc +monster/misc/firechest.arc +wall/bulletwall/bulletwall.arc +wall/firewall/firewall.arc +wall/lbulletwall/lbull_wall.arc +wall/lightnngwall/light_wall.arc +wall/snowstorm_x.arc +Daniel Hawkins 2017-08-05 + Modify ring.110 images to look like other rings. Move old ring image to classic image set. talisman/ring.base.110.png talisman/ring.clsc.110.png diff --git a/misc/cannon.arc b/misc/cannon.arc index 1840797ea..a9a8c3f44 100644 --- a/misc/cannon.arc +++ b/misc/cannon.arc @@ -20,7 +20,7 @@ activate_on_push 1 activate_on_release 1 level 1 face cannon_1.111 -sp 1 +direction 1 speed -0.1 move_block all blocksview 1 @@ -35,7 +35,7 @@ activate_on_push 1 activate_on_release 1 level 1 face cannon_2.111 -sp 2 +direction 2 speed -0.1 move_block all blocksview 1 @@ -50,7 +50,7 @@ activate_on_push 1 activate_on_release 1 level 1 face cannon_3.111 -sp 3 +direction 3 speed -0.1 move_block all blocksview 1 @@ -65,7 +65,7 @@ level 1 activate_on_push 1 activate_on_release 1 face cannon_4.111 -sp 4 +direction 4 speed -0.1 move_block all blocksview 1 @@ -80,7 +80,7 @@ activate_on_push 1 activate_on_release 1 level 1 face cannon_5.111 -sp 5 +direction 5 speed -0.1 move_block all blocksview 1 @@ -95,7 +95,7 @@ activate_on_push 1 activate_on_release 1 level 1 face cannon_6.111 -sp 6 +direction 6 speed -0.1 move_block all blocksview 1 @@ -110,7 +110,7 @@ activate_on_push 1 activate_on_release 1 level 1 face cannon_7.111 -sp 7 +direction 7 speed -0.1 move_block all blocksview 1 @@ -125,7 +125,7 @@ activate_on_push 1 activate_on_release 1 level 1 face cannon_8.111 -sp 8 +direction 8 speed -0.1 move_block all blocksview 1 diff --git a/monster/misc/firechest.arc b/monster/misc/firechest.arc index dc561c920..0de6751e4 100644 --- a/monster/misc/firechest.arc +++ b/monster/misc/firechest.arc @@ -11,5 +11,5 @@ alive 1 level 1 no_pick 1 resist_fire 100 -sp 0 +direction 0 end diff --git a/wall/bulletwall/bulletwall.arc b/wall/bulletwall/bulletwall.arc index 59d4a1662..838491a27 100644 --- a/wall/bulletwall/bulletwall.arc +++ b/wall/bulletwall/bulletwall.arc @@ -19,7 +19,7 @@ activate_on_push 1 activate_on_release 1 level 1 face bul_wall_1.111 -sp 1 +direction 1 speed -0.1 no_pick 1 move_block all @@ -34,7 +34,7 @@ activate_on_push 1 activate_on_release 1 level 1 face bul_wall_2.111 -sp 2 +direction 2 speed -0.1 no_pick 1 move_block all @@ -49,7 +49,7 @@ activate_on_push 1 activate_on_release 1 level 1 face bul_wall_3.111 -sp 3 +direction 3 speed -0.1 no_pick 1 move_block all @@ -64,7 +64,7 @@ activate_on_push 1 activate_on_release 1 level 1 face bul_wall_4.111 -sp 4 +direction 4 speed -0.1 no_pick 1 move_block all @@ -79,7 +79,7 @@ activate_on_push 1 activate_on_release 1 level 1 face bul_wall_5.111 -sp 5 +direction 5 speed -0.1 no_pick 1 move_block all @@ -94,7 +94,7 @@ activate_on_push 1 activate_on_release 1 level 1 face bul_wall_6.111 -sp 6 +direction 6 speed -0.1 no_pick 1 move_block all @@ -109,7 +109,7 @@ activate_on_push 1 activate_on_release 1 level 1 face bul_wall_7.111 -sp 7 +direction 7 speed -0.1 no_pick 1 move_block all @@ -124,7 +124,7 @@ activate_on_push 1 activate_on_release 1 level 1 face bul_wall_8.111 -sp 8 +direction 8 speed -0.1 no_pick 1 move_block all diff --git a/wall/firewall/firewall.arc b/wall/firewall/firewall.arc index d3a91e0ab..607432f82 100644 --- a/wall/firewall/firewall.arc +++ b/wall/firewall/firewall.arc @@ -22,7 +22,7 @@ activate_on_push 1 activate_on_release 1 level 1 face firewall_1.111 -sp 1 +direction 1 speed -0.02 no_pick 1 move_block all @@ -37,7 +37,7 @@ activate_on_push 1 activate_on_release 1 level 1 face firewall_2.111 -sp 2 +direction 2 speed -0.02 no_pick 1 move_block all @@ -52,7 +52,7 @@ activate_on_push 1 activate_on_release 1 level 1 face firewall_3.111 -sp 3 +direction 3 speed -0.02 no_pick 1 move_block all @@ -67,7 +67,7 @@ activate_on_push 1 activate_on_release 1 level 1 face firewall_4.111 -sp 4 +direction 4 speed -0.02 no_pick 1 move_block all @@ -82,7 +82,7 @@ activate_on_push 1 activate_on_release 1 level 1 face firewall_5.111 -sp 5 +direction 5 speed -0.02 no_pick 1 move_block all @@ -97,7 +97,7 @@ activate_on_push 1 activate_on_release 1 level 1 face firewall_6.111 -sp 6 +direction 6 speed -0.02 no_pick 1 move_block all @@ -112,7 +112,7 @@ activate_on_push 1 activate_on_release 1 level 1 face firewall_7.111 -sp 7 +direction 7 speed -0.02 no_pick 1 move_block all @@ -127,7 +127,7 @@ activate_on_push 1 activate_on_release 1 level 1 face firewall_8.111 -sp 8 +direction 8 speed -0.02 no_pick 1 move_block all diff --git a/wall/lbulletwall/lbull_wall.arc b/wall/lbulletwall/lbull_wall.arc index a094343a3..a050d1488 100644 --- a/wall/lbulletwall/lbull_wall.arc +++ b/wall/lbulletwall/lbull_wall.arc @@ -21,7 +21,7 @@ activate_on_push 1 activate_on_release 1 level 1 face lbull_wall.111 -sp 1 +direction 1 speed -0.04 no_pick 1 move_block all @@ -36,7 +36,7 @@ activate_on_push 1 activate_on_release 1 level 1 face lbull_wall.121 -sp 2 +direction 2 speed -0.04 no_pick 1 move_block all @@ -51,7 +51,7 @@ activate_on_push 1 activate_on_release 1 level 1 face lbull_wall.131 -sp 3 +direction 3 speed -0.04 no_pick 1 move_block all @@ -66,7 +66,7 @@ activate_on_push 1 activate_on_release 1 level 1 face lbull_wall.141 -sp 4 +direction 4 speed -0.04 no_pick 1 move_block all @@ -81,7 +81,7 @@ activate_on_push 1 activate_on_release 1 level 1 face lbull_wall.151 -sp 5 +direction 5 speed -0.04 no_pick 1 move_block all @@ -96,7 +96,7 @@ activate_on_push 1 activate_on_release 1 level 1 face lbull_wall.161 -sp 6 +direction 6 speed -0.04 no_pick 1 move_block all @@ -111,7 +111,7 @@ activate_on_push 1 activate_on_release 1 level 1 face lbull_wall.171 -sp 7 +direction 7 speed -0.04 no_pick 1 move_block all @@ -126,7 +126,7 @@ activate_on_push 1 activate_on_release 1 level 1 face lbull_wall.181 -sp 8 +direction 8 speed -0.04 no_pick 1 move_block all diff --git a/wall/lightningwall/light_wall.arc b/wall/lightningwall/light_wall.arc index 431b32082..8a2d8a0bc 100644 --- a/wall/lightningwall/light_wall.arc +++ b/wall/lightningwall/light_wall.arc @@ -20,7 +20,7 @@ activate_on_release 1 level 1 face light_wall.111 animation lightningwall_t -sp 1 +direction 1 maxsp 1 is_animated 0 speed -0.04 @@ -37,7 +37,7 @@ activate_on_push 1 activate_on_release 1 level 1 face light_wall.111 -sp 1 +direction 1 speed -0.04 no_pick 1 move_block all @@ -52,7 +52,7 @@ activate_on_push 1 activate_on_release 1 level 1 face light_wall.121 -sp 2 +direction 2 speed -0.04 no_pick 1 move_block all @@ -67,7 +67,7 @@ activate_on_push 1 activate_on_release 1 level 1 face light_wall.131 -sp 3 +direction 3 speed -0.04 no_pick 1 move_block all @@ -82,7 +82,7 @@ activate_on_push 1 activate_on_release 1 level 1 face light_wall.141 -sp 4 +direction 4 speed -0.04 no_pick 1 move_block all @@ -97,7 +97,7 @@ activate_on_push 1 activate_on_release 1 level 1 face light_wall.151 -sp 5 +direction 5 speed -0.04 no_pick 1 move_block all @@ -112,7 +112,7 @@ activate_on_push 1 activate_on_release 1 level 1 face light_wall.161 -sp 6 +direction 6 speed -0.04 no_pick 1 move_block all @@ -127,7 +127,7 @@ activate_on_push 1 activate_on_release 1 level 1 face light_wall.171 -sp 7 +direction 7 speed -0.04 no_pick 1 move_block all @@ -142,7 +142,7 @@ activate_on_push 1 activate_on_release 1 level 1 face light_wall.181 -sp 8 +direction 8 speed -0.04 no_pick 1 move_block all diff --git a/wall/snowstorm_x.arc b/wall/snowstorm_x.arc index a51f85758..b40aba1d0 100644 --- a/wall/snowstorm_x.arc +++ b/wall/snowstorm_x.arc @@ -10,7 +10,7 @@ exp 50 resist_cold 100 blocksview 0 invisible 1 -sp 0 +direction 0 arch spell_icestorm end end