From a5c5b717c1eef44d22a33acf7c2f0960527baf22 Mon Sep 17 00:00:00 2001 From: jec Date: Fri, 26 May 2000 09:46:19 +0000 Subject: [PATCH] --- BEGIN apply() cleanup patch --- Jan Echternach 5/26/2000 Added level 1 to all archetypes with type 88 (CONE) that can do damage. ground/chaos.arc, arch chaos and arch major_chaos ground/lava.arc, arch lava and arch permanent_lava Added walk_on 1. ground/chaos_ball.arc, arch chaos_ball magic/banishment.arc, arch banishment magic/colorspray.arc, arch color_spray magic/counterspell.arc, arch counterspell magic/face_of_death.arc, arch face_of_death magic/shockwave.arc, arch shockwave dev/unused/0.91.1/Flyingnote/flyingnote.arc, arch flyingnote magic/Cold/icestorm.arc, arch icestorm magic/Fire/firebreath.arc, arch firebreath magic/Effect/confuse.arc, arch confuse magic/Effect/fear.arc, arch fear magic/Effect/holy_word.arc, arch holy_word magic/Effect/paralyze.arc, arch paralyze magic/Effect/slow.arc, arch slow magic/Effect/turnundead.arc, arch turn_undead magic/Mana/manablast.arc, arch manablast Added walk_on 1 and fly_on 1. connect/trig_altar.arc connect/trig_lever.arc connect/trig_pedes.arc Changes to support bug fixes for trigger types: Replace speed with exp. Set is_animated 0. Remove last face from animation sequence. connect/trig_altar.arc Bugfix: Faces where swapped. connect/trig_button.arc, arch button_trigger New archetype. --- END apply() cleanup patch --- Jan Echternach 5/26/2000 git-svn-id: svn+ssh://svn.code.sf.net/p/crossfire/code/trunk/arch@270 282e977c-c81d-0410-88c4-b93c2d0d6712 --- CHANGES | 41 +++++++++++++++++++++ connect/trig_altar.arc | 6 +-- connect/trig_button.arc | 16 ++++++++ connect/trig_lever.arc | 4 +- connect/trig_pedes.arc | 4 +- dev/unused/0.91.1/Flyingnote/flyingnote.arc | 3 ++ ground/chaos.arc | 4 ++ ground/chaos_ball.arc | 3 ++ ground/lava.arc | 4 ++ ground/thorns.arc | 1 + inorganic/dust_effect.arc | 1 + magic/Cold/icestorm.arc | 3 ++ magic/Effect/confuse.arc | 3 ++ magic/Effect/fear.arc | 3 ++ magic/Effect/holy_word.arc | 3 ++ magic/Effect/paralyze.arc | 3 ++ magic/Effect/slow.arc | 3 ++ magic/Effect/turnundead.arc | 3 ++ magic/Fire/firebreath.arc | 3 ++ magic/Mana/manablast.arc | 3 ++ magic/banishment.arc | 3 ++ magic/colorspray.arc | 3 ++ magic/counterspell.arc | 3 ++ magic/face_of_death.arc | 3 ++ magic/flowers.arc | 1 + magic/shockwave.arc | 3 ++ 26 files changed, 123 insertions(+), 7 deletions(-) create mode 100644 connect/trig_button.arc diff --git a/CHANGES b/CHANGES index a1f9e1ef2..27ab41661 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,46 @@ Changes for CVS top of tree: +--- BEGIN apply() cleanup patch --- Jan Echternach 5/26/2000 + +Added level 1 to all archetypes with type 88 (CONE) that can do damage. + +ground/chaos.arc, arch chaos and arch major_chaos +ground/lava.arc, arch lava and arch permanent_lava +Added walk_on 1. + +ground/chaos_ball.arc, arch chaos_ball +magic/banishment.arc, arch banishment +magic/colorspray.arc, arch color_spray +magic/counterspell.arc, arch counterspell +magic/face_of_death.arc, arch face_of_death +magic/shockwave.arc, arch shockwave +dev/unused/0.91.1/Flyingnote/flyingnote.arc, arch flyingnote +magic/Cold/icestorm.arc, arch icestorm +magic/Fire/firebreath.arc, arch firebreath +magic/Effect/confuse.arc, arch confuse +magic/Effect/fear.arc, arch fear +magic/Effect/holy_word.arc, arch holy_word +magic/Effect/paralyze.arc, arch paralyze +magic/Effect/slow.arc, arch slow +magic/Effect/turnundead.arc, arch turn_undead +magic/Mana/manablast.arc, arch manablast +Added walk_on 1 and fly_on 1. + +connect/trig_altar.arc +connect/trig_lever.arc +connect/trig_pedes.arc +Changes to support bug fixes for trigger types: Replace speed with exp. +Set is_animated 0. Remove last face from animation sequence. + +connect/trig_altar.arc +Bugfix: Faces where swapped. + +connect/trig_button.arc, arch button_trigger +New archetype. + +--- END apply() cleanup patch --- Jan Echternach 5/26/2000 + + Added level 1 to all archetypes with type 5 (POTION), because these archetypes are spellcasters and therefore need a level. - Jan Echternach 5/24/2000 diff --git a/connect/trig_altar.arc b/connect/trig_altar.arc index 1c9c4e39e..5e4d6bfff 100644 --- a/connect/trig_altar.arc +++ b/connect/trig_altar.arc @@ -3,13 +3,13 @@ name altar slaying food food 5 type 31 -speed 0.2 -face altar.112 +exp 30 +face altar.111 anim -altar.112 altar.111 altar.112 mina +is_animated 0 no_pick 1 walk_on 1 editable 48 diff --git a/connect/trig_button.arc b/connect/trig_button.arc new file mode 100644 index 000000000..54c717734 --- /dev/null +++ b/connect/trig_button.arc @@ -0,0 +1,16 @@ +Object button_trigger +name button +type 30 +face button_sma.111 +anim +button_sma.111 +button_sma.112 +mina +is_animated 0 +exp 30 +no_pick 1 +walk_on 1 +walk_off 1 +editable 48 +visibility 50 +end diff --git a/connect/trig_lever.arc b/connect/trig_lever.arc index 670b90cdb..c92fdedd8 100644 --- a/connect/trig_lever.arc +++ b/connect/trig_lever.arc @@ -6,9 +6,9 @@ no_pick 1 anim handle.111 handle.112 -handle.111 mina -speed 0.2 +is_animated 0 +exp 30 editable 48 visibility 50 end diff --git a/connect/trig_pedes.arc b/connect/trig_pedes.arc index 3f9cd943a..a7b48872d 100644 --- a/connect/trig_pedes.arc +++ b/connect/trig_pedes.arc @@ -6,9 +6,9 @@ face pedestal.112 anim pedestal.112 pedestal.111 -pedestal.112 mina -speed 0.05 +is_animated 0 +exp 30 no_pick 1 walk_on 1 walk_off 1 diff --git a/dev/unused/0.91.1/Flyingnote/flyingnote.arc b/dev/unused/0.91.1/Flyingnote/flyingnote.arc index 125e1905f..74cf99623 100644 --- a/dev/unused/0.91.1/Flyingnote/flyingnote.arc +++ b/dev/unused/0.91.1/Flyingnote/flyingnote.arc @@ -1,6 +1,9 @@ Object flying_note name music type 88 +level 1 +walk_on 1 +fly_on 1 face flyingnote.111 anim flyingnote.111 diff --git a/ground/chaos.arc b/ground/chaos.arc index 802ad30de..58dce5254 100644 --- a/ground/chaos.arc +++ b/ground/chaos.arc @@ -1,5 +1,7 @@ Object chaos type 88 +walk_on 1 +level 1 wc -30 lifesave 1 name chaos @@ -27,6 +29,8 @@ is_floor 1 end Object major_chaos type 88 +walk_on 1 +level 1 wc -30 lifesave 1 name chaos diff --git a/ground/chaos_ball.arc b/ground/chaos_ball.arc index cae9f134c..08970fa5b 100644 --- a/ground/chaos_ball.arc +++ b/ground/chaos_ball.arc @@ -1,6 +1,9 @@ Object chaos_ball name chaos type 88 +level 1 +walk_on 1 +fly_on 1 wc -30 lifesave 1 face ball_lightning.111 diff --git a/ground/lava.arc b/ground/lava.arc index 05e1c898d..99e39b96a 100644 --- a/ground/lava.arc +++ b/ground/lava.arc @@ -1,5 +1,7 @@ Object lava type 88 +level 1 +walk_on 1 wc -30 food 1 name lava @@ -23,6 +25,8 @@ editable 8 end Object permanent_lava type 88 +level 1 +walk_on 1 wc -30 lifesave 1 name lava diff --git a/ground/thorns.arc b/ground/thorns.arc index 5099a9f5e..c17347b90 100644 --- a/ground/thorns.arc +++ b/ground/thorns.arc @@ -1,5 +1,6 @@ Object thorns type 88 +level 1 wc -1 food 1 name thorns diff --git a/inorganic/dust_effect.arc b/inorganic/dust_effect.arc index 8f25c0117..f32bcec64 100644 --- a/inorganic/dust_effect.arc +++ b/inorganic/dust_effect.arc @@ -1,6 +1,7 @@ Object dust_effect name cloud of dust type 88 +level 1 face dust_effect.111 color_fg brown color_bg khaki diff --git a/magic/Cold/icestorm.arc b/magic/Cold/icestorm.arc index ca1868231..2243f31d3 100644 --- a/magic/Cold/icestorm.arc +++ b/magic/Cold/icestorm.arc @@ -1,6 +1,9 @@ Object icestorm name icestorm type 88 +level 1 +walk_on 1 +fly_on 1 face icestorm.111 color_fg light_blue color_bg white diff --git a/magic/Effect/confuse.arc b/magic/Effect/confuse.arc index 28cf048a3..c94403efd 100644 --- a/magic/Effect/confuse.arc +++ b/magic/Effect/confuse.arc @@ -1,6 +1,9 @@ Object confuse name madness type 88 +level 1 +walk_on 1 +fly_on 1 face confusion.111 anim confusion.111 diff --git a/magic/Effect/fear.arc b/magic/Effect/fear.arc index 36f585c34..95d6fd059 100644 --- a/magic/Effect/fear.arc +++ b/magic/Effect/fear.arc @@ -1,5 +1,8 @@ Object fear type 88 +level 1 +walk_on 1 +fly_on 1 face fear.111 anim fear.111 diff --git a/magic/Effect/holy_word.arc b/magic/Effect/holy_word.arc index 90669fada..ef05a6836 100644 --- a/magic/Effect/holy_word.arc +++ b/magic/Effect/holy_word.arc @@ -1,6 +1,9 @@ Object holy_word name fear type 88 +level 1 +walk_on 1 +fly_on 1 slaying undead,demon face turnundead.111 anim diff --git a/magic/Effect/paralyze.arc b/magic/Effect/paralyze.arc index 2957e0081..952f92a53 100644 --- a/magic/Effect/paralyze.arc +++ b/magic/Effect/paralyze.arc @@ -1,6 +1,9 @@ Object paralyze name stars type 88 +level 1 +walk_on 1 +fly_on 1 face paralyse.111 color_fg dark_orange anim diff --git a/magic/Effect/slow.arc b/magic/Effect/slow.arc index 313f962a9..c14019f2b 100644 --- a/magic/Effect/slow.arc +++ b/magic/Effect/slow.arc @@ -1,5 +1,8 @@ Object slow type 88 +level 1 +walk_on 1 +fly_on 1 face slow.111 anim slow.111 diff --git a/magic/Effect/turnundead.arc b/magic/Effect/turnundead.arc index 96a96db57..1d3f26b75 100644 --- a/magic/Effect/turnundead.arc +++ b/magic/Effect/turnundead.arc @@ -1,6 +1,9 @@ Object turn_undead name fear type 88 +level 1 +walk_on 1 +fly_on 1 face turnundead.111 anim turnundead.111 diff --git a/magic/Fire/firebreath.arc b/magic/Fire/firebreath.arc index f4333bded..0fadcfe93 100644 --- a/magic/Fire/firebreath.arc +++ b/magic/Fire/firebreath.arc @@ -1,6 +1,9 @@ Object firebreath name fire type 88 +level 1 +walk_on 1 +fly_on 1 face fireball.111 color_fg red anim diff --git a/magic/Mana/manablast.arc b/magic/Mana/manablast.arc index 0b35d4114..0f8198313 100644 --- a/magic/Mana/manablast.arc +++ b/magic/Mana/manablast.arc @@ -1,6 +1,9 @@ Object manablast name mana blast type 88 +level 1 +walk_on 1 +fly_on 1 face destruction.111 magicmap light_blue anim diff --git a/magic/banishment.arc b/magic/banishment.arc index 61a94b89a..525a5b0a0 100644 --- a/magic/banishment.arc +++ b/magic/banishment.arc @@ -2,6 +2,9 @@ Object banishment name banishment slaying undead type 88 +level 1 +walk_on 1 +fly_on 1 face turnundead.111 anim turnundead.111 diff --git a/magic/colorspray.arc b/magic/colorspray.arc index 0ccb6db69..7d6edd370 100644 --- a/magic/colorspray.arc +++ b/magic/colorspray.arc @@ -1,6 +1,9 @@ Object color_spray name color spray type 88 +level 1 +walk_on 1 +fly_on 1 face confusion.111 anim explosion.111 diff --git a/magic/counterspell.arc b/magic/counterspell.arc index cf3d042b2..b783246e5 100644 --- a/magic/counterspell.arc +++ b/magic/counterspell.arc @@ -1,6 +1,9 @@ Object counterspell name counterspell type 88 +level 1 +walk_on 1 +fly_on 1 face counterspell.111 hp 8 color_fg light_blue diff --git a/magic/face_of_death.arc b/magic/face_of_death.arc index fa138490b..259de5410 100644 --- a/magic/face_of_death.arc +++ b/magic/face_of_death.arc @@ -1,6 +1,9 @@ Object face_of_death name deathstrike type 88 +level 1 +walk_on 1 +fly_on 1 face face_of_death.111 speed 1 attacktype 131072 diff --git a/magic/flowers.arc b/magic/flowers.arc index 17abbc061..ee0e1cb00 100644 --- a/magic/flowers.arc +++ b/magic/flowers.arc @@ -1,6 +1,7 @@ Object flowers name flower type 88 +level 1 face flowers.111 material 32 speed 0.5 diff --git a/magic/shockwave.arc b/magic/shockwave.arc index 330d057cb..6787dbb6a 100644 --- a/magic/shockwave.arc +++ b/magic/shockwave.arc @@ -1,6 +1,9 @@ Object shockwave name shockwave type 88 +level 1 +walk_on 1 +fly_on 1 face explosion.111 anim explosion.111