From: Laszlo T. <ave...@us...> - 2006-12-31 13:48:25
|
Update of /cvsroot/gemrb/gemrb/gemrb/GUIScripts/tob In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv20891/GUIScripts/tob Modified Files: GUIINV.py GUIREC.py Log Message: changed Item references to const calling CalculateWeight from various points to ensure consistency implemented two handed weapon equipping restrictions Index: GUIINV.py =================================================================== RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/tob/GUIINV.py,v retrieving revision 1.68 retrieving revision 1.69 diff -C2 -d -r1.68 -r1.69 *** GUIINV.py 31 Dec 2006 00:11:43 -0000 1.68 --- GUIINV.py 31 Dec 2006 13:48:23 -0000 1.69 *************** *** 282,286 **** item = GemRB.GetItem (itemname) if (item['AnimationType'] != ''): ! if (GemRB.CanUseItemType(SLOT_WEAPON, itemname)): #off-hand weapon GemRB.SetButtonPLT(Window, Button, "WP" + size + item['AnimationType'] + "OIN", Color1, Color2, Color3, Color4, Color5, Color6, Color7, 0, 2) --- 282,286 ---- item = GemRB.GetItem (itemname) if (item['AnimationType'] != ''): ! if (GemRB.CanUseItemType (SLOT_WEAPON, itemname)): #off-hand weapon GemRB.SetButtonPLT(Window, Button, "WP" + size + item['AnimationType'] + "OIN", Color1, Color2, Color3, Color4, Color5, Color6, Color7, 0, 2) *************** *** 373,378 **** Window = InventoryWindow SlotType = GemRB.GetSlotType (slot+1, pc) ! if not SlotType["ID"]: return --- 373,379 ---- Window = InventoryWindow SlotType = GemRB.GetSlotType (slot+1, pc) + ControlID = SlotType["ID"] ! if not ControlID: return *************** *** 385,389 **** itemname = "" - ControlID = SlotType["ID"] Button = GemRB.GetControl (Window, ControlID) slot_item = GemRB.GetSlotItem (pc, slot+1) --- 386,389 ---- *************** *** 433,442 **** if OverSlot == slot+1: ! if GemRB.CanUseItemType(SlotType["Type"], itemname): GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_SELECTED) else: GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_ENABLED) else: ! if (SlotType["Type"]&SLOT_INVENTORY) or not GemRB.CanUseItemType(SlotType["Type"], itemname): GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_ENABLED) else: --- 433,442 ---- if OverSlot == slot+1: ! if GemRB.CanUseItemType (SlotType["Type"], itemname): GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_SELECTED) else: GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_ENABLED) else: ! if (SlotType["Type"]&SLOT_INVENTORY) or not GemRB.CanUseItemType (SlotType["Type"], itemname): GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_ENABLED) else: *************** *** 472,476 **** if GemRB.IsDraggingItem (): ! GemRB.PlaySound("GAM_47") #failed equip UpdateInventoryWindow () --- 472,476 ---- if GemRB.IsDraggingItem (): ! GemRB.PlaySound ("GAM_47") #failed equip UpdateInventoryWindow () *************** *** 480,485 **** pc = GemRB.GameGetSelectedPCSingle () slot = GemRB.GetVar ("ItemButton") - slot_item = GemRB.GetSlotItem (pc, slot) if not GemRB.IsDraggingItem (): item = GemRB.GetItem (slot_item["ItemResRef"]) GemRB.DragItem (pc, slot, item["ItemIcon"], 0, 0) --- 480,485 ---- pc = GemRB.GameGetSelectedPCSingle () slot = GemRB.GetVar ("ItemButton") if not GemRB.IsDraggingItem (): + slot_item = GemRB.GetSlotItem (pc, slot) item = GemRB.GetItem (slot_item["ItemResRef"]) GemRB.DragItem (pc, slot, item["ItemIcon"], 0, 0) *************** *** 489,493 **** GemRB.DropDraggedItem (pc, slot) if GemRB.IsDraggingItem (): ! GemRB.PlaySound("GAM_47") #failed equip UpdateInventoryWindow () --- 489,493 ---- GemRB.DropDraggedItem (pc, slot) if GemRB.IsDraggingItem (): ! GemRB.PlaySound ("GAM_47") #failed equip UpdateInventoryWindow () *************** *** 500,504 **** GemRB.DropDraggedItem (pc, -3) if GemRB.IsDraggingItem (): ! GemRB.PlaySound("GAM_47") #failed equip UpdateInventoryWindow () return --- 500,504 ---- GemRB.DropDraggedItem (pc, -3) if GemRB.IsDraggingItem (): ! GemRB.PlaySound ("GAM_47") #failed equip UpdateInventoryWindow () return *************** *** 514,517 **** --- 514,518 ---- dialog=item["Dialog"] GemRB.ExecuteString("StartDialog(\""+dialog+"\",Myself)", pc) + return def IdentifyUseSpell (): *************** *** 666,670 **** pc = GemRB.GameGetSelectedPCSingle () - slot = GemRB.GetVar ("TopIndex") + GemRB.GetVar ("GroundItemButton") slot_item = GemRB.GetContainerItem (pc, slot) --- 667,670 ---- Index: GUIREC.py =================================================================== RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/tob/GUIREC.py,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** GUIREC.py 16 Apr 2006 23:57:07 -0000 1.28 --- GUIREC.py 31 Dec 2006 13:48:23 -0000 1.29 *************** *** 40,43 **** --- 40,44 ---- OldPortraitWindow = None OldOptionsWindow = None + DoneButton = None ################################################### *************** *** 106,110 **** Button = GemRB.GetControl (Window, 36) GemRB.SetText (Window, Button, 13956) ! GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "ExportWindow") # kit info --- 107,111 ---- Button = GemRB.GetControl (Window, 36) GemRB.SetText (Window, Button, 13956) ! GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenExportWindow") # kit info *************** *** 553,557 **** --- 554,601 ---- GemRB.ShowModal (Window, MODAL_SHADOW_GRAY) + return + + def OpenExportWindow (): + global ExportWindow, NameField + + ExportWindow = GemRB.LoadWindow(13) + + TextAreaControl = GemRB.GetControl(ExportWindow, 4) + GemRB.SetText(ExportWindow, TextAreaControl, 10963) + + TextAreaControl = GemRB.GetControl(ExportWindow,2) + #Fill TextArea Control with character sheets, make textarea a listbox + + DoneButton = GemRB.GetControl(ExportWindow, 4) + GemRB.SetText(ExportWindow, DoneButton, 11973) + GemRB.SetButtonState(ExportWindow, DoneButton, IE_GUI_BUTTON_DISABLED) + + CancelButton = GemRB.GetControl(ExportWindow,5) + GemRB.SetText(ExportWindow, CancelButton, 13727) + + NameField = GemRB.GetControl(ExportWindow,6) + GemRB.SetEvent(ExportWindow, DoneButton, IE_GUI_BUTTON_ON_PRESS, "ExportDonePress") + GemRB.SetEvent(ExportWindow, CancelButton, IE_GUI_BUTTON_ON_PRESS, "ExportCancelPress") + GemRB.SetEvent(ExportWindow, NameField, IE_GUI_EDIT_ON_CHANGE, "ExportEditChanged") + GemRB.ShowModal (ExportWindow, MODAL_SHADOW_GRAY) + GemRB.SetControlStatus (ExportWindow, NameField,IE_GUI_CONTROL_FOCUSED) + return + + def ExportDonePress(): + GemRB.UnloadWindow(ExportWindow) + #save file under name from EditControl + return + + def ExportCancelPress(): + GemRB.UnloadWindow(ExportWindow) + return + + def ExportEditChanged(): + ExportFileName = GemRB.GetToken(ExportWindow, NameField) + if ExportFileName == "": + GemRB.SetButtonState(ExportWindow, DoneButton, IE_GUI_BUTTON_DISABLED) + else: + GemRB.SetButtonState(ExportWindow, DoneButton, IE_GUI_BUTTON_ENABLED) ################################################### # End of file GUIREC.py |