From: <ave...@us...> - 2008-07-19 17:12:07
|
Revision: 5234 http://gemrb.svn.sourceforge.net/gemrb/?rev=5234&view=rev Author: avenger_teambg Date: 2008-07-19 17:08:50 +0000 (Sat, 19 Jul 2008) Log Message: ----------- removed StrRef from textscreen Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/bg1/TextScreen.py gemrb/trunk/gemrb/GUIScripts/bg2/TextScreen.py gemrb/trunk/gemrb/GUIScripts/how/TextScreen.py gemrb/trunk/gemrb/GUIScripts/iwd/TextScreen.py gemrb/trunk/gemrb/GUIScripts/iwd2/TextScreen.py Modified: gemrb/trunk/gemrb/GUIScripts/bg1/TextScreen.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/TextScreen.py 2008-07-19 17:04:35 UTC (rev 5233) +++ gemrb/trunk/gemrb/GUIScripts/bg1/TextScreen.py 2008-07-19 17:08:50 UTC (rev 5234) @@ -83,7 +83,7 @@ if Value == 'NONE': Position = 1 else: - GemRB.TextAreaAppend (TextScreen, TextArea, Value, -1, 7) + GemRB.TextAreaAppend (TextScreen, TextArea, Value, -1, 6) Position = Position + 1 return Modified: gemrb/trunk/gemrb/GUIScripts/bg2/TextScreen.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/TextScreen.py 2008-07-19 17:04:35 UTC (rev 5233) +++ gemrb/trunk/gemrb/GUIScripts/bg2/TextScreen.py 2008-07-19 17:08:50 UTC (rev 5234) @@ -88,7 +88,7 @@ Value = GemRB.GetTableValue (Table, line, 1) GemRB.UnloadTable (Table) - GemRB.TextAreaAppend (TextScreen, TextArea, Value, -1, 7) + GemRB.TextAreaAppend (TextScreen, TextArea, Value, -1, 6) return def ReplayTextScreen (): Modified: gemrb/trunk/gemrb/GUIScripts/how/TextScreen.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/how/TextScreen.py 2008-07-19 17:04:35 UTC (rev 5233) +++ gemrb/trunk/gemrb/GUIScripts/how/TextScreen.py 2008-07-19 17:08:50 UTC (rev 5234) @@ -94,7 +94,7 @@ Table = GemRB.LoadTable ("chapters") Value = GemRB.GetTableValue (Table, Chapter, 1) GemRB.UnloadTable (Table) - GemRB.TextAreaAppend (TextScreen, TextArea, Value, -1, 7) + GemRB.TextAreaAppend (TextScreen, TextArea, Value, -1, 6) return def ReplayTextScreen (): Modified: gemrb/trunk/gemrb/GUIScripts/iwd/TextScreen.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd/TextScreen.py 2008-07-19 17:04:35 UTC (rev 5233) +++ gemrb/trunk/gemrb/GUIScripts/iwd/TextScreen.py 2008-07-19 17:08:50 UTC (rev 5234) @@ -94,7 +94,7 @@ Table = GemRB.LoadTable ("chapters") Value = GemRB.GetTableValue (Table, Chapter, 1) GemRB.UnloadTable (Table) - GemRB.TextAreaAppend (TextScreen, TextArea, Value, -1, 7) + GemRB.TextAreaAppend (TextScreen, TextArea, Value, -1, 6) return def ReplayTextScreen (): Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/TextScreen.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/TextScreen.py 2008-07-19 17:04:35 UTC (rev 5233) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/TextScreen.py 2008-07-19 17:08:50 UTC (rev 5234) @@ -78,7 +78,7 @@ Table = GemRB.LoadTable ("chapters") Value = GemRB.GetTableValue (Table, Chapter+1, 1) GemRB.UnloadTable (Table) - GemRB.TextAreaAppend (TextScreen, TextArea, Value, -1, 7) + GemRB.TextAreaAppend (TextScreen, TextArea, Value, -1, 6) return def ReplayTextScreen (): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ave...@us...> - 2008-09-02 17:44:18
|
Revision: 5251 http://gemrb.svn.sourceforge.net/gemrb/?rev=5251&view=rev Author: avenger_teambg Date: 2008-09-02 17:44:21 +0000 (Tue, 02 Sep 2008) Log Message: ----------- iwd/bg1 also got mousewheel for ground items Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/bg1/GUIINV.py gemrb/trunk/gemrb/GUIScripts/iwd/GUIINV.py Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUIINV.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/GUIINV.py 2008-09-02 17:35:11 UTC (rev 5250) +++ gemrb/trunk/gemrb/GUIScripts/bg1/GUIINV.py 2008-09-02 17:44:21 UTC (rev 5251) @@ -89,11 +89,16 @@ OldPortraitWindow = GUICommonWindows.PortraitWindow PortraitWindow = OpenPortraitWindow (0) + #ground items scrollbar + ScrollBar = GemRB.GetControl (Window, 66) + GemRB.SetEvent (Window, ScrollBar, IE_GUI_SCROLLBAR_ON_CHANGE, "RefreshInventoryWindow") + #Ground Item for i in range (5): Button = GemRB.GetControl (Window, i+68) GemRB.SetEvent (Window, Button, IE_GUI_MOUSE_ENTER_BUTTON, "MouseEnterGround") GemRB.SetEvent (Window, Button, IE_GUI_MOUSE_LEAVE_BUTTON, "MouseLeaveGround") + GemRB.AttachScrollBar (Window, Button, ScrollBar); GemRB.SetVarAssoc (Window, Button, "GroundItemButton", i) GemRB.SetButtonSprites (Window, Button, "STONSLOT",0,0,2,4,3) GemRB.SetButtonFont (Window, Button, "NUMBER") @@ -102,10 +107,6 @@ GemRB.SetButtonBorder (Window, Button, 2,0,0,0,0,255,128,128,64,0,1) GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_ALIGN_RIGHT | IE_GUI_BUTTON_ALIGN_TOP | IE_GUI_BUTTON_PICTURE, OP_OR) - #ground items scrollbar - ScrollBar = GemRB.GetControl (Window, 66) - GemRB.SetEvent (Window, ScrollBar, IE_GUI_SCROLLBAR_ON_CHANGE, "RefreshInventoryWindow") - #major & minor clothing color Button = GemRB.GetControl (Window, 62) GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE,OP_OR) Modified: gemrb/trunk/gemrb/GUIScripts/iwd/GUIINV.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd/GUIINV.py 2008-09-02 17:35:11 UTC (rev 5250) +++ gemrb/trunk/gemrb/GUIScripts/iwd/GUIINV.py 2008-09-02 17:44:21 UTC (rev 5251) @@ -91,11 +91,16 @@ OldPortraitWindow = GUICommonWindows.PortraitWindow PortraitWindow = OpenPortraitWindow (0) + #ground items scrollbar + ScrollBar = GemRB.GetControl (Window, 66) + GemRB.SetEvent (Window, ScrollBar, IE_GUI_SCROLLBAR_ON_CHANGE, "RefreshInventoryWindow") + #Ground Item for i in range (5): Button = GemRB.GetControl (Window, i+68) GemRB.SetEvent (Window, Button, IE_GUI_MOUSE_ENTER_BUTTON, "MouseEnterGround") GemRB.SetEvent (Window, Button, IE_GUI_MOUSE_LEAVE_BUTTON, "MouseLeaveGround") + GemRB.AttachScrollBar (Window, Button, ScrollBar); GemRB.SetVarAssoc (Window, Button, "GroundItemButton", i) GemRB.SetButtonSprites (Window, Button, "STONSLOT",0,0,1,2,3) GemRB.SetButtonFont (Window, Button, "NUMBER") @@ -104,10 +109,6 @@ GemRB.SetButtonBorder (Window, Button, 2,0,0,0,0,255,128,128,64,0,1) GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_ALIGN_RIGHT | IE_GUI_BUTTON_ALIGN_TOP | IE_GUI_BUTTON_PICTURE, OP_OR) - #ground items scrollbar - ScrollBar = GemRB.GetControl (Window, 66) - GemRB.SetEvent (Window, ScrollBar, IE_GUI_SCROLLBAR_ON_CHANGE, "RefreshInventoryWindow") - #major & minor clothing color Button = GemRB.GetControl (Window, 62) GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE,OP_OR) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ave...@us...> - 2008-09-02 18:02:38
|
Revision: 5253 http://gemrb.svn.sourceforge.net/gemrb/?rev=5253&view=rev Author: avenger_teambg Date: 2008-09-02 18:02:41 +0000 (Tue, 02 Sep 2008) Log Message: ----------- added mousewheel for how/iwd2 ground items Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/how/GUIINV.py gemrb/trunk/gemrb/GUIScripts/iwd2/GUIINV.py Modified: gemrb/trunk/gemrb/GUIScripts/how/GUIINV.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/how/GUIINV.py 2008-09-02 17:48:10 UTC (rev 5252) +++ gemrb/trunk/gemrb/GUIScripts/how/GUIINV.py 2008-09-02 18:02:41 UTC (rev 5253) @@ -91,11 +91,16 @@ OldPortraitWindow = GUICommonWindows.PortraitWindow PortraitWindow = OpenPortraitWindow (0) + #ground items scrollbar + ScrollBar = GemRB.GetControl (Window, 66) + GemRB.SetEvent (Window, ScrollBar, IE_GUI_SCROLLBAR_ON_CHANGE, "RefreshInventoryWindow") + #Ground Item for i in range (5): Button = GemRB.GetControl (Window, i+68) GemRB.SetEvent (Window, Button, IE_GUI_MOUSE_ENTER_BUTTON, "MouseEnterGround") GemRB.SetEvent (Window, Button, IE_GUI_MOUSE_LEAVE_BUTTON, "MouseLeaveGround") + GemRB.AttachScrollBar (Window, Button, ScrollBar); GemRB.SetVarAssoc (Window, Button, "GroundItemButton", i) GemRB.SetButtonSprites (Window, Button, "STONSLOT",0,0,1,2,3) GemRB.SetButtonFont (Window, Button, "NUMBER") @@ -104,10 +109,6 @@ GemRB.SetButtonBorder (Window, Button, 2,0,0,0,0,255,128,128,64,0,1) GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_ALIGN_RIGHT | IE_GUI_BUTTON_ALIGN_TOP | IE_GUI_BUTTON_PICTURE, OP_OR) - #ground items scrollbar - ScrollBar = GemRB.GetControl (Window, 66) - GemRB.SetEvent (Window, ScrollBar, IE_GUI_SCROLLBAR_ON_CHANGE, "RefreshInventoryWindow") - #major & minor clothing color Button = GemRB.GetControl (Window, 62) GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE,OP_OR) Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/GUIINV.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/GUIINV.py 2008-09-02 17:48:10 UTC (rev 5252) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/GUIINV.py 2008-09-02 18:02:41 UTC (rev 5253) @@ -75,10 +75,17 @@ SetupMenuWindowControls (OptionsWindow, 0, "OpenInventoryWindow") GemRB.SetWindowFrame (Window) + #ground items scrollbar + ScrollBar = GemRB.GetControl (Window, 66) + GemRB.SetEvent (Window, ScrollBar, IE_GUI_SCROLLBAR_ON_CHANGE, "RefreshInventoryWindow") + # Ground Items (6) for i in range (5): Button = GemRB.GetControl (Window, i+68) GemRB.SetTooltip (Window, Button, 12011) + GemRB.SetEvent (Window, Button, IE_GUI_MOUSE_ENTER_BUTTON, "MouseEnterGround") + GemRB.SetEvent (Window, Button, IE_GUI_MOUSE_LEAVE_BUTTON, "MouseLeaveGround") + GemRB.AttachScrollBar (Window, Button, ScrollBar); GemRB.SetVarAssoc (Window, Button, "GroundItemButton", i) GemRB.SetButtonFont (Window, Button, "NUMFONT") GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_ALIGN_RIGHT | IE_GUI_BUTTON_ALIGN_BOTTOM | IE_GUI_BUTTON_PICTURE, OP_OR) @@ -88,10 +95,6 @@ GemRB.SetButtonFont (Window, Button, "NUMFONT") GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_ALIGN_RIGHT | IE_GUI_BUTTON_ALIGN_BOTTOM | IE_GUI_BUTTON_PICTURE, OP_OR) - #ground items scrollbar - ScrollBar = GemRB.GetControl (Window, 66) - GemRB.SetEvent (Window, ScrollBar, IE_GUI_SCROLLBAR_ON_CHANGE, "RefreshInventoryWindow") - #major & minor clothing color Button = GemRB.GetControl (Window, 62) GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE,OP_OR) @@ -146,6 +149,8 @@ SlotType = GemRB.GetSlotType (slot+1) if SlotType["ID"]: Button = GemRB.GetControl (Window, SlotType["ID"]) + GemRB.SetEvent (Window, Button, IE_GUI_MOUSE_ENTER_BUTTON, "MouseEnterSlot") + GemRB.SetEvent (Window, Button, IE_GUI_MOUSE_LEAVE_BUTTON, "MouseLeaveSlot") GemRB.SetVarAssoc (Window, Button, "ItemButton", slot+1) GemRB.SetButtonFont (Window, Button, "NUMFONT") GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_ALIGN_RIGHT | IE_GUI_BUTTON_ALIGN_BOTTOM | IE_GUI_BUTTON_PICTURE, OP_OR) @@ -604,6 +609,40 @@ DisplayItem(slot_item["ItemResRef"], value) #the ground items are only displayable return +def MouseEnterSlot (): + global OverSlot + pc = GemRB.GameGetSelectedPCSingle () + OverSlot = GemRB.GetVar ("ItemButton") + if GemRB.IsDraggingItem (): + UpdateSlot (pc, OverSlot-1) + return + +def MouseLeaveSlot (): + global OverSlot + + pc = GemRB.GameGetSelectedPCSingle () + slot = GemRB.GetVar ("ItemButton") + if slot == OverSlot or not GemRB.IsDraggingItem (): + OverSlot = None + UpdateSlot (pc, slot-1) + return + +def MouseEnterGround (): + Window = InventoryWindow + i = GemRB.GetVar ("GroundItemButton") + Button = GemRB.GetControl (Window, i+68) + if GemRB.IsDraggingItem (): + GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_SELECTED) + return + +def MouseLeaveGround (): + Window = InventoryWindow + i = GemRB.GetVar ("GroundItemButton") + Button = GemRB.GetControl (Window, i+68) + if GemRB.IsDraggingItem (): + GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_SECOND) + return + ################################################### # End of file GUIINV.py This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ave...@us...> - 2008-09-07 07:44:55
|
Revision: 5261 http://gemrb.svn.sourceforge.net/gemrb/?rev=5261&view=rev Author: avenger_teambg Date: 2008-09-07 07:45:04 +0000 (Sun, 07 Sep 2008) Log Message: ----------- set the default button in iwd/how partyformation screen too Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/how/PartyFormation.py gemrb/trunk/gemrb/GUIScripts/iwd/PartyFormation.py Modified: gemrb/trunk/gemrb/GUIScripts/how/PartyFormation.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/how/PartyFormation.py 2008-09-07 07:00:27 UTC (rev 5260) +++ gemrb/trunk/gemrb/GUIScripts/how/PartyFormation.py 2008-09-07 07:45:04 UTC (rev 5261) @@ -29,142 +29,147 @@ CreateCharWindow = 0 ExitWindow = 0 -def OnLoad(): +def OnLoad (): global PartyFormationWindow - GemRB.LoadWindowPack("GUISP", 640, 480) - PartyFormationWindow = GemRB.LoadWindow(0) + GemRB.LoadWindowPack ("GUISP", 640, 480) + PartyFormationWindow = GemRB.LoadWindow (0) GemRB.SetWindowFrame (PartyFormationWindow) - ModifyCharsButton = GemRB.GetControl(PartyFormationWindow, 43) - GemRB.SetEvent(PartyFormationWindow, ModifyCharsButton, IE_GUI_BUTTON_ON_PRESS, "ModifyPress") - GemRB.SetControlStatus(PartyFormationWindow, ModifyCharsButton, IE_GUI_BUTTON_DISABLED) - GemRB.SetText(PartyFormationWindow, ModifyCharsButton, 18816) - - - ExitButton = GemRB.GetControl(PartyFormationWindow, 30) - GemRB.SetEvent(PartyFormationWindow, ExitButton, IE_GUI_BUTTON_ON_PRESS, "ExitPress") - GemRB.SetControlStatus(PartyFormationWindow, ExitButton, IE_GUI_BUTTON_ENABLED) - GemRB.SetText(PartyFormationWindow, ExitButton, 13906) + ModifyCharsButton = GemRB.GetControl (PartyFormationWindow, 43) + GemRB.SetEvent (PartyFormationWindow, ModifyCharsButton, IE_GUI_BUTTON_ON_PRESS, "ModifyPress") + GemRB.SetControlStatus (PartyFormationWindow, ModifyCharsButton, IE_GUI_BUTTON_DISABLED) + GemRB.SetText (PartyFormationWindow, ModifyCharsButton, 18816) - DoneButton = GemRB.GetControl(PartyFormationWindow, 28) - GemRB.SetText(PartyFormationWindow, DoneButton, 11973) + ExitButton = GemRB.GetControl (PartyFormationWindow, 30) + GemRB.SetEvent (PartyFormationWindow, ExitButton, IE_GUI_BUTTON_ON_PRESS, "ExitPress") + GemRB.SetControlStatus (PartyFormationWindow, ExitButton, IE_GUI_BUTTON_ENABLED) + GemRB.SetText (PartyFormationWindow, ExitButton, 13906) + + DoneButton = GemRB.GetControl (PartyFormationWindow, 28) + GemRB.SetText (PartyFormationWindow, DoneButton, 11973) Portraits = 0 for i in range(18,24): - Label = GemRB.GetControl(PartyFormationWindow, 0x10000012+i) + Label = GemRB.GetControl (PartyFormationWindow, 0x10000012+i) #removing this label, it just disturbs us - GemRB.SetControlSize(PartyFormationWindow, Label, 0, 0) - Button = GemRB.GetControl(PartyFormationWindow, i-12) - ResRef = GemRB.GetPlayerPortrait(i-17, 1) + GemRB.SetControlSize (PartyFormationWindow, Label, 0, 0) + Button = GemRB.GetControl (PartyFormationWindow, i-12) + ResRef = GemRB.GetPlayerPortrait (i-17, 1) if ResRef == "": - GemRB.SetButtonFlags(PartyFormationWindow, Button, IE_GUI_BUTTON_NORMAL,OP_SET) + GemRB.SetButtonFlags (PartyFormationWindow, Button, IE_GUI_BUTTON_NORMAL,OP_SET) else: - GemRB.SetButtonPicture(PartyFormationWindow, Button, ResRef) - GemRB.SetButtonFlags(PartyFormationWindow, Button, IE_GUI_BUTTON_PICTURE, OP_OR) + GemRB.SetButtonPicture (PartyFormationWindow, Button, ResRef) + GemRB.SetButtonFlags (PartyFormationWindow, Button, IE_GUI_BUTTON_PICTURE, OP_OR) Portraits = Portraits+1 - CreateCharButton = GemRB.GetControl(PartyFormationWindow,i) - GemRB.SetVarAssoc(PartyFormationWindow, CreateCharButton, "Slot", i-17) - GemRB.SetEvent(PartyFormationWindow, CreateCharButton, IE_GUI_BUTTON_ON_PRESS, "CreateCharPress") - GemRB.SetControlStatus(PartyFormationWindow, CreateCharButton, IE_GUI_BUTTON_ENABLED) + CreateCharButton = GemRB.GetControl (PartyFormationWindow,i) + GemRB.SetVarAssoc (PartyFormationWindow, CreateCharButton, "Slot", i-17) + GemRB.SetEvent (PartyFormationWindow, CreateCharButton, IE_GUI_BUTTON_ON_PRESS, "CreateCharPress") + GemRB.SetControlStatus (PartyFormationWindow, CreateCharButton, IE_GUI_BUTTON_ENABLED) if ResRef == "": - GemRB.SetText(PartyFormationWindow, CreateCharButton, 10264) + GemRB.SetText (PartyFormationWindow, CreateCharButton, 10264) else: - GemRB.SetText(PartyFormationWindow, CreateCharButton, GemRB.GetPlayerName(i-17,0) ) + GemRB.SetText (PartyFormationWindow, CreateCharButton, GemRB.GetPlayerName (i-17,0) ) if Portraits == 0: - GemRB.SetButtonState(PartyFormationWindow, DoneButton, IE_GUI_BUTTON_DISABLED) + GemRB.SetButtonState (PartyFormationWindow, DoneButton, IE_GUI_BUTTON_DISABLED) else: - GemRB.SetButtonState(PartyFormationWindow, DoneButton, IE_GUI_BUTTON_ENABLED) - GemRB.SetEvent(PartyFormationWindow,DoneButton, IE_GUI_BUTTON_ON_PRESS,"EnterGamePress") + GemRB.SetButtonState (PartyFormationWindow, DoneButton, IE_GUI_BUTTON_ENABLED) + GemRB.SetButtonFlags (PartyFormationWindow, DoneButton, IE_GUI_BUTTON_DEFAULT, OP_OR) + GemRB.SetEvent (PartyFormationWindow,DoneButton, IE_GUI_BUTTON_ON_PRESS,"EnterGamePress") - GemRB.SetVisible(PartyFormationWindow, 1) + GemRB.SetVisible (PartyFormationWindow, 1) return -def CreateCharPress(): +def CreateCharPress (): global PartyFormationWindow, CreateCharWindow - GemRB.SetVisible(PartyFormationWindow, 0) - CreateCharWindow = GemRB.LoadWindow(3) - - CreateButton = GemRB.GetControl(CreateCharWindow, 0) - GemRB.SetEvent(CreateCharWindow, CreateButton, IE_GUI_BUTTON_ON_PRESS, "CreateCharCreatePress") - GemRB.SetControlStatus(CreateCharWindow, CreateButton, IE_GUI_BUTTON_ENABLED) - GemRB.SetText(CreateCharWindow, CreateButton, 13954) - DeleteButton = GemRB.GetControl(CreateCharWindow, 3) - GemRB.SetEvent(CreateCharWindow, DeleteButton, IE_GUI_BUTTON_ON_PRESS, "CreateCharDeletePress") - GemRB.SetControlStatus(CreateCharWindow, DeleteButton, IE_GUI_BUTTON_DISABLED) - GemRB.SetText(CreateCharWindow, DeleteButton, 13957) + GemRB.SetVisible (PartyFormationWindow, 0) + CreateCharWindow = GemRB.LoadWindow (3) - CancelButton = GemRB.GetControl(CreateCharWindow, 4) - GemRB.SetEvent(CreateCharWindow, CancelButton, IE_GUI_BUTTON_ON_PRESS, "CreateCharCancelPress") - GemRB.SetControlStatus(CreateCharWindow, CancelButton, IE_GUI_BUTTON_ENABLED) - GemRB.SetText(CreateCharWindow, CancelButton, 13727) - GemRB.SetButtonFlags(CreateCharWindow, CreateButton, IE_GUI_BUTTON_DEFAULT, OP_OR) - - GemRB.SetVisible(CreateCharWindow, 1) + CreateButton = GemRB.GetControl (CreateCharWindow, 0) + GemRB.SetEvent (CreateCharWindow, CreateButton, IE_GUI_BUTTON_ON_PRESS, "CreateCharCreatePress") + GemRB.SetControlStatus (CreateCharWindow, CreateButton, IE_GUI_BUTTON_ENABLED) + GemRB.SetText (CreateCharWindow, CreateButton, 13954) + + DeleteButton = GemRB.GetControl (CreateCharWindow, 3) + GemRB.SetEvent (CreateCharWindow, DeleteButton, IE_GUI_BUTTON_ON_PRESS, "CreateCharDeletePress") + GemRB.SetControlStatus (CreateCharWindow, DeleteButton, IE_GUI_BUTTON_DISABLED) + GemRB.SetText (CreateCharWindow, DeleteButton, 13957) + + CancelButton = GemRB.GetControl (CreateCharWindow, 4) + GemRB.SetEvent (CreateCharWindow, CancelButton, IE_GUI_BUTTON_ON_PRESS, "CreateCharCancelPress") + GemRB.SetControlStatus (CreateCharWindow, CancelButton, IE_GUI_BUTTON_ENABLED) + GemRB.SetText (CreateCharWindow, CancelButton, 13727) + GemRB.SetButtonFlags (CreateCharWindow, CreateButton, IE_GUI_BUTTON_DEFAULT, OP_OR) + + GemRB.SetVisible (CreateCharWindow, 1) return -def CreateCharCreatePress(): +def CreateCharCreatePress (): global PartyFormationWindow, CreateCharWindow - GemRB.UnloadWindow(CreateCharWindow) - GemRB.UnloadWindow(PartyFormationWindow) - GemRB.SetNextScript("CharGen") + + GemRB.UnloadWindow (CreateCharWindow) + GemRB.UnloadWindow (PartyFormationWindow) + GemRB.SetNextScript ("CharGen") return -def CreateCharDeletePress(): +def CreateCharDeletePress (): return -def CreateCharCancelPress(): +def CreateCharCancelPress (): global PartyFormationWindow, CreateCharWindow - GemRB.UnloadWindow(CreateCharWindow) - GemRB.SetVisible(PartyFormationWindow, 1) + + GemRB.UnloadWindow (CreateCharWindow) + GemRB.SetVisible (PartyFormationWindow, 1) return -def ModifyCharsPress(): +def ModifyCharsPress (): return -def EnterGamePress(): - if GemRB.GetVar("oldgame")==0: - GemRB.SetVar("PlayMode",3) #using mpsave and second row - GemRB.GameSetExpansion(1) +def EnterGamePress (): + if GemRB.GetVar ("oldgame")==0: + GemRB.SetVar ("PlayMode",3) #using mpsave and second row + GemRB.GameSetExpansion (1) else: - GemRB.SetVar("PlayMode",2) #using mpsave and first row - GemRB.GameSetExpansion(0) + GemRB.SetVar ("PlayMode",2) #using mpsave and first row + GemRB.GameSetExpansion (0) - GemRB.EnterGame() + GemRB.EnterGame () return -def ExitPress(): +def ExitPress (): global PartyFormationWindow, ExitWindow - GemRB.SetVisible(PartyFormationWindow, 0) - ExitWindow = GemRB.LoadWindow(7) - - ExitButton = GemRB.GetControl(ExitWindow, 1) - GemRB.SetEvent(ExitWindow, ExitButton, IE_GUI_BUTTON_ON_PRESS, "ExitExitPress") - GemRB.SetText(ExitWindow, ExitButton, 13906) - - CancelButton = GemRB.GetControl(ExitWindow, 2) - GemRB.SetEvent(ExitWindow, CancelButton, IE_GUI_BUTTON_ON_PRESS, "ExitCancelPress") - GemRB.SetText(ExitWindow, CancelButton, 13727) - - TextArea = GemRB.GetControl(ExitWindow, 0) - GemRB.SetText(ExitWindow, TextArea, 11329) - GemRB.SetVisible(ExitWindow, 1) + GemRB.SetVisible (PartyFormationWindow, 0) + ExitWindow = GemRB.LoadWindow (7) + + ExitButton = GemRB.GetControl (ExitWindow, 1) + GemRB.SetEvent (ExitWindow, ExitButton, IE_GUI_BUTTON_ON_PRESS, "ExitExitPress") + GemRB.SetText (ExitWindow, ExitButton, 13906) + + CancelButton = GemRB.GetControl (ExitWindow, 2) + GemRB.SetEvent (ExitWindow, CancelButton, IE_GUI_BUTTON_ON_PRESS, "ExitCancelPress") + GemRB.SetText (ExitWindow, CancelButton, 13727) + + TextArea = GemRB.GetControl (ExitWindow, 0) + GemRB.SetText (ExitWindow, TextArea, 11329) + + GemRB.SetVisible (ExitWindow, 1) return -def ExitCancelPress(): +def ExitCancelPress (): global PartyFormationWindow, ExitWindow - GemRB.UnloadWindow(ExitWindow) - GemRB.SetVisible(PartyFormationWindow, 1) + + GemRB.UnloadWindow (ExitWindow) + GemRB.SetVisible (PartyFormationWindow, 1) return -def ExitExitPress(): +def ExitExitPress (): global PartyFormationWindow, ExitWindow - GemRB.UnloadWindow(ExitWindow) - GemRB.UnloadWindow(PartyFormationWindow) - GemRB.SetNextScript("Start") + + GemRB.UnloadWindow (ExitWindow) + GemRB.UnloadWindow (PartyFormationWindow) + GemRB.SetNextScript ("Start") return - Modified: gemrb/trunk/gemrb/GUIScripts/iwd/PartyFormation.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd/PartyFormation.py 2008-09-07 07:00:27 UTC (rev 5260) +++ gemrb/trunk/gemrb/GUIScripts/iwd/PartyFormation.py 2008-09-07 07:45:04 UTC (rev 5261) @@ -29,136 +29,141 @@ CreateCharWindow = 0 ExitWindow = 0 -def OnLoad(): +def OnLoad (): global PartyFormationWindow - GemRB.LoadWindowPack("GUISP", 640, 480) - PartyFormationWindow = GemRB.LoadWindow(0) + GemRB.LoadWindowPack ("GUISP", 640, 480) + PartyFormationWindow = GemRB.LoadWindow (0) GemRB.SetWindowFrame (PartyFormationWindow) - ModifyCharsButton = GemRB.GetControl(PartyFormationWindow, 43) - GemRB.SetEvent(PartyFormationWindow, ModifyCharsButton, IE_GUI_BUTTON_ON_PRESS, "ModifyPress") - GemRB.SetControlStatus(PartyFormationWindow, ModifyCharsButton, IE_GUI_BUTTON_DISABLED) - GemRB.SetText(PartyFormationWindow, ModifyCharsButton, 18816) - - - ExitButton = GemRB.GetControl(PartyFormationWindow, 30) - GemRB.SetEvent(PartyFormationWindow, ExitButton, IE_GUI_BUTTON_ON_PRESS, "ExitPress") - GemRB.SetControlStatus(PartyFormationWindow, ExitButton, IE_GUI_BUTTON_ENABLED) - GemRB.SetText(PartyFormationWindow, ExitButton, 13906) + ModifyCharsButton = GemRB.GetControl (PartyFormationWindow, 43) + GemRB.SetEvent (PartyFormationWindow, ModifyCharsButton, IE_GUI_BUTTON_ON_PRESS, "ModifyPress") + GemRB.SetControlStatus (PartyFormationWindow, ModifyCharsButton, IE_GUI_BUTTON_DISABLED) + GemRB.SetText (PartyFormationWindow, ModifyCharsButton, 18816) - DoneButton = GemRB.GetControl(PartyFormationWindow, 28) - GemRB.SetText(PartyFormationWindow, DoneButton, 11973) + ExitButton = GemRB.GetControl (PartyFormationWindow, 30) + GemRB.SetEvent (PartyFormationWindow, ExitButton, IE_GUI_BUTTON_ON_PRESS, "ExitPress") + GemRB.SetControlStatus (PartyFormationWindow, ExitButton, IE_GUI_BUTTON_ENABLED) + GemRB.SetText (PartyFormationWindow, ExitButton, 13906) + + DoneButton = GemRB.GetControl (PartyFormationWindow, 28) + GemRB.SetText (PartyFormationWindow, DoneButton, 11973) Portraits = 0 for i in range(18,24): - Label = GemRB.GetControl(PartyFormationWindow, 0x10000012+i) + Label = GemRB.GetControl (PartyFormationWindow, 0x10000012+i) #removing this label, it just disturbs us - GemRB.SetControlSize(PartyFormationWindow, Label, 0, 0) - Button = GemRB.GetControl(PartyFormationWindow, i-12) - ResRef = GemRB.GetPlayerPortrait(i-17, 1) + GemRB.SetControlSize (PartyFormationWindow, Label, 0, 0) + Button = GemRB.GetControl (PartyFormationWindow, i-12) + ResRef = GemRB.GetPlayerPortrait (i-17, 1) if ResRef == "": - GemRB.SetButtonFlags(PartyFormationWindow, Button, IE_GUI_BUTTON_NORMAL,OP_SET) + GemRB.SetButtonFlags (PartyFormationWindow, Button, IE_GUI_BUTTON_NORMAL,OP_SET) else: - GemRB.SetButtonPicture(PartyFormationWindow, Button, ResRef) - GemRB.SetButtonFlags(PartyFormationWindow, Button, IE_GUI_BUTTON_PICTURE, OP_OR) + GemRB.SetButtonPicture (PartyFormationWindow, Button, ResRef) + GemRB.SetButtonFlags (PartyFormationWindow, Button, IE_GUI_BUTTON_PICTURE, OP_OR) Portraits = Portraits+1 - CreateCharButton = GemRB.GetControl(PartyFormationWindow,i) - GemRB.SetVarAssoc(PartyFormationWindow, CreateCharButton, "Slot", i-17) - GemRB.SetEvent(PartyFormationWindow, CreateCharButton, IE_GUI_BUTTON_ON_PRESS, "CreateCharPress") - GemRB.SetControlStatus(PartyFormationWindow, CreateCharButton, IE_GUI_BUTTON_ENABLED) + CreateCharButton = GemRB.GetControl (PartyFormationWindow,i) + GemRB.SetVarAssoc (PartyFormationWindow, CreateCharButton, "Slot", i-17) + GemRB.SetEvent (PartyFormationWindow, CreateCharButton, IE_GUI_BUTTON_ON_PRESS, "CreateCharPress") + GemRB.SetControlStatus (PartyFormationWindow, CreateCharButton, IE_GUI_BUTTON_ENABLED) if ResRef == "": - GemRB.SetText(PartyFormationWindow, CreateCharButton, 10264) + GemRB.SetText (PartyFormationWindow, CreateCharButton, 10264) else: - GemRB.SetText(PartyFormationWindow, CreateCharButton, GemRB.GetPlayerName(i-17,0) ) + GemRB.SetText (PartyFormationWindow, CreateCharButton, GemRB.GetPlayerName (i-17,0) ) if Portraits == 0: - GemRB.SetButtonState(PartyFormationWindow, DoneButton, IE_GUI_BUTTON_DISABLED) + GemRB.SetButtonState (PartyFormationWindow, DoneButton, IE_GUI_BUTTON_DISABLED) else: - GemRB.SetButtonState(PartyFormationWindow, DoneButton, IE_GUI_BUTTON_ENABLED) - GemRB.SetEvent(PartyFormationWindow,DoneButton, IE_GUI_BUTTON_ON_PRESS,"EnterGamePress") + GemRB.SetButtonState (PartyFormationWindow, DoneButton, IE_GUI_BUTTON_ENABLED) + GemRB.SetButtonFlags (PartyFormationWindow, DoneButton, IE_GUI_BUTTON_DEFAULT, OP_OR) + GemRB.SetEvent (PartyFormationWindow,DoneButton, IE_GUI_BUTTON_ON_PRESS,"EnterGamePress") - GemRB.SetVisible(PartyFormationWindow, 1) + GemRB.SetVisible (PartyFormationWindow, 1) return -def CreateCharPress(): +def CreateCharPress (): global PartyFormationWindow, CreateCharWindow - GemRB.SetVisible(PartyFormationWindow, 0) - CreateCharWindow = GemRB.LoadWindow(3) - - CreateButton = GemRB.GetControl(CreateCharWindow, 0) - GemRB.SetEvent(CreateCharWindow, CreateButton, IE_GUI_BUTTON_ON_PRESS, "CreateCharCreatePress") - GemRB.SetControlStatus(CreateCharWindow, CreateButton, IE_GUI_BUTTON_ENABLED) - GemRB.SetText(CreateCharWindow, CreateButton, 13954) - DeleteButton = GemRB.GetControl(CreateCharWindow, 3) - GemRB.SetEvent(CreateCharWindow, DeleteButton, IE_GUI_BUTTON_ON_PRESS, "CreateCharDeletePress") - GemRB.SetControlStatus(CreateCharWindow, DeleteButton, IE_GUI_BUTTON_DISABLED) - GemRB.SetText(CreateCharWindow, DeleteButton, 13957) + GemRB.SetVisible (PartyFormationWindow, 0) + CreateCharWindow = GemRB.LoadWindow (3) - CancelButton = GemRB.GetControl(CreateCharWindow, 4) - GemRB.SetEvent(CreateCharWindow, CancelButton, IE_GUI_BUTTON_ON_PRESS, "CreateCharCancelPress") - GemRB.SetControlStatus(CreateCharWindow, CancelButton, IE_GUI_BUTTON_ENABLED) - GemRB.SetText(CreateCharWindow, CancelButton, 13727) - GemRB.SetButtonFlags(CreateCharWindow, CreateButton, IE_GUI_BUTTON_DEFAULT, OP_OR) - - GemRB.SetVisible(CreateCharWindow, 1) + CreateButton = GemRB.GetControl (CreateCharWindow, 0) + GemRB.SetEvent (CreateCharWindow, CreateButton, IE_GUI_BUTTON_ON_PRESS, "CreateCharCreatePress") + GemRB.SetControlStatus (CreateCharWindow, CreateButton, IE_GUI_BUTTON_ENABLED) + GemRB.SetText (CreateCharWindow, CreateButton, 13954) + + DeleteButton = GemRB.GetControl (CreateCharWindow, 3) + GemRB.SetEvent (CreateCharWindow, DeleteButton, IE_GUI_BUTTON_ON_PRESS, "CreateCharDeletePress") + GemRB.SetControlStatus (CreateCharWindow, DeleteButton, IE_GUI_BUTTON_DISABLED) + GemRB.SetText (CreateCharWindow, DeleteButton, 13957) + + CancelButton = GemRB.GetControl (CreateCharWindow, 4) + GemRB.SetEvent (CreateCharWindow, CancelButton, IE_GUI_BUTTON_ON_PRESS, "CreateCharCancelPress") + GemRB.SetControlStatus (CreateCharWindow, CancelButton, IE_GUI_BUTTON_ENABLED) + GemRB.SetText (CreateCharWindow, CancelButton, 13727) + GemRB.SetButtonFlags (CreateCharWindow, CreateButton, IE_GUI_BUTTON_DEFAULT, OP_OR) + + GemRB.SetVisible (CreateCharWindow, 1) return -def CreateCharCreatePress(): +def CreateCharCreatePress (): global PartyFormationWindow, CreateCharWindow - GemRB.UnloadWindow(CreateCharWindow) - GemRB.UnloadWindow(PartyFormationWindow) - GemRB.SetNextScript("CharGen") + + GemRB.UnloadWindow (CreateCharWindow) + GemRB.UnloadWindow (PartyFormationWindow) + GemRB.SetNextScript ("CharGen") return -def CreateCharDeletePress(): +def CreateCharDeletePress (): return -def CreateCharCancelPress(): +def CreateCharCancelPress (): global PartyFormationWindow, CreateCharWindow - GemRB.UnloadWindow(CreateCharWindow) - GemRB.SetVisible(PartyFormationWindow, 1) + + GemRB.UnloadWindow (CreateCharWindow) + GemRB.SetVisible (PartyFormationWindow, 1) return -def ModifyCharsPress(): +def ModifyCharsPress (): return -def EnterGamePress(): - GemRB.SetVar("PlayMode",2) #using mpsave and second row - GemRB.EnterGame() +def EnterGamePress (): + GemRB.SetVar ("PlayMode",2) #using mpsave and second row + GemRB.EnterGame () return -def ExitPress(): +def ExitPress (): global PartyFormationWindow, ExitWindow - GemRB.SetVisible(PartyFormationWindow, 0) - ExitWindow = GemRB.LoadWindow(7) - - ExitButton = GemRB.GetControl(ExitWindow, 1) - GemRB.SetEvent(ExitWindow, ExitButton, IE_GUI_BUTTON_ON_PRESS, "ExitExitPress") - GemRB.SetText(ExitWindow, ExitButton, 13906) - - CancelButton = GemRB.GetControl(ExitWindow, 2) - GemRB.SetEvent(ExitWindow, CancelButton, IE_GUI_BUTTON_ON_PRESS, "ExitCancelPress") - GemRB.SetText(ExitWindow, CancelButton, 13727) - - TextArea = GemRB.GetControl(ExitWindow, 0) - GemRB.SetText(ExitWindow, TextArea, 11329) - GemRB.SetVisible(ExitWindow, 1) + GemRB.SetVisible (PartyFormationWindow, 0) + ExitWindow = GemRB.LoadWindow (7) + + ExitButton = GemRB.GetControl (ExitWindow, 1) + GemRB.SetEvent (ExitWindow, ExitButton, IE_GUI_BUTTON_ON_PRESS, "ExitExitPress") + GemRB.SetText (ExitWindow, ExitButton, 13906) + + CancelButton = GemRB.GetControl (ExitWindow, 2) + GemRB.SetEvent (ExitWindow, CancelButton, IE_GUI_BUTTON_ON_PRESS, "ExitCancelPress") + GemRB.SetText (ExitWindow, CancelButton, 13727) + + TextArea = GemRB.GetControl (ExitWindow, 0) + GemRB.SetText (ExitWindow, TextArea, 11329) + + GemRB.SetVisible (ExitWindow, 1) return -def ExitCancelPress(): +def ExitCancelPress (): global PartyFormationWindow, ExitWindow - GemRB.UnloadWindow(ExitWindow) - GemRB.SetVisible(PartyFormationWindow, 1) + + GemRB.UnloadWindow (ExitWindow) + GemRB.SetVisible (PartyFormationWindow, 1) return -def ExitExitPress(): +def ExitExitPress (): global PartyFormationWindow, ExitWindow - GemRB.UnloadWindow(ExitWindow) - GemRB.UnloadWindow(PartyFormationWindow) - GemRB.SetNextScript("Start") + + GemRB.UnloadWindow (ExitWindow) + GemRB.UnloadWindow (PartyFormationWindow) + GemRB.SetNextScript ("Start") return - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ave...@us...> - 2008-09-16 20:01:04
|
Revision: 5317 http://gemrb.svn.sourceforge.net/gemrb/?rev=5317&view=rev Author: avenger_teambg Date: 2008-09-16 20:01:15 +0000 (Tue, 16 Sep 2008) Log Message: ----------- fixed weapon slots in CreateItem calls Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/bg1/CharGen9.py gemrb/trunk/gemrb/GUIScripts/bg2/CharGen9.py gemrb/trunk/gemrb/GUIScripts/how/CharGen.py gemrb/trunk/gemrb/GUIScripts/iwd/CharGen.py Modified: gemrb/trunk/gemrb/GUIScripts/bg1/CharGen9.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/CharGen9.py 2008-09-16 19:58:36 UTC (rev 5316) +++ gemrb/trunk/gemrb/GUIScripts/bg1/CharGen9.py 2008-09-16 20:01:15 UTC (rev 5317) @@ -214,8 +214,8 @@ LargePortrait = GemRB.GetToken ("LargePortrait") SmallPortrait = GemRB.GetToken ("SmallPortrait") GemRB.FillPlayerInfo (MyChar, LargePortrait, SmallPortrait) - #35 is a weapon slot - GemRB.CreateItem (MyChar, "staf01", 35, 1, 0, 0) + #10 is a weapon slot (see slottype.2da row 10) + GemRB.CreateItem (MyChar, "staf01", 10, 1, 0, 0) GemRB.SetEquippedQuickSlot (MyChar, 0) #LETS PLAY!! playmode = GemRB.GetVar ("PlayMode") Modified: gemrb/trunk/gemrb/GUIScripts/bg2/CharGen9.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/CharGen9.py 2008-09-16 19:58:36 UTC (rev 5316) +++ gemrb/trunk/gemrb/GUIScripts/bg2/CharGen9.py 2008-09-16 20:01:15 UTC (rev 5317) @@ -178,13 +178,14 @@ else: count = 0 GemRB.CreateItem(MyChar, item, realslot[0], count, 0, 0) -# GemRB.ChangeItemFlag (MyChar, realslot[0], IE_INV_ITEM_IDENTIFIED, OP_OR) + GemRB.ChangeItemFlag (MyChar, realslot[0], IE_INV_ITEM_IDENTIFIED, OP_OR) + # identify all the items; FIXME: remove the current hack # for slot in GemRB.GetSlots (MyChar, SLOT_ANY, 1): - for slot in range(0,50): - if not GemRB.ChangeItemFlag (MyChar, slot, IE_INV_ITEM_IDENTIFIED, OP_OR): - pass - #print "NNN", slot +# for slot in range(0,50): +# if not GemRB.ChangeItemFlag (MyChar, slot, IE_INV_ITEM_IDENTIFIED, OP_OR): +# pass +# #print "NNN", slot GemRB.UnloadTable (EquipmentTable) GemRB.UnloadTable (KitTable) Modified: gemrb/trunk/gemrb/GUIScripts/how/CharGen.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/how/CharGen.py 2008-09-16 19:58:36 UTC (rev 5316) +++ gemrb/trunk/gemrb/GUIScripts/how/CharGen.py 2008-09-16 20:01:15 UTC (rev 5317) @@ -304,7 +304,7 @@ t = GemRB.GetTableValue ( AlignmentTable, GemRB.GetVar ("Alignment")-1, 3) GemRB.SetPlayerStat (MyChar, IE_ALIGNMENT, t) - TmpTable = GemRB.LoadTable ("clskills") + TmpTable = GemRB.LoadTable ("clskills") #mage spells TableName = GemRB.GetTableValue (TmpTable, Class, 2, 0) if TableName != "*": @@ -372,7 +372,7 @@ StatID = GemRB.GetTableValue (TmpTable, i, 0) Value = GemRB.GetVar ("Proficiency"+str(i) ) GemRB.SetPlayerStat (MyChar, StatID, Value ) - GemRB.UnloadTable (TmpTable) + GemRB.UnloadTable (TmpTable) SetColorStat (MyChar, IE_SKIN_COLOR, GemRB.GetVar ("SkinColor") ) SetColorStat (MyChar, IE_HAIR_COLOR, GemRB.GetVar ("HairColor") ) @@ -383,8 +383,8 @@ SetColorStat (MyChar, IE_ARMOR_COLOR, 0x17 ) GemRB.FillPlayerInfo(MyChar, PortraitName+"L", PortraitName+"S") - #35 is a weapon slot - GemRB.CreateItem(MyChar, "staf01", 35, 1, 0, 0) + #10 is a weapon slot (see slottype.2da row 10) + GemRB.CreateItem(MyChar, "staf01", 10, 1, 0, 0) GemRB.SetEquippedQuickSlot(MyChar, 0) GemRB.UnloadWindow (CharGenWindow) @@ -789,7 +789,7 @@ GemRB.SetText (ClassWindow, ClassMultiButton, 11993) KitButton = GemRB.GetControl (ClassWindow, 11) - #only the mage class has schools + #only the mage class has schools Allowed = GemRB.GetTableValue (ClassTable, "MAGE", RaceName) if Allowed: GemRB.SetButtonState (ClassWindow, KitButton, IE_GUI_BUTTON_ENABLED) @@ -1014,7 +1014,7 @@ def AlignmentSelectPress(): global AlignmentWindow, AlignmentTable, AlignmentTextArea, AlignmentDoneButton - Alignment = GemRB.GetVar ("Alignment") - 1 + Alignment = GemRB.GetVar ("Alignment") - 1 GemRB.SetText (AlignmentWindow, AlignmentTextArea, GemRB.GetTableValue (AlignmentTable, Alignment, 1)) GemRB.SetButtonState (AlignmentWindow, AlignmentDoneButton, IE_GUI_BUTTON_ENABLED) return @@ -2440,9 +2440,9 @@ e = GemRB.GetTableValue (TmpTable, Class, 4) #level bonus rate t = GemRB.GetPlayerStat (MyChar, IE_LEVEL) #FIXME: calculate multiclass average if t>1: - e=e*(t-1) + e=e*(t-1) else: - e=0 + e=0 t = GemRB.Roll (a,b,c)*d+e GemRB.SetPlayerStat (MyChar, IE_GOLD, t) Modified: gemrb/trunk/gemrb/GUIScripts/iwd/CharGen.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd/CharGen.py 2008-09-16 19:58:36 UTC (rev 5316) +++ gemrb/trunk/gemrb/GUIScripts/iwd/CharGen.py 2008-09-16 20:01:15 UTC (rev 5317) @@ -304,7 +304,7 @@ t = GemRB.GetTableValue ( AlignmentTable, GemRB.GetVar ("Alignment")-1, 3) GemRB.SetPlayerStat (MyChar, IE_ALIGNMENT, t) - TmpTable = GemRB.LoadTable ("clskills") + TmpTable = GemRB.LoadTable ("clskills") #mage spells TableName = GemRB.GetTableValue (TmpTable, Class, 2, 0) if TableName != "*": @@ -372,7 +372,7 @@ StatID = GemRB.GetTableValue (TmpTable, i, 0) Value = GemRB.GetVar ("Proficiency"+str(i) ) GemRB.SetPlayerStat (MyChar, StatID, Value ) - GemRB.UnloadTable (TmpTable) + GemRB.UnloadTable (TmpTable) SetColorStat (MyChar, IE_SKIN_COLOR, GemRB.GetVar ("SkinColor") ) SetColorStat (MyChar, IE_HAIR_COLOR, GemRB.GetVar ("HairColor") ) @@ -383,8 +383,8 @@ SetColorStat (MyChar, IE_ARMOR_COLOR, 0x17 ) GemRB.FillPlayerInfo(MyChar, PortraitName+"L", PortraitName+"S") - #35 is a weapon slot - GemRB.CreateItem(MyChar, "staf01", 35, 1, 0, 0) + #10 is a weapon slot (see slottype.2da row 10) + GemRB.CreateItem(MyChar, "staf01", 10, 1, 0, 0) GemRB.SetEquippedQuickSlot(MyChar, 0) GemRB.UnloadWindow (CharGenWindow) @@ -789,7 +789,7 @@ GemRB.SetText (ClassWindow, ClassMultiButton, 11993) KitButton = GemRB.GetControl (ClassWindow, 11) - #only the mage class has schools + #only the mage class has schools Allowed = GemRB.GetTableValue (ClassTable, "MAGE", RaceName) if Allowed: GemRB.SetButtonState (ClassWindow, KitButton, IE_GUI_BUTTON_ENABLED) @@ -1014,7 +1014,7 @@ def AlignmentSelectPress(): global AlignmentWindow, AlignmentTable, AlignmentTextArea, AlignmentDoneButton - Alignment = GemRB.GetVar ("Alignment") - 1 + Alignment = GemRB.GetVar ("Alignment") - 1 GemRB.SetText (AlignmentWindow, AlignmentTextArea, GemRB.GetTableValue (AlignmentTable, Alignment, 1)) GemRB.SetButtonState (AlignmentWindow, AlignmentDoneButton, IE_GUI_BUTTON_ENABLED) return This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ave...@us...> - 2008-09-16 20:09:44
|
Revision: 5318 http://gemrb.svn.sourceforge.net/gemrb/?rev=5318&view=rev Author: avenger_teambg Date: 2008-09-16 20:09:55 +0000 (Tue, 16 Sep 2008) Log Message: ----------- fixed racial enemy feature detection (use column name instead of index) so it is less prone to changes in clskills.2da Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/bg1/GUICG15.py gemrb/trunk/gemrb/GUIScripts/bg2/GUICG15.py Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUICG15.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/GUICG15.py 2008-09-16 20:01:15 UTC (rev 5317) +++ gemrb/trunk/gemrb/GUIScripts/bg1/GUICG15.py 2008-09-16 20:09:55 UTC (rev 5318) @@ -35,7 +35,8 @@ ClassRow = GemRB.GetVar("Class")-1 Class = GemRB.GetTableValue(ClassTable, ClassRow, 5) TmpTable = GemRB.LoadTable("clskills") - TableName = GemRB.GetTableValue(TmpTable, Class, 0) + ClassName = GemRB.GetTableRowName(TmpTable, Class) + TableName = GemRB.GetTableValue(TmpTable, ClassName, "HATERACE") if TableName == "*": GemRB.SetNextScript("GUICG7") return Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICG15.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG15.py 2008-09-16 20:01:15 UTC (rev 5317) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICG15.py 2008-09-16 20:09:55 UTC (rev 5318) @@ -35,7 +35,8 @@ ClassRow = GemRB.GetVar("Class")-1 Class = GemRB.GetTableValue(ClassTable, ClassRow, 5) TmpTable = GemRB.LoadTable("clskills") - TableName = GemRB.GetTableValue(TmpTable, Class, 9) + ClassName = GemRB.GetTableRowName(TmpTable, Class) + TableName = GemRB.GetTableValue(TmpTable, ClassName, "HATERACE") if TableName == "*": GemRB.SetNextScript("GUICG7") return This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ave...@us...> - 2008-09-17 18:14:30
|
Revision: 5320 http://gemrb.svn.sourceforge.net/gemrb/?rev=5320&view=rev Author: avenger_teambg Date: 2008-09-17 18:14:38 +0000 (Wed, 17 Sep 2008) Log Message: ----------- removed excess AttachScrollBar from guiinv everywhere Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/bg1/GUIINV.py gemrb/trunk/gemrb/GUIScripts/how/GUIINV.py gemrb/trunk/gemrb/GUIScripts/iwd/GUIINV.py gemrb/trunk/gemrb/GUIScripts/iwd2/GUIINV.py Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUIINV.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/GUIINV.py 2008-09-17 18:13:06 UTC (rev 5319) +++ gemrb/trunk/gemrb/GUIScripts/bg1/GUIINV.py 2008-09-17 18:14:38 UTC (rev 5320) @@ -98,7 +98,6 @@ Button = GemRB.GetControl (Window, i+68) GemRB.SetEvent (Window, Button, IE_GUI_MOUSE_ENTER_BUTTON, "MouseEnterGround") GemRB.SetEvent (Window, Button, IE_GUI_MOUSE_LEAVE_BUTTON, "MouseLeaveGround") - GemRB.AttachScrollBar (Window, Button, ScrollBar); GemRB.SetVarAssoc (Window, Button, "GroundItemButton", i) GemRB.SetButtonSprites (Window, Button, "STONSLOT",0,0,2,4,3) GemRB.SetButtonFont (Window, Button, "NUMBER") Modified: gemrb/trunk/gemrb/GUIScripts/how/GUIINV.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/how/GUIINV.py 2008-09-17 18:13:06 UTC (rev 5319) +++ gemrb/trunk/gemrb/GUIScripts/how/GUIINV.py 2008-09-17 18:14:38 UTC (rev 5320) @@ -100,7 +100,6 @@ Button = GemRB.GetControl (Window, i+68) GemRB.SetEvent (Window, Button, IE_GUI_MOUSE_ENTER_BUTTON, "MouseEnterGround") GemRB.SetEvent (Window, Button, IE_GUI_MOUSE_LEAVE_BUTTON, "MouseLeaveGround") - GemRB.AttachScrollBar (Window, Button, ScrollBar); GemRB.SetVarAssoc (Window, Button, "GroundItemButton", i) GemRB.SetButtonSprites (Window, Button, "STONSLOT",0,0,1,2,3) GemRB.SetButtonFont (Window, Button, "NUMBER") Modified: gemrb/trunk/gemrb/GUIScripts/iwd/GUIINV.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd/GUIINV.py 2008-09-17 18:13:06 UTC (rev 5319) +++ gemrb/trunk/gemrb/GUIScripts/iwd/GUIINV.py 2008-09-17 18:14:38 UTC (rev 5320) @@ -100,7 +100,6 @@ Button = GemRB.GetControl (Window, i+68) GemRB.SetEvent (Window, Button, IE_GUI_MOUSE_ENTER_BUTTON, "MouseEnterGround") GemRB.SetEvent (Window, Button, IE_GUI_MOUSE_LEAVE_BUTTON, "MouseLeaveGround") - GemRB.AttachScrollBar (Window, Button, ScrollBar); GemRB.SetVarAssoc (Window, Button, "GroundItemButton", i) GemRB.SetButtonSprites (Window, Button, "STONSLOT",0,0,1,2,3) GemRB.SetButtonFont (Window, Button, "NUMBER") Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/GUIINV.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/GUIINV.py 2008-09-17 18:13:06 UTC (rev 5319) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/GUIINV.py 2008-09-17 18:14:38 UTC (rev 5320) @@ -85,7 +85,6 @@ GemRB.SetTooltip (Window, Button, 12011) GemRB.SetEvent (Window, Button, IE_GUI_MOUSE_ENTER_BUTTON, "MouseEnterGround") GemRB.SetEvent (Window, Button, IE_GUI_MOUSE_LEAVE_BUTTON, "MouseLeaveGround") - GemRB.AttachScrollBar (Window, Button, ScrollBar); GemRB.SetVarAssoc (Window, Button, "GroundItemButton", i) GemRB.SetButtonFont (Window, Button, "NUMFONT") GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_ALIGN_RIGHT | IE_GUI_BUTTON_ALIGN_BOTTOM | IE_GUI_BUTTON_PICTURE, OP_OR) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lyn...@us...> - 2008-09-23 20:47:49
|
Revision: 5351 http://gemrb.svn.sourceforge.net/gemrb/?rev=5351&view=rev Author: lynxlupodian Date: 2008-09-23 20:47:40 +0000 (Tue, 23 Sep 2008) Log Message: ----------- bg1, bg2: made the sun dial pausing work, patch from zefklop [ 2121876 ] Gears : tooltip and pause Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/bg1/GUICommonWindows.py gemrb/trunk/gemrb/GUIScripts/bg2/GUICommonWindows.py gemrb/trunk/gemrb/GUIScripts/bg2/GUIWORLD.py Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUICommonWindows.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/GUICommonWindows.py 2008-09-23 20:46:02 UTC (rev 5350) +++ gemrb/trunk/gemrb/GUIScripts/bg1/GUICommonWindows.py 2008-09-23 20:47:40 UTC (rev 5351) @@ -100,6 +100,17 @@ Button = GemRB.GetControl (Window, 8) GemRB.SetTooltip (Window, Button, 16312) GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenPartyWindow") + + #gears + if Gears: + # Pendulum, gears, sun/moon dial (time) + # FIXME: display all animations: CPEN, CGEAR, CDIAL + Button = GemRB.GetControl (Window, 9) + GemRB.SetAnimation (Window, Button, "CGEAR") + GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_ENABLED) + GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_ANIMATED|IE_GUI_BUTTON_NORMAL, OP_SET) + GemRB.SetEvent(Window, Button, IE_GUI_BUTTON_ON_PRESS, "GearsClicked") + GemRB.SetTooltip(Window, Button, 16041) return @@ -693,3 +704,6 @@ GemRB.SetLabelTextColor (Window, Label, 255, 255, 255) GemRB.SetLabelTextColor (Window, Label2, 255, 0, 0) return + +def GearsClicked(): + GemRB.GamePause(2,0) Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICommonWindows.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUICommonWindows.py 2008-09-23 20:46:02 UTC (rev 5350) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICommonWindows.py 2008-09-23 20:47:40 UTC (rev 5351) @@ -98,8 +98,10 @@ # FIXME: display all animations: CPEN, CGEAR, CDIAL Button = GemRB.GetControl (Window, 9) GemRB.SetAnimation (Window, Button, "CPEN") - GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE | IE_GUI_BUTTON_ANIMATED, OP_SET) - GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_LOCKED) + GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_ENABLED) + GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_ANIMATED|IE_GUI_BUTTON_NORMAL, OP_SET) + GemRB.SetEvent(Window, Button, IE_GUI_BUTTON_ON_PRESS, "GearsClicked") + GemRB.SetTooltip(Window, Button, 16041) rb = 11 else: rb = 9 @@ -212,8 +214,10 @@ Button = GemRB.GetControl (Window, 62) # FIXME: display all animations GemRB.SetAnimation (Window, Button, "CPEN") - GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE | IE_GUI_BUTTON_ANIMATED, OP_SET) - GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_LOCKED) + GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_ENABLED) + GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_ANIMATED|IE_GUI_BUTTON_NORMAL, OP_SET) + GemRB.SetEvent(Window, Button, IE_GUI_BUTTON_ON_PRESS, "GearsClicked") + GemRB.SetTooltip(Window, Button, 16041) UpdateActionsWindow () return @@ -751,3 +755,6 @@ print 2**i, GemRB.GetSlots (pc, 2**i, 1) print SLOT_ANY, GemRB.GetSlots (pc, SLOT_ANY, 1) print + +def GearsClicked(): + GemRB.GamePause(2,0) Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUIWORLD.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUIWORLD.py 2008-09-23 20:46:02 UTC (rev 5350) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUIWORLD.py 2008-09-23 20:47:40 UTC (rev 5351) @@ -224,8 +224,10 @@ # Gears (time) when options pane is down Button = GemRB.GetControl (Window, 62) GemRB.SetAnimation (Window, Button, "CGEAR") - GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE | IE_GUI_BUTTON_ANIMATED, OP_SET) - GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_LOCKED) + GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_ENABLED) + GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_ANIMATED|IE_GUI_BUTTON_NORMAL, OP_SET) + GemRB.SetEvent(Window, Button, IE_GUI_BUTTON_ON_PRESS, "GearsClicked") + GemRB.SetTooltip(Window, Button, 16041) # 0 - 5 - Ground Item # 10 - 13 - Personal Item This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lyn...@us...> - 2008-09-24 20:06:31
|
Revision: 5352 http://gemrb.svn.sourceforge.net/gemrb/?rev=5352&view=rev Author: lynxlupodian Date: 2008-09-24 20:06:17 +0000 (Wed, 24 Sep 2008) Log Message: ----------- set the tokens needed for the pause button, last part of 2121876 Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/GUICommon.py gemrb/trunk/gemrb/GUIScripts/bg1/GUICommonWindows.py gemrb/trunk/gemrb/GUIScripts/bg2/GUICommonWindows.py gemrb/trunk/gemrb/GUIScripts/bg2/GUIWORLD.py Modified: gemrb/trunk/gemrb/GUIScripts/GUICommon.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/GUICommon.py 2008-09-23 20:47:40 UTC (rev 5351) +++ gemrb/trunk/gemrb/GUIScripts/GUICommon.py 2008-09-24 20:06:17 UTC (rev 5352) @@ -146,3 +146,10 @@ def GameIsTOB (): return GemRB.HasResource ("worldm25", RES_WMP) + +def SetGamedaysAndHourToken (): + currentTime = GemRB.GetGameTime() + days = currentTime / 7200 + hours = (currentTime % 7200) / 300 + GemRB.SetToken ('GAMEDAYS', str (days)) + GemRB.SetToken ('HOUR', str (hours)) Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUICommonWindows.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/GUICommonWindows.py 2008-09-23 20:47:40 UTC (rev 5351) +++ gemrb/trunk/gemrb/GUIScripts/bg1/GUICommonWindows.py 2008-09-24 20:06:17 UTC (rev 5352) @@ -28,6 +28,7 @@ from ie_stats import * from ie_modal import * from ie_action import * +from GUICommon import SetGamedaysAndHourToken FRAME_PC_SELECTED = 0 FRAME_PC_TARGET = 1 @@ -110,6 +111,7 @@ GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_ENABLED) GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_ANIMATED|IE_GUI_BUTTON_NORMAL, OP_SET) GemRB.SetEvent(Window, Button, IE_GUI_BUTTON_ON_PRESS, "GearsClicked") + SetGamedaysAndHourToken() GemRB.SetTooltip(Window, Button, 16041) return Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICommonWindows.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUICommonWindows.py 2008-09-23 20:47:40 UTC (rev 5351) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICommonWindows.py 2008-09-24 20:06:17 UTC (rev 5352) @@ -29,6 +29,7 @@ from ie_modal import * from ie_action import * from ie_slots import * +from GUICommon import SetGamedaysAndHourToken FRAME_PC_SELECTED = 0 FRAME_PC_TARGET = 1 @@ -101,6 +102,7 @@ GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_ENABLED) GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_ANIMATED|IE_GUI_BUTTON_NORMAL, OP_SET) GemRB.SetEvent(Window, Button, IE_GUI_BUTTON_ON_PRESS, "GearsClicked") + SetGamedaysAndHourToken() GemRB.SetTooltip(Window, Button, 16041) rb = 11 else: @@ -217,6 +219,7 @@ GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_ENABLED) GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_ANIMATED|IE_GUI_BUTTON_NORMAL, OP_SET) GemRB.SetEvent(Window, Button, IE_GUI_BUTTON_ON_PRESS, "GearsClicked") + SetGamedaysAndHourToken() GemRB.SetTooltip(Window, Button, 16041) UpdateActionsWindow () return Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUIWORLD.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUIWORLD.py 2008-09-23 20:47:40 UTC (rev 5351) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUIWORLD.py 2008-09-24 20:06:17 UTC (rev 5352) @@ -26,6 +26,7 @@ import GemRB from GUIDefines import * from GUICommon import CloseOtherWindow +from GUICommon import SetGamedaysAndHourToken from GUICommonWindows import * FRAME_PC_SELECTED = 0 @@ -227,6 +228,7 @@ GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_ENABLED) GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_ANIMATED|IE_GUI_BUTTON_NORMAL, OP_SET) GemRB.SetEvent(Window, Button, IE_GUI_BUTTON_ON_PRESS, "GearsClicked") + SetGamedaysAndHourToken() GemRB.SetTooltip(Window, Button, 16041) # 0 - 5 - Ground Item This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ave...@us...> - 2008-09-25 19:09:31
|
Revision: 5362 http://gemrb.svn.sourceforge.net/gemrb/?rev=5362&view=rev Author: avenger_teambg Date: 2008-09-25 19:09:16 +0000 (Thu, 25 Sep 2008) Log Message: ----------- iwd/how: enabled rest button, synchronised the time button improves Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/bg1/GUICommonWindows.py gemrb/trunk/gemrb/GUIScripts/bg2/GUICommonWindows.py gemrb/trunk/gemrb/GUIScripts/how/GUICommonWindows.py gemrb/trunk/gemrb/GUIScripts/iwd/GUICommonWindows.py Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUICommonWindows.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/GUICommonWindows.py 2008-09-25 18:05:48 UTC (rev 5361) +++ gemrb/trunk/gemrb/GUIScripts/bg1/GUICommonWindows.py 2008-09-25 19:09:16 UTC (rev 5362) @@ -63,6 +63,7 @@ #GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_RADIOBUTTON, OP_OR) GemRB.SetVarAssoc (Window, Button, "SelectedWindow", 2) GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenJournalWindow") + # Inventory Button = GemRB.GetControl (Window, 3) GemRB.SetTooltip (Window, Button, 16307) @@ -482,7 +483,7 @@ if needcontrols: Button = GemRB.GetControl (Window, 6) GSFlags = GemRB.GetMessageWindowSize ()&GS_PARTYAI - GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_CHECKBOX,OP_OR) + GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_CHECKBOX, OP_OR) #this control is crippled GemRB.SetButtonSprites (Window, Button, "GUIBTACT", 0, 46, 47, 48, 49) GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "AIPress") @@ -551,9 +552,9 @@ state = GemRB.GetPlayerStat (i+1, IE_STATE_ID) if (hp_max<1): - ratio = 0.0 + ratio = 0.0 else: - ratio = (hp+0.0) / hp_max + ratio = (hp+0.0) / hp_max if hp<1 or (state & STATE_DEAD): GemRB.SetButtonOverlay (Window, Button, ratio, 64,64,64,200, 64,64,64,200) Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICommonWindows.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUICommonWindows.py 2008-09-25 18:05:48 UTC (rev 5361) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICommonWindows.py 2008-09-25 19:09:16 UTC (rev 5362) @@ -93,7 +93,7 @@ # Multi player team setup? Button = GemRB.GetControl (Window, 8) GemRB.SetTooltip (Window, Button, 13902) - + if Gears: # Pendulum, gears, sun/moon dial (time) # FIXME: display all animations: CPEN, CGEAR, CDIAL @@ -379,13 +379,13 @@ GemRB.SetModalState (pc, MS_STEALTH) UpdateActionsWindow () return - + def ActionTurnPressed (): pc = GemRB.GameGetFirstSelectedPC () GemRB.SetModalState (pc, MS_TURNUNDEAD) UpdateActionsWindow () return - + def ActionUseItemPressed (): GemRB.SetVar ("TopIndex", 0) GemRB.SetVar ("ActionLevel", 1) @@ -403,7 +403,7 @@ #quick slot GemRB.UseItem (pc, -2, action) return - + def ActionQItem1Pressed (): ActionQItemPressed (ACT_QSLOT1) return @@ -537,9 +537,9 @@ # AI Button = GemRB.GetControl (Window, 6) #fixing a gui bug, and while we are at it, hacking it to be easier - GemRB.SetButtonSprites (Window, Button, "GUIBTACT",0,48,47,46,49) + GemRB.SetButtonSprites (Window, Button, "GUIBTACT", 0, 48, 47, 46, 49) GSFlags = GemRB.GetMessageWindowSize ()&GS_PARTYAI - + GemRB.SetVar ("AI", GSFlags) GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "AIPress") GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_CHECKBOX, OP_OR) @@ -602,9 +602,9 @@ state = GemRB.GetPlayerStat (i+1, IE_STATE_ID) if (hp_max<1): - ratio = 0.0 + ratio = 0.0 else: - ratio = (hp+0.0) / hp_max + ratio = (hp+0.0) / hp_max if hp<1 or (state & STATE_DEAD): GemRB.SetButtonOverlay (Window, Button, ratio, 64,64,64,200, 64,64,64,200) @@ -692,7 +692,7 @@ Race = GemRB.GetPlayerStat (pc, IE_RACE) RaceTable = GemRB.LoadTable ("races") - + Class = GemRB.FindTableValue (ClassTable, 5, Class) Multi = GemRB.GetTableValue (ClassTable, Class, 4) Modified: gemrb/trunk/gemrb/GUIScripts/how/GUICommonWindows.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/how/GUICommonWindows.py 2008-09-25 18:05:48 UTC (rev 5361) +++ gemrb/trunk/gemrb/GUIScripts/how/GUICommonWindows.py 2008-09-25 19:09:16 UTC (rev 5362) @@ -25,10 +25,10 @@ import GemRB from GUIDefines import * -from GUICommon import CloseOtherWindow from ie_stats import * from ie_modal import * from ie_action import * +from GUICommon import SetGamedaysAndHourToken FRAME_PC_SELECTED = 0 FRAME_PC_TARGET = 1 @@ -44,54 +44,55 @@ Button = GemRB.GetControl (Window, 0) GemRB.SetTooltip (Window, Button, 16313) #GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_RADIOBUTTON, OP_OR) - GemRB.SetVarAssoc(Window, Button, "SelectedWindow", 0) + GemRB.SetVarAssoc (Window, Button, "SelectedWindow", 0) GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, ReturnToGame) # Map Button = GemRB.GetControl (Window, 1) GemRB.SetTooltip (Window, Button, 16310) #GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_RADIOBUTTON, OP_OR) - GemRB.SetVarAssoc(Window, Button, "SelectedWindow", 1) + GemRB.SetVarAssoc (Window, Button, "SelectedWindow", 1) GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenMapWindow") # Journal Button = GemRB.GetControl (Window, 2) GemRB.SetTooltip (Window, Button, 16308) #GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_RADIOBUTTON, OP_OR) - GemRB.SetVarAssoc(Window, Button, "SelectedWindow", 2) + GemRB.SetVarAssoc (Window, Button, "SelectedWindow", 2) GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenJournalWindow") + # Inventory Button = GemRB.GetControl (Window, 3) GemRB.SetTooltip (Window, Button, 16307) #GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_RADIOBUTTON, OP_OR) - GemRB.SetVarAssoc(Window, Button, "SelectedWindow", 3) + GemRB.SetVarAssoc (Window, Button, "SelectedWindow", 3) GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenInventoryWindow") # Records Button = GemRB.GetControl (Window, 4) GemRB.SetTooltip (Window, Button, 16306) #GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_RADIOBUTTON, OP_OR) - GemRB.SetVarAssoc(Window, Button, "SelectedWindow", 4) + GemRB.SetVarAssoc (Window, Button, "SelectedWindow", 4) GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenRecordsWindow") # Mage Button = GemRB.GetControl (Window, 5) GemRB.SetTooltip (Window, Button, 16309) #GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_RADIOBUTTON, OP_OR) - GemRB.SetVarAssoc(Window, Button, "SelectedWindow", 5) + GemRB.SetVarAssoc (Window, Button, "SelectedWindow", 5) GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenMageWindow") # 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) + GemRB.SetVarAssoc (Window, Button, "SelectedWindow", 6) GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenPriestWindow") # Options Button = GemRB.GetControl (Window, 7) GemRB.SetTooltip (Window, Button, 16311) #GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_RADIOBUTTON, OP_OR) - GemRB.SetVarAssoc(Window, Button, "SelectedWindow", 7) + GemRB.SetVarAssoc (Window, Button, "SelectedWindow", 7) GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenOptionsWindow") # Party mgmt @@ -105,8 +106,11 @@ GemRB.CreateButton (Window, 9, 6, pos, 64, 71) Button = GemRB.GetControl (Window, 9) GemRB.SetAnimation (Window, Button, "CGEAR") - GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE | IE_GUI_BUTTON_ANIMATED, OP_SET) - GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_LOCKED) + GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_ENABLED) + GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_ANIMATED|IE_GUI_BUTTON_NORMAL, OP_SET) + GemRB.SetEvent(Window, Button, IE_GUI_BUTTON_ON_PRESS, "GearsClicked") + SetGamedaysAndHourToken() + GemRB.SetTooltip(Window, Button, 16041) return @@ -424,7 +428,7 @@ ClassTable = GemRB.LoadTable ("classes") Class = GemRB.FindTableValue ( ClassTable, 5, Class ) - if ClassTitle==0: + if ClassTitle == 0: if KitIndex == 0: ClassTitle=GemRB.GetTableValue (ClassTable, Class, 2) #else: @@ -475,19 +479,29 @@ Button = GemRB.GetControl (Window, 8) GemRB.SetButtonSprites (Window, Button, "GUIRSBUT", 0,0,1,0,0) GemRB.SetTooltip (Window, Button, 11942) + GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "RestPress") # AI pos = pos - 37 GemRB.CreateButton (Window, 6, 6, pos, 27, 36) Button = GemRB.GetControl (Window, 6) - GemRB.SetButtonSprites (Window, Button, "GUIBTACT",0,46,47,48,49) + #fixing a gui bug, and while we are at it, hacking it to be easier + GemRB.SetButtonSprites (Window, Button, "GUIBTACT", 0, 46, 47, 48, 49) + GSFlags = GemRB.GetMessageWindowSize ()&GS_PARTYAI + + GemRB.SetVar ("AI", GSFlags) + GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "AIPress") GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_CHECKBOX, OP_OR) - GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "AIPress") + GemRB.SetVarAssoc (Window, Button, "AI", 1) + if GSFlags: + GemRB.SetTooltip (PortraitWindow, Button, 15917) + else: + GemRB.SetTooltip (PortraitWindow, Button, 15918) #Select All GemRB.CreateButton (Window, 7, 33, pos, 27, 36) Button = GemRB.GetControl (Window, 7) - GemRB.SetButtonSprites (Window, Button, "GUIBTACT",0,50,51,50,51) + GemRB.SetButtonSprites (Window, Button, "GUIBTACT", 0, 50, 51, 50, 51) GemRB.SetTooltip (Window, Button, 10485) GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "SelectAllOnPress") else: @@ -700,3 +714,7 @@ GemRB.SetLabelTextColor (Window, Label, 255, 255, 255) GemRB.SetLabelTextColor (Window, Label2, 255, 0, 0) return + +def GearsClicked(): + GemRB.GamePause(2,0) + Modified: gemrb/trunk/gemrb/GUIScripts/iwd/GUICommonWindows.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd/GUICommonWindows.py 2008-09-25 18:05:48 UTC (rev 5361) +++ gemrb/trunk/gemrb/GUIScripts/iwd/GUICommonWindows.py 2008-09-25 19:09:16 UTC (rev 5362) @@ -25,10 +25,10 @@ import GemRB from GUIDefines import * -from GUICommon import CloseOtherWindow from ie_stats import * from ie_modal import * from ie_action import * +from GUICommon import SetGamedaysAndHourToken FRAME_PC_SELECTED = 0 FRAME_PC_TARGET = 1 @@ -44,54 +44,55 @@ Button = GemRB.GetControl (Window, 0) GemRB.SetTooltip (Window, Button, 16313) #GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_RADIOBUTTON, OP_OR) - GemRB.SetVarAssoc(Window, Button, "SelectedWindow", 0) + GemRB.SetVarAssoc (Window, Button, "SelectedWindow", 0) GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, ReturnToGame) # Map Button = GemRB.GetControl (Window, 1) GemRB.SetTooltip (Window, Button, 16310) #GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_RADIOBUTTON, OP_OR) - GemRB.SetVarAssoc(Window, Button, "SelectedWindow", 1) + GemRB.SetVarAssoc (Window, Button, "SelectedWindow", 1) GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenMapWindow") # Journal Button = GemRB.GetControl (Window, 2) GemRB.SetTooltip (Window, Button, 16308) #GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_RADIOBUTTON, OP_OR) - GemRB.SetVarAssoc(Window, Button, "SelectedWindow", 2) + GemRB.SetVarAssoc (Window, Button, "SelectedWindow", 2) GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenJournalWindow") + # Inventory Button = GemRB.GetControl (Window, 3) GemRB.SetTooltip (Window, Button, 16307) #GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_RADIOBUTTON, OP_OR) - GemRB.SetVarAssoc(Window, Button, "SelectedWindow", 3) + GemRB.SetVarAssoc (Window, Button, "SelectedWindow", 3) GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenInventoryWindow") # Records Button = GemRB.GetControl (Window, 4) GemRB.SetTooltip (Window, Button, 16306) #GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_RADIOBUTTON, OP_OR) - GemRB.SetVarAssoc(Window, Button, "SelectedWindow", 4) + GemRB.SetVarAssoc (Window, Button, "SelectedWindow", 4) GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenRecordsWindow") # Mage Button = GemRB.GetControl (Window, 5) GemRB.SetTooltip (Window, Button, 16309) #GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_RADIOBUTTON, OP_OR) - GemRB.SetVarAssoc(Window, Button, "SelectedWindow", 5) + GemRB.SetVarAssoc (Window, Button, "SelectedWindow", 5) GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenMageWindow") # 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) + GemRB.SetVarAssoc (Window, Button, "SelectedWindow", 6) GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenPriestWindow") # Options Button = GemRB.GetControl (Window, 7) GemRB.SetTooltip (Window, Button, 16311) #GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_RADIOBUTTON, OP_OR) - GemRB.SetVarAssoc(Window, Button, "SelectedWindow", 7) + GemRB.SetVarAssoc (Window, Button, "SelectedWindow", 7) GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenOptionsWindow") # Party mgmt @@ -103,8 +104,11 @@ # Gears (time) Button = GemRB.GetControl (Window, 9) GemRB.SetAnimation (Window, Button, "CGEAR") - GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE | IE_GUI_BUTTON_ANIMATED, OP_SET) - GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_LOCKED) + GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_ENABLED) + GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_ANIMATED|IE_GUI_BUTTON_NORMAL, OP_SET) + GemRB.SetEvent(Window, Button, IE_GUI_BUTTON_ON_PRESS, "GearsClicked") + SetGamedaysAndHourToken() + GemRB.SetTooltip(Window, Button, 16041) return @@ -264,7 +268,7 @@ GemRB.GameControlSetTargetMode (TARGET_MODE_ALL | TARGET_MODE_DEFEND) def ActionThievingPressed (): - GemRB.GameControlSetTargetMode (TARGET_MODE_ALL | TARGET_MODE_PICK) + GemRB.GameControlSetTargetMode (TARGET_MODE_ALL | TARGET_MODE_PICK) def ActionQWeaponPressed (which): pc = GemRB.GameGetFirstSelectedPC () @@ -422,7 +426,7 @@ ClassTable = GemRB.LoadTable ("classes") Class = GemRB.FindTableValue ( ClassTable, 5, Class ) - if ClassTitle==0: + if ClassTitle == 0: if KitIndex == 0: ClassTitle=GemRB.GetTableValue (ClassTable, Class, 2) #else: @@ -469,20 +473,28 @@ if needcontrols: # AI Button = GemRB.GetControl (Window, 6) + #fixing a gui bug, and while we are at it, hacking it to be easier + GemRB.SetButtonSprites (Window, Button, "GUIBTACT", 0, 46, 47, 48, 49) + GSFlags = GemRB.GetMessageWindowSize ()&GS_PARTYAI - GemRB.SetButtonSprites (Window, Button, "GUIBTACT",0,46,47,48,49) + GemRB.SetVar ("AI", GSFlags) + GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "AIPress") GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_CHECKBOX, OP_OR) - GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "AIPress") + GemRB.SetVarAssoc (Window, Button, "AI", 1) + if GSFlags: + GemRB.SetTooltip (PortraitWindow, Button, 15917) + else: + GemRB.SetTooltip (PortraitWindow, Button, 15918) #Select All Button = GemRB.GetControl (Window, 7) - GemRB.SetButtonSprites (Window, Button, "GUIBTACT",0,50,51,50,51) + GemRB.SetButtonSprites (Window, Button, "GUIBTACT", 0, 50, 51, 50, 51) GemRB.SetTooltip (Window, Button, 10485) GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "SelectAllOnPress") #Rest Button=GemRB.GetControl (PortraitWindow, 8) GemRB.SetTooltip (Window, Button, 11942) - GemRB.SetEvent (PortraitWindow, Button, IE_GUI_BUTTON_ON_PRESS, "RestParty") + GemRB.SetEvent (PortraitWindow, Button, IE_GUI_BUTTON_ON_PRESS, "RestPress") for i in range (PARTY_SIZE): Button = GemRB.GetControl (Window, i) @@ -691,3 +703,6 @@ GemRB.SetLabelTextColor (Window, Label, 255, 255, 255) GemRB.SetLabelTextColor (Window, Label2, 255, 0, 0) return + +def GearsClicked(): + GemRB.GamePause(2,0) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ave...@us...> - 2008-10-03 15:55:26
|
Revision: 5379 http://gemrb.svn.sourceforge.net/gemrb/?rev=5379&view=rev Author: avenger_teambg Date: 2008-10-03 15:55:18 +0000 (Fri, 03 Oct 2008) Log Message: ----------- how/iwd improved information/biography window, displaying custom bios Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/bg2/GUIREC.py gemrb/trunk/gemrb/GUIScripts/how/GUIREC.py gemrb/trunk/gemrb/GUIScripts/iwd/GUIREC.py Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUIREC.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUIREC.py 2008-10-01 20:20:59 UTC (rev 5378) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUIREC.py 2008-10-03 15:55:18 UTC (rev 5379) @@ -700,9 +700,9 @@ BiographyWindow = Window = GemRB.LoadWindow (12) TextArea = GemRB.GetControl (Window, 0) - GemRB.SetText (Window, TextArea, 33347) + pc = GemRB.GameGetSelectedPCSingle () + GemRB.SetText (Window, TextArea, GemRB.GetPlayerString(pc, 63) ) - # Done Button = GemRB.GetControl (Window, 2) GemRB.SetText (Window, Button, 11973) @@ -765,7 +765,7 @@ def IsDualClassed(actor, verbose): Dual = GemRB.GetPlayerStat (actor, IE_MC_FLAGS) Dual = Dual & ~(MC_EXPORTABLE|MC_PLOT_CRITICAL|MC_BEENINPARTY|MC_HIDDEN) - + if verbose: Class = GemRB.GetPlayerStat (actor, IE_CLASS) ClassTable = GemRB.LoadTable ("classes") Modified: gemrb/trunk/gemrb/GUIScripts/how/GUIREC.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/how/GUIREC.py 2008-10-01 20:20:59 UTC (rev 5378) +++ gemrb/trunk/gemrb/GUIScripts/how/GUIREC.py 2008-10-03 15:55:18 UTC (rev 5379) @@ -372,7 +372,7 @@ stats.append (9466) table = GemRB.LoadTable("weapprof") RowCount = GemRB.GetTableRowCount (table) - # + # for i in range(RowCount): text = GemRB.GetTableValue (table, i, 3) stat = GemRB.GetTableValue (table, i, 0) @@ -506,47 +506,138 @@ def OpenInformationWindow (): global InformationWindow - GemRB.HideGUI () - if InformationWindow != None: if BiographyWindow: OpenBiographyWindow () GemRB.UnloadWindow (InformationWindow) InformationWindow = None GemRB.SetVar ("FloatWindow", -1) - - GemRB.UnhideGUI() return InformationWindow = Window = GemRB.LoadWindow (4) GemRB.SetVar ("FloatWindow", InformationWindow) - # Biography + #Biography Button = GemRB.GetControl (Window, 26) GemRB.SetText (Window, Button, 18003) GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenBiographyWindow") - # Done + #Done Button = GemRB.GetControl (Window, 24) GemRB.SetText (Window, Button, 11973) GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenInformationWindow") - GemRB.UnhideGUI () + TotalPartyExp = 0 + ChapterPartyExp = 0 + TotalCount = 0 + ChapterCount = 0 + for i in range (1, GemRB.GetPartySize() + 1): + stat = GemRB.GetPCStats(i) + TotalPartyExp = TotalPartyExp + stat['KillsChapterXP'] + ChapterPartyExp = ChapterPartyExp + stat['KillsTotalXP'] + TotalCount = TotalCount + stat['KillsChapterCount'] + ChapterCount = ChapterCount + stat['KillsTotalCount'] + + # These are used to get the stats + pc = GemRB.GameGetSelectedPCSingle () + stat = GemRB.GetPCStats (pc) + + Label = GemRB.GetControl (Window, 0x10000000) + GemRB.SetText (Window, Label, GemRB.GetPlayerName (pc, 1)) + # class + ClassTitle = GetActorClassTitle(pc) + Label = GemRB.GetControl (Window, 0x10000018) + GemRB.SetText (Window, Label, ClassTitle) + + #most powerful vanquished + Label = GemRB.GetControl (Window, 0x10000005) + #we need getstring, so -1 will translate to empty string + GemRB.SetText (Window, Label, GemRB.GetString (stat['BestKilledName'])) + + # NOTE: currentTime is in seconds, joinTime is in seconds * 15 + # (script updates???). In each case, there are 60 seconds + # in a minute, 24 hours in a day, but ONLY 5 minutes in an hour!! + # Hence currentTime (and joinTime after div by 15) has + # 7200 secs a day (60 * 5 * 24) + currentTime = GemRB.GetGameTime() + joinTime = stat['JoinDate'] - stat['AwayTime'] + + party_time = currentTime - (joinTime / 15) + days = party_time / 7200 + hours = (party_time % 7200) / 300 + + GemRB.SetToken ('GAMEDAYS', str (days)) + GemRB.SetToken ('HOUR', str (hours)) + Label = GemRB.GetControl (Window, 0x10000006) + #actually it is 16043 <DURATION>, but duration is translated to + #16041, hopefully this won't cause problem with international version + GemRB.SetText (Window, Label, 16041) + + #favourite spell + Label = GemRB.GetControl (Window, 0x10000007) + GemRB.SetText (Window, Label, stat['FavouriteSpell']) + + #favourite weapon + Label = GemRB.GetControl (Window, 0x10000008) + #actually it is 10479 <WEAPONNAME>, but weaponname is translated to + #the real weapon name (which we should set using SetToken) + #there are other strings like bow+wname/xbow+wname/sling+wname + #are they used? + GemRB.SetText (Window, Label, stat['FavouriteWeapon']) + + #total xp + Label = GemRB.GetControl (Window, 0x1000000f) + if TotalPartyExp != 0: + PartyExp = int ((stat['KillsTotalXP'] * 100) / TotalPartyExp) + GemRB.SetText (Window, Label, str (PartyExp) + '%') + else: + GemRB.SetText (Window, Label, "0%") + + Label = GemRB.GetControl (Window, 0x10000013) + if ChapterPartyExp != 0: + PartyExp = int ((stat['KillsChapterXP'] * 100) / ChapterPartyExp) + GemRB.SetText (Window, Label, str (PartyExp) + '%') + else: + GemRB.SetText (Window, Label, "0%") + + #total xp + Label = GemRB.GetControl (Window, 0x10000010) + if TotalCount != 0: + PartyExp = int ((stat['KillsTotalCount'] * 100) / TotalCount) + GemRB.SetText (Window, Label, str (PartyExp) + '%') + else: + GemRB.SetText (Window, Label, "0%") + + Label = GemRB.GetControl (Window, 0x10000014) + if ChapterCount != 0: + PartyExp = int ((stat['KillsChapterCount'] * 100) / ChapterCount) + GemRB.SetText (Window, Label, str (PartyExp) + '%') + else: + GemRB.SetText (Window, Label, "0%") + + Label = GemRB.GetControl (Window, 0x10000011) + GemRB.SetText (Window, Label, str (stat['KillsChapterXP'])) + Label = GemRB.GetControl (Window, 0x10000015) + GemRB.SetText (Window, Label, str (stat['KillsTotalXP'])) + + #count of kills in chapter/game + Label = GemRB.GetControl (Window, 0x10000012) + GemRB.SetText (Window, Label, str (stat['KillsChapterCount'])) + Label = GemRB.GetControl (Window, 0x10000016) + GemRB.SetText (Window, Label, str (stat['KillsTotalCount'])) + GemRB.ShowModal (Window, MODAL_SHADOW_GRAY) + return - def OpenBiographyWindow (): global BiographyWindow - GemRB.HideGUI () - if BiographyWindow != None: GemRB.UnloadWindow (BiographyWindow) BiographyWindow = None GemRB.SetVar ("FloatWindow", InformationWindow) - GemRB.UnhideGUI() GemRB.ShowModal (InformationWindow, MODAL_SHADOW_GRAY) return @@ -554,14 +645,14 @@ GemRB.SetVar ("FloatWindow", BiographyWindow) TextArea = GemRB.GetControl (Window, 0) - GemRB.SetText (Window, TextArea, 39424) + pc = GemRB.GameGetSelectedPCSingle () + GemRB.SetText (Window, TextArea, GemRB.GetPlayerString(pc, 63) ) # Done Button = GemRB.GetControl (Window, 2) GemRB.SetText (Window, Button, 11973) GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenBiographyWindow") - GemRB.UnhideGUI () GemRB.ShowModal (Window, MODAL_SHADOW_GRAY) return Modified: gemrb/trunk/gemrb/GUIScripts/iwd/GUIREC.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd/GUIREC.py 2008-10-01 20:20:59 UTC (rev 5378) +++ gemrb/trunk/gemrb/GUIScripts/iwd/GUIREC.py 2008-10-03 15:55:18 UTC (rev 5379) @@ -506,47 +506,138 @@ def OpenInformationWindow (): global InformationWindow - GemRB.HideGUI () - if InformationWindow != None: if BiographyWindow: OpenBiographyWindow () GemRB.UnloadWindow (InformationWindow) InformationWindow = None GemRB.SetVar ("FloatWindow", -1) - - GemRB.UnhideGUI() return InformationWindow = Window = GemRB.LoadWindow (4) GemRB.SetVar ("FloatWindow", InformationWindow) - # Biography + #Biography Button = GemRB.GetControl (Window, 26) GemRB.SetText (Window, Button, 18003) GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenBiographyWindow") - # Done + #Done Button = GemRB.GetControl (Window, 24) GemRB.SetText (Window, Button, 11973) GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenInformationWindow") - GemRB.UnhideGUI () + TotalPartyExp = 0 + ChapterPartyExp = 0 + TotalCount = 0 + ChapterCount = 0 + for i in range (1, GemRB.GetPartySize() + 1): + stat = GemRB.GetPCStats(i) + TotalPartyExp = TotalPartyExp + stat['KillsChapterXP'] + ChapterPartyExp = ChapterPartyExp + stat['KillsTotalXP'] + TotalCount = TotalCount + stat['KillsChapterCount'] + ChapterCount = ChapterCount + stat['KillsTotalCount'] + + # These are used to get the stats + pc = GemRB.GameGetSelectedPCSingle () + stat = GemRB.GetPCStats (pc) + + Label = GemRB.GetControl (Window, 0x10000000) + GemRB.SetText (Window, Label, GemRB.GetPlayerName (pc, 1)) + # class + ClassTitle = GetActorClassTitle(pc) + Label = GemRB.GetControl (Window, 0x10000018) + GemRB.SetText (Window, Label, ClassTitle) + + #most powerful vanquished + Label = GemRB.GetControl (Window, 0x10000005) + #we need getstring, so -1 will translate to empty string + GemRB.SetText (Window, Label, GemRB.GetString (stat['BestKilledName'])) + + # NOTE: currentTime is in seconds, joinTime is in seconds * 15 + # (script updates???). In each case, there are 60 seconds + # in a minute, 24 hours in a day, but ONLY 5 minutes in an hour!! + # Hence currentTime (and joinTime after div by 15) has + # 7200 secs a day (60 * 5 * 24) + currentTime = GemRB.GetGameTime() + joinTime = stat['JoinDate'] - stat['AwayTime'] + + party_time = currentTime - (joinTime / 15) + days = party_time / 7200 + hours = (party_time % 7200) / 300 + + GemRB.SetToken ('GAMEDAYS', str (days)) + GemRB.SetToken ('HOUR', str (hours)) + Label = GemRB.GetControl (Window, 0x10000006) + #actually it is 16043 <DURATION>, but duration is translated to + #16041, hopefully this won't cause problem with international version + GemRB.SetText (Window, Label, 16041) + + #favourite spell + Label = GemRB.GetControl (Window, 0x10000007) + GemRB.SetText (Window, Label, stat['FavouriteSpell']) + + #favourite weapon + Label = GemRB.GetControl (Window, 0x10000008) + #actually it is 10479 <WEAPONNAME>, but weaponname is translated to + #the real weapon name (which we should set using SetToken) + #there are other strings like bow+wname/xbow+wname/sling+wname + #are they used? + GemRB.SetText (Window, Label, stat['FavouriteWeapon']) + + #total xp + Label = GemRB.GetControl (Window, 0x1000000f) + if TotalPartyExp != 0: + PartyExp = int ((stat['KillsTotalXP'] * 100) / TotalPartyExp) + GemRB.SetText (Window, Label, str (PartyExp) + '%') + else: + GemRB.SetText (Window, Label, "0%") + + Label = GemRB.GetControl (Window, 0x10000013) + if ChapterPartyExp != 0: + PartyExp = int ((stat['KillsChapterXP'] * 100) / ChapterPartyExp) + GemRB.SetText (Window, Label, str (PartyExp) + '%') + else: + GemRB.SetText (Window, Label, "0%") + + #total xp + Label = GemRB.GetControl (Window, 0x10000010) + if TotalCount != 0: + PartyExp = int ((stat['KillsTotalCount'] * 100) / TotalCount) + GemRB.SetText (Window, Label, str (PartyExp) + '%') + else: + GemRB.SetText (Window, Label, "0%") + + Label = GemRB.GetControl (Window, 0x10000014) + if ChapterCount != 0: + PartyExp = int ((stat['KillsChapterCount'] * 100) / ChapterCount) + GemRB.SetText (Window, Label, str (PartyExp) + '%') + else: + GemRB.SetText (Window, Label, "0%") + + Label = GemRB.GetControl (Window, 0x10000011) + GemRB.SetText (Window, Label, str (stat['KillsChapterXP'])) + Label = GemRB.GetControl (Window, 0x10000015) + GemRB.SetText (Window, Label, str (stat['KillsTotalXP'])) + + #count of kills in chapter/game + Label = GemRB.GetControl (Window, 0x10000012) + GemRB.SetText (Window, Label, str (stat['KillsChapterCount'])) + Label = GemRB.GetControl (Window, 0x10000016) + GemRB.SetText (Window, Label, str (stat['KillsTotalCount'])) + GemRB.ShowModal (Window, MODAL_SHADOW_GRAY) + return - def OpenBiographyWindow (): global BiographyWindow - GemRB.HideGUI () - if BiographyWindow != None: GemRB.UnloadWindow (BiographyWindow) BiographyWindow = None GemRB.SetVar ("FloatWindow", InformationWindow) - GemRB.UnhideGUI() GemRB.ShowModal (InformationWindow, MODAL_SHADOW_GRAY) return @@ -554,14 +645,14 @@ GemRB.SetVar ("FloatWindow", BiographyWindow) TextArea = GemRB.GetControl (Window, 0) - GemRB.SetText (Window, TextArea, 39424) + pc = GemRB.GameGetSelectedPCSingle () + GemRB.SetText (Window, TextArea, GemRB.GetPlayerString(pc, 63) ) # Done Button = GemRB.GetControl (Window, 2) GemRB.SetText (Window, Button, 11973) GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenBiographyWindow") - GemRB.UnhideGUI () GemRB.ShowModal (Window, MODAL_SHADOW_GRAY) return This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ave...@us...> - 2008-10-03 16:04:34
|
Revision: 5380 http://gemrb.svn.sourceforge.net/gemrb/?rev=5380&view=rev Author: avenger_teambg Date: 2008-10-03 16:04:23 +0000 (Fri, 03 Oct 2008) Log Message: ----------- synchronised bg1 information/biography windows Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/bg1/GUIREC.py gemrb/trunk/gemrb/GUIScripts/bg2/GUIREC.py Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUIREC.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/GUIREC.py 2008-10-03 15:55:18 UTC (rev 5379) +++ gemrb/trunk/gemrb/GUIScripts/bg1/GUIREC.py 2008-10-03 16:04:23 UTC (rev 5380) @@ -46,7 +46,7 @@ if CloseOtherWindow (OpenRecordsWindow): if InformationWindow: OpenInformationWindow () - + GemRB.UnloadWindow (RecordsWindow) GemRB.UnloadWindow (OptionsWindow) RecordsWindow = None @@ -461,13 +461,112 @@ GemRB.SetText (Window, Button, 11973) GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "CloseInformationWindow") + TotalPartyExp = 0 + ChapterPartyExp = 0 + TotalCount = 0 + ChapterCount = 0 + for i in range (1, GemRB.GetPartySize() + 1): + stat = GemRB.GetPCStats(i) + TotalPartyExp = TotalPartyExp + stat['KillsChapterXP'] + ChapterPartyExp = ChapterPartyExp + stat['KillsTotalXP'] + TotalCount = TotalCount + stat['KillsChapterCount'] + ChapterCount = ChapterCount + stat['KillsTotalCount'] + + # These are used to get the stats + pc = GemRB.GameGetSelectedPCSingle () + stat = GemRB.GetPCStats (pc) + + Label = GemRB.GetControl (Window, 0x10000000) + GemRB.SetText (Window, Label, GemRB.GetPlayerName (pc, 1)) + # class + ClassTitle = GetActorClassTitle(pc) + Label = GemRB.GetControl (Window, 0x10000018) + GemRB.SetText (Window, Label, ClassTitle) + + #most powerful vanquished + Label = GemRB.GetControl (Window, 0x10000005) + #we need getstring, so -1 will translate to empty string + GemRB.SetText (Window, Label, GemRB.GetString (stat['BestKilledName'])) + + # NOTE: currentTime is in seconds, joinTime is in seconds * 15 + # (script updates???). In each case, there are 60 seconds + # in a minute, 24 hours in a day, but ONLY 5 minutes in an hour!! + # Hence currentTime (and joinTime after div by 15) has + # 7200 secs a day (60 * 5 * 24) + currentTime = GemRB.GetGameTime() + joinTime = stat['JoinDate'] - stat['AwayTime'] + + party_time = currentTime - (joinTime / 15) + days = party_time / 7200 + hours = (party_time % 7200) / 300 + + GemRB.SetToken ('GAMEDAYS', str (days)) + GemRB.SetToken ('HOUR', str (hours)) + Label = GemRB.GetControl (Window, 0x10000006) + #actually it is 16043 <DURATION>, but duration is translated to + #16041, hopefully this won't cause problem with international version + GemRB.SetText (Window, Label, 16041) + + #favourite spell + Label = GemRB.GetControl (Window, 0x10000007) + GemRB.SetText (Window, Label, stat['FavouriteSpell']) + + #favourite weapon + Label = GemRB.GetControl (Window, 0x10000008) + #actually it is 10479 <WEAPONNAME>, but weaponname is translated to + #the real weapon name (which we should set using SetToken) + #there are other strings like bow+wname/xbow+wname/sling+wname + #are they used? + GemRB.SetText (Window, Label, stat['FavouriteWeapon']) + + #total xp + Label = GemRB.GetControl (Window, 0x1000000f) + if TotalPartyExp != 0: + PartyExp = int ((stat['KillsTotalXP'] * 100) / TotalPartyExp) + GemRB.SetText (Window, Label, str (PartyExp) + '%') + else: + GemRB.SetText (Window, Label, "0%") + + Label = GemRB.GetControl (Window, 0x10000013) + if ChapterPartyExp != 0: + PartyExp = int ((stat['KillsChapterXP'] * 100) / ChapterPartyExp) + GemRB.SetText (Window, Label, str (PartyExp) + '%') + else: + GemRB.SetText (Window, Label, "0%") + + #total xp + Label = GemRB.GetControl (Window, 0x10000010) + if TotalCount != 0: + PartyExp = int ((stat['KillsTotalCount'] * 100) / TotalCount) + GemRB.SetText (Window, Label, str (PartyExp) + '%') + else: + GemRB.SetText (Window, Label, "0%") + + Label = GemRB.GetControl (Window, 0x10000014) + if ChapterCount != 0: + PartyExp = int ((stat['KillsChapterCount'] * 100) / ChapterCount) + GemRB.SetText (Window, Label, str (PartyExp) + '%') + else: + GemRB.SetText (Window, Label, "0%") + + Label = GemRB.GetControl (Window, 0x10000011) + GemRB.SetText (Window, Label, str (stat['KillsChapterXP'])) + Label = GemRB.GetControl (Window, 0x10000015) + GemRB.SetText (Window, Label, str (stat['KillsTotalXP'])) + + #count of kills in chapter/game + Label = GemRB.GetControl (Window, 0x10000012) + GemRB.SetText (Window, Label, str (stat['KillsChapterCount'])) + Label = GemRB.GetControl (Window, 0x10000016) + GemRB.SetText (Window, Label, str (stat['KillsTotalCount'])) + GemRB.ShowModal (Window, MODAL_SHADOW_GRAY) return def CloseInformationWindow (): - global InformationWindow + global InformationWindow - GemRB.UnloadWindow (InformationWindow) + GemRB.UnloadWindow (InformationWindow) InformationWindow = None GemRB.SetVisible (OptionsWindow, 1) GemRB.SetVisible (RecordsWindow, 1) @@ -484,7 +583,8 @@ GemRB.SetVar ("FloatWindow", BiographyWindow) TextArea = GemRB.GetControl (Window, 0) - GemRB.SetText (Window, TextArea, 39424) + pc = GemRB.GameGetSelectedPCSingle () + GemRB.SetText (Window, TextArea, GemRB.GetPlayerString(pc, 74) ) # Done Button = GemRB.GetControl (Window, 2) @@ -495,9 +595,9 @@ return def CloseBiographyWindow (): - global BiographyWindow + global BiographyWindow - GemRB.UnloadWindow (BiographyWindow) + GemRB.UnloadWindow (BiographyWindow) BiographyWindow = None GemRB.SetVisible (InformationWindow, 1) return Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUIREC.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUIREC.py 2008-10-03 15:55:18 UTC (rev 5379) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUIREC.py 2008-10-03 16:04:23 UTC (rev 5380) @@ -701,7 +701,7 @@ TextArea = GemRB.GetControl (Window, 0) pc = GemRB.GameGetSelectedPCSingle () - GemRB.SetText (Window, TextArea, GemRB.GetPlayerString(pc, 63) ) + GemRB.SetText (Window, TextArea, GemRB.GetPlayerString(pc, 74) ) # Done Button = GemRB.GetControl (Window, 2) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ave...@us...> - 2008-09-28 17:13:57
|
Revision: 5370 http://gemrb.svn.sourceforge.net/gemrb/?rev=5370&view=rev Author: avenger_teambg Date: 2008-09-28 17:13:46 +0000 (Sun, 28 Sep 2008) Log Message: ----------- unload the loadscreen before EnterGame (can cause some bugs with autorepeat if the window remains active) Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/bg1/GUILOAD.py gemrb/trunk/gemrb/GUIScripts/bg2/GUILOAD.py gemrb/trunk/gemrb/GUIScripts/how/GUILOAD.py gemrb/trunk/gemrb/GUIScripts/iwd/GUILOAD.py gemrb/trunk/gemrb/GUIScripts/iwd2/GUILOAD.py gemrb/trunk/gemrb/GUIScripts/pst/GUILOAD.py Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUILOAD.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/GUILOAD.py 2008-09-28 16:48:52 UTC (rev 5369) +++ gemrb/trunk/gemrb/GUIScripts/bg1/GUILOAD.py 2008-09-28 17:13:46 UTC (rev 5370) @@ -98,6 +98,7 @@ return def LoadGamePress(): + GemRB.UnloadWindow(LoadWindow) Pos = GemRB.GetVar("TopIndex")+GemRB.GetVar("LoadIdx") StartLoadScreen() GemRB.LoadGame(Pos) #loads and enters savegame Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUILOAD.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUILOAD.py 2008-09-28 16:48:52 UTC (rev 5369) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUILOAD.py 2008-09-28 17:13:46 UTC (rev 5370) @@ -103,6 +103,7 @@ return def LoadGamePress(): + GemRB.UnloadWindow(LoadWindow) Pos = GemRB.GetVar("TopIndex")+GemRB.GetVar("LoadIdx") StartLoadScreen() GemRB.LoadGame(Pos) #loads and enters savegame Modified: gemrb/trunk/gemrb/GUIScripts/how/GUILOAD.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/how/GUILOAD.py 2008-09-28 16:48:52 UTC (rev 5369) +++ gemrb/trunk/gemrb/GUIScripts/how/GUILOAD.py 2008-09-28 17:13:46 UTC (rev 5370) @@ -123,6 +123,7 @@ return def LoadGamePress(): + GemRB.UnloadWindow(LoadWindow) Pos = GemRB.GetVar("TopIndex")+GemRB.GetVar("LoadIdx") StartLoadScreen() GemRB.LoadGame(Pos) #loads and enters savegame Modified: gemrb/trunk/gemrb/GUIScripts/iwd/GUILOAD.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd/GUILOAD.py 2008-09-28 16:48:52 UTC (rev 5369) +++ gemrb/trunk/gemrb/GUIScripts/iwd/GUILOAD.py 2008-09-28 17:13:46 UTC (rev 5370) @@ -123,6 +123,7 @@ return def LoadGamePress(): + GemRB.UnloadWindow(LoadWindow) Pos = GemRB.GetVar("TopIndex")+GemRB.GetVar("LoadIdx") StartLoadScreen() GemRB.LoadGame(Pos) #loads and enters savegame Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/GUILOAD.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/GUILOAD.py 2008-09-28 16:48:52 UTC (rev 5369) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/GUILOAD.py 2008-09-28 17:13:46 UTC (rev 5370) @@ -105,6 +105,7 @@ return def LoadGamePress(): + GemRB.UnloadWindow(LoadWindow) Pos = GemRB.GetVar("TopIndex")+GemRB.GetVar("LoadIdx") StartLoadScreen() GemRB.LoadGame(Pos) # load & start game Modified: gemrb/trunk/gemrb/GUIScripts/pst/GUILOAD.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/pst/GUILOAD.py 2008-09-28 16:48:52 UTC (rev 5369) +++ gemrb/trunk/gemrb/GUIScripts/pst/GUILOAD.py 2008-09-28 17:13:46 UTC (rev 5370) @@ -120,6 +120,7 @@ return def LoadGamePress(): + GemRB.UnloadWindow(LoadWindow) Pos = GemRB.GetVar("TopIndex")+GemRB.GetVar("LoadIdx") StartLoadScreen() GemRB.LoadGame(Pos) # load & start game This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ave...@us...> - 2008-10-01 18:36:42
|
Revision: 5375 http://gemrb.svn.sourceforge.net/gemrb/?rev=5375&view=rev Author: avenger_teambg Date: 2008-10-01 18:36:34 +0000 (Wed, 01 Oct 2008) Log Message: ----------- fixed iwd2 map notes, added clairvoyance effect support too Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/bg2/GUIMA.py gemrb/trunk/gemrb/GUIScripts/iwd2/GUIMA.py Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUIMA.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUIMA.py 2008-10-01 18:34:33 UTC (rev 5374) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUIMA.py 2008-10-01 18:36:34 UTC (rev 5375) @@ -33,7 +33,9 @@ NoteWindow = None WorldMapWindow = None WorldMapControl = None +PortraitWindow = None OldPortraitWindow = None +OptionsWindow = None OldOptionsWindow = None def RevealMap (): @@ -114,7 +116,7 @@ # Map Control GemRB.CreateMapControl (Window, 2, 0, 0, 0, 0, 0x10000003, "FLAG1") Map = GemRB.GetControl (Window, 2) - GemRB.SetVar("ShowMapNotes",IE_GUI_MAP_REVEAL_MAP) + GemRB.SetVar ("ShowMapNotes",IE_GUI_MAP_REVEAL_MAP) GemRB.SetVarAssoc (Window, Map, "ShowMapNotes", IE_GUI_MAP_REVEAL_MAP) GemRB.SetEvent (Window, Map, IE_GUI_MAP_ON_PRESS, "RevealMap") GemRB.SetVisible (Window, 1) @@ -256,7 +258,7 @@ return def OpenWorldMapWindowInside (): - OpenMapWindow() #closes mapwindow + OpenMapWindow () #closes mapwindow WorldMapWindowCommon (-1) return @@ -268,7 +270,6 @@ global WorldMapWindow, WorldMapControl tmp = GemRB.GetDestinationArea (WorldMapWindow, WorldMapControl) - print tmp CloseWorldMapWindow () GemRB.CreateMovement (tmp["Destination"], tmp["Entrance"]) return @@ -278,7 +279,6 @@ global str tmp = GemRB.GetDestinationArea (WorldMapWindow, WorldMapControl) - print tmp if (tmp): str = "%s: %d"%(GemRB.GetString(23084),tmp["Distance"]) else: @@ -301,7 +301,7 @@ global WorldMapWindow, WorldMapControl if WorldMapWindow: - CloseWorldMapWindow() + CloseWorldMapWindow () return GemRB.HideGUI () Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/GUIMA.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/GUIMA.py 2008-10-01 18:34:33 UTC (rev 5374) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/GUIMA.py 2008-10-01 18:36:34 UTC (rev 5375) @@ -37,15 +37,107 @@ PortraitWindow = None OldPortraitWindow = None +def RevealMap (): + global MapWindow + global OldPortraitWindow, OldOptionsWindow + + if CloseOtherWindow (ShowMap): + GemRB.UnloadWindow (MapWindow) + GemRB.UnloadWindow (OptionsWindow) + GemRB.UnloadWindow (PortraitWindow) + + MapWindow = None + #this window type should block the game + GemRB.SetVar ("OtherWindow", -1) + GemRB.SetVisible (0,1) + GemRB.UnhideGUI () + GUICommonWindows.PortraitWindow = OldPortraitWindow + OldPortraitWindow = None + GUICommonWindows.OptionsWindow = OldOptionsWindow + OldOptionsWindow = None + + PosX = GemRB.GetVar ("MapControlX") + PosY = GemRB.GetVar ("MapControlY") + + GemRB.RevealArea (PosX, PosY, 30, 1) + GemRB.GamePause (0,0) + return + ################################################### +# for farsight effect +################################################### +def ShowMap (): + global MapWindow, OptionsWindow, PortraitWindow + global OldPortraitWindow, OldOptionsWindow + + if CloseOtherWindow (ShowMap): + GemRB.UnloadWindow (MapWindow) + GemRB.UnloadWindow (OptionsWindow) + GemRB.UnloadWindow (PortraitWindow) + + MapWindow = None + #this window type should block the game + GemRB.SetVar ("OtherWindow", -1) + GemRB.SetVisible (0,1) + GemRB.UnhideGUI () + GUICommonWindows.PortraitWindow = OldPortraitWindow + OldPortraitWindow = None + GUICommonWindows.OptionsWindow = OldOptionsWindow + OldOptionsWindow = None + return + + GemRB.HideGUI () + GemRB.SetVisible (0,0) + + GemRB.LoadWindowPack ("GUIMAP", 640, 480) + MapWindow = Window = GemRB.LoadWindow (2) + #this window type blocks the game normally, but map window doesn't + GemRB.SetVar ("OtherWindow", MapWindow) + #saving the original portrait window + OldOptionsWindow = GUICommonWindows.OptionsWindow + OptionsWindow = GemRB.LoadWindow (0) + SetupMenuWindowControls (OptionsWindow, 0, "ShowMap") + OldPortraitWindow = GUICommonWindows.PortraitWindow + PortraitWindow = OpenPortraitWindow (0) + GemRB.SetWindowFrame (OptionsWindow) + + # World Map + Button = GemRB.GetControl (Window, 1) + GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_LOCKED) + + # Hide or Show mapnotes + Button = GemRB.GetControl (Window, 3) + GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_LOCKED) + + Label = GemRB.GetControl (Window, 0x10000003) + GemRB.SetText (Window, Label, "") + + # Map Control + GemRB.CreateMapControl (Window, 2, 0, 0, 0, 0, 0x10000003, "FLAG1") + Map = GemRB.GetControl (Window, 2) + GemRB.SetVar ("ShowMapNotes",IE_GUI_MAP_REVEAL_MAP) + GemRB.SetVarAssoc (Window, Map, "ShowMapNotes", IE_GUI_MAP_REVEAL_MAP) + GemRB.SetEvent (Window, Map, IE_GUI_MAP_ON_PRESS, "RevealMap") + GemRB.SetVisible (Window, 1) + GemRB.SetVisible (OptionsWindow, 2) + GemRB.SetVisible (PortraitWindow, 2) + GemRB.SetVisible (OptionsWindow, 3) + GemRB.SetVisible (PortraitWindow, 3) + GemRB.SetVisible (Window, 3) + GemRB.SetControlStatus(Window, Map, IE_GUI_CONTROL_FOCUSED) + GemRB.GamePause (0,0) + return + +################################################### def OpenMapWindow (): - global MapWindow, PortraitWindow, OptionsWindow + global MapWindow, OptionsWindow, PortraitWindow global OldPortraitWindow, OldOptionsWindow if CloseOtherWindow (OpenMapWindow): GemRB.UnloadWindow (MapWindow) + GemRB.UnloadWindow (OptionsWindow) GemRB.UnloadWindow (PortraitWindow) - GemRB.UnloadWindow (OptionsWindow) + MapWindow = None GemRB.SetVar ("OtherWindow", -1) GemRB.SetVisible (0,1) @@ -89,7 +181,8 @@ GemRB.CreateMapControl (Window, 2, 0, 0, 0, 0, 0x10000003, "FLAG1") Map = GemRB.GetControl (Window, 2) GemRB.SetVarAssoc (Window, Map, "ShowMapNotes", IE_GUI_MAP_VIEW_NOTES) - GemRB.SetEvent (Window, Map, IE_GUI_MAP_ON_PRESS, "AddNoteWindow") + GemRB.SetEvent (Window, Map, IE_GUI_MAP_ON_RIGHT_PRESS, "AddNoteWindow") + GemRB.SetEvent (Window, Map, IE_GUI_MAP_ON_DOUBLE_PRESS, "LeftDoublePressMap") GemRB.SetVisible( OptionsWindow, 1) GemRB.SetVisible( PortraitWindow, 1) GemRB.SetVisible( Window, 1) @@ -99,45 +192,61 @@ return def CloseNoteWindow (): - GemRB.SetVisible (NoteWindow, 0) - GemRB.SetVisible (PortraitWindow, 1) + GemRB.UnloadWindow (NoteWindow) GemRB.SetVisible (MapWindow, 1) - GemRB.SetVisible (OptionsWindow, 1) return def RemoveMapNote (): - PosX = GemRB.GetVar("MapControlX") - PosY = GemRB.GetVar("MapControlY") + PosX = GemRB.GetVar ("MapControlX") + PosY = GemRB.GetVar ("MapControlY") GemRB.SetMapnote (PosX, PosY, 0, "") CloseNoteWindow () return +def QueryText (): + Data = "" + row = 0 + while 1: + GemRB.SetVar ("row", row) + GemRB.SetVarAssoc (NoteWindow, NoteLabel, "row", row) + line = GemRB.QueryText (NoteWindow, NoteLabel) + if len(line)<=0: + break + Data += line+"\n" + row += 1 + return Data + def SetMapNote (): - PosX = GemRB.GetVar("MapControlX") - PosY = GemRB.GetVar("MapControlY") + PosX = GemRB.GetVar ("MapControlX") + PosY = GemRB.GetVar ("MapControlY") Label = GemRB.GetControl (NoteWindow, 1) - Text = GemRB.QueryText (NoteWindow, Label) - Color = GemRB.GetVar("Color") + Text = QueryText () + Color = GemRB.GetVar ("Color") GemRB.SetMapnote (PosX, PosY, Color, Text) CloseNoteWindow () return +def SetFocusBack (): + GemRB.SetControlStatus (NoteWindow, NoteLabel, IE_GUI_CONTROL_FOCUSED) + return + def AddNoteWindow (): - global NoteWindow + global NoteWindow, NoteLabel Label = GemRB.GetControl (MapWindow, 0x10000003) Text = GemRB.QueryText (MapWindow, Label) NoteWindow = GemRB.LoadWindow (5) - Label = GemRB.GetControl (NoteWindow, 1) - Label = GemRB.ConvertEdit (NoteWindow, Label, 1) - GemRB.SetText (NoteWindow, Label, Text) - GemRB.SetControlStatus (NoteWindow, Label, IE_GUI_CONTROL_FOCUSED) + NoteLabel = GemRB.GetControl (NoteWindow, 1) + NoteLabel = GemRB.ConvertEdit (NoteWindow, NoteLabel, 1) + GemRB.SetText (NoteWindow, NoteLabel, Text) + GemRB.SetControlStatus (NoteWindow, NoteLabel, IE_GUI_CONTROL_FOCUSED) for i in range(8): Label = GemRB.GetControl (NoteWindow, 4+i) GemRB.SetButtonSprites (NoteWindow, Label, "FLAG1", i,0,1,2,0) - GemRB.SetButtonFlags (NoteWindow, Label, IE_GUI_BUTTON_RADIOBUTTON, OP_OR) + GemRB.SetButtonFlags (NoteWindow, Label, IE_GUI_BUTTON_RADIOBUTTON, OP_SET) GemRB.SetVarAssoc (NoteWindow, Label, "Color", i) + GemRB.SetEvent (NoteWindow, Label, IE_GUI_BUTTON_ON_PRESS, "SetFocusBack") #convert to multiline, destroy unwanted resources @@ -190,7 +299,7 @@ GemRB.SetTooltip (WorldMapWindow, WorldMapControl, str) return -def CloseWorldMapWindow(): +def CloseWorldMapWindow (): global WorldMapWindow, WorldMapControl GemRB.UnloadWindow (WorldMapWindow) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lyn...@us...> - 2008-10-06 17:34:54
|
Revision: 5409 http://gemrb.svn.sourceforge.net/gemrb/?rev=5409&view=rev Author: lynxlupodian Date: 2008-10-06 17:33:52 +0000 (Mon, 06 Oct 2008) Log Message: ----------- a few syntax changes for better future compatibility Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG6.py gemrb/trunk/gemrb/GUIScripts/pst/FloatMenuWindow.py gemrb/trunk/gemrb/GUIScripts/pst/GUIINV.py Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICG6.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG6.py 2008-10-06 10:20:10 UTC (rev 5408) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICG6.py 2008-10-06 17:33:52 UTC (rev 5409) @@ -171,7 +171,7 @@ return GemRB.SetVar("Skill "+str(Pos),ActPoint-1) PointsLeft = PointsLeft + 1 - if OldPos <> Pos: + if OldPos != Pos: OldPos = Pos ClickCount = 0 @@ -190,7 +190,7 @@ return GemRB.SetVar("Skill "+str(Pos), ActPoint+1) PointsLeft = PointsLeft - 1 - if OldPos <> Pos: + if OldPos != Pos: OldPos = Pos ClickCount = 0 Modified: gemrb/trunk/gemrb/GUIScripts/pst/FloatMenuWindow.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/pst/FloatMenuWindow.py 2008-10-06 10:20:10 UTC (rev 5408) +++ gemrb/trunk/gemrb/GUIScripts/pst/FloatMenuWindow.py 2008-10-06 17:33:52 UTC (rev 5409) @@ -318,7 +318,7 @@ # Spell was already used up if not ms['Flags']: continue - if spell_hash.has_key (ms['SpellResRef']): + if ms['SpellResRef'] in spell_hash: spell_hash[ms['SpellResRef']] = spell_hash[ms['SpellResRef']] + 1 else: spell_hash[ms['SpellResRef']] = 1 Modified: gemrb/trunk/gemrb/GUIScripts/pst/GUIINV.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/pst/GUIINV.py 2008-10-06 10:20:10 UTC (rev 5408) +++ gemrb/trunk/gemrb/GUIScripts/pst/GUIINV.py 2008-10-06 17:33:52 UTC (rev 5409) @@ -460,7 +460,7 @@ if tmp < 0: tmp = 43 - while not ItemHash.has_key(tmp) or not ItemHash[tmp][1]: + while tmp not in ItemHash or not ItemHash[tmp][1]: tmp = tmp - 1 if tmp < 0: tmp = 43 @@ -476,7 +476,7 @@ if tmp > 43: tmp = 0 - while not ItemHash.has_key(tmp) or not ItemHash[tmp][1]: + while tmp not in ItemHash or not ItemHash[tmp][1]: tmp = tmp + 1 if tmp > 43: tmp = 0 @@ -720,7 +720,7 @@ pc = GemRB.GameGetSelectedPCSingle () slot = GemRB.GetVar ('ItemButton') - if not ItemHash.has_key(slot): + if slot not in ItemHash: return OverSlot = ItemHash[slot][0]-1 if GemRB.IsDraggingItem (): @@ -734,7 +734,7 @@ pc = GemRB.GameGetSelectedPCSingle () slot = GemRB.GetVar ('ItemButton') - if not ItemHash.has_key(slot): + if slot not in ItemHash: return slot = ItemHash[slot][0]-1 if slot == OverSlot or not GemRB.IsDraggingItem (): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ave...@us...> - 2008-10-08 16:18:59
|
Revision: 5412 http://gemrb.svn.sourceforge.net/gemrb/?rev=5412&view=rev Author: avenger_teambg Date: 2008-10-08 16:18:53 +0000 (Wed, 08 Oct 2008) Log Message: ----------- fixed a 64 bit specific bug in TextScreen (-1+1 was not 0) Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/bg1/TextScreen.py gemrb/trunk/gemrb/GUIScripts/bg2/TextScreen.py gemrb/trunk/gemrb/GUIScripts/how/TextScreen.py gemrb/trunk/gemrb/GUIScripts/iwd/TextScreen.py gemrb/trunk/gemrb/GUIScripts/iwd2/TextScreen.py Modified: gemrb/trunk/gemrb/GUIScripts/bg1/TextScreen.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/TextScreen.py 2008-10-08 00:08:53 UTC (rev 5411) +++ gemrb/trunk/gemrb/GUIScripts/bg1/TextScreen.py 2008-10-08 16:18:53 UTC (rev 5412) @@ -38,7 +38,7 @@ if TableName[:6] == "chptxt": GemRB.LoadMusicPL("chapter.mus") - Chapter = GemRB.GetGameVar("CHAPTER") + Chapter = GemRB.GetGameVar("CHAPTER") & 0x7fffffff #set ID according to the Chapter? ID = Chapter+1 TextScreen = GemRB.LoadWindow (ID) Modified: gemrb/trunk/gemrb/GUIScripts/bg2/TextScreen.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/TextScreen.py 2008-10-08 00:08:53 UTC (rev 5411) +++ gemrb/trunk/gemrb/GUIScripts/bg2/TextScreen.py 2008-10-08 16:18:53 UTC (rev 5412) @@ -38,7 +38,7 @@ #if there is no preset loadpic, try to determine it from the chapter if TableName == "": - Chapter = GemRB.GetGameVar ("CHAPTER") + Chapter = GemRB.GetGameVar ("CHAPTER") & 0x7fffffff TableName = "CHPTXT"+str(Chapter) #set ID according to the Chapter? Modified: gemrb/trunk/gemrb/GUIScripts/how/TextScreen.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/how/TextScreen.py 2008-10-08 00:08:53 UTC (rev 5411) +++ gemrb/trunk/gemrb/GUIScripts/how/TextScreen.py 2008-10-08 16:18:53 UTC (rev 5412) @@ -38,7 +38,7 @@ print "LoadPic", LoadPic #if there is no preset loadpic, try to determine it from the chapter #fixme: we always assume there isn't - ID = GemRB.GetGameVar("CHAPTER") + 1 + ID = (GemRB.GetGameVar("CHAPTER") + 1) & 0x7fffffff #set ID according to the Chapter? Chapter = ID + 1 @@ -48,6 +48,7 @@ else: GemRB.LoadMusicPL ("chap1.mus") + print "Load ",ID TextScreen = GemRB.LoadWindow (ID) GemRB.SetWindowFrame (TextScreen) Modified: gemrb/trunk/gemrb/GUIScripts/iwd/TextScreen.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd/TextScreen.py 2008-10-08 00:08:53 UTC (rev 5411) +++ gemrb/trunk/gemrb/GUIScripts/iwd/TextScreen.py 2008-10-08 16:18:53 UTC (rev 5412) @@ -38,7 +38,7 @@ print "LoadPic", LoadPic #if there is no preset loadpic, try to determine it from the chapter #fixme: we always assume there isn't - ID = GemRB.GetGameVar("CHAPTER") + 1 + ID = (GemRB.GetGameVar("CHAPTER") + 1) & 0x7fffffff #set ID according to the Chapter? Chapter = ID + 1 Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/TextScreen.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/TextScreen.py 2008-10-08 00:08:53 UTC (rev 5411) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/TextScreen.py 2008-10-08 16:18:53 UTC (rev 5412) @@ -35,7 +35,7 @@ GemRB.LoadWindowPack ("GUICHAP", 800, 600) LoadPic = GemRB.GetGameString (STR_LOADMOS) #if there is no preset loadpic, try to determine it from the chapter - ID = GemRB.GetGameVar("CHAPTER") + ID = GemRB.GetGameVar("CHAPTER") & 0x7fffffff #set ID according to the Chapter? Chapter = ID + 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ave...@us...> - 2008-10-08 18:39:38
|
Revision: 5413 http://gemrb.svn.sourceforge.net/gemrb/?rev=5413&view=rev Author: avenger_teambg Date: 2008-10-08 18:39:33 +0000 (Wed, 08 Oct 2008) Log Message: ----------- fixed problem with druids in chargen Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/how/CharGen.py gemrb/trunk/gemrb/GUIScripts/how/TextScreen.py gemrb/trunk/gemrb/GUIScripts/iwd/CharGen.py gemrb/trunk/gemrb/GUIScripts/iwd/TextScreen.py Modified: gemrb/trunk/gemrb/GUIScripts/how/CharGen.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/how/CharGen.py 2008-10-08 16:18:53 UTC (rev 5412) +++ gemrb/trunk/gemrb/GUIScripts/how/CharGen.py 2008-10-08 18:39:33 UTC (rev 5413) @@ -321,6 +321,9 @@ #priest spells TableName = GemRB.GetTableValue (TmpTable, Class, 1, 0) if TableName != "*": + #there is no separate druid table, falling back to priest + if TableName == "MXSPLDRU": + TableName = "MXSPLPRS" #todo: set up ALL spell levels not just level 1 SetupSpellLevels(MyChar, TableName, IE_SPELL_TYPE_PRIEST, 1) ClassFlag = 0 #set this according to class Modified: gemrb/trunk/gemrb/GUIScripts/how/TextScreen.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/how/TextScreen.py 2008-10-08 16:18:53 UTC (rev 5412) +++ gemrb/trunk/gemrb/GUIScripts/how/TextScreen.py 2008-10-08 18:39:33 UTC (rev 5413) @@ -35,7 +35,6 @@ GemRB.LoadWindowPack ("GUICHAP", 640, 480) LoadPic = GemRB.GetGameString (STR_LOADMOS) - print "LoadPic", LoadPic #if there is no preset loadpic, try to determine it from the chapter #fixme: we always assume there isn't ID = (GemRB.GetGameVar("CHAPTER") + 1) & 0x7fffffff @@ -48,7 +47,6 @@ else: GemRB.LoadMusicPL ("chap1.mus") - print "Load ",ID TextScreen = GemRB.LoadWindow (ID) GemRB.SetWindowFrame (TextScreen) Modified: gemrb/trunk/gemrb/GUIScripts/iwd/CharGen.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd/CharGen.py 2008-10-08 16:18:53 UTC (rev 5412) +++ gemrb/trunk/gemrb/GUIScripts/iwd/CharGen.py 2008-10-08 18:39:33 UTC (rev 5413) @@ -321,6 +321,9 @@ #priest spells TableName = GemRB.GetTableValue (TmpTable, Class, 1, 0) if TableName != "*": + #there is no separate druid table, falling back to priest + if TableName == "MXSPLDRU": + TableName = "MXSPLPRS" #todo: set up ALL spell levels not just level 1 SetupSpellLevels(MyChar, TableName, IE_SPELL_TYPE_PRIEST, 1) ClassFlag = 0 #set this according to class Modified: gemrb/trunk/gemrb/GUIScripts/iwd/TextScreen.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd/TextScreen.py 2008-10-08 16:18:53 UTC (rev 5412) +++ gemrb/trunk/gemrb/GUIScripts/iwd/TextScreen.py 2008-10-08 18:39:33 UTC (rev 5413) @@ -35,7 +35,6 @@ GemRB.LoadWindowPack ("GUICHAP", 640, 480) LoadPic = GemRB.GetGameString (STR_LOADMOS) - print "LoadPic", LoadPic #if there is no preset loadpic, try to determine it from the chapter #fixme: we always assume there isn't ID = (GemRB.GetGameVar("CHAPTER") + 1) & 0x7fffffff This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ave...@us...> - 2008-10-09 17:15:42
|
Revision: 5419 http://gemrb.svn.sourceforge.net/gemrb/?rev=5419&view=rev Author: avenger_teambg Date: 2008-10-09 17:15:40 +0000 (Thu, 09 Oct 2008) Log Message: ----------- fixed bags in how/iwd Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/how/GUIINV.py gemrb/trunk/gemrb/GUIScripts/how/GUISTORE.py gemrb/trunk/gemrb/GUIScripts/iwd/GUIINV.py gemrb/trunk/gemrb/GUIScripts/iwd/GUISTORE.py Modified: gemrb/trunk/gemrb/GUIScripts/how/GUIINV.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/how/GUIINV.py 2008-10-09 17:01:10 UTC (rev 5418) +++ gemrb/trunk/gemrb/GUIScripts/how/GUIINV.py 2008-10-09 17:15:40 UTC (rev 5419) @@ -537,6 +537,19 @@ UpdateInventoryWindow () return +def OpenItemWindow (): + #close inventory + GemRB.SetVar ("Inventory", 1) + GemRB.UnloadWindow (ItemInfoWindow) + OpenInventoryWindow () + pc = GemRB.GameGetSelectedPCSingle () + slot = GemRB.GetVar ("ItemButton") + slot_item = GemRB.GetSlotItem (pc, slot) + ResRef = slot_item['ItemResRef'] + #the store will have to reopen the inventory + GemRB.EnterStore (ResRef) + return + def DialogItemWindow (): GemRB.UnloadWindow (ItemInfoWindow) OpenInventoryWindow () @@ -667,7 +680,7 @@ GemRB.SetText (Window, Button, 17104) GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "ReadItemWindow") elif container: - GemRB.SetText (Window, Button, 14133) + GemRB.SetText (Window, Button, 24891) GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenItemWindow") elif dialog: GemRB.SetText (Window, Button, item["DialogName"]) Modified: gemrb/trunk/gemrb/GUIScripts/how/GUISTORE.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/how/GUISTORE.py 2008-10-09 17:01:10 UTC (rev 5418) +++ gemrb/trunk/gemrb/GUIScripts/how/GUISTORE.py 2008-10-09 17:15:40 UTC (rev 5419) @@ -72,7 +72,7 @@ # 5 - drink # 6 - rent -storebams = ("STORSTOR","STORTVRN","STORINN","STORTMPL","STORBAG","STORBAG") +storebams = ("STORSTOR","STORTVRN","STORINN","STORTMPL","STORSTOR","STORSTOR") storetips = (14288,14292,14291,12138,15013,14289,14287) roomtypes = (17389,17517,17521,17519) store_funcs = ( "OpenStoreShoppingWindow", "OpenStoreIdentifyWindow", Modified: gemrb/trunk/gemrb/GUIScripts/iwd/GUIINV.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd/GUIINV.py 2008-10-09 17:01:10 UTC (rev 5418) +++ gemrb/trunk/gemrb/GUIScripts/iwd/GUIINV.py 2008-10-09 17:15:40 UTC (rev 5419) @@ -537,6 +537,19 @@ UpdateInventoryWindow () return +def OpenItemWindow (): + #close inventory + GemRB.SetVar ("Inventory", 1) + GemRB.UnloadWindow (ItemInfoWindow) + OpenInventoryWindow () + pc = GemRB.GameGetSelectedPCSingle () + slot = GemRB.GetVar ("ItemButton") + slot_item = GemRB.GetSlotItem (pc, slot) + ResRef = slot_item['ItemResRef'] + #the store will have to reopen the inventory + GemRB.EnterStore (ResRef) + return + def DialogItemWindow (): GemRB.UnloadWindow (ItemInfoWindow) OpenInventoryWindow () @@ -667,7 +680,7 @@ GemRB.SetText (Window, Button, 17104) GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "ReadItemWindow") elif container: - GemRB.SetText (Window, Button, 14133) + GemRB.SetText (Window, Button, 24891) GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenItemWindow") elif dialog: GemRB.SetText (Window, Button, item["DialogName"]) Modified: gemrb/trunk/gemrb/GUIScripts/iwd/GUISTORE.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd/GUISTORE.py 2008-10-09 17:01:10 UTC (rev 5418) +++ gemrb/trunk/gemrb/GUIScripts/iwd/GUISTORE.py 2008-10-09 17:15:40 UTC (rev 5419) @@ -72,7 +72,7 @@ # 5 - drink # 6 - rent -storebams = ("STORSTOR","STORTVRN","STORINN","STORTMPL","STORBAG","STORBAG") +storebams = ("STORSTOR","STORTVRN","STORINN","STORTMPL","STORSTOR","STORSTOR") storetips = (14288,14292,14291,12138,15013,14289,14287) roomtypes = (17389,17517,17521,17519) store_funcs = ( "OpenStoreShoppingWindow", "OpenStoreIdentifyWindow", This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ave...@us...> - 2008-10-09 18:28:46
|
Revision: 5420 http://gemrb.svn.sourceforge.net/gemrb/?rev=5420&view=rev Author: avenger_teambg Date: 2008-10-09 18:28:39 +0000 (Thu, 09 Oct 2008) Log Message: ----------- more fixes in store Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/bg1/GUISTORE.py gemrb/trunk/gemrb/GUIScripts/bg2/GUISTORE.py gemrb/trunk/gemrb/GUIScripts/how/GUISTORE.py gemrb/trunk/gemrb/GUIScripts/iwd/GUISTORE.py Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUISTORE.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/GUISTORE.py 2008-10-09 17:15:40 UTC (rev 5419) +++ gemrb/trunk/gemrb/GUIScripts/bg1/GUISTORE.py 2008-10-09 18:28:39 UTC (rev 5420) @@ -504,15 +504,22 @@ LeftCount = Store['StoreItemCount'] ScrollBar = GemRB.GetControl (Window, 11) GemRB.SetVarAssoc (Window, ScrollBar, "LeftTopIndex", LeftCount-3) + LeftTopIndex = GemRB.GetVar ("LeftTopIndex") + if LeftTopIndex>LeftCount-3: + GemRB.SetVar ("LeftTopIndex", LeftCount-3) pc = GemRB.GameGetSelectedPCSingle () inventory_slots = GemRB.GetSlots (pc, SLOT_INVENTORY) RightCount = len(inventory_slots) ScrollBar = GemRB.GetControl (Window, 12) GemRB.SetVarAssoc (Window, ScrollBar, "RightTopIndex", RightCount-3) + RightTopIndex = GemRB.GetVar ("RightTopIndex") + if RightTopIndex>RightCount-3: + GemRB.SetVar ("RightTopIndex", RightCount-3) + RedrawStoreShoppingWindow () + return - def SelectBuy (): Window = StoreShoppingWindow Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUISTORE.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUISTORE.py 2008-10-09 17:15:40 UTC (rev 5419) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUISTORE.py 2008-10-09 18:28:39 UTC (rev 5420) @@ -164,6 +164,7 @@ GemRB.SetVarAssoc (Window, Button, "Action", i) if Action>=0: GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_RADIOBUTTON, OP_OR) + #this is different from IWD??? GemRB.SetButtonSprites (Window, Button, "GUISTBBC", Action, 0,1,2,0) GemRB.SetTooltip (Window, Button, storetips[Action]) GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, store_funcs[Action]) @@ -288,13 +289,13 @@ GemRB.SetText (Window, Label, "0") # 8-11 item slots, 0x1000000c-f labels - for i in range(4): Button = GemRB.GetControl (Window, i+8) GemRB.SetVarAssoc (Window, Button, "Index", i) GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_RADIOBUTTON, OP_OR) GemRB.SetButtonBorder (Window, Button, 0,0,0,0,0,0,0,128,160,0,1) GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "RedrawStoreIdentifyWindow") + GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_RIGHT_PRESS, "InfoIdentifyWindow") ScrollBar = GemRB.GetControl (Window, 7) GemRB.SetEvent (Window, ScrollBar, IE_GUI_SCROLLBAR_ON_CHANGE, "RedrawStoreIdentifyWindow") @@ -519,20 +520,24 @@ #reget store in case of a change Store = GemRB.GetStore () LeftCount = Store['StoreItemCount'] + if LeftCount<0: + LeftCount=0 ScrollBar = GemRB.GetControl (Window, 11) - GemRB.SetVarAssoc (Window, ScrollBar, "LeftTopIndex", LeftCount-3) + GemRB.SetVarAssoc (Window, ScrollBar, "LeftTopIndex", LeftCount) LeftTopIndex = GemRB.GetVar ("LeftTopIndex") - if LeftTopIndex>LeftCount-3: - GemRB.SetVar ("LeftTopIndex", LeftCount-3) + if LeftTopIndex>LeftCount: + GemRB.SetVar ("LeftTopIndex", LeftCount) pc = GemRB.GameGetSelectedPCSingle () inventory_slots = GemRB.GetSlots (pc, SLOT_INVENTORY) - RightCount = len(inventory_slots) + RightCount = len(inventory_slots)-3 + if RightCount<0: + RightCount=0 ScrollBar = GemRB.GetControl (Window, 12) - GemRB.SetVarAssoc (Window, ScrollBar, "RightTopIndex", RightCount-3) + GemRB.SetVarAssoc (Window, ScrollBar, "RightTopIndex", RightCount) RightTopIndex = GemRB.GetVar ("RightTopIndex") - if RightTopIndex>LeftCount-3: - GemRB.SetVar ("RightTopIndex", RightCount-3) + if RightTopIndex>RightCount: + GemRB.SetVar ("RightTopIndex", RightCount) RedrawStoreShoppingWindow () return @@ -680,14 +685,17 @@ GemRB.SetButtonState (Window, RightButton, IE_GUI_BUTTON_DISABLED) for i in range(4): - Slot = GemRB.GetStoreItem (i+LeftTopIndex) + if i+LeftTopIndex<LeftCount: + Slot = GemRB.GetStoreItem (i+LeftTopIndex) + else: + Slot = None Button = GemRB.GetControl (Window, i+5) Label = GemRB.GetControl (Window, 0x10000012+i) GemRB.SetVarAssoc (Window, Button, "LeftIndex", LeftTopIndex+i) if Slot != None: Flags = GemRB.IsValidStoreItem (pc, i+LeftTopIndex, ITEM_STORE) Item = GemRB.GetItem (Slot['ItemResRef']) - GemRB.SetItemIcon (Window, Button, Slot['ItemResRef'],0) + GemRB.SetItemIcon (Window, Button, Slot['ItemResRef'], 0) GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_NAND) GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE, OP_OR) if Flags & SHOP_BUY: @@ -720,6 +728,7 @@ GemRB.SetText (Window, Label, "") if i+RightTopIndex<RightCount: + print i+RightTopIndex,"vs",RightCount Slot = GemRB.GetSlotItem (pc, inventory_slots[i+RightTopIndex]) else: Slot = None @@ -729,7 +738,7 @@ if Slot != None: Flags = GemRB.IsValidStoreItem (pc, inventory_slots[i+RightTopIndex], ITEM_PC) Item = GemRB.GetItem (Slot['ItemResRef']) - GemRB.SetItemIcon (Window, Button, Slot['ItemResRef'],0) + GemRB.SetItemIcon (Window, Button, Slot['ItemResRef'], 0) GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_NAND) GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE, OP_OR) if Inventory: @@ -802,7 +811,7 @@ if Slot != None: Flags = GemRB.IsValidStoreItem (pc, inventory_slots[i+TopIndex], ITEM_PC) Item = GemRB.GetItem (Slot['ItemResRef']) - GemRB.SetItemIcon (Window, Button, Slot['ItemResRef'],0) + GemRB.SetItemIcon (Window, Button, Slot['ItemResRef'], 0) GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_NAND) GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE, OP_OR) if Flags & SHOP_ID: @@ -903,11 +912,11 @@ #description bam Button = GemRB.GetControl (Window, 7) - GemRB.SetItemIcon (Window, Button, Slot['ItemResRef'],2) + GemRB.SetItemIcon (Window, Button, Slot['ItemResRef'], 2) #slot bam Button = GemRB.GetControl (Window, 2) - GemRB.SetItemIcon (Window, Button, Slot['ItemResRef'],0) + GemRB.SetItemIcon (Window, Button, Slot['ItemResRef'], 0) Label = GemRB.GetControl (Window, 0x10000007) TextArea = GemRB.GetControl (Window, 5) @@ -980,7 +989,7 @@ if Slot != None: Flags = GemRB.IsValidStoreItem (pc, i+LeftTopIndex, ITEM_STORE) Item = GemRB.GetItem (Slot['ItemResRef']) - GemRB.SetItemIcon (Window, Button, Slot['ItemResRef'],0) + GemRB.SetItemIcon (Window, Button, Slot['ItemResRef'], 0) GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_NAND) GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE, OP_OR) if Flags & SHOP_STEAL: @@ -1016,7 +1025,7 @@ if Slot != None: Flags = GemRB.IsValidStoreItem (pc, inventory_slots[i+RightTopIndex], ITEM_PC) Item = GemRB.GetItem (Slot['ItemResRef']) - GemRB.SetItemIcon (Window, Button, Slot['ItemResRef'],0) + GemRB.SetItemIcon (Window, Button, Slot['ItemResRef'], 0) GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_NAND) GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE, OP_OR) Price = Item['Price'] * Store['BuyMarkup'] / 100 @@ -1120,7 +1129,7 @@ GemRB.SetVarAssoc (Window, Button, "Index", TopIndex+i) if Cure != None: Spell = GemRB.GetSpell (Cure['CureResRef']) - GemRB.SetSpellIcon (Window, Button, Cure['CureResRef'],1) + GemRB.SetSpellIcon (Window, Button, Cure['CureResRef'], 1) GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_NAND) GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE, OP_OR) @@ -1156,7 +1165,7 @@ GemRB.SetText (Window, Label, Spell['SpellName']) Button = GemRB.GetControl (Window, 2) - GemRB.SetSpellIcon (Window, Button, Cure['CureResRef'],1) + GemRB.SetSpellIcon (Window, Button, Cure['CureResRef'], 1) TextArea = GemRB.GetControl (Window, 3) GemRB.SetText (Window, TextArea, Spell['SpellDesc']) Modified: gemrb/trunk/gemrb/GUIScripts/how/GUISTORE.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/how/GUISTORE.py 2008-10-09 17:15:40 UTC (rev 5419) +++ gemrb/trunk/gemrb/GUIScripts/how/GUISTORE.py 2008-10-09 18:28:39 UTC (rev 5420) @@ -30,6 +30,7 @@ from GUICommonWindows import * from ie_stats import * from ie_slots import * +from GUICommon import CheckStat100 StoreWindow = None MessageWindow = None @@ -50,6 +51,7 @@ ITEM_PC = 0 ITEM_STORE = 1 +Inventory = None RentIndex = -1 Store = None Buttons = [-1,-1,-1,-1] @@ -88,29 +90,34 @@ CloseStoreDonateWindow () CloseStoreRumourWindow () CloseStoreRentWindow () + return - def CloseStoreWindow (): global StoreWindow, ActionWindow, PortraitWindow global OldPortraitWindow + GemRB.SetVar ("Inventory", 0) CloseWindows () GemRB.UnloadWindow (StoreWindow) GemRB.UnloadWindow (ActionWindow) GemRB.UnloadWindow (PortraitWindow) StoreWindow = None GemRB.LeaveStore () - GemRB.SetVisible (0,1) #enabling the game control screen - GemRB.UnhideGUI () #enabling the other windows GUICommonWindows.PortraitWindow = OldPortraitWindow - SetSelectionChangeHandler( None ) + if Inventory: + GemRB.RunEventHandler("OpenInventoryWindow") + else: + GemRB.SetVisible (0,1) #enabling the game control screen + GemRB.UnhideGUI () #enabling the other windows + SetSelectionChangeHandler( None ) + return - def OpenStoreWindow (): global Store global StoreWindow, ActionWindow, PortraitWindow global OldPortraitWindow global store_update_funcs + global Inventory #these are function pointers, not strings #can't put this in global init, doh! @@ -122,6 +129,11 @@ GemRB.HideGUI () GemRB.SetVisible (0,0) #removing the game control screen + if GemRB.GetVar ("Inventory"): + Inventory = 1 + else: + Inventory = None + GemRB.SetVar ("Action", 0) GemRB.LoadWindowPack ("GUISTORE", 640, 480) StoreWindow = Window = GemRB.LoadWindow (3) @@ -133,6 +145,7 @@ GemRB.SetWindowFrame (ActionWindow) Store = GemRB.GetStore () + # Done Button = GemRB.GetControl (Window, 0) GemRB.SetText (Window, Button, 11973) @@ -166,8 +179,8 @@ GemRB.SetVisible (Window, 1) store_update_funcs[store_buttons[0]] () GemRB.SetVisible (PortraitWindow, 1) + return - def OpenStoreShoppingWindow (): global StoreShoppingWindow global LeftButton, RightButton @@ -176,36 +189,59 @@ StoreShoppingWindow = Window = GemRB.LoadWindow (2) - # buy price ... - Label = GemRB.GetControl (Window, 0x1000002b) - GemRB.SetText (Window, Label, "0") + if Inventory: + # Title + Label = GemRB.GetControl (Window, 0xfffffff) + GemRB.SetText (Window, Label, 51881) + # buy price ... + Label = GemRB.GetControl (Window, 0x1000002b) + GemRB.SetText (Window, Label, "") + # sell price ... + Label = GemRB.GetControl (Window, 0x1000002c) + GemRB.SetText (Window, Label, "") + # buy price ... + Label = GemRB.GetControl (Window, 0x1000002f) + GemRB.SetText (Window, Label, "") + # sell price ... + Label = GemRB.GetControl (Window, 0x10000030) + GemRB.SetText (Window, Label, "") + else: + # buy price ... + Label = GemRB.GetControl (Window, 0x1000002b) + GemRB.SetText (Window, Label, "0") - # sell price ... - Label = GemRB.GetControl (Window, 0x1000002c) - GemRB.SetText (Window, Label, "0") + # sell price ... + Label = GemRB.GetControl (Window, 0x1000002c) + GemRB.SetText (Window, Label, "0") for i in range(4): Button = GemRB.GetControl (Window, i+5) - GemRB.SetVarAssoc (Window, Button, "LeftIndex", i) GemRB.SetButtonBorder (Window, Button, 0,0,0,0,0,32,32,192,128,0,1) GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "SelectBuy") GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_RIGHT_PRESS, "InfoLeftWindow") Button = GemRB.GetControl (Window, i+13) - GemRB.SetVarAssoc (Window, Button, "RightIndex", i) GemRB.SetButtonBorder (Window, Button, 0,0,0,0,0,32,32,192,128,0,1) GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "SelectSell") GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_RIGHT_PRESS, "InfoRightWindow") # Buy LeftButton = Button = GemRB.GetControl (Window, 2) - GemRB.SetText (Window, Button, 13703) - GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "BuyPressed") + if Inventory: + GemRB.SetText (Window, Button, 26287) + GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "ToBackpackPressed") + else: + GemRB.SetText (Window, Button, 13703) + GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "BuyPressed") # Sell RightButton = Button = GemRB.GetControl (Window, 3) - GemRB.SetText (Window, Button, 13704) - GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "SellPressed") + if Inventory: + GemRB.SetText (Window, Button, 26288) + GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "ToBagPressed") + else: + GemRB.SetText (Window, Button, 13704) + GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "SellPressed") # inactive button #Button = GemRB.GetControl (Window, 50) @@ -231,11 +267,10 @@ SetSelectionChangeHandler( UpdateStoreShoppingWindow ) UpdateStoreShoppingWindow () GemRB.SetVisible (Window, 1) + return - def OpenStoreIdentifyWindow (): global StoreIdentifyWindow - global LeftButton GemRB.SetVar ("Index", -1) GemRB.SetVar ("TopIndex", 0) @@ -244,9 +279,10 @@ StoreIdentifyWindow = Window = GemRB.LoadWindow (4) # Identify - LeftButton = Button = GemRB.GetControl (Window, 5) + Button = GemRB.GetControl (Window, 5) GemRB.SetText (Window, Button, 14133) GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "IdentifyPressed") + GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_RIGHT_PRESS, "InfoIdentifyWindow") # price ... Label = GemRB.GetControl (Window, 0x10000003) @@ -255,6 +291,8 @@ # 8-11 item slots, 0x1000000c-f labels for i in range(4): Button = GemRB.GetControl (Window, i+8) + GemRB.SetVarAssoc (Window, Button, "Index", i) + GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_RADIOBUTTON, OP_OR) GemRB.SetButtonSprites (Window, Button, "GUISTMSC", 0, 1,2,0,3) GemRB.SetButtonBorder (Window, Button, 0,0,0,0,0,32,32,192,128,0,1) GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "RedrawStoreIdentifyWindow") @@ -266,27 +304,28 @@ SetSelectionChangeHandler( UpdateStoreIdentifyWindow ) UpdateStoreIdentifyWindow () GemRB.SetVisible (Window, 1) + return - def OpenStoreStealWindow (): global StoreStealWindow global LeftButton - GemRB.SetVar ("LeftIndex", -1) - GemRB.SetVar ("LeftTopIndex", 0) - GemRB.SetVar ("RightTopIndex", 0) + GemRB.SetVar ("RightIndex", 0) + GemRB.SetVar ("LeftIndex", 0) CloseWindows() StoreStealWindow = Window = GemRB.LoadWindow (6) for i in range(4): Button = GemRB.GetControl (Window, i+4) + GemRB.SetVarAssoc (Window, Button, "LeftIndex", i) GemRB.SetButtonBorder (Window, Button, 0,0,0,0,0,32,32,192,128,0,1) GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "RedrawStoreStealWindow") Button = GemRB.GetControl (Window, i+11) + GemRB.SetVarAssoc (Window, Button, "RightIndex", i) GemRB.SetButtonBorder (Window, Button, 0,0,0,0,0,32,32,192,128,0,1) - GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_RIGHT_PRESS, "StealInfoWindow") + GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_RIGHT_PRESS, "InfoRightWindow") # Steal LeftButton = Button = GemRB.GetControl (Window, 1) @@ -311,8 +350,8 @@ SetSelectionChangeHandler( UpdateStoreStealWindow ) UpdateStoreStealWindow () GemRB.SetVisible (Window, 1) + return - def OpenStoreDonateWindow (): global StoreDonateWindow @@ -347,8 +386,8 @@ SetSelectionChangeHandler( UpdateStoreDonateWindow ) UpdateStoreDonateWindow () GemRB.SetVisible (Window, 1) + return - def OpenStoreHealWindow (): global StoreHealWindow @@ -386,8 +425,8 @@ UpdateStoreHealWindow () GemRB.SetVisible (Window, 1) + return - def OpenStoreRumourWindow (): global StoreRumourWindow @@ -420,8 +459,8 @@ UpdateStoreRumourWindow () GemRB.SetVisible (Window, 1) + return - def OpenStoreRentWindow (): global StoreRentWindow, RentIndex @@ -459,8 +498,8 @@ UpdateStoreRentWindow () GemRB.SetVisible (Window, 1) + return - def UpdateStoreCommon (Window, title, name, gold): Label = GemRB.GetControl (Window, title) @@ -473,26 +512,37 @@ Label = GemRB.GetControl (Window, gold) GemRB.SetText (Window, Label, str(GemRB.GameGetPartyGold ())) + return - def UpdateStoreShoppingWindow (): global Store, inventory_slots Window = StoreShoppingWindow #reget store in case of a change Store = GemRB.GetStore () - LeftCount = Store['StoreItemCount'] + LeftCount = Store['StoreItemCount']-3 + if LeftCount<0: + LeftCount=0 ScrollBar = GemRB.GetControl (Window, 11) - GemRB.SetVarAssoc (Window, ScrollBar, "LeftTopIndex", LeftCount-3) + GemRB.SetVarAssoc (Window, ScrollBar, "LeftTopIndex", LeftCount) + LeftTopIndex = GemRB.GetVar ("LeftTopIndex") + if LeftTopIndex>LeftCount: + GemRB.SetVar ("LeftTopIndex", LeftCount) pc = GemRB.GameGetSelectedPCSingle () inventory_slots = GemRB.GetSlots (pc, SLOT_INVENTORY) RightCount = len(inventory_slots) + if RightCount<0: + RightCount=0 ScrollBar = GemRB.GetControl (Window, 12) - GemRB.SetVarAssoc (Window, ScrollBar, "RightTopIndex", RightCount-3) + GemRB.SetVarAssoc (Window, ScrollBar, "RightTopIndex", RightCount) + RightTopIndex = GemRB.GetVar ("RightTopIndex") + if RightTopIndex>RightCount: + GemRB.SetVar ("RightTopIndex", RightCount) + RedrawStoreShoppingWindow () + return - def SelectBuy (): Window = StoreShoppingWindow @@ -500,8 +550,22 @@ LeftIndex = GemRB.GetVar ("LeftIndex") GemRB.ChangeStoreItem (pc, LeftIndex, SHOP_BUY|SHOP_SELECT) RedrawStoreShoppingWindow () + return +def ToBackpackPressed (): + Window = StoreShoppingWindow + pc = GemRB.GameGetSelectedPCSingle () + LeftCount = Store['StoreItemCount'] + #going backwards because removed items shift the slots + for i in range(LeftCount, 0, -1): + Flags = GemRB.IsValidStoreItem (pc, i-1, ITEM_STORE)&SHOP_SELECT + if Flags: + GemRB.ChangeStoreItem (pc, i-1, SHOP_BUY) + + UpdateStoreShoppingWindow () + return + def BuyPressed (): Window = StoreShoppingWindow @@ -524,8 +588,8 @@ if GemRB.ChangeStoreItem (pc, i-1, SHOP_BUY): GemRB.GameSetPartyGold (GemRB.GameGetPartyGold ()-Price) UpdateStoreShoppingWindow () + return - def SelectSell (): Window = StoreShoppingWindow @@ -533,8 +597,21 @@ RightIndex = GemRB.GetVar ("RightIndex") GemRB.ChangeStoreItem (pc, inventory_slots[RightIndex], SHOP_SELL|SHOP_SELECT) RedrawStoreShoppingWindow () + return +def ToBagPressed (): + Window = StoreShoppingWindow + pc = GemRB.GameGetSelectedPCSingle () + RightCount = len (inventory_slots) + #no need to go reverse + for Slot in range(RightCount): + Flags = GemRB.IsValidStoreItem (pc, inventory_slots[Slot], ITEM_PC) & SHOP_SELECT + if Flags: + GemRB.ChangeStoreItem (pc, inventory_slots[Slot], SHOP_SELL) + UpdateStoreShoppingWindow () + return + def SellPressed (): Window = StoreShoppingWindow @@ -548,8 +625,8 @@ GemRB.GameSetPartyGold (GemRB.GameGetPartyGold ()+SellSum) UpdateStoreShoppingWindow () + return - def RedrawStoreShoppingWindow (): global BuySum, SellSum @@ -568,7 +645,10 @@ if GemRB.IsValidStoreItem (pc, i, ITEM_STORE) & SHOP_SELECT: Slot = GemRB.GetStoreItem (i) Item = GemRB.GetItem (Slot['ItemResRef']) - Price = Item['Price'] * Store['SellMarkup'] / 100 + if Inventory: + Price = 1 + else: + Price = Item['Price'] * Store['SellMarkup'] / 100 if Price <= 0: Price = 1 BuySum = BuySum + Price @@ -579,18 +659,27 @@ if GemRB.IsValidStoreItem (pc, inventory_slots[i], ITEM_PC) & SHOP_SELECT: Slot = GemRB.GetSlotItem (pc, inventory_slots[i]) Item = GemRB.GetItem (Slot['ItemResRef']) - Price = Item['Price'] * Store['BuyMarkup'] / 100 + if Inventory: + Price = 1 + else: + Price = Item['Price'] * Store['BuyMarkup'] / 100 SellSum = SellSum + Price Label = GemRB.GetControl (Window, 0x1000002b) - GemRB.SetText (Window, Label, str(BuySum) ) + if Inventory: + GemRB.SetText (Window, Label, "" ) + else: + GemRB.SetText (Window, Label, str(BuySum) ) if BuySum: GemRB.SetButtonState (Window, LeftButton, IE_GUI_BUTTON_ENABLED) else: GemRB.SetButtonState (Window, LeftButton, IE_GUI_BUTTON_DISABLED) Label = GemRB.GetControl (Window, 0x1000002c) - GemRB.SetText (Window, Label, str(SellSum) ) + if Inventory: + GemRB.SetText (Window, Label, "" ) + else: + GemRB.SetText (Window, Label, str(SellSum) ) if SellSum: GemRB.SetButtonState (Window, RightButton, IE_GUI_BUTTON_ENABLED) else: @@ -604,7 +693,7 @@ if Slot != None: Flags = GemRB.IsValidStoreItem (pc, i+LeftTopIndex, ITEM_STORE) Item = GemRB.GetItem (Slot['ItemResRef']) - GemRB.SetItemIcon (Window,Button, Slot['ItemResRef'],0) + GemRB.SetItemIcon (Window, Button, Slot['ItemResRef'], 0) GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_NAND) GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE, OP_OR) if Flags & SHOP_BUY: @@ -622,11 +711,14 @@ GemRB.SetToken ("ITEMNAME", GemRB.GetString (Item['ItemNameIdentified'])) GemRB.EnableButtonBorder (Window, Button, 0, 0) - Price = Item['Price'] * Store['SellMarkup'] / 100 - if Price <= 0: - Price = 1 - GemRB.SetToken ("ITEMCOST", str(Price) ) - GemRB.SetText (Window, Label, 10162) + if Inventory: + GemRB.SetText (Window, Label, 28337) + else: + Price = Item['Price'] * Store['SellMarkup'] / 100 + if Price <= 0: + Price = 1 + GemRB.SetToken ("ITEMCOST", str(Price) ) + GemRB.SetText (Window, Label, 10162) else: GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_DISABLED) GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_OR) @@ -643,10 +735,14 @@ if Slot != None: Flags = GemRB.IsValidStoreItem (pc, inventory_slots[i+RightTopIndex], ITEM_PC) Item = GemRB.GetItem (Slot['ItemResRef']) - GemRB.SetItemIcon (Window,Button, Slot['ItemResRef'],0) + GemRB.SetItemIcon (Window, Button, Slot['ItemResRef'], 0) GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_NAND) GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE, OP_OR) - Price = Item['Price'] * Store['BuyMarkup'] / 100 + if Inventory: + Price = 1 + else: + Price = Item['Price'] * Store['BuyMarkup'] / 100 + if (Price>0) and (Flags & SHOP_SELL): if Flags & SHOP_SELECT: GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_SELECTED) @@ -662,31 +758,32 @@ GemRB.SetToken ("ITEMNAME", GemRB.GetString (Item['ItemNameIdentified'])) GemRB.EnableButtonBorder (Window, Button, 0, 0) - GemRB.SetToken ("ITEMCOST", str(Price) ) - GemRB.SetText (Window, Label, 10162) + if Inventory: + GemRB.SetText (Window, Label, 26291) #not sure + else: + GemRB.SetToken ("ITEMCOST", str(Price) ) + GemRB.SetText (Window, Label, 10162) else: GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_DISABLED) GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_OR) GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE, OP_NAND) GemRB.SetText (Window, Label, "") + return - def UpdateStoreIdentifyWindow (): global inventory_slots Window = StoreIdentifyWindow pc = GemRB.GameGetSelectedPCSingle () - #all slots!!! - #we can't do that, because equipped and selected are the same :( inventory_slots = GemRB.GetSlots (pc, SLOT_INVENTORY) Count = len(inventory_slots) ScrollBar = GemRB.GetControl (Window, 7) GemRB.SetVarAssoc (Window, ScrollBar, "TopIndex", Count-3) GemRB.SetVar ("Index", -1) RedrawStoreIdentifyWindow () + return - def RedrawStoreIdentifyWindow (): Window = StoreIdentifyWindow @@ -711,7 +808,7 @@ if Slot != None: Flags = GemRB.IsValidStoreItem (pc, inventory_slots[i+TopIndex], ITEM_PC) Item = GemRB.GetItem (Slot['ItemResRef']) - GemRB.SetItemIcon (Window,Button, Slot['ItemResRef'],0) + GemRB.SetItemIcon (Window, Button, Slot['ItemResRef'], 0) GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_NAND) GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE, OP_OR) if Flags & SHOP_ID: @@ -749,8 +846,8 @@ else: GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_DISABLED) GemRB.SetText (Window, Label, str(0) ) + return - def IdentifyPressed (): IDPrice = Store['IDPrice'] if (GemRB.GameGetPartyGold ()<IDPrice): @@ -768,8 +865,8 @@ GemRB.ChangeStoreItem (pc, inventory_slots[Index], SHOP_ID) GemRB.GameSetPartyGold (GemRB.GameGetPartyGold ()-IDPrice) UpdateStoreIdentifyWindow () + return - def InfoIdentifyWindow (): Index = GemRB.GetVar ("Index") pc = GemRB.GameGetSelectedPCSingle () @@ -779,15 +876,15 @@ Slot = GemRB.GetSlotItem (pc, inventory_slots[Index]) Item = GemRB.GetItem (Slot['ItemResRef']) InfoWindow (Slot, Item) + return - def InfoLeftWindow (): Index = GemRB.GetVar ("LeftIndex") Slot = GemRB.GetStoreItem (Index) Item = GemRB.GetItem (Slot['ItemResRef']) InfoWindow (Slot, Item) + return - def InfoRightWindow (): Index = GemRB.GetVar ("RightIndex") pc = GemRB.GameGetSelectedPCSingle () @@ -797,8 +894,8 @@ Slot = GemRB.GetSlotItem (pc, inventory_slots[Index]) Item = GemRB.GetItem (Slot['ItemResRef']) InfoWindow (Slot, Item) + return - def InfoWindow (Slot, Item): global MessageWindow @@ -810,9 +907,13 @@ Label = GemRB.GetControl (Window, 0x10000000) GemRB.SetText (Window, Label, "") + #description bam, only in bg2 + #Button = GemRB.GetControl (Window, 7) + #GemRB.SetItemIcon (Window, Button, Slot['ItemResRef'], 2) + #slot bam Button = GemRB.GetControl (Window, 2) - GemRB.SetItemIcon (Window, Button, Slot['ItemResRef'],0) + GemRB.SetItemIcon (Window, Button, Slot['ItemResRef'], 0) Label = GemRB.GetControl (Window, 0x10000007) TextArea = GemRB.GetControl (Window, 5) @@ -829,8 +930,8 @@ GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "ErrorDone") GemRB.ShowModal (Window, MODAL_SHADOW_GRAY) + return - def UpdateStoreStealWindow (): global Store, inventory_slots @@ -850,24 +951,22 @@ GemRB.SetVar ("LeftIndex", -1) GemRB.SetButtonState (Window, LeftButton, IE_GUI_BUTTON_DISABLED) RedrawStoreStealWindow () + return - def StealPressed (): Window = StoreShoppingWindow LeftIndex = GemRB.GetVar ("LeftIndex") pc = GemRB.GameGetSelectedPCSingle () - #skill check, if fails + #percentage skill check, if fails, trigger StealFailed if CheckStat100 (pc, IE_PICKPOCKET, Store['StealFailure']): - print "success!" GemRB.ChangeStoreItem (pc, LeftIndex, SHOP_STEAL) UpdateStoreStealWindow () else: - print "failure!" GemRB.StealFailed () CloseStoreWindow () + return - def RedrawStoreStealWindow (): Window = StoreStealWindow @@ -887,7 +986,7 @@ if Slot != None: Flags = GemRB.IsValidStoreItem (pc, i+LeftTopIndex, ITEM_STORE) Item = GemRB.GetItem (Slot['ItemResRef']) - GemRB.SetItemIcon (Window,Button, Slot['ItemResRef'],0) + GemRB.SetItemIcon (Window, Button, Slot['ItemResRef'], 0) GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_NAND) GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE, OP_OR) if Flags & SHOP_STEAL: @@ -923,7 +1022,7 @@ if Slot != None: Flags = GemRB.IsValidStoreItem (pc, inventory_slots[i+RightTopIndex], ITEM_PC) Item = GemRB.GetItem (Slot['ItemResRef']) - GemRB.SetItemIcon (Window,Button, Slot['ItemResRef'],0) + GemRB.SetItemIcon (Window, Button, Slot['ItemResRef'], 0) GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_NAND) GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE, OP_OR) Price = Item['Price'] * Store['BuyMarkup'] / 100 @@ -946,8 +1045,8 @@ GemRB.SetButtonState (Window, LeftButton, IE_GUI_BUTTON_ENABLED) else: GemRB.SetButtonState (Window, LeftButton, IE_GUI_BUTTON_DISABLED) + return - def UpdateStoreDonateWindow (): Window = StoreDonateWindow @@ -964,8 +1063,8 @@ GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_ENABLED) else: GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_DISABLED) + return - def IncrementDonation (): Window = StoreDonateWindow @@ -976,6 +1075,7 @@ else: GemRB.SetText (Window, Field, str(GemRB.GameGetPartyGold ()) ) UpdateStoreDonateWindow () + return def DecrementDonation (): Window = StoreDonateWindow @@ -987,6 +1087,7 @@ else: GemRB.SetText (Window, Field, str(0) ) UpdateStoreDonateWindow () + return def DonateGold (): Window = StoreDonateWindow @@ -1009,8 +1110,8 @@ GemRB.TextAreaAppend (Window, TextArea, 10469, -1) GemRB.PlaySound ("act_03e") UpdateStoreDonateWindow () + return - def UpdateStoreHealWindow (): Window = StoreHealWindow @@ -1025,7 +1126,7 @@ GemRB.SetVarAssoc (Window, Button, "Index", TopIndex+i) if Cure != None: Spell = GemRB.GetSpell (Cure['CureResRef']) - GemRB.SetSpellIcon (Window,Button, Cure['CureResRef'],1) + GemRB.SetSpellIcon (Window, Button, Cure['CureResRef'], 1) GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_NAND) GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE, OP_OR) @@ -1045,8 +1146,8 @@ GemRB.SetText (Window, Label, str(Cure['Price']) ) Button = GemRB.GetControl (Window, 5) GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_ENABLED) + return - def InfoHealWindow (): global MessageWindow @@ -1061,7 +1162,7 @@ GemRB.SetText (Window, Label, Spell['SpellName']) Button = GemRB.GetControl (Window, 2) - GemRB.SetSpellIcon (Window, Button, Cure['CureResRef'],1) + GemRB.SetSpellIcon (Window, Button, Cure['CureResRef'], 1) TextArea = GemRB.GetControl (Window, 3) GemRB.SetText (Window, TextArea, Spell['SpellDesc']) @@ -1072,8 +1173,8 @@ GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "ErrorDone") GemRB.ShowModal (Window, MODAL_SHADOW_GRAY) + return - def BuyHeal (): Index = GemRB.GetVar ("Index") Cure = GemRB.GetStoreCure (Index) @@ -1087,8 +1188,8 @@ #chances are we don't need a new function for this GemRB.ExecuteString ("ApplySpell("+Cure['CureResRef']+", Myself)", pc) UpdateStoreHealWindow () + return - def UpdateStoreRumourWindow (): Window = StoreRumourWindow @@ -1107,6 +1208,7 @@ else: GemRB.SetText (Window, Button, "") GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_DISABLED) + return def GulpDrink (): Window = StoreRumourWindow @@ -1133,8 +1235,8 @@ GemRB.TextAreaAppend (Window, TextArea, text, -1) GemRB.PlaySound ("gam_07") UpdateStoreRumourWindow () + return - def UpdateStoreRentWindow (): global RentIndex @@ -1152,8 +1254,8 @@ else: GemRB.SetText (Window, Label, "0" ) GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_DISABLED) + return - def RentConfirm (): RentIndex = GemRB.GetVar ("RentIndex") price = Store['StoreRoomPrices'][RentIndex] @@ -1171,13 +1273,13 @@ Button = GemRB.GetControl (Window, RentIndex+4) GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_ENABLED) UpdateStoreRentWindow () + return - def RentDeny () : GemRB.UnloadWindow (RentConfirmWindow) UpdateStoreRentWindow () + return - def RentRoom (): global RentIndex, RentConfirmWindow @@ -1202,64 +1304,64 @@ GemRB.SetText (Window, TextArea, 15358) GemRB.ShowModal (Window, MODAL_SHADOW_GRAY) + return - def CloseStoreShoppingWindow (): global StoreShoppingWindow if StoreShoppingWindow != None: GemRB.UnloadWindow (StoreShoppingWindow) StoreShoppingWindow = None + return - def CloseStoreIdentifyWindow (): global StoreIdentifyWindow if StoreIdentifyWindow != None: GemRB.UnloadWindow (StoreIdentifyWindow) StoreIdentifyWindow = None + return - def CloseStoreStealWindow (): global StoreStealWindow if StoreStealWindow != None: GemRB.UnloadWindow (StoreStealWindow) StoreStealWindow = None + return - def CloseStoreDonateWindow (): global StoreDonateWindow if StoreDonateWindow != None: GemRB.UnloadWindow (StoreDonateWindow) StoreDonateWindow = None + return - def CloseStoreHealWindow (): global StoreHealWindow if StoreHealWindow != None: GemRB.UnloadWindow (StoreHealWindow) StoreHealWindow = None + return - def CloseStoreRumourWindow (): global StoreRumourWindow if StoreRumourWindow != None: GemRB.UnloadWindow (StoreRumourWindow) StoreRumourWindow = None + return - def CloseStoreRentWindow (): global StoreRentWindow if StoreRentWindow != None: GemRB.UnloadWindow (StoreRentWindow) StoreRentWindow = None + return - def ErrorWindow (strref): global MessageWindow @@ -1274,11 +1376,11 @@ GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "ErrorDone") GemRB.ShowModal (Window, MODAL_SHADOW_GRAY) + return - def ErrorDone (): GemRB.UnloadWindow (MessageWindow) + return - ################################################### # End of file GUISTORE.py Modified: gemrb/trunk/gemrb/GUIScripts/iwd/GUISTORE.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd/GUISTORE.py 2008-10-09 17:15:40 UTC (rev 5419) +++ gemrb/trunk/gemrb/GUIScripts/iwd/GUISTORE.py 2008-10-09 18:28:39 UTC (rev 5420) @@ -30,6 +30,7 @@ from GUICommonWindows import * from ie_stats import * from ie_slots import * +from GUICommon import CheckStat100 StoreWindow = None MessageWindow = None @@ -50,6 +51,7 @@ ITEM_PC = 0 ITEM_STORE = 1 +Inventory = None RentIndex = -1 Store = None Buttons = [-1,-1,-1,-1] @@ -88,29 +90,34 @@ CloseStoreDonateWindow () CloseStoreRumourWindow () CloseStoreRentWindow () + return - def CloseStoreWindow (): global StoreWindow, ActionWindow, PortraitWindow global OldPortraitWindow + GemRB.SetVar ("Inventory", 0) CloseWindows () GemRB.UnloadWindow (StoreWindow) GemRB.UnloadWindow (ActionWindow) GemRB.UnloadWindow (PortraitWindow) StoreWindow = None GemRB.LeaveStore () - GemRB.SetVisible (0,1) #enabling the game control screen - GemRB.UnhideGUI () #enabling the other windows GUICommonWindows.PortraitWindow = OldPortraitWindow - SetSelectionChangeHandler( None ) + if Inventory: + GemRB.RunEventHandler("OpenInventoryWindow") + else: + GemRB.SetVisible (0,1) #enabling the game control screen + GemRB.UnhideGUI () #enabling the other windows + SetSelectionChangeHandler( None ) + return - def OpenStoreWindow (): global Store global StoreWindow, ActionWindow, PortraitWindow global OldPortraitWindow global store_update_funcs + global Inventory #these are function pointers, not strings #can't put this in global init, doh! @@ -122,6 +129,11 @@ GemRB.HideGUI () GemRB.SetVisible (0,0) #removing the game control screen + if GemRB.GetVar ("Inventory"): + Inventory = 1 + else: + Inventory = None + GemRB.SetVar ("Action", 0) GemRB.LoadWindowPack ("GUISTORE", 640, 480) StoreWindow = Window = GemRB.LoadWindow (3) @@ -133,6 +145,7 @@ GemRB.SetWindowFrame (ActionWindow) Store = GemRB.GetStore () + # Done Button = GemRB.GetControl (Window, 0) GemRB.SetText (Window, Button, 11973) @@ -166,8 +179,8 @@ GemRB.SetVisible (Window, 1) store_update_funcs[store_buttons[0]] () GemRB.SetVisible (PortraitWindow, 1) + return - def OpenStoreShoppingWindow (): global StoreShoppingWindow global LeftButton, RightButton @@ -176,36 +189,59 @@ StoreShoppingWindow = Window = GemRB.LoadWindow (2) - # buy price ... - Label = GemRB.GetControl (Window, 0x1000002b) - GemRB.SetText (Window, Label, "0") + if Inventory: + # Title + Label = GemRB.GetControl (Window, 0xfffffff) + GemRB.SetText (Window, Label, 51881) + # buy price ... + Label = GemRB.GetControl (Window, 0x1000002b) + GemRB.SetText (Window, Label, "") + # sell price ... + Label = GemRB.GetControl (Window, 0x1000002c) + GemRB.SetText (Window, Label, "") + # buy price ... + Label = GemRB.GetControl (Window, 0x1000002f) + GemRB.SetText (Window, Label, "") + # sell price ... + Label = GemRB.GetControl (Window, 0x10000030) + GemRB.SetText (Window, Label, "") + else: + # buy price ... + Label = GemRB.GetControl (Window, 0x1000002b) + GemRB.SetText (Window, Label, "0") - # sell price ... - Label = GemRB.GetControl (Window, 0x1000002c) - GemRB.SetText (Window, Label, "0") + # sell price ... + Label = GemRB.GetControl (Window, 0x1000002c) + GemRB.SetText (Window, Label, "0") for i in range(4): Button = GemRB.GetControl (Window, i+5) - GemRB.SetVarAssoc (Window, Button, "LeftIndex", i) GemRB.SetButtonBorder (Window, Button, 0,0,0,0,0,32,32,192,128,0,1) GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "SelectBuy") GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_RIGHT_PRESS, "InfoLeftWindow") Button = GemRB.GetControl (Window, i+13) - GemRB.SetVarAssoc (Window, Button, "RightIndex", i) GemRB.SetButtonBorder (Window, Button, 0,0,0,0,0,32,32,192,128,0,1) GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "SelectSell") GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_RIGHT_PRESS, "InfoRightWindow") # Buy LeftButton = Button = GemRB.GetControl (Window, 2) - GemRB.SetText (Window, Button, 13703) - GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "BuyPressed") + if Inventory: + GemRB.SetText (Window, Button, 26287) + GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "ToBackpackPressed") + else: + GemRB.SetText (Window, Button, 13703) + GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "BuyPressed") # Sell RightButton = Button = GemRB.GetControl (Window, 3) - GemRB.SetText (Window, Button, 13704) - GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "SellPressed") + if Inventory: + GemRB.SetText (Window, Button, 26288) + GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "ToBagPressed") + else: + GemRB.SetText (Window, Button, 13704) + GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "SellPressed") # inactive button #Button = GemRB.GetControl (Window, 50) @@ -231,11 +267,10 @@ SetSelectionChangeHandler( UpdateStoreShoppingWindow ) UpdateStoreShoppingWindow () GemRB.SetVisible (Window, 1) + return - def OpenStoreIdentifyWindow (): global StoreIdentifyWindow - global LeftButton GemRB.SetVar ("Index", -1) GemRB.SetVar ("TopIndex", 0) @@ -244,9 +279,10 @@ StoreIdentifyWindow = Window = GemRB.LoadWindow (4) # Identify - LeftButton = Button = GemRB.GetControl (Window, 5) + Button = GemRB.GetControl (Window, 5) GemRB.SetText (Window, Button, 14133) GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "IdentifyPressed") + GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_RIGHT_PRESS, "InfoIdentifyWindow") # price ... Label = GemRB.GetControl (Window, 0x10000003) @@ -255,6 +291,8 @@ # 8-11 item slots, 0x1000000c-f labels for i in range(4): Button = GemRB.GetControl (Window, i+8) + GemRB.SetVarAssoc (Window, Button, "Index", i) + GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_RADIOBUTTON, OP_OR) GemRB.SetButtonSprites (Window, Button, "GUISTMSC", 0, 1,2,0,3) GemRB.SetButtonBorder (Window, Button, 0,0,0,0,0,32,32,192,128,0,1) GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "RedrawStoreIdentifyWindow") @@ -266,27 +304,28 @@ SetSelectionChangeHandler( UpdateStoreIdentifyWindow ) UpdateStoreIdentifyWindow () GemRB.SetVisible (Window, 1) + return - def OpenStoreStealWindow (): global StoreStealWindow global LeftButton - GemRB.SetVar ("LeftIndex", -1) - GemRB.SetVar ("LeftTopIndex", 0) - GemRB.SetVar ("RightTopIndex", 0) + GemRB.SetVar ("RightIndex", 0) + GemRB.SetVar ("LeftIndex", 0) CloseWindows() StoreStealWindow = Window = GemRB.LoadWindow (6) for i in range(4): Button = GemRB.GetControl (Window, i+4) + GemRB.SetVarAssoc (Window, Button, "LeftIndex", i) GemRB.SetButtonBorder (Window, Button, 0,0,0,0,0,32,32,192,128,0,1) GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "RedrawStoreStealWindow") Button = GemRB.GetControl (Window, i+11) + GemRB.SetVarAssoc (Window, Button, "RightIndex", i) GemRB.SetButtonBorder (Window, Button, 0,0,0,0,0,32,32,192,128,0,1) - GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_RIGHT_PRESS, "StealInfoWindow") + GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_RIGHT_PRESS, "InfoRightWindow") # Steal LeftButton = Button = GemRB.GetControl (Window, 1) @@ -311,8 +350,8 @@ SetSelectionChangeHandler( UpdateStoreStealWindow ) UpdateStoreStealWindow () GemRB.SetVisible (Window, 1) + return - def OpenStoreDonateWindow (): global StoreDonateWindow @@ -347,8 +386,8 @@ SetSelectionChangeHandler( UpdateStoreDonateWindow ) UpdateStoreDonateWindow () GemRB.SetVisible (Window, 1) + return - def OpenStoreHealWindow (): global StoreHealWindow @@ -386,8 +425,8 @@ UpdateStoreHealWindow () GemRB.SetVisible (Window, 1) + return - def OpenStoreRumourWindow (): global StoreRumourWindow @@ -420,8 +459,8 @@ UpdateStoreRumourWindow () GemRB.SetVisible (Window, 1) + return - def OpenStoreRentWindow (): global StoreRentWindow, RentIndex @@ -459,8 +498,8 @@ UpdateStoreRentWindow () GemRB.SetVisible (Window, 1) + return - def UpdateStoreCommon (Window, title, name, gold): Label = GemRB.GetControl (Window, title) @@ -473,26 +512,37 @@ Label = GemRB.GetControl (Window, gold) GemRB.SetText (Window, Label, str(GemRB.GameGetPartyGold ())) + return - def UpdateStoreShoppingWindow (): global Store, inventory_slots Window = StoreShoppingWindow #reget store in case of a change Store = GemRB.GetStore () - LeftCount = Store['StoreItemCount'] + LeftCount = Store['StoreItemCount']-3 + if LeftCount<0: + LeftCount=0 ScrollBar = GemRB.GetControl (Window, 11) - GemRB.SetVarAssoc (Window, ScrollBar, "LeftTopIndex", LeftCount-3) + GemRB.SetVarAssoc (Window, ScrollBar, "LeftTopIndex", LeftCount) + LeftTopIndex = GemRB.GetVar ("LeftTopIndex") + if LeftTopIndex>LeftCount: + GemRB.SetVar ("LeftTopIndex", LeftCount) pc = GemRB.GameGetSelectedPCSingle () inventory_slots = GemRB.GetSlots (pc, SLOT_INVENTORY) RightCount = len(inventory_slots) + if RightCount<0: + RightCount=0 ScrollBar = GemRB.GetControl (Window, 12) - GemRB.SetVarAssoc (Window, ScrollBar, "RightTopIndex", RightCount-3) + GemRB.SetVarAssoc (Window, ScrollBar, "RightTopIndex", RightCount) + RightTopIndex = GemRB.GetVar ("RightTopIndex") + if RightTopIndex>RightCount: + GemRB.SetVar ("RightTopIndex", RightCount) + RedrawStoreShoppingWindow () + return - def SelectBuy (): Window = StoreShoppingWindow @@ -500,8 +550,22 @@ LeftIndex = GemRB.GetVar ("LeftIndex") GemRB.ChangeStoreItem (pc, LeftIndex, SHOP_BUY|SHOP_SELECT) RedrawStoreShoppingWindow () + return +def ToBackpackPressed (): + Window = StoreShoppingWindow + pc = GemRB.GameGetSelectedPCSingle () + LeftCount = Store['StoreItemCount'] + #going backwards because removed items shift the slots + for i in range(LeftCount, 0, -1): + Flags = GemRB.IsValidStoreItem (pc, i-1, ITEM_STORE)&SHOP_SELECT + if Flags: + GemRB.ChangeStoreItem (pc, i-1, SHOP_BUY) + + UpdateStoreShoppingWindow () + return + def BuyPressed (): Window = StoreShoppingWindow @@ -524,8 +588,8 @@ if GemRB.ChangeStoreItem (pc, i-1, SHOP_BUY): GemRB.GameSetPartyGold (GemRB.GameGetPartyGold ()-Price) UpdateStoreShoppingWindow () + return - def SelectSell (): Window = StoreShoppingWindow @@ -533,8 +597,21 @@ RightIndex = GemRB.GetVar ("RightIndex") GemRB.ChangeStoreItem (pc, inventory_slots[RightIndex], SHOP_SELL|SHOP_SELECT) RedrawStoreShoppingWindow () + return +def ToBagPressed (): + Window = StoreShoppingWindow + pc = GemRB.GameGetSelectedPCSingle () + RightCount = len (inventory_slots) + #no need to go reverse + for Slot in range(RightCount): + Flags = GemRB.IsValidStoreItem (pc, inventory_slots[Slot], ITEM_PC) & SHOP_SELECT + if Flags: + GemRB.ChangeStoreItem (pc, inventory_slots[Slot], SHOP_SELL) + UpdateStoreShoppingWindow () + return + def SellPressed (): Window = StoreShoppingWindow @@ -548,8 +625,8 @@ GemRB.GameSetPartyGold (GemRB.GameGetPartyGold ()+SellSum) UpdateStoreShoppingWindow () + return - def RedrawStoreShoppingWindow (): global BuySum, SellSum @@ -568,7 +645,10 @@ if GemRB.IsValidStoreItem (pc, i, ITEM_STORE) & SHOP_SELECT: Slot = GemRB.GetStoreItem (i) Item = GemRB.GetItem (Slot['ItemResRef']) - Price = Item['Price'] * Store['SellMarkup'] / 100 + if Inventory: + Price = 1 + else: + Price = Item['Price'] * Store['SellMarkup'] / 100 if Price <= 0: Price = 1 BuySum = BuySum + Price @@ -579,18 +659,27 @@ if GemRB.IsValidStoreItem (pc, inventory_slots[i], ITEM_PC) & SHOP_SELECT: Slot = GemRB.GetSlotItem (pc, inventory_slots[i]) Item = GemRB.GetItem (Slot['ItemResRef']) - Price = Item['Price'] * Store['BuyMarkup'] / 100 + if Inventory: + Price = 1 + else: + Price = Item['Price'] * Store['BuyMarkup'] / 100 SellSum = SellSum + Price Label = GemRB.GetControl (Window, 0x1000002b) - GemRB.SetText (Window, Label, str(BuySum) ) + if Inventory: + GemRB.SetText (Window, Label, "" ) + else: + GemRB.SetText (Window, Label, str(BuySum) ) if BuySum: GemRB.SetButtonState (Window, LeftButton, IE_GUI_BUTTON_ENABLED) else: GemRB.SetButtonState (Window, LeftButton, IE_GUI_BUTTON_DISABLED) Label = GemRB.GetControl (Window, 0x1000002c) - GemRB.SetText (Window, Label, str(SellSum) ) + if Inventory: + GemRB.SetText (Window, Label, "" ) + else: + GemRB.SetText (Window, Label, str(SellSum) ) if SellSum: GemRB.SetButtonState (Window, RightButton, IE_GUI_BUTTON_ENABLED) else: @@ -604,7 +693,7 @@ if Slot != None: Flags = GemRB.IsValidStoreItem (pc, i+LeftTopIndex, ITEM_STORE) Item = GemRB.GetItem (Slot['ItemResRef']) - GemRB.SetItemIcon (Window,Button, Slot['ItemResRef'],0) + GemRB.SetItemIcon (Window, Button, Slot['ItemResRef'], 0) GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_NAND) GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE, OP_OR) if Flags & SHOP_BUY: @@ -622,11 +711,14 @@ GemRB.SetToken ("ITEMNAME", GemRB.GetString (Item['ItemNameIdentified'])) GemRB.EnableButtonBorder (Window, Button, 0, 0) - Price = Item['Price'] * Store['SellMarkup'] / 100 - if Price <= 0: - Price = 1 - GemRB.SetToken ("ITEMCOST", str(Price) ) - GemRB.SetText (Window, Label, 10162) + if Inventory: + GemRB.SetText (Window, Label, 28337) + else: + Price = Item['Price'] * Store['SellMarkup'] / 100 + if Price <= 0: + Price = 1 + GemRB.SetToken ("ITEMCOST", str(Price) ) + GemRB.SetText (Window, Label, 10162) else: GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_DISABLED) GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_OR) @@ -643,10 +735,14 @@ if Slot != None: Flags = GemRB.IsValidStoreItem (pc, inventory_slots[i+RightTopIndex], ITEM_PC) Item = GemRB.GetItem (Slot['ItemResRef']) - GemRB.SetItemIcon (Window,Button, Slot['ItemResRef'],0) + GemRB.SetItemIcon (Window, Button, Slot['ItemResRef'], 0) GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_NAND) GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE, OP_OR) - Price = Item['Price'] * Store['BuyMarkup'] / 100 + if Inventory: + Price = 1 + else: + Price = Item['Price'] * Store['BuyMarkup'] / 100 + if (Price>0) and (Flags & SHOP_SELL): if Flags & SHOP_SELECT: GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_SELECTED) @@ -662,31 +758,32 @@ GemRB.SetToken ("ITEMNAME", GemRB.GetString (Item['ItemNameIdentified'])) GemRB.EnableButtonBorder (Window, Button, 0, 0) - GemRB.SetToken ("ITEMCOST", str(Price) ) - GemRB.SetText (Window, Label, 10162) + if Inventory: + GemRB.SetText (Window, Label, 26291) #not sure + else: + GemRB.SetToken ("ITEMCOST", str(Price) ) + GemRB.SetText (Window, Label, 10162) else: GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_DISABLED) GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_OR) GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE, OP_NAND) GemRB.SetText (Window, Label, "") + return - def UpdateStoreIdentifyWindow (): global inventory_slots Window = StoreIdentifyWindow pc = GemRB.GameGetSelectedPCSingle () - #all slots!!! - #we can't do that, because equipped and selected are the same :( inventory_slots = GemRB.GetSlots (pc, SLOT_INVENTORY) Count = len(inventory_slots) ScrollBar = GemRB.GetControl (Window, 7) GemRB.SetVarAssoc (Window, ScrollBar, "TopIndex", Count-3) GemRB.SetVar ("Index", -1) RedrawStoreIdentifyWindow () + return - def RedrawStoreIdentifyWindow (): Window = StoreIdentifyWindow @@ -711,7 +808,7 @@ if Slot != None: Flags = GemRB.IsValidStoreItem (pc, inventory_slots[i+TopIndex], ITEM_PC) Item = GemRB.GetItem (Slot['ItemResRef']) - GemRB.SetItemIcon (Window,Button, Slot['ItemResRef'],0) + GemRB.SetItemIcon (Window, Button, Slot['ItemResRef'], 0) GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_NAND) GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE, OP_OR) if Flags & SHOP_ID: @@ -749,8 +846,8 @@ else: GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_DISABLED) GemRB.SetText (Window, Label, str(0) ) + return - def IdentifyPressed (): IDPrice = Store['IDPrice'] if (GemRB.GameGetPartyGold ()<IDPrice): @@ -768,8 +865,8 @@ GemRB.ChangeStoreItem (pc, inventory_slots[Index], SHOP_ID) GemRB.GameSetPartyGold (GemRB.GameGetPartyGold ()-IDPrice) UpdateStoreIdentifyWindow () + return - def InfoIdentifyWindow (): Index = GemRB.GetVar ("Index") pc = GemRB.GameGetSelectedPCSingle () @@ -779,15 +876,15 @@ Slot = GemRB.GetSlotItem (pc, inventory_slots[Index]) Item = GemRB.GetItem (Slot['ItemResRef']) InfoWindow (Slot, Item) + return - def InfoLeftWindow (): Index = GemRB.GetVar ("LeftIndex") Slot = GemRB.GetStoreItem (Index) Item = GemRB.GetItem (Slot['ItemResRef']) InfoWindow (Slot, Item) + return - def InfoRightWindow (): Index = GemRB.GetVar ("RightIndex") pc = GemRB.GameGetSelectedPCSingle () @@ -797,8 +894,8 @@ Slot = GemRB.GetSlotItem (pc, inventory_slots[Index]) Item = GemRB.GetItem (Slot['ItemResRef']) InfoWindow (Slot, Item) + return - def InfoWindow (Slot, Item): global MessageWindow @@ -810,9 +907,13 @@ Label = GemRB.GetControl (Window, 0x10000000) GemRB.SetText (Window, Label, "") + #description bam, only in bg2 + #Button = GemRB.GetControl (Window, 7) + #GemRB.SetItemIcon (Window, Button, Slot['ItemResRef'], 2) + #slot bam Button = GemRB.GetControl (Window, 2) - GemRB.SetItemIcon (Window, Button, Slot['ItemResRef'],0) + GemRB.SetItemIcon (Window, Button, Slot['ItemResRef'], 0) Label = GemRB.GetControl (Window, 0x10000007) TextArea = GemRB.GetControl (Window, 5) @@ -829,8 +930,8 @@ GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "ErrorDone") GemRB.ShowModal (Window, MODAL_SHADOW_GRAY) + return - def UpdateStoreStealWindow (): global Store, inventory_slots @@ -850,24 +951,22 @@ GemRB.SetVar ("LeftIndex", -1) GemRB.SetButtonState (Window, LeftButton, IE_GUI_BUTTON_DISABLED) RedrawStoreStealWindow () + return - def StealPressed (): Window = StoreShoppingWindow LeftIndex = GemRB.GetVar ("LeftIndex") pc = GemRB.GameGetSelectedPCSingle () - #skill check, if fails + #percentage skill check, if fails, trigger StealFailed if CheckStat100 (pc, IE_PICKPOCKET, Store['StealFailure']): - print "success!" GemRB.ChangeStoreItem (pc, LeftIndex, SHOP_STEAL) UpdateStoreStealWindow () else: - print "failure!" GemRB.StealFailed () CloseStoreWindow () + return - def RedrawStoreStealWindow (): Window = StoreStealWindow @@ -887,7 +986,7 @@ if Slot != None: Flags = GemRB.IsValidStoreItem (pc, i+LeftTopIndex, ITEM_STORE) Item = GemRB.GetItem (Slot['ItemResRef']) - GemRB.SetItemIcon (Window,Button, Slot['ItemResRef'],0) + GemRB.SetItemIcon (Window, Button, Slot['ItemResRef'], 0) GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_NAND) GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE, OP_OR) if Flags & SHOP_STEAL: @@ -923,7 +1022,7 @@ if Slot != None: Flags = GemRB.IsValidStoreItem (pc, inventory_slots[i+RightTopIndex], ITEM_PC) Item = GemRB.GetItem (Slot['ItemResRef']) - GemRB.SetItemIcon (Window,Button, Slot['ItemResRef'],0) + GemRB.SetItemIcon (Window, Button, Slot['ItemResRef'], 0) GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_NAND) GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE, OP_OR) Price = Item['Price'] * Store['BuyMarkup'] / 100 @@ -946,8 +1045,8 @@ GemRB.SetButtonState (Window, LeftButton, IE_GUI_BUTTON_ENABLED) else: GemRB.SetButtonState (Window, LeftButton, IE_GUI_BUTTON_DISABLED) + return - def UpdateStoreDonateWindow (): Window = StoreDonateWindow @@ -964,8 +1063,8 @@ GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_ENABLED) else: GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_DISABLED) + return - def IncrementDonation (): Window = StoreDonateWindow @@ -976,6 +1075,7 @@ else: GemRB.SetText (Window, Field, str(GemRB.GameGetPartyGold ()) ) UpdateStoreDonateWindow () + return def DecrementDonation (): Window = StoreDonateWindow @@ -987,6 +1087,7 @@ else: GemRB.SetText (Window, Field, str(0) ) UpdateStoreDonateWindow () + return def DonateGold (): Window = StoreDonateWindow @@ -1009,8 +1110,8 @@ GemRB.TextAreaAppend (Window, TextArea, 10469, -1) GemRB.PlaySound ("act_03e") UpdateStoreDonateWindow () + return - def UpdateStoreHealWindow (): Window = StoreHealWindow @@ -1025,7 +1126,7 @@ GemRB.SetVarAssoc (Window, Button, "Index", TopIndex+i) if Cure != None: Spell = GemRB.GetSpell (Cure['CureResRef']) - GemRB.SetSpellIcon (Window,Button, Cure['CureResRef'],1) + GemRB.SetSpellIcon (Window, Button, Cure['CureResRef'], 1) GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_NAND) GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE, OP_OR) @@ -1045,8 +1146,8 @@ GemRB.SetText (Window, Label, str(Cure['Price']) ) Button = GemRB.GetControl (Window, 5) GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_ENABLED) + return - def InfoHealWindow (): global MessageWindow @@ -1061,7 +1162,7 @@ GemRB.SetText (Window, Label, Spell['SpellName']) Button = GemRB.GetControl (Window, 2) - GemRB.SetSpellIcon (Window, Button, Cure['CureResRef'],1) + GemRB.SetSpellIcon (Window, Button, Cure['CureResRef'], 1) TextArea = GemRB.GetControl (Window, 3) GemRB.SetText (Window, TextArea, Spell['SpellDesc']) @@ -1072,8 +1173,8 @@ GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "ErrorDone") GemRB.ShowModal (Window, MODAL_SHADOW_GRAY) + return - def BuyHeal (): Index = GemRB.GetVar ("Index") Cure = GemRB.GetStoreCure (Index) @@ -1087,8 +1188,8 @@ #chances are we don't need a new function for this GemRB.ExecuteString ("ApplySpell("+Cure['CureResRef']+", Myself)", pc) UpdateStoreHealWindow () + return - def UpdateStoreRumourWindow (): Window = StoreRumourWindow @@ -1107,6 +1208,7 @@ else: GemRB.SetText (Window, Button, "") GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_DISABLED) + return def GulpDrink (): Window = StoreRumourWindow @@ -1133,8 +1235,8 @@ GemRB.TextAreaAppend (Window, TextArea, text, -1) GemRB.PlaySound ("gam_07") UpdateStoreRumourWindow () + return - def UpdateStoreRentWindow (): global RentIndex @@ -1152,8 +1254,8 @@ else: GemRB.SetText (Window, Label, "0" ) GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_DISABLED) + return - def RentConfirm (): RentIndex = GemRB.GetVar ("RentIndex") price = Store['StoreRoomPrices'][RentIndex] @@ -1171,13 +1273,13 @@ Button = GemRB.GetControl (Window, RentIndex+4) GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_ENABLED) UpdateStoreRentWindow () + return - def RentDeny () : GemRB.UnloadWindow (RentConfirmWindow) UpdateStoreRentWindow () + return - def RentRoom (): global RentIndex, RentConfirmWindow @@ -1202,64 +1304,64 @@ GemRB.SetText (Window, TextArea, 15358) GemRB.ShowModal (Window, MODAL_SHADOW_GRAY) + return - def CloseStoreShoppingWindow (): global StoreShoppingWindow if StoreShoppingWindow != None: GemRB.UnloadWindow (StoreShoppingWindow) StoreShoppingWindow = None + return - def CloseStoreIdentifyWindow (): global StoreIdentifyWindow if StoreIdentifyWindow != None: GemRB.UnloadWindow (StoreIdentifyWindow) StoreIdentifyWindow = None + return - def CloseStoreStealWindow (): global StoreStealWindow if StoreStealWindow != None: GemRB.UnloadWindow (StoreStealWindow) StoreStealWindow = None + return - def CloseStoreDonateWindow (): global StoreDonateWindow if StoreDonateWindow != None: GemRB.UnloadWindow (StoreDonateWindow) StoreDonateWindow = None + return - def CloseStoreHealWindow (): global StoreHealWindow if StoreHealWindow != None: GemRB.UnloadWindow (StoreHealWindow) StoreHealWindow = None + return - def CloseStoreRumourWindow (): global StoreRumourWindow if StoreRumourWindow != None: GemRB.UnloadWindow (StoreRumourWindow) StoreRumourWindow = None + return - def CloseStoreRentWindow (): global StoreRentWindow if StoreRentWindow != None: GemRB.UnloadWindow (StoreRentWindow) StoreRentWindow = None + return - def ErrorWindow (strref): global MessageWindow @@ -1274,11 +1376,11 @@ GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "ErrorDone") GemRB.ShowModal (Window, MODAL_SHADOW_GRAY) + return - def ErrorDone (): GemRB.UnloadWindow (MessageWindow) + return - ################################################### # End of file GUISTORE.py This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ave...@us...> - 2008-10-23 14:58:23
|
Revision: 5465 http://gemrb.svn.sourceforge.net/gemrb/?rev=5465&view=rev Author: avenger_teambg Date: 2008-10-23 14:58:07 +0000 (Thu, 23 Oct 2008) Log Message: ----------- fixed custom portrait problems in bg1/bg2 (portrait sizes/color problem) Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/bg1/GUICG12.py gemrb/trunk/gemrb/GUIScripts/bg1/GUICG13.py gemrb/trunk/gemrb/GUIScripts/bg2/GUICG12.py gemrb/trunk/gemrb/GUIScripts/bg2/GUICG13.py Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUICG12.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/GUICG12.py 2008-10-21 21:53:43 UTC (rev 5464) +++ gemrb/trunk/gemrb/GUIScripts/bg1/GUICG12.py 2008-10-23 14:58:07 UTC (rev 5465) @@ -88,9 +88,9 @@ Window = CustomWindow Portrait = GemRB.QueryText (Window, PortraitList1) + GemRB.SetToken ("LargePortrait", Portrait) + Portrait = GemRB.QueryText (Window, PortraitList2) GemRB.SetToken ("SmallPortrait", Portrait) - Portrait = GemRB.QueryText (Window, PortraitList2) - GemRB.SetToken ("LargePortrait", Portrait) GemRB.UnloadWindow (Window) GemRB.UnloadWindow (AppearanceWindow) GemRB.SetNextScript ("CharGen2") Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUICG13.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/GUICG13.py 2008-10-21 21:53:43 UTC (rev 5464) +++ gemrb/trunk/gemrb/GUIScripts/bg1/GUICG13.py 2008-10-23 14:58:07 UTC (rev 5465) @@ -28,7 +28,6 @@ AnimID = AnimID+GemRB.GetTableValue(table, GemRB.GetVar("Class"),0) table = GemRB.LoadTable("avprefg") AnimID = AnimID+GemRB.GetTableValue(table, GemRB.GetVar("Gender"),0) - print "AnimID:",hex(AnimID) ResRef = GemRB.GetTableValue(PDollTable,hex(AnimID), "LEVEL1") GemRB.SetButtonPLT(ColorWindow, PDollButton, ResRef, 0, MinorColor, MajorColor, SkinColor, 0, 0, HairColor, 0) @@ -49,11 +48,17 @@ PortraitName = GemRB.GetToken("LargePortrait") PortraitName = PortraitName[0:len(PortraitName)-1] PortraitIndex = GemRB.GetTableRowIndex(PortraitTable, PortraitName) - HairColor=GemRB.GetTableValue(PortraitTable,PortraitIndex,1) - SkinColor=GemRB.GetTableValue(PortraitTable,PortraitIndex,2) - MinorColor=GemRB.GetTableValue(PortraitTable,PortraitIndex,3) - MajorColor=GemRB.GetTableValue(PortraitTable,PortraitIndex,4) - print HairColor, SkinColor, MinorColor, MajorColor + if PortraitIndex<0: + HairColor=GemRB.GetTableValue(PortraitTable,0,1) + SkinColor=GemRB.GetTableValue(PortraitTable,0,2) + MinorColor=GemRB.GetTableValue(PortraitTable,0,3) + MajorColor=GemRB.GetTableValue(PortraitTable,0,4) + else: + HairColor=GemRB.GetTableValue(PortraitTable,PortraitIndex,1) + SkinColor=GemRB.GetTableValue(PortraitTable,PortraitIndex,2) + MinorColor=GemRB.GetTableValue(PortraitTable,PortraitIndex,3) + MajorColor=GemRB.GetTableValue(PortraitTable,PortraitIndex,4) + PDollButton = GemRB.GetControl(ColorWindow, 1) GemRB.SetButtonFlags(ColorWindow, PDollButton, IE_GUI_BUTTON_PICTURE,OP_OR) Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICG12.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG12.py 2008-10-21 21:53:43 UTC (rev 5464) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICG12.py 2008-10-23 14:58:07 UTC (rev 5465) @@ -92,9 +92,9 @@ Window = CustomWindow Portrait = GemRB.QueryText (Window, PortraitList1) + GemRB.SetToken ("LargePortrait", Portrait) + Portrait = GemRB.QueryText (Window, PortraitList2) GemRB.SetToken ("SmallPortrait", Portrait) - Portrait = GemRB.QueryText (Window, PortraitList2) - GemRB.SetToken ("LargePortrait", Portrait) GemRB.UnloadWindow (Window) GemRB.UnloadWindow (AppearanceWindow) GemRB.SetNextScript ("CharGen2") Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICG13.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG13.py 2008-10-21 21:53:43 UTC (rev 5464) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICG13.py 2008-10-23 14:58:07 UTC (rev 5465) @@ -31,7 +31,6 @@ AnimID = AnimID+GemRB.GetTableValue(table, Class, 0) table = GemRB.LoadTable("avprefg") AnimID = AnimID+GemRB.GetTableValue(table, GemRB.GetVar("Gender"),0) - print "AnimID:",hex(AnimID) ResRef = GemRB.GetTableValue(PDollTable,hex(AnimID), "LEVEL1") GemRB.SetButtonPLT(ColorWindow, PDollButton, ResRef, @@ -52,12 +51,18 @@ PortraitName = GemRB.GetToken("LargePortrait") PortraitName = PortraitName[0:len(PortraitName)-1] PortraitIndex = GemRB.GetTableRowIndex(PortraitTable, PortraitName) - HairColor=GemRB.GetTableValue(PortraitTable,PortraitIndex,1) - SkinColor=GemRB.GetTableValue(PortraitTable,PortraitIndex,2) - MinorColor=GemRB.GetTableValue(PortraitTable,PortraitIndex,3) - MajorColor=GemRB.GetTableValue(PortraitTable,PortraitIndex,4) + if PortraitIndex<0: + HairColor=GemRB.GetTableValue(PortraitTable,0,1) + SkinColor=GemRB.GetTableValue(PortraitTable,0,2) + MinorColor=GemRB.GetTableValue(PortraitTable,0,3) + MajorColor=GemRB.GetTableValue(PortraitTable,0,4) + else: + HairColor=GemRB.GetTableValue(PortraitTable,PortraitIndex,1) + SkinColor=GemRB.GetTableValue(PortraitTable,PortraitIndex,2) + MinorColor=GemRB.GetTableValue(PortraitTable,PortraitIndex,3) + MajorColor=GemRB.GetTableValue(PortraitTable,PortraitIndex,4) + PDollButton = GemRB.GetControl(ColorWindow, 1) - print HairColor, SkinColor, MajorColor, MinorColor GemRB.SetButtonFlags(ColorWindow, PDollButton, IE_GUI_BUTTON_PICTURE,OP_OR) HairButton = GemRB.GetControl(ColorWindow, 2) @@ -193,5 +198,5 @@ GemRB.SetVar("SkinColor",SkinColor) GemRB.SetVar("MinorColor",MinorColor) GemRB.SetVar("MajorColor",MajorColor) - GemRB.SetNextScript("GUICG19") + GemRB.SetNextScript("GUICG19") #sounds return This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ave...@us...> - 2008-10-23 16:00:55
|
Revision: 5466 http://gemrb.svn.sourceforge.net/gemrb/?rev=5466&view=rev Author: avenger_teambg Date: 2008-10-23 16:00:48 +0000 (Thu, 23 Oct 2008) Log Message: ----------- added custom portrait feature (with all the updates to iwd/how) Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/how/CharGen.py gemrb/trunk/gemrb/GUIScripts/iwd/CharGen.py Modified: gemrb/trunk/gemrb/GUIScripts/how/CharGen.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/how/CharGen.py 2008-10-23 14:58:07 UTC (rev 5465) +++ gemrb/trunk/gemrb/GUIScripts/how/CharGen.py 2008-10-23 16:00:48 UTC (rev 5466) @@ -39,7 +39,7 @@ GenderDoneButton = 0 Portrait = 0 -PortraitTable = 0 +PortraitsTable = 0 PortraitPortraitButton = 0 RaceButton = 0 @@ -385,7 +385,11 @@ SetColorStat (MyChar, IE_LEATHER_COLOR, 0x16 ) SetColorStat (MyChar, IE_ARMOR_COLOR, 0x17 ) - GemRB.FillPlayerInfo(MyChar, PortraitName+"L", PortraitName+"S") + #does all the rest + LargePortrait = GemRB.GetToken ("LargePortrait") + SmallPortrait = GemRB.GetToken ("SmallPortrait") + GemRB.FillPlayerInfo (MyChar, LargePortrait, SmallPortrait) + #10 is a weapon slot (see slottype.2da row 10) GemRB.CreateItem(MyChar, "staf01", 10, 1, 0, 0) GemRB.SetEquippedQuickSlot(MyChar, 0) @@ -589,13 +593,13 @@ return def PortraitSelect(): - global CharGenWindow, PortraitWindow, Portrait, PortraitPortraitButton, PortraitTable + global CharGenWindow, PortraitWindow, Portrait, PortraitPortraitButton, PortraitsTable GemRB.SetVisible (CharGenWindow, 0) PortraitWindow = GemRB.LoadWindow (11) # this is not the correct one, but I don't know which is - PortraitTable = GemRB.LoadTable ("PICTURES") + PortraitsTable = GemRB.LoadTable ("PICTURES") Portrait = 0 PortraitPortraitButton = GemRB.GetControl (PortraitWindow, 1) @@ -627,43 +631,155 @@ GemRB.SetEvent (PortraitWindow, PortraitCancelButton, IE_GUI_BUTTON_ON_PRESS, "PortraitCancelPress") GemRB.SetText (PortraitWindow, PortraitCancelButton, 13727) - while GemRB.GetTableValue (PortraitTable, Portrait, 0) != GemRB.GetVar ("Gender"): + while GemRB.GetTableValue (PortraitsTable, Portrait, 0) != GemRB.GetVar ("Gender"): Portrait = Portrait + 1 - GemRB.SetButtonPicture(PortraitWindow, PortraitPortraitButton, GemRB.GetTableRowName (PortraitTable, Portrait) + "G") + GemRB.SetButtonPicture(PortraitWindow, PortraitPortraitButton, GemRB.GetTableRowName (PortraitsTable, Portrait) + "G") GemRB.SetVisible (PortraitWindow, 1) return def PortraitLeftPress(): - global PortraitWindow, Portrait, PortraitTable, PortraitPortraitButton + global PortraitWindow, Portrait, PortraitsTable, PortraitPortraitButton while True: Portrait = Portrait - 1 if Portrait < 0: - Portrait = GemRB.GetTableRowCount (PortraitTable) - 1 - if GemRB.GetTableValue (PortraitTable, Portrait, 0) == GemRB.GetVar ("Gender"): - GemRB.SetButtonPicture(PortraitWindow, PortraitPortraitButton, GemRB.GetTableRowName (PortraitTable, Portrait) + "G") + Portrait = GemRB.GetTableRowCount (PortraitsTable) - 1 + if GemRB.GetTableValue (PortraitsTable, Portrait, 0) == GemRB.GetVar ("Gender"): + GemRB.SetButtonPicture(PortraitWindow, PortraitPortraitButton, GemRB.GetTableRowName (PortraitsTable, Portrait) + "G") return def PortraitRightPress(): - global PortraitWindow, Portrait, PortraitTable, PortraitPortraitButton + global PortraitWindow, Portrait, PortraitsTable, PortraitPortraitButton while True: Portrait = Portrait + 1 - if Portrait == GemRB.GetTableRowCount (PortraitTable): + if Portrait == GemRB.GetTableRowCount (PortraitsTable): Portrait = 0 - if GemRB.GetTableValue (PortraitTable, Portrait, 0) == GemRB.GetVar ("Gender"): - GemRB.SetButtonPicture(PortraitWindow, PortraitPortraitButton, GemRB.GetTableRowName (PortraitTable, Portrait) + "G") + if GemRB.GetTableValue (PortraitsTable, Portrait, 0) == GemRB.GetVar ("Gender"): + GemRB.SetButtonPicture(PortraitWindow, PortraitPortraitButton, GemRB.GetTableRowName (PortraitsTable, Portrait) + "G") return +def CustomDone(): + global CharGenWindow, CharGenState, PortraitWindow, PortraitButton, PortraitsTable, Portrait, GenderButton, RaceButton + + Window = CustomWindow + + PortraitName = GemRB.QueryText (Window, PortraitList2) + GemRB.SetToken ("SmallPortrait", PortraitName) + PortraitName = GemRB.QueryText (Window, PortraitList1) + GemRB.SetToken ("LargePortrait", PortraitName) + GemRB.UnloadWindow (Window) + + GemRB.UnloadWindow (PortraitWindow) + GemRB.SetButtonPicture(CharGenWindow, PortraitButton, PortraitName) + GemRB.SetButtonState (CharGenWindow, GenderButton, IE_GUI_BUTTON_DISABLED) + GemRB.SetButtonFlags (CharGenWindow, GenderButton, IE_GUI_BUTTON_DEFAULT, OP_NAND) + GemRB.SetButtonState (CharGenWindow, RaceButton, IE_GUI_BUTTON_ENABLED) + GemRB.SetButtonFlags (CharGenWindow, RaceButton, IE_GUI_BUTTON_DEFAULT, OP_OR) + CharGenState = 1 + Portrait = -1 + SetCharacterDescription() + GemRB.SetVisible (CharGenWindow, 1) + return + +def CustomAbort(): + GemRB.UnloadWindow (CustomWindow) + return + +def LargeCustomPortrait(): + Window = CustomWindow + + Portrait = GemRB.QueryText (Window, PortraitList1) + #small hack + if GemRB.GetVar ("Row1") == RowCount1: + return + + Label = GemRB.GetControl (Window, 0x10000007) + GemRB.SetText (Window, Label, Portrait) + + Button = GemRB.GetControl (Window, 6) + if Portrait=="": + Portrait = "NOPORTMD" + GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_DISABLED) + else: + if GemRB.QueryText (Window, PortraitList2)!="": + GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_ENABLED) + + Button = GemRB.GetControl (Window, 0) + GemRB.SetButtonPicture (Window, Button, Portrait, "NOPORTMD") + return + +def SmallCustomPortrait(): + Window = CustomWindow + + Portrait = GemRB.QueryText (Window, PortraitList2) + #small hack + if GemRB.GetVar ("Row2") == RowCount2: + return + + Label = GemRB.GetControl (Window, 0x10000008) + GemRB.SetText (Window, Label, Portrait) + + Button = GemRB.GetControl (Window, 6) + if Portrait=="": + Portrait = "NOPORTSM" + GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_DISABLED) + else: + if GemRB.QueryText (Window, PortraitList1)!="": + GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_ENABLED) + + Button = GemRB.GetControl (Window, 1) + GemRB.SetButtonPicture (Window, Button, Portrait, "NOPORTSM") + return + def PortraitCustomPress(): + global PortraitList1, PortraitList2 + global RowCount1, RowCount2 + global CustomWindow + + CustomWindow = Window = GemRB.LoadWindow (18) + PortraitList1 = GemRB.GetControl (Window, 2) + RowCount1 = GemRB.GetPortraits (Window, PortraitList1, 0) + GemRB.SetEvent (Window, PortraitList1, IE_GUI_TEXTAREA_ON_CHANGE, "LargeCustomPortrait") + GemRB.SetVar ("Row1", RowCount1) + GemRB.SetVarAssoc (Window, PortraitList1, "Row1",RowCount1) + + PortraitList2 = GemRB.GetControl (Window, 4) + RowCount2 = GemRB.GetPortraits (Window, PortraitList2, 1) + GemRB.SetEvent (Window, PortraitList2, IE_GUI_TEXTAREA_ON_CHANGE, "SmallCustomPortrait") + GemRB.SetVar ("Row2", RowCount2) + GemRB.SetVarAssoc (Window, PortraitList2, "Row2",RowCount2) + + Button = GemRB.GetControl (Window, 6) + GemRB.SetText (Window, Button, 11973) + GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "CustomDone") + GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_DISABLED) + + Button = GemRB.GetControl (Window, 7) + GemRB.SetText (Window, Button, 15416) + GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "CustomAbort") + + Button = GemRB.GetControl (Window, 0) + PortraitName = GemRB.GetTableRowName (PortraitsTable, Portrait)+"L" + GemRB.SetButtonPicture (Window, Button, PortraitName, "NOPORTMD") + GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_LOCKED) + + Button = GemRB.GetControl (Window, 1) + PortraitName = GemRB.GetTableRowName (PortraitsTable, Portrait)+"S" + GemRB.SetButtonPicture (Window, Button, PortraitName, "NOPORTSM") + GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_LOCKED) + + GemRB.ShowModal (Window, MODAL_SHADOW_NONE) return def PortraitDonePress(): - global CharGenWindow, CharGenState, PortraitWindow, PortraitButton, PortraitTable, Portrait, GenderButton, RaceButton + global CharGenWindow, CharGenState, PortraitWindow, PortraitButton, PortraitsTable, Portrait, GenderButton, RaceButton - GemRB.UnloadWindow (PortraitWindow) - GemRB.SetButtonPicture(CharGenWindow, PortraitButton, GemRB.GetTableRowName (PortraitTable, Portrait) + "L") + PortraitName = GemRB.GetTableRowName (PortraitsTable, Portrait ) + GemRB.SetToken ("SmallPortrait", PortraitName+"S") + GemRB.SetToken ("LargePortrait", PortraitName+"L") + GemRB.SetButtonPicture(CharGenWindow, PortraitButton, GemRB.GetTableRowName (PortraitsTable, Portrait) + "L") GemRB.SetButtonState (CharGenWindow, GenderButton, IE_GUI_BUTTON_DISABLED) GemRB.SetButtonFlags (CharGenWindow, GenderButton, IE_GUI_BUTTON_DEFAULT, OP_NAND) GemRB.SetButtonState (CharGenWindow, RaceButton, IE_GUI_BUTTON_ENABLED) @@ -671,6 +787,7 @@ CharGenState = 1 SetCharacterDescription() GemRB.SetVisible (CharGenWindow, 1) + GemRB.UnloadWindow (PortraitWindow) return def PortraitCancelPress(): @@ -2049,16 +2166,21 @@ def AppearancePress(): global CharGenWindow, AppearanceWindow, AppearanceTable - global PortraitTable, Portrait, AppearanceAvatarButton, PortraitName + global PortraitsTable, Portrait, AppearanceAvatarButton, PortraitName global AppearanceHairButton, AppearanceSkinButton global AppearanceMajorButton, AppearanceMinorButton global HairColor, SkinColor, MajorColor, MinorColor GemRB.SetVisible (CharGenWindow, 0) AppearanceWindow = GemRB.LoadWindow (13) - PortraitName = GemRB.GetTableRowName (PortraitTable, Portrait) AppearanceTable = GemRB.LoadTable ("PORTCOLR") - PortraitIndex = GemRB.GetTableRowIndex (AppearanceTable, PortraitName + "L") + + if Portrait<0: + PortraitIndex = 0 + else: + PortraitName = GemRB.GetTableRowName (PortraitsTable, Portrait) + PortraitIndex = GemRB.GetTableRowIndex (AppearanceTable, PortraitName + "L") + HairColor = GemRB.GetTableValue (AppearanceTable, PortraitIndex, 1) GemRB.SetVar ("HairColor", HairColor) SkinColor = GemRB.GetTableValue (AppearanceTable, PortraitIndex, 2) Modified: gemrb/trunk/gemrb/GUIScripts/iwd/CharGen.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd/CharGen.py 2008-10-23 14:58:07 UTC (rev 5465) +++ gemrb/trunk/gemrb/GUIScripts/iwd/CharGen.py 2008-10-23 16:00:48 UTC (rev 5466) @@ -39,7 +39,7 @@ GenderDoneButton = 0 Portrait = 0 -PortraitTable = 0 +PortraitsTable = 0 PortraitPortraitButton = 0 RaceButton = 0 @@ -385,7 +385,11 @@ SetColorStat (MyChar, IE_LEATHER_COLOR, 0x16 ) SetColorStat (MyChar, IE_ARMOR_COLOR, 0x17 ) - GemRB.FillPlayerInfo(MyChar, PortraitName+"L", PortraitName+"S") + #does all the rest + LargePortrait = GemRB.GetToken ("LargePortrait") + SmallPortrait = GemRB.GetToken ("SmallPortrait") + GemRB.FillPlayerInfo (MyChar, LargePortrait, SmallPortrait) + #10 is a weapon slot (see slottype.2da row 10) GemRB.CreateItem(MyChar, "staf01", 10, 1, 0, 0) GemRB.SetEquippedQuickSlot(MyChar, 0) @@ -589,13 +593,13 @@ return def PortraitSelect(): - global CharGenWindow, PortraitWindow, Portrait, PortraitPortraitButton, PortraitTable + global CharGenWindow, PortraitWindow, Portrait, PortraitPortraitButton, PortraitsTable GemRB.SetVisible (CharGenWindow, 0) PortraitWindow = GemRB.LoadWindow (11) # this is not the correct one, but I don't know which is - PortraitTable = GemRB.LoadTable ("PICTURES") + PortraitsTable = GemRB.LoadTable ("PICTURES") Portrait = 0 PortraitPortraitButton = GemRB.GetControl (PortraitWindow, 1) @@ -627,43 +631,155 @@ GemRB.SetEvent (PortraitWindow, PortraitCancelButton, IE_GUI_BUTTON_ON_PRESS, "PortraitCancelPress") GemRB.SetText (PortraitWindow, PortraitCancelButton, 13727) - while GemRB.GetTableValue (PortraitTable, Portrait, 0) != GemRB.GetVar ("Gender"): + while GemRB.GetTableValue (PortraitsTable, Portrait, 0) != GemRB.GetVar ("Gender"): Portrait = Portrait + 1 - GemRB.SetButtonPicture(PortraitWindow, PortraitPortraitButton, GemRB.GetTableRowName (PortraitTable, Portrait) + "G") + GemRB.SetButtonPicture(PortraitWindow, PortraitPortraitButton, GemRB.GetTableRowName (PortraitsTable, Portrait) + "G") GemRB.SetVisible (PortraitWindow, 1) return def PortraitLeftPress(): - global PortraitWindow, Portrait, PortraitTable, PortraitPortraitButton + global PortraitWindow, Portrait, PortraitsTable, PortraitPortraitButton while True: Portrait = Portrait - 1 if Portrait < 0: - Portrait = GemRB.GetTableRowCount (PortraitTable) - 1 - if GemRB.GetTableValue (PortraitTable, Portrait, 0) == GemRB.GetVar ("Gender"): - GemRB.SetButtonPicture(PortraitWindow, PortraitPortraitButton, GemRB.GetTableRowName (PortraitTable, Portrait) + "G") + Portrait = GemRB.GetTableRowCount (PortraitsTable) - 1 + if GemRB.GetTableValue (PortraitsTable, Portrait, 0) == GemRB.GetVar ("Gender"): + GemRB.SetButtonPicture(PortraitWindow, PortraitPortraitButton, GemRB.GetTableRowName (PortraitsTable, Portrait) + "G") return def PortraitRightPress(): - global PortraitWindow, Portrait, PortraitTable, PortraitPortraitButton + global PortraitWindow, Portrait, PortraitsTable, PortraitPortraitButton while True: Portrait = Portrait + 1 - if Portrait == GemRB.GetTableRowCount (PortraitTable): + if Portrait == GemRB.GetTableRowCount (PortraitsTable): Portrait = 0 - if GemRB.GetTableValue (PortraitTable, Portrait, 0) == GemRB.GetVar ("Gender"): - GemRB.SetButtonPicture(PortraitWindow, PortraitPortraitButton, GemRB.GetTableRowName (PortraitTable, Portrait) + "G") + if GemRB.GetTableValue (PortraitsTable, Portrait, 0) == GemRB.GetVar ("Gender"): + GemRB.SetButtonPicture(PortraitWindow, PortraitPortraitButton, GemRB.GetTableRowName (PortraitsTable, Portrait) + "G") return +def CustomDone(): + global CharGenWindow, CharGenState, PortraitWindow, PortraitButton, PortraitsTable, Portrait, GenderButton, RaceButton + + Window = CustomWindow + + PortraitName = GemRB.QueryText (Window, PortraitList2) + GemRB.SetToken ("SmallPortrait", PortraitName) + PortraitName = GemRB.QueryText (Window, PortraitList1) + GemRB.SetToken ("LargePortrait", PortraitName) + GemRB.UnloadWindow (Window) + + GemRB.UnloadWindow (PortraitWindow) + GemRB.SetButtonPicture(CharGenWindow, PortraitButton, PortraitName) + GemRB.SetButtonState (CharGenWindow, GenderButton, IE_GUI_BUTTON_DISABLED) + GemRB.SetButtonFlags (CharGenWindow, GenderButton, IE_GUI_BUTTON_DEFAULT, OP_NAND) + GemRB.SetButtonState (CharGenWindow, RaceButton, IE_GUI_BUTTON_ENABLED) + GemRB.SetButtonFlags (CharGenWindow, RaceButton, IE_GUI_BUTTON_DEFAULT, OP_OR) + CharGenState = 1 + Portrait = -1 + SetCharacterDescription() + GemRB.SetVisible (CharGenWindow, 1) + return + +def CustomAbort(): + GemRB.UnloadWindow (CustomWindow) + return + +def LargeCustomPortrait(): + Window = CustomWindow + + Portrait = GemRB.QueryText (Window, PortraitList1) + #small hack + if GemRB.GetVar ("Row1") == RowCount1: + return + + Label = GemRB.GetControl (Window, 0x10000007) + GemRB.SetText (Window, Label, Portrait) + + Button = GemRB.GetControl (Window, 6) + if Portrait=="": + Portrait = "NOPORTMD" + GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_DISABLED) + else: + if GemRB.QueryText (Window, PortraitList2)!="": + GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_ENABLED) + + Button = GemRB.GetControl (Window, 0) + GemRB.SetButtonPicture (Window, Button, Portrait, "NOPORTMD") + return + +def SmallCustomPortrait(): + Window = CustomWindow + + Portrait = GemRB.QueryText (Window, PortraitList2) + #small hack + if GemRB.GetVar ("Row2") == RowCount2: + return + + Label = GemRB.GetControl (Window, 0x10000008) + GemRB.SetText (Window, Label, Portrait) + + Button = GemRB.GetControl (Window, 6) + if Portrait=="": + Portrait = "NOPORTSM" + GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_DISABLED) + else: + if GemRB.QueryText (Window, PortraitList1)!="": + GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_ENABLED) + + Button = GemRB.GetControl (Window, 1) + GemRB.SetButtonPicture (Window, Button, Portrait, "NOPORTSM") + return + def PortraitCustomPress(): + global PortraitList1, PortraitList2 + global RowCount1, RowCount2 + global CustomWindow + + CustomWindow = Window = GemRB.LoadWindow (18) + PortraitList1 = GemRB.GetControl (Window, 2) + RowCount1 = GemRB.GetPortraits (Window, PortraitList1, 0) + GemRB.SetEvent (Window, PortraitList1, IE_GUI_TEXTAREA_ON_CHANGE, "LargeCustomPortrait") + GemRB.SetVar ("Row1", RowCount1) + GemRB.SetVarAssoc (Window, PortraitList1, "Row1",RowCount1) + + PortraitList2 = GemRB.GetControl (Window, 4) + RowCount2 = GemRB.GetPortraits (Window, PortraitList2, 1) + GemRB.SetEvent (Window, PortraitList2, IE_GUI_TEXTAREA_ON_CHANGE, "SmallCustomPortrait") + GemRB.SetVar ("Row2", RowCount2) + GemRB.SetVarAssoc (Window, PortraitList2, "Row2",RowCount2) + + Button = GemRB.GetControl (Window, 6) + GemRB.SetText (Window, Button, 11973) + GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "CustomDone") + GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_DISABLED) + + Button = GemRB.GetControl (Window, 7) + GemRB.SetText (Window, Button, 15416) + GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "CustomAbort") + + Button = GemRB.GetControl (Window, 0) + PortraitName = GemRB.GetTableRowName (PortraitsTable, Portrait)+"L" + GemRB.SetButtonPicture (Window, Button, PortraitName, "NOPORTMD") + GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_LOCKED) + + Button = GemRB.GetControl (Window, 1) + PortraitName = GemRB.GetTableRowName (PortraitsTable, Portrait)+"S" + GemRB.SetButtonPicture (Window, Button, PortraitName, "NOPORTSM") + GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_LOCKED) + + GemRB.ShowModal (Window, MODAL_SHADOW_NONE) return def PortraitDonePress(): - global CharGenWindow, CharGenState, PortraitWindow, PortraitButton, PortraitTable, Portrait, GenderButton, RaceButton + global CharGenWindow, CharGenState, PortraitWindow, PortraitButton, PortraitsTable, Portrait, GenderButton, RaceButton - GemRB.UnloadWindow (PortraitWindow) - GemRB.SetButtonPicture(CharGenWindow, PortraitButton, GemRB.GetTableRowName (PortraitTable, Portrait) + "L") + PortraitName = GemRB.GetTableRowName (PortraitsTable, Portrait ) + GemRB.SetToken ("SmallPortrait", PortraitName+"S") + GemRB.SetToken ("LargePortrait", PortraitName+"L") + GemRB.SetButtonPicture(CharGenWindow, PortraitButton, GemRB.GetTableRowName (PortraitsTable, Portrait) + "L") GemRB.SetButtonState (CharGenWindow, GenderButton, IE_GUI_BUTTON_DISABLED) GemRB.SetButtonFlags (CharGenWindow, GenderButton, IE_GUI_BUTTON_DEFAULT, OP_NAND) GemRB.SetButtonState (CharGenWindow, RaceButton, IE_GUI_BUTTON_ENABLED) @@ -671,6 +787,7 @@ CharGenState = 1 SetCharacterDescription() GemRB.SetVisible (CharGenWindow, 1) + GemRB.UnloadWindow (PortraitWindow) return def PortraitCancelPress(): @@ -2049,16 +2166,21 @@ def AppearancePress(): global CharGenWindow, AppearanceWindow, AppearanceTable - global PortraitTable, Portrait, AppearanceAvatarButton, PortraitName + global PortraitsTable, Portrait, AppearanceAvatarButton, PortraitName global AppearanceHairButton, AppearanceSkinButton global AppearanceMajorButton, AppearanceMinorButton global HairColor, SkinColor, MajorColor, MinorColor GemRB.SetVisible (CharGenWindow, 0) AppearanceWindow = GemRB.LoadWindow (13) - PortraitName = GemRB.GetTableRowName (PortraitTable, Portrait) AppearanceTable = GemRB.LoadTable ("PORTCOLR") - PortraitIndex = GemRB.GetTableRowIndex (AppearanceTable, PortraitName + "L") + + if Portrait<0: + PortraitIndex = 0 + else: + PortraitName = GemRB.GetTableRowName (PortraitsTable, Portrait) + PortraitIndex = GemRB.GetTableRowIndex (AppearanceTable, PortraitName + "L") + HairColor = GemRB.GetTableValue (AppearanceTable, PortraitIndex, 1) GemRB.SetVar ("HairColor", HairColor) SkinColor = GemRB.GetTableValue (AppearanceTable, PortraitIndex, 2) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ave...@us...> - 2008-11-30 18:17:24
|
Revision: 5486 http://gemrb.svn.sourceforge.net/gemrb/?rev=5486&view=rev Author: avenger_teambg Date: 2008-11-30 18:17:20 +0000 (Sun, 30 Nov 2008) Log Message: ----------- iwd/how: re-enabled the hp display on the portraits Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/how/GUICommonWindows.py gemrb/trunk/gemrb/GUIScripts/iwd/GUICommonWindows.py Modified: gemrb/trunk/gemrb/GUIScripts/how/GUICommonWindows.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/how/GUICommonWindows.py 2008-11-29 15:30:27 UTC (rev 5485) +++ gemrb/trunk/gemrb/GUIScripts/how/GUICommonWindows.py 2008-11-30 18:17:20 UTC (rev 5486) @@ -544,7 +544,7 @@ GemRB.SetButtonPicture (Window, Button, pic, "NOPORTSM") GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE | IE_GUI_BUTTON_ALIGN_TOP | IE_GUI_BUTTON_ALIGN_LEFT, OP_SET) GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_ENABLED) - GemRB.SetButtonFont (Window, Button, 'NUMFONT') + GemRB.SetButtonFont (Window, Button, "NUMFONT") GemRB.SetVarAssoc (Window, Button, "PressedPortrait", i) @@ -562,7 +562,7 @@ else: GemRB.SetButtonOverlay (Window, Button, ratio, 255,0,0,200, 128,0,0,200) - #GemRB.SetText (Window, Button, "%d/%d" %(hp, hp_max)) + GemRB.SetText (Window, Button, "%d/%d" %(hp, hp_max)) GemRB.SetTooltip (Window, Button, GemRB.GetPlayerName (i+1, 1) + "\n%d/%d" %(hp, hp_max)) if sel: GemRB.EnableButtonBorder (Window, Button, FRAME_PC_SELECTED, 1) Modified: gemrb/trunk/gemrb/GUIScripts/iwd/GUICommonWindows.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd/GUICommonWindows.py 2008-11-29 15:30:27 UTC (rev 5485) +++ gemrb/trunk/gemrb/GUIScripts/iwd/GUICommonWindows.py 2008-11-30 18:17:20 UTC (rev 5486) @@ -533,7 +533,7 @@ GemRB.SetButtonPicture (Window, Button, pic, "NOPORTSM") GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE | IE_GUI_BUTTON_ALIGN_TOP | IE_GUI_BUTTON_ALIGN_LEFT, OP_SET) GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_ENABLED) - GemRB.SetButtonFont (Window, Button, 'NUMFONT') + GemRB.SetButtonFont (Window, Button, "NUMFONT") GemRB.SetVarAssoc (Window, Button, "PressedPortrait", i) @@ -551,7 +551,7 @@ else: GemRB.SetButtonOverlay (Window, Button, ratio, 255,0,0,200, 128,0,0,200) - #GemRB.SetText (Window, Button, "%d/%d" %(hp, hp_max)) + GemRB.SetText (Window, Button, "%d/%d" %(hp, hp_max)) GemRB.SetTooltip (Window, Button, GemRB.GetPlayerName (i+1, 1) + "\n%d/%d" %(hp, hp_max)) if sel: GemRB.EnableButtonBorder (Window, Button, FRAME_PC_SELECTED, 1) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ave...@us...> - 2009-01-25 17:04:02
|
Revision: 5530 http://gemrb.svn.sourceforge.net/gemrb/?rev=5530&view=rev Author: avenger_teambg Date: 2009-01-25 17:03:53 +0000 (Sun, 25 Jan 2009) Log Message: ----------- fixed shopping window Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/bg1/GUISTORE.py gemrb/trunk/gemrb/GUIScripts/bg2/GUISTORE.py Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUISTORE.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/GUISTORE.py 2009-01-25 16:19:50 UTC (rev 5529) +++ gemrb/trunk/gemrb/GUIScripts/bg1/GUISTORE.py 2009-01-25 17:03:53 UTC (rev 5530) @@ -501,21 +501,25 @@ Window = StoreShoppingWindow #reget store in case of a change Store = GemRB.GetStore () - LeftCount = Store['StoreItemCount'] + LeftCount = Store['StoreItemCount']-3 + if LeftCount<0: + LeftCount=0 ScrollBar = GemRB.GetControl (Window, 11) - GemRB.SetVarAssoc (Window, ScrollBar, "LeftTopIndex", LeftCount-3) + GemRB.SetVarAssoc (Window, ScrollBar, "LeftTopIndex", LeftCount) LeftTopIndex = GemRB.GetVar ("LeftTopIndex") - if LeftTopIndex>LeftCount-3: - GemRB.SetVar ("LeftTopIndex", LeftCount-3) + if LeftTopIndex>LeftCount: + GemRB.SetVar ("LeftTopIndex", LeftCount) pc = GemRB.GameGetSelectedPCSingle () inventory_slots = GemRB.GetSlots (pc, SLOT_INVENTORY) - RightCount = len(inventory_slots) + RightCount = len(inventory_slots)-3 + if RightCount<0: + RightCount=0 ScrollBar = GemRB.GetControl (Window, 12) - GemRB.SetVarAssoc (Window, ScrollBar, "RightTopIndex", RightCount-3) + GemRB.SetVarAssoc (Window, ScrollBar, "RightTopIndex", RightCount) RightTopIndex = GemRB.GetVar ("RightTopIndex") - if RightTopIndex>RightCount-3: - GemRB.SetVar ("RightTopIndex", RightCount-3) + if RightTopIndex>RightCount: + GemRB.SetVar ("RightTopIndex", RightCount) RedrawStoreShoppingWindow () return @@ -660,7 +664,9 @@ GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE, OP_NAND) GemRB.SetText (Window, Label, "") + print i, " ", RightTopIndex, " ", RightCount if i+RightTopIndex<RightCount: + print i+RightTopIndex,"vs",RightCount Slot = GemRB.GetSlotItem (pc, inventory_slots[i+RightTopIndex]) else: Slot = None Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUISTORE.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUISTORE.py 2009-01-25 16:19:50 UTC (rev 5529) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUISTORE.py 2009-01-25 17:03:53 UTC (rev 5530) @@ -519,7 +519,7 @@ Window = StoreShoppingWindow #reget store in case of a change Store = GemRB.GetStore () - LeftCount = Store['StoreItemCount'] + LeftCount = Store['StoreItemCount']-3 if LeftCount<0: LeftCount=0 ScrollBar = GemRB.GetControl (Window, 11) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wjp...@us...> - 2009-01-31 22:53:33
|
Revision: 5599 http://gemrb.svn.sourceforge.net/gemrb/?rev=5599&view=rev Author: wjpalenstijn Date: 2009-01-31 22:53:28 +0000 (Sat, 31 Jan 2009) Log Message: ----------- removed dead code Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/bg1/GUIINV.py gemrb/trunk/gemrb/GUIScripts/bg2/GUIINV.py gemrb/trunk/gemrb/GUIScripts/how/GUIINV.py gemrb/trunk/gemrb/GUIScripts/iwd/GUIINV.py gemrb/trunk/gemrb/GUIScripts/iwd2/GUIINV.py Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUIINV.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/GUIINV.py 2009-01-31 22:18:40 UTC (rev 5598) +++ gemrb/trunk/gemrb/GUIScripts/bg1/GUIINV.py 2009-01-31 22:53:28 UTC (rev 5599) @@ -670,7 +670,6 @@ text = item["ItemDescIdentified"] GemRB.SetText (Window, Text, text) - Button = GemRB.GetControl (Window, 6) #left button Button = GemRB.GetControl(Window, 8) Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUIINV.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUIINV.py 2009-01-31 22:18:40 UTC (rev 5598) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUIINV.py 2009-01-31 22:53:28 UTC (rev 5599) @@ -688,7 +688,6 @@ text = item["ItemDescIdentified"] GemRB.SetText (Window, Text, text) - Button = GemRB.GetControl (Window, 6) #left button Button = GemRB.GetControl(Window, 8) Modified: gemrb/trunk/gemrb/GUIScripts/how/GUIINV.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/how/GUIINV.py 2009-01-31 22:18:40 UTC (rev 5598) +++ gemrb/trunk/gemrb/GUIScripts/how/GUIINV.py 2009-01-31 22:53:28 UTC (rev 5599) @@ -651,7 +651,6 @@ text = item["ItemDescIdentified"] GemRB.SetText (Window, Text, text) - Button = GemRB.GetControl (Window, 6) #left button Button = GemRB.GetControl(Window, 8) Modified: gemrb/trunk/gemrb/GUIScripts/iwd/GUIINV.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd/GUIINV.py 2009-01-31 22:18:40 UTC (rev 5598) +++ gemrb/trunk/gemrb/GUIScripts/iwd/GUIINV.py 2009-01-31 22:53:28 UTC (rev 5599) @@ -681,7 +681,6 @@ text = item["ItemDescIdentified"] GemRB.SetText (Window, Text, text) - Button = GemRB.GetControl (Window, 6) #left button Button = GemRB.GetControl(Window, 8) Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/GUIINV.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/GUIINV.py 2009-01-31 22:18:40 UTC (rev 5598) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/GUIINV.py 2009-01-31 22:53:28 UTC (rev 5599) @@ -595,7 +595,6 @@ text = item["ItemDescIdentified"] GemRB.SetText (Window, Text, text) - Button = GemRB.GetControl (Window, 6) #left button Button = GemRB.GetControl(Window, 8) if type&2: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wjp...@us...> - 2009-02-01 18:07:59
|
Revision: 5605 http://gemrb.svn.sourceforge.net/gemrb/?rev=5605&view=rev Author: wjpalenstijn Date: 2009-02-01 18:07:54 +0000 (Sun, 01 Feb 2009) Log Message: ----------- whitespace Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/GUIClasses.py gemrb/trunk/gemrb/GUIScripts/bg2/GUICG13.py gemrb/trunk/gemrb/GUIScripts/bg2/GUICommonWindows.py gemrb/trunk/gemrb/GUIScripts/how/GUIPR.py gemrb/trunk/gemrb/GUIScripts/iwd/GUIPR.py gemrb/trunk/gemrb/GUIScripts/iwd2/CharGen4.py gemrb/trunk/gemrb/GUIScripts/iwd2/Class.py gemrb/trunk/gemrb/GUIScripts/pst/GUICommonWindows.py gemrb/trunk/gemrb/GUIScripts/pst/GUIMA.py gemrb/trunk/gemrb/GUIScripts/pst/GUIWORLD.py Modified: gemrb/trunk/gemrb/GUIScripts/GUIClasses.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/GUIClasses.py 2009-02-01 17:47:29 UTC (rev 5604) +++ gemrb/trunk/gemrb/GUIScripts/GUIClasses.py 2009-02-01 18:07:54 UTC (rev 5605) @@ -111,7 +111,7 @@ 'Append': GemRB.TextAreaAppend, 'Clear': GemRB.TextAreaClear, 'Scroll': GemRB.TextAreaScroll, - 'SetFlags': GemRB.SetTextAreaFlags + 'SetFlags': GemRB.SetTextAreaFlags } def MoveText(self, other): GemRB.MoveTAText(self.WinID, self.ID, other.WinID, other.ID) @@ -143,7 +143,7 @@ 'SetGamePreview': GemRB.SetGamePreview, 'SetGamePortraitPreview': GemRB.SetGamePortraitPreview, 'SetSpellIcon': GemRB.SetSpellIcon, - 'SetItemIcon': GemRB.SetItemIcon, + 'SetItemIcon': GemRB.SetItemIcon } def CreateLabelOnButton(self, control, *args): GemRB.CreateLabelOnButton(self.WinID, self.ID, control, *args) Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICG13.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG13.py 2009-02-01 17:47:29 UTC (rev 5604) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICG13.py 2009-02-01 18:07:54 UTC (rev 5605) @@ -52,7 +52,7 @@ PortraitName = PortraitName[0:len(PortraitName)-1] PortraitIndex = GemRB.GetTableRowIndex(PortraitTable, PortraitName) if PortraitIndex<0: - HairColor=GemRB.GetTableValue(PortraitTable,0,1) + HairColor=GemRB.GetTableValue(PortraitTable,0,1) SkinColor=GemRB.GetTableValue(PortraitTable,0,2) MinorColor=GemRB.GetTableValue(PortraitTable,0,3) MajorColor=GemRB.GetTableValue(PortraitTable,0,4) Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICommonWindows.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUICommonWindows.py 2009-02-01 17:47:29 UTC (rev 5604) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICommonWindows.py 2009-02-01 18:07:54 UTC (rev 5605) @@ -778,49 +778,49 @@ GemRB.GamePause(2,0) def OpenWaitForDiscWindow (): - global DiscWindow - #print "OpenWaitForDiscWindow" + global DiscWindow + #print "OpenWaitForDiscWindow" - if DiscWindow: - GemRB.HideGUI () - GemRB.UnloadWindow (DiscWindow) - GemRB.SetVar ("OtherWindow", -1) - # ...LoadWindowPack() - EnableAnimatedWindows () - DiscWindow = None - GemRB.UnhideGUI () - return + if DiscWindow: + GemRB.HideGUI () + GemRB.UnloadWindow (DiscWindow) + GemRB.SetVar ("OtherWindow", -1) + # ...LoadWindowPack() + EnableAnimatedWindows () + DiscWindow = None + GemRB.UnhideGUI () + return - try: - GemRB.HideGUI () - except: - pass + try: + GemRB.HideGUI () + except: + pass - GemRB.LoadWindowPack ("GUIID") - DiscWindow = Window = GemRB.LoadWindow (0) - GemRB.SetVar ("OtherWindow", Window) - label = GemRB.GetControl (DiscWindow, 0) + GemRB.LoadWindowPack ("GUIID") + DiscWindow = Window = GemRB.LoadWindow (0) + GemRB.SetVar ("OtherWindow", Window) + label = GemRB.GetControl (DiscWindow, 0) - disc_num = GemRB.GetVar ("WaitForDisc") - #disc_path = GemRB.GetVar ("WaitForDiscPath") - disc_path = 'XX:' + disc_num = GemRB.GetVar ("WaitForDisc") + #disc_path = GemRB.GetVar ("WaitForDiscPath") + disc_path = 'XX:' - text = GemRB.GetString (31483) + " " + str (disc_num) + " " + GemRB.GetString (31569) + " " + disc_path + "\n" + GemRB.GetString (49152) - GemRB.SetText (DiscWindow, label, text) - DisableAnimatedWindows () - # 31483 - Please place PS:T disc number - # 31568 - Please place the PS:T DVD - # 31569 - in drive - # 31570 - Wrong disc in drive - # 31571 - There is no disc in drive - # 31578 - No disc could be found in drive. Please place Disc 1 in drive. - # 49152 - To quit the game, press Alt-F4 + text = GemRB.GetString (31483) + " " + str (disc_num) + " " + GemRB.GetString (31569) + " " + disc_path + "\n" + GemRB.GetString (49152) + GemRB.SetText (DiscWindow, label, text) + DisableAnimatedWindows () + # 31483 - Please place PS:T disc number + # 31568 - Please place the PS:T DVD + # 31569 - in drive + # 31570 - Wrong disc in drive + # 31571 - There is no disc in drive + # 31578 - No disc could be found in drive. Please place Disc 1 in drive. + # 49152 - To quit the game, press Alt-F4 - try: - GemRB.UnhideGUI () - except: - GemRB.SetVisible (DiscWindow, 1) + try: + GemRB.UnhideGUI () + except: + GemRB.SetVisible (DiscWindow, 1) # returns an array: first field is 0 - not dual classed; 1 - kit/class; 2 - class/class # the second and third field hold the kit/class index for each class Modified: gemrb/trunk/gemrb/GUIScripts/how/GUIPR.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/how/GUIPR.py 2009-02-01 17:47:29 UTC (rev 5604) +++ gemrb/trunk/gemrb/GUIScripts/how/GUIPR.py 2009-02-01 18:07:54 UTC (rev 5605) @@ -273,11 +273,11 @@ return def ClosePriestSpellUnmemorizeWindow (): - global PriestSpellUnmemorizeWindow + global PriestSpellUnmemorizeWindow - GemRB.UnloadWindow (PriestSpellUnmemorizeWindow) - PriestSpellUnmemorizeWindow = None - return + GemRB.UnloadWindow (PriestSpellUnmemorizeWindow) + PriestSpellUnmemorizeWindow = None + return def OpenPriestSpellUnmemorizeWindow (): global PriestSpellUnmemorizeWindow Modified: gemrb/trunk/gemrb/GUIScripts/iwd/GUIPR.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd/GUIPR.py 2009-02-01 17:47:29 UTC (rev 5604) +++ gemrb/trunk/gemrb/GUIScripts/iwd/GUIPR.py 2009-02-01 18:07:54 UTC (rev 5605) @@ -273,11 +273,11 @@ return def ClosePriestSpellUnmemorizeWindow (): - global PriestSpellUnmemorizeWindow + global PriestSpellUnmemorizeWindow - GemRB.UnloadWindow (PriestSpellUnmemorizeWindow) - PriestSpellUnmemorizeWindow = None - return + GemRB.UnloadWindow (PriestSpellUnmemorizeWindow) + PriestSpellUnmemorizeWindow = None + return def OpenPriestSpellUnmemorizeWindow (): global PriestSpellUnmemorizeWindow Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/CharGen4.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/CharGen4.py 2009-02-01 17:47:29 UTC (rev 5604) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/CharGen4.py 2009-02-01 18:07:54 UTC (rev 5605) @@ -10,11 +10,11 @@ def OnLoad(): MyChar = GemRB.GetVar ("Slot") - #base class - Class=GemRB.GetVar ("BaseClass") - GemRB.SetPlayerStat (MyChar, IE_CLASS, Class) - #kit - GemRB.SetPlayerStat (MyChar, IE_KIT, GemRB.GetVar ("Class") ) + #base class + Class=GemRB.GetVar ("BaseClass") + GemRB.SetPlayerStat (MyChar, IE_CLASS, Class) + #kit + GemRB.SetPlayerStat (MyChar, IE_KIT, GemRB.GetVar ("Class") ) #works only for the first level character generation #if this code ever needs to be more versatile, consider saving the Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/Class.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/Class.py 2009-02-01 17:47:29 UTC (rev 5604) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/Class.py 2009-02-01 18:07:54 UTC (rev 5605) @@ -154,7 +154,7 @@ GemRB.UnloadWindow(ClassWindow) GemRB.SetNextScript("CharGen3") GemRB.SetVar("Class",0) #scrapping the class value - MyChar = GemRB.GetVar("Slot") + MyChar = GemRB.GetVar("Slot") GemRB.SetPlayerStat (IE_CLASS, 0) return Modified: gemrb/trunk/gemrb/GUIScripts/pst/GUICommonWindows.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/pst/GUICommonWindows.py 2009-02-01 17:47:29 UTC (rev 5604) +++ gemrb/trunk/gemrb/GUIScripts/pst/GUICommonWindows.py 2009-02-01 18:07:54 UTC (rev 5605) @@ -576,14 +576,14 @@ #GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_DRAG_DROP, "") def GearsClicked(): - GemRB.GamePause(2,0) + GemRB.GamePause(2,0) def OpenWaitForDiscWindow (): global DiscWindow - #print "OpenWaitForDiscWindow" + #print "OpenWaitForDiscWindow" if DiscWindow: - GemRB.HideGUI () + GemRB.HideGUI () GemRB.UnloadWindow (DiscWindow) GemRB.SetVar ("OtherWindow", -1) # ...LoadWindowPack() @@ -593,13 +593,13 @@ return try: - GemRB.HideGUI () + GemRB.HideGUI () except: pass - - GemRB.LoadWindowPack ("GUIID") - DiscWindow = Window = GemRB.LoadWindow (0) - GemRB.SetVar ("OtherWindow", Window) + + GemRB.LoadWindowPack ("GUIID") + DiscWindow = Window = GemRB.LoadWindow (0) + GemRB.SetVar ("OtherWindow", Window) label = GemRB.GetControl (DiscWindow, 0) disc_num = GemRB.GetVar ("WaitForDisc") @@ -608,8 +608,8 @@ text = GemRB.GetString (31483) + " " + str (disc_num) + " " + GemRB.GetString (31569) + " " + disc_path + "\n" + GemRB.GetString (49152) GemRB.SetText (DiscWindow, label, text) - DisableAnimatedWindows () - + DisableAnimatedWindows () + # 31483 - Please place PS:T disc number # 31568 - Please place the PS:T DVD # 31569 - in drive @@ -619,8 +619,8 @@ # 49152 - To quit the game, press Alt-F4 - try: - GemRB.UnhideGUI () - except: - GemRB.SetVisible (DiscWindow, 1) + try: + GemRB.UnhideGUI () + except: + GemRB.SetVisible (DiscWindow, 1) Modified: gemrb/trunk/gemrb/GUIScripts/pst/GUIMA.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/pst/GUIMA.py 2009-02-01 17:47:29 UTC (rev 5604) +++ gemrb/trunk/gemrb/GUIScripts/pst/GUIMA.py 2009-02-01 18:07:54 UTC (rev 5605) @@ -90,7 +90,7 @@ # 2 - map name? # 3 - map bitmap? # 4 - ??? - + # Done Button = GemRB.GetControl (Window, 5) GemRB.SetText (Window, Button, 1403) Modified: gemrb/trunk/gemrb/GUIScripts/pst/GUIWORLD.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/pst/GUIWORLD.py 2009-02-01 17:47:29 UTC (rev 5604) +++ gemrb/trunk/gemrb/GUIScripts/pst/GUIWORLD.py 2009-02-01 18:07:54 UTC (rev 5605) @@ -63,7 +63,7 @@ if ContainerWindow: return - hideflag = GemRB.HideGUI () + hideflag = GemRB.HideGUI () GemRB.LoadWindowPack (GetWindowPack()) ContainerWindow = Window = GemRB.LoadWindow (8) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |