From: <lyn...@us...> - 2009-02-20 13:23:50
|
Revision: 5731 http://gemrb.svn.sourceforge.net/gemrb/?rev=5731&view=rev Author: lynxlupodian Date: 2009-02-20 12:49:29 +0000 (Fri, 20 Feb 2009) Log Message: ----------- bg2: simplify the class/kit ability logic Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/bg2/CharGen9.py Modified: gemrb/trunk/gemrb/GUIScripts/bg2/CharGen9.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/CharGen9.py 2009-02-20 12:27:57 UTC (rev 5730) +++ gemrb/trunk/gemrb/GUIScripts/bg2/CharGen9.py 2009-02-20 12:49:29 UTC (rev 5731) @@ -64,22 +64,18 @@ print "KitValue**********:",KitValue GemRB.SetPlayerStat (MyChar, IE_KIT, KitValue) - # apply kit abilities - TmpTable = KitTable.GetValue (str(KitIndex), "ABILITIES") - ABTable = TmpTable - if KitValue != 0x4000 and TmpTable != "*": - TmpTable = GemRB.LoadTableObject (TmpTable) - elif KitValue == 0x4000: - # classes get clab**01 - TmpTable = ClassSkillsTable (ClassName, "ABILITIES") - if TmpTable != "*" and TmpTable != ABTable: - if KitValue == 0x4000 and "," in TmpTable: - # multiclass - classes = TmpTable.split(",") - for j in classes: - AddClassAbilities (MyChar, "CLAB"+j) - else: - AddClassAbilities (MyChar, TmpTable) + # apply class/kit abilities + if KitIndex: + ABTable = KitTable.GetValue (str(KitIndex), "ABILITIES") + else: + ABTable = ClassSkillsTable.GetValue (ClassName, "ABILITIES") + if not KitIndex and "," in ABTable: + # multiclass + classes = ABTable.split(",") + for j in classes: + AddClassAbilities (MyChar, "CLAB"+j) + else: + AddClassAbilities (MyChar, ABTable) # Lay on hands # Turn undead @@ -225,6 +221,7 @@ return def AddClassAbilities (MyChar, TmpTable): + TmpTable = GemRB.LoadTableObject (TmpTable) for i in range(TmpTable.GetRowCount()): ab = TmpTable.GetValue (i, 0) # only add level 1 abilities if ab != "****": This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |