From 77f54db4c77c0c4bf6efe1d5d988858f5483b9af Mon Sep 17 00:00:00 2001 From: peterm Date: Mon, 4 Dec 2000 07:18:51 +0000 Subject: [PATCH] Converted the old "armor" "protected" "vulnerable" and "immune" to the partial-resistance equivalents. git-svn-id: svn+ssh://svn.code.sf.net/p/crossfire/code/trunk/arch@554 282e977c-c81d-0410-88c4-b93c2d0d6712 --- armour/boots/high_boots.arc | 2 +- armour/boots/idaten.arc | 2 +- armour/boots/lev_boots.arc | 2 +- armour/boots/low_boots.arc | 2 +- armour/boots/sandals.arc | 2 +- armour/boots/speedboots.arc | 2 +- armour/cloak/magic_resist.arc | 3 ++- armour/cloak/oilskin.arc | 2 +- armour/cloak/serp_cloak.arc | 3 ++- armour/gauntlets/gauntlet.arc | 2 +- armour/gauntlets/gauntlet_d.arc | 2 +- armour/gauntlets/gauntlet_s.arc | 2 +- armour/gauntlets/gloves.arc | 2 +- armour/gauntlets/god_finger.arc | 2 +- armour/gauntlets/shining_finger.arc | 2 +- armour/helmet/a_helmet.arc | 2 +- armour/helmet/bighorn_he.arc | 2 +- armour/helmet/fullhelmet.arc | 2 +- armour/helmet/helmet.arc | 2 +- armour/helmet/helmet_bri.arc | 2 +- armour/helmet/helmetxray.arc | 2 +- armour/helmet/hornhelmet.arc | 2 +- armour/helmet/kog.arc | 2 +- armour/helmet/turban.arc | 2 +- armour/helmet/wiz_hat.arc | 7 +++++- armour/mail/Pdragonmail.arc | 6 ++++-- armour/mail/chainmail.arc | 2 +- armour/mail/dragonmail.arc | 5 +++-- armour/mail/dress1.arc | 2 +- armour/mail/gale.arc | 5 +++-- armour/mail/lapron.arc | 2 +- armour/mail/leather_ar.arc | 2 +- armour/mail/mithril_ar.arc | 2 +- armour/mail/mithril_ar_ele.arc | 5 +++-- armour/mail/plate_mail.arc | 2 +- armour/mail/ring_mail.arc | 2 +- armour/mail/ring_mail2.arc | 2 +- armour/mail/robe_midnight.arc | 15 ++++++++++--- armour/mail/scale_mail.arc | 2 +- armour/mail/wdsm.arc | 2 +- armour/shield/DShield.arc | 9 +++++--- armour/shield/DShieldm.arc | 9 +++++--- armour/shield/DShieldms.arc | 9 +++++--- armour/shield/DShields.arc | 9 +++++--- armour/shield/dragon_shi.arc | 5 +++-- armour/shield/eyeshield.arc | 5 +++-- armour/shield/highshield.arc | 2 +- armour/shield/holyshield.arc | 6 ++++-- armour/shield/reflector.arc | 2 +- armour/shield/round_shiel.arc | 2 +- armour/shield/shield.arc | 2 +- armour/shield/spiked_shield.arc | 2 +- armour/shield/uw_shield.arc | 5 +++-- armour/shield/wds.arc | 6 ++++-- construct/hold/darkhold.arc | 3 --- construct/hold/stronghold.arc | 11 ---------- construct/town/collesium.arc | 1 - construct/town/hovels.arc | 1 - dev/unused/0.91.1/Undead/shadow.arc | 10 +++++++-- dev/unused/0.91.1/Undead/werewolf.arc | 3 ++- dev/unused/0.91.1/dark_uni.arc | 7 +++++- dev/unused/0.91.7/chaos/broo.arc | 3 ++- dev/unused/0.91.7/chaos/c_knight.arc | 3 ++- exit/Town/town.arc | 5 ----- flesh/human/corpse_pl.arc | 20 ++++++++++++++++- gods/altars/altardevo.arc | 3 ++- gods/altars/altarvalr.arc | 3 ++- gods/demihumans/gnarg.arc | 9 +++++--- gods/demihumans/lythander.arc | 9 +++++--- gods/demihumans/mostrai.arc | 3 ++- gods/elemental/gaea.arc | 13 ++++++++--- gods/elemental/ruggilli.arc | 11 +++++++--- gods/elemental/sorig.arc | 6 ++++-- gods/supernatural/devourers.arc | 15 ++++++++++--- gods/supernatural/gorokh.arc | 8 +++++-- gods/supernatural/valriel.arc | 8 +++++-- ground/fog.arc | 17 ++++++++++++++- ground/fog_wall.arc | 17 ++++++++++++++- ground/new/dunes.arc | 1 - ground/new/earth.arc | 1 - ground/new/fernsdense.arc | 1 - ground/new/fernssparse.arc | 2 -- ground/new/forestsparse.arc | 3 --- ground/new/grassdark.arc | 1 - ground/new/grassmedium.arc | 2 -- ground/new/palm.arc | 1 - ground/new/palms.arc | 4 ---- ground/temp_fog.arc | 17 ++++++++++++++- inorganic/lead.arc | 6 ++++-- inorganic/mercury.arc | 8 +++++-- inorganic/minerals.arc | 19 ++++++++++------ inorganic/phil_minerals.arc | 16 +++++++++----- inorganic/stone.arc | 9 +++++--- inorganic/true_lead.arc | 4 +++- magic/avatar.arc | 5 +++-- magic/flaming_aura.arc | 1 - magic/holy_servant.arc | 5 +++-- magic/snake_golem.arc | 3 ++- magic/spiderweb_spell.arc | 1 - magic/vitriol.arc | 2 -- misc/crown.arc | 2 +- misc/icecube.arc | 3 ++- misc/naz_report.arc | 1 - monster/acid/acidsphere.arc | 14 +++++++++++- monster/acid/bpudding.arc | 9 +++++--- monster/acid/pet_necro.arc | 3 ++- monster/acid/rustmonste.arc | 3 ++- monster/animal/Behemoth/behemoth.arc | 6 ++++-- monster/animal/bat.arc | 3 ++- monster/animal/bat_gen.arc | 3 ++- monster/animal/scorpion.arc | 10 ++++++--- monster/animal/shadowtiger/shadowtiger.arc | 13 +++++++++-- monster/beholder/behold_gen.arc | 3 ++- monster/beholder/beholder.arc | 6 +++++- monster/beholder/dread.arc | 7 +++++- monster/chaos/liv_chaos.arc | 19 +++++++++++++--- monster/demon/Balrog.arc | 10 +++++++-- monster/demon/Big_Demon/big_demon.arc | 10 +++++++-- monster/demon/Demon_Lord/demon_lord.arc | 8 +++++-- monster/demon/GreatDemon/GreatDemon.arc | 10 +++++++-- monster/demon/angel.arc | 3 ++- monster/demon/archangel.arc | 15 +++++++++++-- monster/demon/devil.arc | 9 +++++--- monster/demon/devil_gen.arc | 7 ++++-- monster/demon/evil_master2.arc | 5 +++-- monster/demon/evil_master3.arc | 5 +++-- monster/demon/evil_master4.arc | 5 +++-- monster/demon/imp.arc | 8 ++++--- monster/demon/liteangel.arc | 5 ++++- monster/demon/mesangel.arc | 5 ++++- monster/demon/raas.arc | 5 +++-- monster/dragon/Chinese_Dra/chinese_dr.arc | 10 ++++++--- monster/dragon/Cwyvern.arc | 9 ++++++-- monster/dragon/Dragon/dragon.arc | 11 +++++++--- monster/dragon/Dragonman/dragonman.arc | 16 ++++++++++++-- monster/dragon/Electric/elec_dr.arc | 9 ++++++-- monster/dragon/Hatchlings/cold_drag.arc | 6 ++++-- monster/dragon/Hatchlings/elec_drag.arc | 6 ++++-- monster/dragon/Hatchlings/fire_drag.arc | 6 ++++-- monster/dragon/WDragon/worthless_dragon.arc | 11 +++++++--- monster/dragon/baby_drag.arc | 8 +++++-- monster/dragon/dragoncave.arc | 3 ++- monster/dragon/fae_drag.arc | 6 +++++- monster/dragon/wyvern.arc | 8 +++++-- monster/elemental/Para/para_air.arc | 3 ++- monster/elemental/Para/para_earth.arc | 3 ++- monster/elemental/Para/para_fire.arc | 6 ++++-- monster/elemental/Para/para_ice.arc | 7 ++++-- monster/elemental/Para/para_lava.arc | 6 ++++-- monster/elemental/Para/para_light.arc | 4 +++- monster/elemental/Para/para_mud.arc | 6 ++++-- monster/elemental/Para/para_water.arc | 6 ++++-- monster/elemental/elem_air.arc | 6 ++++-- monster/elemental/elem_earth.arc | 6 ++++-- monster/elemental/elem_fire.arc | 6 ++++-- monster/elemental/elem_water.arc | 6 ++++-- monster/giant/Belzebub/belzebub.arc | 9 +++++--- monster/giant/JessyB/jessyb.arc | 18 ++++++++++++++-- monster/giant/Titan/titan.arc | 7 ++++-- monster/giant/byakie/byakie.arc | 18 +++++++++++++--- monster/giant/cyclops/cyclops.arc | 19 ++++++++++++---- monster/giant/djinn/djinn.arc | 15 +++++++++++-- monster/giant/djinn/m_djinn.arc | 19 +++++++++++++--- monster/giant/giant.arc | 3 ++- monster/giant/mabu.arc | 3 ++- monster/giant/serpent/fireserp.arc | 6 ++++-- monster/giant/serpent/serpent.arc | 6 ++++-- monster/giant/slug/slug.arc | 10 ++++++--- monster/goblin/Kobold/h_kobold.arc | 3 ++- monster/goblin/Kobold/unusual_kobold.arc | 5 +++-- monster/goblin/ogre.arc | 3 ++- monster/human/Demihuman/gnome.arc | 6 +++++- monster/human/Guard/guard_hard.arc | 5 +++-- monster/human/Guard/guard_ligh.arc | 5 +++-- monster/human/Guard/guard_med.arc | 5 +++-- monster/human/Guard/knight.arc | 5 +++-- monster/human/Town/courier.arc | 2 +- monster/human/Town/postman/postman.arc | 3 ++- monster/human/arabic/a_guard_h.arc | 5 +++-- monster/human/arabic/a_guard_l.arc | 5 +++-- monster/human/arabic/a_guard_m.arc | 5 +++-- monster/human/arabic/a_priest.arc | 3 ++- monster/human/arabic/holy_priest.arc | 17 +++++++++++++-- monster/human/lord_e.arc | 12 ++++++++--- monster/human/pyromaniac.arc | 3 ++- monster/insect/ant/ant_egg.arc | 7 ++++-- monster/insect/ant/ant_larvae.arc | 9 +++++--- monster/insect/ant/breeder_ant.arc | 11 ++++++---- monster/insect/ant/guard_ant.arc | 11 ++++++---- monster/insect/ant/spit_ant.arc | 9 +++++--- monster/insect/ant/war_ant.arc | 11 ++++++---- monster/insect/ant/work_ant.arc | 9 +++++--- monster/insect/bee.arc | 3 ++- monster/misc/Baslic/baslic.arc | 10 ++++++--- monster/misc/Ent/ent.arc | 3 ++- monster/misc/Ngolem/gol.arc | 7 ++++-- monster/misc/Unicorn/unicorn.arc | 7 +++++- monster/misc/broo.arc | 8 +++++-- monster/misc/c_knight.arc | 9 +++++--- monster/misc/c_priest.arc | 24 +++++++++++++++------ monster/misc/crawl/crawling_chaos.arc | 9 ++++++-- monster/misc/dancingsword.arc | 17 ++++++++++++--- monster/misc/deathtree.arc | 3 ++- monster/misc/firechest.arc | 3 ++- monster/misc/gargoyle.arc | 7 ++++-- monster/misc/lamia/lamia.arc | 11 +++++++--- monster/misc/lokanth/lokanth.arc | 18 +++++++++++----- monster/misc/mudman.arc | 9 ++++++-- monster/misc/sandy.arc | 6 ++++-- monster/misc/serpmen/serp_man.arc | 10 +++++++-- monster/misc/serpmen/serp_priest.arc | 14 +++++++++--- monster/misc/serpmen/serpman_gen.arc | 3 ++- monster/misc/sphinx.arc | 4 +++- monster/misc/stalker.arc | 3 ++- monster/troll/Gaelotroll/gaelotroll.arc | 7 ++++-- monster/troll/Troll/troll.arc | 6 ++++-- monster/troll/smalltroll.arc | 3 ++- monster/undead/dave.arc | 4 +++- monster/undead/ghast.arc | 7 ++++-- monster/undead/ghost.arc | 6 ++++-- monster/undead/ghost_gen.arc | 3 ++- monster/undead/grimreaper.arc | 11 +++++++--- monster/undead/lich.arc | 4 +++- monster/undead/nazgul.arc | 9 ++++++-- monster/undead/nightmare.arc | 12 ++++++++--- monster/undead/skelet_gen.arc | 3 ++- monster/undead/skeleton.arc | 9 +++++--- monster/undead/spectre.arc | 4 +++- monster/undead/vampire.arc | 4 +++- monster/undead/vampiregen.arc | 4 +++- monster/undead/wight.arc | 7 ++++-- monster/undead/wraith.arc | 9 +++++--- monster/undead/zombie.arc | 6 ++++-- monster/undead/zombie_gen.arc | 3 ++- player/class/Religious/paladin.arc | 3 ++- player/old/fireborn.arc | 9 ++++++-- player/old/quetzalcoatl.arc | 8 +++++-- player/old/wraithp.arc | 11 +++++++--- player/race/fireborn.arc | 9 ++++++-- player/race/halfling.arc | 3 ++- player/race/northman.arc | 3 ++- player/race/pl_half_orc.arc | 3 ++- player/race/quetzalcoatl.arc | 7 ++++-- player/race/troll_player.arc | 3 ++- player/race/wraithp.arc | 12 +++++++---- potion/potioncol.arc | 3 ++- potion/potionfir.arc | 3 ++- potion/potioninv.arc | 3 ++- shop/alchemy_gems.arc | 10 --------- talisman/ring_drain.arc | 3 ++- wall/awall/awall_weak.arc | 18 ++++++++++++++-- wall/bwall/bwall_weak.arc | 18 ++++++++++++++-- wall/bwall/earthwall.arc | 9 +++++++- wall/bwall/hedge.arc | 11 ++++++++-- wall/cwall/cwall_weak.arc | 18 ++++++++++++++-- wall/firewall/firewall.arc | 3 ++- wall/wwall/wwall_weak.arc | 18 ++++++++++++++-- weapon/artifact/ChaosSword/CSword.arc | 9 ++++++-- weapon/artifact/Darkblade/darkblade.arc | 6 ++++-- weapon/artifact/Demonbane/demonbane.arc | 3 ++- weapon/artifact/Fhammer/frost_hammer.arc | 3 ++- weapon/artifact/Firestar/firestar.arc | 7 ++++-- weapon/artifact/Gram/gram.arc | 4 +++- weapon/artifact/HolyAvenger/holyave.arc | 6 ++++-- weapon/artifact/Masamune/masamune.arc | 7 ++++-- weapon/artifact/UW_Sword/uw_sword.arc | 7 ++++-- weapon/artifact/dragonslay.arc | 3 ++- weapon/artifact/excalibur.arc | 6 ++++-- weapon/artifact/firebrand.arc | 3 ++- weapon/artifact/frostbrand.arc | 3 ++- weapon/artifact/magi_staff.arc | 3 ++- weapon/artifact/mjoellnir.arc | 3 ++- weapon/artifact/mournblade.arc | 6 ++++-- weapon/artifact/stormbring.arc | 7 ++++-- 274 files changed, 1244 insertions(+), 507 deletions(-) diff --git a/armour/boots/high_boots.arc b/armour/boots/high_boots.arc index fbbee0166..a8327d32f 100644 --- a/armour/boots/high_boots.arc +++ b/armour/boots/high_boots.arc @@ -6,7 +6,7 @@ last_heal 4 weight 6500 ac 1 nrof 1 -armour 4 +resist_physical 4 type 99 material 24 editable 1024 diff --git a/armour/boots/idaten.arc b/armour/boots/idaten.arc index c1697153c..e5d13c414 100644 --- a/armour/boots/idaten.arc +++ b/armour/boots/idaten.arc @@ -13,7 +13,7 @@ value 50000 weight 5000 type 99 material 8 -armour 3 +resist_physical 3 editable 5120 color_fg black end diff --git a/armour/boots/lev_boots.arc b/armour/boots/lev_boots.arc index 6aee23c8c..be8207b93 100644 --- a/armour/boots/lev_boots.arc +++ b/armour/boots/lev_boots.arc @@ -6,7 +6,7 @@ value 35000 weight 2500 type 99 material 8 -armour 3 +resist_physical 3 flying 1 editable 5120 magicmap white diff --git a/armour/boots/low_boots.arc b/armour/boots/low_boots.arc index 83c1877d1..fe289e0e4 100644 --- a/armour/boots/low_boots.arc +++ b/armour/boots/low_boots.arc @@ -7,7 +7,7 @@ last_heal 1 weight 2000 nrof 1 ac 1 -armour 1 +resist_physical 1 type 99 material 24 editable 1024 diff --git a/armour/boots/sandals.arc b/armour/boots/sandals.arc index b402cc792..88d4b2153 100644 --- a/armour/boots/sandals.arc +++ b/armour/boots/sandals.arc @@ -4,7 +4,7 @@ face sandals.111 value 5 weight 500 last_heal 1 -armour 1 +resist_physical 1 nrof 1 type 99 material 24 diff --git a/armour/boots/speedboots.arc b/armour/boots/speedboots.arc index b04dbc65f..955d5760d 100644 --- a/armour/boots/speedboots.arc +++ b/armour/boots/speedboots.arc @@ -14,7 +14,7 @@ value 50000 weight 5000 type 99 material 8 -armour 3 +resist_physical 3 editable 5120 color_fg brown end diff --git a/armour/cloak/magic_resist.arc b/armour/cloak/magic_resist.arc index 90e12770b..7429fc3e5 100644 --- a/armour/cloak/magic_resist.arc +++ b/armour/cloak/magic_resist.arc @@ -7,7 +7,8 @@ ac 0 weight 5000 value 220000 material 8 -immune 2 +resist_magic 100 + editable 5120 color_fg black end diff --git a/armour/cloak/oilskin.arc b/armour/cloak/oilskin.arc index 47ac99d4c..53f7779db 100644 --- a/armour/cloak/oilskin.arc +++ b/armour/cloak/oilskin.arc @@ -4,7 +4,7 @@ type 87 face oilskin.111 Dex -1 ac 1 -armour 3 +resist_physical 3 weight 1000 value 120000 material 8 diff --git a/armour/cloak/serp_cloak.arc b/armour/cloak/serp_cloak.arc index 8ffcd647a..e072901b8 100644 --- a/armour/cloak/serp_cloak.arc +++ b/armour/cloak/serp_cloak.arc @@ -5,7 +5,8 @@ face serp_cloak.111 ac 1 weight 700 color_fg green -protected 1024 +resist_poison 30 + value 900 material 32 editable 1024 diff --git a/armour/gauntlets/gauntlet.arc b/armour/gauntlets/gauntlet.arc index eb7f44190..e0abe3c00 100644 --- a/armour/gauntlets/gauntlet.arc +++ b/armour/gauntlets/gauntlet.arc @@ -3,7 +3,7 @@ nrof 1 name gauntlets face gauntlet_s.111 type 100 -armour 3 +resist_physical 3 value 25 nrof 1 material 2 diff --git a/armour/gauntlets/gauntlet_d.arc b/armour/gauntlets/gauntlet_d.arc index 6b5dc86da..0d7dd285b 100644 --- a/armour/gauntlets/gauntlet_d.arc +++ b/armour/gauntlets/gauntlet_d.arc @@ -5,7 +5,7 @@ title of dexterity face gauntlet_s.111 type 100 Dex 2 -armour 3 +resist_physical 3 value 65000 material 2 weight 1800 diff --git a/armour/gauntlets/gauntlet_s.arc b/armour/gauntlets/gauntlet_s.arc index 48b9ad67a..0e5c41b47 100644 --- a/armour/gauntlets/gauntlet_s.arc +++ b/armour/gauntlets/gauntlet_s.arc @@ -5,7 +5,7 @@ title of strength face gauntlet_s.111 type 100 Str 1 -armour 3 +resist_physical 3 value 65000 material 2 weight 2000 diff --git a/armour/gauntlets/gloves.arc b/armour/gauntlets/gloves.arc index 16daa472d..dfc13d53a 100644 --- a/armour/gauntlets/gloves.arc +++ b/armour/gauntlets/gloves.arc @@ -3,7 +3,7 @@ nrof 1 name gloves face gloves.111 type 100 -armour 1 +resist_physical 1 nrof 1 value 4 material 8 diff --git a/armour/gauntlets/god_finger.arc b/armour/gauntlets/god_finger.arc index 18eda23d5..6df3c8590 100644 --- a/armour/gauntlets/god_finger.arc +++ b/armour/gauntlets/god_finger.arc @@ -11,7 +11,7 @@ speed .1 Str 2 Dex -1 color_fg orange -armour 3 +resist_physical 3 dam +3 make_invisible 1 value 120000 diff --git a/armour/gauntlets/shining_finger.arc b/armour/gauntlets/shining_finger.arc index 00099c990..c6c612824 100644 --- a/armour/gauntlets/shining_finger.arc +++ b/armour/gauntlets/shining_finger.arc @@ -10,7 +10,7 @@ mina color_fg black speed .1 Str 2 -armour 3 +resist_physical 3 dam +3 value 120000 material 2 diff --git a/armour/helmet/a_helmet.arc b/armour/helmet/a_helmet.arc index b58ba94df..e9eafc098 100644 --- a/armour/helmet/a_helmet.arc +++ b/armour/helmet/a_helmet.arc @@ -6,7 +6,7 @@ face a_helmet.111 last_heal 5 weight 5000 ac 1 -armour 5 +resist_physical 5 value 14 material 2 editable 1024 diff --git a/armour/helmet/bighorn_he.arc b/armour/helmet/bighorn_he.arc index eee270555..a624641f8 100644 --- a/armour/helmet/bighorn_he.arc +++ b/armour/helmet/bighorn_he.arc @@ -5,7 +5,7 @@ type 34 face bighorn_he.111 last_heal 3 ac 1 -armour 5 +resist_physical 5 weight 10000 value 22 material 18 diff --git a/armour/helmet/fullhelmet.arc b/armour/helmet/fullhelmet.arc index f021f1830..e8e5ba614 100644 --- a/armour/helmet/fullhelmet.arc +++ b/armour/helmet/fullhelmet.arc @@ -5,7 +5,7 @@ type 34 face fullhelmet.111 last_heal 10 ac 1 -armour 10 +resist_physical 10 weight 12000 value 16 material 2 diff --git a/armour/helmet/helmet.arc b/armour/helmet/helmet.arc index 8332b2849..5303d8dec 100644 --- a/armour/helmet/helmet.arc +++ b/armour/helmet/helmet.arc @@ -5,7 +5,7 @@ face helmet.111 last_heal 5 weight 5000 ac 1 -armour 5 +resist_physical 5 value 14 material 2 editable 1024 diff --git a/armour/helmet/helmet_bri.arc b/armour/helmet/helmet_bri.arc index 73fa716c9..f9b947fa4 100644 --- a/armour/helmet/helmet_bri.arc +++ b/armour/helmet/helmet_bri.arc @@ -6,7 +6,7 @@ face helmet_bri.111 type 34 weight 7000 ac 2 -armour 5 +resist_physical 5 value 95000 Int 2 Pow 2 diff --git a/armour/helmet/helmetxray.arc b/armour/helmet/helmetxray.arc index e1ea71bde..a0f382548 100644 --- a/armour/helmet/helmetxray.arc +++ b/armour/helmet/helmetxray.arc @@ -11,7 +11,7 @@ speed 0.05 type 34 weight 6000 ac 2 -armour 5 +resist_physical 5 value 70000 material 2 xrays 1 diff --git a/armour/helmet/hornhelmet.arc b/armour/helmet/hornhelmet.arc index 8bb0957f6..823e387ae 100644 --- a/armour/helmet/hornhelmet.arc +++ b/armour/helmet/hornhelmet.arc @@ -5,7 +5,7 @@ type 34 face hornhelmet.111 last_heal 2 ac 1 -armour 2 +resist_physical 2 weight 6000 value 12 material 18 diff --git a/armour/helmet/kog.arc b/armour/helmet/kog.arc index 0d0d1e3c2..d70f2958a 100644 --- a/armour/helmet/kog.arc +++ b/armour/helmet/kog.arc @@ -9,7 +9,7 @@ Int 1 last_heal 5 weight 2000 ac 3 -armour 10 +resist_physical 10 value 100000 material 2 editable 1024 diff --git a/armour/helmet/turban.arc b/armour/helmet/turban.arc index 6f40cfdf1..6bfd6ed99 100644 --- a/armour/helmet/turban.arc +++ b/armour/helmet/turban.arc @@ -4,7 +4,7 @@ type 34 face turban.111 last_heal 1 weight 500 -armour 1 +resist_physical 1 value 8 material 128 editable 1024 diff --git a/armour/helmet/wiz_hat.arc b/armour/helmet/wiz_hat.arc index 11f46a336..21f3424ab 100644 --- a/armour/helmet/wiz_hat.arc +++ b/armour/helmet/wiz_hat.arc @@ -14,7 +14,12 @@ last_sp 12 ac 1 Int 2 sp 4 -protected 6292 +resist_fire 30 +resist_cold 30 +resist_drain 30 +resist_slow 30 +resist_paralyze 30 + weight 1000 value 50000 material 128 diff --git a/armour/mail/Pdragonmail.arc b/armour/mail/Pdragonmail.arc index 1550d0cbb..e646e0534 100644 --- a/armour/mail/Pdragonmail.arc +++ b/armour/mail/Pdragonmail.arc @@ -11,11 +11,13 @@ speed 0.2 last_heal 9 last_sp 13 ac 8 -armour 60 +resist_physical 60 weight 40000 value 990000 exp 1 -protected 12 +resist_fire 30 +resist_electricity 30 + magic 4 editable 5120 identified 1 diff --git a/armour/mail/chainmail.arc b/armour/mail/chainmail.arc index 6d2771555..e61e4156e 100644 --- a/armour/mail/chainmail.arc +++ b/armour/mail/chainmail.arc @@ -8,7 +8,7 @@ last_heal 15 last_sp 10 material 2 ac 4 -armour 30 +resist_physical 30 weight 60000 value 75 editable 1024 diff --git a/armour/mail/dragonmail.arc b/armour/mail/dragonmail.arc index d53714eac..3c4c4f911 100644 --- a/armour/mail/dragonmail.arc +++ b/armour/mail/dragonmail.arc @@ -6,10 +6,11 @@ face dragonmail.111 last_heal 9 last_sp 13 ac 6 -armour 50 +resist_physical 50 weight 60000 value 50000 -protected 4 +resist_fire 30 + magic 3 editable 5120 identified 1 diff --git a/armour/mail/dress1.arc b/armour/mail/dress1.arc index afdedf9be..e1c92b84a 100644 --- a/armour/mail/dress1.arc +++ b/armour/mail/dress1.arc @@ -4,7 +4,7 @@ nrof 1 type 16 face dress1.111 color_fg blue -armour 1 +resist_physical 1 last_sp 5 Cha 2 ac 1 diff --git a/armour/mail/gale.arc b/armour/mail/gale.arc index aec9f0e5d..60254f42f 100644 --- a/armour/mail/gale.arc +++ b/armour/mail/gale.arc @@ -5,10 +5,11 @@ face gale.111 Dex 2 ac 4 color_fg brown -armour 40 +resist_physical 40 speed 2.000000 type 16 -protected 8 +resist_electricity 30 + material 8 value 220000 weight 10000 diff --git a/armour/mail/lapron.arc b/armour/mail/lapron.arc index 468255c2a..ac29bff07 100644 --- a/armour/mail/lapron.arc +++ b/armour/mail/lapron.arc @@ -6,7 +6,7 @@ face lapron.111 color_fg brown last_sp 11 ac 1 -armour 5 +resist_physical 5 weight 20000 nrof 1 value 10 diff --git a/armour/mail/leather_ar.arc b/armour/mail/leather_ar.arc index ce891d139..4d56caaf2 100644 --- a/armour/mail/leather_ar.arc +++ b/armour/mail/leather_ar.arc @@ -6,7 +6,7 @@ face leather_ar.111 last_heal 8 last_sp 13 ac 2 -armour 10 +resist_physical 10 weight 20000 value 40 material 8 diff --git a/armour/mail/mithril_ar.arc b/armour/mail/mithril_ar.arc index 27ac51d36..078b17427 100644 --- a/armour/mail/mithril_ar.arc +++ b/armour/mail/mithril_ar.arc @@ -10,7 +10,7 @@ mithril_ar.113 mina speed 0.1 ac 6 -armour 35 +resist_physical 35 last_heal 5 last_sp 18 weight 15000 diff --git a/armour/mail/mithril_ar_ele.arc b/armour/mail/mithril_ar_ele.arc index 40aab70f9..4be7ccd11 100644 --- a/armour/mail/mithril_ar_ele.arc +++ b/armour/mail/mithril_ar_ele.arc @@ -10,8 +10,9 @@ mithril_ar.113 mina speed 0.3 ac 4 -armour 40 -protected 8 +resist_physical 40 +resist_electricity 30 + Cha 1 Str 1 exp 1 diff --git a/armour/mail/plate_mail.arc b/armour/mail/plate_mail.arc index 700d5e4c7..dde15b861 100644 --- a/armour/mail/plate_mail.arc +++ b/armour/mail/plate_mail.arc @@ -8,7 +8,7 @@ last_heal 30 last_sp 7 material 2 ac 5 -armour 40 +resist_physical 40 weight 100000 value 100 editable 1024 diff --git a/armour/mail/ring_mail.arc b/armour/mail/ring_mail.arc index 9d851b275..bf08c2ef1 100644 --- a/armour/mail/ring_mail.arc +++ b/armour/mail/ring_mail.arc @@ -8,7 +8,7 @@ last_heal 15 last_sp 10 material 2 ac 4 -armour 25 +resist_physical 25 weight 50000 value 60 editable 1024 diff --git a/armour/mail/ring_mail2.arc b/armour/mail/ring_mail2.arc index a561649bc..d46069669 100644 --- a/armour/mail/ring_mail2.arc +++ b/armour/mail/ring_mail2.arc @@ -7,7 +7,7 @@ last_heal 15 last_sp 11 material 2 ac 4 -armour 20 +resist_physical 20 weight 40000 value 85 editable 1024 diff --git a/armour/mail/robe_midnight.arc b/armour/mail/robe_midnight.arc index 7c2c124fe..cf1bf3d3d 100644 --- a/armour/mail/robe_midnight.arc +++ b/armour/mail/robe_midnight.arc @@ -15,9 +15,18 @@ ac 5 Dex 1 Int 2 Wis 2 -protected 6294 -immune 64 -vulnerable 66048 +resist_magic 30 +resist_fire 30 +resist_cold 30 +resist_drain 30 +resist_slow 30 +resist_paralyze 30 + +resist_acid 100 + +resist_ghosthit -100 +resist_deplete -100 + reflect_spell 1 magic 5 weight 5000 diff --git a/armour/mail/scale_mail.arc b/armour/mail/scale_mail.arc index 51f77760b..ca8b5d211 100644 --- a/armour/mail/scale_mail.arc +++ b/armour/mail/scale_mail.arc @@ -7,7 +7,7 @@ last_heal 10 last_sp 9 material 8 ac 3 -armour 20 +resist_physical 20 weight 20000 value 30 editable 1024 diff --git a/armour/mail/wdsm.arc b/armour/mail/wdsm.arc index 06763e97f..a3e1d0ac4 100644 --- a/armour/mail/wdsm.arc +++ b/armour/mail/wdsm.arc @@ -7,7 +7,7 @@ last_heal 9 last_sp 13 cursed 1 ac 5 -armour 45 +resist_physical 45 weight 5000 value 220000 resist_cold 70 diff --git a/armour/shield/DShield.arc b/armour/shield/DShield.arc index 14035132b..03a0126ee 100644 --- a/armour/shield/DShield.arc +++ b/armour/shield/DShield.arc @@ -12,10 +12,13 @@ msg There is a evil spirit in the shield. endmsg Cha -3 -protected 4 -immune 640 +resist_fire 30 + +resist_drain 100 +resist_ghosthit 100 + ac 3 -armour 10 +resist_physical 10 weight 25000 value 50000 editable 5120 diff --git a/armour/shield/DShieldm.arc b/armour/shield/DShieldm.arc index 0c9a91f72..086e9c134 100644 --- a/armour/shield/DShieldm.arc +++ b/armour/shield/DShieldm.arc @@ -17,11 +17,14 @@ msg trying to dominate over you. endmsg Cha -3 -protected 4 -immune 640 +resist_fire 30 + +resist_drain 100 +resist_ghosthit 100 + reflect_missile 1 ac 4 -armour 10 +resist_physical 10 weight 25000 value 100000 editable 5120 diff --git a/armour/shield/DShieldms.arc b/armour/shield/DShieldms.arc index 6cc7dfc03..d0223733f 100644 --- a/armour/shield/DShieldms.arc +++ b/armour/shield/DShieldms.arc @@ -16,12 +16,15 @@ msg dominating over you. You are struggling to remain control of yourself. endmsg -protected 4 -immune 640 +resist_fire 30 + +resist_drain 100 +resist_ghosthit 100 + reflect_missile 1 reflect_spell 1 ac 7 -armour 15 +resist_physical 15 weight 25000 value 300000 editable 5120 diff --git a/armour/shield/DShields.arc b/armour/shield/DShields.arc index 27511d52f..858142cb4 100644 --- a/armour/shield/DShields.arc +++ b/armour/shield/DShields.arc @@ -17,11 +17,14 @@ msg trying to dominate over you. endmsg Cha -3 -protected 4 -immune 640 +resist_fire 30 + +resist_drain 100 +resist_ghosthit 100 + ac 4 reflect_spell 1 -armour 10 +resist_physical 10 weight 25000 value 100000 editable 5120 diff --git a/armour/shield/dragon_shi.arc b/armour/shield/dragon_shi.arc index 29a681757..f95c05b97 100644 --- a/armour/shield/dragon_shi.arc +++ b/armour/shield/dragon_shi.arc @@ -5,9 +5,10 @@ face dragon_shi.111 type 33 color_fg dark_orange ac 1 -armour 8 +resist_physical 8 magic 2 -protected 4 +resist_fire 30 + weight 5000 value 28000 editable 5120 diff --git a/armour/shield/eyeshield.arc b/armour/shield/eyeshield.arc index 948ae27ac..b91497d39 100644 --- a/armour/shield/eyeshield.arc +++ b/armour/shield/eyeshield.arc @@ -5,8 +5,9 @@ material 32 type 33 face eyeshield.111 ac 3 -armour 3 -protected 2 +resist_physical 3 +resist_magic 30 + weight 15000 value 30000 editable 5120 diff --git a/armour/shield/highshield.arc b/armour/shield/highshield.arc index f7d6c09c7..ca2f6b61c 100644 --- a/armour/shield/highshield.arc +++ b/armour/shield/highshield.arc @@ -4,7 +4,7 @@ name high shield type 33 face highshield.111 ac 1 -armour 8 +resist_physical 8 weight 20000 value 24 material 2 diff --git a/armour/shield/holyshield.arc b/armour/shield/holyshield.arc index fb56e3435..2c8e2f252 100644 --- a/armour/shield/holyshield.arc +++ b/armour/shield/holyshield.arc @@ -7,8 +7,10 @@ type 33 weight 20000 value 35000 ac 4 -armour 10 -protected 640 +resist_physical 10 +resist_drain 30 +resist_ghosthit 30 + editable 5120 magicmap grey end diff --git a/armour/shield/reflector.arc b/armour/shield/reflector.arc index ffe70dcf3..d4d4d1519 100644 --- a/armour/shield/reflector.arc +++ b/armour/shield/reflector.arc @@ -11,7 +11,7 @@ reflector.112 mina speed 0.25 ac 3 -armour 5 +resist_physical 5 reflect_spell 1 weight 18000 value 100000 diff --git a/armour/shield/round_shiel.arc b/armour/shield/round_shiel.arc index 29838523c..05d883bf1 100644 --- a/armour/shield/round_shiel.arc +++ b/armour/shield/round_shiel.arc @@ -4,7 +4,7 @@ name shield type 33 face round_shiel.111 ac 1 -armour 7 +resist_physical 7 weight 15000 value 21 material 18 diff --git a/armour/shield/shield.arc b/armour/shield/shield.arc index 77e7ed662..bfc99d3a1 100644 --- a/armour/shield/shield.arc +++ b/armour/shield/shield.arc @@ -4,7 +4,7 @@ material 2 type 33 face shield.111 ac 1 -armour 5 +resist_physical 5 weight 15000 value 22 editable 1024 diff --git a/armour/shield/spiked_shield.arc b/armour/shield/spiked_shield.arc index af297262c..1f5b0a848 100644 --- a/armour/shield/spiked_shield.arc +++ b/armour/shield/spiked_shield.arc @@ -5,7 +5,7 @@ type 33 face spiked_shield.111 dam 3 ac 1 -armour 3 +resist_physical 3 weight 2000 value 21 material 18 diff --git a/armour/shield/uw_shield.arc b/armour/shield/uw_shield.arc index 1fe998ad4..01716305c 100644 --- a/armour/shield/uw_shield.arc +++ b/armour/shield/uw_shield.arc @@ -6,8 +6,9 @@ type 33 weight 25000 value 80000 ac 4 -armour 15 -protected 65536 +resist_physical 15 +resist_deplete 30 + editable 5120 color_fg black end diff --git a/armour/shield/wds.arc b/armour/shield/wds.arc index 3ee7838d7..cd11e4197 100644 --- a/armour/shield/wds.arc +++ b/armour/shield/wds.arc @@ -3,9 +3,11 @@ name White Dragon Shield nrof 1 face wds.111 ac 2 -armour 8 +resist_physical 8 type 33 -protected 20 +resist_fire 30 +resist_cold 30 + value 45000 weight 6000 magic 2 diff --git a/construct/hold/darkhold.arc b/construct/hold/darkhold.arc index bb2553bf7..6ae48efc8 100644 --- a/construct/hold/darkhold.arc +++ b/construct/hold/darkhold.arc @@ -169,6 +169,3 @@ no_pass 1 visibility 100 magicmap grey end - - - diff --git a/construct/hold/stronghold.arc b/construct/hold/stronghold.arc index d382c01d7..7690073e6 100644 --- a/construct/hold/stronghold.arc +++ b/construct/hold/stronghold.arc @@ -98,14 +98,3 @@ no_pass 1 visibility 100 magicmap grey end - - - - - - - - - - - diff --git a/construct/town/collesium.arc b/construct/town/collesium.arc index a3112ebd4..20f8ffbc4 100644 --- a/construct/town/collesium.arc +++ b/construct/town/collesium.arc @@ -138,4 +138,3 @@ visibility 100 x 4 y 2 end - diff --git a/construct/town/hovels.arc b/construct/town/hovels.arc index 424c67731..036050c2a 100644 --- a/construct/town/hovels.arc +++ b/construct/town/hovels.arc @@ -6,4 +6,3 @@ visibility 100 no_pick 1 editable 2 end - diff --git a/dev/unused/0.91.1/Undead/shadow.arc b/dev/unused/0.91.1/Undead/shadow.arc index 856f353f0..c608ba27e 100644 --- a/dev/unused/0.91.1/Undead/shadow.arc +++ b/dev/unused/0.91.1/Undead/shadow.arc @@ -24,8 +24,14 @@ speed 0.25 exp 400 weight 1000 attacktype 1 -protected 24 -immune 22532 +resist_electricity 30 +resist_cold 30 + +resist_fire 100 +resist_slow 100 +resist_paralyze 100 +resist_fear 100 + will_apply 2 pick_up 24 can_apply 25 diff --git a/dev/unused/0.91.1/Undead/werewolf.arc b/dev/unused/0.91.1/Undead/werewolf.arc index ed08770c3..2f174e0c4 100644 --- a/dev/unused/0.91.1/Undead/werewolf.arc +++ b/dev/unused/0.91.1/Undead/werewolf.arc @@ -22,7 +22,8 @@ ac 5 dam 8 wc 14 level 7 -protected 1 +resist_physical 30 + weight 80000 editable 1 run_away 15 diff --git a/dev/unused/0.91.1/dark_uni.arc b/dev/unused/0.91.1/dark_uni.arc index 905a8d4fb..1ab5611f1 100644 --- a/dev/unused/0.91.1/dark_uni.arc +++ b/dev/unused/0.91.1/dark_uni.arc @@ -21,7 +21,12 @@ maxsp 50 sp 50 hp 800 maxhp 800 -immune 21570 +resist_magic 100 +resist_acid 100 +resist_poison 100 +resist_paralyze 100 +resist_fear 100 + attacktype 1 unaggressive 1 ac 0 diff --git a/dev/unused/0.91.7/chaos/broo.arc b/dev/unused/0.91.7/chaos/broo.arc index 156cf93b1..b2c2a46b5 100644 --- a/dev/unused/0.91.7/chaos/broo.arc +++ b/dev/unused/0.91.7/chaos/broo.arc @@ -20,7 +20,8 @@ wc 3 dam 8 speed 0.16 attacktype 1025 -protected 2 +resist_magic 30 + weight 75000 will_apply 2 pick_up 50 diff --git a/dev/unused/0.91.7/chaos/c_knight.arc b/dev/unused/0.91.7/chaos/c_knight.arc index 816d6851d..bb56869dd 100644 --- a/dev/unused/0.91.7/chaos/c_knight.arc +++ b/dev/unused/0.91.7/chaos/c_knight.arc @@ -20,7 +20,8 @@ wc 1 dam 12 speed 0.15 attacktype 263169 -protected 2 +resist_magic 30 + weight 75000 will_apply 2 pick_up 60 diff --git a/exit/Town/town.arc b/exit/Town/town.arc index 1561f8c16..25ed48e45 100644 --- a/exit/Town/town.arc +++ b/exit/Town/town.arc @@ -300,8 +300,3 @@ no_pick 1 visibility 100 magicmap grey end - - - - - diff --git a/flesh/human/corpse_pl.arc b/flesh/human/corpse_pl.arc index ba69fc9e5..3a8182030 100644 --- a/flesh/human/corpse_pl.arc +++ b/flesh/human/corpse_pl.arc @@ -5,6 +5,24 @@ nrof 1 type 157 material 32 weight 75000 -immune 262143 +resist_physical 100 +resist_magic 100 +resist_fire 100 +resist_electricity 100 +resist_cold 100 +resist_confusion 100 +resist_acid 100 +resist_drain 100 +resist_weaponmagic 100 +resist_ghosthit 100 +resist_poison 100 +resist_slow 100 +resist_paralyze 100 +resist_turn_undead 100 +resist_fear 100 +resist_cancellation 100 +resist_deplete 100 +resist_death 100 + editable 2048 end diff --git a/gods/altars/altardevo.arc b/gods/altars/altardevo.arc index 24a291a9f..7f45b3a91 100644 --- a/gods/altars/altardevo.arc +++ b/gods/altars/altardevo.arc @@ -5,7 +5,8 @@ level 100 other_arch Devourers face altardevo.111 no_pick 1 -immune 1 +resist_physical 100 + editable 48 visibility 50 magicmap grey diff --git a/gods/altars/altarvalr.arc b/gods/altars/altarvalr.arc index aa8071c8d..389ca8511 100644 --- a/gods/altars/altarvalr.arc +++ b/gods/altars/altarvalr.arc @@ -5,7 +5,8 @@ type 56 level 100 face altarvalr.111 no_pick 1 -immune 1 +resist_physical 100 + editable 48 visibility 50 magicmap grey diff --git a/gods/demihumans/gnarg.arc b/gods/demihumans/gnarg.arc index bd2f6cdcc..809263970 100644 --- a/gods/demihumans/gnarg.arc +++ b/gods/demihumans/gnarg.arc @@ -19,9 +19,12 @@ Pow 30 attacktype 1024 path_attuned 131088 path_repelled 65792 -immune 1024 -protected 1024 -vulnerable 16384 +resist_poison 100 + +resist_poison 30 + +resist_fear -100 + hp 1000 ac -5 wc -3 diff --git a/gods/demihumans/lythander.arc b/gods/demihumans/lythander.arc index 8b175f242..ec7d32d37 100644 --- a/gods/demihumans/lythander.arc +++ b/gods/demihumans/lythander.arc @@ -17,9 +17,12 @@ Int 30 Wis 30 Pow 30 attacktype 32 -immune 32 -protected 32 -vulnerable 32 +resist_confusion 100 + +resist_confusion 30 + +resist_confusion -100 + path_attuned 65536 path_repelled 131088 ac -7 diff --git a/gods/demihumans/mostrai.arc b/gods/demihumans/mostrai.arc index 105e656fd..56b3653e4 100644 --- a/gods/demihumans/mostrai.arc +++ b/gods/demihumans/mostrai.arc @@ -19,7 +19,8 @@ Wis 30 Pow 30 path_attuned 18432 path_repelled 64 -protected 4 +resist_fire 30 + ac -10 wc -6 dam 50 diff --git a/gods/elemental/gaea.arc b/gods/elemental/gaea.arc index b8cc5e4a0..9c3c96590 100644 --- a/gods/elemental/gaea.arc +++ b/gods/elemental/gaea.arc @@ -20,9 +20,16 @@ attacktype 16384 path_attuned 526784 path_denied 393216 path_repelled 30 -immune 196736 -protected 196736 -vulnerable 16384 +resist_drain 100 +resist_deplete 100 +resist_death 100 + +resist_drain 30 +resist_deplete 30 +resist_death 30 + +resist_fear -100 + ac -5 wc -1 dam 50 diff --git a/gods/elemental/ruggilli.arc b/gods/elemental/ruggilli.arc index c8d8fc951..ff936f5e0 100644 --- a/gods/elemental/ruggilli.arc +++ b/gods/elemental/ruggilli.arc @@ -18,9 +18,14 @@ attacktype 5 path_attuned 131074 path_repelled 10500 path_denied 82945 -immune 4 -protected 7 -vulnerable 16 +resist_fire 100 + +resist_physical 30 +resist_magic 30 +resist_fire 30 + +resist_cold -100 + ac -5 wc -3 dam 60 diff --git a/gods/elemental/sorig.arc b/gods/elemental/sorig.arc index 86b06b7ca..0407e3839 100644 --- a/gods/elemental/sorig.arc +++ b/gods/elemental/sorig.arc @@ -15,8 +15,10 @@ Pow 30 monster 1 alive 1 attacktype 8 -immune 8 -protected 8 +resist_electricity 100 + +resist_electricity 30 + path_attuned 131096 path_repelled 256 path_denied 66561 diff --git a/gods/supernatural/devourers.arc b/gods/supernatural/devourers.arc index a0a7cb6e6..a0fee19e5 100644 --- a/gods/supernatural/devourers.arc +++ b/gods/supernatural/devourers.arc @@ -19,9 +19,18 @@ attacktype 196736 path_attuned 262144 path_denied 590082 path_repelled 129 -immune 213120 -protected 213120 -vulnerable 4 +resist_drain 100 +resist_fear 100 +resist_deplete 100 +resist_death 100 + +resist_drain 30 +resist_fear 30 +resist_deplete 30 +resist_death 30 + +resist_fire -100 + ac -12 wc -1 hp 350 diff --git a/gods/supernatural/gorokh.arc b/gods/supernatural/gorokh.arc index fc76a2b6b..67e30dd69 100644 --- a/gods/supernatural/gorokh.arc +++ b/gods/supernatural/gorokh.arc @@ -19,8 +19,12 @@ alive 1 attacktype 16384 path_attuned 393216 path_denied 1025 -protected 16416 -immune 16416 +resist_confusion 30 +resist_fear 30 + +resist_confusion 100 +resist_fear 100 + ac -5 wc -3 dam 50 diff --git a/gods/supernatural/valriel.arc b/gods/supernatural/valriel.arc index 1e0c37187..7297d7d6a 100644 --- a/gods/supernatural/valriel.arc +++ b/gods/supernatural/valriel.arc @@ -19,8 +19,12 @@ alive 1 attacktype 16384 path_attuned 1025 path_denied 393216 -immune 16416 -protected 16416 +resist_confusion 100 +resist_fear 100 + +resist_confusion 30 +resist_fear 30 + ac -7 wc -1 hp 350 diff --git a/ground/fog.arc b/ground/fog.arc index 2eedf82a9..3a8a9a937 100644 --- a/ground/fog.arc +++ b/ground/fog.arc @@ -18,7 +18,22 @@ no_pick 1 color_fg white color_bg khaki is_used_up 1 -immune 262124 +resist_fire 100 +resist_electricity 100 +resist_confusion 100 +resist_acid 100 +resist_drain 100 +resist_weaponmagic 100 +resist_ghosthit 100 +resist_poison 100 +resist_slow 100 +resist_paralyze 100 +resist_turn_undead 100 +resist_fear 100 +resist_cancellation 100 +resist_deplete 100 +resist_death 100 + material 1 changing 1 visibility 100 diff --git a/ground/fog_wall.arc b/ground/fog_wall.arc index efdc5f30f..b16dbe696 100644 --- a/ground/fog_wall.arc +++ b/ground/fog_wall.arc @@ -11,7 +11,22 @@ flying 1 no_pick 1 color_fg white color_bg khaki -immune 262124 +resist_fire 100 +resist_electricity 100 +resist_confusion 100 +resist_acid 100 +resist_drain 100 +resist_weaponmagic 100 +resist_ghosthit 100 +resist_poison 100 +resist_slow 100 +resist_paralyze 100 +resist_turn_undead 100 +resist_fear 100 +resist_cancellation 100 +resist_deplete 100 +resist_death 100 + material 1 changing 1 visibility 100 diff --git a/ground/new/dunes.arc b/ground/new/dunes.arc index bd1daeb75..a1593172c 100644 --- a/ground/new/dunes.arc +++ b/ground/new/dunes.arc @@ -11,4 +11,3 @@ is_wooded 1 is_floor 1 editable 8 end - diff --git a/ground/new/earth.arc b/ground/new/earth.arc index 1cf10b4f7..d68331e56 100644 --- a/ground/new/earth.arc +++ b/ground/new/earth.arc @@ -10,4 +10,3 @@ slow_move 1 is_wooded 1 editable 8 end - diff --git a/ground/new/fernsdense.arc b/ground/new/fernsdense.arc index df2aaed3c..c483053c2 100644 --- a/ground/new/fernsdense.arc +++ b/ground/new/fernsdense.arc @@ -9,4 +9,3 @@ slow_move 3 is_wooded 1 editable 8 end - diff --git a/ground/new/fernssparse.arc b/ground/new/fernssparse.arc index 96e37d6d9..c33289237 100644 --- a/ground/new/fernssparse.arc +++ b/ground/new/fernssparse.arc @@ -9,5 +9,3 @@ slow_move 2 is_wooded 1 editable 8 end - - diff --git a/ground/new/forestsparse.arc b/ground/new/forestsparse.arc index 3b53da587..a14c03eef 100644 --- a/ground/new/forestsparse.arc +++ b/ground/new/forestsparse.arc @@ -9,6 +9,3 @@ slow_move 2 is_wooded 1 editable 8 end - - - diff --git a/ground/new/grassdark.arc b/ground/new/grassdark.arc index 9062385c5..2327a9de1 100644 --- a/ground/new/grassdark.arc +++ b/ground/new/grassdark.arc @@ -10,4 +10,3 @@ slow_move 1 is_wooded 1 editable 8 end - diff --git a/ground/new/grassmedium.arc b/ground/new/grassmedium.arc index f2800494e..7ca185dd6 100644 --- a/ground/new/grassmedium.arc +++ b/ground/new/grassmedium.arc @@ -10,5 +10,3 @@ slow_move 1 is_wooded 1 editable 8 end - - diff --git a/ground/new/palm.arc b/ground/new/palm.arc index 687b9396e..0f66e5a9b 100644 --- a/ground/new/palm.arc +++ b/ground/new/palm.arc @@ -8,4 +8,3 @@ editable 8 visibility 100 color_fg brown end - diff --git a/ground/new/palms.arc b/ground/new/palms.arc index b7d9e598b..cdc840fd2 100644 --- a/ground/new/palms.arc +++ b/ground/new/palms.arc @@ -9,7 +9,3 @@ slow_move 2 is_wooded 1 editable 8 end - - - - diff --git a/ground/temp_fog.arc b/ground/temp_fog.arc index ca6d98b97..230323b94 100644 --- a/ground/temp_fog.arc +++ b/ground/temp_fog.arc @@ -18,7 +18,22 @@ no_pick 1 color_fg white color_bg khaki is_used_up 1 -immune 262124 +resist_fire 100 +resist_electricity 100 +resist_confusion 100 +resist_acid 100 +resist_drain 100 +resist_weaponmagic 100 +resist_ghosthit 100 +resist_poison 100 +resist_slow 100 +resist_paralyze 100 +resist_turn_undead 100 +resist_fear 100 +resist_cancellation 100 +resist_deplete 100 +resist_death 100 + material 1 changing 1 visibility 100 diff --git a/inorganic/lead.arc b/inorganic/lead.arc index 2cb0a183e..1bbec04d9 100644 --- a/inorganic/lead.arc +++ b/inorganic/lead.arc @@ -2,9 +2,11 @@ Object lead face lead.111 material 2 value 100 -protected 2 +resist_magic 30 + type 73 -immune 64 +resist_acid 100 + weight 5000 editable 2048 nrof 1 diff --git a/inorganic/mercury.arc b/inorganic/mercury.arc index f87b8ee1e..01733f5ff 100644 --- a/inorganic/mercury.arc +++ b/inorganic/mercury.arc @@ -2,7 +2,9 @@ Object mercury face mercury.111 material 2 value 210 -immune 72 +resist_electricity 100 +resist_acid 100 + type 73 nrof 1 weight 3000 @@ -21,7 +23,9 @@ mina speed 0.5 material 2 value 400 -immune 72 +resist_electricity 100 +resist_acid 100 + type 73 nrof 1 weight 8000 diff --git a/inorganic/minerals.arc b/inorganic/minerals.arc index 3e51ddb14..4f91c3fde 100644 --- a/inorganic/minerals.arc +++ b/inorganic/minerals.arc @@ -6,7 +6,8 @@ nrof 1 material 4 type 73 value 40 -vulnerable 4 +resist_fire -100 + weight 2500 editable 2048 magicmap brown @@ -32,8 +33,10 @@ material 64 type 73 value 15 color_fg yellow -vulnerable 4 -immune 64 +resist_fire -100 + +resist_acid 100 + weight 500 editable 2048 end @@ -46,8 +49,11 @@ material 64 type 73 value 45 color_fg grey -vulnerable 12 -immune 64 +resist_fire -100 +resist_electricity -100 + +resist_acid 100 + weight 1000 editable 2048 end @@ -84,7 +90,8 @@ material 64 type 73 value 9 color_fg blue -immune 64 +resist_acid 100 + weight 1500 editable 2048 end diff --git a/inorganic/phil_minerals.arc b/inorganic/phil_minerals.arc index fe641ef2d..ef32f9941 100644 --- a/inorganic/phil_minerals.arc +++ b/inorganic/phil_minerals.arc @@ -6,7 +6,8 @@ nrof 1 material 4 type 73 value 280 -vulnerable 4 +resist_fire -100 + weight 500 editable 2048 end @@ -25,8 +26,10 @@ type 73 speed -0.35 value 110 color_fg yellow -vulnerable 4 -immune 64 +resist_fire -100 + +resist_acid 100 + weight 500 editable 2048 end @@ -45,8 +48,11 @@ speed -0.45 type 73 value 350 color_fg grey -vulnerable 12 -immune 64 +resist_fire -100 +resist_electricity -100 + +resist_acid 100 + weight 1000 editable 2048 end diff --git a/inorganic/stone.arc b/inorganic/stone.arc index dbd4c3839..4ad161460 100644 --- a/inorganic/stone.arc +++ b/inorganic/stone.arc @@ -3,7 +3,8 @@ name river stone face lstone.111 material 2 value 1 -immune 64 +resist_acid 100 + type 73 weight 800 editable 2048 @@ -15,7 +16,8 @@ name mountain stone face lstone.111 material 2 value 1 -immune 64 +resist_acid 100 + type 73 weight 800 editable 2048 @@ -26,7 +28,8 @@ name stone face lstone.111 material 2 value 1 -immune 64 +resist_acid 100 + type 73 weight 800 editable 2048 diff --git a/inorganic/true_lead.arc b/inorganic/true_lead.arc index 579f02442..3426035fb 100644 --- a/inorganic/true_lead.arc +++ b/inorganic/true_lead.arc @@ -4,7 +4,9 @@ title of true lead face true_lead.111 material 2 value 530 -immune 68 +resist_fire 100 +resist_acid 100 + type 73 nrof 1 weight 5000 diff --git a/magic/avatar.arc b/magic/avatar.arc index edae4920d..1fcc78e47 100644 --- a/magic/avatar.arc +++ b/magic/avatar.arc @@ -7,7 +7,7 @@ animation avatar is_animated 1 monster 1 alive 1 -armour 45 +resist_physical 45 ac -10 wc -1 dam 50 @@ -15,7 +15,8 @@ hp 500 maxhp 500 level 12 speed 0.25 -immune 2 +resist_magic 100 + exp 1000 weight 200000 editable 33 diff --git a/magic/flaming_aura.arc b/magic/flaming_aura.arc index 54517081c..bf3817fba 100644 --- a/magic/flaming_aura.arc +++ b/magic/flaming_aura.arc @@ -22,4 +22,3 @@ no_pick 1 food 2 is_used_up 1 end - diff --git a/magic/holy_servant.arc b/magic/holy_servant.arc index 8d096b2d8..9f57274d6 100644 --- a/magic/holy_servant.arc +++ b/magic/holy_servant.arc @@ -8,7 +8,7 @@ golem.112 mina is_animated 1 monster 1 -armour 25 +resist_physical 25 alive 1 ac 4 wc 6 @@ -17,7 +17,8 @@ hp 50 maxhp 50 level 8 speed 0.15 -immune 2 +resist_magic 100 + exp 50 weight 200000 editable 1 diff --git a/magic/snake_golem.arc b/magic/snake_golem.arc index 00be2b855..3da9a4026 100644 --- a/magic/snake_golem.arc +++ b/magic/snake_golem.arc @@ -16,7 +16,8 @@ hp 10 maxhp 10 level 3 speed 0.10 -immune 1024 +resist_poison 100 + attacktype 1025 exp 50 weight 200000 diff --git a/magic/spiderweb_spell.arc b/magic/spiderweb_spell.arc index a2512b44f..0965f14eb 100644 --- a/magic/spiderweb_spell.arc +++ b/magic/spiderweb_spell.arc @@ -23,4 +23,3 @@ slow_move 7 material 128 editable 8 end - diff --git a/magic/vitriol.arc b/magic/vitriol.arc index 943f5519d..a5817829b 100644 --- a/magic/vitriol.arc +++ b/magic/vitriol.arc @@ -16,7 +16,6 @@ no_pick 1 attacktype 64 editable 0 end - Object vitriol_splash name vitriol splash other_arch vitriol_pool @@ -39,7 +38,6 @@ no_pick 1 attacktype 64 editable 0 end - Object vitriol_pool type 88 level 1 diff --git a/misc/crown.arc b/misc/crown.arc index c29405931..ad28ee72d 100644 --- a/misc/crown.arc +++ b/misc/crown.arc @@ -4,7 +4,7 @@ nrof 1 face crown.111 type 34 material 2 -armour 3 +resist_physical 3 weight 12300 value 1700 color_fg orange diff --git a/misc/icecube.arc b/misc/icecube.arc index e1c16accd..b1d17cf8d 100644 --- a/misc/icecube.arc +++ b/misc/icecube.arc @@ -4,6 +4,7 @@ face icecube.111 color_fg white material 68 weight 15000 -immune 16 +resist_cold 100 + editable 2048 end diff --git a/misc/naz_report.arc b/misc/naz_report.arc index 4b8a078f1..735cd04ee 100644 --- a/misc/naz_report.arc +++ b/misc/naz_report.arc @@ -10,7 +10,6 @@ Nazgul has a drain attack. So we cannot attack him physically, except a Special Case. Special case means ... - * this scroll is broken, * *so I cannot continue to read * endmsg diff --git a/monster/acid/acidsphere.arc b/monster/acid/acidsphere.arc index eb863cb31..762583e3b 100644 --- a/monster/acid/acidsphere.arc +++ b/monster/acid/acidsphere.arc @@ -19,7 +19,19 @@ wc 1 dam 100 weight 1 level 5 -immune 16380 +resist_fire 100 +resist_electricity 100 +resist_cold 100 +resist_confusion 100 +resist_acid 100 +resist_drain 100 +resist_weaponmagic 100 +resist_ghosthit 100 +resist_poison 100 +resist_slow 100 +resist_paralyze 100 +resist_turn_undead 100 + attacktype 64 hitback 1 hp 1 diff --git a/monster/acid/bpudding.arc b/monster/acid/bpudding.arc index ced4f83e9..1007da61a 100644 --- a/monster/acid/bpudding.arc +++ b/monster/acid/bpudding.arc @@ -25,7 +25,8 @@ exp 800 weight 20000 level 5 attacktype 64 -vulnerable 4 +resist_fire -100 + hitback 1 editable 1 color_fg black @@ -60,7 +61,8 @@ exp 400 weight 20000 level 5 attacktype 64 -vulnerable 4 +resist_fire -100 + hitback 1 editable 1 color_fg black @@ -90,7 +92,8 @@ exp 400 weight 20000 level 5 attacktype 64 -vulnerable 4 +resist_fire -100 + hitback 1 editable 1 color_fg black diff --git a/monster/acid/pet_necro.arc b/monster/acid/pet_necro.arc index c89341ac2..ed18ba41a 100644 --- a/monster/acid/pet_necro.arc +++ b/monster/acid/pet_necro.arc @@ -18,7 +18,8 @@ ac -10 speed -1.000000 level 100 attacktype 1 -vulnerable 4 +resist_fire -100 + weight 30000 alive 1 monster 1 diff --git a/monster/acid/rustmonste.arc b/monster/acid/rustmonste.arc index 6b44c0568..c4dacd756 100644 --- a/monster/acid/rustmonste.arc +++ b/monster/acid/rustmonste.arc @@ -22,7 +22,8 @@ exp 300 weight 30000 level 4 attacktype 64 -vulnerable 4 +resist_fire -100 + hitback 1 editable 1 end diff --git a/monster/animal/Behemoth/behemoth.arc b/monster/animal/Behemoth/behemoth.arc index 2b6996f44..fbda7ddb1 100644 --- a/monster/animal/Behemoth/behemoth.arc +++ b/monster/animal/Behemoth/behemoth.arc @@ -6,8 +6,10 @@ attacktype 1025 monster 1 sleep 1 Wis 20 -immune 16384 -protected 2 +resist_fear 100 + +resist_magic 30 + exp 20000 ac -6 wc -10 diff --git a/monster/animal/bat.arc b/monster/animal/bat.arc index 0efb15e10..b8e667fd1 100644 --- a/monster/animal/bat.arc +++ b/monster/animal/bat.arc @@ -23,7 +23,8 @@ ac 4 level 2 flying 1 weight 20 -protected 1 +resist_physical 30 + editable 1 color_fg black end diff --git a/monster/animal/bat_gen.arc b/monster/animal/bat_gen.arc index 0ee799e08..55199bc34 100644 --- a/monster/animal/bat_gen.arc +++ b/monster/animal/bat_gen.arc @@ -10,7 +10,8 @@ level 1 exp 20 speed 0.015 hp 100 -protected 1 +resist_physical 30 + editable 1 magicmap black end diff --git a/monster/animal/scorpion.arc b/monster/animal/scorpion.arc index a673d3156..a5c3d8b51 100644 --- a/monster/animal/scorpion.arc +++ b/monster/animal/scorpion.arc @@ -19,9 +19,13 @@ wc 0 level 5 dam 10 attacktype 1025 -immune 4 -protected 8 -vulnerable 48 +resist_fire 100 + +resist_electricity 30 + +resist_cold -100 +resist_confusion -100 + speed 0.1 exp 70 weight 5000 diff --git a/monster/animal/shadowtiger/shadowtiger.arc b/monster/animal/shadowtiger/shadowtiger.arc index 04333136f..b8c000e85 100644 --- a/monster/animal/shadowtiger/shadowtiger.arc +++ b/monster/animal/shadowtiger/shadowtiger.arc @@ -46,8 +46,17 @@ ac -13 wc -20 dam 33 level 20 -immune 7331 -protected 264 +resist_physical 100 +resist_magic 100 +resist_confusion 100 +resist_drain 100 +resist_poison 100 +resist_slow 100 +resist_paralyze 100 + +resist_electricity 30 +resist_weaponmagic 30 + attacktype 71041 speed 0.300000 weight 300000 diff --git a/monster/beholder/behold_gen.arc b/monster/beholder/behold_gen.arc index d1c535ca6..c7377acea 100644 --- a/monster/beholder/behold_gen.arc +++ b/monster/beholder/behold_gen.arc @@ -10,7 +10,8 @@ maxhp 100 exp 180 ac 13 speed -0.001 -immune 2 +resist_magic 100 + alive 1 level 1 maxsp 1 diff --git a/monster/beholder/beholder.arc b/monster/beholder/beholder.arc index bdc33996a..a5de73a53 100644 --- a/monster/beholder/beholder.arc +++ b/monster/beholder/beholder.arc @@ -24,7 +24,11 @@ maxsp 15 hp 80 maxhp 80 level 9 -immune 21506 +resist_magic 100 +resist_poison 100 +resist_paralyze 100 +resist_fear 100 + speed -0.07 flying 1 weight 1000 diff --git a/monster/beholder/dread.arc b/monster/beholder/dread.arc index 4310b7a61..8962d2594 100644 --- a/monster/beholder/dread.arc +++ b/monster/beholder/dread.arc @@ -28,7 +28,12 @@ ac -10 wc -20 dam 25 level 15 -immune 21510 +resist_magic 100 +resist_fire 100 +resist_poison 100 +resist_paralyze 100 +resist_fear 100 + speed -0.30 weight 30000 run_away 2 diff --git a/monster/chaos/liv_chaos.arc b/monster/chaos/liv_chaos.arc index 2493553a6..f7b87debb 100644 --- a/monster/chaos/liv_chaos.arc +++ b/monster/chaos/liv_chaos.arc @@ -30,9 +30,22 @@ attacktype 262144 Con 3 Wis 15 can_cast_spell 1 -immune 411136 -protected 31 -vulnerable 416 +resist_ghosthit 100 +resist_poison 100 +resist_fear 100 +resist_death 100 +resist_chaos 100 + +resist_physical 30 +resist_magic 30 +resist_fire 30 +resist_electricity 30 +resist_cold 30 + +resist_confusion -100 +resist_drain -100 +resist_weaponmagic -100 + monster 1 editable 1 end diff --git a/monster/demon/Balrog.arc b/monster/demon/Balrog.arc index 0ca63c234..259f23707 100644 --- a/monster/demon/Balrog.arc +++ b/monster/demon/Balrog.arc @@ -10,8 +10,14 @@ jessyb.113 jessyb.112 mina attacktype 1029 -protected 3145730 -immune 1060 +resist_magic 30 +resist_godpower 30 +resist_holyword 30 + +resist_fire 100 +resist_confusion 100 +resist_poison 100 + monster 1 sleep 1 Wis 20 diff --git a/monster/demon/Big_Demon/big_demon.arc b/monster/demon/Big_Demon/big_demon.arc index ede1990c7..fd49bc859 100644 --- a/monster/demon/Big_Demon/big_demon.arc +++ b/monster/demon/Big_Demon/big_demon.arc @@ -9,8 +9,14 @@ facings 2 big_demon.171 big_demon.131 mina -protected 3145730 -immune 1060 +resist_magic 30 +resist_godpower 30 +resist_holyword 30 + +resist_fire 100 +resist_confusion 100 +resist_poison 100 + attacktype 1029 can_see_in_dark 1 can_cast_spell 1 diff --git a/monster/demon/Demon_Lord/demon_lord.arc b/monster/demon/Demon_Lord/demon_lord.arc index 3c7419542..9149853af 100644 --- a/monster/demon/Demon_Lord/demon_lord.arc +++ b/monster/demon/Demon_Lord/demon_lord.arc @@ -20,8 +20,12 @@ dam 50 wc -30 weight 8000000 attacktype 5 -immune 16404 -protected 2 +resist_fire 100 +resist_cold 100 +resist_fear 100 + +resist_magic 30 + level 19 speed -0.2 alive 1 diff --git a/monster/demon/GreatDemon/GreatDemon.arc b/monster/demon/GreatDemon/GreatDemon.arc index fdb74ba6d..23b9fd6c3 100644 --- a/monster/demon/GreatDemon/GreatDemon.arc +++ b/monster/demon/GreatDemon/GreatDemon.arc @@ -30,8 +30,14 @@ wc -50 weight 8000000 attacktype 1029 attack_movement 5 -immune 1060 -protected 3145730 +resist_fire 100 +resist_confusion 100 +resist_poison 100 + +resist_magic 30 +resist_godpower 30 +resist_holyword 30 + level 40 speed 0.3 alive 1 diff --git a/monster/demon/angel.arc b/monster/demon/angel.arc index ca2c7dab0..e298ae0c6 100644 --- a/monster/demon/angel.arc +++ b/monster/demon/angel.arc @@ -24,7 +24,8 @@ hp 150 Int 20 Con 3 level 12 -immune 2 +resist_magic 100 + speed 0.2 weight 75000 flying 1 diff --git a/monster/demon/archangel.arc b/monster/demon/archangel.arc index 559645fe0..92c65ae68 100644 --- a/monster/demon/archangel.arc +++ b/monster/demon/archangel.arc @@ -24,8 +24,19 @@ hp 2500 maxhp 2500 Con 40 level 25 -immune 23722 -protected 21 +resist_magic 100 +resist_electricity 100 +resist_confusion 100 +resist_drain 100 +resist_poison 100 +resist_slow 100 +resist_paralyze 100 +resist_fear 100 + +resist_physical 30 +resist_fire 30 +resist_cold 30 + attacktype 20745 speed 0.400000 weight 150000 diff --git a/monster/demon/devil.arc b/monster/demon/devil.arc index 5fc687367..1b5dd8e24 100644 --- a/monster/demon/devil.arc +++ b/monster/demon/devil.arc @@ -16,7 +16,7 @@ no_pick 1 alive 1 exp 800 ac 1 -armour 30 +resist_physical 30 wc 3 dam 12 Pow 4 @@ -27,8 +27,11 @@ hp 165 Con 4 maxhp 165 level 9 -immune 4 -vulnerable 48 +resist_fire 100 + +resist_cold -100 +resist_confusion -100 + speed 0.11 weight 180000 run_away 15 diff --git a/monster/demon/devil_gen.arc b/monster/demon/devil_gen.arc index 4d0a1f634..a7d0a221a 100644 --- a/monster/demon/devil_gen.arc +++ b/monster/demon/devil_gen.arc @@ -10,8 +10,11 @@ maxhp 400 exp 180 ac 7 speed 0.0003 -immune 4 -vulnerable 48 +resist_fire 100 + +resist_cold -100 +resist_confusion -100 + alive 1 level 1 maxsp 1 diff --git a/monster/demon/evil_master2.arc b/monster/demon/evil_master2.arc index eeae0dc10..eee8bd627 100644 --- a/monster/demon/evil_master2.arc +++ b/monster/demon/evil_master2.arc @@ -19,11 +19,12 @@ exp 6000 dam 40 wc -30 ac -60 -armour 50 +resist_physical 50 speed 0.700000 attack_movement 4 level 100 -immune 2 +resist_magic 100 + weight 75000 randomitems angel run_away 18 diff --git a/monster/demon/evil_master3.arc b/monster/demon/evil_master3.arc index bcc3b081e..487074d2d 100644 --- a/monster/demon/evil_master3.arc +++ b/monster/demon/evil_master3.arc @@ -19,10 +19,11 @@ exp 5000 dam 30 wc -30 ac -10 -armour -30 +resist_physical -30 speed 0.500000 level 100 -immune 4 +resist_fire 100 + attacktype 7 carrying 100 weight 180000 diff --git a/monster/demon/evil_master4.arc b/monster/demon/evil_master4.arc index cb38a0d86..bd7406298 100644 --- a/monster/demon/evil_master4.arc +++ b/monster/demon/evil_master4.arc @@ -21,12 +21,13 @@ exp 4000 dam 25 wc -50 ac -10 -armour 30 +resist_physical 30 speed 0.500000 attack_movement 5 level 100 attacktype 1 -vulnerable 4 +resist_fire -100 + weight 200000 randomitems raas run_away 15 diff --git a/monster/demon/imp.arc b/monster/demon/imp.arc index 91caff2d4..d8fc55ea8 100644 --- a/monster/demon/imp.arc +++ b/monster/demon/imp.arc @@ -17,7 +17,7 @@ no_pick 1 alive 1 exp 150 ac 4 -armour 20 +resist_physical 20 wc 4 dam 2 Int 0 @@ -29,8 +29,10 @@ Str 24 Pow 1 maxhp 5 level 1 -protected 2 -immune 4 +resist_magic 30 + +resist_fire 100 + speed 0.25 weight 200000 run_away 15 diff --git a/monster/demon/liteangel.arc b/monster/demon/liteangel.arc index 4844a4a4e..64caf0fd7 100644 --- a/monster/demon/liteangel.arc +++ b/monster/demon/liteangel.arc @@ -29,7 +29,10 @@ hp 500 maxhp 500 Con 16 level 13 -protected 21 +resist_physical 30 +resist_fire 30 +resist_cold 30 + attacktype 5 speed 0.25 weight 150000 diff --git a/monster/demon/mesangel.arc b/monster/demon/mesangel.arc index 15d46db53..52bdb4211 100644 --- a/monster/demon/mesangel.arc +++ b/monster/demon/mesangel.arc @@ -29,7 +29,10 @@ hp 500 maxhp 500 Con 12 level 18 -protected 21 +resist_physical 30 +resist_fire 30 +resist_cold 30 + attacktype 5 speed -0.50 weight 150000 diff --git a/monster/demon/raas.arc b/monster/demon/raas.arc index 85cc3c92b..77394747f 100644 --- a/monster/demon/raas.arc +++ b/monster/demon/raas.arc @@ -18,7 +18,7 @@ no_pick 1 alive 1 exp 700 ac 0 -armour 20 +resist_physical 20 wc 1 dam 25 Int 0 @@ -28,7 +28,8 @@ Con 14 Str 24 maxhp 165 level 9 -vulnerable 4 +resist_fire -100 + speed 0.20 weight 200000 run_away 15 diff --git a/monster/dragon/Chinese_Dra/chinese_dr.arc b/monster/dragon/Chinese_Dra/chinese_dr.arc index fbc1d9e8a..1bcac76c4 100644 --- a/monster/dragon/Chinese_Dra/chinese_dr.arc +++ b/monster/dragon/Chinese_Dra/chinese_dr.arc @@ -24,9 +24,13 @@ can_cast_spell 1 maxsp 40 hp 1000 maxhp 1000 -immune 16400 -vulnerable 4 -protected 2 +resist_cold 100 +resist_fear 100 + +resist_fire -100 + +resist_magic 30 + ac -8 wc -15 dam 15 diff --git a/monster/dragon/Cwyvern.arc b/monster/dragon/Cwyvern.arc index 28cb77553..f51dff03b 100644 --- a/monster/dragon/Cwyvern.arc +++ b/monster/dragon/Cwyvern.arc @@ -20,8 +20,13 @@ can_cast_spell 1 maxsp 300 hp 3000 maxhp 3000 -immune 4117 -protected 8 +resist_physical 100 +resist_fire 100 +resist_cold 100 +resist_paralyze 100 + +resist_electricity 30 + attacktype 29 ac -10 wc -20 diff --git a/monster/dragon/Dragon/dragon.arc b/monster/dragon/Dragon/dragon.arc index fe800e22e..523408e4b 100644 --- a/monster/dragon/Dragon/dragon.arc +++ b/monster/dragon/Dragon/dragon.arc @@ -25,9 +25,14 @@ sp 60 maxsp 60 hp 3500 maxhp 3500 -immune 16388 -protected 2 -vulnerable 48 +resist_fire 100 +resist_fear 100 + +resist_magic 30 + +resist_cold -100 +resist_confusion -100 + ac -12 wc -20 dam 25 diff --git a/monster/dragon/Dragonman/dragonman.arc b/monster/dragon/Dragonman/dragonman.arc index 4b0f8c750..a0a6909cf 100644 --- a/monster/dragon/Dragonman/dragonman.arc +++ b/monster/dragon/Dragonman/dragonman.arc @@ -25,8 +25,20 @@ sp 80 maxsp 80 hp 3500 maxhp 3500 -immune 23756 -protected 305 +resist_fire 100 +resist_electricity 100 +resist_acid 100 +resist_drain 100 +resist_poison 100 +resist_slow 100 +resist_paralyze 100 +resist_fear 100 + +resist_physical 30 +resist_cold 30 +resist_confusion 30 +resist_weaponmagic 30 + ac -10 wc -10 dam 10 diff --git a/monster/dragon/Electric/elec_dr.arc b/monster/dragon/Electric/elec_dr.arc index 18d255d34..404125817 100644 --- a/monster/dragon/Electric/elec_dr.arc +++ b/monster/dragon/Electric/elec_dr.arc @@ -22,8 +22,13 @@ sp 70 maxsp 100 hp 3500 maxhp 3500 -immune 16440 -vulnerable 4 +resist_electricity 100 +resist_cold 100 +resist_confusion 100 +resist_fear 100 + +resist_fire -100 + ac -12 wc -20 dam 25 diff --git a/monster/dragon/Hatchlings/cold_drag.arc b/monster/dragon/Hatchlings/cold_drag.arc index 48521d87e..7d0457c9f 100644 --- a/monster/dragon/Hatchlings/cold_drag.arc +++ b/monster/dragon/Hatchlings/cold_drag.arc @@ -29,8 +29,10 @@ sp 40 maxsp 40 hp 80 maxhp 80 -immune 16 -protected 2 +resist_cold 100 + +resist_magic 30 + speed -0.07 flying 1 weight 70000 diff --git a/monster/dragon/Hatchlings/elec_drag.arc b/monster/dragon/Hatchlings/elec_drag.arc index c440935bc..44e031dd6 100644 --- a/monster/dragon/Hatchlings/elec_drag.arc +++ b/monster/dragon/Hatchlings/elec_drag.arc @@ -29,8 +29,10 @@ sp 40 maxsp 40 hp 90 maxhp 90 -immune 8 -protected 2 +resist_electricity 100 + +resist_magic 30 + speed -0.07 flying 1 weight 70000 diff --git a/monster/dragon/Hatchlings/fire_drag.arc b/monster/dragon/Hatchlings/fire_drag.arc index 0de6c6afc..5d2bf5e04 100644 --- a/monster/dragon/Hatchlings/fire_drag.arc +++ b/monster/dragon/Hatchlings/fire_drag.arc @@ -29,8 +29,10 @@ sp 40 maxsp 40 hp 100 maxhp 100 -immune 4 -protected 2 +resist_fire 100 + +resist_magic 30 + speed -0.07 flying 1 weight 70000 diff --git a/monster/dragon/WDragon/worthless_dragon.arc b/monster/dragon/WDragon/worthless_dragon.arc index ddd258850..75a66a638 100644 --- a/monster/dragon/WDragon/worthless_dragon.arc +++ b/monster/dragon/WDragon/worthless_dragon.arc @@ -26,9 +26,14 @@ sp 60 maxsp 60 hp 3500 maxhp 3500 -immune 16388 -protected 2 -vulnerable 48 +resist_fire 100 +resist_fear 100 + +resist_magic 30 + +resist_cold -100 +resist_confusion -100 + ac -12 wc -20 dam 25 diff --git a/monster/dragon/baby_drag.arc b/monster/dragon/baby_drag.arc index 2dfeff4b9..2927eb26c 100644 --- a/monster/dragon/baby_drag.arc +++ b/monster/dragon/baby_drag.arc @@ -19,8 +19,12 @@ can_cast_spell 1 maxsp 40 hp 1750 maxhp 1750 -immune 16388 -protected 18 +resist_fire 100 +resist_fear 100 + +resist_magic 30 +resist_cold 30 + ac -8 wc -10 dam 10 diff --git a/monster/dragon/dragoncave.arc b/monster/dragon/dragoncave.arc index 8015cbe5e..787684ea9 100644 --- a/monster/dragon/dragoncave.arc +++ b/monster/dragon/dragoncave.arc @@ -11,7 +11,8 @@ hp 300 maxhp 300 ac 3 exp 1000 -immune 4 +resist_fire 100 + no_pick 1 alive 1 maxsp 1 diff --git a/monster/dragon/fae_drag.arc b/monster/dragon/fae_drag.arc index 5c2d0ec69..ef8e4b557 100644 --- a/monster/dragon/fae_drag.arc +++ b/monster/dragon/fae_drag.arc @@ -30,7 +30,11 @@ sp 20 maxsp 40 hp 40 maxhp 40 -immune 21506 +resist_magic 100 +resist_poison 100 +resist_paralyze 100 +resist_fear 100 + speed -0.07 flying 1 weight 70000 diff --git a/monster/dragon/wyvern.arc b/monster/dragon/wyvern.arc index 670502aa1..39a63d377 100644 --- a/monster/dragon/wyvern.arc +++ b/monster/dragon/wyvern.arc @@ -21,8 +21,12 @@ can_cast_spell 1 maxsp 10 hp 300 maxhp 300 -immune 16388 -vulnerable 48 +resist_fire 100 +resist_fear 100 + +resist_cold -100 +resist_confusion -100 + attacktype 1 ac 2 wc 2 diff --git a/monster/elemental/Para/para_air.arc b/monster/elemental/Para/para_air.arc index f1e1d1653..c473285d2 100644 --- a/monster/elemental/Para/para_air.arc +++ b/monster/elemental/Para/para_air.arc @@ -12,7 +12,8 @@ para_air.114 mina monster 1 alive 1 -immune 8 +resist_electricity 100 + attacktype 8 ac 3 wc 10 diff --git a/monster/elemental/Para/para_earth.arc b/monster/elemental/Para/para_earth.arc index 34213d525..50c776778 100644 --- a/monster/elemental/Para/para_earth.arc +++ b/monster/elemental/Para/para_earth.arc @@ -21,7 +21,8 @@ speed -0.08 exp 210 weight 100000 level 6 -immune 16 +resist_cold 100 + attacktype 16 editable 1 end diff --git a/monster/elemental/Para/para_fire.arc b/monster/elemental/Para/para_fire.arc index 4afa83319..7dad955c4 100644 --- a/monster/elemental/Para/para_fire.arc +++ b/monster/elemental/Para/para_fire.arc @@ -10,9 +10,11 @@ para_fire.112 mina monster 1 alive 1 -immune 4 +resist_fire 100 + attacktype 4 -vulnerable 32 +resist_confusion -100 + ac 5 wc 16 dam 20 diff --git a/monster/elemental/Para/para_ice.arc b/monster/elemental/Para/para_ice.arc index b60c46d10..7ef31110d 100644 --- a/monster/elemental/Para/para_ice.arc +++ b/monster/elemental/Para/para_ice.arc @@ -21,8 +21,11 @@ speed -0.1 exp 200 weight 50000 level 6 -immune 48 +resist_cold 100 +resist_confusion 100 + attacktype 16 -vulnerable 4 +resist_fire -100 + editable 1 end diff --git a/monster/elemental/Para/para_lava.arc b/monster/elemental/Para/para_lava.arc index 17d99a1d7..576fa404a 100644 --- a/monster/elemental/Para/para_lava.arc +++ b/monster/elemental/Para/para_lava.arc @@ -12,9 +12,11 @@ para_lava.112 mina monster 1 alive 1 -immune 4 +resist_fire 100 + attacktype 4 -vulnerable 16 +resist_cold -100 + ac 5 wc 16 dam 20 diff --git a/monster/elemental/Para/para_light.arc b/monster/elemental/Para/para_light.arc index 186acbe0b..0655128ca 100644 --- a/monster/elemental/Para/para_light.arc +++ b/monster/elemental/Para/para_light.arc @@ -22,6 +22,8 @@ weight 200 level 6 flying 1 editable 1 -immune 12 +resist_fire 100 +resist_electricity 100 + attacktype 8 end diff --git a/monster/elemental/Para/para_mud.arc b/monster/elemental/Para/para_mud.arc index 15e5b441e..be17929f6 100644 --- a/monster/elemental/Para/para_mud.arc +++ b/monster/elemental/Para/para_mud.arc @@ -25,8 +25,10 @@ speed -0.08 exp 200 weight 100000 level 6 -immune 16 +resist_cold 100 + attacktype 1 -vulnerable 4 +resist_fire -100 + editable 1 end diff --git a/monster/elemental/Para/para_water.arc b/monster/elemental/Para/para_water.arc index d6f6494b2..7dc036e6a 100644 --- a/monster/elemental/Para/para_water.arc +++ b/monster/elemental/Para/para_water.arc @@ -20,8 +20,10 @@ speed -0.1 exp 200 weight 50000 level 6 -immune 32 +resist_confusion 100 + attacktype 1 -vulnerable 16 +resist_cold -100 + editable 1 end diff --git a/monster/elemental/elem_air.arc b/monster/elemental/elem_air.arc index ccd22fd97..e2f6f7adc 100644 --- a/monster/elemental/elem_air.arc +++ b/monster/elemental/elem_air.arc @@ -9,9 +9,11 @@ elem_air.112 mina monster 1 alive 1 -immune 8 +resist_electricity 100 + attacktype 8 -vulnerable 1 +resist_physical -100 + ac 0 wc 8 dam 10 diff --git a/monster/elemental/elem_earth.arc b/monster/elemental/elem_earth.arc index df00a8bac..161cd6c39 100644 --- a/monster/elemental/elem_earth.arc +++ b/monster/elemental/elem_earth.arc @@ -18,8 +18,10 @@ speed -0.08 exp 250 weight 100000 level 8 -immune 16 +resist_cold 100 + attacktype 16 -vulnerable 4 +resist_fire -100 + editable 1 end diff --git a/monster/elemental/elem_fire.arc b/monster/elemental/elem_fire.arc index 453bd461e..ffb67d14b 100644 --- a/monster/elemental/elem_fire.arc +++ b/monster/elemental/elem_fire.arc @@ -9,9 +9,11 @@ elem_fire.112 mina monster 1 alive 1 -immune 4 +resist_fire 100 + attacktype 4 -vulnerable 32 +resist_confusion -100 + glow_radius 1 ac 2 wc 10 diff --git a/monster/elemental/elem_water.arc b/monster/elemental/elem_water.arc index 15c86e9fa..4b5694a07 100644 --- a/monster/elemental/elem_water.arc +++ b/monster/elemental/elem_water.arc @@ -18,8 +18,10 @@ speed -0.1 exp 250 weight 50000 level 8 -immune 32 +resist_confusion 100 + attacktype 1 -vulnerable 16 +resist_cold -100 + editable 1 end diff --git a/monster/giant/Belzebub/belzebub.arc b/monster/giant/Belzebub/belzebub.arc index 945b52f54..8fd265e58 100644 --- a/monster/giant/Belzebub/belzebub.arc +++ b/monster/giant/Belzebub/belzebub.arc @@ -14,13 +14,16 @@ belzebub.112 belzebub.111 belzebub.111 mina -immune 2 -protected 1032 +resist_magic 100 + +resist_electricity 30 +resist_poison 30 + exp 300000 ac -14 wc -20 dam 40 -armour 35 +resist_physical 35 Str 80 Dex 30 Int 25 diff --git a/monster/giant/JessyB/jessyb.arc b/monster/giant/JessyB/jessyb.arc index 512026d0b..ea8ac9fb1 100644 --- a/monster/giant/JessyB/jessyb.arc +++ b/monster/giant/JessyB/jessyb.arc @@ -10,8 +10,22 @@ jessyb.113 jessyb.112 mina attacktype 65023 -immune 16119 -vulnerable 16392 +resist_physical 100 +resist_magic 100 +resist_fire 100 +resist_cold 100 +resist_confusion 100 +resist_acid 100 +resist_drain 100 +resist_ghosthit 100 +resist_poison 100 +resist_slow 100 +resist_paralyze 100 +resist_turn_undead 100 + +resist_electricity -100 +resist_fear -100 + monster 1 sleep 1 Wis 20 diff --git a/monster/giant/Titan/titan.arc b/monster/giant/Titan/titan.arc index f824cff42..886f0bcf7 100644 --- a/monster/giant/Titan/titan.arc +++ b/monster/giant/Titan/titan.arc @@ -20,8 +20,11 @@ titan.533 titan.532 titan.531 mina -immune 16392 -protected 2 +resist_electricity 100 +resist_fear 100 + +resist_magic 30 + exp 100000 ac -5 wc -20 diff --git a/monster/giant/byakie/byakie.arc b/monster/giant/byakie/byakie.arc index 8573df206..198ad943a 100644 --- a/monster/giant/byakie/byakie.arc +++ b/monster/giant/byakie/byakie.arc @@ -17,9 +17,21 @@ maxsp 20 Int 1 Pow 1 resist_physical 100 -immune 279554 -protected 6364 -vulnerable 32 +resist_magic 100 +resist_poison 100 +resist_fear 100 +resist_chaos 100 + +resist_fire 30 +resist_electricity 30 +resist_cold 30 +resist_acid 30 +resist_drain 30 +resist_slow 30 +resist_paralyze 30 + +resist_confusion -100 + see_invisible 1 exp 250000 ac -10 diff --git a/monster/giant/cyclops/cyclops.arc b/monster/giant/cyclops/cyclops.arc index 085d13afe..08bbc8277 100644 --- a/monster/giant/cyclops/cyclops.arc +++ b/monster/giant/cyclops/cyclops.arc @@ -17,10 +17,21 @@ Con 56 Str 80 Int 13 Dex 30 -armour 50 -immune 263168 -protected 6366 -vulnerable 32 +resist_physical 50 +resist_poison 100 +resist_chaos 100 + +resist_magic 30 +resist_fire 30 +resist_electricity 30 +resist_cold 30 +resist_acid 30 +resist_drain 30 +resist_slow 30 +resist_paralyze 30 + +resist_confusion -100 + see_invisible 1 exp 400000 ac -10 diff --git a/monster/giant/djinn/djinn.arc b/monster/giant/djinn/djinn.arc index d22b78fb3..a7e876910 100644 --- a/monster/giant/djinn/djinn.arc +++ b/monster/giant/djinn/djinn.arc @@ -20,8 +20,19 @@ Pow 30 can_cast_spell 1 maxsp 300 sp 300 -protected 262272 -immune 18015 +resist_drain 30 +resist_chaos 30 + +resist_physical 100 +resist_magic 100 +resist_fire 100 +resist_electricity 100 +resist_cold 100 +resist_acid 100 +resist_ghosthit 100 +resist_poison 100 +resist_fear 100 + attack_movement 7 attacktype 15 see_invisible 1 diff --git a/monster/giant/djinn/m_djinn.arc b/monster/giant/djinn/m_djinn.arc index ff97df435..de1e12321 100644 --- a/monster/giant/djinn/m_djinn.arc +++ b/monster/giant/djinn/m_djinn.arc @@ -14,9 +14,22 @@ Pow 10 can_cast_spell 1 maxsp 100 sp 100 -immune 18016 -vulnerable 262528 -protected 31 +resist_confusion 100 +resist_acid 100 +resist_ghosthit 100 +resist_poison 100 +resist_fear 100 + +resist_drain -100 +resist_weaponmagic -100 +resist_chaos -100 + +resist_physical 30 +resist_magic 30 +resist_fire 30 +resist_electricity 30 +resist_cold 30 + attack_movement 7 see_invisible 1 exp 70000 diff --git a/monster/giant/giant.arc b/monster/giant/giant.arc index 041638e34..4394e704f 100644 --- a/monster/giant/giant.arc +++ b/monster/giant/giant.arc @@ -11,7 +11,8 @@ anim giant.111 giant.112 mina -protected 8 +resist_electricity 30 + exp 1500 ac 1 wc 2 diff --git a/monster/giant/mabu.arc b/monster/giant/mabu.arc index 551f1ec11..493d605c2 100644 --- a/monster/giant/mabu.arc +++ b/monster/giant/mabu.arc @@ -11,7 +11,8 @@ anim mabu.111 mabu.112 mina -protected 8 +resist_electricity 30 + exp 1500 ac 1 wc 2 diff --git a/monster/giant/serpent/fireserp.arc b/monster/giant/serpent/fireserp.arc index b501b87ac..e36a262f1 100644 --- a/monster/giant/serpent/fireserp.arc +++ b/monster/giant/serpent/fireserp.arc @@ -8,8 +8,10 @@ Wis 15 animation serpent level 9 Con 4 -vulnerable 16 -protected 4 +resist_cold -100 + +resist_fire 30 + attacktype 5 exp 400 ac -1 diff --git a/monster/giant/serpent/serpent.arc b/monster/giant/serpent/serpent.arc index 07b4ea920..798c12aa4 100644 --- a/monster/giant/serpent/serpent.arc +++ b/monster/giant/serpent/serpent.arc @@ -14,8 +14,10 @@ serpent.172 mina level 7 Con 3.2 -vulnerable 16 -immune 1024 +resist_cold -100 + +resist_poison 100 + exp 150 ac -2 wc 5 diff --git a/monster/giant/slug/slug.arc b/monster/giant/slug/slug.arc index 51cd34070..e7c7ccff6 100644 --- a/monster/giant/slug/slug.arc +++ b/monster/giant/slug/slug.arc @@ -15,9 +15,13 @@ mina level 8 Con 10 color_fg grey -immune 16448 -vulnerable 4 -protected 8 +resist_acid 100 +resist_fear 100 + +resist_fire -100 + +resist_electricity 30 + attacktype 65 exp 500 ac -1 diff --git a/monster/goblin/Kobold/h_kobold.arc b/monster/goblin/Kobold/h_kobold.arc index 0f8f3df87..656c562b5 100644 --- a/monster/goblin/Kobold/h_kobold.arc +++ b/monster/goblin/Kobold/h_kobold.arc @@ -20,7 +20,8 @@ ac -30 speed 1.200000 attack_movement 3 level 50 -vulnerable 16 +resist_cold -100 + carrying 6000 weight 30000 alive 1 diff --git a/monster/goblin/Kobold/unusual_kobold.arc b/monster/goblin/Kobold/unusual_kobold.arc index 31722db98..3a6d38894 100644 --- a/monster/goblin/Kobold/unusual_kobold.arc +++ b/monster/goblin/Kobold/unusual_kobold.arc @@ -20,10 +20,11 @@ exp 5000 dam 70 wc -50 ac -100 -armour 100 +resist_physical 100 speed .4 level 50 -vulnerable 16 +resist_cold -100 + carrying 6000 weight 30000 is_animated 1 diff --git a/monster/goblin/ogre.arc b/monster/goblin/ogre.arc index ba18b59bd..aa44a9ad7 100644 --- a/monster/goblin/ogre.arc +++ b/monster/goblin/ogre.arc @@ -25,7 +25,8 @@ maxhp 50 wc 7 dam 8 speed 0.08 -protected 8 +resist_electricity 30 + weight 140000 run_away 15 can_apply 24 diff --git a/monster/human/Demihuman/gnome.arc b/monster/human/Demihuman/gnome.arc index b6d617702..baf70d9d7 100644 --- a/monster/human/Demihuman/gnome.arc +++ b/monster/human/Demihuman/gnome.arc @@ -30,7 +30,11 @@ hp 100 maxhp 100 sp 300 maxsp 300 -immune 8244 +resist_fire 100 +resist_cold 100 +resist_confusion 100 +resist_turn_undead 100 + weight 50000 speed 0.4 random_movement 1 diff --git a/monster/human/Guard/guard_hard.arc b/monster/human/Guard/guard_hard.arc index 6637271e5..e96d0cb12 100644 --- a/monster/human/Guard/guard_hard.arc +++ b/monster/human/Guard/guard_hard.arc @@ -10,7 +10,8 @@ sleep 1 Wis 15 see_invisible 1 no_pick 1 -immune 2 +resist_magic 100 + reflect_missile 1 reflect_spell 1 hp 250 @@ -20,7 +21,7 @@ sp 25 maxsp 25 Pow 3 ac 0 -armour 75 +resist_physical 75 exp 1200 wc 1 dam 15 diff --git a/monster/human/Guard/guard_ligh.arc b/monster/human/Guard/guard_ligh.arc index b8d22d56b..6c7a514f8 100644 --- a/monster/human/Guard/guard_ligh.arc +++ b/monster/human/Guard/guard_ligh.arc @@ -10,7 +10,8 @@ sleep 1 Wis 5 see_invisible 1 no_pick 1 -protected 2 +resist_magic 30 + sp 10 maxsp 10 Pow 1 @@ -18,7 +19,7 @@ hp 80 maxhp 80 Con 15 ac 3 -armour 30 +resist_physical 30 exp 150 wc 5 dam 10 diff --git a/monster/human/Guard/guard_med.arc b/monster/human/Guard/guard_med.arc index cf95aa63a..4a7a0948a 100644 --- a/monster/human/Guard/guard_med.arc +++ b/monster/human/Guard/guard_med.arc @@ -10,7 +10,8 @@ sleep 1 Wis 10 see_invisible 1 no_pick 1 -protected 2 +resist_magic 30 + reflect_missile 1 hp 120 maxhp 120 @@ -19,7 +20,7 @@ maxsp 20 Pow 2 Con 15 ac 1 -armour 65 +resist_physical 65 exp 250 wc 1 dam 15 diff --git a/monster/human/Guard/knight.arc b/monster/human/Guard/knight.arc index bcf071ba5..fff4a65e7 100644 --- a/monster/human/Guard/knight.arc +++ b/monster/human/Guard/knight.arc @@ -17,7 +17,8 @@ sleep 1 Wis 15 see_invisible 1 no_pick 1 -immune 2 +resist_magic 100 + unaggressive 1 reflect_missile 1 reflect_spell 1 @@ -28,7 +29,7 @@ sp 25 maxsp 25 Pow 3 ac 0 -armour 75 +resist_physical 75 exp 1500 wc 4 dam 15 diff --git a/monster/human/Town/courier.arc b/monster/human/Town/courier.arc index 117fe0228..2a83f37d4 100644 --- a/monster/human/Town/courier.arc +++ b/monster/human/Town/courier.arc @@ -18,7 +18,7 @@ Dex 15 Int 12 speed 0.20 weight 50000 -armour 20 +resist_physical 20 level 5 can_use_skill 1 can_use_wand 1 diff --git a/monster/human/Town/postman/postman.arc b/monster/human/Town/postman/postman.arc index 8bd57ff98..a9312fc64 100644 --- a/monster/human/Town/postman/postman.arc +++ b/monster/human/Town/postman/postman.arc @@ -18,7 +18,8 @@ hp 15 maxhp 15 exp 40 speed -0.20 -vulnerable 2048 +resist_slow -100 + weight 50000 level 3 can_use_skill 1 diff --git a/monster/human/arabic/a_guard_h.arc b/monster/human/arabic/a_guard_h.arc index 45ec39273..f4d20dff9 100644 --- a/monster/human/arabic/a_guard_h.arc +++ b/monster/human/arabic/a_guard_h.arc @@ -12,7 +12,8 @@ Wis 15 see_invisible 1 no_pick 1 no_magic 1 -immune 2 +resist_magic 100 + reflect_missile 1 reflect_spell 1 hp 250 @@ -25,7 +26,7 @@ Pow 3 sp 25 maxsp 25 ac 0 -armour 75 +resist_physical 75 exp 1200 wc 1 dam 15 diff --git a/monster/human/arabic/a_guard_l.arc b/monster/human/arabic/a_guard_l.arc index 5f7110b33..13b57da52 100644 --- a/monster/human/arabic/a_guard_l.arc +++ b/monster/human/arabic/a_guard_l.arc @@ -10,7 +10,8 @@ sleep 1 Wis 5 see_invisible 1 no_pick 1 -protected 2 +resist_magic 30 + sp 10 maxsp 10 Int 1 @@ -19,7 +20,7 @@ hp 80 maxhp 80 Con 15 ac 3 -armour 30 +resist_physical 30 exp 150 wc 5 dam 10 diff --git a/monster/human/arabic/a_guard_m.arc b/monster/human/arabic/a_guard_m.arc index d879f4b47..9ca4b31d5 100644 --- a/monster/human/arabic/a_guard_m.arc +++ b/monster/human/arabic/a_guard_m.arc @@ -11,7 +11,8 @@ sleep 1 Wis 10 see_invisible 1 no_pick 1 -protected 2 +resist_magic 30 + reflect_missile 1 hp 120 maxhp 120 @@ -21,7 +22,7 @@ Int 2 Pow 2 Con 15 ac 1 -armour 65 +resist_physical 65 exp 250 wc 1 dam 15 diff --git a/monster/human/arabic/a_priest.arc b/monster/human/arabic/a_priest.arc index 086ba59e2..1036f2ce1 100644 --- a/monster/human/arabic/a_priest.arc +++ b/monster/human/arabic/a_priest.arc @@ -15,7 +15,8 @@ maxhp 50 Con 10 no_pick 1 exp 500 -protected 2 +resist_magic 30 + speed 0.16 ac 5 wc 9 diff --git a/monster/human/arabic/holy_priest.arc b/monster/human/arabic/holy_priest.arc index a864d1392..a80cee4f3 100644 --- a/monster/human/arabic/holy_priest.arc +++ b/monster/human/arabic/holy_priest.arc @@ -13,8 +13,21 @@ monster 1 Wis 25 see_invisible 1 no_pick 1 -protected 263292 -immune 213123 +resist_fire 30 +resist_electricity 30 +resist_cold 30 +resist_confusion 30 +resist_acid 30 +resist_poison 30 +resist_chaos 30 + +resist_physical 100 +resist_magic 100 +resist_drain 100 +resist_fear 100 +resist_deplete 100 +resist_death 100 + sp 100 maxsp 100 Int 30 diff --git a/monster/human/lord_e.arc b/monster/human/lord_e.arc index dad7be193..42aa30e40 100644 --- a/monster/human/lord_e.arc +++ b/monster/human/lord_e.arc @@ -20,13 +20,19 @@ exp 10000 dam 60 wc -50 ac -50 -armour 50 +resist_physical 50 speed 0.95 speed_left -2.000000 level 30 -immune 28 +resist_fire 100 +resist_electricity 100 +resist_cold 100 + attacktype 30 -vulnerable 6176 +resist_confusion -100 +resist_slow -100 +resist_paralyze -100 + carrying 90000 weight 50000 pick_up 24 diff --git a/monster/human/pyromaniac.arc b/monster/human/pyromaniac.arc index 3e0191268..fb94e5521 100644 --- a/monster/human/pyromaniac.arc +++ b/monster/human/pyromaniac.arc @@ -29,7 +29,8 @@ hp 100 maxhp 100 sp 300 maxsp 1 -immune 2 +resist_magic 100 + weight 50000 speed 0.2 random_movement 1 diff --git a/monster/insect/ant/ant_egg.arc b/monster/insect/ant/ant_egg.arc index 974f89b48..7a0f3b602 100644 --- a/monster/insect/ant/ant_egg.arc +++ b/monster/insect/ant/ant_egg.arc @@ -11,8 +11,11 @@ level 1 ac 20 hp 1 maxhp 1 -protected 1088 -vulnerable 16 +resist_acid 30 +resist_poison 30 + +resist_cold -100 + speed 0.001 generator 1 is_used_up 1 diff --git a/monster/insect/ant/ant_larvae.arc b/monster/insect/ant/ant_larvae.arc index bd67bff54..4af339327 100644 --- a/monster/insect/ant/ant_larvae.arc +++ b/monster/insect/ant/ant_larvae.arc @@ -17,9 +17,12 @@ hp 3 maxhp 3 wc 20 dam 1 -armour 10 -vulnerable 16 -protected 1088 +resist_physical 10 +resist_cold -100 + +resist_acid 30 +resist_poison 30 + speed 0.005 generator 1 is_used_up 1 diff --git a/monster/insect/ant/breeder_ant.arc b/monster/insect/ant/breeder_ant.arc index 664b95164..aebad8d56 100644 --- a/monster/insect/ant/breeder_ant.arc +++ b/monster/insect/ant/breeder_ant.arc @@ -20,10 +20,13 @@ hp 1000 maxhp 1000 wc -12 dam 30 -armour 30 -vulnerable 16 -immune 1024 -protected 64 +resist_physical 30 +resist_cold -100 + +resist_poison 100 + +resist_acid 30 + attacktype 1025 attack_movement 7 generator 1 diff --git a/monster/insect/ant/guard_ant.arc b/monster/insect/ant/guard_ant.arc index 0f307df0a..2bc9d7cd8 100644 --- a/monster/insect/ant/guard_ant.arc +++ b/monster/insect/ant/guard_ant.arc @@ -17,10 +17,13 @@ hp 100 maxhp 100 wc -5 dam 25 -armour 50 -immune 1024 -protected 64 -vulnerable 16 +resist_physical 50 +resist_poison 100 + +resist_acid 30 + +resist_cold -100 + speed -0.2 stand_still 1 unaggressive 1 diff --git a/monster/insect/ant/spit_ant.arc b/monster/insect/ant/spit_ant.arc index 9cc49f988..b8396171d 100644 --- a/monster/insect/ant/spit_ant.arc +++ b/monster/insect/ant/spit_ant.arc @@ -31,12 +31,15 @@ Wis 10 ac -5 hp 100 maxhp 100 -armour 45 +resist_physical 45 attacktype 1025 attack_movement 7 run_away 50 -immune 1088 -vulnerable 16 +resist_acid 100 +resist_poison 100 + +resist_cold -100 + can_use_bow 1 wc -5 dam 15 diff --git a/monster/insect/ant/war_ant.arc b/monster/insect/ant/war_ant.arc index 3ac2a30bc..34e10603a 100644 --- a/monster/insect/ant/war_ant.arc +++ b/monster/insect/ant/war_ant.arc @@ -22,11 +22,14 @@ Wis 10 ac -5 hp 100 maxhp 100 -armour 45 +resist_physical 45 attacktype 1025 -immune 1024 -protected 64 -vulnerable 16 +resist_poison 100 + +resist_acid 30 + +resist_cold -100 + wc -5 dam 15 speed -0.2 diff --git a/monster/insect/ant/work_ant.arc b/monster/insect/ant/work_ant.arc index 7c1c53166..db61e69df 100644 --- a/monster/insect/ant/work_ant.arc +++ b/monster/insect/ant/work_ant.arc @@ -18,9 +18,12 @@ level 3 ac 10 hp 15 maxhp 15 -armour 20 -protected 1088 -vulnerable 16 +resist_physical 20 +resist_acid 30 +resist_poison 30 + +resist_cold -100 + wc 12 dam 3 speed 0.1 diff --git a/monster/insect/bee.arc b/monster/insect/bee.arc index 6e3c55a5e..5ecd38383 100644 --- a/monster/insect/bee.arc +++ b/monster/insect/bee.arc @@ -20,6 +20,7 @@ dam 1 ac 4 level 1 weight 20 -protected 1 +resist_physical 30 + editable 1 end diff --git a/monster/misc/Baslic/baslic.arc b/monster/misc/Baslic/baslic.arc index 6952cec9a..3b9a161e0 100644 --- a/monster/misc/Baslic/baslic.arc +++ b/monster/misc/Baslic/baslic.arc @@ -16,9 +16,13 @@ Pow 5 maxsp 20 hp 1200 maxhp 1000 -immune 16400 -vulnerable 4 -protected 2 +resist_cold 100 +resist_fear 100 + +resist_fire -100 + +resist_magic 30 + ac -8 wc -15 dam 20 diff --git a/monster/misc/Ent/ent.arc b/monster/misc/Ent/ent.arc index dd12f21ba..e1b5a4506 100644 --- a/monster/misc/Ent/ent.arc +++ b/monster/misc/Ent/ent.arc @@ -18,7 +18,8 @@ msg Don't trod on my roots! endmsg unaggressive 1 -vulnerable 4 +resist_fire -100 + exp 1000 ac -1 wc -1 diff --git a/monster/misc/Ngolem/gol.arc b/monster/misc/Ngolem/gol.arc index 86a6833b5..7ec9fb00a 100644 --- a/monster/misc/Ngolem/gol.arc +++ b/monster/misc/Ngolem/gol.arc @@ -21,8 +21,11 @@ dam 50 wc -20 ac -40 level 50 -immune 16392 -protected 2 +resist_electricity 100 +resist_fear 100 + +resist_magic 30 + weight 1500000 randomitems titan run_away 1 diff --git a/monster/misc/Unicorn/unicorn.arc b/monster/misc/Unicorn/unicorn.arc index 2c7baf7c1..bf470a6e7 100644 --- a/monster/misc/Unicorn/unicorn.arc +++ b/monster/misc/Unicorn/unicorn.arc @@ -24,7 +24,12 @@ maxsp 50 sp 50 hp 200 maxhp 200 -immune 21570 +resist_magic 100 +resist_acid 100 +resist_poison 100 +resist_paralyze 100 +resist_fear 100 + attacktype 1 unaggressive 1 ac 4 diff --git a/monster/misc/broo.arc b/monster/misc/broo.arc index dac7a79f1..a9a1e8ef3 100644 --- a/monster/misc/broo.arc +++ b/monster/misc/broo.arc @@ -23,8 +23,12 @@ wc 3 dam 12 speed -0.21 attacktype 1025 -immune 279552 -vulnerable 32 +resist_poison 100 +resist_fear 100 +resist_chaos 100 + +resist_confusion -100 + weight 75000 can_use_skill 1 can_use_scroll 1 diff --git a/monster/misc/c_knight.arc b/monster/misc/c_knight.arc index 5343c485b..2661cd2fa 100644 --- a/monster/misc/c_knight.arc +++ b/monster/misc/c_knight.arc @@ -21,11 +21,14 @@ Dex 20 Int 17 wc -1 dam 12 -armour 30 +resist_physical 30 speed 0.15 attacktype 1025 -protected 2 -immune 278528 +resist_magic 30 + +resist_fear 100 +resist_chaos 100 + weight 75000 can_use_skill 1 can_use_scroll 1 diff --git a/monster/misc/c_priest.arc b/monster/misc/c_priest.arc index 5b4f24ae1..01f859b2e 100644 --- a/monster/misc/c_priest.arc +++ b/monster/misc/c_priest.arc @@ -26,9 +26,14 @@ Con 10 wc 1 dam 8 speed 0.15 -protected 2 -vulnerable 1048864 -immune 262144 +resist_magic 30 + +resist_confusion -100 +resist_weaponmagic -100 +resist_godpower -100 + +resist_chaos 100 + weight 75000 attack_movement 7 can_use_skill 1 @@ -70,9 +75,16 @@ wc -1 dam 16 color_fg red speed 0.2 -protected 3 -vulnerable 1048864 -immune 278528 +resist_physical 30 +resist_magic 30 + +resist_confusion -100 +resist_weaponmagic -100 +resist_godpower -100 + +resist_fear 100 +resist_chaos 100 + weight 75000 attacktype 1025 attack_movement 7 diff --git a/monster/misc/crawl/crawling_chaos.arc b/monster/misc/crawl/crawling_chaos.arc index c661c2040..4a534824a 100644 --- a/monster/misc/crawl/crawling_chaos.arc +++ b/monster/misc/crawl/crawling_chaos.arc @@ -18,8 +18,13 @@ wc -5 dam 30 speed -0.25 attacktype 1089 -immune 279552 -vulnerable 40 +resist_poison 100 +resist_fear 100 +resist_chaos 100 + +resist_electricity -100 +resist_confusion -100 + weight 750000 monster 1 no_pick 1 diff --git a/monster/misc/dancingsword.arc b/monster/misc/dancingsword.arc index 9de3633bd..e2de67c8f 100644 --- a/monster/misc/dancingsword.arc +++ b/monster/misc/dancingsword.arc @@ -29,9 +29,20 @@ maxhp 100 wc -5 dam 20 speed -0.3 -armour 25 +resist_physical 25 attacktype 256 -immune 21124792 -protected 4 +resist_electricity 100 +resist_cold 100 +resist_confusion 100 +resist_drain 100 +resist_ghosthit 100 +resist_poison 100 +resist_paralyze 100 +resist_fear 100 +resist_death 100 +resist_blind 100 + +resist_fire 30 + editable 1 end diff --git a/monster/misc/deathtree.arc b/monster/misc/deathtree.arc index 7dd23bf56..b90eff0f1 100644 --- a/monster/misc/deathtree.arc +++ b/monster/misc/deathtree.arc @@ -14,7 +14,8 @@ speed -0.2 alive 1 monster 1 no_pick 1 -immune 2 +resist_magic 100 + hp 500 maxhp 500 Con 1 diff --git a/monster/misc/firechest.arc b/monster/misc/firechest.arc index 22cf90b1e..4f3b17296 100644 --- a/monster/misc/firechest.arc +++ b/monster/misc/firechest.arc @@ -10,7 +10,8 @@ weight 30 alive 1 level 1 no_pick 1 -immune 4 +resist_fire 100 + editable 1 color_fg black end diff --git a/monster/misc/gargoyle.arc b/monster/misc/gargoyle.arc index 1b86b75c7..3b829bea1 100644 --- a/monster/misc/gargoyle.arc +++ b/monster/misc/gargoyle.arc @@ -26,8 +26,11 @@ maxhp 300 wc -7 dam 20 speed -0.1 -armour 50 -immune 1090 +resist_physical 50 +resist_magic 100 +resist_acid 100 +resist_poison 100 + can_use_weapon 1 can_use_armour 1 can_use_bow 1 diff --git a/monster/misc/lamia/lamia.arc b/monster/misc/lamia/lamia.arc index dd17ebcfe..f9017a897 100644 --- a/monster/misc/lamia/lamia.arc +++ b/monster/misc/lamia/lamia.arc @@ -22,9 +22,14 @@ can_cast_spell 1 color_fg green maxsp 50 sp 50 -armour 30 -protected 2 -immune 279616 +resist_physical 30 +resist_magic 30 + +resist_acid 100 +resist_poison 100 +resist_fear 100 +resist_chaos 100 + attacktype 65 see_invisible 1 exp 100000 diff --git a/monster/misc/lokanth/lokanth.arc b/monster/misc/lokanth/lokanth.arc index 1f4cf68d3..90381cc3a 100644 --- a/monster/misc/lokanth/lokanth.arc +++ b/monster/misc/lokanth/lokanth.arc @@ -26,11 +26,19 @@ wc -1 dam 10 color_fg green speed -0.2 -armour 30 -protected 2 -vulnerable 1048864 -immune 278528 -immune 1088 +resist_physical 30 +resist_magic 30 + +resist_confusion -100 +resist_weaponmagic -100 +resist_godpower -100 + +resist_fear 100 +resist_chaos 100 + +resist_acid 100 +resist_poison 100 + weight 85000 attacktype 1025 can_cast_spell 1 diff --git a/monster/misc/mudman.arc b/monster/misc/mudman.arc index 92e1ce3c5..d3537c0f5 100644 --- a/monster/misc/mudman.arc +++ b/monster/misc/mudman.arc @@ -24,8 +24,13 @@ maxhp 1000 sp 150 maxsp 150 attacktype 7169 -immune 7168 -protected 80 +resist_poison 100 +resist_slow 100 +resist_paralyze 100 + +resist_cold 30 +resist_acid 30 + level 18 speed 0.1 weight 100000 diff --git a/monster/misc/sandy.arc b/monster/misc/sandy.arc index 0797b34a8..dfc753523 100644 --- a/monster/misc/sandy.arc +++ b/monster/misc/sandy.arc @@ -24,8 +24,10 @@ speed -0.08 exp 500 weight 100000 level 8 -immune 16 +resist_cold 100 + attacktype 16 -vulnerable 4 +resist_fire -100 + editable 1 end diff --git a/monster/misc/serpmen/serp_man.arc b/monster/misc/serpmen/serp_man.arc index 7e5a23f42..28bcd3424 100644 --- a/monster/misc/serpmen/serp_man.arc +++ b/monster/misc/serpmen/serp_man.arc @@ -25,8 +25,14 @@ Int 12 wc 1 dam 8 speed -0.15 -vulnerable 16 -protected 263244 +resist_cold -100 + +resist_fire 30 +resist_electricity 30 +resist_acid 30 +resist_poison 30 +resist_chaos 30 + weight 75000 can_use_skill 1 can_use_wand 1 diff --git a/monster/misc/serpmen/serp_priest.arc b/monster/misc/serpmen/serp_priest.arc index aaeec01e9..2ef6da2e2 100644 --- a/monster/misc/serpmen/serp_priest.arc +++ b/monster/misc/serpmen/serp_priest.arc @@ -28,9 +28,17 @@ dam 6 speed 0.15 see_invisible 1 attacktype 1025 -protected 7 -vulnerable 16 -immune 263240 +resist_physical 30 +resist_magic 30 +resist_fire 30 + +resist_cold -100 + +resist_electricity 100 +resist_acid 100 +resist_poison 100 +resist_chaos 100 + weight 75000 can_apply 20 can_cast_spell 1 diff --git a/monster/misc/serpmen/serpman_gen.arc b/monster/misc/serpmen/serpman_gen.arc index d22d6faa3..a33ad7ac5 100644 --- a/monster/misc/serpmen/serpman_gen.arc +++ b/monster/misc/serpmen/serpman_gen.arc @@ -10,7 +10,8 @@ maxhp 100 exp 250 ac 10 speed -0.05 -immune 2 +resist_magic 100 + alive 1 level 1 sp 1 diff --git a/monster/misc/sphinx.arc b/monster/misc/sphinx.arc index 8ef107502..b6c3a1a41 100644 --- a/monster/misc/sphinx.arc +++ b/monster/misc/sphinx.arc @@ -23,7 +23,9 @@ can_cast_spell 1 maxsp 10 hp 300 maxhp 300 -immune 16388 +resist_fire 100 +resist_fear 100 + attacktype 1 ac 2 wc 2 diff --git a/monster/misc/stalker.arc b/monster/misc/stalker.arc index e129cf572..e434e17f1 100644 --- a/monster/misc/stalker.arc +++ b/monster/misc/stalker.arc @@ -30,7 +30,8 @@ wc 10 dam 5 speed -0.4 flying 1 -protected 8 +resist_electricity 30 + run_away 25 attack_movement 3 editable 1 diff --git a/monster/troll/Gaelotroll/gaelotroll.arc b/monster/troll/Gaelotroll/gaelotroll.arc index b299f6570..8807b93d2 100644 --- a/monster/troll/Gaelotroll/gaelotroll.arc +++ b/monster/troll/Gaelotroll/gaelotroll.arc @@ -12,8 +12,11 @@ gaelotroll.112 gaelotroll.113 gaelotroll.112 mina -vulnerable 4 -protected 16385 +resist_fire -100 + +resist_physical 30 +resist_fear 30 + attacktype 65 can_see_in_dark 1 exp 70000 diff --git a/monster/troll/Troll/troll.arc b/monster/troll/Troll/troll.arc index c13fa106d..42f1d4763 100644 --- a/monster/troll/Troll/troll.arc +++ b/monster/troll/Troll/troll.arc @@ -4,8 +4,10 @@ race troll face troll.171 color_fg green animation troll_1 -vulnerable 4 -protected 16384 +resist_fire -100 + +resist_fear 30 + can_see_in_dark 1 exp 8000 ac -2 diff --git a/monster/troll/smalltroll.arc b/monster/troll/smalltroll.arc index 05bdcf430..612f4c532 100644 --- a/monster/troll/smalltroll.arc +++ b/monster/troll/smalltroll.arc @@ -16,7 +16,8 @@ Str 20 Dex 18 no_pick 1 alive 1 -vulnerable 4 +resist_fire -100 + can_see_in_dark 1 exp 450 ac 2 diff --git a/monster/undead/dave.arc b/monster/undead/dave.arc index e21a09c12..6434c2708 100644 --- a/monster/undead/dave.arc +++ b/monster/undead/dave.arc @@ -24,7 +24,9 @@ ac -100 editable 1 speed 0.150000 level 100 -protected 3 +resist_physical 30 +resist_magic 30 + attacktype 4225 randomitems lich pick_up 24 diff --git a/monster/undead/ghast.arc b/monster/undead/ghast.arc index 59b95a955..7a851e1c7 100644 --- a/monster/undead/ghast.arc +++ b/monster/undead/ghast.arc @@ -25,8 +25,11 @@ speed 0.15 exp 100 weight 5000 attacktype 4095 -protected 20 -immune 16384 +resist_fire 30 +resist_cold 30 + +resist_fear 100 + will_apply 2 pick_up 24 can_see_in_dark 1 diff --git a/monster/undead/ghost.arc b/monster/undead/ghost.arc index 419c2080e..effa41f83 100644 --- a/monster/undead/ghost.arc +++ b/monster/undead/ghost.arc @@ -23,8 +23,10 @@ speed 0.14 attacktype 528 flying 1 weight 500 -protected 16 -immune 16384 +resist_cold 30 + +resist_fear 100 + undead 1 can_pass_thru 1 can_see_in_dark 1 diff --git a/monster/undead/ghost_gen.arc b/monster/undead/ghost_gen.arc index 65196109d..5e4f09b2e 100644 --- a/monster/undead/ghost_gen.arc +++ b/monster/undead/ghost_gen.arc @@ -13,7 +13,8 @@ no_pick 1 ac 5 maxsp 1 weight 25000 -protected 16 +resist_cold 30 + editable 1 undead 1 end diff --git a/monster/undead/grimreaper.arc b/monster/undead/grimreaper.arc index c0d23fd9c..01831be42 100644 --- a/monster/undead/grimreaper.arc +++ b/monster/undead/grimreaper.arc @@ -16,9 +16,14 @@ ac 10 speed 0.3 level 4 type 28 -immune 16513 -vulnerable 2 -protected 16 +resist_physical 100 +resist_drain 100 +resist_fear 100 + +resist_magic -100 + +resist_cold 30 + attacktype 128 alive 1 monster 1 diff --git a/monster/undead/lich.arc b/monster/undead/lich.arc index a6a6174e3..c04123631 100644 --- a/monster/undead/lich.arc +++ b/monster/undead/lich.arc @@ -16,7 +16,9 @@ undead 1 hp 1000 maxhp 1000 level 15 -protected 3 +resist_physical 30 +resist_magic 30 + dam 20 see_invisible 1 wc -3 diff --git a/monster/undead/nazgul.arc b/monster/undead/nazgul.arc index 29b91c03d..c8d92b82f 100644 --- a/monster/undead/nazgul.arc +++ b/monster/undead/nazgul.arc @@ -18,8 +18,13 @@ speed 0.8 attack_movement 5 level 13 type 28 -immune 16513 -protected 18 +resist_physical 100 +resist_drain 100 +resist_fear 100 + +resist_magic 30 +resist_cold 30 + attacktype 160 carrying 100 alive 1 diff --git a/monster/undead/nightmare.arc b/monster/undead/nightmare.arc index bed38516d..15f3fc630 100644 --- a/monster/undead/nightmare.arc +++ b/monster/undead/nightmare.arc @@ -15,9 +15,15 @@ wc 1 ac 10 speed 0.3 level 4 -immune 16513 -vulnerable 8194 -protected 32 +resist_physical 100 +resist_drain 100 +resist_fear 100 + +resist_magic -100 +resist_turn_undead -100 + +resist_confusion 30 + attacktype 66048 alive 1 monster 1 diff --git a/monster/undead/skelet_gen.arc b/monster/undead/skelet_gen.arc index 3a68a6266..770bc5d91 100644 --- a/monster/undead/skelet_gen.arc +++ b/monster/undead/skelet_gen.arc @@ -14,7 +14,8 @@ no_pick 1 maxsp 1 speed 0.006 weight 750000 -protected 16 +resist_cold 30 + editable 1 undead 1 end diff --git a/monster/undead/skeleton.arc b/monster/undead/skeleton.arc index a8e372d8e..e408a918f 100644 --- a/monster/undead/skeleton.arc +++ b/monster/undead/skeleton.arc @@ -24,9 +24,12 @@ speed 0.2 exp 40 weight 15000 attacktype 17 -vulnerable 4 -protected 16 -immune 16384 +resist_fire -100 + +resist_cold 30 + +resist_fear 100 + will_apply 2 pick_up 24 can_see_in_dark 1 diff --git a/monster/undead/spectre.arc b/monster/undead/spectre.arc index dc6167b0f..b3894c422 100644 --- a/monster/undead/spectre.arc +++ b/monster/undead/spectre.arc @@ -13,7 +13,9 @@ dam 15 hp 500 maxhp 500 level 10 -protected 3 +resist_physical 30 +resist_magic 30 + wc 5 ac -5 no_pick 1 diff --git a/monster/undead/vampire.arc b/monster/undead/vampire.arc index b25521e6a..c46ed4ed3 100644 --- a/monster/undead/vampire.arc +++ b/monster/undead/vampire.arc @@ -21,7 +21,9 @@ exp 2000 dam 10 wc 2 ac 0 -immune 9 +resist_physical 100 +resist_electricity 100 + speed -0.4 level 11 weight 70000 diff --git a/monster/undead/vampiregen.arc b/monster/undead/vampiregen.arc index 83fce4af5..87e110766 100644 --- a/monster/undead/vampiregen.arc +++ b/monster/undead/vampiregen.arc @@ -10,7 +10,9 @@ hp 400 maxhp 400 exp 200 ac 0 -immune 12 +resist_fire 100 +resist_electricity 100 + speed 0.001 weight -1 sp 127 diff --git a/monster/undead/wight.arc b/monster/undead/wight.arc index 687794abf..f0d14ea3b 100644 --- a/monster/undead/wight.arc +++ b/monster/undead/wight.arc @@ -26,7 +26,10 @@ exp 75 weight 15000 attacktype 16385 can_see_in_dark 1 -protected 8 -immune 16400 +resist_electricity 30 + +resist_cold 100 +resist_fear 100 + editable 1 end diff --git a/monster/undead/wraith.arc b/monster/undead/wraith.arc index 358116dc0..769249ccf 100644 --- a/monster/undead/wraith.arc +++ b/monster/undead/wraith.arc @@ -23,9 +23,12 @@ dam 30 speed 0.16 attacktype 528 weight 700 -protected 16 -vulnerable 4 -immune 16384 +resist_cold 30 + +resist_fire -100 + +resist_fear 100 + undead 1 can_see_in_dark 1 can_pass_thru 1 diff --git a/monster/undead/zombie.arc b/monster/undead/zombie.arc index 41b28aef7..74ec4cea7 100644 --- a/monster/undead/zombie.arc +++ b/monster/undead/zombie.arc @@ -25,8 +25,10 @@ speed -0.05 exp 60 weight 15000 attacktype 1 -protected 16 -immune 16384 +resist_cold 30 + +resist_fear 100 + can_see_in_dark 1 editable 1 end diff --git a/monster/undead/zombie_gen.arc b/monster/undead/zombie_gen.arc index b8a0f1c67..6c612a224 100644 --- a/monster/undead/zombie_gen.arc +++ b/monster/undead/zombie_gen.arc @@ -15,7 +15,8 @@ no_pick 1 maxsp 1 speed 0.01 weight 750000 -protected 16 +resist_cold 30 + editable 1 undead 1 magicmap brown diff --git a/player/class/Religious/paladin.arc b/player/class/Religious/paladin.arc index 27a54e3d9..57b75f986 100644 --- a/player/class/Religious/paladin.arc +++ b/player/class/Religious/paladin.arc @@ -28,5 +28,6 @@ nrof 1 value 1500 weight 5000 editable 2048 -protected 2 +resist_magic 30 + end diff --git a/player/old/fireborn.arc b/player/old/fireborn.arc index d8a42db3c..297316da6 100644 --- a/player/old/fireborn.arc +++ b/player/old/fireborn.arc @@ -29,7 +29,12 @@ Con -4 Cha -4 Int 3 Pow 6 -immune 1028 -vulnerable 656 +resist_fire 100 +resist_poison 100 + +resist_cold -100 +resist_drain -100 +resist_ghosthit -100 + editable 0 end diff --git a/player/old/quetzalcoatl.arc b/player/old/quetzalcoatl.arc index 5b91b8e7f..dad3f5aff 100644 --- a/player/old/quetzalcoatl.arc +++ b/player/old/quetzalcoatl.arc @@ -29,7 +29,11 @@ Con 6 Wis -8 Int -8 Pow 8 -immune 4 -vulnerable 5136 +resist_fire 100 + +resist_cold -100 +resist_poison -100 +resist_paralyze -100 + editable 0 end diff --git a/player/old/wraithp.arc b/player/old/wraithp.arc index fc9dbbf4a..b45916ee4 100644 --- a/player/old/wraithp.arc +++ b/player/old/wraithp.arc @@ -23,9 +23,14 @@ food 500 can_use_armour 1 can_use_weapon 1 attacktype 17 -vulnerable 4 -immune 1664 -protected 16 +resist_fire -100 + +resist_drain 100 +resist_ghosthit 100 +resist_poison 100 + +resist_cold 30 + Str -3 Dex 4 Con -3 diff --git a/player/race/fireborn.arc b/player/race/fireborn.arc index b6961c4a8..e0c852b98 100644 --- a/player/race/fireborn.arc +++ b/player/race/fireborn.arc @@ -31,8 +31,13 @@ Int 2 Wis 2 Cha -2 Pow 7 -immune 1028 -vulnerable 656 +resist_fire 100 +resist_poison 100 + +resist_cold -100 +resist_drain -100 +resist_ghosthit -100 + editable 0 end Object fireborn_player_force diff --git a/player/race/halfling.arc b/player/race/halfling.arc index 6fa7932a7..881151e72 100644 --- a/player/race/halfling.arc +++ b/player/race/halfling.arc @@ -22,7 +22,8 @@ food 999 speed 1 luck 1 attacktype 1 -protected 128 +resist_drain 30 + Str -4 Dex 3 Con 4 diff --git a/player/race/northman.arc b/player/race/northman.arc index e48632b8f..5d21d0228 100644 --- a/player/race/northman.arc +++ b/player/race/northman.arc @@ -10,7 +10,8 @@ viking.131 viking.151 viking.171 mina -protected 16 +resist_cold 30 + is_animated 0 type 1 level 1 diff --git a/player/race/pl_half_orc.arc b/player/race/pl_half_orc.arc index 7ebb4be07..b26c2fb3c 100644 --- a/player/race/pl_half_orc.arc +++ b/player/race/pl_half_orc.arc @@ -18,7 +18,8 @@ dam 1 type 1 speed 1 weight 70000 -protected 1024 +resist_poison 30 + can_use_armour 1 can_use_weapon 1 can_see_in_dark 1 diff --git a/player/race/quetzalcoatl.arc b/player/race/quetzalcoatl.arc index dbd0984fb..24573246a 100644 --- a/player/race/quetzalcoatl.arc +++ b/player/race/quetzalcoatl.arc @@ -31,7 +31,10 @@ Con 6 Wis -8 Int -8 Pow 6 -immune 4 -vulnerable 4112 +resist_fire 100 + +resist_cold -100 +resist_paralyze -100 + editable 0 end diff --git a/player/race/troll_player.arc b/player/race/troll_player.arc index 5472c2795..9ff90e215 100644 --- a/player/race/troll_player.arc +++ b/player/race/troll_player.arc @@ -30,7 +30,8 @@ Int -5 Wis -2 Pow -2 Cha -4 -vulnerable 4 +resist_fire -100 + path_repelled 2 editable 0 magicmap blue diff --git a/player/race/wraithp.arc b/player/race/wraithp.arc index bf39ed78a..c36b2b472 100644 --- a/player/race/wraithp.arc +++ b/player/race/wraithp.arc @@ -24,9 +24,14 @@ can_see_in_dark 1 can_use_armour 1 can_use_weapon 1 attacktype 17 -vulnerable 4 -immune 1664 -protected 16 +resist_fire -100 + +resist_drain 100 +resist_ghosthit 100 +resist_poison 100 + +resist_cold 30 + path_attuned 4 path_denied 2 Str -3 @@ -38,7 +43,6 @@ Pow 3 Cha -4 editable 0 end - Object wraith_player_force name Wraith_Force invisible 1 diff --git a/potion/potioncol.arc b/potion/potioncol.arc index eb1d8e3a1..63622f9a9 100644 --- a/potion/potioncol.arc +++ b/potion/potioncol.arc @@ -8,6 +8,7 @@ level 1 material 4 weight 1800 value 5800 -immune 4 +resist_fire 100 + editable 2048 end diff --git a/potion/potionfir.arc b/potion/potionfir.arc index bbc2061f4..8b2639b90 100644 --- a/potion/potionfir.arc +++ b/potion/potionfir.arc @@ -8,6 +8,7 @@ level 1 material 4 weight 1800 value 5200 -immune 16 +resist_cold 100 + editable 2048 end diff --git a/potion/potioninv.arc b/potion/potioninv.arc index 567923a32..d33cd3bf7 100644 --- a/potion/potioninv.arc +++ b/potion/potioninv.arc @@ -8,6 +8,7 @@ level 1 material 4 weight 2000 value 10000 -immune 1 +resist_physical 100 + editable 2048 end diff --git a/shop/alchemy_gems.arc b/shop/alchemy_gems.arc index fbdfd5036..8f4f4110c 100644 --- a/shop/alchemy_gems.arc +++ b/shop/alchemy_gems.arc @@ -76,13 +76,3 @@ walk_on 1 editable 64 visibility 100 end - - - - - - - - - - diff --git a/talisman/ring_drain.arc b/talisman/ring_drain.arc index 611d7eb91..7021a6928 100644 --- a/talisman/ring_drain.arc +++ b/talisman/ring_drain.arc @@ -13,7 +13,8 @@ value 10000 weight 40 type 70 material 2 -immune 128 +resist_drain 100 + editable 6144 nrof 1 speed 0.1 diff --git a/wall/awall/awall_weak.arc b/wall/awall/awall_weak.arc index 96f8d9ef2..256496365 100644 --- a/wall/awall/awall_weak.arc +++ b/wall/awall/awall_weak.arc @@ -16,7 +16,14 @@ tear_down 1 hp 80 maxhp 80 ac 30 -immune 254 +resist_magic 100 +resist_fire 100 +resist_electricity 100 +resist_cold 100 +resist_confusion 100 +resist_acid 100 +resist_drain 100 + no_pick 1 blocksview 1 alive 1 @@ -46,7 +53,14 @@ tear_down 1 hp 80 maxhp 80 ac 30 -immune 254 +resist_magic 100 +resist_fire 100 +resist_electricity 100 +resist_cold 100 +resist_confusion 100 +resist_acid 100 +resist_drain 100 + no_pick 1 blocksview 1 alive 1 diff --git a/wall/bwall/bwall_weak.arc b/wall/bwall/bwall_weak.arc index bac4325ea..2b198d1c9 100644 --- a/wall/bwall/bwall_weak.arc +++ b/wall/bwall/bwall_weak.arc @@ -18,7 +18,14 @@ tear_down 1 hp 150 maxhp 150 ac 30 -immune 254 +resist_magic 100 +resist_fire 100 +resist_electricity 100 +resist_cold 100 +resist_confusion 100 +resist_acid 100 +resist_drain 100 + no_pick 1 blocksview 1 alive 1 @@ -46,7 +53,14 @@ tear_down 1 hp 150 maxhp 150 ac 30 -immune 254 +resist_magic 100 +resist_fire 100 +resist_electricity 100 +resist_cold 100 +resist_confusion 100 +resist_acid 100 +resist_drain 100 + no_pick 1 blocksview 1 alive 1 diff --git a/wall/bwall/earthwall.arc b/wall/bwall/earthwall.arc index cc280ada9..51475d4d2 100644 --- a/wall/bwall/earthwall.arc +++ b/wall/bwall/earthwall.arc @@ -15,7 +15,14 @@ hp 24 maxhp 24 ac 30 type 45 -immune 254 +resist_magic 100 +resist_fire 100 +resist_electricity 100 +resist_cold 100 +resist_confusion 100 +resist_acid 100 +resist_drain 100 + no_pick 1 blocksview 1 alive 1 diff --git a/wall/bwall/hedge.arc b/wall/bwall/hedge.arc index c3ba5d19e..534682aeb 100644 --- a/wall/bwall/hedge.arc +++ b/wall/bwall/hedge.arc @@ -13,8 +13,15 @@ hp 24 maxhp 24 ac 20 type 45 -immune 250 -protected 4 +resist_magic 100 +resist_electricity 100 +resist_cold 100 +resist_confusion 100 +resist_acid 100 +resist_drain 100 + +resist_fire 30 + no_pick 1 blocksview 1 alive 1 diff --git a/wall/cwall/cwall_weak.arc b/wall/cwall/cwall_weak.arc index daf541dde..4f31896c5 100644 --- a/wall/cwall/cwall_weak.arc +++ b/wall/cwall/cwall_weak.arc @@ -19,7 +19,14 @@ tear_down 1 hp 100 maxhp 100 ac 30 -immune 254 +resist_magic 100 +resist_fire 100 +resist_electricity 100 +resist_cold 100 +resist_confusion 100 +resist_acid 100 +resist_drain 100 + no_pick 1 blocksview 1 alive 1 @@ -48,7 +55,14 @@ tear_down 1 hp 100 maxhp 100 ac 30 -immune 254 +resist_magic 100 +resist_fire 100 +resist_electricity 100 +resist_cold 100 +resist_confusion 100 +resist_acid 100 +resist_drain 100 + no_pick 1 blocksview 1 alive 1 diff --git a/wall/firewall/firewall.arc b/wall/firewall/firewall.arc index 5af842493..1dfe2b7e4 100644 --- a/wall/firewall/firewall.arc +++ b/wall/firewall/firewall.arc @@ -12,7 +12,8 @@ maxhp 250 dam 1 ac 3 exp 50 -immune 4 +resist_fire 100 + blocksview 1 editable 32 visibility 100 diff --git a/wall/wwall/wwall_weak.arc b/wall/wwall/wwall_weak.arc index 20a2d3230..063de8e33 100644 --- a/wall/wwall/wwall_weak.arc +++ b/wall/wwall/wwall_weak.arc @@ -16,7 +16,14 @@ tear_down 1 hp 200 maxhp 200 ac 30 -immune 254 +resist_magic 100 +resist_fire 100 +resist_electricity 100 +resist_cold 100 +resist_confusion 100 +resist_acid 100 +resist_drain 100 + no_pick 1 blocksview 1 alive 1 @@ -42,7 +49,14 @@ tear_down 1 hp 200 maxhp 200 ac 30 -immune 254 +resist_magic 100 +resist_fire 100 +resist_electricity 100 +resist_cold 100 +resist_confusion 100 +resist_acid 100 +resist_drain 100 + no_pick 1 blocksview 1 alive 1 diff --git a/weapon/artifact/ChaosSword/CSword.arc b/weapon/artifact/ChaosSword/CSword.arc index 56fc6018b..288a74806 100644 --- a/weapon/artifact/ChaosSword/CSword.arc +++ b/weapon/artifact/ChaosSword/CSword.arc @@ -35,8 +35,13 @@ luck -3 xrays 1 dam 100 magic 10 -immune 64 -protected 30 +resist_acid 100 + +resist_magic 30 +resist_fire 30 +resist_electricity 30 +resist_cold 30 + attacktype 262144 path_denied 2304 value 1000000 diff --git a/weapon/artifact/Darkblade/darkblade.arc b/weapon/artifact/Darkblade/darkblade.arc index 0525a6ccc..49b1fc535 100644 --- a/weapon/artifact/Darkblade/darkblade.arc +++ b/weapon/artifact/Darkblade/darkblade.arc @@ -23,8 +23,10 @@ Cha -1 Con 2 hp 1 attacktype 256 -protected 1024 -immune 128 +resist_poison 30 + +resist_drain 100 + weight 20000 last_sp 7 dam 10 diff --git a/weapon/artifact/Demonbane/demonbane.arc b/weapon/artifact/Demonbane/demonbane.arc index 979f45a48..cfff7597a 100644 --- a/weapon/artifact/Demonbane/demonbane.arc +++ b/weapon/artifact/Demonbane/demonbane.arc @@ -22,7 +22,8 @@ magic 3 weight 32000 value 90000 slaying demon -protected 4 +resist_fire 30 + editable 5120 attacktype 1 magicmap black diff --git a/weapon/artifact/Fhammer/frost_hammer.arc b/weapon/artifact/Fhammer/frost_hammer.arc index c3d94fd51..dee21f75d 100644 --- a/weapon/artifact/Fhammer/frost_hammer.arc +++ b/weapon/artifact/Fhammer/frost_hammer.arc @@ -16,7 +16,8 @@ dam 10 value 90000 weight 30000 magic 3 -protected 16 +resist_cold 30 + attacktype 18 Pow 3 editable 5120 diff --git a/weapon/artifact/Firestar/firestar.arc b/weapon/artifact/Firestar/firestar.arc index 921ffd433..7b3a50855 100644 --- a/weapon/artifact/Firestar/firestar.arc +++ b/weapon/artifact/Firestar/firestar.arc @@ -19,8 +19,11 @@ material 2 magic 6 dam 35 attacktype 261 -protected 4 -immune 16512 +resist_fire 30 + +resist_drain 100 +resist_fear 100 + value 400000 weight 40000 editable 5120 diff --git a/weapon/artifact/Gram/gram.arc b/weapon/artifact/Gram/gram.arc index 5aedaed49..1af8592f2 100644 --- a/weapon/artifact/Gram/gram.arc +++ b/weapon/artifact/Gram/gram.arc @@ -18,7 +18,9 @@ magic 3 weight 30000 value 80000 attacktype 33 -protected 16896 +resist_ghosthit 30 +resist_fear 30 + luck 1 editable 5120 magicmap black diff --git a/weapon/artifact/HolyAvenger/holyave.arc b/weapon/artifact/HolyAvenger/holyave.arc index f7adfab13..1d71a55ac 100644 --- a/weapon/artifact/HolyAvenger/holyave.arc +++ b/weapon/artifact/HolyAvenger/holyave.arc @@ -25,8 +25,10 @@ Str 1 Wis 2 Cha 2 attacktype 4194560 -protected 2 -immune 128 +resist_magic 30 + +resist_drain 100 + weight 25000 value 220000 editable 5120 diff --git a/weapon/artifact/Masamune/masamune.arc b/weapon/artifact/Masamune/masamune.arc index d2472dd89..9b42daff8 100644 --- a/weapon/artifact/Masamune/masamune.arc +++ b/weapon/artifact/Masamune/masamune.arc @@ -18,8 +18,11 @@ Dex 2 Con 2 Wis 1 dam 25 -immune 640 -protected 65536 +resist_drain 100 +resist_ghosthit 100 + +resist_deplete 30 + weight 9000 value 220000 editable 5120 diff --git a/weapon/artifact/UW_Sword/uw_sword.arc b/weapon/artifact/UW_Sword/uw_sword.arc index 02be48f1f..19f0df3ed 100644 --- a/weapon/artifact/UW_Sword/uw_sword.arc +++ b/weapon/artifact/UW_Sword/uw_sword.arc @@ -9,8 +9,11 @@ Int 1 sp 1 type 15 face uw_sword.111 -immune 160 -protected 2 +resist_confusion 100 +resist_drain 100 + +resist_magic 30 + magic 5 weight 30000 attacktype 65 diff --git a/weapon/artifact/dragonslay.arc b/weapon/artifact/dragonslay.arc index 69927eca6..77fdf7b6c 100644 --- a/weapon/artifact/dragonslay.arc +++ b/weapon/artifact/dragonslay.arc @@ -10,7 +10,8 @@ weight 35000 value 85000 magic 3 slaying dragon -protected 4 +resist_fire 30 + editable 5120 attacktype 1 magicmap white diff --git a/weapon/artifact/excalibur.arc b/weapon/artifact/excalibur.arc index e5e61f809..93d0371e4 100644 --- a/weapon/artifact/excalibur.arc +++ b/weapon/artifact/excalibur.arc @@ -11,8 +11,10 @@ dam 12 magic 5 weight 25000 value 220000 -protected 2 -immune 128 +resist_magic 30 + +resist_drain 100 + attacktype 256 editable 5120 magicmap white diff --git a/weapon/artifact/firebrand.arc b/weapon/artifact/firebrand.arc index b536df216..f7967ee84 100644 --- a/weapon/artifact/firebrand.arc +++ b/weapon/artifact/firebrand.arc @@ -15,7 +15,8 @@ dam 9 weight 22000 value 75000 magic 3 -protected 16 +resist_cold 30 + attacktype 4 editable 5120 magicmap red diff --git a/weapon/artifact/frostbrand.arc b/weapon/artifact/frostbrand.arc index f2df567db..6d7bd8c10 100644 --- a/weapon/artifact/frostbrand.arc +++ b/weapon/artifact/frostbrand.arc @@ -9,7 +9,8 @@ dam 9 weight 22000 value 85000 magic 3 -protected 4 +resist_fire 30 + attacktype 16 editable 5120 magicmap white diff --git a/weapon/artifact/magi_staff.arc b/weapon/artifact/magi_staff.arc index bc6c5feaf..39d373339 100644 --- a/weapon/artifact/magi_staff.arc +++ b/weapon/artifact/magi_staff.arc @@ -11,7 +11,8 @@ magi_staff.112 mina speed .2 material 16 -protected 2 +resist_magic 30 + Int 1 Pow 1 sp 2 diff --git a/weapon/artifact/mjoellnir.arc b/weapon/artifact/mjoellnir.arc index 5c454a8fd..aadfc51ba 100644 --- a/weapon/artifact/mjoellnir.arc +++ b/weapon/artifact/mjoellnir.arc @@ -9,7 +9,8 @@ dam 10 weight 30000 value 75000 magic 3 -protected 8 +resist_electricity 30 + attacktype 8 Str 1 editable 5120 diff --git a/weapon/artifact/mournblade.arc b/weapon/artifact/mournblade.arc index 1d0161ce9..75050adec 100644 --- a/weapon/artifact/mournblade.arc +++ b/weapon/artifact/mournblade.arc @@ -11,8 +11,10 @@ dam 9 weight 25000 value 170000 magic 4 -protected 2 -immune 128 +resist_magic 30 + +resist_drain 100 + attacktype 384 editable 5120 magicmap grey diff --git a/weapon/artifact/stormbring.arc b/weapon/artifact/stormbring.arc index 53f40bd34..1607c766f 100644 --- a/weapon/artifact/stormbring.arc +++ b/weapon/artifact/stormbring.arc @@ -11,8 +11,11 @@ dam 9 weight 25000 value 180000 magic 4 -protected 10 -immune 128 +resist_magic 30 +resist_electricity 30 + +resist_drain 100 + attacktype 136 editable 5120 magicmap black