From: Jaka K. <lyn...@us...> - 2011-08-27 11:28:39
|
gemrb: Infinity Engine emulator The branch master has been updated via aa948e54f3707b7276d5b6ae55570d1bfcf75eef (commit) via b588e2263267f9662f7267ccc02b222452ebf069 (commit) Summary of changes: gemrb/GUIScripts/GUICommon.py | 29 +++++++++++++++++++---------- 1 files changed, 19 insertions(+), 10 deletions(-) from 4f78ebe3acf171a4babfccd0316b80bf2076763a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=aa948e54f3707b7276d5b6ae55570d1bfcf75eef commit aa948e54f3707b7276d5b6ae55570d1bfcf75eef Author: Jaka Kranjc <lyn...@us...> Date: Sat Aug 27 13:25:45 2011 +0200 GUICommon: tiny refactoring for the druid spell exception diff --git a/gemrb/GUIScripts/GUICommon.py b/gemrb/GUIScripts/GUICommon.py index 7d6d1c9..3f9315c 100644 --- a/gemrb/GUIScripts/GUICommon.py +++ b/gemrb/GUIScripts/GUICommon.py @@ -177,12 +177,19 @@ def GetLearnablePriestSpells (Class, Alignment, Level): Learnable.append (SpellName) return Learnable +# there is no separate druid spell table in the originals +#FIXME: try to do this in a non-hard way? +def GetPriestSpellTable(tablename): + if not GemRB.HasResource (tablename, RES_2DA): + if tablename == "MXSPLDRU": + return "MXSPLPRS" + return tablename + def SetupSpellLevels (pc, TableName, Type, Level): #don't die on a missing reference - #FIXME: try to do this in a non-hard way? - if not GemRB.HasResource (TableName, RES_2DA): - if TableName == "MXSPLDRU": - SetupSpellLevels (pc, "MXSPLPRS", Type, Level) + tmp = GetPriestSpellTable(TableName) + if tmp != TableName: + SetupSpellLevels (pc, tmp, Type, Level) return Table = GemRB.LoadTable (TableName) @@ -200,10 +207,9 @@ def SetupSpellLevels (pc, TableName, Type, Level): def UnsetupSpellLevels (pc, TableName, Type, Level): #don't die on a missing reference - #FIXME: try to do this in a non-hard way? - if not GemRB.HasResource (TableName, RES_2DA): - if TableName == "MXSPLDRU": - UnsetupSpellLevels (pc, "MXSPLPRS", Type, Level) + tmp = GetPriestSpellTable(TableName) + if tmp != TableName: + UnsetupSpellLevels (pc, tmp, Type, Level) return Table = GemRB.LoadTable (TableName) http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=b588e2263267f9662f7267ccc02b222452ebf069 commit b588e2263267f9662f7267ccc02b222452ebf069 Author: Jaka Kranjc <lyn...@us...> Date: Sat Aug 27 13:17:03 2011 +0200 CanDualClass: create the lookup table manually, so adding new dualclass combinations works out of the box (or atleast for this function) diff --git a/gemrb/GUIScripts/GUICommon.py b/gemrb/GUIScripts/GUICommon.py index 36a3ca0..7d6d1c9 100644 --- a/gemrb/GUIScripts/GUICommon.py +++ b/gemrb/GUIScripts/GUICommon.py @@ -827,8 +827,11 @@ def CanDualClass(actor): ClassTitle = CommonTables.KitList.GetValue (KitIndex, 0) Row = DualClassTable.GetRowIndex (ClassTitle) - # a lookup table for the DualClassTable columns - classes = [ "FIGHTER", "CLERIC", "MAGE", "THIEF", "DRUID", "RANGER" ] + # create a lookup table for the DualClassTable columns + classes = [] + for col in range(DualClassTable.GetColumnCount()): + classes.append(DualClassTable.GetColumnName(col)) + matches = [] Sum = 0 for col in range (0, DualClassTable.GetColumnCount ()): ----------------------------------------------------------------------- This is an automated email from the git hooks/post-receive script. -- gemrb: Infinity Engine emulator |