[Gemrb-commits] gemrb/gemrb/GUIScripts/bg2 CharGen9.py,1.8,1.9 GUICG4.py,1.6,1.7

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

Update of /cvsroot/gemrb/gemrb/gemrb/GUIScripts/bg2
In directory sc8-pr-cvs1:/tmp/cvs-serv14363/bg2

Modified Files:
	CharGen9.py GUICG4.py 
Log Message:
Fix: Extra strength in PST/BG2 character generation


Index: CharGen9.py
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/bg2/CharGen9.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** CharGen9.py	26 Nov 2003 01:16:47 -0000	1.8
--- CharGen9.py	23 Dec 2003 23:33:20 -0000	1.9
***************
*** 3,6 ****
--- 3,15 ----
  
  IE_SEX =        	35
+ IE_STR =		36
+ IE_STREXTRA = 		37
+ IE_INT =		38
+ IE_WIS =		39
+ IE_DEX =		40
+ IE_CON =		41
+ IE_CHR =		42
+ IE_XP =			44
+ IE_GOLD =		45
  IE_HATEDRACE =  	49
  IE_KIT =        	152
***************
*** 150,153 ****
--- 159,174 ----
  	GemRB.SetPlayerStat(MyChar, IE_LEATHER_COLOR, 0x16 )
  	GemRB.SetPlayerStat(MyChar, IE_ARMOR_COLOR, 0x17 )
+ 	GemRB.SetPlayerStat(MyChar, IE_STR, GemRB.GetVar("Ability 1")
+ 	if Str==18:
+ 		GemRB.SetPlayerStat(MyChar, IE_STREXTRA,GemRb.GetVar("StrExtra")
+ 	else
+ 		GemRB.SetPlayerStat(MyChar, IE_STREXTRA,0)
+ 
+ 	GemRB.SetPlayerStat(MyChar, IE_INT, GemRB.GetVar("Ability 2"))
+ 	GemRB.SetPlayerStat(MyChar, IE_WIS, GemRB.GetVar("Ability 3"))
+ 	GemRB.SetPlayerStat(MyChar, IE_DEX, GemRB.GetVar("Ability 4"))
+ 	GemRB.SetPlayerStat(MyChar, IE_CON, GemRB.GetVar("Ability 5"))
+ 	GemRB.SetPlayerStat(MyChar, IE_CHR, GemRB.GetVar("Ability 6"))
+ 
  	GemRB.FillPlayerInfo(MyChar) #does all the rest
  	#LETS PLAY!!

Index: GUICG4.py
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/bg2/GUICG4.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** GUICG4.py	9 Nov 2003 22:33:15 -0000	1.6
--- GUICG4.py	23 Dec 2003 23:33:20 -0000	1.7
***************
*** 11,14 ****
--- 11,15 ----
  Add = 0
  KitIndex = 0
+ HasStrExtra = 0
  
  def CalcLimits(Abidx):
***************
*** 51,55 ****
  
  def RollPress():
! 	global Minimum, Maximum, Add
  
  	GemRB.InvalidateWindow(AbilityWindow)
--- 52,56 ----
  
  def RollPress():
! 	global Minimum, Maximum, Add, HasStrExtra
  
  	GemRB.InvalidateWindow(AbilityWindow)
***************
*** 60,63 ****
--- 61,69 ----
  	GemRB.SetLabelUseRGB(AbilityWindow, SumLabel, 1)
  
+ 	if HasStrExtra:
+ 		e = GemRB.Roll(1,100,0)
+ 	else:
+ 		e = 0
+ 	GemRB.SetVar("StrExtra", e)
  	for i in range(0,6):
  		dice = 3
***************
*** 71,75 ****
  		GemRB.SetVar("Ability "+str(i), v )
  		Label = GemRB.GetControl(AbilityWindow, 0x10000003+i)
! 		GemRB.SetText(AbilityWindow, Label, str(v) )
  		GemRB.SetLabelUseRGB(AbilityWindow, Label, 1)
  	return
--- 77,84 ----
  		GemRB.SetVar("Ability "+str(i), v )
  		Label = GemRB.GetControl(AbilityWindow, 0x10000003+i)
! 		if i==0 and v==18 and HasStrExtra:
! 			GemRB.SetText(AbilityWindow, Label, "18/"+str(e) )
! 		else:
! 			GemRB.SetText(AbilityWindow, Label, str(v) )
  		GemRB.SetLabelUseRGB(AbilityWindow, Label, 1)
  	return
***************
*** 77,81 ****
  def OnLoad():
  	global AbilityWindow, TextAreaControl, DoneButton
! 	global PointsLeft
  	global AbilityTable
  	global KitIndex, Minimum, Maximum
--- 86,90 ----
  def OnLoad():
  	global AbilityWindow, TextAreaControl, DoneButton
! 	global PointsLeft, HasStrExtra
  	global AbilityTable
  	global KitIndex, Minimum, Maximum
***************
*** 91,94 ****
--- 100,108 ----
  		KitName = GemRB.GetTableValue(KitList, Kit, 0) 
  
+ 	if GemRB.GetTableValue(ClassTable, Class, 3)=="SAVEWAR":
+ 		HasStrExtra=1
+ 	else:
+ 		HasStrExtra=0
+ 
  	Abclasrq = GemRB.LoadTable("ABCLASRQ")
  	KitIndex = GemRB.GetTableRowIndex(Abclasrq, KitName)
***************
*** 99,102 ****
--- 113,117 ----
  
  	RollPress()
+ 	StorePress()
  	for i in range(0,6):
  		Button = GemRB.GetControl(AbilityWindow, i+30)
***************
*** 154,158 ****
  	GemRB.SetText(AbilityWindow, SumLabel, str(PointsLeft) )
  	Label = GemRB.GetControl(AbilityWindow, 0x10000003+Abidx)
! 	GemRB.SetText(AbilityWindow, Label, str(Ability-1) )
  	GemRB.SetButtonState(AbilityWindow, DoneButton,IE_GUI_BUTTON_DISABLED)
  	return
--- 169,177 ----
  	GemRB.SetText(AbilityWindow, SumLabel, str(PointsLeft) )
  	Label = GemRB.GetControl(AbilityWindow, 0x10000003+Abidx)
! 	StrExtra = GemRB.GetVar("StrExtra")
! 	if Abidx==0 and Ability==19 and StrExtra:
! 		GemRB.SetText(AbilityWindow, Label, "18/"+str(StrExtra) )
! 	else:
! 		GemRB.SetText(AbilityWindow, Label, str(Ability-1) )
  	GemRB.SetButtonState(AbilityWindow, DoneButton,IE_GUI_BUTTON_DISABLED)
  	return
***************
*** 169,173 ****
  
  def LeftPress():
! 	global PointsLeft
  
  	GemRB.InvalidateWindow(AbilityWindow)
--- 188,192 ----
  
  def LeftPress():
! 	global PointsLeft, HasStrExtra
  
  	GemRB.InvalidateWindow(AbilityWindow)
***************
*** 191,195 ****
  	GemRB.SetText(AbilityWindow, SumLabel, str(PointsLeft) )
  	Label = GemRB.GetControl(AbilityWindow, 0x10000003+Abidx)
! 	GemRB.SetText(AbilityWindow, Label, str(Ability+1) )
  	if PointsLeft == 0:
  		GemRB.SetButtonState(AbilityWindow, DoneButton,IE_GUI_BUTTON_ENABLED)
--- 210,218 ----
  	GemRB.SetText(AbilityWindow, SumLabel, str(PointsLeft) )
  	Label = GemRB.GetControl(AbilityWindow, 0x10000003+Abidx)
! 	StrExtra = GemRB.GetVar("StrExtra")
! 	if Abidx==0 and Ability==17 and HasStrExtra==1:
! 		GemRB.SetText(AbilityWindow, Label, "18/"+str(StrExtra) )
! 	else:
! 		GemRB.SetText(AbilityWindow, Label, str(Ability+1) )
  	if PointsLeft == 0:
  		GemRB.SetButtonState(AbilityWindow, DoneButton,IE_GUI_BUTTON_ENABLED)
***************
*** 197,200 ****
--- 220,224 ----
  
  def StorePress():
+ 	GemRB.SetVar("StoredStrExtra",GemRB.GetVar("StrExtra") )
  	for i in range(-1,6):
  		GemRB.SetVar("Stored "+str(i),GemRB.GetVar("Ability "+str(i) ) )
***************
*** 203,211 ****
  def RecallPress():
  	GemRB.InvalidateWindow(AbilityWindow)
  	for i in range(-1,6):
  		v = GemRB.GetVar("Stored "+str(i) )
  		GemRB.SetVar("Ability "+str(i), v)
  		Label = GemRB.GetControl(AbilityWindow, 0x10000003+i)
! 		GemRB.SetText(AbilityWindow, Label, str(v) )
  	return
  
--- 227,240 ----
  def RecallPress():
  	GemRB.InvalidateWindow(AbilityWindow)
+ 	e=GemRB.GetVar("StoredStrExtra")
+ 	GemRB.SetVar("StrExtra",e)
  	for i in range(-1,6):
  		v = GemRB.GetVar("Stored "+str(i) )
  		GemRB.SetVar("Ability "+str(i), v)
  		Label = GemRB.GetControl(AbilityWindow, 0x10000003+i)
! 		if i==0 and v==18 and HasStrExtra==1:
! 			GemRB.SetText(AbilityWindow, Label, "18/"+str(e) )
! 		else:
! 			GemRB.SetText(AbilityWindow, Label, str(v) )
  	return
  
***************
*** 213,217 ****
  	GemRB.UnloadWindow(AbilityWindow)
  	GemRB.SetNextScript("CharGen5")
! 	for i in range(1,6):
  		GemRB.SetVar("Ability "+str(i),0)  #scrapping the abilities
  	return
--- 242,247 ----
  	GemRB.UnloadWindow(AbilityWindow)
  	GemRB.SetNextScript("CharGen5")
! 	GemRB.SetVar("StrExtra",0)
! 	for i in range(-1,6):
  		GemRB.SetVar("Ability "+str(i),0)  #scrapping the abilities
  	return