Menu
▾
▴
[Gemrb-commits] SF.net SVN: gemrb: [4635] gemrb/trunk/gemrb/GUIScripts
|
From: <ave...@us...> - 2007-05-03 20:53:58
|
Revision: 4635
http://gemrb.svn.sourceforge.net/gemrb/?rev=4635&view=rev
Author: avenger_teambg
Date: 2007-05-03 13:53:55 -0700 (Thu, 03 May 2007)
Log Message:
-----------
more spellbook guiscript updates
Modified Paths:
--------------
gemrb/trunk/gemrb/GUIScripts/bg1/GUIMG.py
gemrb/trunk/gemrb/GUIScripts/bg1/GUIPR.py
gemrb/trunk/gemrb/GUIScripts/bg2/GUIMG.py
gemrb/trunk/gemrb/GUIScripts/bg2/GUIPR.py
gemrb/trunk/gemrb/GUIScripts/how/GUIMG.py
gemrb/trunk/gemrb/GUIScripts/how/GUIPR.py
gemrb/trunk/gemrb/GUIScripts/iwd/GUIMG.py
gemrb/trunk/gemrb/GUIScripts/iwd/GUIPR.py
gemrb/trunk/gemrb/GUIScripts/tob/GUIMG.py
gemrb/trunk/gemrb/GUIScripts/tob/GUIPR.py
Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUIMG.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/GUIMG.py 2007-05-03 17:51:09 UTC (rev 4634)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/GUIMG.py 2007-05-03 20:53:55 UTC (rev 4635)
@@ -225,12 +225,8 @@
index = GemRB.GetVar ("SpellButton")
if index < 100:
ResRef = MageMemorizedSpellList[index]
- # GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "")
- # GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_SET)
else:
ResRef = MageKnownSpellList[index - 100]
- # GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenMageSpellRemoveWindow")
- # GemRB.SetText (Window, Button, 63668)
spell = GemRB.GetSpell (ResRef)
Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUIPR.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg1/GUIPR.py 2007-05-03 17:51:09 UTC (rev 4634)
+++ gemrb/trunk/gemrb/GUIScripts/bg1/GUIPR.py 2007-05-03 20:53:55 UTC (rev 4635)
@@ -229,7 +229,6 @@
GemRB.ShowModal (Window, MODAL_SHADOW_GRAY)
return
-
def OnPriestMemorizeSpell ():
pc = GemRB.GameGetSelectedPCSingle ()
level = PriestSpellLevel
@@ -306,7 +305,6 @@
UpdatePriestWindow ()
return
-
def OnPriestRemoveSpell ():
ClosePriestSpellUnmemorizeWindow()
OpenPriestSpellInfoWindow()
Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUIMG.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg2/GUIMG.py 2007-05-03 17:51:09 UTC (rev 4634)
+++ gemrb/trunk/gemrb/GUIScripts/bg2/GUIMG.py 2007-05-03 20:53:55 UTC (rev 4635)
@@ -158,7 +158,7 @@
GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NORMAL, OP_SET)
else:
GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_SET)
- GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS,"")
+ GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "")
GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_RIGHT_PRESS, "")
GemRB.SetTooltip (Window, Button, '')
GemRB.EnableButtonBorder (Window, Button, 0, 0)
@@ -170,7 +170,7 @@
if i < known_cnt:
ks = GemRB.GetKnownSpell (pc, type, level, i)
GemRB.SetSpellIcon (Window, Button, ks['SpellResRef'], 0)
- GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS,"OnMageMemorizeSpell")
+ GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OnMageMemorizeSpell")
GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_RIGHT_PRESS, "OpenMageSpellInfoWindow")
spell = GemRB.GetSpell (ks['SpellResRef'])
GemRB.SetTooltip (Window, Button, spell['SpellName'])
@@ -232,7 +232,7 @@
GemRB.UnloadWindow (MageSpellInfoWindow)
MageSpellInfoWindow = None
return
-
+
MageSpellInfoWindow = Window = GemRB.LoadWindow (3)
#back
@@ -286,7 +286,7 @@
def OpenMageSpellRemoveWindow ():
global MageSpellUnmemorizeWindow
-
+
MageSpellUnmemorizeWindow = Window = GemRB.LoadWindow (101)
# "Are you sure you want to ....?"
Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUIPR.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/bg2/GUIPR.py 2007-05-03 17:51:09 UTC (rev 4634)
+++ gemrb/trunk/gemrb/GUIScripts/bg2/GUIPR.py 2007-05-03 20:53:55 UTC (rev 4635)
@@ -151,12 +151,8 @@
GemRB.EnableButtonBorder (Window, Button, 0, ms['Flags'] == 0)
else:
if i < max_mem_cnt:
- #GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_NAND)
- #GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE, OP_OR)
GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NORMAL, OP_SET)
else:
- #GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_OR)
- #GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE, OP_NAND)
GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_SET)
GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "")
GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_RIGHT_PRESS, "")
@@ -170,7 +166,6 @@
if i < known_cnt:
ks = GemRB.GetKnownSpell (pc, type, level, i)
GemRB.SetSpellIcon (Window, Button, ks['SpellResRef'], 0)
- #GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_NAND)
GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OnPriestMemorizeSpell")
GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_RIGHT_PRESS, "OpenPriestSpellInfoWindow")
spell = GemRB.GetSpell (ks['SpellResRef'])
@@ -251,7 +246,6 @@
GemRB.ShowModal (Window, MODAL_SHADOW_GRAY)
return
-
def OnPriestMemorizeSpell ():
pc = GemRB.GameGetSelectedPCSingle ()
level = PriestSpellLevel
@@ -280,7 +274,7 @@
# Cancel
Button = GemRB.GetControl (Window, 1)
GemRB.SetText (Window, Button, 13727)
- GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenPriestSpellRemoveWindow")
+ GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "ClosePriestSpellUnmemorizeWindow")
GemRB.ShowModal (Window, MODAL_SHADOW_GRAY)
return
@@ -328,7 +322,6 @@
UpdatePriestWindow ()
return
-
def OnPriestRemoveSpell ():
ClosePriestSpellUnmemorizeWindow()
OpenPriestSpellInfoWindow()
@@ -337,9 +330,9 @@
level = PriestSpellLevel
type = IE_SPELL_TYPE_PRIEST
- index = GemRB.GetVar ("SpellButton")-100
+ index = GemRB.GetVar ("SpellButton") - 100
- #remove spell from memory
+ #remove spell from book
GemRB.RemoveSpell (pc, type, level, index)
UpdatePriestWindow ()
return
Modified: gemrb/trunk/gemrb/GUIScripts/how/GUIMG.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/how/GUIMG.py 2007-05-03 17:51:09 UTC (rev 4634)
+++ gemrb/trunk/gemrb/GUIScripts/how/GUIMG.py 2007-05-03 20:53:55 UTC (rev 4635)
@@ -39,9 +39,8 @@
OldPortraitWindow = None
OldOptionsWindow = None
-
def OpenMageWindow ():
- global MageWindow, PortraitWindow, OptionsWindow
+ global MageWindow, OptionsWindow, PortraitWindow
global OldPortraitWindow, OldOptionsWindow
if CloseOtherWindow (OpenMageWindow):
@@ -59,9 +58,10 @@
OldOptionsWindow = None
SetSelectionChangeHandler (None)
return
-
+
GemRB.HideGUI ()
GemRB.SetVisible (0,0)
+
GemRB.LoadWindowPack ("GUIMG", 640, 480)
MageWindow = Window = GemRB.LoadWindow (2)
GemRB.SetVar ("OtherWindow", MageWindow)
@@ -113,10 +113,11 @@
SetSelectionChangeHandler (UpdateMageWindow)
UpdateMageWindow ()
GemRB.SetVisible (OptionsWindow, 1)
+ #bringing the window front
GemRB.SetVisible (Window, 3)
GemRB.SetVisible (PortraitWindow, 1)
+ return
-
def UpdateMageWindow ():
global MageMemorizedSpellList, MageKnownSpellList
@@ -127,9 +128,8 @@
pc = GemRB.GameGetSelectedPCSingle ()
type = IE_SPELL_TYPE_WIZARD
level = MageSpellLevel
- #max_mem_cnt = GemRB.GetMemorizableSpellsCount (pc, type, level)
- max_mem_cnt = 0
-
+ max_mem_cnt = GemRB.GetMemorizableSpellsCount (pc, type, level)
+
Label = GemRB.GetControl (Window, 0x10000032)
GemRB.SetToken ('LEVEL', str (level + 1))
GemRB.SetText (Window, Label, 12137 )
@@ -142,7 +142,7 @@
Button = GemRB.GetControl (Window, 3 + i)
if i < mem_cnt:
ms = GemRB.GetMemorizedSpell (pc, type, level, i)
- GemRB.SetSpellIcon (Window, Button, ms['SpellResRef'])
+ GemRB.SetSpellIcon (Window, Button, ms['SpellResRef'], 0)
GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_NAND)
GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE, OP_OR)
if ms['Flags']:
@@ -157,13 +157,10 @@
GemRB.EnableButtonBorder (Window, Button, 0, ms['Flags'] == 0)
else:
if i < max_mem_cnt:
- GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_NAND)
- GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE, OP_OR)
+ GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NORMAL, OP_SET)
else:
- GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_OR)
- GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE, OP_NAND)
- GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS,
-"")
+ GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_SET)
+ GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "")
GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_RIGHT_PRESS, "")
GemRB.SetTooltip (Window, Button, '')
GemRB.EnableButtonBorder (Window, Button, 0, 0)
@@ -174,54 +171,193 @@
Button = GemRB.GetControl (Window, 27 + i)
if i < known_cnt:
ks = GemRB.GetKnownSpell (pc, type, level, i)
- GemRB.SetSpellIcon (Window, Button, ks['SpellResRef'])
- GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_NAND)
- GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS,
-"OnMageMemorizeSpell")
+ GemRB.SetSpellIcon (Window, Button, ks['SpellResRef'], 0)
+ GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OnMageMemorizeSpell")
GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_RIGHT_PRESS, "OpenMageSpellInfoWindow")
spell = GemRB.GetSpell (ks['SpellResRef'])
GemRB.SetTooltip (Window, Button, spell['SpellName'])
MageKnownSpellList.append (ks['SpellResRef'])
- GemRB.SetVarAssoc (Window, Button, "SpellButton", 100 +
-i)
+ GemRB.SetVarAssoc (Window, Button, "SpellButton", 100 + i)
else:
- GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_OR)
GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE, OP_NAND)
- GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS,
-"")
+ GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "")
GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_RIGHT_PRESS, "")
GemRB.SetTooltip (Window, Button, '')
GemRB.EnableButtonBorder (Window, Button, 0, 0)
+
Table = GemRB.LoadTable ("clskills")
if (GemRB.GetTableValue (Table, GemRB.GetPlayerStat( GemRB.GameGetSelectedPCSingle(), IE_CLASS), 2)=="*"):
GemRB.SetVisible (Window, 2)
else:
GemRB.SetVisible (Window, 1)
+ return
-
def MagePrevLevelPress ():
global MageSpellLevel
if MageSpellLevel > 0:
MageSpellLevel = MageSpellLevel - 1
UpdateMageWindow ()
+ return
-
def MageNextLevelPress ():
global MageSpellLevel
if MageSpellLevel < 8:
MageSpellLevel = MageSpellLevel + 1
UpdateMageWindow ()
+ return
-
def RefreshMageLevel ():
global MageSpellLevel
MageSpellLevel = GemRB.GetVar ("MageSpellLevel")
UpdateMageWindow ()
+ return
+def OnMageMemorizeSpell ():
+ pc = GemRB.GameGetSelectedPCSingle ()
+ level = MageSpellLevel
+ type = IE_SPELL_TYPE_WIZARD
+ index = GemRB.GetVar ("SpellButton") - 100
+
+ if GemRB.MemorizeSpell (pc, type, level, index):
+ UpdateMageWindow ()
+ return
+
+def OpenMageSpellInfoWindow ():
+ global MageSpellInfoWindow
+
+ if MageSpellInfoWindow != None:
+ GemRB.UnloadWindow (MageSpellInfoWindow)
+ MageSpellInfoWindow = None
+ return
+
+ MageSpellInfoWindow = Window = GemRB.LoadWindow (3)
+
+ #back
+ Button = GemRB.GetControl (Window, 5)
+ GemRB.SetText (Window, Button, 15416)
+ GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenMageSpellInfoWindow")
+
+ #erase
+ #Button = GemRB.GetControl (Window, 6)
+ index = GemRB.GetVar ("SpellButton")
+ if index < 100:
+ ResRef = MageMemorizedSpellList[index]
+ #GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "")
+ #GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_SET)
+ else:
+ ResRef = MageKnownSpellList[index - 100]
+ #GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenMageSpellRemoveWindow")
+ #GemRB.SetText (Window, Button, 63668)
+
+ spell = GemRB.GetSpell (ResRef)
+
+ Label = GemRB.GetControl (Window, 0x0fffffff)
+ GemRB.SetText (Window, Label, spell['SpellName'])
+
+ Button = GemRB.GetControl (Window, 2)
+ GemRB.SetSpellIcon (Window, Button, ResRef, 1)
+
+ Text = GemRB.GetControl (Window, 3)
+ GemRB.SetText (Window, Text, spell['SpellDesc'])
+
+ GemRB.ShowModal (Window, MODAL_SHADOW_GRAY)
+ return
+
+def OnMageMemorizeSpell ():
+ pc = GemRB.GameGetSelectedPCSingle ()
+ level = MageSpellLevel
+ type = IE_SPELL_TYPE_WIZARD
+
+ index = GemRB.GetVar ("SpellButton") - 100
+
+ if GemRB.MemorizeSpell (pc, type, level, index):
+ UpdateMageWindow ()
+ return
+
+def CloseMageSpellUnmemorizeWindow ():
+ global MageSpellUnmemorizeWindow
+
+ GemRB.UnloadWindow (MageSpellUnmemorizeWindow)
+ MageSpellUnmemorizeWindow = None
+ return
+
+def OpenMageSpellRemoveWindow ():
+ global MageSpellUnmemorizeWindow
+
+ MageSpellUnmemorizeWindow = Window = GemRB.LoadWindow (5)
+
+ # "Are you sure you want to ....?"
+ TextArea = GemRB.GetControl (Window, 3)
+ GemRB.SetText (Window, TextArea, 63745)
+
+ # Remove
+ Button = GemRB.GetControl (Window, 0)
+ GemRB.SetText (Window, Button, 17507)
+ GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OnMageRemoveSpell")
+
+ # Cancel
+ Button = GemRB.GetControl (Window, 1)
+ GemRB.SetText (Window, Button, 13727)
+ GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "CloseMageSpellUnmemorizeWindow")
+
+ GemRB.ShowModal (Window, MODAL_SHADOW_GRAY)
+ return
+
+def OpenMageSpellUnmemorizeWindow ():
+ global MageSpellUnmemorizeWindow
+
+ MageSpellUnmemorizeWindow = Window = GemRB.LoadWindow (5)
+
+ # "Are you sure you want to ....?"
+ TextArea = GemRB.GetControl (Window, 3)
+ GemRB.SetText (Window, TextArea, 11824)
+
+ # Remove
+ Button = GemRB.GetControl (Window, 0)
+ GemRB.SetText (Window, Button, 17507)
+ GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OnMageUnmemorizeSpell")
+
+ # Cancel
+ Button = GemRB.GetControl (Window, 1)
+ GemRB.SetText (Window, Button, 13727)
+ GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "CloseMageSpellUnmemorizeWindow")
+
+ GemRB.ShowModal (Window, MODAL_SHADOW_GRAY)
+ return
+
+def OnMageUnmemorizeSpell ():
+ if MageSpellUnmemorizeWindow:
+ CloseMageSpellUnmemorizeWindow()
+
+ pc = GemRB.GameGetSelectedPCSingle ()
+ level = MageSpellLevel
+ type = IE_SPELL_TYPE_WIZARD
+
+ index = GemRB.GetVar ("SpellButton")
+
+ if GemRB.UnmemorizeSpell (pc, type, level, index):
+ UpdateMageWindow ()
+ return
+
+def OnMageRemoveSpell ():
+ CloseMageSpellUnmemorizeWindow()
+ OpenMageSpellInfoWindow()
+
+ pc = GemRB.GameGetSelectedPCSingle ()
+ level = MageSpellLevel
+ type = IE_SPELL_TYPE_WIZARD
+
+ index = GemRB.GetVar ("SpellButton")-100
+
+ #remove spell from book
+ GemRB.RemoveSpell (pc, type, level, index)
+ UpdateMageWindow ()
+ return
+
###################################################
# End of file GUIMG.py
Modified: gemrb/trunk/gemrb/GUIScripts/how/GUIPR.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/how/GUIPR.py 2007-05-03 17:51:09 UTC (rev 4634)
+++ gemrb/trunk/gemrb/GUIScripts/how/GUIPR.py 2007-05-03 20:53:55 UTC (rev 4635)
@@ -39,29 +39,29 @@
OldPortraitWindow = None
OldOptionsWindow = None
-
def OpenPriestWindow ():
- global PriestWindow, PortraitWindow, OptionsWindow
+ global PriestWindow, OptionsWindow, PortraitWindow
global OldPortraitWindow, OldOptionsWindow
-
+
if CloseOtherWindow (OpenPriestWindow):
GemRB.UnloadWindow (PriestWindow)
GemRB.UnloadWindow (OptionsWindow)
GemRB.UnloadWindow (PortraitWindow)
PriestWindow = None
- GemRB.SetVar ("OtherWindow", -1)
- GemRB.SetVisible (0,1)
- GemRB.UnhideGUI ()
- GUICommonWindows.PortraitWindow = OldPortraitWindow
- OldPortraitWindow = None
- GUICommonWindows.OptionsWindow = OldOptionsWindow
- OldOptionsWindow = None
- SetSelectionChangeHandler (None)
+ GemRB.SetVar ("OtherWindow", -1)
+ GemRB.SetVisible (0,1)
+ GemRB.UnhideGUI ()
+ GUICommonWindows.PortraitWindow = OldPortraitWindow
+ OldPortraitWindow = None
+ GUICommonWindows.OptionsWindow = OldOptionsWindow
+ OldOptionsWindow = None
+ SetSelectionChangeHandler (None)
return
-
+
GemRB.HideGUI ()
GemRB.SetVisible (0,0)
+
GemRB.LoadWindowPack ("GUIPR", 640, 480)
PriestWindow = Window = GemRB.LoadWindow (2)
GemRB.SetVar ("OtherWindow", PriestWindow)
@@ -96,10 +96,11 @@
SetSelectionChangeHandler (UpdatePriestWindow)
UpdatePriestWindow ()
GemRB.SetVisible (OptionsWindow, 1)
+ #bringing window front
GemRB.SetVisible (Window, 3)
GemRB.SetVisible (PortraitWindow, 1)
+ return
-
def UpdatePriestWindow ():
global PriestMemorizedSpellList, PriestKnownSpellList
@@ -110,9 +111,8 @@
pc = GemRB.GameGetSelectedPCSingle ()
type = IE_SPELL_TYPE_PRIEST
level = PriestSpellLevel
- ###max_mem_cnt = GemRB.GetMemorizableSpellsCount (pc, type, level)
- max_mem_cnt = 2
-
+ max_mem_cnt = GemRB.GetMemorizableSpellsCount (pc, type, level)
+
Label = GemRB.GetControl (Window, 0x10000032)
GemRB.SetToken ('LEVEL', str (level + 1))
GemRB.SetText (Window, Label, 12137)
@@ -126,7 +126,7 @@
Button = GemRB.GetControl (Window, 3 + i)
if i < mem_cnt:
ms = GemRB.GetMemorizedSpell (pc, type, level, i)
- GemRB.SetSpellIcon (Window, Button, ms['SpellResRef'])
+ GemRB.SetSpellIcon (Window, Button, ms['SpellResRef'], 0)
GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_NAND)
GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE, OP_OR)
if ms['Flags']:
@@ -141,11 +141,9 @@
GemRB.EnableButtonBorder (Window, Button, 0, ms['Flags'] == 0)
else:
if i < max_mem_cnt:
- GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_NAND)
- GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE, OP_OR)
+ GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NORMAL, OP_SET)
else:
- GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_OR)
- GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE, OP_NAND)
+ GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_SET)
GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "")
GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_RIGHT_PRESS, "")
GemRB.SetTooltip (Window, Button, '')
@@ -157,7 +155,7 @@
Button = GemRB.GetControl (Window, 27 + i)
if i < known_cnt:
ks = GemRB.GetKnownSpell (pc, type, level, i)
- GemRB.SetSpellIcon (Window, Button, ks['SpellResRef'])
+ GemRB.SetSpellIcon (Window, Button, ks['SpellResRef'], 0)
GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_NAND)
GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OnPriestMemorizeSpell")
GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_RIGHT_PRESS, "OpenPriestSpellInfoWindow")
@@ -178,47 +176,40 @@
GemRB.SetVisible (Window, 2)
else:
GemRB.SetVisible (Window, 1)
+ return
-
-
def PriestPrevLevelPress ():
global PriestSpellLevel
if PriestSpellLevel > 0:
PriestSpellLevel = PriestSpellLevel - 1
UpdatePriestWindow ()
+ return
-
def PriestNextLevelPress ():
global PriestSpellLevel
if PriestSpellLevel < 6:
PriestSpellLevel = PriestSpellLevel + 1
UpdatePriestWindow ()
+ return
-
def RefreshPriestLevel ():
global PriestSpellLevel
PriestSpellLevel = GemRB.GetVar ("PriestSpellLevel")
UpdatePriestWindow ()
+ return
-
def OpenPriestSpellInfoWindow ():
global PriestSpellInfoWindow
- GemRB.HideGUI ()
-
if PriestSpellInfoWindow != None:
GemRB.UnloadWindow (PriestSpellInfoWindow)
PriestSpellInfoWindow = None
- GemRB.SetVar ("FloatWindow", -1)
-
- GemRB.UnhideGUI ()
return
-
+
PriestSpellInfoWindow = Window = GemRB.LoadWindow (3)
- GemRB.SetVar ("FloatWindow", PriestSpellInfoWindow)
#back
Button = GemRB.GetControl (Window, 5)
@@ -240,15 +231,14 @@
GemRB.SetText (Window, Label, spell['SpellName'])
Button = GemRB.GetControl (Window, 2)
- GemRB.SetSpellIcon (Window, Button, ResRef)
+ GemRB.SetSpellIcon (Window, Button, ResRef, 1)
Text = GemRB.GetControl (Window, 3)
GemRB.SetText (Window, Text, spell['SpellDesc'])
- GemRB.UnhideGUI ()
GemRB.ShowModal (Window, MODAL_SHADOW_GRAY)
+ return
-
def OnPriestMemorizeSpell ():
pc = GemRB.GameGetSelectedPCSingle ()
level = PriestSpellLevel
@@ -258,23 +248,12 @@
if GemRB.MemorizeSpell (pc, type, level, index):
UpdatePriestWindow ()
+ return
-
def OpenPriestSpellRemoveWindow ():
global PriestSpellUnmemorizeWindow
-
- GemRB.HideGUI ()
-
- if PriestSpellUnmemorizeWindow != None:
- GemRB.UnloadWindow (PriestSpellUnmemorizeWindow)
- PriestSpellUnmemorizeWindow = None
- GemRB.SetVar ("FloatWindow", -1)
-
- GemRB.UnhideGUI ()
- return
-
+
PriestSpellUnmemorizeWindow = Window = GemRB.LoadWindow (5)
- GemRB.SetVar ("FloatWindow", PriestSpellUnmemorizeWindow)
# "Are you sure you want to ....?"
TextArea = GemRB.GetControl (Window, 3)
@@ -288,27 +267,22 @@
# Cancel
Button = GemRB.GetControl (Window, 1)
GemRB.SetText (Window, Button, 13727)
- GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenPriestSpellRemoveWindow")
+ GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "ClosePriestSpelliUnmemorizeWindow")
- GemRB.UnhideGUI ()
GemRB.ShowModal (Window, MODAL_SHADOW_GRAY)
+ return
+def ClosePriestSpellUnmemorizeWindow ():
+ global PriestSpellUnmemorizeWindow
+ GemRB.UnloadWindow (PriestSpellUnmemorizeWindow)
+ PriestSpellUnmemorizeWindow = None
+ return
+
def OpenPriestSpellUnmemorizeWindow ():
global PriestSpellUnmemorizeWindow
-
- GemRB.HideGUI ()
-
- if PriestSpellUnmemorizeWindow != None:
- GemRB.UnloadWindow (PriestSpellUnmemorizeWindow)
- PriestSpellUnmemorizeWindow = None
- GemRB.SetVar ("FloatWindow", -1)
-
- GemRB.UnhideGUI ()
- return
-
+
PriestSpellUnmemorizeWindow = Window = GemRB.LoadWindow (5)
- GemRB.SetVar ("FloatWindow", PriestSpellUnmemorizeWindow)
# "Are you sure you want to ....?"
TextArea = GemRB.GetControl (Window, 3)
@@ -322,15 +296,14 @@
# Cancel
Button = GemRB.GetControl (Window, 1)
GemRB.SetText (Window, Button, 13727)
- GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenPriestSpellUnmemorizeWindow")
+ GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "ClosePriestSpellUnmemorizeWindow")
- GemRB.UnhideGUI ()
GemRB.ShowModal (Window, MODAL_SHADOW_GRAY)
+ return
-
def OnPriestUnmemorizeSpell ():
if PriestSpellUnmemorizeWindow:
- OpenPriestSpellUnmemorizeWindow ()
+ ClosePriestSpellUnmemorizeWindow ()
pc = GemRB.GameGetSelectedPCSingle ()
level = PriestSpellLevel
@@ -340,24 +313,22 @@
if GemRB.UnmemorizeSpell (pc, type, level, index):
UpdatePriestWindow ()
+ return
-
def OnPriestRemoveSpell ():
if PriestSpellUnmemorizeWindow:
- OpenPriestSpellRemoveWindow ()
+ ClosePriestSpellRemoveWindow ()
pc = GemRB.GameGetSelectedPCSingle ()
level = PriestSpellLevel
type = IE_SPELL_TYPE_PRIEST
- index = GemRB.GetVar ("SpellButton")
+ index = GemRB.GetVar ("SpellButton") - 100
- #remove spell from memory
- #GemRB.UnmemorizeSpell (pc, type, level, index)
#remove spell from book
- #GemRB.RemoveSpell (pc, type, level, index)
+ GemRB.RemoveSpell (pc, type, level, index)
UpdatePriestWindow ()
+ return
-
###################################################
# End of file GUIPR.py
Modified: gemrb/trunk/gemrb/GUIScripts/iwd/GUIMG.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/iwd/GUIMG.py 2007-05-03 17:51:09 UTC (rev 4634)
+++ gemrb/trunk/gemrb/GUIScripts/iwd/GUIMG.py 2007-05-03 20:53:55 UTC (rev 4635)
@@ -39,9 +39,8 @@
OldPortraitWindow = None
OldOptionsWindow = None
-
def OpenMageWindow ():
- global MageWindow, PortraitWindow, OptionsWindow
+ global MageWindow, OptionsWindow, PortraitWindow
global OldPortraitWindow, OldOptionsWindow
if CloseOtherWindow (OpenMageWindow):
@@ -59,9 +58,10 @@
OldOptionsWindow = None
SetSelectionChangeHandler (None)
return
-
+
GemRB.HideGUI ()
GemRB.SetVisible (0,0)
+
GemRB.LoadWindowPack ("GUIMG", 640, 480)
MageWindow = Window = GemRB.LoadWindow (2)
GemRB.SetVar ("OtherWindow", MageWindow)
@@ -105,7 +105,7 @@
GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_LOCKED)
# Setup book spells buttons
- for i in range (20):
+ for i in range (24):
Button = GemRB.GetControl (Window, 27 + i)
GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_OR)
GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_LOCKED)
@@ -113,10 +113,11 @@
SetSelectionChangeHandler (UpdateMageWindow)
UpdateMageWindow ()
GemRB.SetVisible (OptionsWindow, 1)
+ #bringing the window front
GemRB.SetVisible (Window, 3)
GemRB.SetVisible (PortraitWindow, 1)
+ return
-
def UpdateMageWindow ():
global MageMemorizedSpellList, MageKnownSpellList
@@ -127,9 +128,8 @@
pc = GemRB.GameGetSelectedPCSingle ()
type = IE_SPELL_TYPE_WIZARD
level = MageSpellLevel
- #max_mem_cnt = GemRB.GetMemorizableSpellsCount (pc, type, level)
- max_mem_cnt = 0
-
+ max_mem_cnt = GemRB.GetMemorizableSpellsCount (pc, type, level)
+
Label = GemRB.GetControl (Window, 0x10000032)
GemRB.SetToken ('LEVEL', str (level + 1))
GemRB.SetText (Window, Label, 12137 )
@@ -142,7 +142,7 @@
Button = GemRB.GetControl (Window, 3 + i)
if i < mem_cnt:
ms = GemRB.GetMemorizedSpell (pc, type, level, i)
- GemRB.SetSpellIcon (Window, Button, ms['SpellResRef'])
+ GemRB.SetSpellIcon (Window, Button, ms['SpellResRef'], 0)
GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_NAND)
GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE, OP_OR)
if ms['Flags']:
@@ -157,71 +157,207 @@
GemRB.EnableButtonBorder (Window, Button, 0, ms['Flags'] == 0)
else:
if i < max_mem_cnt:
- GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_NAND)
- GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE, OP_OR)
+ GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NORMAL, OP_SET)
else:
- GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_OR)
- GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE, OP_NAND)
- GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS,
-"")
+ GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_SET)
+ GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "")
GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_RIGHT_PRESS, "")
GemRB.SetTooltip (Window, Button, '')
GemRB.EnableButtonBorder (Window, Button, 0, 0)
known_cnt = GemRB.GetKnownSpellsCount (pc, type, level)
- for i in range (20):
+ for i in range (24):
Button = GemRB.GetControl (Window, 27 + i)
if i < known_cnt:
ks = GemRB.GetKnownSpell (pc, type, level, i)
- GemRB.SetSpellIcon (Window, Button, ks['SpellResRef'])
- GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_NAND)
- GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS,
-"OnMageMemorizeSpell")
+ GemRB.SetSpellIcon (Window, Button, ks['SpellResRef'], 0)
+ GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OnMageMemorizeSpell")
GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_RIGHT_PRESS, "OpenMageSpellInfoWindow")
spell = GemRB.GetSpell (ks['SpellResRef'])
GemRB.SetTooltip (Window, Button, spell['SpellName'])
MageKnownSpellList.append (ks['SpellResRef'])
- GemRB.SetVarAssoc (Window, Button, "SpellButton", 100 +
-i)
+ GemRB.SetVarAssoc (Window, Button, "SpellButton", 100 + i)
else:
- GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_OR)
GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE, OP_NAND)
- GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS,
-"")
+ GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "")
GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_RIGHT_PRESS, "")
GemRB.SetTooltip (Window, Button, '')
GemRB.EnableButtonBorder (Window, Button, 0, 0)
+
Table = GemRB.LoadTable ("clskills")
if (GemRB.GetTableValue (Table, GemRB.GetPlayerStat( GemRB.GameGetSelectedPCSingle(), IE_CLASS), 2)=="*"):
GemRB.SetVisible (Window, 2)
else:
GemRB.SetVisible (Window, 1)
+ return
-
def MagePrevLevelPress ():
global MageSpellLevel
if MageSpellLevel > 0:
MageSpellLevel = MageSpellLevel - 1
UpdateMageWindow ()
+ return
-
def MageNextLevelPress ():
global MageSpellLevel
if MageSpellLevel < 8:
MageSpellLevel = MageSpellLevel + 1
UpdateMageWindow ()
+ return
-
def RefreshMageLevel ():
global MageSpellLevel
MageSpellLevel = GemRB.GetVar ("MageSpellLevel")
UpdateMageWindow ()
+ return
+def OnMageMemorizeSpell ():
+ pc = GemRB.GameGetSelectedPCSingle ()
+ level = MageSpellLevel
+ type = IE_SPELL_TYPE_WIZARD
+ index = GemRB.GetVar ("SpellButton") - 100
+
+ if GemRB.MemorizeSpell (pc, type, level, index):
+ UpdateMageWindow ()
+ return
+
+def OpenMageSpellInfoWindow ():
+ global MageSpellInfoWindow
+
+ if MageSpellInfoWindow != None:
+ GemRB.UnloadWindow (MageSpellInfoWindow)
+ MageSpellInfoWindow = None
+ return
+
+ MageSpellInfoWindow = Window = GemRB.LoadWindow (3)
+
+ #back
+ Button = GemRB.GetControl (Window, 5)
+ GemRB.SetText (Window, Button, 15416)
+ GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenMageSpellInfoWindow")
+
+ #erase
+ #Button = GemRB.GetControl (Window, 6)
+ index = GemRB.GetVar ("SpellButton")
+ if index < 100:
+ ResRef = MageMemorizedSpellList[index]
+ #GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "")
+ #GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_SET)
+ else:
+ ResRef = MageKnownSpellList[index - 100]
+ #GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenMageSpellRemoveWindow")
+ #GemRB.SetText (Window, Button, 63668)
+
+ spell = GemRB.GetSpell (ResRef)
+
+ Label = GemRB.GetControl (Window, 0x0fffffff)
+ GemRB.SetText (Window, Label, spell['SpellName'])
+
+ Button = GemRB.GetControl (Window, 2)
+ GemRB.SetSpellIcon (Window, Button, ResRef, 1)
+
+ Text = GemRB.GetControl (Window, 3)
+ GemRB.SetText (Window, Text, spell['SpellDesc'])
+
+ GemRB.ShowModal (Window, MODAL_SHADOW_GRAY)
+ return
+
+def OnMageMemorizeSpell ():
+ pc = GemRB.GameGetSelectedPCSingle ()
+ level = MageSpellLevel
+ type = IE_SPELL_TYPE_WIZARD
+
+ index = GemRB.GetVar ("SpellButton") - 100
+
+ if GemRB.MemorizeSpell (pc, type, level, index):
+ UpdateMageWindow ()
+ return
+
+def CloseMageSpellUnmemorizeWindow ():
+ global MageSpellUnmemorizeWindow
+
+ GemRB.UnloadWindow (MageSpellUnmemorizeWindow)
+ MageSpellUnmemorizeWindow = None
+ return
+
+def OpenMageSpellRemoveWindow ():
+ global MageSpellUnmemorizeWindow
+
+ MageSpellUnmemorizeWindow = Window = GemRB.LoadWindow (5)
+
+ # "Are you sure you want to ....?"
+ TextArea = GemRB.GetControl (Window, 3)
+ GemRB.SetText (Window, TextArea, 63745)
+
+ # Remove
+ Button = GemRB.GetControl (Window, 0)
+ GemRB.SetText (Window, Button, 17507)
+ GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OnMageRemoveSpell")
+
+ # Cancel
+ Button = GemRB.GetControl (Window, 1)
+ GemRB.SetText (Window, Button, 13727)
+ GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "CloseMageSpellUnmemorizeWindow")
+
+ GemRB.ShowModal (Window, MODAL_SHADOW_GRAY)
+ return
+
+def OpenMageSpellUnmemorizeWindow ():
+ global MageSpellUnmemorizeWindow
+
+ MageSpellUnmemorizeWindow = Window = GemRB.LoadWindow (5)
+
+ # "Are you sure you want to ....?"
+ TextArea = GemRB.GetControl (Window, 3)
+ GemRB.SetText (Window, TextArea, 11824)
+
+ # Remove
+ Button = GemRB.GetControl (Window, 0)
+ GemRB.SetText (Window, Button, 17507)
+ GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OnMageUnmemorizeSpell")
+
+ # Cancel
+ Button = GemRB.GetControl (Window, 1)
+ GemRB.SetText (Window, Button, 13727)
+ GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "CloseMageSpellUnmemorizeWindow")
+
+ GemRB.ShowModal (Window, MODAL_SHADOW_GRAY)
+ return
+
+def OnMageUnmemorizeSpell ():
+ if MageSpellUnmemorizeWindow:
+ CloseMageSpellUnmemorizeWindow()
+
+ pc = GemRB.GameGetSelectedPCSingle ()
+ level = MageSpellLevel
+ type = IE_SPELL_TYPE_WIZARD
+
+ index = GemRB.GetVar ("SpellButton")
+
+ if GemRB.UnmemorizeSpell (pc, type, level, index):
+ UpdateMageWindow ()
+ return
+
+def OnMageRemoveSpell ():
+ CloseMageSpellUnmemorizeWindow()
+ OpenMageSpellInfoWindow()
+
+ pc = GemRB.GameGetSelectedPCSingle ()
+ level = MageSpellLevel
+ type = IE_SPELL_TYPE_WIZARD
+
+ index = GemRB.GetVar ("SpellButton")-100
+
+ #remove spell from book
+ GemRB.RemoveSpell (pc, type, level, index)
+ UpdateMageWindow ()
+ return
+
###################################################
# End of file GUIMG.py
Modified: gemrb/trunk/gemrb/GUIScripts/iwd/GUIPR.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/iwd/GUIPR.py 2007-05-03 17:51:09 UTC (rev 4634)
+++ gemrb/trunk/gemrb/GUIScripts/iwd/GUIPR.py 2007-05-03 20:53:55 UTC (rev 4635)
@@ -39,29 +39,29 @@
OldPortraitWindow = None
OldOptionsWindow = None
-
def OpenPriestWindow ():
- global PriestWindow, PortraitWindow, OptionsWindow
+ global PriestWindow, OptionsWindow, PortraitWindow
global OldPortraitWindow, OldOptionsWindow
-
+
if CloseOtherWindow (OpenPriestWindow):
GemRB.UnloadWindow (PriestWindow)
GemRB.UnloadWindow (OptionsWindow)
GemRB.UnloadWindow (PortraitWindow)
PriestWindow = None
- GemRB.SetVar ("OtherWindow", -1)
- GemRB.SetVisible (0,1)
- GemRB.UnhideGUI ()
- GUICommonWindows.PortraitWindow = OldPortraitWindow
- OldPortraitWindow = None
- GUICommonWindows.OptionsWindow = OldOptionsWindow
- OldOptionsWindow = None
- SetSelectionChangeHandler (None)
+ GemRB.SetVar ("OtherWindow", -1)
+ GemRB.SetVisible (0,1)
+ GemRB.UnhideGUI ()
+ GUICommonWindows.PortraitWindow = OldPortraitWindow
+ OldPortraitWindow = None
+ GUICommonWindows.OptionsWindow = OldOptionsWindow
+ OldOptionsWindow = None
+ SetSelectionChangeHandler (None)
return
-
+
GemRB.HideGUI ()
GemRB.SetVisible (0,0)
+
GemRB.LoadWindowPack ("GUIPR", 640, 480)
PriestWindow = Window = GemRB.LoadWindow (2)
GemRB.SetVar ("OtherWindow", PriestWindow)
@@ -88,7 +88,7 @@
GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_LOCKED)
# Setup book spells buttons
- for i in range (20):
+ for i in range (24):
Button = GemRB.GetControl (Window, 27 + i)
GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_OR)
GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_LOCKED)
@@ -96,10 +96,11 @@
SetSelectionChangeHandler (UpdatePriestWindow)
UpdatePriestWindow ()
GemRB.SetVisible (OptionsWindow, 1)
+ #bringing window front
GemRB.SetVisible (Window, 3)
GemRB.SetVisible (PortraitWindow, 1)
+ return
-
def UpdatePriestWindow ():
global PriestMemorizedSpellList, PriestKnownSpellList
@@ -110,9 +111,8 @@
pc = GemRB.GameGetSelectedPCSingle ()
type = IE_SPELL_TYPE_PRIEST
level = PriestSpellLevel
- ###max_mem_cnt = GemRB.GetMemorizableSpellsCount (pc, type, level)
- max_mem_cnt = 2
-
+ max_mem_cnt = GemRB.GetMemorizableSpellsCount (pc, type, level)
+
Label = GemRB.GetControl (Window, 0x10000032)
GemRB.SetToken ('LEVEL', str (level + 1))
GemRB.SetText (Window, Label, 12137)
@@ -126,7 +126,7 @@
Button = GemRB.GetControl (Window, 3 + i)
if i < mem_cnt:
ms = GemRB.GetMemorizedSpell (pc, type, level, i)
- GemRB.SetSpellIcon (Window, Button, ms['SpellResRef'])
+ GemRB.SetSpellIcon (Window, Button, ms['SpellResRef'], 0)
GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_NAND)
GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE, OP_OR)
if ms['Flags']:
@@ -141,11 +141,9 @@
GemRB.EnableButtonBorder (Window, Button, 0, ms['Flags'] == 0)
else:
if i < max_mem_cnt:
- GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_NAND)
- GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE, OP_OR)
+ GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NORMAL, OP_SET)
else:
- GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_OR)
- GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE, OP_NAND)
+ GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_SET)
GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "")
GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_RIGHT_PRESS, "")
GemRB.SetTooltip (Window, Button, '')
@@ -153,11 +151,11 @@
known_cnt = GemRB.GetKnownSpellsCount (pc, type, level)
- for i in range (20):
+ for i in range (24):
Button = GemRB.GetControl (Window, 27 + i)
if i < known_cnt:
ks = GemRB.GetKnownSpell (pc, type, level, i)
- GemRB.SetSpellIcon (Window, Button, ks['SpellResRef'])
+ GemRB.SetSpellIcon (Window, Button, ks['SpellResRef'], 0)
GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_NAND)
GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OnPriestMemorizeSpell")
GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_RIGHT_PRESS, "OpenPriestSpellInfoWindow")
@@ -178,47 +176,40 @@
GemRB.SetVisible (Window, 2)
else:
GemRB.SetVisible (Window, 1)
+ return
-
-
def PriestPrevLevelPress ():
global PriestSpellLevel
if PriestSpellLevel > 0:
PriestSpellLevel = PriestSpellLevel - 1
UpdatePriestWindow ()
+ return
-
def PriestNextLevelPress ():
global PriestSpellLevel
if PriestSpellLevel < 6:
PriestSpellLevel = PriestSpellLevel + 1
UpdatePriestWindow ()
+ return
-
def RefreshPriestLevel ():
global PriestSpellLevel
PriestSpellLevel = GemRB.GetVar ("PriestSpellLevel")
UpdatePriestWindow ()
+ return
-
def OpenPriestSpellInfoWindow ():
global PriestSpellInfoWindow
- GemRB.HideGUI ()
-
if PriestSpellInfoWindow != None:
GemRB.UnloadWindow (PriestSpellInfoWindow)
PriestSpellInfoWindow = None
- GemRB.SetVar ("FloatWindow", -1)
-
- GemRB.UnhideGUI ()
return
-
+
PriestSpellInfoWindow = Window = GemRB.LoadWindow (3)
- GemRB.SetVar ("FloatWindow", PriestSpellInfoWindow)
#back
Button = GemRB.GetControl (Window, 5)
@@ -240,15 +231,14 @@
GemRB.SetText (Window, Label, spell['SpellName'])
Button = GemRB.GetControl (Window, 2)
- GemRB.SetSpellIcon (Window, Button, ResRef)
+ GemRB.SetSpellIcon (Window, Button, ResRef, 1)
Text = GemRB.GetControl (Window, 3)
GemRB.SetText (Window, Text, spell['SpellDesc'])
- GemRB.UnhideGUI ()
GemRB.ShowModal (Window, MODAL_SHADOW_GRAY)
+ return
-
def OnPriestMemorizeSpell ():
pc = GemRB.GameGetSelectedPCSingle ()
level = PriestSpellLevel
@@ -258,23 +248,12 @@
if GemRB.MemorizeSpell (pc, type, level, index):
UpdatePriestWindow ()
+ return
-
def OpenPriestSpellRemoveWindow ():
global PriestSpellUnmemorizeWindow
-
- GemRB.HideGUI ()
-
- if PriestSpellUnmemorizeWindow != None:
- GemRB.UnloadWindow (PriestSpellUnmemorizeWindow)
- PriestSpellUnmemorizeWindow = None
- GemRB.SetVar ("FloatWindow", -1)
-
- GemRB.UnhideGUI ()
- return
-
+
PriestSpellUnmemorizeWindow = Window = GemRB.LoadWindow (5)
- GemRB.SetVar ("FloatWindow", PriestSpellUnmemorizeWindow)
# "Are you sure you want to ....?"
TextArea = GemRB.GetControl (Window, 3)
@@ -288,27 +267,22 @@
# Cancel
Button = GemRB.GetControl (Window, 1)
GemRB.SetText (Window, Button, 13727)
- GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenPriestSpellRemoveWindow")
+ GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "ClosePriestSpelliUnmemorizeWindow")
- GemRB.UnhideGUI ()
GemRB.ShowModal (Window, MODAL_SHADOW_GRAY)
+ return
+def ClosePriestSpellUnmemorizeWindow ():
+ global PriestSpellUnmemorizeWindow
+ GemRB.UnloadWindow (PriestSpellUnmemorizeWindow)
+ PriestSpellUnmemorizeWindow = None
+ return
+
def OpenPriestSpellUnmemorizeWindow ():
global PriestSpellUnmemorizeWindow
-
- GemRB.HideGUI ()
-
- if PriestSpellUnmemorizeWindow != None:
- GemRB.UnloadWindow (PriestSpellUnmemorizeWindow)
- PriestSpellUnmemorizeWindow = None
- GemRB.SetVar ("FloatWindow", -1)
-
- GemRB.UnhideGUI ()
- return
-
+
PriestSpellUnmemorizeWindow = Window = GemRB.LoadWindow (5)
- GemRB.SetVar ("FloatWindow", PriestSpellUnmemorizeWindow)
# "Are you sure you want to ....?"
TextArea = GemRB.GetControl (Window, 3)
@@ -322,15 +296,14 @@
# Cancel
Button = GemRB.GetControl (Window, 1)
GemRB.SetText (Window, Button, 13727)
- GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenPriestSpellUnmemorizeWindow")
+ GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "ClosePriestSpellUnmemorizeWindow")
- GemRB.UnhideGUI ()
GemRB.ShowModal (Window, MODAL_SHADOW_GRAY)
+ return
-
def OnPriestUnmemorizeSpell ():
if PriestSpellUnmemorizeWindow:
- OpenPriestSpellUnmemorizeWindow ()
+ ClosePriestSpellUnmemorizeWindow ()
pc = GemRB.GameGetSelectedPCSingle ()
level = PriestSpellLevel
@@ -340,24 +313,22 @@
if GemRB.UnmemorizeSpell (pc, type, level, index):
UpdatePriestWindow ()
+ return
-
def OnPriestRemoveSpell ():
if PriestSpellUnmemorizeWindow:
- OpenPriestSpellRemoveWindow ()
+ ClosePriestSpellRemoveWindow ()
pc = GemRB.GameGetSelectedPCSingle ()
level = PriestSpellLevel
type = IE_SPELL_TYPE_PRIEST
- index = GemRB.GetVar ("SpellButton")
+ index = GemRB.GetVar ("SpellButton") - 100
- #remove spell from memory
- #GemRB.UnmemorizeSpell (pc, type, level, index)
#remove spell from book
- #GemRB.RemoveSpell (pc, type, level, index)
+ GemRB.RemoveSpell (pc, type, level, index)
UpdatePriestWindow ()
+ return
-
###################################################
# End of file GUIPR.py
Modified: gemrb/trunk/gemrb/GUIScripts/tob/GUIMG.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/tob/GUIMG.py 2007-05-03 17:51:09 UTC (rev 4634)
+++ gemrb/trunk/gemrb/GUIScripts/tob/GUIMG.py 2007-05-03 20:53:55 UTC (rev 4635)
@@ -158,7 +158,7 @@
GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NORMAL, OP_SET)
else:
GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_SET)
- GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS,"")
+ GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "")
GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_RIGHT_PRESS, "")
GemRB.SetTooltip (Window, Button, '')
GemRB.EnableButtonBorder (Window, Button, 0, 0)
@@ -170,7 +170,7 @@
if i < known_cnt:
ks = GemRB.GetKnownSpell (pc, type, level, i)
GemRB.SetSpellIcon (Window, Button, ks['SpellResRef'], 0)
- GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS,"OnMageMemorizeSpell")
+ GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OnMageMemorizeSpell")
GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_RIGHT_PRESS, "OpenMageSpellInfoWindow")
spell = GemRB.GetSpell (ks['SpellResRef'])
GemRB.SetTooltip (Window, Button, spell['SpellName'])
@@ -232,7 +232,7 @@
GemRB.UnloadWindow (MageSpellInfoWindow)
MageSpellInfoWindow = None
return
-
+
MageSpellInfoWindow = Window = GemRB.LoadWindow (3)
#back
@@ -286,7 +286,7 @@
def OpenMageSpellRemoveWindow ():
global MageSpellUnmemorizeWindow
-
+
MageSpellUnmemorizeWindow = Window = GemRB.LoadWindow (101)
# "Are you sure you want to ....?"
Modified: gemrb/trunk/gemrb/GUIScripts/tob/GUIPR.py
===================================================================
--- gemrb/trunk/gemrb/GUIScripts/tob/GUIPR.py 2007-05-03 17:51:09 UTC (rev 4634)
+++ gemrb/trunk/gemrb/GUIScripts/tob/GUIPR.py 2007-05-03 20:53:55 UTC (rev 4635)
@@ -151,12 +151,8 @@
GemRB.EnableButtonBorder (Window, Button, 0, ms['Flags'] == 0)
else:
if i < max_mem_cnt:
- #GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_NAND)
- #GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE, OP_OR)
GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NORMAL, OP_SET)
else:
- #GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_OR)
- #GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE, OP_NAND)
GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_SET)
GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "")
GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_RIGHT_PRESS, "")
@@ -170,7 +166,6 @@
if i < known_cnt:
ks = GemRB.GetKnownSpell (pc, type, level, i)
GemRB.SetSpellIcon (Window, Button, ks['SpellResRef'], 0)
- #GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_NAND)
GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OnPriestMemorizeSpell")
GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_RIGHT_PRESS, "OpenPriestSpellInfoWindow")
spell = GemRB.GetSpell (ks['SpellResRef'])
@@ -251,7 +246,6 @@
GemRB.ShowModal (Window, MODAL_SHADOW_GRAY)
return
-
def OnPriestMemorizeSpell ():
pc = GemRB.GameGetSelectedPCSingle ()
level = PriestSpellLevel
@@ -280,7 +274,7 @@
# Cancel
Button = GemRB.GetControl (Window, 1)
GemRB.SetText (Window, Button, 13727)
- GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenPriestSpellRemoveWindow")
+ GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "ClosePriestSpellUnmemorizeWindow")
GemRB.ShowModal (Window, MODAL_SHADOW_GRAY)
return
@@ -328,7 +322,6 @@
UpdatePriestWindow ()
return
-
def OnPriestRemoveSpell ():
ClosePriestSpellUnmemorizeWindow()
OpenPriestSpellInfoWindow()
@@ -337,9 +330,9 @@
level = PriestSpellLevel
type = IE_SPELL_TYPE_PRIEST
- index = GemRB.GetVar ("SpellButton")-100
+ index = GemRB.GetVar ("SpellButton") - 100
- #remove spell from memory
+ #remove spell from book
GemRB.RemoveSpell (pc, type, level, index)
UpdatePriestWindow ()
return
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|