Update of /cvsroot/wpdev/xmlscripts/scripts/combat
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18250/combat
Modified Files:
__init__.py aos.py utilities.py
Log Message:
random magic item loot and additional properties
Index: aos.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/combat/aos.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** aos.py 20 Sep 2004 18:15:24 -0000 1.19
--- aos.py 27 Sep 2004 14:37:25 -0000 1.20
***************
*** 83,87 ****
attackerValue = attacker.skill[attackerSkill] / 10
defenderValue = defender.skill[defenderSkill] / 10
!
# Calculate the hit chance
bonus = 0 # Get the weapon "accuracy" status
--- 83,87 ----
attackerValue = attacker.skill[attackerSkill] / 10
defenderValue = defender.skill[defenderSkill] / 10
!
# Calculate the hit chance
bonus = 0 # Get the weapon "accuracy" status
Index: __init__.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/combat/__init__.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** __init__.py 29 Aug 2004 16:36:38 -0000 1.14
--- __init__.py 27 Sep 2004 14:37:25 -0000 1.15
***************
*** 88,92 ****
packet.setshort(74, properties.fromchar(char, RESISTANCE_POISON)) # Poison Resistance
packet.setshort(76, properties.fromchar(char, RESISTANCE_ENERGY)) # Energy Resistance
! packet.setshort(78, 0) # Luck
packet.setshort(80, mindamage) # Min. Damage
packet.setshort(82, maxdamage) # Max. Damage
--- 88,92 ----
packet.setshort(74, properties.fromchar(char, RESISTANCE_POISON)) # Poison Resistance
packet.setshort(76, properties.fromchar(char, RESISTANCE_ENERGY)) # Energy Resistance
! packet.setshort(78, properties.fromchar(char, LUCK)) # Luck
packet.setshort(80, mindamage) # Min. Damage
packet.setshort(82, maxdamage) # Max. Damage
Index: utilities.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/combat/utilities.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** utilities.py 30 May 2004 13:22:40 -0000 1.11
--- utilities.py 27 Sep 2004 14:37:25 -0000 1.12
***************
*** 90,94 ****
return WRESTLING
else:
! if bestskill and weapon.hastag('bestskill'):
return getbestskill(char)
--- 90,94 ----
return WRESTLING
else:
! if bestskill and properties.fromitem(weapon, BESTSKILL):
return getbestskill(char)
|