Menu
▾
▴
[Gemrb-commits] gemrb/gemrb/GUIScripts/bg2 GUICG13.py,1.9,1.10 GUICommonWindows.py,1.3,1.4 GUIINV.py,1.3,1.4 GUIMA.py,1.3,1.4 GUIMG.py,1.1,1.2 GUIOPT.py,1.1,1.2 GUIPR.py,1.1,1.2 GUIREC.py,1.5,1.6 MessageWindow.py,1.16,1.17
Update of /cvsroot/gemrb/gemrb/gemrb/GUIScripts/bg2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24844/bg2 Modified Files: GUICG13.py GUICommonWindows.py GUIINV.py GUIMA.py GUIMG.py GUIOPT.py GUIPR.py GUIREC.py MessageWindow.py Log Message: tob/soa script update Index: GUICG13.py =================================================================== RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/bg2/GUICG13.py,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** GUICG13.py 28 Aug 2004 20:36:38 -0000 1.9 --- GUICG13.py 3 Sep 2004 23:23:34 -0000 1.10 *************** *** 33,37 **** GemRB.SetButtonPLT(ColorWindow, PDollButton, ResRef, ! Color2, Color1, Color3, Color4, 0,0,0,0) return --- 33,37 ---- GemRB.SetButtonPLT(ColorWindow, PDollButton, ResRef, ! Color2, Color1, Color3, 0,0 ,Color4,0,0) return Index: GUIMG.py =================================================================== RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/bg2/GUIMG.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** GUIMG.py 26 Aug 2004 19:05:40 -0000 1.1 --- GUIMG.py 3 Sep 2004 23:23:34 -0000 1.2 *************** *** 27,31 **** from GUIDefines import * - #from GUICommonWindows import OpenCommonWindows, CloseCommonWindows #import GUICommonWindows --- 27,30 ---- *************** *** 46,50 **** GemRB.LoadWindowPack ("GUIMG") ! MageWindow = Window = GemRB.LoadWindow (3) GemRB.SetVar ("OtherWindow", MageWindow) --- 45,49 ---- GemRB.LoadWindowPack ("GUIMG") ! MageWindow = Window = GemRB.LoadWindow (2) GemRB.SetVar ("OtherWindow", MageWindow) Index: GUICommonWindows.py =================================================================== RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/bg2/GUICommonWindows.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** GUICommonWindows.py 28 Aug 2004 21:11:46 -0000 1.3 --- GUICommonWindows.py 3 Sep 2004 23:23:34 -0000 1.4 *************** *** 23,28 **** import GemRB - import ie_stats from GUIDefines import * FRAME_PC_SELECTED = 0 --- 23,28 ---- import GemRB from GUIDefines import * + from ie_stats import * FRAME_PC_SELECTED = 0 *************** *** 86,90 **** # Priest Button = GemRB.GetControl (Window, 6) ! GemRB.SetTooltip (Window, Button, 16310) GemRB.SetButtonFlags(Window, Button, IE_GUI_BUTTON_RADIOBUTTON, OP_OR) GemRB.SetVarAssoc(Window, Button, "SelectedWindow", 6) --- 86,90 ---- # Priest Button = GemRB.GetControl (Window, 6) ! GemRB.SetTooltip (Window, Button, 14930) GemRB.SetButtonFlags(Window, Button, IE_GUI_BUTTON_RADIOBUTTON, OP_OR) GemRB.SetVarAssoc(Window, Button, "SelectedWindow", 6) *************** *** 131,139 **** Button = GemRB.GetControl (Window, 4) GemRB.SetTooltip (Window, Button, 44945) def GetActorPaperDoll (actor): PortraitTable = GemRB.LoadTable ("PDOLLS") ! anim_id = GemRB.GetPlayerStat (actor, ie_stats.IE_ANIMATION_ID) ! level = GemRB.GetPlayerStat (actor, ie_stats.IE_ARMOR_TYPE) row = "0x%04X" %anim_id which = "LEVEL%d" %(level+1) --- 131,158 ---- Button = GemRB.GetControl (Window, 4) GemRB.SetTooltip (Window, Button, 44945) + return + + def GetActorClassTitle (actor): + ClassTitle = GemRB.GetPlayerStat (actor, IE_TITLE1) + KitIndex = GemRB.GetPlayerStat (actor, IE_KIT) & 0xfff + Class = GemRB.GetPlayerStat (actor, IE_CLASS) + ClassTable = GemRB.LoadTable ("classes") + KitTable = GemRB.LoadTable ("kitlist") + + if ClassTitle==0: + if KitIndex == 0: + ClassTitle=GemRB.GetTableValue(ClassTable, Class, 2) + else: + ClassTitle=GemRB.GetTableValue(KitTable, KitIndex, 2) + + GemRB.UnloadTable (ClassTable) + GemRB.UnloadTable (KitTable) + print "TITLE:", ClassTitle + return ClassTitle def GetActorPaperDoll (actor): PortraitTable = GemRB.LoadTable ("PDOLLS") ! anim_id = GemRB.GetPlayerStat (actor, IE_ANIMATION_ID) ! level = GemRB.GetPlayerStat (actor, IE_ARMOR_TYPE) row = "0x%04X" %anim_id which = "LEVEL%d" %(level+1) Index: GUIPR.py =================================================================== RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/bg2/GUIPR.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** GUIPR.py 26 Aug 2004 19:05:40 -0000 1.1 --- GUIPR.py 3 Sep 2004 23:23:34 -0000 1.2 *************** *** 29,34 **** --- 29,38 ---- #from GUICommonWindows import OpenCommonWindows, CloseCommonWindows #import GUICommonWindows + from GUICommonWindows import SetSelectionChangeHandler PriestWindow = None + PriestSpellInfoWindow = None + PriestSpellLevel = 0 + PriestSpellUnmemorizeWindow = None *************** *** 43,55 **** GemRB.SetVar ("OtherWindow", -1) GemRB.UnhideGUI () return GemRB.LoadWindowPack ("GUIPR") ! PriestWindow = Window = GemRB.LoadWindow (3) GemRB.SetVar ("OtherWindow", PriestWindow) GemRB.UnhideGUI () ################################################### --- 47,297 ---- GemRB.SetVar ("OtherWindow", -1) + SetSelectionChangeHandler (None) GemRB.UnhideGUI () return GemRB.LoadWindowPack ("GUIPR") ! PriestWindow = Window = GemRB.LoadWindow (2) GemRB.SetVar ("OtherWindow", PriestWindow) + Button = GemRB.GetControl (Window, 1) + GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "PriestPrevLevelPress") + + Button = GemRB.GetControl (Window, 2) + GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "PriestNextLevelPress") + + #setup level buttons + for i in range (7): + Button = GemRB.GetControl (Window, 55 + i) + GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "RefreshPriestLevel") + GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_RADIOBUTTON, OP_OR) + + for i in range (7): + Button = GemRB.GetControl (Window, 55 + i) + GemRB.SetVarAssoc (Window, Button, "PriestSpellLevel", i) + + # Setup book spells buttons + for i in range (12): + Button = GemRB.GetControl (Window, 3 + i) + GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_LOCKED, OP_OR) + + # Setup memorized spells buttons + for i in range (12): + Button = GemRB.GetControl (Window, 27 + i) + GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_LOCKED, OP_OR) + GemRB.SetButtonBorder (Window, Button, 0, 0, 0, 0, 0, 0, 0, 0, 160, 0, 1) + + + SetSelectionChangeHandler (UpdatePriestWindow) + UpdatePriestWindow () + + GemRB.UnhideGUI () + + + def UpdatePriestWindow (): + global PriestMemorizedSpellList, PriestKnownSpellList + + PriestMemorizedSpellList = [] + PriestKnownSpellList = [] + + Window = PriestWindow + pc = GemRB.GameGetSelectedPCSingle () + type = IE_SPELL_TYPE_PRIEST + level = PriestSpellLevel + # FIXME: how to calculate it??? + max_mem_cnt = 0 + + Label = GemRB.GetControl (Window, 0x10000032) + GemRB.SetText (Window, Label, GemRB.GetString(12137)+str(level+1) ) + + Name = GemRB.GetPlayerName (pc, 0) + Label = GemRB.GetControl (Window, 0x10000035) + GemRB.SetText (Window, Label, Name) + + mem_cnt = GemRB.GetMemorizedSpellsCount (pc, type, level) + for i in range (12): + Button = GemRB.GetControl (Window, 3 + i) + GemRB.SetButtonBorder (Window, Button, 0, 0, 0, 0, 0, 0, 0, 0, 160, 0, 1) + if i < mem_cnt: + ms = GemRB.GetMemorizedSpell (pc, type, level, i) + GemRB.SetSpellIcon (Window, Button, ms['SpellResRef']) + GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_NAND) + if ms['Flags']: + GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenPriestSpellUnmemorizeWindow") + else: + GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OnPriestUnmemorizeSpell") + GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_RIGHT_PRESS, "OpenPriestSpellInfoWindow") + spell = GemRB.GetSpell (ms['SpellResRef']) + GemRB.SetTooltip (Window, Button, spell['SpellName']) + PriestMemorizedSpellList.append (ms['SpellResRef']) + GemRB.SetVarAssoc (Window, Button, "SpellButton", i) + GemRB.EnableButtonBorder (Window, Button, 0, ms['Flags'] == 0) + else: + if i < max_mem_cnt: + GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_NAND) + GemRB.SetButtonSprites (Window, Button, "IVSLOT", 0, 0, 0, 0, 0) + else: + GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_OR) + GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "") + GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_RIGHT_PRESS, "") + GemRB.SetTooltip (Window, Button, '') + GemRB.EnableButtonBorder (Window, Button, 0, 0) + + + known_cnt = GemRB.GetKnownSpellsCount (pc, type, level) + for i in range (12): + Button = GemRB.GetControl (Window, 27 + i) + if i < known_cnt: + ks = GemRB.GetKnownSpell (pc, type, level, i) + GemRB.SetSpellIcon (Window, Button, ks['SpellResRef']) + GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_NAND) + GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OnPriestMemorizeSpell") + GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_RIGHT_PRESS, "OpenPriestSpellInfoWindow") + spell = GemRB.GetSpell (ks['SpellResRef']) + GemRB.SetTooltip (Window, Button, spell['SpellName']) + PriestKnownSpellList.append (ks['SpellResRef']) + GemRB.SetVarAssoc (Window, Button, "SpellButton", 100 + i) + + else: + GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_OR) + GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "") + GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_RIGHT_PRESS, "") + GemRB.SetTooltip (Window, Button, '') + return + + + def PriestPrevLevelPress (): + global PriestSpellLevel + + if PriestSpellLevel > 0: + PriestSpellLevel = PriestSpellLevel - 1 + UpdatePriestWindow () + return + + + def PriestNextLevelPress (): + global PriestSpellLevel + + if PriestSpellLevel < 6: + PriestSpellLevel = PriestSpellLevel + 1 + UpdatePriestWindow () + return + + def RefreshPriestLevel (): + global PriestSpellLevel + + PriestSpellLevel = GemRB.GetVar ("PriestSpellLevel") + UpdatePriestWindow () + return + + def OpenPriestSpellInfoWindow (): + global PriestSpellInfoWindow + + GemRB.HideGUI () + + if PriestSpellInfoWindow != None: + GemRB.UnloadWindow (PriestSpellInfoWindow) + PriestSpellInfoWindow = None + GemRB.SetVar ("FloatWindow", -1) + + GemRB.UnhideGUI () + return + + PriestSpellInfoWindow = Window = GemRB.LoadWindow (3) + GemRB.SetVar ("FloatWindow", PriestSpellInfoWindow) + + Button = GemRB.GetControl (Window, 5) + GemRB.SetText (Window, Button, 1403) + GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenPriestSpellInfoWindow") + + index = GemRB.GetVar ("SpellButton") + if index < 100: + ResRef = PriestMemorizedSpellList[index] + else: + ResRef = PriestKnownSpellList[index - 100] + + spell = GemRB.GetSpell (ResRef) + + Label = GemRB.GetControl (Window, 0x0fffffff) + GemRB.SetText (Window, Label, spell['SpellName']) + + Button = GemRB.GetControl (Window, 2) + GemRB.SetSpellIcon (Window, Button, ResRef) + + Text = GemRB.GetControl (Window, 3) + GemRB.SetText (Window, Text, spell['SpellDesc']) + + #IconResRef = 'SPL' + spell['SpellbookIcon'][2:] + + #Button = GemRB.GetControl (Window, 5) + #GemRB.SetButtonSprites (Window, Button, IconResRef, 0, 0, 0, 0, 0) + + GemRB.UnhideGUI () + GemRB.ShowModal (Window, MODAL_SHADOW_GRAY) + return + + + def OnPriestMemorizeSpell (): + pc = GemRB.GameGetSelectedPCSingle () + level = PriestSpellLevel + type = IE_SPELL_TYPE_PRIEST + + index = GemRB.GetVar ("SpellButton") - 100 + + if GemRB.MemorizeSpell (pc, type, level, index): + UpdatePriestWindow () + return + + + def OpenPriestSpellUnmemorizeWindow (): + global PriestSpellUnmemorizeWindow + GemRB.HideGUI () + + if PriestSpellUnmemorizeWindow != None: + GemRB.UnloadWindow (PriestSpellUnmemorizeWindow) + PriestSpellUnmemorizeWindow = None + GemRB.SetVar ("FloatWindow", -1) + + GemRB.UnhideGUI () + return + + PriestSpellUnmemorizeWindow = Window = GemRB.LoadWindow (5) + GemRB.SetVar ("FloatWindow", PriestSpellUnmemorizeWindow) + + # "Are you sure you want to ....?" + TextArea = GemRB.GetControl (Window, 2) + GemRB.SetText (Window, TextArea, 50450) + + # Remove + Button = GemRB.GetControl (Window, 0) + GemRB.SetText (Window, Button, 42514) + GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OnPriestUnmemorizeSpell") + + # Cancel + Button = GemRB.GetControl (Window, 1) + GemRB.SetText (Window, Button, 4196) + GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenPriestSpellUnmemorizeWindow") + + GemRB.UnhideGUI () + GemRB.ShowModal (Window, MODAL_SHADOW_GRAY) + return + + + def OnPriestUnmemorizeSpell (): + if PriestSpellUnmemorizeWindow: + OpenPriestSpellUnmemorizeWindow () + + pc = GemRB.GameGetSelectedPCSingle () + level = PriestSpellLevel + type = IE_SPELL_TYPE_PRIEST + + index = GemRB.GetVar ("SpellButton") + + if GemRB.UnmemorizeSpell (pc, type, level, index): + UpdatePriestWindow () + return + ################################################### Index: GUIMA.py =================================================================== RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/bg2/GUIMA.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** GUIMA.py 28 Aug 2004 20:36:38 -0000 1.3 --- GUIMA.py 3 Sep 2004 23:23:34 -0000 1.4 *************** *** 27,31 **** from GUIDefines import * - #from GUICommonWindows import OpenCommonWindows, CloseCommonWindows #import GUICommonWindows --- 27,30 ---- *************** *** 118,122 **** # Done Button = GemRB.GetControl (Window, 0) - GemRB.SetText (Window, Button, 1403) if Travel: GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenWorldMapWindow") --- 117,120 ---- Index: MessageWindow.py =================================================================== RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/bg2/MessageWindow.py,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** MessageWindow.py 26 Aug 2004 19:05:40 -0000 1.16 --- MessageWindow.py 3 Sep 2004 23:23:34 -0000 1.17 *************** *** 2,6 **** from GUICommonWindows import * - from GUIJRNL import * from GUIMA import * --- 2,5 ---- *************** *** 26,30 **** ActionsWindow = GemRB.LoadWindow(3) PortraitWindow = GemRB.LoadWindow(1) - PopulatePortraitWindow() OptionsWindow = GemRB.LoadWindow(0) MessageWindow = GemRB.LoadWindow(4) --- 25,28 ---- *************** *** 56,59 **** --- 54,58 ---- GemRB.SetVar("MessageWindowSize", 0) + PopulatePortraitWindow(PortraitWindow) SetupActionsWindowControls (ActionsWindow) SetupMenuWindowControls (OptionsWindow) *************** *** 188,202 **** GemRB.SetEvent(MessageWindow, ContractButton, IE_GUI_BUTTON_ON_PRESS, "OnDecreaseSize") return - - def PopulatePortraitWindow (): - Window = PortraitWindow - - for i in range (0,5): - Button = GemRB.GetControl (Window, i) - GemRB.SetVarAssoc (Window, Button, "SelectedSingle", i) - GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "PortraitButtonOnPress") - - pic = GemRB.GetPlayerPortrait (i+1,1) - GemRB.SetButtonPicture(Window, Button, pic) - GemRB.SetButtonFlags(Window, Button, IE_GUI_BUTTON_PICTURE, OP_SET) - --- 187,188 ---- Index: GUIINV.py =================================================================== RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/bg2/GUIINV.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** GUIINV.py 28 Aug 2004 21:11:46 -0000 1.3 --- GUIINV.py 3 Sep 2004 23:23:34 -0000 1.4 *************** *** 27,32 **** from ie_stats import * import GemRB ! from GUICommonWindows import GetActorPaperDoll, SetSelectionChangeHandler ! #import GUICommonWindows InventoryWindow = None --- 27,32 ---- from ie_stats import * import GemRB ! from GUICommonWindows import GetActorClassTitle, GetActorPaperDoll ! from GUICommonWindows import SetSelectionChangeHandler InventoryWindow = None *************** *** 235,239 **** # name ! Label = GemRB.GetControl (Window, 0x10000039) GemRB.SetText (Window, Label, GemRB.GetPlayerName (pc, 0)) --- 235,239 ---- # name ! Label = GemRB.GetControl (Window, 0x10000032) GemRB.SetText (Window, Label, GemRB.GetPlayerName (pc, 0)) *************** *** 244,249 **** Color3 = GemRB.GetPlayerStat (pc, IE_MAJOR_COLOR) Color4 = GemRB.GetPlayerStat (pc, IE_MINOR_COLOR) GemRB.SetButtonPLT (Window, Button, GetActorPaperDoll (pc), ! Color2, Color1, Color3, Color4, 0, 0, 0, 0) # encumbrance --- 244,252 ---- Color3 = GemRB.GetPlayerStat (pc, IE_MAJOR_COLOR) Color4 = GemRB.GetPlayerStat (pc, IE_MINOR_COLOR) + Color5 = GemRB.GetPlayerStat (pc, IE_LEATHER_COLOR) + Color6 = GemRB.GetPlayerStat (pc, IE_METAL_COLOR) + Color7 = GemRB.GetPlayerStat (pc, IE_ARMOR_COLOR) GemRB.SetButtonPLT (Window, Button, GetActorPaperDoll (pc), ! Color2, Color1, Color3, Color6, Color5, Color4, Color7, 0) # encumbrance *************** *** 270,277 **** GemRB.SetText (Window, Label, str (GemRB.GameGetPartyGold ())) ! # class (but this is set by a stat) ! text = GemRB.GetPlayerStat (pc, IE_TITLE1) Label = GemRB.GetControl (Window, 0x10000042) ! GemRB.SetText (Window, Label, text) Button = GemRB.GetControl (Window, 62); --- 273,280 ---- GemRB.SetText (Window, Label, str (GemRB.GameGetPartyGold ())) ! # class ! ClassTitle = GetActorClassTitle (pc) Label = GemRB.GetControl (Window, 0x10000042) ! GemRB.SetText (Window, Label, ClassTitle) Button = GemRB.GetControl (Window, 62); Index: GUIREC.py =================================================================== RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/bg2/GUIREC.py,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** GUIREC.py 28 Aug 2004 21:11:46 -0000 1.5 --- GUIREC.py 3 Sep 2004 23:23:34 -0000 1.6 *************** *** 68,72 **** from GUIDefines import * from ie_stats import * ! from GUICommonWindows import SetSelectionChangeHandler, RunSelectionChangeHandler from GUIWORLD import OpenReformPartyWindow --- 68,74 ---- from GUIDefines import * from ie_stats import * ! from GUICommonWindows import SetSelectionChangeHandler ! #, RunSelectionChangeHandler ! from GUICommonWindows import GetActorClassTitle from GUIWORLD import OpenReformPartyWindow *************** *** 133,141 **** GemRB.SetText (Window, Label, GemRB.GetPlayerName (pc, 0)) # portrait Button = GemRB.GetControl (Window, 2) GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_LOCKED) GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE | IE_GUI_BUTTON_PICTURE, OP_SET) ! GemRB.SetButtonPicture (Window, Button, GemRB.GetPlayerPortrait (pc,1)) # armorclass --- 135,150 ---- GemRB.SetText (Window, Label, GemRB.GetPlayerName (pc, 0)) + # level + Label = GemRB.GetControl (Window, 0x10000011) + Level = GemRB.GetString (48156) + ': ' + str (GemRB.GetPlayerStat (pc, IE_LEVEL)) + #multiclass!!! + GemRB.SetText (Window, Label, Level) + + GemRB.SetText (Window, Label, GemRB.GetPlayerName (pc, 0)) # portrait Button = GemRB.GetControl (Window, 2) GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_LOCKED) GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE | IE_GUI_BUTTON_PICTURE, OP_SET) ! GemRB.SetButtonPicture (Window, Button, GemRB.GetPlayerPortrait (pc,0)) # armorclass *************** *** 198,221 **** # class ! ClassTitle = GemRB.GetPlayerStat (pc, IE_TITLE1) ! print "TITLE:", ClassTitle ! KitIndex = GemRB.GetPlayerStat (pc, IE_KIT) ! Class = GemRB.GetPlayerStat (pc, IE_CLASS) ! ClassTable = GemRB.LoadTable ("classes") ! KitTable = GemRB.LoadTable ("kitlist") ! ! if ClassTitle==0: ! if KitIndex == 0: ! ClassTitle=GemRB.GetTableValue(ClassTable,Class,2) ! else: ! ClassTitle=GemRB.GetTableValue(KitTable, KitIndex,2) ! ! GemRB.UnloadTable (ClassTable) ! GemRB.UnloadTable (KitTable) ! Label = GemRB.GetControl (Window, 0x1000000f) GemRB.SetText (Window, Label, ClassTitle) - print "CLASS:", Class - print "KIT:", KitIndex # help, info textarea --- 207,213 ---- # class ! ClassTitle = GetActorClassTitle (pc) Label = GemRB.GetControl (Window, 0x1000000f) GemRB.SetText (Window, Label, ClassTitle) # help, info textarea *************** *** 248,266 **** # 19672 Level <LEVEL> Spells ! ClassTitle = GemRB.GetPlayerStat (pc, IE_TITLE1) ! print "TITLE:", ClassTitle ! KitIndex = GemRB.GetPlayerStat (pc, IE_KIT) ! Class = GemRB.GetPlayerStat (pc, IE_CLASS) ! ClassTable = GemRB.LoadTable ("classes") ! KitTable = GemRB.LoadTable ("kitlist") ! ! if ClassTitle==0: ! if KitIndex == 0: ! ClassTitle=GemRB.GetTableValue(ClassTable,Class,2) ! else: ! ClassTitle=GemRB.GetTableValue(KitTable, KitIndex,2) ! ! GemRB.UnloadTable (ClassTable) ! GemRB.UnloadTable (KitTable) # 48156 Level --- 240,244 ---- # 19672 Level <LEVEL> Spells ! ClassTitle = GemRB.GetString (GetActorClassTitle (pc) ) # 48156 Level Index: GUIOPT.py =================================================================== RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/bg2/GUIOPT.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** GUIOPT.py 26 Aug 2004 19:05:40 -0000 1.1 --- GUIOPT.py 3 Sep 2004 23:23:34 -0000 1.2 *************** *** 38,42 **** from GUIDefines import * - from GUICommonWindows import CloseCommonWindows import MessageWindow --- 38,41 ---- |