[wpdev-commits] xmlscripts/scripts/system loot.py,1.19,1.20 lootlists.py,1.8,1.9
Brought to you by:
rip,
thiagocorrea
Menu
▾
▴
[wpdev-commits] xmlscripts/scripts/system loot.py,1.19,1.20 lootlists.py,1.8,1.9
|
From: Sebastian H. <dar...@us...> - 2004-09-27 14:37:47
|
Update of /cvsroot/wpdev/xmlscripts/scripts/system In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18250/system Modified Files: loot.py lootlists.py Log Message: random magic item loot and additional properties Index: loot.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/loot.py,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** loot.py 21 Sep 2004 14:01:22 -0000 1.19 --- loot.py 27 Sep 2004 14:37:27 -0000 1.20 *************** *** 3,7 **** from wolfpack.consts import * from system.lootlists import * ! from wolfpack import console, utilities import random --- 3,7 ---- from wolfpack.consts import * from system.lootlists import * ! from wolfpack import console, utilities, properties import random *************** *** 11,14 **** --- 11,17 ---- PACK_AMOUNT = 2 PACK_STACKABLE = 3 + PACK_MAXPROPERTIES = 4 + PACK_MININTENSITY = 5 + PACK_MAXINTENSITY = 6 # Lootpacks *************** *** 27,83 **** 'lootpack_poor': [ [1.0, 'eed', [11, 20], 1], # Gold ! [0.0002, DEF_INSTRUMENTS, 1, 0 ] # Slayer Instruments ! #[0.0002, 'RANDOM_MAGIC_ITEM', 1, 0 ] # [0% -> 90%] 5 max properties ], 'lootpack_meager': [ [1.0, 'eed', [11, 20], 1], # Gold ! [0.001, DEF_INSTRUMENTS, 1, 0 ] # Slayer Instruments ! #[0.01, 'RANDOM_MAGIC_ITEM', 1, 0 ], # [0% -> 10%] 2 max properties ! #[0.002, 'RANDOM_MAGIC_ITEM', 1, 0 ] # [0% -> 90%] 5 max properties ], 'lootpack_average': [ [1.0, 'eed', [55, 100], 1], # Gold ! [0.004, DEF_INSTRUMENTS, 1, 0 ] # Slayer Instruments ! #[0.05, 'RANDOM_MAGIC_ITEM', 1, 0 ], # [0% -> 20%] 4 max properties ! #[0.02, 'RANDOM_MAGIC_ITEM', 1, 0 ], # [0% -> 50%] 3 max properties ! #[0.005, 'RANDOM_MAGIC_ITEM', 1, 0 ] # [0% -> 90%] 5 max properties ], 'lootpack_rich': [ [1.0, 'eed', [160, 250], 1], # Gold ! [0.01, DEF_INSTRUMENTS, 1, 0 ] # Slayer Instruments ! #[0.2, 'RANDOM_MAGIC_ITEM', 1, 0 ], # [0% -> 40%] 4 max properties ! #[0.1, 'RANDOM_MAGIC_ITEM', 1, 0 ], # [0% -> 60%] 5 max properties ! #[0.01, 'RANDOM_MAGIC_ITEM', 1, 0 ] # [0% -> 90%] 5 max properties ], 'lootpack_filthy_rich': [ [1.0, 'eed', [202, 400], 1], # Gold ! [0.02, DEF_INSTRUMENTS, 1, 0 ] # Slayer Instruments ! #[0.33, 'RANDOM_MAGIC_ITEM', 1, 0 ], # [0% -> 50%] 4 max properties ! #[0.33, 'RANDOM_MAGIC_ITEM', 1, 0 ], # [0% -> 60%] 4 max properties ! #[0.2, 'RANDOM_MAGIC_ITEM', 1, 0 ], # [0% -> 75%] 5 max properties ! #[0.05, 'RANDOM_MAGIC_ITEM', 1, 0 ] # [0% -> 100%] 5 max properties ], 'lootpack_ultra_rich': [ [1.0, 'eed', [505, 1000], 1], # Gold ! [0.02, DEF_INSTRUMENTS, 1, 0 ] # Slayer Instruments ! #[1.0, 'RANDOM_MAGIC_ITEM', 1, 0 ], # [25% -> 100%] 5 max properties ! #[1.0, 'RANDOM_MAGIC_ITEM', 1, 0 ], # [25% -> 100%] 5 max properties ! #[1.0, 'RANDOM_MAGIC_ITEM', 1, 0 ], # [25% -> 100%] 5 max properties ! #[1.0, 'RANDOM_MAGIC_ITEM', 1, 0 ], # [25% -> 100%] 5 max properties ! #[1.0, 'RANDOM_MAGIC_ITEM', 1, 0 ] # [35% -> 100%] 5 max properties ], 'lootpack_super_boss': [ [1.0, 'eed', [505, 1000], 1], # Gold ! [0.02, DEF_INSTRUMENTS, 1, 0 ] # Slayer Instruments ! #[1.0, 'RANDOM_MAGIC_ITEM', 1, 0 ], # [25% -> 100%] 5 max properties ! #[1.0, 'RANDOM_MAGIC_ITEM', 1, 0 ], # [25% -> 100%] 5 max properties ! #[1.0, 'RANDOM_MAGIC_ITEM', 1, 0 ], # [25% -> 100%] 5 max properties ! #[1.0, 'RANDOM_MAGIC_ITEM', 1, 0 ], # [25% -> 100%] 5 max properties ! #[1.0, 'RANDOM_MAGIC_ITEM', 1, 0 ] # [35% -> 100%] 5 max properties ! #[1.0, 'RANDOM_MAGIC_ITEM', 1, 0 ], # [35% -> 100%] 5 max properties ! #[1.0, 'RANDOM_MAGIC_ITEM', 1, 0 ], # [35% -> 100%] 5 max properties ! #[1.0, 'RANDOM_MAGIC_ITEM', 1, 0 ], # [35% -> 100%] 5 max properties ! #[1.0, 'RANDOM_MAGIC_ITEM', 1, 0 ], # [50% -> 100%] 5 max properties ! #[1.0, 'RANDOM_MAGIC_ITEM', 1, 0 ] # [50% -> 100%] 5 max properties ], # Gold Packs --- 30,86 ---- 'lootpack_poor': [ [1.0, 'eed', [11, 20], 1], # Gold ! [0.0002, DEF_INSTRUMENTS, 1, 0 ], # Slayer Instruments ! [0.0002, 'RANDOM_MAGIC_ITEM', 1, 0 , 5, 0, 90] ], 'lootpack_meager': [ [1.0, 'eed', [11, 20], 1], # Gold ! [0.001, DEF_INSTRUMENTS, 1, 0 ], # Slayer Instruments ! [0.01, 'RANDOM_MAGIC_ITEM', 1, 0, 2, 0, 10 ], # [0% -> 10%] 2 max properties ! [0.002, 'RANDOM_MAGIC_ITEM', 1, 0, 5, 0, 90 ] # [0% -> 90%] 5 max properties ], 'lootpack_average': [ [1.0, 'eed', [55, 100], 1], # Gold ! [0.004, DEF_INSTRUMENTS, 1, 0 ], # Slayer Instruments ! [0.05, 'RANDOM_MAGIC_ITEM', 1, 0, 4, 0, 20 ], # [0% -> 20%] 4 max properties ! [0.02, 'RANDOM_MAGIC_ITEM', 1, 0, 3, 0, 50 ], # [0% -> 50%] 3 max properties ! [0.005, 'RANDOM_MAGIC_ITEM', 1, 0, 5, 0, 90 ] # [0% -> 90%] 5 max properties ], 'lootpack_rich': [ [1.0, 'eed', [160, 250], 1], # Gold ! [0.01, DEF_INSTRUMENTS, 1, 0 ], # Slayer Instruments ! [0.2, 'RANDOM_MAGIC_ITEM', 1, 0, 4, 0, 40 ], # [0% -> 40%] 4 max properties ! [0.1, 'RANDOM_MAGIC_ITEM', 1, 0, 5, 0, 60 ], # [0% -> 60%] 5 max properties ! [0.01, 'RANDOM_MAGIC_ITEM', 1, 0, 5, 0, 90 ] # [0% -> 90%] 5 max properties ], 'lootpack_filthy_rich': [ [1.0, 'eed', [202, 400], 1], # Gold ! [0.02, DEF_INSTRUMENTS, 1, 0 ], # Slayer Instruments ! [0.33, 'RANDOM_MAGIC_ITEM', 1, 0, 4, 0, 50 ], # [0% -> 50%] 4 max properties ! [0.33, 'RANDOM_MAGIC_ITEM', 1, 0, 4, 0, 60 ], # [0% -> 60%] 4 max properties ! [0.2, 'RANDOM_MAGIC_ITEM', 1, 0, 5, 0, 75 ], # [0% -> 75%] 5 max properties ! [0.05, 'RANDOM_MAGIC_ITEM', 1, 0, 5, 0, 100 ] # [0% -> 100%] 5 max properties ], 'lootpack_ultra_rich': [ [1.0, 'eed', [505, 1000], 1], # Gold ! [0.02, DEF_INSTRUMENTS, 1, 0 ], # Slayer Instruments ! [1.0, 'RANDOM_MAGIC_ITEM', 1, 0, 5, 25, 100 ], # [25% -> 100%] 5 max properties ! [1.0, 'RANDOM_MAGIC_ITEM', 1, 0, 5, 25, 100 ], # [25% -> 100%] 5 max properties ! [1.0, 'RANDOM_MAGIC_ITEM', 1, 0, 5, 25, 100 ], # [25% -> 100%] 5 max properties ! [1.0, 'RANDOM_MAGIC_ITEM', 1, 0, 5, 25, 100 ], # [25% -> 100%] 5 max properties ! [1.0, 'RANDOM_MAGIC_ITEM', 1, 0, 5, 35, 100 ] # [35% -> 100%] 5 max properties ], 'lootpack_super_boss': [ [1.0, 'eed', [505, 1000], 1], # Gold ! [0.02, DEF_INSTRUMENTS, 1, 0 ], # Slayer Instruments ! [1.0, 'RANDOM_MAGIC_ITEM', 1, 0, 5, 25, 100 ], # [25% -> 100%] 5 max properties ! [1.0, 'RANDOM_MAGIC_ITEM', 1, 0, 5, 25, 100 ], # [25% -> 100%] 5 max properties ! [1.0, 'RANDOM_MAGIC_ITEM', 1, 0, 5, 25, 100 ], # [25% -> 100%] 5 max properties ! [1.0, 'RANDOM_MAGIC_ITEM', 1, 0, 5, 25, 100 ], # [25% -> 100%] 5 max properties ! [1.0, 'RANDOM_MAGIC_ITEM', 1, 0, 5, 35, 100 ], # [35% -> 100%] 5 max properties ! [1.0, 'RANDOM_MAGIC_ITEM', 1, 0, 5, 35, 100 ], # [35% -> 100%] 5 max properties ! [1.0, 'RANDOM_MAGIC_ITEM', 1, 0, 5, 35, 100 ], # [35% -> 100%] 5 max properties ! [1.0, 'RANDOM_MAGIC_ITEM', 1, 0, 5, 35, 100 ], # [35% -> 100%] 5 max properties ! [1.0, 'RANDOM_MAGIC_ITEM', 1, 0, 5, 50, 100 ], # [50% -> 100%] 5 max properties ! [1.0, 'RANDOM_MAGIC_ITEM', 1, 0, 5, 50, 100 ] # [50% -> 100%] 5 max properties ], # Gold Packs *************** *** 466,469 **** --- 469,477 ---- # def createpack(char, killer, corpse, pack): + if killer: + luckChance = properties.luckchance(killer) + else: + luckChance = 0 + # A pack is actually a list of lists for item in pack: *************** *** 473,478 **** --- 481,495 ---- packitem = item[ PACK_ITEM ] + spawn = False if packchance >= random.random(): + spawn = True + + # There is a chance that the item will spawn anyway if the luck check + # succeeds + if not spawn: + spawn = luckChance > random.randint(0, 9999) + + if spawn: if type( packamount ) == str: amount = utilities.rolldice( packamount ) *************** *** 498,503 **** elif type( packitem ) == str: itemid = str( packitem ) ! ! item = wolfpack.additem(itemid) dropitem(item, char, corpse) --- 515,528 ---- elif type( packitem ) == str: itemid = str( packitem ) ! ! if itemid == 'RANDOM_MAGIC_ITEM': ! maxproperties = item[ PACK_MAXPROPERTIES ] ! minintensity = item[ PACK_MININTENSITY ] ! maxintensity = item[ PACK_MAXINTENSITY ] ! item = wolfpack.additem(random.choice(RANDOM_MAGIC_ITEMS)) ! properties.applyRandom(item, maxproperties, minintensity, maxintensity, luckChance) ! else: ! item = wolfpack.additem(itemid) ! dropitem(item, char, corpse) Index: lootlists.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/lootlists.py,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** lootlists.py 7 Jun 2004 21:53:27 -0000 1.8 --- lootlists.py 27 Sep 2004 14:37:27 -0000 1.9 *************** *** 36,39 **** --- 36,40 ---- DEF_SHIELDS = ['1b72', '1b73', '1bc3', '1b76', '1b77', '1b74', '1b75', '1b7b', '1bc4', '1bc5', '1b78', '1b79', '1b79'] DEF_ORCHEADGEAR = DEF_ORCMASKS + DEF_ORCHELMS + DEF_ARMOR = DEF_LEATHER + DEF_STUDDED + DEF_CHAINMAIL + DEF_RINGMAIL + DEF_BONEMAIL + DEF_PLATEMAIL + DEF_HELMS DEF_ALLARMOR = DEF_HATS + DEF_LEATHER + DEF_STUDDED + DEF_CHAINMAIL + DEF_RINGMAIL + DEF_BONEMAIL + DEF_PLATEMAIL + DEF_DRAGONMAIL + DEF_HELMS + DEF_SHIELDS + DEF_SHIELDS *************** *** 113,114 **** --- 114,118 ---- # + RANDOM_MAGIC_ITEMS = DEF_ARMOR + DEF_ARMOR + DEF_ARMOR + DEF_ARMOR + RANDOM_MAGIC_ITEMS += DEF_SHIELDS + DEF_JEWELERY + RANDOM_MAGIC_ITEMS += DEF_ALLWEAPONS + DEF_ALLWEAPONS + DEF_ALLWEAPONS + DEF_ALLWEAPONS |
