From fc0c353b444dd2826cb25da342cfb2cc80bc92f5 Mon Sep 17 00:00:00 2001 From: ryo_saeba Date: Sat, 12 May 2007 20:35:15 +0000 Subject: [PATCH] Remove obsolete fields. Other changes due to editor. git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@6238 282e977c-c81d-0410-88c4-b93c2d0d6712 --- quests/greyshield/Finish | 8 +- quests/greyshield/GreyMaster | 6 +- quests/greyshield/Greysword | 2 +- quests/mak/chaos/monsters.pick | 428 +++++++++++++-------------- quests/peterm/CTower/Chamber | 1 - quests/peterm/Demonology/AirTower2 | 74 ++--- quests/peterm/Demonology/EarthMaster | 5 +- quests/peterm/Demonology/EarthTower2 | 72 ++--- quests/peterm/Demonology/FireMaster | 5 +- quests/peterm/Demonology/FireTower2 | 72 ++--- quests/peterm/Demonology/WaterMaster | 5 +- quests/peterm/Demonology/WaterTower2 | 72 ++--- 12 files changed, 366 insertions(+), 384 deletions(-) diff --git a/quests/greyshield/Finish b/quests/greyshield/Finish index b80bdc08c..d692ccd88 100644 --- a/quests/greyshield/Finish +++ b/quests/greyshield/Finish @@ -2406,7 +2406,6 @@ end arch holy_shield name Greyshield msg - The arts that crafted this shield have long been lost. The Grey Master's works are but a distant shadow of the might contained in @@ -2419,7 +2418,6 @@ But looking back at the shield, you decide that it certainly doesn't emit any light. As a matter of fact, it looks as if it would absorb light, were that possible... - endmsg Dex 3 Con 3 @@ -2428,6 +2426,11 @@ Cha -3 ac 8 x 20 y 11 +resist_physical 100 +resist_magic 100 +resist_fire 100 +resist_electricity 100 +resist_cold 100 material 256 value 1000 weight 5000 @@ -2436,7 +2439,6 @@ glow_radius 5 identified 1 reflect_missile 1 reflect_spell 1 -immune 31 end arch teleporter hp 7 diff --git a/quests/greyshield/GreyMaster b/quests/greyshield/GreyMaster index 88a2f1fc4..7a40a948b 100644 --- a/quests/greyshield/GreyMaster +++ b/quests/greyshield/GreyMaster @@ -53,10 +53,12 @@ sp 1000 maxsp 1000 exp 200000 y 9 -speed 4.000000 +speed 4.0 attack_movement 103 +resist_physical 100 +resist_magic 100 +resist_cold 100 carrying 1 -immune 4127 arch eye name silver ball face shell.111 diff --git a/quests/greyshield/Greysword b/quests/greyshield/Greysword index 6ed92d75c..922064af4 100644 --- a/quests/greyshield/Greysword +++ b/quests/greyshield/Greysword @@ -2545,9 +2545,9 @@ Cha -2 x 17 y 8 attacktype 257 +resist_magic 30 material 256 magic 5 -protected 2 end arch teleporter name teleporter1 diff --git a/quests/mak/chaos/monsters.pick b/quests/mak/chaos/monsters.pick index a09e0bf96..01aeb5221 100644 --- a/quests/mak/chaos/monsters.pick +++ b/quests/mak/chaos/monsters.pick @@ -1,5 +1,7 @@ arch map name Bogustest +width 16 +height 16 msg Creator: Gnat the Gnu Email: gnu@foo.bar @@ -29,25 +31,20 @@ ac -8 y 2 speed 0.200000 level 13 -immune 2 carrying 100 undead 1 stand_still 1 -arch ability_paralyze -end -arch ability_fear -end -arch ability_coldspell -end -arch ability_cold -end -arch ability_cold -end arch key2 name Priest of Devourers head slaying cp_head_d face head.111 end +arch spell_large_icestorm +end +arch spell_paralyze +end +arch abil_fear +end end arch c_knight Str 40 @@ -62,17 +59,20 @@ dam 20 wc -20 ac -15 y 4 -speed -0.700000 +speed -0.7 level 20 -immune 282665 attacktype 262145 +resist_physical 100 +resist_electricity 100 +resist_confusion 100 +resist_paralyze 100 carrying 13000 see_invisible 1 arch falchion name wicked sabre dam 25 attacktype 262145 -vulnerable 256 +resist_weaponmagic -100 last_sp 4 end end @@ -92,9 +92,8 @@ ac -15 y 7 speed -0.800000 level 20 -immune 20512 -protected 1 attacktype 256 +resist_physical 100 carrying 20000 see_invisible 1 unaggressive 0 @@ -105,7 +104,7 @@ slaying unnatural dam 15 nrof 2 attacktype 256 -vulnerable 128 +resist_drain -100 weight 10000 magic 4 last_sp 0 @@ -132,15 +131,15 @@ wc -10 ac -8 x 1 y 2 -speed 0.400000 +speed 0.4 level 10 -immune 20496 +resist_cold 100 +resist_slow 100 +resist_fear 100 see_invisible 1 undead 1 stand_still 1 -arch ability_coldspell -end -arch ability_cold +arch spell_large_icestorm end end arch c_priest @@ -160,13 +159,16 @@ wc -10 ac -8 x 1 y 4 -speed -0.400000 +speed -0.4 level 13 -immune 282662 +resist_magic 100 +resist_fire 100 +resist_confusion 100 +resist_slow 100 see_invisible 1 -arch ability_hellfire +arch spell_hellfire end -arch ability_dragon +arch ability_dragonbreath end end arch dwarf_priest @@ -188,8 +190,7 @@ y 7 speed -0.400000 attack_movement 7 level 20 -immune 20512 -protected 2 +resist_magic 100 see_invisible 1 unaggressive 0 arch ability_heal @@ -226,23 +227,19 @@ speed 0.200000 level 13 carrying 100 stand_still 1 -arch ability_dragon -end -arch ability_wyvern -end -arch ability_paralyze -end -arch ability_fear -end -arch ability_dragon -end -arch ability_fire -end arch key2 name Priest of Ruggillis head slaying cp_head_d face head.111 end +arch abil_fear +end +arch ability_dragonbreath +end +arch spell_paralyze +end +arch spell_large_fireball +end end arch a_priest name acolyte @@ -270,11 +267,9 @@ see_invisible 1 stand_still 1 arch ability_summon_fire end -arch ability_fire +arch spell_large_fireball end -arch ability_fire -end -arch ability_firespell +arch spell_burning_hands end end arch broo @@ -295,9 +290,12 @@ wc -20 ac -12 x 2 y 4 -speed -0.400000 +speed -0.4 level 22 -immune 283684 +resist_fire 100 +resist_confusion 100 +resist_ghosthit 100 +resist_slow 100 see_invisible 1 can_cast_spell 1 arch ability_paralyze @@ -329,8 +327,7 @@ x 2 y 7 speed -0.400000 level 22 -immune 20528 -protected 2 +resist_magic 100 see_invisible 1 arch ability_mass_confusion end @@ -366,13 +363,13 @@ speed 0.400000 level 10 see_invisible 1 stand_still 1 -arch ability_missile +arch spell_cause_light_wounds end -arch ability_cause_lig_wound +arch spell_cause_medium_wounds end -arch ability_cause_med_wound +arch spell_cause_heavy_wounds end -arch ability_cause_ser_wound +arch spell_magic_missile end end arch unusual_kobold @@ -408,23 +405,21 @@ speed 0.200000 level 13 carrying 100 stand_still 1 -arch ability_speedball -end -arch ability_cause_med_wound -end -arch ability_paralyze -end -arch ability_fear -end -arch ability_cause_ser_wound -end -arch ability_cause_ser_wound -end arch key2 name Priest of Gorokhs head slaying cp_head_g face head.111 end +arch spell_cause_light_wounds +end +arch spell_cause_heavy_wounds +end +arch spell_cause_medium_wounds +end +arch spell_fear +end +arch spell_paralyze +end end arch h_kobold name rabid kobold @@ -448,16 +443,14 @@ exp 150000 dam 50 wc -15 ac -10 -armour 50 x 5 y 4 speed -0.350000 level 25 -immune 282658 -protected 1 see_invisible 1 can_cast_spell 1 stand_still 0 +armour 1 arch ability_fear end arch ability_paralyze @@ -477,9 +470,6 @@ x 5 y 7 speed -0.400000 level 25 -immune 152254 -protected 1 -vulnerable 64 end arch c_priest name High Priest of Chaos @@ -499,21 +489,22 @@ wc -15 ac -13 x 6 level 25 -immune 262150 +resist_magic 100 +resist_fire 100 stand_still 1 -arch ability_pool_chaos +arch spell_hellfire end -arch ability_slow +arch spell_hellfire end -arch ability_paralyze +arch spell_paralyze end -arch ability_fear +arch abil_fear end -arch ability_dragon +arch abil_slow end -arch ability_hellfire +arch ability_dragonbreath end -arch ability_hellfire +arch spell_create_pool_of_chaos end end arch c_priest @@ -533,14 +524,15 @@ wc -10 ac -8 x 6 y 2 -speed -0.400000 +speed -0.4 level 13 -immune 262150 +resist_magic 100 +resist_fire 100 see_invisible 1 stand_still 1 -arch ability_hellfire +arch ability_dragonbreath end -arch ability_dragon +arch spell_hellfire end end arch lokanth @@ -559,9 +551,11 @@ wc -20 ac -15 x 6 y 4 -speed -0.400000 +speed -0.4 level 31 -immune 21600 +resist_confusion 100 +resist_ghosthit 100 +resist_slow 100 see_invisible 1 arch ability_fear end @@ -583,13 +577,12 @@ exp 250000 dam 25 wc -20 ac -15 -armour 30 x 6 y 7 speed -0.600000 level 31 -immune 20514 attacktype 2 +armour 20514 arch ability_speedball end arch ability_missile @@ -616,17 +609,18 @@ wc -35 ac -30 x 7 y 4 -speed -0.400000 +speed -0.4 level 40 -immune 283680 attacktype 283648 +resist_acid 100 +resist_paralyze 100 see_invisible 1 can_cast_spell 1 -arch ability_fear +arch abil_fear end -arch ability_fear +arch abil_fear end -arch ability_pool_chaos +arch spell_create_pool_of_chaos end end arch dwarf_wiz @@ -644,10 +638,12 @@ wc -30 ac -25 x 7 y 7 -speed -0.400000 +speed -0.4 level 40 -immune 20512 -protected 30 +resist_magic 100 +resist_fire 100 +resist_electricity 100 +resist_cold 100 see_invisible 1 unaggressive 0 arch ability_slow @@ -661,16 +657,93 @@ end arch ability_lightning end end -arch book -name rainbow colored spellbook -msg -This spellbook ripples with the -colors of the rainbow -endmsg -sp 85 -x 7 -y 11 -value 30000 +arch byakie +name cave byakie +Str 90 +Dex 65 +Con 90 +Wis 20 +Pow 75 +Int 30 +hp 10000 +maxhp 8000 +sp 200 +maxsp 200 +exp 700000 +dam 60 +wc -50 +ac -40 +x 8 +y 4 +speed -0.7 +level 50 +resist_confusion 100 +resist_ghosthit 100 +resist_slow 100 +carrying 25000 +arch gem +nrof 500 +end +arch abil_slow +end +arch ability_dragonbreath +end +arch abil_large_icestorm +end +end +arch djinn +Str 75 +Dex 60 +Con 90 +Wis 30 +Pow 127 +Int 75 +hp 10000 +maxhp 10000 +sp 500 +maxsp 500 +exp 750000 +dam 40 +wc -45 +ac -60 +x 8 +y 6 +speed 0.9 +level 75 +resist_confusion 100 +resist_slow 100 +resist_paralyze 100 +resist_death 100 +carrying 650 +arch gem +title of exceptional beauty +face pretty_crystal.111 +speed 0.000000 +nrof 10 +value 40000 +weight 65 +is_animated 0 +end +arch ability_cold +end +arch ability_fire +end +arch ability_fear +end +arch ability_heal +end +arch ability_lightning +end +arch ability_paralyze +end +arch ability_poison +end +arch ability_mass_confusion +end +arch ability_paralyze +end +arch ability_speedball +end end arch turban name shimmering turban @@ -685,13 +758,13 @@ Int 2 hp 1 sp 1 ac 2 -armour 5 x 9 y 12 value 1000000 last_heal 0 glow_radius 2 identified 1 +armour 5 end arch key2 name a sharpedged key @@ -711,20 +784,17 @@ maxsp 500 exp 1000000 dam 80 ac -40 -armour 50 x 10 y 4 speed -0.600000 attack_movement 0 level 99 -immune 393728 -protected 21679 attacktype 262657 -vulnerable 0 carrying 4250 see_invisible 1 unaggressive 0 can_cast_spell 1 +armour 0 arch ability_slow end arch ability_speedball @@ -771,26 +841,14 @@ wc -50 ac -40 x 10 y 7 -speed -0.500000 +speed -0.5 attack_movement 0 level 99 -immune 151557 -protected 3504 attacktype 257 -vulnerable 2 +resist_magic 100 carrying 3254 see_invisible 1 can_cast_spell 1 -arch ability_bullet -end -arch ability_fire -end -arch ability_fear -end -arch ability_heal -end -arch ability_paralyze -end arch heart name a still beating heart material 0 @@ -804,6 +862,16 @@ value 40000 weight 65 is_animated 0 end +arch abil_fear +end +arch abil_burning_hands +end +arch spell_paralyze +end +arch spell_heal +end +arch spell_magic_bullet +end end arch uk_sd name twilight vengeance @@ -811,8 +879,8 @@ slaying human dam 65 x 10 y 12 -protected 262144 attacktype 256 +resist_chaos 30 material 256 magic 5 last_sp 2 @@ -836,121 +904,35 @@ wc -70 ac -60 x 12 y 5 -speed 1.000000 +speed 1.0 speed_left -0.860000 attack_movement 8 level 127 -immune 1529461 -protected 394 attacktype 22817 +resist_magic 100 +resist_electricity 100 +resist_drain 100 +resist_weaponmagic 100 carrying 100 reflect_spell 1 arch key2 name a white shimmering key slaying Lorkas treasure key end -arch ability_speedball +arch abil_large_icestorm end -arch ability_poison +arch ability_dragonbreath end -arch ability_paralyze +arch abil_fear end -arch ability_mass_confusion -name comet spell -sp 90 -attacktype 0 +arch spell_heal end -arch ability_lightning +arch spell_forked_lightning end -arch ability_heal +arch spell_comet end -arch ability_fear +arch abil_poison_cloud end -arch ability_dragon -end -arch ability_cold -end -end -arch byakie -name cave byakie -Str 90 -Dex 65 -Con 90 -Wis 20 -Pow 75 -Int 30 -hp 10000 -maxhp 8000 -sp 200 -maxsp 200 -exp 700000 -dam 60 -wc -50 -ac -40 -x 8 -y 4 -speed -0.700000 -level 50 -immune 283683 -carrying 25000 -arch gem -nrof 500 -end -arch ability_cold -end -arch ability_dragon -end -arch ability_slow -end -end -arch djinn -Str 75 -Dex 60 -Con 90 -Wis 30 -Pow 127 -Int 75 -hp 10000 -maxhp 10000 -sp 500 -maxsp 500 -exp 750000 -dam 40 -wc -45 -ac -60 -x 8 -y 6 -speed 0.900000 -level 75 -immune 153215 -carrying 650 -arch gem -title of exceptional beauty -face pretty_crystal.111 -speed 0.000000 -nrof 10 -value 40000 -weight 65 -is_animated 0 -end -arch ability_cold -end -arch ability_fire -end -arch ability_fear -end -arch ability_heal -end -arch ability_lightning -end -arch ability_paralyze -end -arch ability_poison -end -arch ability_mass_confusion -end -arch ability_paralyze -end -arch ability_speedball +arch spell_paralyze end end diff --git a/quests/peterm/CTower/Chamber b/quests/peterm/CTower/Chamber index ae551c651..6c8ff5eee 100644 --- a/quests/peterm/CTower/Chamber +++ b/quests/peterm/CTower/Chamber @@ -218,7 +218,6 @@ y 8 speed 0.200000 level 6 sleep 0 -protected 0 end arch woodfloor x 6 diff --git a/quests/peterm/Demonology/AirTower2 b/quests/peterm/Demonology/AirTower2 index f28dbbfbd..ac6d229cc 100644 --- a/quests/peterm/Demonology/AirTower2 +++ b/quests/peterm/Demonology/AirTower2 @@ -22,8 +22,8 @@ dam 13 ac -3 speed -0.050000 level 15 +resist_magic 100 alive 1 -immune 2 end arch woodfloor y 1 @@ -41,8 +41,8 @@ ac -3 y 1 speed -0.050000 level 15 +resist_magic 100 alive 1 -immune 2 end arch woodfloor y 2 @@ -60,8 +60,8 @@ ac -3 y 2 speed -0.050000 level 15 +resist_magic 100 alive 1 -immune 2 end arch woodfloor y 3 @@ -79,8 +79,8 @@ ac -3 y 3 speed -0.050000 level 15 +resist_magic 100 alive 1 -immune 2 end arch woodfloor y 4 @@ -98,8 +98,8 @@ ac -3 y 4 speed -0.050000 level 15 +resist_magic 100 alive 1 -immune 2 end arch woodfloor y 5 @@ -117,8 +117,8 @@ ac -3 y 5 speed -0.050000 level 15 +resist_magic 100 alive 1 -immune 2 end arch woodfloor y 6 @@ -136,8 +136,8 @@ ac -3 y 6 speed -0.050000 level 15 +resist_magic 100 alive 1 -immune 2 end arch woodfloor y 7 @@ -155,8 +155,8 @@ ac -3 y 7 speed -0.050000 level 15 +resist_magic 100 alive 1 -immune 2 end arch woodfloor y 8 @@ -174,8 +174,8 @@ ac -3 y 8 speed -0.050000 level 15 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 1 @@ -193,8 +193,8 @@ ac -3 x 1 speed -0.050000 level 15 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 1 @@ -250,8 +250,8 @@ x 1 y 8 speed -0.050000 level 15 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 2 @@ -269,8 +269,8 @@ ac -3 x 2 speed -0.050000 level 15 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 2 @@ -319,8 +319,8 @@ x 2 y 8 speed -0.050000 level 15 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 3 @@ -338,8 +338,8 @@ ac -3 x 3 speed -0.050000 level 15 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 3 @@ -364,7 +364,7 @@ x 3 y 3 speed -0.050000 level 15 -immune 2 +resist_magic 100 end arch woodfloor x 3 @@ -390,7 +390,7 @@ x 3 y 5 speed -0.050000 level 15 -immune 2 +resist_magic 100 end arch woodfloor x 3 @@ -419,8 +419,8 @@ x 3 y 8 speed -0.050000 level 15 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 4 @@ -438,8 +438,8 @@ ac -3 x 4 speed -0.050000 level 15 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 4 @@ -488,8 +488,8 @@ x 4 y 8 speed -0.050000 level 15 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 5 @@ -507,8 +507,8 @@ ac -3 x 5 speed -0.050000 level 15 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 5 @@ -533,7 +533,7 @@ x 5 y 3 speed -0.050000 level 15 -immune 2 +resist_magic 100 end arch woodfloor x 5 @@ -552,9 +552,9 @@ dam 13 ac -3 x 5 y 5 -speed -0.050000 +speed -0.05 level 15 -immune 2 +resist_magic 100 end arch woodfloor x 5 @@ -583,8 +583,8 @@ x 5 y 8 speed -0.050000 level 15 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 6 @@ -602,8 +602,8 @@ ac -3 x 6 speed -0.050000 level 15 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 6 @@ -662,8 +662,8 @@ x 6 y 8 speed -0.050000 level 15 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 7 @@ -681,8 +681,8 @@ ac -3 x 7 speed -0.050000 level 15 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 7 @@ -751,8 +751,8 @@ x 7 y 8 speed -0.050000 level 15 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 8 @@ -770,8 +770,8 @@ ac -3 x 8 speed -0.050000 level 15 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 8 @@ -792,8 +792,8 @@ x 8 y 1 speed -0.050000 level 15 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 8 @@ -814,8 +814,8 @@ x 8 y 2 speed -0.050000 level 15 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 8 @@ -836,8 +836,8 @@ x 8 y 3 speed -0.050000 level 15 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 8 @@ -858,8 +858,8 @@ x 8 y 4 speed -0.050000 level 15 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 8 @@ -880,8 +880,8 @@ x 8 y 5 speed -0.050000 level 15 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 8 @@ -902,8 +902,8 @@ x 8 y 6 speed -0.050000 level 15 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 8 @@ -924,8 +924,8 @@ x 8 y 7 speed -0.050000 level 15 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 8 @@ -946,6 +946,6 @@ x 8 y 8 speed -0.050000 level 15 +resist_magic 100 alive 1 -immune 2 end diff --git a/quests/peterm/Demonology/EarthMaster b/quests/peterm/Demonology/EarthMaster index 26578fab7..c46f64a5d 100644 --- a/quests/peterm/Demonology/EarthMaster +++ b/quests/peterm/Demonology/EarthMaster @@ -258,7 +258,6 @@ end arch wizard name Master Earth Summoner Str 0 -Dex 0 Con 6 Wis 20 Int 11 @@ -275,11 +274,11 @@ speed 0.320000 attack_movement 7 level 30 type 0 +resist_cold 100 carrying 100 -monster 1 move_type walk +monster 1 can_cast_spell 1 -immune 16 arch spell_summon_earth_elemental end arch key2 diff --git a/quests/peterm/Demonology/EarthTower2 b/quests/peterm/Demonology/EarthTower2 index a462a3199..b946e94cf 100644 --- a/quests/peterm/Demonology/EarthTower2 +++ b/quests/peterm/Demonology/EarthTower2 @@ -22,8 +22,8 @@ dam 11 ac -5 speed -0.070000 level 20 +resist_magic 100 alive 1 -immune 2 end arch woodfloor y 1 @@ -41,8 +41,8 @@ ac -5 y 1 speed -0.070000 level 20 +resist_magic 100 alive 1 -immune 2 end arch woodfloor y 2 @@ -60,8 +60,8 @@ ac -5 y 2 speed -0.070000 level 20 +resist_magic 100 alive 1 -immune 2 end arch woodfloor y 3 @@ -79,8 +79,8 @@ ac -5 y 3 speed -0.070000 level 20 +resist_magic 100 alive 1 -immune 2 end arch woodfloor y 4 @@ -98,8 +98,8 @@ ac -5 y 4 speed -0.070000 level 20 +resist_magic 100 alive 1 -immune 2 end arch woodfloor y 5 @@ -117,8 +117,8 @@ ac -5 y 5 speed -0.070000 level 20 +resist_magic 100 alive 1 -immune 2 end arch woodfloor y 6 @@ -136,8 +136,8 @@ ac -5 y 6 speed -0.070000 level 20 +resist_magic 100 alive 1 -immune 2 end arch woodfloor y 7 @@ -155,8 +155,8 @@ ac -5 y 7 speed -0.070000 level 20 +resist_magic 100 alive 1 -immune 2 end arch woodfloor y 8 @@ -174,8 +174,8 @@ ac -5 y 8 speed -0.070000 level 20 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 1 @@ -193,8 +193,8 @@ ac -5 x 1 speed -0.070000 level 20 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 1 @@ -250,8 +250,8 @@ x 1 y 8 speed -0.070000 level 20 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 2 @@ -269,8 +269,8 @@ ac -5 x 2 speed -0.070000 level 20 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 2 @@ -319,8 +319,8 @@ x 2 y 8 speed -0.070000 level 20 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 3 @@ -338,8 +338,8 @@ ac -5 x 3 speed -0.070000 level 20 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 3 @@ -369,7 +369,7 @@ x 3 y 3 speed -0.070000 level 20 -immune 2 +resist_magic 100 end arch woodfloor x 3 @@ -390,7 +390,7 @@ x 3 y 5 speed -0.070000 level 20 -immune 2 +resist_magic 100 end arch woodfloor x 3 @@ -419,8 +419,8 @@ x 3 y 8 speed -0.070000 level 20 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 4 @@ -438,8 +438,8 @@ ac -5 x 4 speed -0.070000 level 20 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 4 @@ -488,8 +488,8 @@ x 4 y 8 speed -0.070000 level 20 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 5 @@ -507,8 +507,8 @@ ac -5 x 5 speed -0.070000 level 20 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 5 @@ -533,7 +533,7 @@ x 5 y 3 speed -0.070000 level 20 -immune 2 +resist_magic 100 end arch woodfloor x 5 @@ -554,7 +554,7 @@ x 5 y 5 speed -0.070000 level 20 -immune 2 +resist_magic 100 end arch woodfloor x 5 @@ -583,8 +583,8 @@ x 5 y 8 speed -0.070000 level 20 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 6 @@ -602,8 +602,8 @@ ac -5 x 6 speed -0.070000 level 20 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 6 @@ -662,8 +662,8 @@ x 6 y 8 speed -0.070000 level 20 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 7 @@ -681,8 +681,8 @@ ac -5 x 7 speed -0.070000 level 20 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 7 @@ -752,8 +752,8 @@ x 7 y 8 speed -0.070000 level 20 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 8 @@ -771,8 +771,8 @@ ac -5 x 8 speed -0.070000 level 20 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 8 @@ -793,8 +793,8 @@ x 8 y 1 speed -0.070000 level 20 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 8 @@ -815,8 +815,8 @@ x 8 y 2 speed -0.070000 level 20 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 8 @@ -837,8 +837,8 @@ x 8 y 3 speed -0.070000 level 20 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 8 @@ -859,8 +859,8 @@ x 8 y 4 speed -0.070000 level 20 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 8 @@ -881,8 +881,8 @@ x 8 y 5 speed -0.070000 level 20 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 8 @@ -903,8 +903,8 @@ x 8 y 6 speed -0.070000 level 20 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 8 @@ -925,8 +925,8 @@ x 8 y 7 speed -0.070000 level 20 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 8 @@ -947,6 +947,6 @@ x 8 y 8 speed -0.070000 level 20 +resist_magic 100 alive 1 -immune 2 end diff --git a/quests/peterm/Demonology/FireMaster b/quests/peterm/Demonology/FireMaster index 9be64ad68..687f4f6c9 100644 --- a/quests/peterm/Demonology/FireMaster +++ b/quests/peterm/Demonology/FireMaster @@ -262,7 +262,6 @@ end arch wizard name Master Fire Summoner Str 0 -Dex 0 Con 6 Wis 30 Int 12 @@ -279,11 +278,11 @@ speed 0.400000 attack_movement 7 level 30 type 0 +resist_fire 100 carrying 100 -monster 1 move_type walk +monster 1 can_cast_spell 1 -immune 4 arch spell_summon_fire_elemental end arch key2 diff --git a/quests/peterm/Demonology/FireTower2 b/quests/peterm/Demonology/FireTower2 index 80004b48a..07458cf4b 100644 --- a/quests/peterm/Demonology/FireTower2 +++ b/quests/peterm/Demonology/FireTower2 @@ -22,8 +22,8 @@ dam 10 ac -9 speed -0.050000 level 25 +resist_magic 100 alive 1 -immune 2 end arch woodfloor y 1 @@ -41,8 +41,8 @@ ac -9 y 1 speed -0.050000 level 25 +resist_magic 100 alive 1 -immune 2 end arch woodfloor y 2 @@ -60,8 +60,8 @@ ac -9 y 2 speed -0.050000 level 25 +resist_magic 100 alive 1 -immune 2 end arch woodfloor y 3 @@ -79,8 +79,8 @@ ac -9 y 3 speed -0.050000 level 25 +resist_magic 100 alive 1 -immune 2 end arch woodfloor y 4 @@ -98,8 +98,8 @@ ac -9 y 4 speed -0.050000 level 25 +resist_magic 100 alive 1 -immune 2 end arch woodfloor y 5 @@ -117,8 +117,8 @@ ac -9 y 5 speed -0.050000 level 25 +resist_magic 100 alive 1 -immune 2 end arch woodfloor y 6 @@ -136,8 +136,8 @@ ac -9 y 6 speed -0.050000 level 25 +resist_magic 100 alive 1 -immune 2 end arch woodfloor y 7 @@ -155,8 +155,8 @@ ac -9 y 7 speed -0.050000 level 25 +resist_magic 100 alive 1 -immune 2 end arch woodfloor y 8 @@ -174,8 +174,8 @@ ac -9 y 8 speed -0.050000 level 25 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 1 @@ -193,8 +193,8 @@ ac -9 x 1 speed -0.050000 level 25 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 1 @@ -250,8 +250,8 @@ x 1 y 8 speed -0.050000 level 25 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 2 @@ -269,8 +269,8 @@ ac -9 x 2 speed -0.050000 level 25 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 2 @@ -319,8 +319,8 @@ x 2 y 8 speed -0.050000 level 25 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 3 @@ -338,8 +338,8 @@ ac -9 x 3 speed -0.050000 level 25 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 3 @@ -364,7 +364,7 @@ x 3 y 3 speed -0.050000 level 25 -immune 2 +resist_magic 100 end arch woodfloor x 3 @@ -385,7 +385,7 @@ x 3 y 5 speed -0.050000 level 25 -immune 2 +resist_magic 100 end arch woodfloor x 3 @@ -414,8 +414,8 @@ x 3 y 8 speed -0.050000 level 25 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 4 @@ -433,8 +433,8 @@ ac -9 x 4 speed -0.050000 level 25 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 4 @@ -483,8 +483,8 @@ x 4 y 8 speed -0.050000 level 25 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 5 @@ -502,8 +502,8 @@ ac -9 x 5 speed -0.050000 level 25 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 5 @@ -528,7 +528,7 @@ x 5 y 3 speed -0.050000 level 25 -immune 2 +resist_magic 100 end arch woodfloor x 5 @@ -554,7 +554,7 @@ x 5 y 5 speed -0.050000 level 25 -immune 2 +resist_magic 100 end arch woodfloor x 5 @@ -583,8 +583,8 @@ x 5 y 8 speed -0.050000 level 25 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 6 @@ -602,8 +602,8 @@ ac -9 x 6 speed -0.050000 level 25 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 6 @@ -662,8 +662,8 @@ x 6 y 8 speed -0.050000 level 25 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 7 @@ -681,8 +681,8 @@ ac -9 x 7 speed -0.050000 level 25 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 7 @@ -751,8 +751,8 @@ x 7 y 8 speed -0.050000 level 25 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 8 @@ -770,8 +770,8 @@ ac -9 x 8 speed -0.050000 level 25 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 8 @@ -792,8 +792,8 @@ x 8 y 1 speed -0.050000 level 25 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 8 @@ -814,8 +814,8 @@ x 8 y 2 speed -0.050000 level 25 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 8 @@ -836,8 +836,8 @@ x 8 y 3 speed -0.050000 level 25 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 8 @@ -858,8 +858,8 @@ x 8 y 4 speed -0.050000 level 25 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 8 @@ -880,8 +880,8 @@ x 8 y 5 speed -0.050000 level 25 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 8 @@ -902,8 +902,8 @@ x 8 y 6 speed -0.050000 level 25 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 8 @@ -924,8 +924,8 @@ x 8 y 7 speed -0.050000 level 25 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 8 @@ -946,6 +946,6 @@ x 8 y 8 speed -0.050000 level 25 +resist_magic 100 alive 1 -immune 2 end diff --git a/quests/peterm/Demonology/WaterMaster b/quests/peterm/Demonology/WaterMaster index 9427fb6c6..844a5617f 100644 --- a/quests/peterm/Demonology/WaterMaster +++ b/quests/peterm/Demonology/WaterMaster @@ -258,7 +258,6 @@ end arch wizard name Master Water Summoner Str 0 -Dex 0 Con 6 Wis 30 Int 11 @@ -275,11 +274,11 @@ speed 0.400000 attack_movement 7 level 30 type 0 +resist_acid 100 carrying 100 -monster 1 move_type walk +monster 1 can_cast_spell 1 -immune 64 arch spell_summon_water_elemental end arch key2 diff --git a/quests/peterm/Demonology/WaterTower2 b/quests/peterm/Demonology/WaterTower2 index 6fa69b112..66aeb8b29 100644 --- a/quests/peterm/Demonology/WaterTower2 +++ b/quests/peterm/Demonology/WaterTower2 @@ -22,8 +22,8 @@ dam 12 ac -7 speed -0.070000 level 23 +resist_magic 100 alive 1 -immune 2 end arch woodfloor y 1 @@ -41,8 +41,8 @@ ac -7 y 1 speed -0.070000 level 23 +resist_magic 100 alive 1 -immune 2 end arch woodfloor y 2 @@ -60,8 +60,8 @@ ac -7 y 2 speed -0.070000 level 23 +resist_magic 100 alive 1 -immune 2 end arch woodfloor y 3 @@ -79,8 +79,8 @@ ac -7 y 3 speed -0.070000 level 23 +resist_magic 100 alive 1 -immune 2 end arch woodfloor y 4 @@ -98,8 +98,8 @@ ac -7 y 4 speed -0.070000 level 23 +resist_magic 100 alive 1 -immune 2 end arch woodfloor y 5 @@ -117,8 +117,8 @@ ac -7 y 5 speed -0.070000 level 23 +resist_magic 100 alive 1 -immune 2 end arch woodfloor y 6 @@ -136,8 +136,8 @@ ac -7 y 6 speed -0.070000 level 23 +resist_magic 100 alive 1 -immune 2 end arch woodfloor y 7 @@ -155,8 +155,8 @@ ac -7 y 7 speed -0.070000 level 23 +resist_magic 100 alive 1 -immune 2 end arch woodfloor y 8 @@ -174,8 +174,8 @@ ac -7 y 8 speed -0.070000 level 23 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 1 @@ -193,8 +193,8 @@ ac -7 x 1 speed -0.070000 level 23 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 1 @@ -250,8 +250,8 @@ x 1 y 8 speed -0.070000 level 23 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 2 @@ -269,8 +269,8 @@ ac -7 x 2 speed -0.070000 level 23 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 2 @@ -319,8 +319,8 @@ x 2 y 8 speed -0.070000 level 23 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 3 @@ -338,8 +338,8 @@ ac -7 x 3 speed -0.070000 level 23 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 3 @@ -364,7 +364,7 @@ x 3 y 3 speed -0.070000 level 23 -immune 2 +resist_magic 100 end arch woodfloor x 3 @@ -385,7 +385,7 @@ x 3 y 5 speed -0.070000 level 23 -immune 2 +resist_magic 100 end arch woodfloor x 3 @@ -414,8 +414,8 @@ x 3 y 8 speed -0.070000 level 23 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 4 @@ -433,8 +433,8 @@ ac -7 x 4 speed -0.070000 level 23 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 4 @@ -483,8 +483,8 @@ x 4 y 8 speed -0.070000 level 23 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 5 @@ -502,8 +502,8 @@ ac -7 x 5 speed -0.070000 level 23 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 5 @@ -533,7 +533,7 @@ x 5 y 3 speed -0.070000 level 23 -immune 2 +resist_magic 100 end arch woodfloor x 5 @@ -554,7 +554,7 @@ x 5 y 5 speed -0.070000 level 23 -immune 2 +resist_magic 100 end arch woodfloor x 5 @@ -583,8 +583,8 @@ x 5 y 8 speed -0.070000 level 23 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 6 @@ -602,8 +602,8 @@ ac -7 x 6 speed -0.070000 level 23 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 6 @@ -662,8 +662,8 @@ x 6 y 8 speed -0.070000 level 23 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 7 @@ -681,8 +681,8 @@ ac -7 x 7 speed -0.070000 level 23 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 7 @@ -751,8 +751,8 @@ x 7 y 8 speed -0.070000 level 23 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 8 @@ -770,8 +770,8 @@ ac -7 x 8 speed -0.070000 level 23 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 8 @@ -792,8 +792,8 @@ x 8 y 1 speed -0.070000 level 23 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 8 @@ -814,8 +814,8 @@ x 8 y 2 speed -0.070000 level 23 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 8 @@ -836,8 +836,8 @@ x 8 y 3 speed -0.070000 level 23 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 8 @@ -858,8 +858,8 @@ x 8 y 4 speed -0.070000 level 23 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 8 @@ -880,8 +880,8 @@ x 8 y 5 speed -0.070000 level 23 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 8 @@ -902,8 +902,8 @@ x 8 y 6 speed -0.070000 level 23 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 8 @@ -924,8 +924,8 @@ x 8 y 7 speed -0.070000 level 23 +resist_magic 100 alive 1 -immune 2 end arch woodfloor x 8 @@ -946,6 +946,6 @@ x 8 y 8 speed -0.070000 level 23 +resist_magic 100 alive 1 -immune 2 end