diff --git a/ChangeLog b/ChangeLog index 57a72d361..781dc749b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,23 @@ +Updated races for several monsters so they can be hit by quirky effects like "slay ant" +Also gave death attacktype to stake so it can actually kill vampires. +monster/undead/vampire.arc +monster/undead/skeleton.arc +monster/undead/skeleton_chief_arc.arc +monster/undead/skeleton_leader_arc.arc +monster/undead/Skeletal_mage/skeletalmage.arc +monster/misc/deathtree.arc +monster/insect/ant/ant.arc +monster/insect/ant/ant_gen.arc +monster/insect/ant/ant_larvae.arc +monster/insect/ant/breeder_ant.arc +monster/insect/ant/fly_ant.arc +monster/insect/ant/guard_ant.arc +monster/insect/ant/spit_ant.arc +monster/insect/ant/war_ant.arc +monster/insect/ant/work_ant.arc +weapons/misc/stake.arc +Daniel Hawkins 2018-05-23 + New graphical face for the archon (monster/chaos/archon) monster, as the original graphic is of questionable origin. monster/chaos/archon.base.111.png diff --git a/monster/insect/ant/ant.arc b/monster/insect/ant/ant.arc index 945cf49d4..05fb424ad 100644 --- a/monster/insect/ant/ant.arc +++ b/monster/insect/ant/ant.arc @@ -1,6 +1,6 @@ Object ant face ant.111 -race insect +race insect,ant animation ant monster 1 move_type walk diff --git a/monster/insect/ant/ant_gen.arc b/monster/insect/ant/ant_gen.arc index 3a5704530..01c68eb2a 100644 --- a/monster/insect/ant/ant_gen.arc +++ b/monster/insect/ant/ant_gen.arc @@ -1,5 +1,5 @@ Object generate_ant -race insect +race insect,ant other_arch ant name ant hill face ant_gen.111 diff --git a/monster/insect/ant/ant_larvae.arc b/monster/insect/ant/ant_larvae.arc index 76d9e8c99..05d07c77e 100644 --- a/monster/insect/ant/ant_larvae.arc +++ b/monster/insect/ant/ant_larvae.arc @@ -1,6 +1,6 @@ Object ant_larvae face ant_larvae.111 -race insect +race insect,ant other_arch war_ant animation ant_larvae # larva is the singular form. larvae is plural diff --git a/monster/insect/ant/breeder_ant.arc b/monster/insect/ant/breeder_ant.arc index 4207b013f..d308c34b9 100644 --- a/monster/insect/ant/breeder_ant.arc +++ b/monster/insect/ant/breeder_ant.arc @@ -2,7 +2,7 @@ Object breeder_ant face breeder_ant.x11 animation breeder_ant name Queen Ant -race insect +race insect,ant other_arch ant_egg monster 1 move_type walk diff --git a/monster/insect/ant/fly_ant.arc b/monster/insect/ant/fly_ant.arc index 29667f715..0d2b88fa4 100644 --- a/monster/insect/ant/fly_ant.arc +++ b/monster/insect/ant/fly_ant.arc @@ -1,6 +1,6 @@ Object fly_ant face fly_ant.131 -race insect +race insect,ant name flying ant animation fly_ant monster 1 diff --git a/monster/insect/ant/guard_ant.arc b/monster/insect/ant/guard_ant.arc index b1f34129d..dfbb345c2 100644 --- a/monster/insect/ant/guard_ant.arc +++ b/monster/insect/ant/guard_ant.arc @@ -1,6 +1,6 @@ Object guard_ant face war_ant.131 -race insect +race insect,ant name Guardian Ant animation war_ant Wis 5 diff --git a/monster/insect/ant/spit_ant.arc b/monster/insect/ant/spit_ant.arc index 0fba2b075..873643d1c 100644 --- a/monster/insect/ant/spit_ant.arc +++ b/monster/insect/ant/spit_ant.arc @@ -1,7 +1,7 @@ Object spit_ant randomitems spit_ant face spit_ant.131 -race insect +race insect,ant name Spitting Ant animation spit_ant monster 1 diff --git a/monster/insect/ant/war_ant.arc b/monster/insect/ant/war_ant.arc index 4b32cbaee..49bf76683 100644 --- a/monster/insect/ant/war_ant.arc +++ b/monster/insect/ant/war_ant.arc @@ -1,7 +1,7 @@ Object war_ant face war_ant.131 name Warrior Ant -race insect +race insect,ant animation war_ant monster 1 move_type walk diff --git a/monster/insect/ant/work_ant.arc b/monster/insect/ant/work_ant.arc index 71985f8db..9f77cdda1 100644 --- a/monster/insect/ant/work_ant.arc +++ b/monster/insect/ant/work_ant.arc @@ -1,7 +1,7 @@ Object work_ant face work_ant.131 name Worker Ant -race insect +race insect,ant animation work_ant monster 1 move_type walk diff --git a/monster/misc/deathtree.arc b/monster/misc/deathtree.arc index b9c9aa548..13f759b13 100644 --- a/monster/misc/deathtree.arc +++ b/monster/misc/deathtree.arc @@ -1,6 +1,6 @@ Object deathtree name tree -race faerie +race faerie,deathtree stand_still 1 face deathtree.111 animation deathtree diff --git a/monster/undead/Skeletal_mage/skeletalmage.arc b/monster/undead/Skeletal_mage/skeletalmage.arc index ab2095f16..e913d7cc9 100644 --- a/monster/undead/Skeletal_mage/skeletalmage.arc +++ b/monster/undead/Skeletal_mage/skeletalmage.arc @@ -1,7 +1,7 @@ Object skeletalmage randomitems skeletalmage name Skeletal Mage -race undead +race undead,skeleton face skeletalmage.111 animation skeletalmage monster 1 diff --git a/monster/undead/skeleton.arc b/monster/undead/skeleton.arc index adf33b62c..eeac01aaf 100644 --- a/monster/undead/skeleton.arc +++ b/monster/undead/skeleton.arc @@ -1,6 +1,6 @@ Object skeleton randomitems skeleton -race undead +race undead,skeleton face skeleton.111 animation skeleton monster 1 diff --git a/monster/undead/skeleton_chief_arc.arc b/monster/undead/skeleton_chief_arc.arc index 62d867329..4c96d7b93 100644 --- a/monster/undead/skeleton_chief_arc.arc +++ b/monster/undead/skeleton_chief_arc.arc @@ -1,7 +1,7 @@ Object skeleton_chief_arc name skeleton captain randomitems skeleton -race undead +race undead,skeleton face skeleton_chief.111 animation skeleton_chief_arc monster 1 diff --git a/monster/undead/skeleton_leader_arc.arc b/monster/undead/skeleton_leader_arc.arc index 330b547c4..9aab12aad 100644 --- a/monster/undead/skeleton_leader_arc.arc +++ b/monster/undead/skeleton_leader_arc.arc @@ -1,7 +1,7 @@ Object skeleton_leader_arc name skeleton bezerk randomitems skeleton -race undead +race undead,skeleton face skeleton_leader.111 animation skeleton_leader_arc monster 1 diff --git a/monster/undead/vampire.arc b/monster/undead/vampire.arc index 802e8df25..9db1189e8 100644 --- a/monster/undead/vampire.arc +++ b/monster/undead/vampire.arc @@ -1,6 +1,7 @@ Object vampire randomitems vampire -race undead +# race of vampire allows us to make stake work correctly w/ death attacktype +race undead,vampire face vampire.111 animation vampire sp 40 diff --git a/weapon/misc/stake.arc b/weapon/misc/stake.arc index 456730b58..eb8c60fec 100644 --- a/weapon/misc/stake.arc +++ b/weapon/misc/stake.arc @@ -8,7 +8,10 @@ material 16 dam 8 weight 2000 value 20 -attacktype 1 +# Give death attacktype, since that circumvents the immunity by vampires +# Recent changes (May 2018) make it so this also doesn't do death damage to non-slaying creatures. +# So everything else should only be hit by physical damage. +attacktype 131073 weapontype 5 name_pl stakes client_type 145