From: Laszlo T. <ave...@us...> - 2005-03-28 10:36:29
|
Update of /cvsroot/gemrb/gemrb/gemrb/GUIScripts/iwd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31769/iwd Modified Files: GUISTORE.py Log Message: Updated GUISTORE to animate the donation window Index: GUISTORE.py =================================================================== RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/iwd/GUISTORE.py,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** GUISTORE.py 21 Mar 2005 23:09:33 -0000 1.12 --- GUISTORE.py 28 Mar 2005 10:36:20 -0000 1.13 *************** *** 73,80 **** store_update_funcs = None ! def CloseStoreWindow (): ! global StoreWindow, ActionWindow, PortraitWindow ! global OldPortraitWindow ! CloseStoreShoppingWindow () CloseStoreIdentifyWindow () --- 73,77 ---- store_update_funcs = None ! def CloseWindows (): CloseStoreShoppingWindow () CloseStoreIdentifyWindow () *************** *** 85,88 **** --- 82,91 ---- CloseStoreRentWindow () + + def CloseStoreWindow (): + global StoreWindow, ActionWindow, PortraitWindow + global OldPortraitWindow + + CloseWindows () GemRB.UnloadWindow (StoreWindow) GemRB.UnloadWindow (ActionWindow) *************** *** 160,167 **** global StoreShoppingWindow ! if StoreShoppingWindow != None: ! Window = StoreShoppingWindow ! UpdateStoreShoppingWindow () ! return StoreShoppingWindow = Window = GemRB.LoadWindow (2) --- 163,171 ---- global StoreShoppingWindow ! CloseWindows() ! #if StoreShoppingWindow != None: ! # Window = StoreShoppingWindow ! # UpdateStoreShoppingWindow () ! # return StoreShoppingWindow = Window = GemRB.LoadWindow (2) *************** *** 194,204 **** GemRB.SetText (Window, Button, 13704) Button = GemRB.GetControl (Window, 50) GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_LOCKED) ! GemRB.SetText (Window, Button, 13707) ! Button = GemRB.GetControl (Window, 44) ! GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_DISABLED) # encumbrance --- 198,210 ---- GemRB.SetText (Window, Button, 13704) + # inactive button Button = GemRB.GetControl (Window, 50) GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_LOCKED) ! GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_SET) ! #GemRB.SetText (Window, Button, 13707) + #backpack Button = GemRB.GetControl (Window, 44) ! GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_LOCKED) # encumbrance *************** *** 224,231 **** GemRB.SetVar ("Index", -1) GemRB.SetVar ("TopIndex", 0) ! if StoreIdentifyWindow != None: ! Window = StoreIdentifyWindow ! UpdateStoreIdentifyWindow () ! return StoreIdentifyWindow = Window = GemRB.LoadWindow (4) --- 230,238 ---- GemRB.SetVar ("Index", -1) GemRB.SetVar ("TopIndex", 0) ! CloseWindows() ! #if StoreIdentifyWindow != None: ! # Window = StoreIdentifyWindow ! # UpdateStoreIdentifyWindow () ! # return StoreIdentifyWindow = Window = GemRB.LoadWindow (4) *************** *** 261,268 **** global StoreStealWindow ! if StoreStealWindow != None: ! Window = StoreStealWindow ! UpdateStoreStealWindow () ! return StoreStealWindow = Window = GemRB.LoadWindow (6) --- 268,278 ---- global StoreStealWindow ! GemRB.SetVar ("RightIndex",0) ! GemRB.SetVar ("LeftIndex",0) ! CloseWindows() ! #if StoreStealWindow != None: ! # Window = StoreStealWindow ! # UpdateStoreStealWindow () ! # return StoreStealWindow = Window = GemRB.LoadWindow (6) *************** *** 286,290 **** Button = GemRB.GetControl (Window, 37) ! GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_DISABLED) # encumbrance --- 296,300 ---- Button = GemRB.GetControl (Window, 37) ! GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_LOCKED) # encumbrance *************** *** 308,315 **** global StoreDonateWindow ! if StoreDonateWindow != None: ! Window = StoreDonateWindow ! UpdateStoreDonateWindow () ! return StoreDonateWindow = Window = GemRB.LoadWindow (9) --- 318,326 ---- global StoreDonateWindow ! CloseWindows () ! #if StoreDonateWindow != None: ! # Window = StoreDonateWindow ! # UpdateStoreDonateWindow () ! # return StoreDonateWindow = Window = GemRB.LoadWindow (9) *************** *** 317,321 **** # graphics Button = GemRB.GetControl (Window, 10) ! GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_ANIMATED|IE_GUI_BUTTON_PLAYONCE, OP_OR) GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_LOCKED) --- 328,332 ---- # graphics Button = GemRB.GetControl (Window, 10) ! GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_ANIMATED|IE_GUI_BUTTON_PLAYONCE, OP_OR) GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_LOCKED) *************** *** 349,356 **** GemRB.SetVar ("Index", -1) GemRB.SetVar ("TopIndex", 0) ! if StoreHealWindow != None: ! Window = StoreHealWindow ! UpdateStoreHealWindow () ! return StoreHealWindow = Window = GemRB.LoadWindow (5) --- 360,368 ---- GemRB.SetVar ("Index", -1) GemRB.SetVar ("TopIndex", 0) ! CloseWindows() ! #if StoreHealWindow != None: ! # Window = StoreHealWindow ! # UpdateStoreHealWindow () ! # return StoreHealWindow = Window = GemRB.LoadWindow (5) *************** *** 390,397 **** GemRB.SetVar ("TopIndex", 0) ! if StoreRumourWindow != None: ! Window = StoreRumourWindow ! UpdateStoreRumourWindow () ! return StoreRumourWindow = Window = GemRB.LoadWindow (8) --- 402,410 ---- GemRB.SetVar ("TopIndex", 0) ! CloseWindows() ! #if StoreRumourWindow != None: ! # Window = StoreRumourWindow ! # UpdateStoreRumourWindow () ! # return StoreRumourWindow = Window = GemRB.LoadWindow (8) *************** *** 407,410 **** --- 420,424 ---- Button = GemRB.GetControl (Window, 12) GemRB.SetButtonSprites (Window, Button, BAM, 0, 0, 0, 0, 0) + GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_LOCKED) ScrollBar = GemRB.GetControl (Window, 5) *************** *** 424,432 **** global StoreRentWindow, RentIndex ! if StoreRentWindow != None: ! Window = StoreRentWindow ! GemRB.SetVar ("RentIndex", RentIndex) ! UpdateStoreRentWindow () ! return StoreRentWindow = Window = GemRB.LoadWindow (7) --- 438,447 ---- global StoreRentWindow, RentIndex ! CloseWindows() ! #if StoreRentWindow != None: ! # Window = StoreRentWindow ! # GemRB.SetVar ("RentIndex", RentIndex) ! # UpdateStoreRentWindow () ! # return StoreRentWindow = Window = GemRB.LoadWindow (7) *************** *** 548,552 **** 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 Flags & 2: if i==RightIndex: --- 563,567 ---- 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 Flags & 2: if i==RightIndex: *************** *** 623,626 **** --- 638,647 ---- GemRB.SetText (Window, Label, "") + Button = GemRB.GetControl (Window, 5) + if Index >= 0 and Count > Index: + GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_ENABLED) + else: + GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_DISABLED) + def InfoIdentifyWindow (): *************** *** 629,632 **** --- 650,656 ---- pc = GemRB.GameGetSelectedPCSingle () inventory_slots = GemRB.GetSlots (pc, -1) + Count = len(inventory_slots) + if Index >= Count: + return Slot = GemRB.GetSlotItem (inventory_slots[Index]) Item = GemRB.GetItem (Slot['ItemResRef']) *************** *** 634,637 **** --- 658,663 ---- #GemRB.SetSlotItem (inventory_slots[Index], {"Flags":4}) #deduce gold from player + IDPrice = Store['IDPrice'] + GemRB.GameSetPartyGold (GemRB.GameGetPartyGold()-IDPrice) Window = GemRB.LoadWindow (12) *************** *** 730,734 **** 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; GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_DISABLED) GemRB.SetToken ("ITEMNAME", GemRB.GetString (Item['ItemName'])) --- 756,760 ---- 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 GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_DISABLED) GemRB.SetToken ("ITEMNAME", GemRB.GetString (Item['ItemName'])) *************** *** 790,800 **** Button = GemRB.GetControl (Window, 10) ! #GemRB.SetButtonAnimation (Window, Button, 0, 0) Field = GemRB.GetControl (Window, 5) donation = int("0"+GemRB.QueryText (Window, Field)) GemRB.GameSetPartyGold (GemRB.GameGetPartyGold ()-donation) - #reputation = GemRB.GameGetReputation () - #if reputation<180: if GemRB.IncreaseReputation( donation ): GemRB.TextAreaAppend (Window, TextArea, 10468, -1) --- 816,824 ---- Button = GemRB.GetControl (Window, 10) ! GemRB.SetAnimation (Window, Button, "DONATE") Field = GemRB.GetControl (Window, 5) donation = int("0"+GemRB.QueryText (Window, Field)) GemRB.GameSetPartyGold (GemRB.GameGetPartyGold ()-donation) if GemRB.IncreaseReputation( donation ): GemRB.TextAreaAppend (Window, TextArea, 10468, -1) |