[Gemrb-commits] gemrb/gemrb/GUIScripts/bg2 GUISTORE.py,1.8,1.9

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

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

Modified Files:
	GUISTORE.py 
Log Message:
added guistore for all games (still needs a lot of work)


Index: GUISTORE.py
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/bg2/GUISTORE.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** GUISTORE.py	28 Feb 2005 22:49:43 -0000	1.8
--- GUISTORE.py	2 Mar 2005 20:04:11 -0000	1.9
***************
*** 27,30 ****
--- 27,31 ----
  import GemRB
  from GUIDefines import *
+ from ie_stats import *
  from GUICommonWindows import SetSelectionChangeHandler
  from GUICommon import CloseOtherWindow
***************
*** 179,188 ****
  	global StoreIdentifyWindow
  	
- 	GemRB.HideGUI ()
- 
  	if StoreIdentifyWindow != None:
  		Window = StoreIdentifyWindow
  		GemRB.SetVar ("TopWindow", Window)
- 		GemRB.UnhideGUI ()
  		UpdateStoreIdentifyWindow ()
  		return
--- 180,186 ----
***************
*** 204,208 ****
  
  	SetSelectionChangeHandler( UpdateStoreIdentifyWindow )
- 	GemRB.UnhideGUI ()
  	UpdateStoreIdentifyWindow ()
  
--- 202,205 ----
***************
*** 211,220 ****
  	global StoreStealWindow
  	
- 	GemRB.HideGUI ()
- 
  	if StoreStealWindow != None:
  		Window = StoreStealWindow
  		GemRB.SetVar ("TopWindow", Window)
- 		GemRB.UnhideGUI ()
  		UpdateStoreStealWindow ()
  		return
--- 208,214 ----
***************
*** 228,232 ****
  
  	SetSelectionChangeHandler( UpdateStoreStealWindow )
- 	GemRB.UnhideGUI ()
  	UpdateStoreStealWindow ()
  
--- 222,225 ----
***************
*** 235,244 ****
  	global StoreDonateWindow
  	
- 	GemRB.HideGUI ()
- 
  	if StoreDonateWindow != None:
  		Window = StoreDonateWindow
  		GemRB.SetVar ("TopWindow", Window)
- 		GemRB.UnhideGUI ()
  		UpdateStoreDonateWindow ()
  		return
--- 228,234 ----
***************
*** 256,260 ****
  
  	SetSelectionChangeHandler( UpdateStoreDonateWindow )
- 	GemRB.UnhideGUI ()
  	UpdateStoreDonateWindow ()
  
--- 246,249 ----
***************
*** 263,272 ****
  	global StoreHealWindow
  	
- 	GemRB.HideGUI ()
- 
  	if StoreHealWindow != None:
  		Window = StoreHealWindow
  		GemRB.SetVar ("TopWindow", Window)
- 		GemRB.UnhideGUI ()
  		UpdateStoreHealWindow ()
  		return
--- 252,258 ----
***************
*** 290,294 ****
  	# 13 ta
  
- 	GemRB.UnhideGUI ()
  	UpdateStoreHealWindow ()
  
--- 276,279 ----
***************
*** 297,306 ****
  	global StoreRumourWindow
  	
! 	GemRB.HideGUI ()
! 
  	if StoreRumourWindow != None:
  		Window = StoreRumourWindow
  		GemRB.SetVar ("TopWindow", Window)
- 		GemRB.UnhideGUI ()
  		UpdateStoreRumourWindow ()
  		return
--- 282,289 ----
  	global StoreRumourWindow
  	
! 	GemRB.SetVar ("TopIndex", 0)
  	if StoreRumourWindow != None:
  		Window = StoreRumourWindow
  		GemRB.SetVar ("TopWindow", Window)
  		UpdateStoreRumourWindow ()
  		return
***************
*** 309,332 ****
  	GemRB.SetVar ("TopWindow", Window)
  	
! 	Scrollbar = GemRB.GetControl (Window, 15)
! 	GemRB.SetEvent(Window, ScrollBar, IE_GUI_SCROLLBAR_ON_CHANGE, "RumourScrollBarPress")
! 	GemRB.SetVar("TopIndex", 0)
!         Count=Store['RumourCount']
          GemRB.SetVarAssoc(Window, ScrollBar, "TopIndex", Count)
- 	RumourScrollBarPress()
  
- 	GemRB.UnhideGUI ()
  	UpdateStoreRumourWindow ()
  
- 
  def OpenStoreRentWindow ():
  	global StoreRentWindow
- 	
- 	GemRB.HideGUI ()
  
  	if StoreRentWindow != None:
  		Window = StoreRentWindow
  		GemRB.SetVar ("TopWindow", Window)
- 		GemRB.UnhideGUI ()
  		UpdateStoreRentWindow ()
  		return
--- 292,316 ----
  	GemRB.SetVar ("TopWindow", Window)
  	
! 	#removing those pesky labels
! 	for i in range(5):
! 		GemRB.DeleteControl (Window, 0x10000005+i)
! 
! 	ScrollBar = GemRB.GetControl (Window, 5)
! 	GemRB.SetEvent (Window, ScrollBar, IE_GUI_SCROLLBAR_ON_CHANGE, "UpdateStoreRumourWindow")
!         Count=Store['StoreDrinkCount']
! 	if Count<5:
! 		Count=1
! 	else:
! 		Count=Count-4
          GemRB.SetVarAssoc(Window, ScrollBar, "TopIndex", Count)
  
  	UpdateStoreRumourWindow ()
  
  def OpenStoreRentWindow ():
  	global StoreRentWindow
  
  	if StoreRentWindow != None:
  		Window = StoreRentWindow
  		GemRB.SetVar ("TopWindow", Window)
  		UpdateStoreRentWindow ()
  		return
***************
*** 361,365 ****
  	GemRB.SetText (Window, Button, 14293)
  	GemRB.SetVar ("StoreRent",StoreRent)
- 	GemRB.UnhideGUI ()
  
  
--- 345,348 ----
***************
*** 376,381 ****
  
  def UpdateStoreCommon (Window, title, name, gold):
- 	GemRB.HideGUI()
  
  	Label = GemRB.GetControl (Window, title)
  	GemRB.SetText (Window, Label, Store['StoreName'])
--- 359,364 ----
  
  def UpdateStoreCommon (Window, title, name, gold):
  
+ 	GemRB.HideGUI()
  	Label = GemRB.GetControl (Window, title)
  	GemRB.SetText (Window, Label, Store['StoreName'])
***************
*** 412,423 ****
  	for i in range(5):
  		Drink = GemRB.GetStoreDrink (i+TopIndex)
! 		Button = GemRB.GetControl (Window, i+4)
! 		GemRB.SetText (Window, Button, Drink['DrinkName'])
! 		GemRB.SetVarAssoc (Window, Button, "Intox", Drink['Strength'])
! 		GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "GulpDrink")
  
  def GulpDrink ():
  	PlaySound("gulp")
- 	print "Intox improvement: ", GemRB.GetVar("Intox")
  
  
--- 395,427 ----
  	for i in range(5):
  		Drink = GemRB.GetStoreDrink (i+TopIndex)
! 		print Drink
! 
! 		Button = GemRB.GetControl (Window, i)
! 		if Drink != None:
! 			GemRB.SetText (Window, Button, Drink['DrinkName'])
! 			GemRB.SetVarAssoc (Window, Button, "Index", i)
! 			GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_ENABLED)
! 			GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "GulpDrink")
! 		else:
! 			GemRB.SetText (Window, Button, "")
! 			GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_DISABLED)
  
  def GulpDrink ():
+ 	pc = GemRB.GameGetSelectedPCSingle ()
+ 	intox = GemRB.GetPlayerStat (pc, IE_INTOXICATION)
+ 	if intox > 80:
+ 		print "Too drunk"
+ 		return
+ 
+ 	gold = GemRB.GameGetPartyGold ()
+ 	Index = GemRB.GetVar ("TopIndex")+GemRB.GetVar ("Index")
+ 	Drink = GemRB.GetStoreDrink (Index)
+ 	if gold < Drink['Price']:
+ 		print "No money"
+ 		return
+ 
+ 	GemRB.SetPlayerStat (pc, IE_INTOXICATION, intox+Drink['Strength'])
+ 	#get some rumour
  	PlaySound("gulp")