Skip to content

Commit 0b3fe35

Browse files
valdavalda
committed
Merging leveled lists became possible.
1 parent 7931d54 commit 0b3fe35

2 files changed

Lines changed: 35 additions & 58 deletions

File tree

‎Data/Bash Patches/Leveled Lists.csv‎

Lines changed: 14 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,14 @@
1-
"Mod","LevelerTags","Comments"
2-
"Bob's Armory Oblivion.esp",,"Adds new items"
3-
"DLCSpellTomes.esp","R","Keep spell tomes semi-rare."
4-
"ExnemRuneskulls.esp",,"Adds new items"
5-
"FCOM_BobItemReleveler.esp","DR","Alters lists"
6-
"FCOM_FranItemReleveler.esp","DR","Alters lists"
7-
"FCOM_FranSISpawnReleveler.esp","DR","Alters lists"
8-
"FCOM_MMMSpawnReleveler.esp","DR","Alters lists"
9-
"FCOM_OOOItemReleveler.esp","DR","Alters lists"
10-
"FCOM_OOOSpawnReleveler.esp","DR","Alters lists"
11-
"FCOM_Unity.esp","DR","Alters lists"
12-
"FCOM_WarCryItemReleveler.esp","DR","Alters lists"
13-
"Francesco's Leveled Creatures-Items Mod.esm","DR","Alters lists"
14-
"Francesco's Optional Chance of More Enemies.esp","DR","Alters lists"
15-
"Francesco's Optional Chance of Stronger Bosses.esp","DR","Alters lists"
16-
"Francesco's Optional Chance of Stronger Enemies.esp","DR","Alters lists"
17-
"Francesco's Optional Leveled Guards.esp","DR","Alters lists"
18-
"Francesco's Optional New Items Add-On.esm","DR","Alters lists"
19-
"Francesco's Optional New Creatures Add-On.esm","DR","Alters lists"
20-
"Mart's Monster Mod - Bats Addon for FCOM.esp",,"Adds new creatures"
21-
"Mart's Monster Mod - ExtraReavers.esp",,"Adds new NPC enemies"
22-
"Mart's Monster Mod - Foxes.esp",,"Adds new creatures"
23-
"Mart's Monster Mod - No Adventurers.esp","D","Removes spawns from lists"
24-
"Mart's Monster Mod - No Beholdens.esp","D","Removes spawns from lists"
25-
"Mart's Monster Mod - No Giants.esp","D","Removes spawns from lists"
26-
"Mart's Monster Mod - No Reaver Hounds.esp","D","Removes spawns from lists"
27-
"Mart's Monster Mod - No Slimes.esp","D","Removes spawns from lists"
28-
"Mart's Monster Mod - No Spiders.esp","D","Removes spawns from lists"
29-
"Mart's Monster Mod - No Werewolves.esp","D","Removes spawns from lists"
30-
"Mart's Monster Mod - Safer Roads.esp","DR","Alters lists"
31-
"Mart's Monster Mod - Spawn Rates - Increased.esp","R","Alters lists"
32-
"Mart's Monster Mod - Spawn Rates - Moderate Increased.esp","DR","Alters lists"
33-
"Mart's Monster Mod - Spawn Rates - Reduced Reduced.esp","DR","Alters lists"
34-
"Mart's Monster Mod - Spawn Rates - Reduced.esp","DR","Alters lists"
35-
"Mart's Monster Mod for FCOM.esp","DR","Alters lists"
36-
"Mart's Monster Mod for Fran.esp","DR","Alters lists"
37-
"Mart's Monster Mod for Francescos.esp","DR","Alters lists"
38-
"Mart's Monster Mod for OOO.esp","DR","Alters lists"
39-
"Mart's Monster Mod.esp","DR","Alters lists"
40-
"MOU - Hungers SI.esp",,"Adds new items"
41-
"MOU - Hungers.esp",,"Does not alter any lists"
42-
"MOU - Imps.esp","DR","Alters lists"
43-
"MOU - Leveled Lists.esp","DR","Alters lists"
44-
"MOU - Necromancers.esp","DR","Alters lists"
45-
"MOU - Ogres.esp","DR","Alters lists"
46-
"MOU - Trolls.esp","DR","Alters lists"
47-
"Oblivion WarCry EV.esp","DR","Alters lists"
48-
"Oscuro's_Oblivion_Overhaul.esp","DR","Alters lists"
49-
"Pestilent Afflictions.esp","R","Disease chances."
50-
"Unofficial Oblivion Patch.esp","DR","Fixes a a few quest reward lists."
1+
"Mod","LevelerTags","Comments"
2+
"Mart's Mutant Mod - No Corpse Flies.esp","D","Removes spawns from lists"
3+
"Mart's Mutant Mod - No Floaters.esp","D","Removes spawns from lists"
4+
"Mart's Mutant Mod - No Geckos.esp","D","Removes spawns from lists"
5+
"Mart's Mutant Mod - No Wanamingos.esp","D","Removes spawns from lists"
6+
"Mart's Mutant Mod - Increased Spawns.esp","R","Alters lists"
7+
"Mart's Mutant Mod - Increased Increased Spawns.esp","R","Alters lists"
8+
"Mart's Mutant Mod - Feral Ghoul Rampage.esp","R","Alters lists"
9+
"Mart's Mutant Mod - Reduced Wasteland Spawns.esp","DR","Alters lists"
10+
"Mart's Mutant Mod.esp","DR","Alters lists"
11+
"FOOK2 - Main.esp","DR","Alters lists"
12+
"FO3 Wanderers Edition - Main File.esp","DR","Alters lists"
13+
"FO3 Wanderers Edition - Optional Worn Weapons.esp",,"Adds new items"
14+
"Unofficial Fallout 3 Patch.esm","DR","Fixes a a few quest reward lists."

‎Mopy/bosh.py‎

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1997,24 +1997,37 @@ def loadData(self,record,ins,type,size,readId):
19971997
record.flags.calcFromAllLevels = True
19981998
record.chanceNone &= 127
19991999

2000-
class MelLevListLvlo(MelStructs):
2000+
class MelLevListLvlo(MelStruct):
20012001
"""Subclass to support alternate format."""
20022002
def loadData(self,record,ins,type,size,readId):
2003-
target = self.getDefault()
2004-
record.__getattribute__(self.attr).append(target)
2005-
target.__slots__ = self.attrs
2006-
format,attrs = ((self.format,self.attrs),('iI',('level','listId'),))[size==8]####might be h2sI
2003+
if size == 12:
2004+
MelStruct.loadData(self,record,ins,type,size,readId)
2005+
return
2006+
elif size == 8:
2007+
format,attrs = ('iI',('level','listId'))####might be h2sI
2008+
else:
2009+
raise "Unexpected size encountered for LVLO subrecord: %s" % size
20072010
unpacked = ins.unpack(format,size,readId)
2008-
setter = target.__setattr__
2009-
map(setter,attrs,unpacked)
2011+
setter = record.__setattr__
2012+
for attr,value,action in zip(attrs,unpacked,self.actions):
2013+
if callable(action): value = action(value)
2014+
setter(attr,value)
2015+
if self._debug: print unpacked
20102016
#--Element Set
20112017
melSet = MelSet(
20122018
MelString('EDID','eid'),
2019+
MelStruct('OBND','=6h',
2020+
'corner0X','corner0Y','corner0Z',
2021+
'corner1X','corner1Y','corner1Z'),
20132022
MelLevListLvld('LVLD','B','chanceNone'),
20142023
MelStruct('LVLF','B',(_flags,'flags',0L)),
20152024
MelFid('SCRI','script'),
20162025
MelFid('TNAM','template'),
2017-
MelLevListLvlo('LVLO','h2sIh2s','entries','level',('unused1',null2),(FID,'listId',None),('count',1),('unused2',null2)),
2026+
MelFid('LVLG','global'),
2027+
MelGroups('entries',
2028+
MelLevListLvlo('LVLO','h2sIh2s','level',('unused1',null2),(FID,'listId',None),('count',1),('unused2',null2)),
2029+
MelOptStruct('COED','IIf',(FID,'owner',None),(FID,'glob',None),('condition',1.0)),
2030+
),
20182031
MelNull('DATA'),
20192032
)
20202033
__slots__ = (MelRecord.__slots__ + melSet.getSlotsUsed() +

0 commit comments

Comments
 (0)