[Gemrb-commits] gemrb/gemrb/GUIScripts/bg1 GUICommonWindows.py,1.4,1.5 GUIREC.py,1.3,1.4 GUIWORLD.py,1.6,1.7 MessageWindow.py,1.17,1.18

[Laszlo T. <ave...@us...>]

Update of /cvsroot/gemrb/gemrb/gemrb/GUIScripts/bg1
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11352/bg1

Modified Files:
	GUICommonWindows.py GUIREC.py GUIWORLD.py MessageWindow.py 
Log Message:
bg1/bg2:Added default portrait bmp if portrait is missing
bg1:added OpenReformPartyWindow


Index: MessageWindow.py
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/bg1/MessageWindow.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** MessageWindow.py	27 Nov 2005 12:18:42 -0000	1.17
--- MessageWindow.py	29 Nov 2005 22:40:36 -0000	1.18
***************
*** 43,46 ****
--- 43,47 ----
  	global PortraitWindow, OptionsWindow
  
+ 	GemRB.GameSetPartySize(PARTY_SIZE)
  	GemRB.GameSetProtagonistMode(1)
  	GemRB.LoadWindowPack(GetWindowPack())

Index: GUICommonWindows.py
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/bg1/GUICommonWindows.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** GUICommonWindows.py	13 Aug 2005 10:50:07 -0000	1.4
--- GUICommonWindows.py	29 Nov 2005 22:40:36 -0000	1.5
***************
*** 20,25 ****
  
  
! # GUICommonWindows.py - functions to open common windows in lower part of the screen
! 
  ###################################################
  
--- 20,25 ----
  
  
! # GUICommonWindows.py - functions to open common
! # windows in lower part of the screen
  ###################################################
  
***************
*** 161,166 ****
  		#	ClassTitle=GemRB.GetTableValue(KitTable, KitIndex, 2)
  
! 	GemRB.UnloadTable (ClassTable)
! 	#GemRB.UnloadTable (KitTable)
  	return ClassTitle
  
--- 161,166 ----
  		#	ClassTitle=GemRB.GetTableValue(KitTable, KitIndex, 2)
  
! 	if ClassTitle == "*":
! 		return 0
  	return ClassTitle
  
***************
*** 229,233 ****
  		
  		sel = GemRB.GameGetSelectedPCSingle () == i + 1
! 		GemRB.SetButtonPicture(Window, Button, pic)
  		
  		GemRB.SetButtonFlags(Window, Button, IE_GUI_BUTTON_PICTURE | IE_GUI_BUTTON_ALIGN_TOP | IE_GUI_BUTTON_ALIGN_LEFT, OP_SET)
--- 229,233 ----
  		
  		sel = GemRB.GameGetSelectedPCSingle () == i + 1
! 		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)

Index: GUIWORLD.py
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/bg1/GUIWORLD.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** GUIWORLD.py	27 Nov 2005 13:26:21 -0000	1.6
--- GUIWORLD.py	29 Nov 2005 22:40:36 -0000	1.7
***************
*** 10,19 ****
  # This program is distributed in the hope that it will be useful,
  # but WITHOUT ANY WARRANTY; without even the implied warranty of
! # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  # GNU General Public License for more details.
  #
  # You should have received a copy of the GNU General Public License
  # along with this program; if not, write to the Free Software
! # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  #
  # $Header$
--- 10,19 ----
  # This program is distributed in the hope that it will be useful,
  # but WITHOUT ANY WARRANTY; without even the implied warranty of
! # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  # GNU General Public License for more details.
  #
  # You should have received a copy of the GNU General Public License
  # along with this program; if not, write to the Free Software
! # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  #
  # $Header$
***************
*** 21,27 ****
  
  # GUIW.py - scripts to control some windows from GUIWORLD winpack
! #    except of Actions, Portrait, Options and Dialog windows
! 
! ###################################################
  
  import GemRB
--- 21,26 ----
  
  # GUIW.py - scripts to control some windows from GUIWORLD winpack
! # except of Actions, Portrait, Options and Dialog windows
! #################################################################
  
  import GemRB
***************
*** 30,33 ****
--- 29,35 ----
  from GUICommonWindows import SetEncumbranceLabels
  
+ FRAME_PC_SELECTED = 0
+ FRAME_PC_TARGET   = 1
+ 
  ContainerWindow = None
  ContinueWindow = None
***************
*** 150,153 ****
--- 152,156 ----
  		Count=1
  	GemRB.SetVarAssoc (Window, ScrollBar, "RightTopIndex", Count)
+ 
  	RedrawContainerWindow ()
  
***************
*** 165,172 ****
  	RightCount = len(inventory_slots)
  
! 	for i in range(6):
  		#this is an autoselected container, but we could use PC too
  		Slot = GemRB.GetContainerItem (0, i+LeftTopIndex)
  		Button = GemRB.GetControl (Window, i)
  		if Slot != None:
  			Item = GemRB.GetItem (Slot['ItemResRef'])
--- 168,176 ----
  	RightCount = len(inventory_slots)
  
! 	for i in range (6):
  		#this is an autoselected container, but we could use PC too
  		Slot = GemRB.GetContainerItem (0, i+LeftTopIndex)
  		Button = GemRB.GetControl (Window, i)
+ 
  		if Slot != None:
  			Item = GemRB.GetItem (Slot['ItemResRef'])
***************
*** 181,185 ****
  
  
! 	for i in range(4):
  		if i+RightTopIndex<RightCount:
  			Slot = GemRB.GetSlotItem (pc, inventory_slots[i+RightTopIndex])
--- 185,189 ----
  
  
! 	for i in range (4):
  		if i+RightTopIndex<RightCount:
  			Slot = GemRB.GetSlotItem (pc, inventory_slots[i+RightTopIndex])
***************
*** 208,212 ****
  		return
  
! 	GemRB.HideGUI ()
  
  	GemRB.LoadWindowPack (GetWindowPack())
--- 212,216 ----
  		return
  
! 	hideflag = GemRB.HideGUI ()
  
  	GemRB.LoadWindowPack (GetWindowPack())
***************
*** 217,221 ****
  	GemRB.SetVar ("MessageWindow", -1)
  
- 	pc = GemRB.GameGetFirstSelectedPC()
  	Container = GemRB.GetContainer(0)
  
--- 221,224 ----
***************
*** 226,230 ****
  	# 54 - encumbrance
  
! 	for i in range(6):
  		Button = GemRB.GetControl (Window, i)
  		GemRB.SetVarAssoc (Window, Button, "LeftIndex", i)
--- 229,233 ----
  	# 54 - encumbrance
  
! 	for i in range (6):
  		Button = GemRB.GetControl (Window, i)
  		GemRB.SetVarAssoc (Window, Button, "LeftIndex", i)
***************
*** 232,236 ****
  		GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "TakeItemContainer")
  
! 	for i in range(4):
  		Button = GemRB.GetControl (Window, i+10)
  		GemRB.SetVarAssoc (Window, Button, "RightIndex", i)
--- 235,239 ----
  		GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "TakeItemContainer")
  
! 	for i in range (4):
  		Button = GemRB.GetControl (Window, i+10)
  		GemRB.SetVarAssoc (Window, Button, "RightIndex", i)
***************
*** 268,272 ****
  	GemRB.SetVar ("RightTopIndex", 0)
  	UpdateContainerWindow ()
! 	GemRB.UnhideGUI ()
  
  
--- 271,276 ----
  	GemRB.SetVar ("RightTopIndex", 0)
  	UpdateContainerWindow ()
! 	if hideflag:
! 		GemRB.UnhideGUI ()
  
  
***************
*** 301,307 ****
  
  
  def OpenReformPartyWindow ():
  	global ReformPartyWindow
! 	GemRB.HideGUI ()
  
  	if ReformPartyWindow:
--- 305,405 ----
  
  
+ def UpdateReformWindow ():
+ 	Window = ReformPartyWindow
+ 
+ 	select = GemRB.GetVar ("Selected")
+ 
+ 	need_to_drop = GemRB.GetPartySize ()-PARTY_SIZE
+ 	if need_to_drop<0:
+ 		need_to_drop = 0
+ 
+ 	#excess player number
+ 	Label = GemRB.GetControl (Window, 0x1000000f)
+ 	GemRB.SetText (Window, Label, str(need_to_drop) )
+ 
+ 	#done
+ 	Button = GemRB.GetControl (Window, 8)
+ 	if need_to_drop:
+ 		GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_DISABLED)
+ 	else:
+ 		GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_ENABLED)
+ 
+ 	#remove
+ 	Button = GemRB.GetControl (Window, 15)
+ 	if select:
+ 		GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_ENABLED)
+ 	else:
+ 		GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_DISABLED)
+ 
+ 	for i in range (PARTY_SIZE+1):
+ 		Button = GemRB.GetControl (Window, i)
+ 		GemRB.EnableButtonBorder (Window, Button, FRAME_PC_SELECTED, select == i+2 )
+ 		#+2 because protagonist is skipped
+ 		pic = GemRB.GetPlayerPortrait (i+2,1)
+ 		if not pic:
+ 			GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE, OP_SET)
+ 			GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_LOCKED)
+ 			continue
+ 
+ 		GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_ENABLED)
+ 		GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_ALIGN_BOTTOM|IE_GUI_BUTTON_ALIGN_LEFT, OP_SET)
+ 		GemRB.SetButtonPicture (Window, Button, pic, "NOPORTSM")
+ 	return
+ 
+ def RemovePlayer ():
+ 	global ReformPartyWindow
+ 
+ 	hideflag = GemRB.HideGUI ()
+ 
+ 	GemRB.LoadWindowPack (GetWindowPack())
+ 	GemRB.UnloadWindow (ReformPartyWindow)
+ 	ReformPartyWindow = Window = GemRB.LoadWindow (25)
+ 	GemRB.SetVar ("OtherWindow", Window)
+ 
+ 	#are you sure
+ 	Label = GemRB.GetControl (Window, 0x0fffffff)
+ 	GemRB.SetText (Window, Label, 17518)
+ 
+ 	#confirm
+ 	Button = GemRB.GetControl (Window, 1)
+ 	GemRB.SetText (Window, Button, 17507)
+ 	GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "RemovePlayerConfirm")
+ 
+ 	#cancel
+ 	Button = GemRB.GetControl (Window, 2)
+ 	GemRB.SetText (Window, Button, 13727)
+ 	GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "RemovePlayerCancel")
+ 
+ def RemovePlayerConfirm ():
+ 	global ReformPartyWindow
+ 
+ 	hideflag = GemRB.HideGUI ()
+ 	GemRB.UnloadWindow (ReformPartyWindow)
+ 	GemRB.SetVar ("OtherWindow", -1)
+ 	#removing selected player
+ 	ReformPartyWindow = None
+ 	if hideflag:
+ 		GemRB.UnhideGUI ()
+ 	GemRB.ExecuteString ("LeaveParty()", GemRB.GetVar("Selected") )
+ 	OpenReformPartyWindow ()
+ 	return
+ 
+ def RemovePlayerCancel ():
+ 	global ReformPartyWindow
+ 
+ 	hideflag = GemRB.HideGUI ()
+ 	GemRB.UnloadWindow (ReformPartyWindow)
+ 	GemRB.SetVar ("OtherWindow", -1)
+ 	ReformPartyWindow = None
+ 	if hideflag:
+ 		GemRB.UnhideGUI ()
+ 	OpenReformPartyWindow ()
+ 	return
+ 
  def OpenReformPartyWindow ():
  	global ReformPartyWindow
! 
! 	GemRB.SetVar ("Selected", 0)
! 	hideflag = GemRB.HideGUI ()
  
  	if ReformPartyWindow:
***************
*** 310,315 ****
  
  		GemRB.SetVar ("OtherWindow", -1)
! 		GemRB.LoadWindowPack ("GUIREC")
! 		GemRB.UnhideGUI ()
  		return
  
--- 408,416 ----
  
  		GemRB.SetVar ("OtherWindow", -1)
! 		#GemRB.LoadWindowPack ("GUIREC")
! 		if hideflag:
! 			GemRB.UnhideGUI ()
! 		#re-enabling party size control
! 		GemRB.GameSetPartySize (PARTY_SIZE)
  		return
  
***************
*** 318,332 ****
  	GemRB.SetVar ("OtherWindow", Window)
  
  	# Remove
  	Button = GemRB.GetControl (Window, 15)
! 	GemRB.SetText (Window, Button, 42514)
! 	GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_DISABLED)
  
  	# Done
  	Button = GemRB.GetControl (Window, 8)
! 	GemRB.SetText (Window, Button, 1403)
  	GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenReformPartyWindow")
! 
! 	GemRB.UnhideGUI ()
  
  
--- 419,448 ----
  	GemRB.SetVar ("OtherWindow", Window)
  
+ 	#PC portraits
+ 	for j in range (PARTY_SIZE+1):
+ 		Button = GemRB.GetControl (Window,j)
+ 		GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_LOCKED)
+ 		GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_RADIOBUTTON|IE_GUI_BUTTON_NO_IMAGE|IE_GUI_BUTTON_PICTURE,OP_SET)
+ 		GemRB.SetButtonBorder (Window, Button, FRAME_PC_SELECTED, 1, 1, 2, 2, 0, 255, 0, 255)
+ 		#protagonist is skipped
+ 		index = j + 2
+ 		GemRB.SetVarAssoc (Window, Button, "Selected", index)
+ 		GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "UpdateReformWindow")
+ 
  	# Remove
  	Button = GemRB.GetControl (Window, 15)
! 	GemRB.SetText (Window, Button, 17507)
! 	GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "RemovePlayer")
  
  	# Done
  	Button = GemRB.GetControl (Window, 8)
! 	GemRB.SetText (Window, Button, 11973)
  	GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenReformPartyWindow")
! 	GemRB.SetVar ("ActionsWindow", -1)
! 	UpdateReformWindow ()
! 	if hideflag:
! 		GemRB.UnhideGUI ()
! 	GemRB.ShowModal (Window, MODAL_SHADOW_GRAY)
! 	return
  
  
***************
*** 336,341 ****
  	global FormationWindow
  
  	if CloseOtherWindow (OpenFormationWindow):
- 		GemRB.HideGUI ()
  		GemRB.UnloadWindow (FormationWindow)
  		FormationWindow = None
--- 452,457 ----
  	global FormationWindow
  
+ 	hideflag = GemRB.HideGUI ()
  	if CloseOtherWindow (OpenFormationWindow):
  		GemRB.UnloadWindow (FormationWindow)
  		FormationWindow = None
***************
*** 343,350 ****
  		GemRB.GameSetFormation (last_formation)
  		GemRB.SetVar ("OtherWindow", -1)
! 		GemRB.UnhideGUI ()
  		return
  
! 	GemRB.HideGUI ()
  	GemRB.LoadWindowPack (GetWindowPack())
  	FormationWindow = Window = GemRB.LoadWindow (27)
--- 459,467 ----
  		GemRB.GameSetFormation (last_formation)
  		GemRB.SetVar ("OtherWindow", -1)
! 		if hideflag:
! 			GemRB.UnhideGUI ()
  		return
  
! 	hideflag = GemRB.HideGUI ()
  	GemRB.LoadWindowPack (GetWindowPack())
  	FormationWindow = Window = GemRB.LoadWindow (27)
***************
*** 381,385 ****
  	SelectFormation ()
  
! 	GemRB.UnhideGUI ()
  
  def SelectFormation ():
--- 498,503 ----
  	SelectFormation ()
  
! 	if hideflag:
! 		GemRB.UnhideGUI ()
  
  def SelectFormation ():
***************
*** 400,405 ****
  def DeathWindow() :
  	#playing death movie before continuing
! 	GemRB.PlayMovie("deathand",1)
! 	GemRB.GamePause(1,1)
  
  	GemRB.LoadWindowPack (GetWindowPack())
--- 518,523 ----
  def DeathWindow() :
  	#playing death movie before continuing
! 	GemRB.PlayMovie ("deathand",1)
! 	GemRB.GamePause (1,1)
  
  	GemRB.LoadWindowPack (GetWindowPack())
***************
*** 420,427 ****
  	GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "QuitPress")
  
! 	GemRB.HideGUI()
  	GemRB.SetVar ("MessageWindow", -1)
  	GemRB.SetVar ("ActionsWindow", Window)
! 	GemRB.UnhideGUI()
  	#making the playing field gray
  	GemRB.SetVisible (0,2)
--- 538,546 ----
  	GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "QuitPress")
  
! 	hideflag = GemRB.HideGUI ()
  	GemRB.SetVar ("MessageWindow", -1)
  	GemRB.SetVar ("ActionsWindow", Window)
! 	if hideflag:
! 		GemRB.UnhideGUI ()
  	#making the playing field gray
  	GemRB.SetVisible (0,2)
***************
*** 433,443 ****
  
  def QuitPress():
! 	GemRB.QuitGame()
! 	GemRB.SetNextScript("Start")
  	return
  
  def LoadPress():
! 	GemRB.QuitGame()
! 	GemRB.SetNextScript("GUILOAD")
  	return
  
--- 552,562 ----
  
  def QuitPress():
! 	GemRB.QuitGame ()
! 	GemRB.SetNextScript ("Start")
  	return
  
  def LoadPress():
! 	GemRB.QuitGame ()
! 	GemRB.SetNextScript ("GUILOAD")
  	return
  

Index: GUIREC.py
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/bg1/GUIREC.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** GUIREC.py	27 Aug 2005 10:40:36 -0000	1.3
--- GUIREC.py	29 Nov 2005 22:40:36 -0000	1.4
***************
*** 117,121 ****
  	GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_LOCKED)
  	GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE | IE_GUI_BUTTON_PICTURE, OP_SET)
! 	GemRB.SetButtonPicture (Window, Button, GemRB.GetPlayerPortrait (pc,0))
  
  	# armorclass
--- 117,121 ----
  	GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_LOCKED)
  	GemRB.SetButtonFlags (Window, Button, IE_GUI_BUTTON_NO_IMAGE | IE_GUI_BUTTON_PICTURE, OP_SET)
! 	GemRB.SetButtonPicture (Window, Button, GemRB.GetPlayerPortrait (pc,0), "NOPORTLG")
  
  	# armorclass