[Gemrb-commits] gemrb/gemrb/GUIScripts/iwd2 Feats.py,1.1,1.2 Skills.py,1.4,1.5

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

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

Modified Files:
	Feats.py Skills.py 
Log Message:
Add: ToB guiscripts


Index: Feats.py
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/iwd2/Feats.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Feats.py	2 Feb 2004 20:21:25 -0000	1.1
--- Feats.py	8 Feb 2004 11:40:01 -0000	1.2
***************
*** 2,45 ****
  import GemRB
  
! SkillWindow = 0
  TextAreaControl = 0
  DoneButton = 0
! SkillTable = 0
  TopIndex = 0
  PointsLeft = 0
  
! def RedrawSkills():
  	global TopIndex
  
! 	if PointsLeft == 0:
! 		GemRB.SetButtonState(SkillWindow, DoneButton, IE_GUI_BUTTON_ENABLED)
! 
! 	SumLabel = GemRB.GetControl(SkillWindow, 0x1000000c)
! 	GemRB.SetText(SkillWindow, SumLabel, str(PointsLeft) )
  
! 	for i in range(0,9):
! 		Pos=TopIndex+i
! 		SkillName = GemRB.GetTableValue(SkillTable, Pos+2,1)
! 		Label = GemRB.GetControl(SkillWindow, 0x10000006+i)
! 		GemRB.SetText(SkillWindow, Label, SkillName)
  
! 		SkillName=GemRB.GetTableRowName(SkillTable, Pos+2)
! 		Ok=GemRB.GetTableValue(SkillTable,SkillName, KitName)
! 		Button1 = GemRB.GetControl(SkillWindow, i*2+14)
! 		Button2 = GemRB.GetControl(SkillWindow, i*2+15)
  		if Ok == 0:
! 			GemRB.SetButtonState(SkillWindow, Button1, IE_GUI_BUTTON_DISABLED)
! 			GemRB.SetButtonState(SkillWindow, Button2, IE_GUI_BUTTON_DISABLED)
! 			GemRB.SetButtonFlags(SkillWindow, Button1, IE_GUI_BUTTON_NO_IMAGE,OP_OR)
! 			GemRB.SetButtonFlags(SkillWindow, Button2, IE_GUI_BUTTON_NO_IMAGE,OP_OR)
  		else:
! 			GemRB.SetButtonState(SkillWindow, Button1, IE_GUI_BUTTON_ENABLED)
! 			GemRB.SetButtonState(SkillWindow, Button2, IE_GUI_BUTTON_ENABLED)
! 			GemRB.SetButtonFlags(SkillWindow, Button1, IE_GUI_BUTTON_NO_IMAGE,OP_NAND)
! 			GemRB.SetButtonFlags(SkillWindow, Button2, IE_GUI_BUTTON_NO_IMAGE,OP_NAND)
! 
! 		Label = GemRB.GetControl(SkillWindow, 0x10000001+i)
! 		ActPoint = GemRB.GetVar("Skill "+str(Pos) )
! 		GemRB.SetText(SkillWindow, Label, str(ActPoint) )
  
  	return
--- 2,41 ----
  import GemRB
  
! FeatWindow = 0
  TextAreaControl = 0
  DoneButton = 0
! FeatTable = 0
  TopIndex = 0
+ Level = 0
+ ClassColumn = 0
  PointsLeft = 0
  
! def RedrawFeats():
  	global TopIndex
  
! 	SumLabel = GemRB.GetControl(FeatWindow, 0x1000000c)
! 	GemRB.SetText(FeatWindow, SumLabel, str(PointsLeft) )
  
! 	for i in range(0,10):
! 		Pos=TopIndex+i+1
! 		FeatName = GemRB.GetTableValue(FeatTable, Pos, 1)
! 		Label = GemRB.GetControl(FeatWindow, 0x10000001+i)
! 		GemRB.SetText(FeatWindow, Label, FeatName)
  
! 		FeatName=GemRB.GetTableRowName(FeatTable, Pos) #row name
! 		
! 		Button1 = GemRB.GetControl(FeatWindow, i*2+14)
! 		Button2 = GemRB.GetControl(FeatWindow, i*2+15)
! 		Ok = 1
  		if Ok == 0:
! 			GemRB.SetButtonState(FeatWindow, Button1, IE_GUI_BUTTON_DISABLED)
! 			GemRB.SetButtonState(FeatWindow, Button2, IE_GUI_BUTTON_DISABLED)
! #			GemRB.SetButtonFlags(FeatWindow, Button1, IE_GUI_BUTTON_NO_IMAGE,OP_OR)
! #			GemRB.SetButtonFlags(FeatWindow, Button2, IE_GUI_BUTTON_NO_IMAGE,OP_OR)
  		else:
! 			GemRB.SetButtonState(FeatWindow, Button1, IE_GUI_BUTTON_ENABLED)
! 			GemRB.SetButtonState(FeatWindow, Button2, IE_GUI_BUTTON_ENABLED)
! #			GemRB.SetButtonFlags(FeatWindow, Button1, IE_GUI_BUTTON_NO_IMAGE,OP_NAND)
! #			GemRB.SetButtonFlags(FeatWindow, Button2, IE_GUI_BUTTON_NO_IMAGE,OP_NAND)
  
  	return
***************
*** 49,140 ****
  
  	TopIndex = GemRB.GetVar("TopIndex")
! 	RedrawSkills()
  	return
  
  def OnLoad():
! 	global SkillWindow, TextAreaControl, DoneButton, TopIndex
! 	global SkillTable, PointsLeft, KitName
  	
!         SkillTable = GemRB.LoadTable("skills")
! 	RowCount = GemRB.GetTableRowCount(SkillTable)-2
! 
! 	Kit = GemRB.GetVar("Class Kit")
! 	if Kit != 0:
! 		KitList = GemRB.LoadTable("kitlist")
! 		KitName = GemRB.GetTableValue(KitList, Kit, 0) #rowname is just a number
! 		PointsLeft = GemRB.GetTableValue(SkillTable,"FIRST_LEVEL",KitName)
! 		if PointsLeft < 0:
! 			Kit = 0
! 		
! 	if Kit == 0:
! 		ClassTable = GemRB.LoadTable("classes")
! 		Class = GemRB.GetVar("Class")-1
! 		KitName = GemRB.GetTableRowName(ClassTable, Class)
! 	else:
! 		KitList = GemRB.LoadTable("kitlist")
! 		KitName = GemRB.GetTableValue(KitList, Kit, 0) #rowname is just a number
  
! 	SkillRacTable = GemRB.LoadTable("SKILLRAC")
! 	RaceTable = GemRB.LoadTable("RACES")
! 	RaceName = GemRB.GetTableRowName(RaceTable, GemRB.GetVar("Race")-1)
  
  	for i in range(0,RowCount):
! 		SkillName = GemRB.GetTableRowName(SkillTable,i+2)
! 		if GemRB.GetTableValue(SkillTable,SkillName, KitName)==1:
! 			b=GemRB.GetTableValue(SkillRacTable, RaceName, SkillName)
! 			GemRB.SetVar("Skill "+str(i),b)
! 		else:
! 			GemRB.SetVar("Skill "+str(i),0)
! 
! 	Level = GemRB.GetVar("Level")
! 	PointsLeft = GemRB.GetTableValue(SkillTable,"FIRST_LEVEL",KitName)
! 	if Level>1:
! 		PointsLeft = PointsLeft + GemRB.GetTableValue(SkillTable,"RATE",KitName)*(Level-1)
  
  	GemRB.SetToken("number",str(PointsLeft) )
  
  	GemRB.LoadWindowPack("GUICG")
!         SkillTable = GemRB.LoadTable("feats")
! 	SkillWindow = GemRB.LoadWindow(55)
  
! 	for i in range(0,9):
! 		Button = GemRB.GetControl(SkillWindow, i+21)
! 		GemRB.SetVarAssoc(SkillWindow, Button, "Skill",i)
! 		GemRB.SetEvent(SkillWindow, Button, IE_GUI_BUTTON_ON_PRESS, "JustPress")
  
! 		Button = GemRB.GetControl(SkillWindow, i*2+14)
! 		GemRB.SetVarAssoc(SkillWindow, Button, "Skill",i)
! 		GemRB.SetEvent(SkillWindow, Button, IE_GUI_BUTTON_ON_PRESS, "LeftPress")
  
! 		Button = GemRB.GetControl(SkillWindow, i*2+15)
! 		GemRB.SetVarAssoc(SkillWindow, Button, "Skill",i)
! 		GemRB.SetEvent(SkillWindow, Button, IE_GUI_BUTTON_ON_PRESS, "RightPress")
  
! 	BackButton = GemRB.GetControl(SkillWindow,25)
! 	GemRB.SetText(SkillWindow,BackButton,15416)
! 	DoneButton = GemRB.GetControl(SkillWindow,0)
! 	GemRB.SetText(SkillWindow,DoneButton,36789)
!         GemRB.SetButtonFlags(SkillWindow, DoneButton, IE_GUI_BUTTON_DEFAULT,OP_OR)
  
! 	TextAreaControl = GemRB.GetControl(SkillWindow, 92)
! 	GemRB.SetText(SkillWindow,TextAreaControl,17248)
  
  	GemRB.SetVar("TopIndex",0)
! 	ScrollBarControl = GemRB.GetControl(SkillWindow, 91)
! 	GemRB.SetEvent(SkillWindow, ScrollBarControl,IE_GUI_SCROLLBAR_ON_CHANGE,"ScrollBarPress")
! 	GemRB.SetVarAssoc(SkillWindow, ScrollBarControl, "TopIndex",RowCount-4) #decrease it with the number of controls on screen (list size)
  
! 	GemRB.SetEvent(SkillWindow,DoneButton,IE_GUI_BUTTON_ON_PRESS,"NextPress")
! 	GemRB.SetEvent(SkillWindow,BackButton,IE_GUI_BUTTON_ON_PRESS,"BackPress")
! 	GemRB.SetButtonState(SkillWindow,DoneButton,IE_GUI_BUTTON_DISABLED)
! 	TopIndex = 0
! 	RedrawSkills()
! 	GemRB.SetVisible(SkillWindow,1)
  	return
  
  
  def JustPress():
! 	Pos = GemRB.GetVar("Skill")+TopIndex
! 	GemRB.SetText(SkillWindow, TextAreaControl, GemRB.GetTableValue(SkillTable,Pos+2,0) )
  	return
  
--- 45,125 ----
  
  	TopIndex = GemRB.GetVar("TopIndex")
! 	RedrawFeats()
  	return
  
  def OnLoad():
! 	global FeatWindow, TextAreaControl, DoneButton, TopIndex
! 	global FeatTable, CostTable
! 	global KitName, Level, ClassColumn
  	
! 	GemRB.SetVar("Level",1) #for simplicity
! 	Class = GemRB.GetVar("Class") - 1
! 	ClassTable = GemRB.LoadTable("classes")
! 	KitName = GemRB.GetTableRowName(ClassTable, Class)
! 	#classcolumn is base class
! 	ClassColumn = GemRB.GetTableValue(ClassTable, Class, 3) - 1
! 	if ClassColumn < 0:  #it was already a base class
! 		ClassColumn = Class
  
! 	FeatTable = GemRB.LoadTable("feats")
! 	RowCount = GemRB.GetTableRowCount(FeatTable)
  
  	for i in range(0,RowCount):
! 			GemRB.SetVar("Feat "+str(i),0)
  
+ 	FeatClassTable = GemRB.LoadTable("featclas")
+ 	#calculating the number of new feats
+ 	for l in (1,Level+1):
+ 		PointsLeft = GemRB.GetTableValue(FeatTable, l, ClassColumn)
+ 		print "Pl:", PointsLeft
+ 		print "a", GemRB.GetTableValue(FeatTable, l, ClassColumn)
+ 		print "b", GemRB.GetTableValue(FeatClassTable, l, ClassColumn)
+ 		PointsLeft += GemRB.GetTableValue(FeatClassTable, l, ClassColumn)
+ 	
  	GemRB.SetToken("number",str(PointsLeft) )
  
  	GemRB.LoadWindowPack("GUICG")
! 	FeatWindow = GemRB.LoadWindow(55)
  
! 	for i in range(0,10):
! 		Button = GemRB.GetControl(FeatWindow, i+93)
! 		GemRB.SetVarAssoc(FeatWindow, Button, "Feat",i)
! 		GemRB.SetEvent(FeatWindow, Button, IE_GUI_BUTTON_ON_PRESS, "JustPress")
  
! 		Button = GemRB.GetControl(FeatWindow, i*2+14)
! 		GemRB.SetVarAssoc(FeatWindow, Button, "Feat",i)
! 		GemRB.SetEvent(FeatWindow, Button, IE_GUI_BUTTON_ON_PRESS, "LeftPress")
  
! 		Button = GemRB.GetControl(FeatWindow, i*2+15)
! 		GemRB.SetVarAssoc(FeatWindow, Button, "Feat",i)
! 		GemRB.SetEvent(FeatWindow, Button, IE_GUI_BUTTON_ON_PRESS, "RightPress")
  
! 	BackButton = GemRB.GetControl(FeatWindow,105)
! 	GemRB.SetText(FeatWindow,BackButton,15416)
! 	DoneButton = GemRB.GetControl(FeatWindow,0)
! 	GemRB.SetText(FeatWindow,DoneButton,36789)
! 	GemRB.SetButtonFlags(FeatWindow, DoneButton, IE_GUI_BUTTON_DEFAULT,OP_OR)
  
! 	TextAreaControl = GemRB.GetControl(FeatWindow, 92)
! 	GemRB.SetText(FeatWindow,TextAreaControl,17248)
  
+ 	ScrollBarControl = GemRB.GetControl(FeatWindow, 104)
+ 	GemRB.SetEvent(FeatWindow, ScrollBarControl,IE_GUI_SCROLLBAR_ON_CHANGE,"ScrollBarPress")
+ 	#decrease it with the number of controls on screen (list size)
+ 	TopIndex = 0
  	GemRB.SetVar("TopIndex",0)
! 	GemRB.SetVarAssoc(FeatWindow, ScrollBarControl, "TopIndex",RowCount-10)
  
! 	GemRB.SetEvent(FeatWindow,DoneButton,IE_GUI_BUTTON_ON_PRESS,"NextPress")
! 	GemRB.SetEvent(FeatWindow,BackButton,IE_GUI_BUTTON_ON_PRESS,"BackPress")
! 	GemRB.SetButtonState(FeatWindow,DoneButton,IE_GUI_BUTTON_DISABLED)
! 	RedrawFeats()
! 	GemRB.SetVisible(FeatWindow,1)
  	return
  
  
  def JustPress():
! 	Pos = GemRB.GetVar("Feat")+TopIndex+1
! 	GemRB.SetText(FeatWindow, TextAreaControl, GemRB.GetTableValue(FeatTable,Pos,2) )
  	return
  
***************
*** 142,153 ****
  	global PointsLeft
  
! 	Pos = GemRB.GetVar("Skill")+TopIndex
! 	GemRB.SetText(SkillWindow, TextAreaControl, GemRB.GetTableValue(SkillTable,Pos+2,0) )
! 	ActPoint = GemRB.GetVar("Skill "+str(Pos) )
  	if ActPoint <= 0:
  		return
! 	GemRB.SetVar("Skill "+str(Pos),ActPoint-1)
! 	PointsLeft = PointsLeft + 1
! 	RedrawSkills()
  	return
  
--- 127,142 ----
  	global PointsLeft
  
! 	Pos = GemRB.GetVar("Feat")+TopIndex+1
! 	Cost = GemRB.GetTableValue(CostTable, Pos, ClassColumn)
! 	if Cost==0:
! 		return
! 
! 	GemRB.SetText(FeatWindow, TextAreaControl, GemRB.GetTableValue(FeatTable,Pos,2) )
! 	ActPoint = GemRB.GetVar("Feat "+str(Pos) )
  	if ActPoint <= 0:
  		return
! 	GemRB.SetVar("Feat "+str(Pos),ActPoint-1)
! 	PointsLeft = PointsLeft + Cost
! 	RedrawFeats()
  	return
  
***************
*** 155,178 ****
  	global PointsLeft
  
! 	Pos = GemRB.GetVar("Skill")+TopIndex
! 	GemRB.SetText(SkillWindow, TextAreaControl, GemRB.GetTableValue(SkillTable,Pos+2,0) )
! 	if PointsLeft == 0:
  		return
! 	ActPoint = GemRB.GetVar("Skill "+str(Pos) )
! 	if ActPoint >= 200:
  		return
! 	GemRB.SetVar("Skill "+str(Pos), ActPoint+1)
! 	PointsLeft = PointsLeft - 1
! 	RedrawSkills()
  	return
  
  def BackPress():
! 	GemRB.UnloadWindow(SkillWindow)
  	GemRB.SetNextScript("Skills")
- 	#scrap skills
  	return
  
  def NextPress():
!         GemRB.UnloadWindow(SkillWindow)
! 	GemRB.SetNextScript("Feats") #feats
  	return
--- 144,170 ----
  	global PointsLeft
  
! 	Pos = GemRB.GetVar("Feat")+TopIndex+1
! 	Cost = GemRB.GetTableValue(CostTable, Pos, ClassColumn)
! 	if Cost==0:
  		return
! 
! 	GemRB.SetText(FeatWindow, TextAreaControl, GemRB.GetTableValue(FeatTable,Pos,2) )
! 	if PointsLeft < Cost:
  		return
! 	ActPoint = GemRB.GetVar("Feat "+str(Pos) )
! 	if ActPoint >= Level:
! 		return
! 	GemRB.SetVar("Feat "+str(Pos), ActPoint+1)
! 	PointsLeft = PointsLeft - Cost
! 	RedrawFeats()
  	return
  
  def BackPress():
! 	GemRB.UnloadWindow(FeatWindow)
  	GemRB.SetNextScript("Skills")
  	return
  
  def NextPress():
! 	GemRB.UnloadWindow(FeatWindow)
! 	GemRB.SetNextScript("CharGen7")
  	return

Index: Skills.py
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/iwd2/Skills.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Skills.py	3 Feb 2004 23:09:37 -0000	1.4
--- Skills.py	8 Feb 2004 11:40:01 -0000	1.5
***************
*** 81,88 ****
  		ClassColumn = Class
  	SkillPtsTable = GemRB.LoadTable("skillpts")
! 	PointsLeft = GemRB.GetTableValue(SkillPtsTable, 0, ClassColumn)
  
! 	Level = GemRB.GetVar("Level")
! 	PointsLeft = PointsLeft * Level
  	GemRB.UnloadTable(SkillPtsTable)
  
--- 81,97 ----
  		ClassColumn = Class
  	SkillPtsTable = GemRB.LoadTable("skillpts")
! 	p = GemRB.GetTableValue(SkillPtsTable, 0, ClassColumn)
! 	IntBonus = GemRB.GetVar("Ability 3")/2-5  #intelligence bonus
! 	p = p + IntBonus
! 	#at least 1 skillpoint / level advanced
! 	if p <1:
! 		p=1
  
! 	Level = GemRB.GetVar("Level")  #this is the level increase
! 	if Level < 2:
! 		PointsLeft = p * 4
! 	else:
! 		PointsLeft = p * 4 + (Level-1) * p
! 	
  	GemRB.UnloadTable(SkillPtsTable)
  
***************
*** 107,111 ****
  
  	GemRB.LoadWindowPack("GUICG")
- 	SkillTable = GemRB.LoadTable("skills")
  	SkillWindow = GemRB.LoadWindow(6)
  
--- 116,119 ----