[Crossfire-cvs] SF.net SVN: crossfire:[20568] arch/trunk

[Crossfire C. r. messages. <cro...@li...>]

Revision: 20568
          http://sourceforge.net/p/crossfire/code/20568
Author:   silvernexus
Date:     2018-05-24 01:59:14 +0000 (Thu, 24 May 2018)
Log Message:
-----------
Tweaks due to ability to use compound race designations for damage calculations.

Modified Paths:
--------------
    arch/trunk/ChangeLog
    arch/trunk/monster/insect/ant/ant.arc
    arch/trunk/monster/insect/ant/ant_gen.arc
    arch/trunk/monster/insect/ant/ant_larvae.arc
    arch/trunk/monster/insect/ant/breeder_ant.arc
    arch/trunk/monster/insect/ant/fly_ant.arc
    arch/trunk/monster/insect/ant/guard_ant.arc
    arch/trunk/monster/insect/ant/spit_ant.arc
    arch/trunk/monster/insect/ant/war_ant.arc
    arch/trunk/monster/insect/ant/work_ant.arc
    arch/trunk/monster/misc/deathtree.arc
    arch/trunk/monster/undead/Skeletal_mage/skeletalmage.arc
    arch/trunk/monster/undead/skeleton.arc
    arch/trunk/monster/undead/skeleton_chief_arc.arc
    arch/trunk/monster/undead/skeleton_leader_arc.arc
    arch/trunk/monster/undead/vampire.arc
    arch/trunk/weapon/misc/stake.arc

Modified: arch/trunk/ChangeLog
===================================================================
--- arch/trunk/ChangeLog	2018-05-24 01:53:24 UTC (rev 20567)
+++ arch/trunk/ChangeLog	2018-05-24 01:59:14 UTC (rev 20568)
@@ -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

Modified: arch/trunk/monster/insect/ant/ant.arc
===================================================================
--- arch/trunk/monster/insect/ant/ant.arc	2018-05-24 01:53:24 UTC (rev 20567)
+++ arch/trunk/monster/insect/ant/ant.arc	2018-05-24 01:59:14 UTC (rev 20568)
@@ -1,6 +1,6 @@
 Object ant
 face ant.111
-race insect
+race insect,ant
 animation ant
 monster 1
 move_type walk

Modified: arch/trunk/monster/insect/ant/ant_gen.arc
===================================================================
--- arch/trunk/monster/insect/ant/ant_gen.arc	2018-05-24 01:53:24 UTC (rev 20567)
+++ arch/trunk/monster/insect/ant/ant_gen.arc	2018-05-24 01:59:14 UTC (rev 20568)
@@ -1,5 +1,5 @@
 Object generate_ant
-race insect
+race insect,ant
 other_arch ant
 name ant hill
 face ant_gen.111

Modified: arch/trunk/monster/insect/ant/ant_larvae.arc
===================================================================
--- arch/trunk/monster/insect/ant/ant_larvae.arc	2018-05-24 01:53:24 UTC (rev 20567)
+++ arch/trunk/monster/insect/ant/ant_larvae.arc	2018-05-24 01:59:14 UTC (rev 20568)
@@ -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

Modified: arch/trunk/monster/insect/ant/breeder_ant.arc
===================================================================
--- arch/trunk/monster/insect/ant/breeder_ant.arc	2018-05-24 01:53:24 UTC (rev 20567)
+++ arch/trunk/monster/insect/ant/breeder_ant.arc	2018-05-24 01:59:14 UTC (rev 20568)
@@ -2,7 +2,7 @@
 face breeder_ant.x11
 animation breeder_ant
 name Queen Ant
-race insect
+race insect,ant
 other_arch ant_egg
 monster 1
 move_type walk

Modified: arch/trunk/monster/insect/ant/fly_ant.arc
===================================================================
--- arch/trunk/monster/insect/ant/fly_ant.arc	2018-05-24 01:53:24 UTC (rev 20567)
+++ arch/trunk/monster/insect/ant/fly_ant.arc	2018-05-24 01:59:14 UTC (rev 20568)
@@ -1,6 +1,6 @@
 Object fly_ant
 face fly_ant.131
-race insect
+race insect,ant
 name flying ant
 animation fly_ant
 monster 1

Modified: arch/trunk/monster/insect/ant/guard_ant.arc
===================================================================
--- arch/trunk/monster/insect/ant/guard_ant.arc	2018-05-24 01:53:24 UTC (rev 20567)
+++ arch/trunk/monster/insect/ant/guard_ant.arc	2018-05-24 01:59:14 UTC (rev 20568)
@@ -1,6 +1,6 @@
 Object guard_ant
 face war_ant.131
-race insect
+race insect,ant
 name Guardian Ant
 animation war_ant
 Wis 5

Modified: arch/trunk/monster/insect/ant/spit_ant.arc
===================================================================
--- arch/trunk/monster/insect/ant/spit_ant.arc	2018-05-24 01:53:24 UTC (rev 20567)
+++ arch/trunk/monster/insect/ant/spit_ant.arc	2018-05-24 01:59:14 UTC (rev 20568)
@@ -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

Modified: arch/trunk/monster/insect/ant/war_ant.arc
===================================================================
--- arch/trunk/monster/insect/ant/war_ant.arc	2018-05-24 01:53:24 UTC (rev 20567)
+++ arch/trunk/monster/insect/ant/war_ant.arc	2018-05-24 01:59:14 UTC (rev 20568)
@@ -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

Modified: arch/trunk/monster/insect/ant/work_ant.arc
===================================================================
--- arch/trunk/monster/insect/ant/work_ant.arc	2018-05-24 01:53:24 UTC (rev 20567)
+++ arch/trunk/monster/insect/ant/work_ant.arc	2018-05-24 01:59:14 UTC (rev 20568)
@@ -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

Modified: arch/trunk/monster/misc/deathtree.arc
===================================================================
--- arch/trunk/monster/misc/deathtree.arc	2018-05-24 01:53:24 UTC (rev 20567)
+++ arch/trunk/monster/misc/deathtree.arc	2018-05-24 01:59:14 UTC (rev 20568)
@@ -1,6 +1,6 @@
 Object deathtree
 name tree
-race faerie
+race faerie,deathtree
 stand_still 1
 face deathtree.111
 animation deathtree

Modified: arch/trunk/monster/undead/Skeletal_mage/skeletalmage.arc
===================================================================
--- arch/trunk/monster/undead/Skeletal_mage/skeletalmage.arc	2018-05-24 01:53:24 UTC (rev 20567)
+++ arch/trunk/monster/undead/Skeletal_mage/skeletalmage.arc	2018-05-24 01:59:14 UTC (rev 20568)
@@ -1,7 +1,7 @@
 Object skeletalmage
 randomitems skeletalmage
 name Skeletal Mage
-race undead
+race undead,skeleton
 face skeletalmage.111
 animation skeletalmage
 monster 1

Modified: arch/trunk/monster/undead/skeleton.arc
===================================================================
--- arch/trunk/monster/undead/skeleton.arc	2018-05-24 01:53:24 UTC (rev 20567)
+++ arch/trunk/monster/undead/skeleton.arc	2018-05-24 01:59:14 UTC (rev 20568)
@@ -1,6 +1,6 @@
 Object skeleton
 randomitems skeleton
-race undead
+race undead,skeleton
 face skeleton.111
 animation skeleton
 monster 1

Modified: arch/trunk/monster/undead/skeleton_chief_arc.arc
===================================================================
--- arch/trunk/monster/undead/skeleton_chief_arc.arc	2018-05-24 01:53:24 UTC (rev 20567)
+++ arch/trunk/monster/undead/skeleton_chief_arc.arc	2018-05-24 01:59:14 UTC (rev 20568)
@@ -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

Modified: arch/trunk/monster/undead/skeleton_leader_arc.arc
===================================================================
--- arch/trunk/monster/undead/skeleton_leader_arc.arc	2018-05-24 01:53:24 UTC (rev 20567)
+++ arch/trunk/monster/undead/skeleton_leader_arc.arc	2018-05-24 01:59:14 UTC (rev 20568)
@@ -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

Modified: arch/trunk/monster/undead/vampire.arc
===================================================================
--- arch/trunk/monster/undead/vampire.arc	2018-05-24 01:53:24 UTC (rev 20567)
+++ arch/trunk/monster/undead/vampire.arc	2018-05-24 01:59:14 UTC (rev 20568)
@@ -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

Modified: arch/trunk/weapon/misc/stake.arc
===================================================================
--- arch/trunk/weapon/misc/stake.arc	2018-05-24 01:53:24 UTC (rev 20567)
+++ arch/trunk/weapon/misc/stake.arc	2018-05-24 01:59:14 UTC (rev 20568)
@@ -8,7 +8,10 @@
 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

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.