wpdev-commits Mailing List for Wolfpack Emu (Page 30)
Brought to you by:
rip,
thiagocorrea
Menu
▾
▴
wpdev-commits — Wolfpack CVS commit info
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(14) |
Aug
(121) |
Sep
(256) |
Oct
(59) |
Nov
(73) |
Dec
(120) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(259) |
Feb
(381) |
Mar
(501) |
Apr
(355) |
May
(427) |
Jun
(270) |
Jul
(394) |
Aug
(412) |
Sep
(724) |
Oct
(578) |
Nov
(65) |
Dec
|
|
From: Richard M. <dr...@us...> - 2004-09-27 14:15:13
|
Update of /cvsroot/wpdev/xmlscripts/definitions/spawnregions/tokuno In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13458/spawnregions/tokuno Added Files: index.xml Log Message: Tokuno Island Stuff for the new expansion, empty templates. --- NEW FILE: index.xml --- <!-- /*========================================================= * ) (\_ | WOLFPACK 13.0.0 Scripts * (( _/{ "-; | Created by: Dreoth * )).-' {{ ;'` | * ( ( ;._ \\ | *=======================================================*/ --> <definitions> </definitions> |
|
From: Richard M. <dr...@us...> - 2004-09-27 14:15:13
|
Update of /cvsroot/wpdev/xmlscripts/definitions/locations In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13458/locations Modified Files: index.xml Added Files: tokuno.xml Log Message: Tokuno Island Stuff for the new expansion, empty templates. Index: index.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/locations/index.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** index.xml 7 Jul 2004 04:20:56 -0000 1.4 --- index.xml 27 Sep 2004 14:14:56 -0000 1.5 *************** *** 12,14 **** --- 12,15 ---- <include file="definitions/locations/ilshenar.xml"/> <include file="definitions/locations/malas.xml"/> + <include file="definitions/locations/tokuno.xml"/> </definitions> --- NEW FILE: tokuno.xml --- <!-- ================================================================= | ) (\_ | WOLFPACK 13.0.0 Scripts | | (( _/{ "-; | Created by: Dreoth | | )).-' {{ ;'` | Revised by: | | ( ( ;._ \\ ctr | Last Modification: Created | ================================================================= --> <definitions> </definitions> |
|
From: Richard M. <dr...@us...> - 2004-09-27 14:15:12
|
Update of /cvsroot/wpdev/xmlscripts/definitions/regions/tokuno In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13458/regions/tokuno Added Files: index.xml Log Message: Tokuno Island Stuff for the new expansion, empty templates. --- NEW FILE: index.xml --- <definitions> <!-- Towns --> <!-- Dungeons --> <!-- Misc. --> </definitions> |
|
From: Richard M. <dr...@us...> - 2004-09-27 14:13:24
|
Update of /cvsroot/wpdev/xmlscripts/definitions/regions/tokuno In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13158/regions/tokuno Log Message: Directory /cvsroot/wpdev/xmlscripts/definitions/regions/tokuno added to the repository |
|
From: Richard M. <dr...@us...> - 2004-09-27 14:13:16
|
Update of /cvsroot/wpdev/xmlscripts/definitions/regions/tokuno/towns In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13158/regions/tokuno/towns Log Message: Directory /cvsroot/wpdev/xmlscripts/definitions/regions/tokuno/towns added to the repository |
|
From: Richard M. <dr...@us...> - 2004-09-27 14:13:15
|
Update of /cvsroot/wpdev/xmlscripts/definitions/regions/tokuno/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13158/regions/tokuno/misc Log Message: Directory /cvsroot/wpdev/xmlscripts/definitions/regions/tokuno/misc added to the repository |
|
From: Richard M. <dr...@us...> - 2004-09-27 14:13:14
|
Update of /cvsroot/wpdev/xmlscripts/definitions/spawnregions/tokuno In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13158/spawnregions/tokuno Log Message: Directory /cvsroot/wpdev/xmlscripts/definitions/spawnregions/tokuno added to the repository |
|
From: Richard M. <dr...@us...> - 2004-09-27 14:13:14
|
Update of /cvsroot/wpdev/xmlscripts/definitions/regions/tokuno/dungeons In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13158/regions/tokuno/dungeons Log Message: Directory /cvsroot/wpdev/xmlscripts/definitions/regions/tokuno/dungeons added to the repository |
|
From: Sebastian H. <dar...@us...> - 2004-09-27 09:58:47
|
Update of /cvsroot/wpdev/xmlscripts/scripts/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10986/wolfpack Modified Files: consts.py properties.py Log Message: fixes Index: consts.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/consts.py,v retrieving revision 1.82 retrieving revision 1.83 diff -C2 -d -r1.82 -r1.83 *** consts.py 27 Sep 2004 00:31:49 -0000 1.82 --- consts.py 27 Sep 2004 09:58:34 -0000 1.83 *************** *** 83,86 **** --- 83,87 ---- LOWERMANACOST = 51 LOWERREAGENTCOST = 52 + SELFREPAIR = 53 # Checks for certain item types Index: properties.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/properties.py,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** properties.py 27 Sep 2004 00:31:49 -0000 1.14 --- properties.py 27 Sep 2004 09:58:34 -0000 1.15 *************** *** 78,81 **** --- 78,82 ---- # Misc LUCK: ['luck', 0, 1], + SELFREPAIR: ['selfrepair', 0, 0], # Requirements *************** *** 388,392 **** # PROPERT KEY, min value, max value, factor, accumulate LOWERREQS: [10, 100, 10, True], ! #[SELFREPAIR, 1, 5, 1, False], DURABILITYBONUS: [10, 100, 10, True], MAGEARMOR: [1, 1, 1, False], --- 389,393 ---- # PROPERT KEY, min value, max value, factor, accumulate LOWERREQS: [10, 100, 10, True], ! SELFREPAIR: [1, 5, 1, False], DURABILITYBONUS: [10, 100, 10, True], MAGEARMOR: [1, 1, 1, False], *************** *** 445,448 **** --- 446,497 ---- item.resendtooltip() + # List of allowed properties + SHIELD_PROPERTIES = { + # PROPERT KEY, min value, max value, factor, accumulate + SPELLCHANNELING: [1, 1, 1, False], + DEFENSEBONUS: [1, 15, 1, True], + HITBONUS: [1, 15, 1, True], + CASTSPEEDBONUS: [1, 1, True], + LOWERREQS: [10, 100, 10, True], + SELFREPAIR: [1, 5, 1, False], + DURABILITYBONUS: [10, 100, 10, True], + } + + # + # Apply a random shield property + # + def applyShieldRandom(item, props, minintensity, maxintensity, luckchance): + properties = SHIELD_PROPERTIES.keys() + + # Select unique properties + for i in range(0, props): + property = random.choice(properties) + properties.remove(property) + + if not PROPERTIES.has_key(property): + continue + + # Scale the value for the property + info = SHIELD_PROPERTIES[property] + value = scaleValue(minintensity, maxintensity, info[0], info[1], info[2], luckchance) + + # Some special handling for special boni + if property == DURABILITYBONUS: + bonus = int(ceil(item.maxhealth * (value / 100.0))) + item.maxhealth = max(1, item.maxhealth + bonus) + item.health = item.maxhealth + + # Set cast speed to -1 + elif property == SPELLCHANNELING: + item.settag(PROPERTIES[CASTSPEEDBONUS][0], -1) + + # Resistances are cummulative + if info[3]: + value += fromitem(item, property) + + item.settag(PROPERTIES[property][0], value) + + item.resendtooltip() + # # Apply random properties to the given items. *************** *** 472,476 **** # List of random armors for magic # item generation - def testarmor(container): DEF_ARMOR = DEF_LEATHER + DEF_STUDDED + DEF_CHAINMAIL + DEF_RINGMAIL + DEF_BONEMAIL + DEF_PLATEMAIL + DEF_HELMS + DEF_SHIELDS --- 521,524 ---- |
|
From: Sebastian H. <dar...@us...> - 2004-09-27 09:58:47
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10986 Modified Files: equipment.py Log Message: fixes Index: equipment.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/equipment.py,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** equipment.py 27 Sep 2004 00:31:48 -0000 1.39 --- equipment.py 27 Sep 2004 09:58:34 -0000 1.40 *************** *** 83,86 **** --- 83,90 ---- if properties.fromitem(object, MAGEARMOR): tooltip.add(1060437, "") + + selfrepair = properties.fromitem(object, SELFREPAIR) + if selfrepair != 0: + tooltip.add(1060450, str(selfrepair)) # *************** *** 248,254 **** tooltip.add(1060407, str(energy)) # Spell Channeling spellchanneling = properties.fromitem(object, SPELLCHANNELING) ! if spellchanneling != 0: tooltip.add(1060482, "") --- 252,259 ---- tooltip.add(1060407, str(energy)) + if weapon or shield: # Spell Channeling spellchanneling = properties.fromitem(object, SPELLCHANNELING) ! if spellchanneling: tooltip.add(1060482, "") |
|
From: Sebastian H. <dar...@us...> - 2004-09-27 00:32:01
|
Update of /cvsroot/wpdev/xmlscripts/scripts/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24292/wolfpack Modified Files: consts.py properties.py Log Message: fixes Index: consts.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/consts.py,v retrieving revision 1.81 retrieving revision 1.82 diff -C2 -d -r1.81 -r1.82 *** consts.py 26 Sep 2004 21:37:31 -0000 1.81 --- consts.py 27 Sep 2004 00:31:49 -0000 1.82 *************** *** 70,73 **** --- 70,86 ---- CASTRECOVERYBONUS = 38 CASTSPEEDBONUS = 39 + MAGEARMOR = 40 + REGENHITPOINTS = 41 + REGENSTAMINA = 42 + REGENMANA = 43 + LUCK = 44 + BONUSHITPOINTS = 45 + BONUSSTAMINA = 46 + BONUSMANA = 47 + BONUSSTRENGTH = 48 + BONUSDEXTERITY = 49 + BONUSINTELLIGENCE = 50 + LOWERMANACOST = 51 + LOWERREAGENTCOST = 52 # Checks for certain item types Index: properties.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/properties.py,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** properties.py 16 Sep 2004 16:42:29 -0000 1.13 --- properties.py 27 Sep 2004 00:31:49 -0000 1.14 *************** *** 1,20 **** ! from math import floor #from wolfpack import weaponinfo #from wolfpack import armorinfo import wolfpack.armorinfo import wolfpack.weaponinfo ! from wolfpack.consts import RESISTANCE_PHYSICAL, RESISTANCE_ENERGY, \ ! RESISTANCE_COLD, RESISTANCE_POISON, RESISTANCE_FIRE, DAMAGE_PHYSICAL, \ ! DAMAGE_ENERGY, DAMAGE_COLD, DAMAGE_POISON, DAMAGE_FIRE, DAMAGEBONUS, \ ! SPEEDBONUS, HITBONUS, DEFENSEBONUS, MINDAMAGE, MAXDAMAGE, SPEED, MISSSOUND, \ ! HITSOUND, PROJECTILE, PROJECTILEHUE, AMMUNITION, REQSTR, REQDEX, REQINT, \ ! LUCK, GOLDINCREASE, LOWERREQS, HITPOINTRATE, STAMINARATE, MANARATE, \ ! SPELLDAMAGEBONUS, MATERIALPREFIX, SWING, REFLECTPHYSICAL, \ ! DURABILITYBONUS, WEIGHTBONUS, \ ! MAGICRESISTANCE, INSCRIPTION, LAYER_RIGHTHAND, LAYER_MOUNT, \ ! ITEM_ARMOR, ITEM_WEAPON, ITEM_SHIELD, ITEM_MELEE, ITEM_RANGED, \ ! ITEM_PIERCING, ITEM_SLASHING, ITEM_BASHING, SPELLCHANNELING, \ ! CASTRECOVERYBONUS, CASTSPEEDBONUS # --- 1,12 ---- ! from math import floor, sqrt, ceil ! import random #from wolfpack import weaponinfo #from wolfpack import armorinfo import wolfpack.armorinfo import wolfpack.weaponinfo ! from wolfpack import console ! from wolfpack.consts import * ! from system.lootlists import * # *************** *** 57,60 **** --- 49,53 ---- # Flags (Weapons): SPELLCHANNELING: ['spellchanneling', 0, 0], + MAGEARMOR: ['magearmor', 0, 0], # % Boni *************** *** 67,70 **** --- 60,81 ---- CASTRECOVERYBONUS: ['castrecoverybonus', 0, 1], CASTSPEEDBONUS: ['castspeedbonus', 0, 1], + LOWERMANACOST: ['lowermanacost', 0, 1], + LOWERREAGENTCOST: ['lowerreagentcost', 0, 1], + + # Bonus Hitpoints etc. + BONUSHITPOINTS: ['bonushitpoints', 0, 1], + BONUSSTAMINA: ['bonusstamina', 0, 1], + BONUSMANA: ['bonusmana', 0, 1], + BONUSSTRENGTH: ['bonusstrength', 0, 1], + BONUSDEXTERITY: ['bonusdexterity', 0, 1], + BONUSINTELLIGENCE: ['bonusintelligence', 0, 1], + + # Regeneration rates + REGENHITPOINTS: ['regenhitpoints', 0, 1], + REGENSTAMINA: ['regenstamina', 0, 1], + REGENMANA: ['regenmana', 0, 1], + + # Misc + LUCK: ['luck', 0, 1], # Requirements *************** *** 92,95 **** --- 103,109 ---- # def fromitem(item, property): + if property == MAGEARMOR and item.allowmeditation: + return True + if not PROPERTIES.has_key(property): raise Exception, "Unknown property value %u" % property *************** *** 299,300 **** --- 313,483 ---- return 0 + + LUCKTABLE = [] + # Generate lucktable + p = 1.0 / 1.8 + for i in range(0, 1201): + LUCKTABLE.append(int(pow(i, p) * 100)) + + # 0, 1, 2, 3, 4, 5 properties chances + CHANCES = [ + [3, 1, 0, 0, 0, 0], # 1 max property + [6, 3, 1, 0, 0, 0], # 2 max properties + [10, 6, 3, 1, 0, 0], # 3 max properties + [16, 12, 6, 5, 1, 0], # 4 max properties + [30, 25, 20, 15, 9, 1], # 5 max properties + ] + + # + # How many properties does the item actually have. + # + def bonusProps(maxprops, luckChance): + if maxprops > 5: + maxprops = 5 + + if maxprops < 1: + return 0 + + maxprops -= 1 + + chances = CHANCES[maxprops] + chancesum = sum(chances) + + result = 0 + + rnd = random.randrange(0, chancesum) + for i in [5, 4, 3, 2, 1, 0]: + if rnd < chances[i]: + result = i + break + else: + rnd -= chances[i] + + # Take luck into account + if result < maxprops and luckChance > random.randint(0, 10000): + result += 1 + + return result + + # + # Scale a property value based on luck and intensity and a custom scale factor + # + def scaleValue( minimum, maximum, propmin, propmax, scale, luckchance ): + if scale != 1: + propmin = propmin / float(scale) + propmax = propmax / float(scale) + + # Although this is the "Worst system ever" (c) RunUO + # I think the basic idea of having the chance increase slower than + # using a normal rand function is good. + percent = 100 - sqrt(random.randint(0, 10000)) # Range of the property value + + if luckchance > random.randint(0, 10000): + percent += 10 + + # Normalize the percentage + percent = min(maximum, max(minimum, percent)) + + if scale != 1: + return int(propmin + float(propmax - propmin) * (percent / 100.0)) * scale + else: + return int(propmin + float(propmax - propmin) * (percent / 100.0)) + + # List of allowed properties + ARMOR_PROPERTIES = { + # PROPERT KEY, min value, max value, factor, accumulate + LOWERREQS: [10, 100, 10, True], + #[SELFREPAIR, 1, 5, 1, False], + DURABILITYBONUS: [10, 100, 10, True], + MAGEARMOR: [1, 1, 1, False], + REGENHITPOINTS: [1, 2, 1, False], + REGENSTAMINA: [1, 3, 1, False], + REGENMANA: [1, 2, 1, False], + BONUSHITPOINTS: [1, 5, 1, False], + BONUSSTAMINA: [1, 8, 1, False], + BONUSMANA: [1, 8, 1, False], + LOWERMANACOST: [1, 8, 1, False], + LOWERREAGENTCOST: [1, 20, 1, False], + LUCK: [1, 100, 1, True], + REFLECTPHYSICAL: [1, 15, 1, False], + RESISTANCE_PHYSICAL: [1, 15, 1, True], + RESISTANCE_FIRE: [1, 15, 1, True], + RESISTANCE_COLD: [1, 15, 1, True], + RESISTANCE_POISON: [1, 15, 1, True], + RESISTANCE_ENERGY: [1, 15, 1, True], + } + + # + # Apply a random armor property + # + def applyArmorRandom(item, props, minintensity, maxintensity, luckchance): + properties = ARMOR_PROPERTIES.keys() + + # Remove MageArmor from the list if it's already on the item + magearmor = fromitem(item, MAGEARMOR) + if magearmor: + properties.remove(MAGEARMOR) + + # Select unique properties + for i in range(0, props): + property = random.choice(properties) + properties.remove(property) + + if not PROPERTIES.has_key(property): + continue + + # Scale the value for the property + info = ARMOR_PROPERTIES[property] + value = scaleValue(minintensity, maxintensity, info[0], info[1], info[2], luckchance) + + # Some special handling for special boni + if property == DURABILITYBONUS: + bonus = int(ceil(item.maxhealth * (value / 100.0))) + item.maxhealth = max(1, item.maxhealth + bonus) + item.health = item.maxhealth + + # Resistances are cummulative + if info[3]: + value += fromitem(item, property) + + item.settag(PROPERTIES[property][0], value) + + item.resendtooltip() + + # + # Apply random properties to the given items. + # + def applyRandom(item, maxprops, minintensity, maxintensity, luck=0 ): + if luck < 0: + luck = 0 + if luck > 1200: + luck = 1200 + + luckchance = LUCKTABLE[luck] + + props = 1 + bonusProps(maxprops, luckchance) + + if itemcheck(item, ITEM_ARMOR): + applyArmorRandom(item, props, minintensity, maxintensity, luckchance) + + elif itemcheck(item, ITEM_SHIELD): + applyShieldRandom(item, props, minintensity, maxintensity, luckchance) + + elif itemcheck(item, ITEM_WEAPON): + applyWeaponRandom(item, props, minintensity, maxintensity, luckchance) + + else: + applyJuwelRandom(item, props, minintensity, maxintensity, luckchance) + + # List of random armors for magic + # item generation + + def testarmor(container): + DEF_ARMOR = DEF_LEATHER + DEF_STUDDED + DEF_CHAINMAIL + DEF_RINGMAIL + DEF_BONEMAIL + DEF_PLATEMAIL + DEF_HELMS + DEF_SHIELDS + id = random.choice(DEF_ARMOR) + + item = wolfpack.additem(id) + container.additem(item) + applyRandom(item, random.randint(1, 5), 50, 100, 0) + item.update() + |
|
From: Sebastian H. <dar...@us...> - 2004-09-27 00:31:58
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24292 Modified Files: equipment.py Log Message: fixes Index: equipment.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/equipment.py,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** equipment.py 13 Sep 2004 19:14:46 -0000 1.38 --- equipment.py 27 Sep 2004 00:31:48 -0000 1.39 *************** *** 14,25 **** def modifiers(object, tooltip): modifiers = { - "boni_dex": 1060409, - "boni_int": 1060432, - "boni_str": 1060485, "remaining_uses": 1060584, "aos_boni_damage": 1060401, - "regenhitpoints": 1060444, - "regenstamina": 1060443, - "regenmana": 1060440, } --- 14,19 ---- *************** *** 44,55 **** spelldamagebonus = properties.fromitem(object, SPELLDAMAGEBONUS) ! if spelldamagebonus: tooltip.add(1060483, str(spelldamagebonus)) if object.hastag("bestskill"): tooltip.add(1060400, "") ! if object.hastag('magearmor'): tooltip.add(1060437, "") --- 38,85 ---- spelldamagebonus = properties.fromitem(object, SPELLDAMAGEBONUS) ! if spelldamagebonus: tooltip.add(1060483, str(spelldamagebonus)) + bonus = properties.fromitem(object, BONUSSTRENGTH) + if bonus != 0: + tooltip.add(1060485, str(bonus)) + + bonus = properties.fromitem(object, BONUSDEXTERITY) + if bonus != 0: + tooltip.add(1060409, str(bonus)) + + bonus = properties.fromitem(object, BONUSINTELLIGENCE) + if bonus != 0: + tooltip.add(1060432, str(bonus)) + + bonus = properties.fromitem(object, BONUSHITPOINTS) + if bonus != 0: + tooltip.add(1060431, str(bonus)) + + bonus = properties.fromitem(object, BONUSSTAMINA) + if bonus != 0: + tooltip.add(1060484, str(bonus)) + + bonus = properties.fromitem(object, BONUSMANA) + if bonus != 0: + tooltip.add(1060439, str(bonus)) + + regenhitpoints = properties.fromitem(object, REGENHITPOINTS) + if regenhitpoints: + tooltip.add(1060444, str(regenhitpoints)) + + regenstamina = properties.fromitem(object, REGENSTAMINA) + if regenstamina: + tooltip.add(1060443, str(regenstamina)) + + regenmana = properties.fromitem(object, REGENMANA) + if regenmana: + tooltip.add(1060440, str(regenmana)) + if object.hastag("bestskill"): tooltip.add(1060400, "") ! if properties.fromitem(object, MAGEARMOR): tooltip.add(1060437, "") *************** *** 179,183 **** maxdamage = object.getintproperty( 'maxdamage', 2 ) if object.hastag( 'maxdamage' ): ! mindamage = int( object.gettag( 'maxdamage' ) ) tooltip.add( 1061168, "%u\t%u" % ( mindamage, maxdamage ) ) --- 209,213 ---- maxdamage = object.getintproperty( 'maxdamage', 2 ) if object.hastag( 'maxdamage' ): ! maxdamage = int( object.gettag( 'maxdamage' ) ) tooltip.add( 1061168, "%u\t%u" % ( mindamage, maxdamage ) ) *************** *** 246,249 **** --- 276,287 ---- modifiers(object, tooltip) + lowermana = properties.fromitem(object, LOWERMANACOST) + if lowermana: + tooltip.add(1060433, str(lowermana)) + + lowerreags = properties.fromitem(object, LOWERREAGENTCOST) + if lowerreags: + tooltip.add(1060434, str(lowerreags)) + lower = properties.fromitem(object, LOWERREQS) if lower: *************** *** 324,359 **** changed = 0 ! # Bonus Strength ! if item.hastag('boni_str'): ! char.strength = char.strength + int(item.gettag('boni_str')) ! changed = 1 # Bonus Dex ! if item.hastag('boni_dex'): ! char.dexterity = char.dexterity + int(item.gettag('boni_dex')) ! changed = 1 # Bonus Int ! if item.hastag('boni_int'): ! char.intelligence = char.intelligence + int(item.gettag('boni_int')) ! changed = 1 # Add hitpoint regeneration rate bonus ! if item.hastag('regenhitpoints'): if char.hastag('regenhitpoints'): ! regenhitpoints = int(char.gettag('regenhitpoints')) + int(item.gettag('regenhitpoints')) ! else: ! regenhitpoints = int(item.gettag('regenhitpoints')) ! char.settag('regenhitpoints', regenhitpoints) # Add stamina regeneration rate bonus ! if item.hastag('regenstamina'): if char.hastag('regenstamina'): ! regenstamina = int(char.gettag('regenstamina')) + int(item.gettag('regenstamina')) ! else: ! regenstamina = int(item.gettag('regenstamina')) ! char.settag('regenstamina', regenstamina) # Update Stats --- 362,430 ---- changed = 0 ! # Bonus Str ! bonus = properties.fromitem(item, BONUSSTRENGTH) ! value = max(0, char.strength + bonus) ! if value != char.strength: ! char.strength = value ! char.strength2 = max(0, char.strength2 + bonus) ! changed = True # Bonus Dex ! bonus = properties.fromitem(item, BONUSDEXTERITY) ! value = max(0, char.dexterity + bonus) ! if value != char.dexterity: ! char.dexterity = value ! char.dexterity2 = max(0, char.dexterity2 + bonus) ! changed = True # Bonus Int ! bonus = properties.fromitem(item, BONUSINTELLIGENCE) ! value = max(0, char.intelligence + bonus) ! if value != char.intelligence: ! char.intelligence = value ! char.intelligence2 = max(0, char.intelligence2 + bonus) ! changed = True ! ! # Bonus Hitpoints ! bonushitpoints = properties.fromitem(item, BONUSHITPOINTS) ! if bonushitpoints != 0: ! char.hitpointsbonus += bonushitpoints ! changed = True ! ! # Bonus Stamina ! bonusstamina = properties.fromitem(item, BONUSSTAMINA) ! if bonusstamina != 0: ! char.staminabonus += bonusstamina ! changed = True ! ! # Bonus Mana ! bonusmana = properties.fromitem(item, BONUSMANA) ! if bonusmana != 0: ! char.manabonus += bonusmana ! changed = True # Add hitpoint regeneration rate bonus ! regenhitpoints = properties.fromitem(item, REGENHITPOINTS) ! if regenhitpoints: if char.hastag('regenhitpoints'): ! regenhitpoints += int(char.gettag('regenhitpoints')) ! char.settag('regenhitpoints', regenhitpoints) # Add stamina regeneration rate bonus ! regenstamina = properties.fromitem(item, REGENSTAMINA) ! if regenstamina: if char.hastag('regenstamina'): ! regenstamina += int(char.gettag('regenstamina')) ! char.settag('regenstamina', regenstamina) + + # Add mana regeneration rate bonus + regenmana = properties.fromitem(item, REGENMANA) + if regenmana: + if char.hastag('regenmana'): + regenmana += int(char.gettag('regenmana')) + + char.settag('regenmana', regenmana) # Update Stats *************** *** 366,402 **** def onUnequip(char, item, layer): changed = 0 ! # Bonus Str ! if item.hastag('boni_str'): ! char.strength = char.strength - int(item.gettag('boni_str')) ! changed = 1 # Bonus Dex ! if item.hastag('boni_dex'): ! char.dexterity = char.dexterity - int(item.gettag('boni_dex')) ! changed = 1 # Bonus Int ! if item.hastag('boni_int'): ! char.intelligence = char.intelligence - int(item.gettag('boni_int')) ! changed = 1 ! # Remove the hitpoint regeneration rate bonus ! if item.hastag('regenhitpoints') and char.hastag('regenhitpoints'): ! regenhitpoints = int(char.gettag('regenhitpoints')) ! regenhitpoints -= int(item.gettag('regenhitpoints')) ! if regenhitpoints <= 0: char.deltag('regenhitpoints') else: ! char.settag('regenhitpoints', regenhitpoints) ! # Remove the stamina regeneration rate bonus ! if item.hastag('regenstamina') and char.hastag('regenstamina'): ! regenstamina = int(char.gettag('regenstamina')) ! regenstamina -= int(item.gettag('regenstamina')) ! if regenstamina <= 0: char.deltag('regenstamina') else: ! char.settag('regenstamina', regenstamina) # Update Stats --- 437,512 ---- def onUnequip(char, item, layer): changed = 0 ! # Bonus Str ! bonus = properties.fromitem(item, BONUSSTRENGTH) ! value = max(0, char.strength - bonus) ! if value != char.strength: ! char.strength = value ! char.strength2 = max(0, char.strength2 - bonus) ! changed = True # Bonus Dex ! bonus = properties.fromitem(item, BONUSDEXTERITY) ! value = max(0, char.dexterity - bonus) ! if value != char.dexterity: ! char.dexterity = value ! char.dexterity2 = max(0, char.dexterity2 - bonus) ! changed = True # Bonus Int ! bonus = properties.fromitem(item, BONUSINTELLIGENCE) ! value = max(0, char.intelligence - bonus) ! if value != char.intelligence: ! char.intelligence = value ! char.intelligence2 = max(0, char.intelligence2 - bonus) ! changed = True ! # Bonus Hitpoints ! bonushitpoints = properties.fromitem(item, BONUSHITPOINTS) ! if bonushitpoints != 0: ! char.hitpointsbonus -= bonushitpoints ! changed = True ! ! # Bonus Stamina ! bonusstamina = properties.fromitem(item, BONUSSTAMINA) ! if bonusstamina != 0: ! char.staminabonus -= bonusstamina ! changed = True ! ! # Bonus Mana ! bonusmana = properties.fromitem(item, BONUSMANA) ! if bonusmana != 0: ! char.manabonus -= bonusmana ! changed = True ! ! # Remove hitpoint regeneration rate bonus ! regenhitpoints = properties.fromitem(item, REGENHITPOINTS) ! if regenhitpoints and char.hastag('regenhitpoints'): ! value = int(char.gettag('regenhitpoints')) - regenhitpoints ! ! if value <= 0: char.deltag('regenhitpoints') else: ! char.settag('regenhitpoints', value) ! # Remove stamina regeneration rate bonus ! regenstamina = properties.fromitem(item, REGENSTAMINA) ! if regenstamina and char.hastag('regenstamina'): ! value = int(char.gettag('regenstamina')) - regenstamina ! ! if value <= 0: char.deltag('regenstamina') else: ! char.settag('regenstamina', value) ! ! # Remove mana regeneration rate bonus ! regenmana = properties.fromitem(item, REGENMANA) ! if regenmana and char.hastag('regenmana'): ! value = int(char.gettag('regenmana')) - regenmana ! ! if value <= 0: ! char.deltag('regenmana') ! else: ! char.settag('regenmana', value) # Update Stats *************** *** 404,407 **** --- 514,524 ---- char.updatestats() + # + # Remove boni + # + def onDelete(item): + char = item.container + onUnequip(char, item, item.layer) + # Try to equip an item after calling onWearItem for it def onUse(player, item): |
|
From: Sebastian H. <dar...@us...> - 2004-09-27 00:31:17
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items/armory/hats In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24069/items/armory/hats Modified Files: bandana.xml bear_mask.xml bonnet.xml cap.xml deer_mask.xml feathered_hat.xml floppy_hat.xml jester_hat.xml jesters_cap.xml orc_masks.xml skull_cap.xml straw_hat.xml tall_straw_hat.xml tribal_masks.xml tricorne_hat.xml wide-brim_hat.xml wizards_hat.xml Log Message: fixes Index: tricorne_hat.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/hats/tricorne_hat.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** tricorne_hat.xml 5 Sep 2004 21:02:49 -0000 1.5 --- tricorne_hat.xml 27 Sep 2004 00:31:02 -0000 1.6 *************** *** 27,30 **** --- 27,31 ---- <intproperty name="res_poison" value="5" /> <intproperty name="res_energy" value="5" /> + <allowmeditation /> </item> Index: jester_hat.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/hats/jester_hat.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** jester_hat.xml 5 Sep 2004 21:02:49 -0000 1.5 --- jester_hat.xml 27 Sep 2004 00:31:02 -0000 1.6 *************** *** 24,27 **** --- 24,28 ---- <intproperty name="res_poison" value="5" /> <intproperty name="res_energy" value="5" /> + <allowmeditation /> </item> Index: bandana.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/hats/bandana.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** bandana.xml 5 Sep 2004 21:02:49 -0000 1.6 --- bandana.xml 27 Sep 2004 00:30:57 -0000 1.7 *************** *** 28,31 **** --- 28,32 ---- <intproperty name="res_poison" value="8" /> <intproperty name="res_energy" value="8" /> + <allowmeditation /> </item> Index: tall_straw_hat.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/hats/tall_straw_hat.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** tall_straw_hat.xml 5 Sep 2004 21:02:49 -0000 1.5 --- tall_straw_hat.xml 27 Sep 2004 00:31:02 -0000 1.6 *************** *** 27,30 **** --- 27,31 ---- <intproperty name="res_poison" value="5" /> <intproperty name="res_energy" value="5" /> + <allowmeditation /> </item> Index: bonnet.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/hats/bonnet.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** bonnet.xml 5 Sep 2004 21:02:49 -0000 1.5 --- bonnet.xml 27 Sep 2004 00:31:02 -0000 1.6 *************** *** 27,30 **** --- 27,31 ---- <intproperty name="res_poison" value="5" /> <intproperty name="res_energy" value="5" /> + <allowmeditation /> </item> Index: wide-brim_hat.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/hats/wide-brim_hat.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** wide-brim_hat.xml 5 Sep 2004 21:02:49 -0000 1.5 --- wide-brim_hat.xml 27 Sep 2004 00:31:02 -0000 1.6 *************** *** 27,30 **** --- 27,31 ---- <intproperty name="res_poison" value="5" /> <intproperty name="res_energy" value="5" /> + <allowmeditation /> </item> Index: bear_mask.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/hats/bear_mask.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** bear_mask.xml 5 Sep 2004 21:02:49 -0000 1.7 --- bear_mask.xml 27 Sep 2004 00:31:02 -0000 1.8 *************** *** 27,30 **** --- 27,31 ---- <intproperty name="res_poison" value="4" /> <intproperty name="res_energy" value="4" /> + <allowmeditation /> </item> Index: cap.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/hats/cap.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** cap.xml 27 Aug 2004 14:43:24 -0000 1.4 --- cap.xml 27 Sep 2004 00:31:02 -0000 1.5 *************** *** 21,24 **** --- 21,25 ---- <type>1009</type> <basescripts>equipment</basescripts> + <allowmeditation /> </item> Index: deer_mask.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/hats/deer_mask.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** deer_mask.xml 5 Sep 2004 21:02:49 -0000 1.7 --- deer_mask.xml 27 Sep 2004 00:31:02 -0000 1.8 *************** *** 26,29 **** --- 26,30 ---- <intproperty name="res_poison" value="1" /> <intproperty name="res_energy" value="7" /> + <allowmeditation /> </item> Index: feathered_hat.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/hats/feathered_hat.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** feathered_hat.xml 5 Sep 2004 21:02:49 -0000 1.5 --- feathered_hat.xml 27 Sep 2004 00:31:02 -0000 1.6 *************** *** 27,30 **** --- 27,31 ---- <intproperty name="res_poison" value="5" /> <intproperty name="res_energy" value="5" /> + <allowmeditation /> </item> Index: straw_hat.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/hats/straw_hat.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** straw_hat.xml 5 Sep 2004 21:02:49 -0000 1.5 --- straw_hat.xml 27 Sep 2004 00:31:02 -0000 1.6 *************** *** 27,30 **** --- 27,31 ---- <intproperty name="res_poison" value="5" /> <intproperty name="res_energy" value="5" /> + <allowmeditation /> </item> Index: wizards_hat.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/hats/wizards_hat.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** wizards_hat.xml 5 Sep 2004 21:02:49 -0000 1.5 --- wizards_hat.xml 27 Sep 2004 00:31:02 -0000 1.6 *************** *** 27,30 **** --- 27,31 ---- <intproperty name="res_poison" value="5" /> <intproperty name="res_energy" value="5" /> + <allowmeditation /> </item> Index: jesters_cap.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/hats/jesters_cap.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** jesters_cap.xml 5 Sep 2004 21:02:49 -0000 1.5 --- jesters_cap.xml 27 Sep 2004 00:31:02 -0000 1.6 *************** *** 27,30 **** --- 27,31 ---- <intproperty name="res_poison" value="5" /> <intproperty name="res_energy" value="5" /> + <allowmeditation /> </item> Index: orc_masks.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/hats/orc_masks.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** orc_masks.xml 5 Sep 2004 21:02:49 -0000 1.6 --- orc_masks.xml 27 Sep 2004 00:31:02 -0000 1.7 *************** *** 25,28 **** --- 25,29 ---- <intproperty name="res_poison" value="7" /> <intproperty name="res_energy" value="8" /> + <allowmeditation /> </item> Index: floppy_hat.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/hats/floppy_hat.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** floppy_hat.xml 5 Sep 2004 21:02:49 -0000 1.6 --- floppy_hat.xml 27 Sep 2004 00:31:02 -0000 1.7 *************** *** 27,30 **** --- 27,31 ---- <intproperty name="res_poison" value="5" /> <intproperty name="res_energy" value="5" /> + <allowmeditation /> </item> Index: skull_cap.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/hats/skull_cap.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** skull_cap.xml 5 Sep 2004 21:02:49 -0000 1.6 --- skull_cap.xml 27 Sep 2004 00:31:02 -0000 1.7 *************** *** 21,24 **** --- 21,25 ---- <intproperty name="res_poison" value="8" /> <intproperty name="res_energy" value="8" /> + <allowmeditation /> </item> Index: tribal_masks.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/hats/tribal_masks.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** tribal_masks.xml 5 Sep 2004 21:02:49 -0000 1.6 --- tribal_masks.xml 27 Sep 2004 00:31:02 -0000 1.7 *************** *** 24,27 **** --- 24,28 ---- <intproperty name="res_poison" value="4" /> <intproperty name="res_energy" value="5" /> + <allowmeditation /> </item> *************** *** 48,51 **** --- 49,53 ---- <intproperty name="res_poison" value="10" /> <intproperty name="res_energy" value="5" /> + <allowmeditation /> </item> |
|
From: Sebastian H. <dar...@us...> - 2004-09-27 00:31:16
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items/armory/helmets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24069/items/armory/helmets Modified Files: orc_helm.xml Log Message: fixes Index: orc_helm.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/helmets/orc_helm.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** orc_helm.xml 5 Sep 2004 21:02:50 -0000 1.12 --- orc_helm.xml 27 Sep 2004 00:31:03 -0000 1.13 *************** *** 31,34 **** --- 31,35 ---- <intproperty name="res_poison" value="3" /> <intproperty name="res_energy" value="5" /> + <allowmeditation /> </item> |
|
From: Sebastian H. <dar...@us...> - 2004-09-27 00:31:15
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items/armory/leather In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24069/items/armory/leather Modified Files: leather_armor.xml leather_bustier.xml leather_cap.xml leather_gloves.xml leather_gorget.xml leather_leggings.xml leather_shorts.xml leather_skirt.xml leather_sleeves.xml leather_tunic.xml Log Message: fixes Index: leather_shorts.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/leather/leather_shorts.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** leather_shorts.xml 5 Sep 2004 21:02:50 -0000 1.14 --- leather_shorts.xml 27 Sep 2004 00:31:04 -0000 1.15 *************** *** 30,33 **** --- 30,34 ---- <intproperty name="res_poison" value="3" /> <intproperty name="res_energy" value="3" /> + <allowmeditation /> </item> Index: leather_gorget.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/leather/leather_gorget.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** leather_gorget.xml 5 Sep 2004 21:02:50 -0000 1.13 --- leather_gorget.xml 27 Sep 2004 00:31:04 -0000 1.14 *************** *** 30,33 **** --- 30,34 ---- <intproperty name="res_poison" value="3" /> <intproperty name="res_energy" value="3" /> + <allowmeditation /> </item> Index: leather_gloves.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/leather/leather_gloves.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** leather_gloves.xml 5 Sep 2004 21:02:50 -0000 1.14 --- leather_gloves.xml 27 Sep 2004 00:31:04 -0000 1.15 *************** *** 30,33 **** --- 30,34 ---- <intproperty name="res_poison" value="3" /> <intproperty name="res_energy" value="3" /> + <allowmeditation /> </item> Index: leather_sleeves.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/leather/leather_sleeves.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** leather_sleeves.xml 5 Sep 2004 21:02:50 -0000 1.14 --- leather_sleeves.xml 27 Sep 2004 00:31:04 -0000 1.15 *************** *** 30,33 **** --- 30,34 ---- <intproperty name="res_poison" value="3" /> <intproperty name="res_energy" value="3" /> + <allowmeditation /> </item> Index: leather_leggings.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/leather/leather_leggings.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** leather_leggings.xml 5 Sep 2004 21:02:50 -0000 1.14 --- leather_leggings.xml 27 Sep 2004 00:31:04 -0000 1.15 *************** *** 30,33 **** --- 30,34 ---- <intproperty name="res_poison" value="3" /> <intproperty name="res_energy" value="3" /> + <allowmeditation /> </item> Index: leather_bustier.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/leather/leather_bustier.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** leather_bustier.xml 5 Sep 2004 21:02:50 -0000 1.15 --- leather_bustier.xml 27 Sep 2004 00:31:04 -0000 1.16 *************** *** 30,33 **** --- 30,34 ---- <intproperty name="res_poison" value="3" /> <intproperty name="res_energy" value="3" /> + <allowmeditation /> </item> Index: leather_armor.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/leather/leather_armor.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** leather_armor.xml 5 Sep 2004 21:02:50 -0000 1.15 --- leather_armor.xml 27 Sep 2004 00:31:03 -0000 1.16 *************** *** 30,33 **** --- 30,34 ---- <intproperty name="res_poison" value="3" /> <intproperty name="res_energy" value="3" /> + <allowmeditation /> </item> Index: leather_cap.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/leather/leather_cap.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** leather_cap.xml 5 Sep 2004 21:02:50 -0000 1.14 --- leather_cap.xml 27 Sep 2004 00:31:04 -0000 1.15 *************** *** 30,33 **** --- 30,34 ---- <intproperty name="res_poison" value="3" /> <intproperty name="res_energy" value="3" /> + <allowmeditation /> </item> Index: leather_skirt.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/leather/leather_skirt.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** leather_skirt.xml 5 Sep 2004 21:02:50 -0000 1.14 --- leather_skirt.xml 27 Sep 2004 00:31:04 -0000 1.15 *************** *** 30,33 **** --- 30,34 ---- <intproperty name="res_poison" value="3" /> <intproperty name="res_energy" value="3" /> + <allowmeditation /> </item> Index: leather_tunic.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/armory/leather/leather_tunic.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** leather_tunic.xml 5 Sep 2004 21:02:50 -0000 1.14 --- leather_tunic.xml 27 Sep 2004 00:31:04 -0000 1.15 *************** *** 30,33 **** --- 30,34 ---- <intproperty name="res_poison" value="3" /> <intproperty name="res_energy" value="3" /> + <allowmeditation /> </item> |
|
From: Sebastian H. <dar...@us...> - 2004-09-27 00:30:58
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24019/webroot Modified Files: ChangeLog.wolfpack Log Message: fixes Index: ChangeLog.wolfpack =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v retrieving revision 1.118 retrieving revision 1.119 diff -C2 -d -r1.118 -r1.119 *** ChangeLog.wolfpack 26 Sep 2004 14:42:41 -0000 1.118 --- ChangeLog.wolfpack 27 Sep 2004 00:30:47 -0000 1.119 *************** *** 1,5 **** Wolfpack ChangeLog ! Wolfpack 12.9.11 Beta (CVS) * Definition Changes: - Fixed minimum taming for npcs. --- 1,25 ---- Wolfpack ChangeLog ! Wolfpack 12.9.12 Beta (CVS) ! * Definition Changes: ! - Made leather armors and hats auto mage armors. ! * Python Script Changes: ! - Fixed BONUS* properties. ! - Fixed other property issues. ! * Misc. Changes: ! * Known Issues, Bugs, and Missing Features: ! - Some skills are still incomplete. ! - Spawn regions are incomplete. ! We welcome donated OSI-like spawn scripts! ! - Town/World regions are incomplete. ! We welcome donated OSI-like region scripts! ! - Teleport Scripts are incomplete. ! We welcome donated OSI-like teleport scripts! ! - Possible that a few monsters are missing and/or incomplete. ! - Reloading Python too many times can crash the server. ! - There are still some memory leaks. ! - Multis (Houses/Boats) are not currently supported. ! ! Wolfpack 12.9.11 Beta (26. September 2004) * Definition Changes: - Fixed minimum taming for npcs. |
|
From: Incanus <inc...@us...> - 2004-09-27 00:23:21
|
Update of /cvsroot/wpdev/xmlscripts/scripts/system In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21830/scripts/system Modified Files: spawns.py Log Message: invalid spawners log their id to console (#327) Index: spawns.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/spawns.py,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** spawns.py 17 Sep 2004 23:05:48 -0000 1.7 --- spawns.py 27 Sep 2004 00:23:03 -0000 1.8 *************** *** 25,28 **** --- 25,30 ---- pass except: + if( spawner ): + console.log(LOG_WARNING, "Invalid spawner: 0x%x.\n" % spawner.serial) return |
|
From: Incanus <inc...@us...> - 2004-09-26 23:34:10
|
Update of /cvsroot/wpdev/xmlscripts/scripts/commands In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10838/scripts/commands Modified Files: adddecor.py Log Message: fix for bug #328 Index: adddecor.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/adddecor.py,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** adddecor.py 23 Aug 2004 03:10:39 -0000 1.6 --- adddecor.py 26 Sep 2004 23:33:49 -0000 1.7 *************** *** 28,32 **** # Tree Lists treeindex = [ 'cca', 'ccb', 'ccc', 'ccd', 'cd0', 'cd3', 'cd6', 'cd8', 'cda', 'cdd', 'ce0', 'ce3', 'ce6', 'cf8', 'cfe', 'd01', 'd94', 'd98', 'd9c', 'da0', 'da4', 'da8' ] ! jungletreeindex = [ 'jungle1', 'jungle2', 'jungle3', 'jungle4', 'jungle5', 'jungle6', 'jungle7' ] forestlist = [ 'ccd', 'cd0', 'cd3', 'cd6', 'cd8', 'cda', 'cdd', 'ce0', 'ce3', 'ce6' ] swamplist = [ 'cf8', 'cfe', 'd01' ] --- 28,32 ---- # Tree Lists treeindex = [ 'cca', 'ccb', 'ccc', 'ccd', 'cd0', 'cd3', 'cd6', 'cd8', 'cda', 'cdd', 'ce0', 'ce3', 'ce6', 'cf8', 'cfe', 'd01', 'd94', 'd98', 'd9c', 'da0', 'da4', 'da8' ] ! jungleindex = [ 'jungle1', 'jungle2', 'jungle3', 'jungle4', 'jungle5', 'jungle6', 'jungle7' ] forestlist = [ 'ccd', 'cd0', 'cd3', 'cd6', 'cd8', 'cda', 'cdd', 'ce0', 'ce3', 'ce6' ] swamplist = [ 'cf8', 'cfe', 'd01' ] |
|
From: Incanus <inc...@us...> - 2004-09-26 23:32:34
|
Update of /cvsroot/wpdev/xmlscripts/scripts/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10533/scripts/wolfpack Modified Files: utilities.py Log Message: fix for bug #329 Index: utilities.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/utilities.py,v retrieving revision 1.67 retrieving revision 1.68 diff -C2 -d -r1.67 -r1.68 *** utilities.py 9 Sep 2004 17:28:12 -0000 1.67 --- utilities.py 26 Sep 2004 23:32:07 -0000 1.68 *************** *** 387,391 **** """ def istree( tile ): ! return tile in range( 3221, 3223 ) + \ range( 3230, 3231 ) + \ range( 3242, 3243 ) + \ --- 387,391 ---- """ def istree( tile ): ! return tile in range( 3220, 3223 ) + \ range( 3230, 3231 ) + \ range( 3242, 3243 ) + \ *************** *** 406,410 **** range( 3326, 3327 ) + \ range( 3329, 3330 ) + \ ! range( 3393, 3394 ) + \ range( 3415, 3420 ) + \ range( 3438, 3443 ) + \ --- 406,410 ---- range( 3326, 3327 ) + \ range( 3329, 3330 ) + \ ! range( 3393, 3397 ) + \ range( 3415, 3420 ) + \ range( 3438, 3443 ) + \ |
|
From: Incanus <inc...@us...> - 2004-09-26 22:40:14
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29773 Modified Files: pythonscript.cpp Log Message: documentation fix Index: pythonscript.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/pythonscript.cpp,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** pythonscript.cpp 26 Sep 2004 21:36:23 -0000 1.52 --- pythonscript.cpp 26 Sep 2004 22:40:04 -0000 1.53 *************** *** 543,547 **** \param source The source of the resurrection. This may be None. \condition Triggered when a character is resurrected. ! \notes Return False to cancel the resurrection. */ "onResurrect", --- 543,547 ---- \param source The source of the resurrection. This may be None. \condition Triggered when a character is resurrected. ! \notes Return True to cancel the resurrection. */ "onResurrect", |
|
From: Incanus <inc...@us...> - 2004-09-26 21:37:51
|
Update of /cvsroot/wpdev/xmlscripts/scripts/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14281/scripts/wolfpack Modified Files: consts.py Log Message: Added an onResurrect event. Changed char.resurrect to accept the source of the resurrection as an optional parameter. Index: consts.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/consts.py,v retrieving revision 1.80 retrieving revision 1.81 diff -C2 -d -r1.80 -r1.81 *** consts.py 25 Sep 2004 19:57:28 -0000 1.80 --- consts.py 26 Sep 2004 21:37:31 -0000 1.81 *************** *** 394,398 **** EVENT_GETSELLPRICE = 45 EVENT_SHOWVIRTUEGUMP = 46 ! EVENT_COUNT = 47 """ \end --- 394,399 ---- EVENT_GETSELLPRICE = 45 EVENT_SHOWVIRTUEGUMP = 46 ! EVENT_RESURRECT = 47 ! EVENT_COUNT = 48 """ \end |
|
From: Incanus <inc...@us...> - 2004-09-26 21:36:36
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13916 Modified Files: basechar.cpp basechar.h pythonscript.cpp pythonscript.h Log Message: Added an onResurrect event. Changed char.resurrect to accept the source of the resurrection as an optional parameter. Index: basechar.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/basechar.h,v retrieving revision 1.87 retrieving revision 1.88 diff -C2 -d -r1.87 -r1.88 *** basechar.h 24 Sep 2004 04:47:23 -0000 1.87 --- basechar.h 26 Sep 2004 21:36:23 -0000 1.88 *************** *** 283,287 **** double getStaminaRate(); double getManaRate(); ! void resurrect(); virtual void turnTo( cUObject* object ); --- 283,287 ---- double getStaminaRate(); double getManaRate(); ! bool resurrect( cUObject* source ); virtual void turnTo( cUObject* object ); *************** *** 326,329 **** --- 326,330 ---- virtual bool onSkillUse( UI08 Skill ); // The character uses %Skill virtual bool onDeath( cUObject* source, P_ITEM corpse ); + virtual bool onResurrect( cUObject* source ); virtual bool onDropOnChar( P_ITEM pItem ); virtual QString onShowPaperdollName( P_CHAR pOrigin ); // only change the viewed name Index: pythonscript.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/pythonscript.h,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** pythonscript.h 25 Sep 2004 19:57:12 -0000 1.42 --- pythonscript.h 26 Sep 2004 21:36:23 -0000 1.43 *************** *** 88,91 **** --- 88,92 ---- EVENT_GETSELLPRICE, EVENT_SHOWVIRTUEGUMP, + EVENT_RESURRECT, EVENT_COUNT, }; Index: basechar.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/basechar.cpp,v retrieving revision 1.151 retrieving revision 1.152 diff -C2 -d -r1.151 -r1.152 *** basechar.cpp 26 Sep 2004 12:45:53 -0000 1.151 --- basechar.cpp 26 Sep 2004 21:36:23 -0000 1.152 *************** *** 783,790 **** // corpse and if so, merge with our corpse instead of // just resurrecting ! void cBaseChar::resurrect() { if ( !isDead() ) ! return; cCorpse* corpse = 0; --- 783,793 ---- // corpse and if so, merge with our corpse instead of // just resurrecting ! bool cBaseChar::resurrect( cUObject* source ) { if ( !isDead() ) ! return false; ! ! if ( onResurrect( source ) ) ! return false; cCorpse* corpse = 0; *************** *** 898,901 **** --- 901,905 ---- this->action( action, 2, true ); } + return true; } *************** *** 2671,2674 **** --- 2675,2690 ---- } + bool cBaseChar::onResurrect( cUObject* source ) + { + bool result = false; + if (canHandleEvent(EVENT_RESURRECT)) + { + PyObject* args = Py_BuildValue( "(O&O&)", PyGetCharObject, this, PyGetObjectObject, source ); + result = callEventHandler(EVENT_RESURRECT, args); + Py_DECREF( args ); + } + return result; + } + bool cBaseChar::onCHLevelChange( unsigned int level ) { Index: pythonscript.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/pythonscript.cpp,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** pythonscript.cpp 25 Sep 2004 19:57:12 -0000 1.51 --- pythonscript.cpp 26 Sep 2004 21:36:23 -0000 1.52 *************** *** 538,541 **** --- 538,550 ---- "onShowVirtueGump", + /* + \event onResurrect + \param char The character being resurrected. + \param source The source of the resurrection. This may be None. + \condition Triggered when a character is resurrected. + \notes Return False to cancel the resurrection. + */ + "onResurrect", + 0 }; |
|
From: Incanus <inc...@us...> - 2004-09-26 21:36:35
|
Update of /cvsroot/wpdev/wolfpack/network In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13916/network Modified Files: uosocket.cpp Log Message: Added an onResurrect event. Changed char.resurrect to accept the source of the resurrection as an optional parameter. Index: uosocket.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.cpp,v retrieving revision 1.419 retrieving revision 1.420 diff -C2 -d -r1.419 -r1.420 *** uosocket.cpp 25 Sep 2004 21:15:47 -0000 1.419 --- uosocket.cpp 26 Sep 2004 21:36:23 -0000 1.420 *************** *** 3255,3260 **** if ( _player->isDead() ) { ! _player->resurrect(); ! sysMessage( tr( "You have been resurrected." ) ); } else --- 3255,3262 ---- if ( _player->isDead() ) { ! if ( _player->resurrect( item ) ) ! { ! sysMessage( tr( "You have been resurrected." ) ); ! } } else |
|
From: Incanus <inc...@us...> - 2004-09-26 21:36:35
|
Update of /cvsroot/wpdev/wolfpack/python In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13916/python Modified Files: char.cpp Log Message: Added an onResurrect event. Changed char.resurrect to accept the source of the resurrection as an optional parameter. Index: char.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/char.cpp,v retrieving revision 1.196 retrieving revision 1.197 diff -C2 -d -r1.196 -r1.197 *** char.cpp 19 Sep 2004 22:13:35 -0000 1.196 --- char.cpp 26 Sep 2004 21:36:24 -0000 1.197 *************** *** 616,619 **** --- 616,620 ---- \method char.resurrect \description Resurrect the character. + \param source Defaults to None. */ static PyObject* wpChar_resurrect( wpChar* self, PyObject* args ) *************** *** 623,627 **** Py_RETURN_FALSE; ! self->pChar->resurrect(); Py_RETURN_TRUE; --- 624,639 ---- Py_RETURN_FALSE; ! PyObject* source = Py_None; ! ! if ( !PyArg_ParseTuple( args, "|O:char.resurrect( source )", &source ) ) ! return 0; ! ! cUObject* pSource = 0; ! if ( source != Py_None ) ! { ! PyConvertObject( source, &pSource ); ! } ! ! self->pChar->resurrect( pSource ); Py_RETURN_TRUE; |
|
From: spddmn <xxx...@us...> - 2004-09-26 17:56:05
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17416/npcs/humans/vendors Modified Files: stablemaster.xml Log Message: Override vendor AI assignment with stablemaster now that Human_Stablemaster is inheriting from Human_Vendor in ai_humans.cpp Index: stablemaster.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/stablemaster.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** stablemaster.xml 26 Sep 2004 12:52:23 -0000 1.5 --- stablemaster.xml 26 Sep 2004 17:55:55 -0000 1.6 *************** *** 41,44 **** --- 41,45 ---- <npc id="stablemaster_male"> <inherit>vendor_male</inherit> + <ai>Human_Stablemaster</ai> <title context="Vendor Male Titles">the Stablemaster</title> <animallore><random min="640" max="1000"/></animallore> *************** *** 51,54 **** --- 52,56 ---- <npc id="stablemaster_female"> <inherit>vendor_female</inherit> + <ai>Human_Stablemaster</ai> <title context="Vendor Female Titles">the Stablemaster</title> <animallore><random min="640" max="1000"/></animallore> |
