From: <ave...@pr...> - 2004-01-30 23:29:21
|
Update of /cvsroot/gemrb/gemrb/gemrb/GUIScripts/iwd2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8974 Modified Files: Abilities.py Log Message: Fix: finished the ability screen for IWD2 Index: Abilities.py =================================================================== RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/iwd2/Abilities.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Abilities.py 29 Jan 2004 20:36:41 -0000 1.2 --- Abilities.py 30 Jan 2004 23:27:40 -0000 1.3 *************** *** 11,15 **** Add = 0 KitIndex = 0 - HasStrExtra = 0 def CalcLimits(Abidx): --- 11,14 ---- *************** *** 52,60 **** def RollPress(): ! global HasStrExtra, PointsLeft, Add GemRB.InvalidateWindow(AbilityWindow) GemRB.SetVar("Ability",0) - GemRB.SetVar("Ability -1",0) SumLabel = GemRB.GetControl(AbilityWindow, 0x10000002) PointsLeft=16 --- 51,58 ---- def RollPress(): ! global PointsLeft, Add GemRB.InvalidateWindow(AbilityWindow) GemRB.SetVar("Ability",0) SumLabel = GemRB.GetControl(AbilityWindow, 0x10000002) PointsLeft=16 *************** *** 62,84 **** 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): v = 10+Add 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 def OnLoad(): global AbilityWindow, TextAreaControl, DoneButton ! global PointsLeft, HasStrExtra global AbilityTable global KitIndex, Minimum, Maximum --- 60,76 ---- GemRB.SetLabelUseRGB(AbilityWindow, SumLabel, 1) for i in range(0,6): v = 10+Add GemRB.SetVar("Ability "+str(i), v ) Label = GemRB.GetControl(AbilityWindow, 0x10000003+i) ! GemRB.SetText(AbilityWindow, Label, str(v) ) GemRB.SetLabelUseRGB(AbilityWindow, Label, 1) + Label = GemRB.GetControl(AbilityWindow, 0x10000024+i) + GemRB.SetText(AbilityWindow, Label, "%+d"%(v/2-5)) return def OnLoad(): global AbilityWindow, TextAreaControl, DoneButton ! global PointsLeft global AbilityTable global KitIndex, Minimum, Maximum *************** *** 94,102 **** 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) --- 86,89 ---- *************** *** 108,111 **** --- 95,101 ---- RollPress() for i in range(0,6): + Label = GemRB.GetControl(AbilityWindow, i+0x10000024) + GemRB.SetText(AbilityWindow, Label,"+0") + Button = GemRB.GetControl(AbilityWindow, i+30) GemRB.SetEvent(AbilityWindow, Button, IE_GUI_BUTTON_ON_PRESS, "JustPress") *************** *** 149,161 **** GemRB.SetVar("Ability "+str(Abidx), Ability-1) PointsLeft = PointsLeft + 1 - GemRB.SetVar("Ability -1",PointsLeft) SumLabel = GemRB.GetControl(AbilityWindow, 0x10000002) 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 --- 139,148 ---- GemRB.SetVar("Ability "+str(Abidx), Ability-1) PointsLeft = PointsLeft + 1 SumLabel = GemRB.GetControl(AbilityWindow, 0x10000002) GemRB.SetText(AbilityWindow, SumLabel, str(PointsLeft) ) Label = GemRB.GetControl(AbilityWindow, 0x10000003+Abidx) ! GemRB.SetText(AbilityWindow, Label, str(Ability-1) ) ! Label = GemRB.GetControl(AbilityWindow, 0x10000024+Abidx) ! GemRB.SetText(AbilityWindow, Label, "%+d"%((Ability-1)/2-5)) GemRB.SetButtonState(AbilityWindow, DoneButton,IE_GUI_BUTTON_DISABLED) return *************** *** 172,180 **** def LeftPress(): ! global PointsLeft, HasStrExtra Abidx = GemRB.GetVar("Ability") GemRB.InvalidateWindow(AbilityWindow) - PointsLeft=GemRB.GetVar("Ability -1") CalcLimits(Abidx) GemRB.SetToken("MINIMUM",str(Minimum) ) --- 159,166 ---- def LeftPress(): ! global PointsLeft Abidx = GemRB.GetVar("Ability") GemRB.InvalidateWindow(AbilityWindow) CalcLimits(Abidx) GemRB.SetToken("MINIMUM",str(Minimum) ) *************** *** 188,200 **** GemRB.SetVar("Ability "+str(Abidx), Ability+1) PointsLeft = PointsLeft - 1 - GemRB.SetVar("Ability -1",PointsLeft) SumLabel = GemRB.GetControl(AbilityWindow, 0x10000002) 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) --- 174,183 ---- GemRB.SetVar("Ability "+str(Abidx), Ability+1) PointsLeft = PointsLeft - 1 SumLabel = GemRB.GetControl(AbilityWindow, 0x10000002) GemRB.SetText(AbilityWindow, SumLabel, str(PointsLeft) ) Label = GemRB.GetControl(AbilityWindow, 0x10000003+Abidx) ! GemRB.SetText(AbilityWindow, Label, str(Ability+1) ) ! Label = GemRB.GetControl(AbilityWindow, 0x10000024+Abidx) ! GemRB.SetText(AbilityWindow, Label, "%+d"%((Ability+1)/2-5)) if PointsLeft == 0: GemRB.SetButtonState(AbilityWindow, DoneButton,IE_GUI_BUTTON_ENABLED) *************** *** 204,208 **** 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 --- 187,190 ---- |