From: <ave...@us...> - 2007-03-11 15:47:28
|
Revision: 4544 http://gemrb.svn.sourceforge.net/gemrb/?rev=4544&view=rev Author: avenger_teambg Date: 2007-03-11 08:47:27 -0700 (Sun, 11 Mar 2007) Log Message: ----------- guiscript updates Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/GUIDefines.py gemrb/trunk/gemrb/GUIScripts/bg1/GUICommonWindows.py gemrb/trunk/gemrb/GUIScripts/bg1/MessageWindow.py gemrb/trunk/gemrb/GUIScripts/bg2/GUICommonWindows.py gemrb/trunk/gemrb/GUIScripts/how/GUICommonWindows.py gemrb/trunk/gemrb/GUIScripts/iwd/GUICommonWindows.py gemrb/trunk/gemrb/GUIScripts/iwd2/GUIOPT.py gemrb/trunk/gemrb/GUIScripts/tob/GUICommonWindows.py Modified: gemrb/trunk/gemrb/GUIScripts/GUIDefines.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/GUIDefines.py 2007-03-11 14:44:54 UTC (rev 4543) +++ gemrb/trunk/gemrb/GUIScripts/GUIDefines.py 2007-03-11 15:47:27 UTC (rev 4544) @@ -159,6 +159,7 @@ TARGET_MODE_TALK = 0x01 TARGET_MODE_ATTACK = 0x02 TARGET_MODE_CAST = 0x04 +TARGET_MODE_DEFEND = 0x08 TARGET_MODE_ALLY = 0x10 TARGET_MODE_ENEMY = 0x20 Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUICommonWindows.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/GUICommonWindows.py 2007-03-11 14:44:54 UTC (rev 4543) +++ gemrb/trunk/gemrb/GUIScripts/bg1/GUICommonWindows.py 2007-03-11 15:47:27 UTC (rev 4544) @@ -27,6 +27,7 @@ from GUIDefines import * from ie_stats import * from ie_modal import * +from ie_action import * FRAME_PC_SELECTED = 0 FRAME_PC_TARGET = 1 @@ -104,7 +105,7 @@ def AIPress (): Button = GemRB.GetControl (PortraitWindow, 6) - AI = GemRB.GetMessageWindowSize() & GS_PARTYAI + AI = GemRB.GetMessageWindowSize () & GS_PARTYAI if AI: GemRB.GameSetScreenFlags(GS_PARTYAI, OP_NAND) @@ -138,7 +139,7 @@ global ActionsWindow Window = ActionsWindow - for i in range (12): + for i in range(12): Button = GemRB.GetControl (Window, i) GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NORMAL, OP_SET) GemRB.SetButtonSprites (Window, Button, "GUIBTBUT",0,0,1,2,3) @@ -254,6 +255,9 @@ def ActionAttackPressed (): GemRB.GameControlSetTargetMode (TARGET_MODE_ALL | TARGET_MODE_ATTACK) +def ActionDefendpressed (): + GemRB.GameControlSetTargetMode (TARGET_MODE_ALL | TARGET_MODE_DEFEND) + def ActionQWeaponPressed (which): pc = GemRB.GameGetFirstSelectedPC () @@ -293,7 +297,7 @@ else: TopIndex = 0 GemRB.SetVar ("TopIndex", TopIndex) - UpdateActionsWindow () + UpdateActionsWindow () return #no check needed because the button wouldn't be drawn if illegal @@ -312,7 +316,7 @@ else: TopIndex = 0 - GemRB.SetVar ("TopIndex", TopIndex) + GemRB.SetVar ("TopIndex", TopIndex) UpdateActionsWindow () return @@ -354,27 +358,28 @@ def ActionQItemPressed (action): pc = GemRB.GameGetFirstSelectedPC () - GemRB.UseItem(pc, action) + #quick slot + GemRB.UseItem(pc, -2, action) return def ActionQItem1Pressed (): - ActionQItemPressed (9) + ActionQItemPressed (ACT_QSLOT1) return def ActionQItem2Pressed (): - ActionQItemPressed (11) + ActionQItemPressed (ACT_QSLOT2) return def ActionQItem3Pressed (): - ActionQItemPressed (12) + ActionQItemPressed (ACT_QSLOT3) return def ActionQItem4Pressed (): - ActionQItemPressed (10) + ActionQItemPressed (ACT_QSLOT4) return def ActionQItem5Pressed (): - ActionQItemPressed (31) + ActionQItemPressed (ACT_QSLOT5) return def ActionInnatePressed (): @@ -397,7 +402,7 @@ Item = GemRB.GetVar("Equipment") GemRB.UseItem(pc, -1, Item) return - + def GetActorClassTitle (actor): ClassTitle = GemRB.GetPlayerStat (actor, IE_TITLE1) KitIndex = GemRB.GetPlayerStat (actor, IE_KIT) & 0xfff @@ -450,12 +455,12 @@ def OpenPortraitWindow (needcontrols): global PortraitWindow - PortraitWindow = Window = GemRB.LoadWindow(1) + PortraitWindow = Window = GemRB.LoadWindow (1) # AI if needcontrols: Button = GemRB.GetControl (Window, 6) - GSFlags = GemRB.GetMessageWindowSize()&GS_PARTYAI + GSFlags = GemRB.GetMessageWindowSize ()&GS_PARTYAI GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_CHECKBOX,OP_OR) #this control is crippled GemRB.SetButtonSprites (Window, Button, "GUIBTACT", 0, 46, 47, 48, 49) @@ -470,6 +475,8 @@ Button = GemRB.GetControl (Window, 7) GemRB.SetTooltip (Window, Button, 10485) GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "SelectAllOnPress") + pc = GemRB.GameGetSelectedPCSingle () + Inventory = GemRB.GetVar ("Inventory") for i in range (PARTY_SIZE): Button = GemRB.GetControl (Window, i) @@ -484,6 +491,11 @@ GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_DRAG_DROP, "OnDropItemToPC") GemRB.SetEvent (Window, Button, IE_GUI_MOUSE_ENTER_BUTTON, "PortraitButtonOnMouseEnter") GemRB.SetEvent (Window, Button, IE_GUI_MOUSE_LEAVE_BUTTON, "PortraitButtonOnMouseLeave") + if Inventory and pc !=i+1: + GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_SET) + GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_DISABLED) + GemRB.SetText (Window, Button, "") + GemRB.SetTooltip (Window, Button, "") GemRB.SetButtonBorder (Window, Button, FRAME_PC_SELECTED, 1, 1, 2, 2, 0, 255, 0, 255) GemRB.SetButtonBorder (Window, Button, FRAME_PC_TARGET, 3, 3, 4, 4, 255, 255, 0, 255) @@ -512,8 +524,8 @@ hp_max = GemRB.GetPlayerStat (i+1, IE_MAXHITPOINTS) GemRB.SetTooltip (Window, Button, GemRB.GetPlayerName (i+1, 1) + "\n%d/%d" %(hp, hp_max)) - + def PortraitButtonOnPress (): i = GemRB.GetVar ("PressedPortrait") Modified: gemrb/trunk/gemrb/GUIScripts/bg1/MessageWindow.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/MessageWindow.py 2007-03-11 14:44:54 UTC (rev 4543) +++ gemrb/trunk/gemrb/GUIScripts/bg1/MessageWindow.py 2007-03-11 15:47:27 UTC (rev 4544) @@ -156,7 +156,7 @@ GemRB.SetVar("MessageWindow", TMessageWindow) GemRB.SetVar("MessageTextArea", TMessageTA) if Override: - GemRB.SetControlStatus (MessageWindow,MessageTA,IE_GUI_CONTROL_FOCUSED) + GemRB.SetControlStatus (TMessageWindow,TMessageTA,IE_GUI_CONTROL_FOCUSED) else: GemRB.SetControlStatus (0,0,IE_GUI_CONTROL_FOCUSED) Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICommonWindows.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUICommonWindows.py 2007-03-11 14:44:54 UTC (rev 4543) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICommonWindows.py 2007-03-11 15:47:27 UTC (rev 4544) @@ -114,7 +114,7 @@ def AIPress (): Button = GemRB.GetControl (PortraitWindow, 6) - AI = GemRB.GetMessageWindowSize() & GS_PARTYAI + AI = GemRB.GetMessageWindowSize () & GS_PARTYAI if AI: GemRB.GameSetScreenFlags(GS_PARTYAI, OP_NAND) @@ -140,7 +140,7 @@ return def SelectFormationPreset (): - GemRB.GameSetFormation ( GemRB.GetVar ("Value"), GemRB.GetVar ("Formation") ) + GemRB.GameSetFormation (GemRB.GetVar ("Value"), GemRB.GetVar ("Formation") ) GroupControls () return @@ -271,14 +271,17 @@ def ActionAttackPressed (): GemRB.GameControlSetTargetMode (TARGET_MODE_ALL | TARGET_MODE_ATTACK) +def ActionDefendpressed (): + GemRB.GameControlSetTargetMode (TARGET_MODE_ALL | TARGET_MODE_DEFEND) + def ActionQWeaponPressed (which): - pc = GemRB.GameGetFirstSelectedPC() + pc = GemRB.GameGetFirstSelectedPC () - if GemRB.GetEquippedQuickSlot(pc)==which and not (GemRB.GameControlGetTargetMode() &TARGET_MODE_ATTACK): + if GemRB.GetEquippedQuickSlot (pc)==which and not (GemRB.GameControlGetTargetMode() &TARGET_MODE_ATTACK): GemRB.GameControlSetTargetMode (TARGET_MODE_ALL | TARGET_MODE_ATTACK) else: GemRB.GameControlSetTargetMode (TARGET_MODE_ALL) - GemRB.SetEquippedQuickSlot(pc, which) + GemRB.SetEquippedQuickSlot (pc, which) GemRB.SetupControls (ActionsWindow, pc) UpdateActionsWindow () @@ -315,7 +318,7 @@ #no check needed because the button wouldn't be drawn if illegal def ActionRightPressed (): - pc = GemRB.GameGetFirstSelectedPC() + pc = GemRB.GameGetFirstSelectedPC () TopIndex = GemRB.GetVar ("TopIndex") Type = GemRB.GetVar ("Type") if Type == 3: @@ -334,25 +337,25 @@ return def ActionSongPressed (): - pc = GemRB.GameGetFirstSelectedPC() + pc = GemRB.GameGetFirstSelectedPC () GemRB.SetModalState (pc, MS_BATTLESONG) UpdateActionsWindow () return def ActionSearchPressed (): - pc = GemRB.GameGetFirstSelectedPC() + pc = GemRB.GameGetFirstSelectedPC () GemRB.SetModalState (pc, MS_DETECTTRAPS) UpdateActionsWindow () return def ActionStealthPressed (): - pc = GemRB.GameGetFirstSelectedPC() + pc = GemRB.GameGetFirstSelectedPC () GemRB.SetModalState (pc, MS_STEALTH) UpdateActionsWindow () return def ActionTurnPressed (): - pc = GemRB.GameGetFirstSelectedPC() + pc = GemRB.GameGetFirstSelectedPC () GemRB.SetModalState (pc, MS_TURNUNDEAD) UpdateActionsWindow () return @@ -370,7 +373,7 @@ return def ActionQItemPressed (action): - pc = GemRB.GameGetFirstSelectedPC() + pc = GemRB.GameGetFirstSelectedPC () #quick slot GemRB.UseItem(pc, -2, action) return @@ -402,7 +405,7 @@ return def SpellPressed (): - pc = GemRB.GameGetFirstSelectedPC() + pc = GemRB.GameGetFirstSelectedPC () GemRB.GameControlSetTargetMode (TARGET_MODE_ALL | TARGET_MODE_CAST) Spell = GemRB.GetVar("Spell") @@ -411,7 +414,7 @@ return def EquipmentPressed (): - pc = GemRB.GameGetFirstSelectedPC() + pc = GemRB.GameGetFirstSelectedPC () GemRB.GameControlSetTargetMode (TARGET_MODE_ALL | TARGET_MODE_CAST) Item = GemRB.GetVar("Equipment") @@ -480,7 +483,7 @@ # AI Button = GemRB.GetControl (Window, 6) - GSFlags = GemRB.GetMessageWindowSize()&GS_PARTYAI + GSFlags = GemRB.GetMessageWindowSize ()&GS_PARTYAI GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "AIPress") GemRB.SetVarAssoc (Window, Button, "", GSFlags) if GSFlags: Modified: gemrb/trunk/gemrb/GUIScripts/how/GUICommonWindows.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/how/GUICommonWindows.py 2007-03-11 14:44:54 UTC (rev 4543) +++ gemrb/trunk/gemrb/GUIScripts/how/GUICommonWindows.py 2007-03-11 15:47:27 UTC (rev 4544) @@ -227,6 +227,8 @@ for i in range (12): Button = GemRB.GetControl (ActionsWindow, i) GemRB.SetButtonBorder (ActionsWindow, Button, 1, 0, 0, 0, 0, 50,30,10,120, 0, 1) + GemRB.SetButtonFont (ActionsWindow, Button, "NUMBER") + GemRB.SetText (ActionsWindow, Button, "") if pc == 0: EmptyControls () @@ -259,6 +261,9 @@ def ActionAttackPressed (): GemRB.GameControlSetTargetMode (TARGET_MODE_ALL | TARGET_MODE_ATTACK) +def ActionDefendpressed (): + GemRB.GameControlSetTargetMode (TARGET_MODE_ALL | TARGET_MODE_DEFEND) + def ActionQWeaponPressed (which): pc = GemRB.GameGetFirstSelectedPC() Modified: gemrb/trunk/gemrb/GUIScripts/iwd/GUICommonWindows.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd/GUICommonWindows.py 2007-03-11 14:44:54 UTC (rev 4543) +++ gemrb/trunk/gemrb/GUIScripts/iwd/GUICommonWindows.py 2007-03-11 15:47:27 UTC (rev 4544) @@ -225,7 +225,10 @@ for i in range (12): Button = GemRB.GetControl (ActionsWindow, i) GemRB.SetButtonBorder (ActionsWindow, Button, 1, 0, 0, 0, 0, 50,30,10,120, 0, 1) + GemRB.SetButtonFont (ActionsWindow, Button, "NUMBER") + GemRB.SetText (ActionsWindow, Button, "") + if pc == 0: EmptyControls () return @@ -257,6 +260,9 @@ def ActionAttackPressed (): GemRB.GameControlSetTargetMode (TARGET_MODE_ALL | TARGET_MODE_ATTACK) +def ActionDefendpressed (): + GemRB.GameControlSetTargetMode (TARGET_MODE_ALL | TARGET_MODE_DEFEND) + def ActionQWeaponPressed (which): pc = GemRB.GameGetFirstSelectedPC() Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/GUIOPT.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/GUIOPT.py 2007-03-11 14:44:54 UTC (rev 4543) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/GUIOPT.py 2007-03-11 15:47:27 UTC (rev 4544) @@ -111,10 +111,10 @@ def SaveGamePress(): OpenOptionsWindow () - GemRB.SetVar("QuitAfterSave",0) - OpenSaveWindow () - #save the game without quitting - return + GemRB.SetVar("QuitAfterSave",0) + OpenSaveWindow () + #save the game without quitting + return def QuitGamePress(): OpenOptionsWindow () Modified: gemrb/trunk/gemrb/GUIScripts/tob/GUICommonWindows.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/tob/GUICommonWindows.py 2007-03-11 14:44:54 UTC (rev 4543) +++ gemrb/trunk/gemrb/GUIScripts/tob/GUICommonWindows.py 2007-03-11 15:47:27 UTC (rev 4544) @@ -114,7 +114,7 @@ def AIPress (): Button = GemRB.GetControl (PortraitWindow, 6) - AI = GemRB.GetMessageWindowSize() & GS_PARTYAI + AI = GemRB.GetMessageWindowSize () & GS_PARTYAI if AI: GemRB.GameSetScreenFlags(GS_PARTYAI, OP_NAND) @@ -140,7 +140,7 @@ return def SelectFormationPreset (): - GemRB.GameSetFormation ( GemRB.GetVar ("Value"), GemRB.GetVar ("Formation") ) + GemRB.GameSetFormation (GemRB.GetVar ("Value"), GemRB.GetVar ("Formation") ) GroupControls () return @@ -271,14 +271,17 @@ def ActionAttackPressed (): GemRB.GameControlSetTargetMode (TARGET_MODE_ALL | TARGET_MODE_ATTACK) +def ActionDefendpressed (): + GemRB.GameControlSetTargetMode (TARGET_MODE_ALL | TARGET_MODE_DEFEND) + def ActionQWeaponPressed (which): - pc = GemRB.GameGetFirstSelectedPC() + pc = GemRB.GameGetFirstSelectedPC () - if GemRB.GetEquippedQuickSlot(pc)==which and not (GemRB.GameControlGetTargetMode() &TARGET_MODE_ATTACK): + if GemRB.GetEquippedQuickSlot (pc)==which and not (GemRB.GameControlGetTargetMode() &TARGET_MODE_ATTACK): GemRB.GameControlSetTargetMode (TARGET_MODE_ALL | TARGET_MODE_ATTACK) else: GemRB.GameControlSetTargetMode (TARGET_MODE_ALL) - GemRB.SetEquippedQuickSlot(pc, which) + GemRB.SetEquippedQuickSlot (pc, which) GemRB.SetupControls (ActionsWindow, pc) UpdateActionsWindow () @@ -315,7 +318,7 @@ #no check needed because the button wouldn't be drawn if illegal def ActionRightPressed (): - pc = GemRB.GameGetFirstSelectedPC() + pc = GemRB.GameGetFirstSelectedPC () TopIndex = GemRB.GetVar ("TopIndex") Type = GemRB.GetVar ("Type") if Type == 3: @@ -334,25 +337,25 @@ return def ActionSongPressed (): - pc = GemRB.GameGetFirstSelectedPC() + pc = GemRB.GameGetFirstSelectedPC () GemRB.SetModalState (pc, MS_BATTLESONG) UpdateActionsWindow () return def ActionSearchPressed (): - pc = GemRB.GameGetFirstSelectedPC() + pc = GemRB.GameGetFirstSelectedPC () GemRB.SetModalState (pc, MS_DETECTTRAPS) UpdateActionsWindow () return def ActionStealthPressed (): - pc = GemRB.GameGetFirstSelectedPC() + pc = GemRB.GameGetFirstSelectedPC () GemRB.SetModalState (pc, MS_STEALTH) UpdateActionsWindow () return def ActionTurnPressed (): - pc = GemRB.GameGetFirstSelectedPC() + pc = GemRB.GameGetFirstSelectedPC () GemRB.SetModalState (pc, MS_TURNUNDEAD) UpdateActionsWindow () return @@ -370,7 +373,7 @@ return def ActionQItemPressed (action): - pc = GemRB.GameGetFirstSelectedPC() + pc = GemRB.GameGetFirstSelectedPC () #quick slot GemRB.UseItem(pc, -2, action) return @@ -402,7 +405,7 @@ return def SpellPressed (): - pc = GemRB.GameGetFirstSelectedPC() + pc = GemRB.GameGetFirstSelectedPC () GemRB.GameControlSetTargetMode (TARGET_MODE_ALL | TARGET_MODE_CAST) Spell = GemRB.GetVar("Spell") @@ -411,7 +414,7 @@ return def EquipmentPressed (): - pc = GemRB.GameGetFirstSelectedPC() + pc = GemRB.GameGetFirstSelectedPC () GemRB.GameControlSetTargetMode (TARGET_MODE_ALL | TARGET_MODE_CAST) Item = GemRB.GetVar("Equipment") @@ -480,7 +483,7 @@ # AI Button = GemRB.GetControl (Window, 6) - GSFlags = GemRB.GetMessageWindowSize()&GS_PARTYAI + GSFlags = GemRB.GetMessageWindowSize ()&GS_PARTYAI GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "AIPress") GemRB.SetVarAssoc (Window, Button, "", GSFlags) if GSFlags: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |