Update of /cvsroot/wpdev/xmlscripts/scripts/combat
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28885/combat
Modified Files:
aos.py
Log Message:
slayer weapons
Index: aos.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/combat/aos.py,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** aos.py 4 Oct 2004 15:02:17 -0000 1.22
--- aos.py 6 Oct 2004 20:05:59 -0000 1.23
***************
*** 9,12 ****
--- 9,29 ----
from system.debugging import DEBUG_COMBAT_INFO
from skills import poisoning
+ import system.slayer
+
+ #
+ # Check if the given weapon can slay the given
+ # NPC.
+ #
+ def checkSlaying(weapon, defender):
+ slayer = properties.fromitem(weapon, SLAYER)
+ if slayer == '':
+ return False
+
+ slayer = system.slayer.findEntry(slayer)
+
+ if not slayer:
+ return False
+
+ return slayer.slays(defender)
#
***************
*** 331,334 ****
--- 348,356 ----
damage = scaledamage(attacker, damage)
+ # Slaying? (only against NPCs)
+ if weapon and defender.npc and checkSlaying(weapon, defender):
+ defender.effect(0x37B9, 5, 10)
+ damage *= 2
+
# Give the defender a chance to absorb damage
damage = absorbdamage(defender, damage)
|