From: <ave...@us...> - 2003-11-06 21:18:24
|
Update of /cvsroot/gemrb/gemrb/gemrb/GUIScripts/bg2 In directory sc8-pr-cvs1:/tmp/cvs-serv9385 Modified Files: GUICG12.py GUICG2.py GUICG4.py GUIMOVIE.py Log Message: small mod in ability window, removed some debug messages Index: GUICG12.py =================================================================== RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/bg2/GUICG12.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** GUICG12.py 6 Nov 2003 15:03:04 -0000 1.1 --- GUICG12.py 6 Nov 2003 21:18:20 -0000 1.2 *************** *** 64,68 **** while True: LastPortrait = LastPortrait + 1 - print LastPortrait if LastPortrait >= GemRB.GetTableRowCount(PortraitsTable)-1: LastPortrait = 0 --- 64,67 ---- Index: GUICG2.py =================================================================== RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/bg2/GUICG2.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** GUICG2.py 6 Nov 2003 18:23:48 -0000 1.2 --- GUICG2.py 6 Nov 2003 21:18:20 -0000 1.3 *************** *** 83,87 **** def ClassPress(): Class = GemRB.GetVar("Class")-1 - print GemRB.GetTableValue(ClassTable,Class,1) GemRB.SetText(ClassWindow,TextAreaControl, GemRB.GetTableValue(ClassTable,Class,1) ) GemRB.SetButtonState(ClassWindow, DoneButton, IE_GUI_BUTTON_ENABLED) --- 83,86 ---- Index: GUICG4.py =================================================================== RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/bg2/GUICG4.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** GUICG4.py 6 Nov 2003 20:27:03 -0000 1.2 --- GUICG4.py 6 Nov 2003 21:18:20 -0000 1.3 *************** *** 10,15 **** def RollPress(): GemRB.InvalidateWindow(AbilityWindow) ! GemRB.SetVar("AbilityIncrease",0) ! GemRB.SetVar("AbilityDecrease",0) GemRB.SetVar("Ability -1",0) SumLabel = GemRB.GetControl(AbilityWindow, 0x10000002) --- 10,14 ---- def RollPress(): GemRB.InvalidateWindow(AbilityWindow) ! GemRB.SetVar("Ability",0) GemRB.SetVar("Ability -1",0) SumLabel = GemRB.GetControl(AbilityWindow, 0x10000002) *************** *** 39,49 **** RollPress() for i in range(0,6): Button = GemRB.GetControl(AbilityWindow, i*2+16) GemRB.SetEvent(AbilityWindow, Button, IE_GUI_BUTTON_ON_PRESS, "LeftPress") ! GemRB.SetVarAssoc(AbilityWindow, Button, "AbilityIncrease", i ) Button = GemRB.GetControl(AbilityWindow, i*2+17) GemRB.SetEvent(AbilityWindow, Button, IE_GUI_BUTTON_ON_PRESS, "RightPress") ! GemRB.SetVarAssoc(AbilityWindow, Button, "AbilityDecrease", i ) RerollButton = GemRB.GetControl(AbilityWindow,2) --- 38,52 ---- RollPress() for i in range(0,6): + Button = GemRB.GetControl(AbilityWindow, i+30) + GemRB.SetEvent(AbilityWindow, Button, IE_GUI_BUTTON_ON_PRESS, "JustPress") + GemRB.SetVarAssoc(AbilityWindow, Button, "Ability", i) + Button = GemRB.GetControl(AbilityWindow, i*2+16) GemRB.SetEvent(AbilityWindow, Button, IE_GUI_BUTTON_ON_PRESS, "LeftPress") ! GemRB.SetVarAssoc(AbilityWindow, Button, "Ability", i ) Button = GemRB.GetControl(AbilityWindow, i*2+17) GemRB.SetEvent(AbilityWindow, Button, IE_GUI_BUTTON_ON_PRESS, "RightPress") ! GemRB.SetVarAssoc(AbilityWindow, Button, "Ability", i ) RerollButton = GemRB.GetControl(AbilityWindow,2) *************** *** 74,78 **** GemRB.InvalidateWindow(AbilityWindow) ! Abidx = GemRB.GetVar("AbilityDecrease") Ability = GemRB.GetVar("Ability "+str(Abidx) ) #should be more elaborate --- 77,81 ---- GemRB.InvalidateWindow(AbilityWindow) ! Abidx = GemRB.GetVar("Ability") Ability = GemRB.GetVar("Ability "+str(Abidx) ) #should be more elaborate *************** *** 94,97 **** --- 97,111 ---- return + def JustPress(): + Abidx = GemRB.GetVar("Ability") + Ability = GemRB.GetVar("Ability "+str(Abidx) ) + #should be more elaborate + Minimum=3 + Maximum=18 + GemRB.SetToken("MINIMUM",str(Minimum) ) + GemRB.SetToken("MAXIMUM",str(Maximum) ) + GemRB.SetText(AbilityWindow, TextAreaControl, GemRB.GetTableValue(AbilityTable, Abidx, 1) ) + return + def LeftPress(): global PointsLeft *************** *** 104,108 **** GemRB.SetToken("MINIMUM",str(Minimum) ) GemRB.SetToken("MAXIMUM",str(Maximum) ) ! Abidx = GemRB.GetVar("AbilityIncrease") Ability = GemRB.GetVar("Ability "+str(Abidx) ) GemRB.SetText(AbilityWindow, TextAreaControl, GemRB.GetTableValue(AbilityTable, Abidx, 1) ) --- 118,122 ---- GemRB.SetToken("MINIMUM",str(Minimum) ) GemRB.SetToken("MAXIMUM",str(Maximum) ) ! Abidx = GemRB.GetVar("Ability") Ability = GemRB.GetVar("Ability "+str(Abidx) ) GemRB.SetText(AbilityWindow, TextAreaControl, GemRB.GetTableValue(AbilityTable, Abidx, 1) ) Index: GUIMOVIE.py =================================================================== RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/bg2/GUIMOVIE.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** GUIMOVIE.py 6 Nov 2003 18:23:48 -0000 1.2 --- GUIMOVIE.py 6 Nov 2003 21:18:20 -0000 1.3 *************** *** 31,35 **** def PlayPress(): - print "MovieIndex", GemRB.GetVar("MovieIndex") s = GemRB.GetVar("MovieIndex") for i in range(0, GemRB.GetTableRowCount(MoviesTable) ): --- 31,34 ---- |