diff --git a/CHANGES b/CHANGES index 0594a5777..b948ef5a9 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,8 @@ Changes for SVN top of tree: +Update spellcasting objects to use inventory objects. +Andreas Kirschbaum 2007-11-04 + Rename low_boots from "shoes" to "pair of shoes". Andreas Kirschbaum 2007-11-03 diff --git a/gods/items/tear_gaea.arc b/gods/items/tear_gaea.arc index da7d894ba..211c548c8 100644 --- a/gods/items/tear_gaea.arc +++ b/gods/items/tear_gaea.arc @@ -13,8 +13,9 @@ anim_speed 4 client_anim_random 1 color_fg blue type 5 -sp 35 weight 10 name_pl Gaea's tears client_type 650 +arch spell_heal +end end diff --git a/potion/potionhea.arc b/potion/potionhea.arc index 065411a92..06791ffc2 100644 --- a/potion/potionhea.arc +++ b/potion/potionhea.arc @@ -8,8 +8,9 @@ level 1 material 4 weight 1800 value 5200 -sp 35 name_pl healing potions on_use_yield potion_empty client_type 651 +arch spell_heal +end end diff --git a/potion/potionhero.arc b/potion/potionhero.arc index 224ed6201..f4d3a67d4 100644 --- a/potion/potionhero.arc +++ b/potion/potionhero.arc @@ -8,8 +8,9 @@ level 1 material 4 weight 1000 value 500 -sp 80 name_pl potions of heroism on_use_yield potion_empty client_type 651 +arch spell_heroism +end end diff --git a/potion/potionmag.arc b/potion/potionmag.arc index a34a9363c..ae4d0bce1 100644 --- a/potion/potionmag.arc +++ b/potion/potionmag.arc @@ -5,11 +5,12 @@ face potionmag.111 color_fg light_blue type 5 level 1 -sp 67 material 4 weight 1800 value 5200 name_pl magic power potions on_use_yield potion_empty client_type 651 +arch spell_regenerate_spellpoints +end end diff --git a/wall/bulletwall/bulletwall.arc b/wall/bulletwall/bulletwall.arc index 67284eab1..6ab6dcc16 100644 --- a/wall/bulletwall/bulletwall.arc +++ b/wall/bulletwall/bulletwall.arc @@ -1,5 +1,4 @@ Object bulletwall -other_arch spell_magic_bullet name bulletwall type 62 activate_on_push 1 @@ -12,9 +11,10 @@ move_block all blocksview 1 visibility 100 magicmap yellow +arch spell_magic_bullet +end end Object bulletwall_1 -other_arch spell_magic_bullet name bulletwall type 62 activate_on_push 1 @@ -28,9 +28,10 @@ move_block all blocksview 1 visibility 100 magicmap yellow +arch spell_magic_bullet +end end Object bulletwall_2 -other_arch spell_magic_bullet name bulletwall type 62 activate_on_push 1 @@ -44,9 +45,10 @@ move_block all blocksview 1 visibility 100 magicmap yellow +arch spell_magic_bullet +end end Object bulletwall_3 -other_arch spell_magic_bullet name bulletwall type 62 activate_on_push 1 @@ -60,9 +62,10 @@ move_block all blocksview 1 visibility 100 magicmap yellow +arch spell_magic_bullet +end end Object bulletwall_4 -other_arch spell_magic_bullet name bulletwall type 62 activate_on_push 1 @@ -76,9 +79,10 @@ move_block all blocksview 1 visibility 100 magicmap yellow +arch spell_magic_bullet +end end Object bulletwall_5 -other_arch spell_magic_bullet name bulletwall type 62 activate_on_push 1 @@ -92,9 +96,10 @@ move_block all blocksview 1 visibility 100 magicmap yellow +arch spell_magic_bullet +end end Object bulletwall_6 -other_arch spell_magic_bullet name bulletwall type 62 activate_on_push 1 @@ -108,9 +113,10 @@ move_block all blocksview 1 visibility 100 magicmap yellow +arch spell_magic_bullet +end end Object bulletwall_7 -other_arch spell_magic_bullet name bulletwall type 62 activate_on_push 1 @@ -124,9 +130,10 @@ move_block all blocksview 1 visibility 100 magicmap yellow +arch spell_magic_bullet +end end Object bulletwall_8 -other_arch spell_magic_bullet name bulletwall type 62 activate_on_push 1 @@ -140,4 +147,6 @@ move_block all blocksview 1 visibility 100 magicmap yellow +arch spell_magic_bullet +end end diff --git a/wall/firewall/firewall.arc b/wall/firewall/firewall.arc index 1a1f1de6b..caed720ad 100644 --- a/wall/firewall/firewall.arc +++ b/wall/firewall/firewall.arc @@ -1,5 +1,4 @@ Object firewall -other_arch spell_small_fireball alive 1 level 1 type 62 @@ -10,15 +9,15 @@ color_fg grey speed -0.02 hp 250 maxhp 250 -dam 1 ac 3 exp 50 resist_fire 100 blocksview 1 visibility 100 +arch spell_small_fireball +end end Object firewall_1 -other_arch spell_small_fireball name firewall type 62 activate_on_push 1 @@ -27,15 +26,15 @@ level 1 face firewall_1.111 color_fg grey sp 1 -dam 1 speed -0.02 no_pick 1 move_block all blocksview 1 visibility 100 +arch spell_small_fireball +end end Object firewall_2 -other_arch spell_small_fireball name firewall type 62 activate_on_push 1 @@ -44,15 +43,15 @@ level 1 face firewall_2.111 color_fg grey sp 2 -dam 1 speed -0.02 no_pick 1 move_block all blocksview 1 visibility 100 +arch spell_small_fireball +end end Object firewall_3 -other_arch spell_small_fireball name firewall type 62 activate_on_push 1 @@ -61,15 +60,15 @@ level 1 face firewall_3.111 color_fg grey sp 3 -dam 1 speed -0.02 no_pick 1 move_block all blocksview 1 visibility 100 +arch spell_small_fireball +end end Object firewall_4 -other_arch spell_small_fireball name firewall type 62 activate_on_push 1 @@ -78,15 +77,15 @@ level 1 face firewall_4.111 color_fg grey sp 4 -dam 1 speed -0.02 no_pick 1 move_block all blocksview 1 visibility 100 +arch spell_small_fireball +end end Object firewall_5 -other_arch spell_small_fireball name firewall type 62 activate_on_push 1 @@ -95,15 +94,15 @@ level 1 face firewall_5.111 color_fg grey sp 5 -dam 1 speed -0.02 no_pick 1 move_block all blocksview 1 visibility 100 +arch spell_small_fireball +end end Object firewall_6 -other_arch spell_small_fireball name firewall type 62 activate_on_push 1 @@ -112,15 +111,15 @@ level 1 face firewall_6.111 color_fg grey sp 6 -dam 1 speed -0.02 no_pick 1 move_block all blocksview 1 visibility 100 +arch spell_small_fireball +end end Object firewall_7 -other_arch spell_small_fireball name firewall type 62 activate_on_push 1 @@ -129,15 +128,15 @@ level 1 face firewall_7.111 color_fg grey sp 7 -dam 1 speed -0.02 no_pick 1 move_block all blocksview 1 visibility 100 +arch spell_small_fireball +end end Object firewall_8 -other_arch spell_small_fireball name firewall type 62 activate_on_push 1 @@ -146,10 +145,11 @@ level 1 face firewall_8.111 color_fg grey sp 8 -dam 1 speed -0.02 no_pick 1 move_block all blocksview 1 visibility 100 +arch spell_small_fireball +end end diff --git a/wall/lbulletwall/lbull_wall.arc b/wall/lbulletwall/lbull_wall.arc index 4ac98777e..a1e0fa5ac 100644 --- a/wall/lbulletwall/lbull_wall.arc +++ b/wall/lbulletwall/lbull_wall.arc @@ -1,5 +1,4 @@ Object lbulletwall -other_arch spell_lg_magic_bullet name large bulletwall type 62 activate_on_push 1 @@ -20,13 +19,13 @@ is_animated 0 speed -0.16 no_pick 1 move_block all -dam 29 blocksview 1 visibility 100 magicmap yellow +arch spell_lg_magic_bullet +end end Object lbulletwall_1 -other_arch spell_lg_magic_bullet name large bulletwall type 62 activate_on_push 1 @@ -34,16 +33,16 @@ activate_on_release 1 level 1 face lbull_wall.111 sp 1 -dam 29 speed -0.04 no_pick 1 move_block all blocksview 1 visibility 100 magicmap yellow +arch spell_lg_magic_bullet +end end Object lbulletwall_2 -other_arch spell_lg_magic_bullet name large bulletwall type 62 activate_on_push 1 @@ -51,16 +50,16 @@ activate_on_release 1 level 1 face lbull_wall.121 sp 2 -dam 29 speed -0.04 no_pick 1 move_block all blocksview 1 visibility 100 magicmap yellow +arch spell_lg_magic_bullet +end end Object lbulletwall_3 -other_arch spell_lg_magic_bullet name large bulletwall type 62 activate_on_push 1 @@ -68,16 +67,16 @@ activate_on_release 1 level 1 face lbull_wall.131 sp 3 -dam 29 speed -0.04 no_pick 1 move_block all blocksview 1 visibility 100 magicmap yellow +arch spell_lg_magic_bullet +end end Object lbulletwall_4 -other_arch spell_lg_magic_bullet name large bulletwall type 62 activate_on_push 1 @@ -85,16 +84,16 @@ activate_on_release 1 level 1 face lbull_wall.141 sp 4 -dam 29 speed -0.04 no_pick 1 move_block all blocksview 1 visibility 100 magicmap yellow +arch spell_lg_magic_bullet +end end Object lbulletwall_5 -other_arch spell_lg_magic_bullet name large bulletwall type 62 activate_on_push 1 @@ -102,16 +101,16 @@ activate_on_release 1 level 1 face lbull_wall.151 sp 5 -dam 29 speed -0.04 no_pick 1 move_block all blocksview 1 visibility 100 magicmap yellow +arch spell_lg_magic_bullet +end end Object lbulletwall_6 -other_arch spell_lg_magic_bullet name large bulletwall type 62 activate_on_push 1 @@ -119,16 +118,16 @@ activate_on_release 1 level 1 face lbull_wall.161 sp 6 -dam 29 speed -0.04 no_pick 1 move_block all blocksview 1 visibility 100 magicmap yellow +arch spell_lg_magic_bullet +end end Object lbulletwall_7 -other_arch spell_lg_magic_bullet name large bulletwall type 62 activate_on_push 1 @@ -136,16 +135,16 @@ activate_on_release 1 level 1 face lbull_wall.171 sp 7 -dam 29 speed -0.04 no_pick 1 move_block all blocksview 1 visibility 100 magicmap yellow +arch spell_lg_magic_bullet +end end Object lbulletwall_8 -other_arch spell_lg_magic_bullet name large bulletwall type 62 activate_on_push 1 @@ -153,11 +152,12 @@ activate_on_release 1 level 1 face lbull_wall.181 sp 8 -dam 29 speed -0.04 no_pick 1 move_block all blocksview 1 visibility 100 magicmap yellow +arch spell_lg_magic_bullet +end end diff --git a/wall/lightningwall/light_wall.arc b/wall/lightningwall/light_wall.arc index 499155de4..df3ea24da 100644 --- a/wall/lightningwall/light_wall.arc +++ b/wall/lightningwall/light_wall.arc @@ -1,11 +1,9 @@ Object lightningwall -other_arch spell_sm_lightning name lightningwall type 62 activate_on_push 1 activate_on_release 1 level 1 -dam 5 face light_wall.101 speed -0.1 no_pick 1 @@ -13,9 +11,10 @@ move_block all blocksview 1 visibility 100 magicmap yellow +arch spell_sm_lightning +end end Object lightningwall_t -other_arch spell_sm_lightning name lightningwall type 62 activate_on_push 1 @@ -34,7 +33,6 @@ light_wall.181 mina sp 1 maxsp 1 -dam 5 is_animated 0 speed -0.04 no_pick 1 @@ -42,9 +40,10 @@ move_block all blocksview 1 visibility 100 magicmap yellow +arch spell_sm_lightning +end end Object lightningwall_1 -other_arch spell_sm_lightning name lightningwall type 62 activate_on_push 1 @@ -52,16 +51,16 @@ activate_on_release 1 level 1 face light_wall.111 sp 1 -dam 5 speed -0.04 no_pick 1 move_block all blocksview 1 visibility 100 magicmap yellow +arch spell_sm_lightning +end end Object lightningwall_2 -other_arch spell_sm_lightning name lightningwall type 62 activate_on_push 1 @@ -72,13 +71,13 @@ sp 2 speed -0.04 no_pick 1 move_block all -dam 5 blocksview 1 visibility 100 magicmap yellow +arch spell_sm_lightning +end end Object lightningwall_3 -other_arch spell_sm_lightning name lightningwall type 62 activate_on_push 1 @@ -86,16 +85,16 @@ activate_on_release 1 level 1 face light_wall.131 sp 3 -dam 5 speed -0.04 no_pick 1 move_block all blocksview 1 visibility 100 magicmap yellow +arch spell_sm_lightning +end end Object lightningwall_4 -other_arch spell_sm_lightning name lightningwall type 62 activate_on_push 1 @@ -103,16 +102,16 @@ activate_on_release 1 level 1 face light_wall.141 sp 4 -dam 5 speed -0.04 no_pick 1 move_block all blocksview 1 visibility 100 magicmap yellow +arch spell_sm_lightning +end end Object lightningwall_5 -other_arch spell_sm_lightning name lightningwall type 62 activate_on_push 1 @@ -120,16 +119,16 @@ activate_on_release 1 level 1 face light_wall.151 sp 5 -dam 5 speed -0.04 no_pick 1 move_block all blocksview 1 visibility 100 magicmap yellow +arch spell_sm_lightning +end end Object lightningwall_6 -other_arch spell_sm_lightning name lightningwall type 62 activate_on_push 1 @@ -137,16 +136,16 @@ activate_on_release 1 level 1 face light_wall.161 sp 6 -dam 5 speed -0.04 no_pick 1 move_block all blocksview 1 visibility 100 magicmap yellow +arch spell_sm_lightning +end end Object lightningwall_7 -other_arch spell_sm_lightning name lightningwall type 62 activate_on_push 1 @@ -154,16 +153,16 @@ activate_on_release 1 level 1 face light_wall.171 sp 7 -dam 5 speed -0.04 no_pick 1 move_block all blocksview 1 visibility 100 magicmap yellow +arch spell_sm_lightning +end end Object lightningwall_8 -other_arch spell_sm_lightning name lightningwall type 62 activate_on_push 1 @@ -171,11 +170,12 @@ activate_on_release 1 level 1 face light_wall.181 sp 8 -dam 5 speed -0.04 no_pick 1 move_block all blocksview 1 visibility 100 magicmap yellow +arch spell_sm_lightning +end end diff --git a/wall/snowstorm_x.arc b/wall/snowstorm_x.arc index ec74f012e..001ed4fea 100644 --- a/wall/snowstorm_x.arc +++ b/wall/snowstorm_x.arc @@ -1,5 +1,4 @@ Object snowstorm_0 -other_arch spell_icestorm level 10 type 62 activate_on_push 1 @@ -7,7 +6,6 @@ activate_on_release 1 face icestorm.113 color_fg grey speed -0.02 -dam 1 ac 3 exp 50 resist_cold 100 @@ -15,4 +13,6 @@ blocksview 0 invisible 1 visibility 100 sp 0 +arch spell_icestorm +end end