From: <lyn...@us...> - 2009-06-06 17:40:19
|
Revision: 6323 http://gemrb.svn.sourceforge.net/gemrb/?rev=6323&view=rev Author: lynxlupodian Date: 2009-06-06 17:39:44 +0000 (Sat, 06 Jun 2009) Log Message: ----------- bg2: fixed a comment and added a debug print Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/bg2/GUIINV.py gemrb/trunk/gemrb/GUIScripts/bg2/GUISTORE.py Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUIINV.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUIINV.py 2009-06-06 17:18:43 UTC (rev 6322) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUIINV.py 2009-06-06 17:39:44 UTC (rev 6323) @@ -724,7 +724,7 @@ return def ReadItemWindow (): - """Displays the contents of a scroll.""" + """Tries to learn the mage scroll.""" pc = GemRB.GameGetSelectedPCSingle () slot = GemRB.GetVar ("ItemButton") Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUISTORE.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUISTORE.py 2009-06-06 17:18:43 UTC (rev 6322) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUISTORE.py 2009-06-06 17:39:44 UTC (rev 6323) @@ -750,6 +750,7 @@ if (Price>0) and (Flags & SHOP_SELL): if Flags & SHOP_SELECT: + print "SELECTING", GemRB.GetString(Item['ItemNameIdentified']) Button.SetState (IE_GUI_BUTTON_SELECTED) else: Button.SetState (IE_GUI_BUTTON_ENABLED) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lyn...@us...> - 2009-09-07 20:18:05
|
Revision: 7127 http://gemrb.svn.sourceforge.net/gemrb/?rev=7127&view=rev Author: lynxlupodian Date: 2009-09-07 20:17:49 +0000 (Mon, 07 Sep 2009) Log Message: ----------- bg2::cg: fixed multiclassing Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG10.py gemrb/trunk/gemrb/GUIScripts/bg2/GUICG2.py Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICG10.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG10.py 2009-09-07 16:41:55 UTC (rev 7126) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICG10.py 2009-09-07 20:17:49 UTC (rev 7127) @@ -20,6 +20,7 @@ #character generation, multi-class (GUICG10) import GemRB from LUCommon import * +from GUICG2 import SetClass ClassWindow = 0 TextAreaControl = 0 @@ -85,6 +86,7 @@ return def ClassPress(): + SetClass() Class = GemRB.GetVar("Class")-1 TextAreaControl.SetText(ClassTable.GetValue(Class,1) ) DoneButton.SetState(IE_GUI_BUTTON_ENABLED) @@ -98,6 +100,7 @@ return def NextPress(): + SetClass() if ClassWindow: ClassWindow.Unload() Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICG2.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG2.py 2009-09-07 16:41:55 UTC (rev 7126) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICG2.py 2009-09-07 20:17:49 UTC (rev 7127) @@ -113,9 +113,6 @@ return def SetClass(): - if ClassWindow: - ClassWindow.Unload() - # find the class from the class table ClassIndex = GemRB.GetVar ("Class") - 1 Class = ClassTable.GetValue (ClassIndex, 5) @@ -160,5 +157,8 @@ def NextPress (): SetClass() + if ClassWindow: + ClassWindow.Unload() + GemRB.SetNextScript("CharGen4") #alignment return This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lyn...@us...> - 2009-09-13 15:03:33
|
Revision: 7135 http://gemrb.svn.sourceforge.net/gemrb/?rev=7135&view=rev Author: lynxlupodian Date: 2009-09-13 15:03:22 +0000 (Sun, 13 Sep 2009) Log Message: ----------- bg2: hack barbies back into submission Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG2.py gemrb/trunk/gemrb/GUIScripts/bg2/GUICG22.py Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICG2.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG2.py 2009-09-13 11:01:41 UTC (rev 7134) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICG2.py 2009-09-13 15:03:22 UTC (rev 7135) @@ -116,9 +116,11 @@ # find the class from the class table ClassIndex = GemRB.GetVar ("Class") - 1 Class = ClassTable.GetValue (ClassIndex, 5) - #protect against barbarians - ClassName = ClassTable.GetRowName (ClassTable.FindValue (5, Class) ) GemRB.SetPlayerStat (MyChar, IE_CLASS, Class) + ClassName = ClassTable.GetRowName (ClassTable.FindValue (5, Class)) + # protect against barbarians; this stat will be overwritten later + GemRB.SetPlayerStat (MyChar, IE_HITPOINTS, ClassIndex) + #assign the correct XP if GameIsTOB(): GemRB.SetPlayerStat (MyChar, IE_XP, ClassSkillsTable.GetValue (ClassName, "STARTXP2")) Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICG22.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG22.py 2009-09-13 11:01:41 UTC (rev 7134) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICG22.py 2009-09-13 15:03:22 UTC (rev 7135) @@ -46,7 +46,7 @@ RaceName = RaceTable.GetRowName(RaceTable.FindValue (3, Race) ) ClassID = GemRB.GetPlayerStat (MyChar, IE_CLASS) - ClassName = ClassTable.GetRowName (ClassTable.FindValue(5, ClassID) ) + ClassName = ClassTable.GetRowName (GemRB.GetPlayerStat (MyChar, IE_HITPOINTS)) # barbarian hack KitTable = GemRB.LoadTableObject("kittable") KitTableName = KitTable.GetValue(ClassName, RaceName) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |