From: Laszlo T. <ave...@us...> - 2004-12-14 22:37:56
|
Update of /cvsroot/gemrb/gemrb/gemrb/GUIScripts/bg2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28030/GUIScripts/bg2 Modified Files: CharGen9.py GUICG13.py GUICG7.py GUIINV.py Log Message: more paperdoll fixes, PLT color indices will follow the same order as BAM colors Index: GUICG7.py =================================================================== RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/bg2/GUICG7.py,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** GUICG7.py 9 Dec 2004 22:08:05 -0000 1.9 --- GUICG7.py 14 Dec 2004 22:37:47 -0000 1.10 *************** *** 139,142 **** --- 139,143 ---- global MageSpellsSelectPointsLeft, Learnable + SpellMask = 0 Range = len(Learnable) if MageSpellsSelectPointsLeft > Range: Index: GUICG13.py =================================================================== RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/bg2/GUICG13.py,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** GUICG13.py 4 Dec 2004 17:35:09 -0000 1.13 --- GUICG13.py 14 Dec 2004 22:37:47 -0000 1.14 *************** *** 13,20 **** MajorButton = 0 MinorButton = 0 ! Color1 = 0 ! Color2 = 0 ! Color3 = 0 ! Color4 = 0 PDollButton = 0 IE_ANIM_ID = 206 --- 13,20 ---- MajorButton = 0 MinorButton = 0 ! HairColor = 0 ! SkinColor = 0 ! MajorColor = 0 ! MinorColor = 0 PDollButton = 0 IE_ANIM_ID = 206 *************** *** 33,37 **** GemRB.SetButtonPLT(ColorWindow, PDollButton, ResRef, ! Color2, Color1, 0, 0, 0 ,Color3,Color4,0) return --- 33,37 ---- GemRB.SetButtonPLT(ColorWindow, PDollButton, ResRef, ! 0, MinorColor, MajorColor, SkinColor, 0, 0, HairColor, 0) return *************** *** 39,43 **** global ColorWindow, DoneButton, PDollButton, ColorTable global HairButton, SkinButton, MajorButton, MinorButton ! global Color1, Color2, Color3, Color4 GemRB.LoadWindowPack("GUICG") --- 39,43 ---- global ColorWindow, DoneButton, PDollButton, ColorTable global HairButton, SkinButton, MajorButton, MinorButton ! global HairColor, SkinColor, MajorColor, MinorColor GemRB.LoadWindowPack("GUICG") *************** *** 48,57 **** PortraitTable = GemRB.LoadTable("pictures") PortraitIndex = GemRB.GetVar("PortraitIndex") ! Color1=GemRB.GetTableValue(PortraitTable,PortraitIndex,1) ! Color2=GemRB.GetTableValue(PortraitTable,PortraitIndex,2) ! Color3=GemRB.GetTableValue(PortraitTable,PortraitIndex,3) ! Color4=GemRB.GetTableValue(PortraitTable,PortraitIndex,4) PDollButton = GemRB.GetControl(ColorWindow, 1) ! print Color1, Color2, Color3, Color4 GemRB.SetButtonFlags(ColorWindow, PDollButton, IE_GUI_BUTTON_PICTURE,OP_OR) --- 48,57 ---- PortraitTable = GemRB.LoadTable("pictures") PortraitIndex = GemRB.GetVar("PortraitIndex") ! HairColor=GemRB.GetTableValue(PortraitTable,PortraitIndex,1) ! SkinColor=GemRB.GetTableValue(PortraitTable,PortraitIndex,2) ! MinorColor=GemRB.GetTableValue(PortraitTable,PortraitIndex,3) ! MajorColor=GemRB.GetTableValue(PortraitTable,PortraitIndex,4) PDollButton = GemRB.GetControl(ColorWindow, 1) ! print HairColor, SkinColor, MajorColor, MinorColor GemRB.SetButtonFlags(ColorWindow, PDollButton, IE_GUI_BUTTON_PICTURE,OP_OR) *************** *** 59,78 **** GemRB.SetButtonFlags(ColorWindow, HairButton, IE_GUI_BUTTON_PICTURE,OP_OR) GemRB.SetEvent(ColorWindow, HairButton, IE_GUI_BUTTON_ON_PRESS,"HairPress") ! GemRB.SetButtonBAM(ColorWindow, HairButton, "COLGRAD", 1, 0, Color1) SkinButton = GemRB.GetControl(ColorWindow, 3) GemRB.SetButtonFlags(ColorWindow, SkinButton, IE_GUI_BUTTON_PICTURE,OP_OR) GemRB.SetEvent(ColorWindow, SkinButton, IE_GUI_BUTTON_ON_PRESS,"SkinPress") ! GemRB.SetButtonBAM(ColorWindow, SkinButton, "COLGRAD", 1, 0, Color2) MajorButton = GemRB.GetControl(ColorWindow, 5) GemRB.SetButtonFlags(ColorWindow, MajorButton, IE_GUI_BUTTON_PICTURE,OP_OR) GemRB.SetEvent(ColorWindow, MajorButton, IE_GUI_BUTTON_ON_PRESS,"MajorPress") ! GemRB.SetButtonBAM(ColorWindow, MajorButton, "COLGRAD", 1, 0, Color3) MinorButton = GemRB.GetControl(ColorWindow, 4) GemRB.SetButtonFlags(ColorWindow, MinorButton, IE_GUI_BUTTON_PICTURE,OP_OR) GemRB.SetEvent(ColorWindow, MinorButton, IE_GUI_BUTTON_ON_PRESS,"MinorPress") ! GemRB.SetButtonBAM(ColorWindow, MinorButton, "COLGRAD", 1, 0, Color4) BackButton = GemRB.GetControl(ColorWindow,13) --- 59,78 ---- GemRB.SetButtonFlags(ColorWindow, HairButton, IE_GUI_BUTTON_PICTURE,OP_OR) GemRB.SetEvent(ColorWindow, HairButton, IE_GUI_BUTTON_ON_PRESS,"HairPress") ! GemRB.SetButtonBAM(ColorWindow, HairButton, "COLGRAD", 1, 0, HairColor) SkinButton = GemRB.GetControl(ColorWindow, 3) GemRB.SetButtonFlags(ColorWindow, SkinButton, IE_GUI_BUTTON_PICTURE,OP_OR) GemRB.SetEvent(ColorWindow, SkinButton, IE_GUI_BUTTON_ON_PRESS,"SkinPress") ! GemRB.SetButtonBAM(ColorWindow, SkinButton, "COLGRAD", 1, 0, SkinColor) MajorButton = GemRB.GetControl(ColorWindow, 5) GemRB.SetButtonFlags(ColorWindow, MajorButton, IE_GUI_BUTTON_PICTURE,OP_OR) GemRB.SetEvent(ColorWindow, MajorButton, IE_GUI_BUTTON_ON_PRESS,"MajorPress") ! GemRB.SetButtonBAM(ColorWindow, MajorButton, "COLGRAD", 1, 0, MinorColor) MinorButton = GemRB.GetControl(ColorWindow, 4) GemRB.SetButtonFlags(ColorWindow, MinorButton, IE_GUI_BUTTON_PICTURE,OP_OR) GemRB.SetEvent(ColorWindow, MinorButton, IE_GUI_BUTTON_ON_PRESS,"MinorPress") ! GemRB.SetButtonBAM(ColorWindow, MinorButton, "COLGRAD", 1, 0, MajorColor) BackButton = GemRB.GetControl(ColorWindow,13) *************** *** 89,93 **** def DonePress(): ! global Color1, Color2, Color3, Color4 GemRB.UnloadWindow(ColorPicker) ColorWindow=GemRB.LoadWindow(13) --- 89,93 ---- def DonePress(): ! global HairColor, SkinColor, MajorColor, MinorColor GemRB.UnloadWindow(ColorPicker) ColorWindow=GemRB.LoadWindow(13) *************** *** 95,115 **** PickedColor=GemRB.GetTableValue(ColorTable, ColorIndex, GemRB.GetVar("Selected")) if ColorIndex==0: ! Color1=PickedColor ! GemRB.SetButtonBAM(ColorWindow, HairButton, "COLGRAD", 1, 0, Color1) RefreshPDoll() return if ColorIndex==1: ! Color2=PickedColor ! GemRB.SetButtonBAM(ColorWindow, SkinButton, "COLGRAD", 1, 0, Color2) RefreshPDoll() return if ColorIndex==2: ! Color3=PickedColor ! GemRB.SetButtonBAM(ColorWindow, MajorButton, "COLGRAD", 1, 0, Color3) RefreshPDoll() return ! Color4=PickedColor ! GemRB.SetButtonBAM(ColorWindow, MinorButton, "COLGRAD", 1, 0, Color4) RefreshPDoll() return --- 95,115 ---- PickedColor=GemRB.GetTableValue(ColorTable, ColorIndex, GemRB.GetVar("Selected")) if ColorIndex==0: ! HairColor=PickedColor ! GemRB.SetButtonBAM(ColorWindow, HairButton, "COLGRAD", 1, 0, HairColor) RefreshPDoll() return if ColorIndex==1: ! SkinColor=PickedColor ! GemRB.SetButtonBAM(ColorWindow, SkinButton, "COLGRAD", 1, 0, SkinColor) RefreshPDoll() return if ColorIndex==2: ! MinorColor=PickedColor ! GemRB.SetButtonBAM(ColorWindow, MajorButton, "COLGRAD", 1, 0, MinorColor) RefreshPDoll() return ! MajorColor=PickedColor ! GemRB.SetButtonBAM(ColorWindow, MinorButton, "COLGRAD", 1, 0, MajorColor) RefreshPDoll() return *************** *** 147,151 **** GemRB.SetVisible(ColorWindow,0) ColorIndex = 0 ! PickedColor = Color1 GetColor() return --- 147,151 ---- GemRB.SetVisible(ColorWindow,0) ColorIndex = 0 ! PickedColor = HairColor GetColor() return *************** *** 156,160 **** GemRB.SetVisible(ColorWindow,0) ColorIndex = 1 ! PickedColor = Color2 GetColor() return --- 156,160 ---- GemRB.SetVisible(ColorWindow,0) ColorIndex = 1 ! PickedColor = SkinColor GetColor() return *************** *** 165,169 **** GemRB.SetVisible(ColorWindow,0) ColorIndex = 2 ! PickedColor = Color3 GetColor() return --- 165,169 ---- GemRB.SetVisible(ColorWindow,0) ColorIndex = 2 ! PickedColor = MinorColor GetColor() return *************** *** 174,178 **** GemRB.SetVisible(ColorWindow,0) ColorIndex = 3 ! PickedColor = Color4 GetColor() return --- 174,178 ---- GemRB.SetVisible(ColorWindow,0) ColorIndex = 3 ! PickedColor = MajorColor GetColor() return *************** *** 185,192 **** def NextPress(): GemRB.UnloadWindow(ColorWindow) ! GemRB.SetVar("Color1",Color1) ! GemRB.SetVar("Color2",Color2) ! GemRB.SetVar("Color3",Color3) ! GemRB.SetVar("Color4",Color4) GemRB.SetNextScript("CharGen8") #name return --- 185,192 ---- def NextPress(): GemRB.UnloadWindow(ColorWindow) ! GemRB.SetVar("HairColor",HairColor) ! GemRB.SetVar("SkinColor",SkinColor) ! GemRB.SetVar("MinorColor",MinorColor) ! GemRB.SetVar("MajorColor",MajorColor) GemRB.SetNextScript("CharGen8") #name return Index: GUIINV.py =================================================================== RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/bg2/GUIINV.py,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** GUIINV.py 4 Dec 2004 17:35:09 -0000 1.17 --- GUIINV.py 14 Dec 2004 22:37:47 -0000 1.18 *************** *** 185,197 **** # portrait Button = GemRB.GetControl (Window, 50) ! Color1 = GemRB.GetPlayerStat (pc, IE_HAIR_COLOR) ! Color2 = GemRB.GetPlayerStat (pc, IE_SKIN_COLOR) Color3 = GemRB.GetPlayerStat (pc, IE_MAJOR_COLOR) ! Color4 = GemRB.GetPlayerStat (pc, IE_MINOR_COLOR) Color5 = GemRB.GetPlayerStat (pc, IE_LEATHER_COLOR) ! Color6 = GemRB.GetPlayerStat (pc, IE_METAL_COLOR) ! Color7 = GemRB.GetPlayerStat (pc, IE_ARMOR_COLOR) GemRB.SetButtonPLT (Window, Button, GetActorPaperDoll (pc), ! Color2, Color1, Color7, Color6, Color5, Color3, Color4, 0) # encumbrance --- 185,197 ---- # portrait Button = GemRB.GetControl (Window, 50) ! Color1 = GemRB.GetPlayerStat (pc, IE_METAL_COLOR) ! Color2 = GemRB.GetPlayerStat (pc, IE_MINOR_COLOR) Color3 = GemRB.GetPlayerStat (pc, IE_MAJOR_COLOR) ! Color4 = GemRB.GetPlayerStat (pc, IE_SKIN_COLOR) Color5 = GemRB.GetPlayerStat (pc, IE_LEATHER_COLOR) ! Color6 = GemRB.GetPlayerStat (pc, IE_ARMOR_COLOR) ! Color7 = GemRB.GetPlayerStat (pc, IE_HAIR_COLOR) GemRB.SetButtonPLT (Window, Button, GetActorPaperDoll (pc), ! Color1, Color2, Color3, Color4, Color5, Color6, Color7, 0) # encumbrance Index: CharGen9.py =================================================================== RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/bg2/CharGen9.py,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** CharGen9.py 10 Dec 2004 18:39:11 -0000 1.27 --- CharGen9.py 14 Dec 2004 22:37:47 -0000 1.28 *************** *** 185,195 **** GemRB.UnloadTable(TmpTable) ! GemRB.SetPlayerStat(MyChar, IE_HAIR_COLOR, GemRB.GetVar("Color1") ) ! GemRB.SetPlayerStat(MyChar, IE_SKIN_COLOR, GemRB.GetVar("Color2") ) ! GemRB.SetPlayerStat(MyChar, IE_MAJOR_COLOR, GemRB.GetVar("Color4") ) ! GemRB.SetPlayerStat(MyChar, IE_MINOR_COLOR, GemRB.GetVar("Color3") ) ! GemRB.SetPlayerStat(MyChar, IE_METAL_COLOR, 0x1B ) ! GemRB.SetPlayerStat(MyChar, IE_LEATHER_COLOR, 0x16 ) ! GemRB.SetPlayerStat(MyChar, IE_ARMOR_COLOR, 0x17 ) GemRB.SetPlayerStat(MyChar, IE_EA, 2 ) Str=GemRB.GetVar("Ability 1") --- 185,195 ---- GemRB.UnloadTable(TmpTable) ! GemRB.SetPlayerStat(MyChar, IE_HAIR_COLOR, GemRB.GetVar("HairColor") ) ! GemRB.SetPlayerStat(MyChar, IE_SKIN_COLOR, GemRB.GetVar("SkinColor") ) ! GemRB.SetPlayerStat(MyChar, IE_MAJOR_COLOR, GemRB.GetVar("MajorColor") ) ! GemRB.SetPlayerStat(MyChar, IE_MINOR_COLOR, GemRB.GetVar("MinorColor") ) ! #GemRB.SetPlayerStat(MyChar, IE_METAL_COLOR, 0x1B ) ! #GemRB.SetPlayerStat(MyChar, IE_LEATHER_COLOR, 0x16 ) ! #GemRB.SetPlayerStat(MyChar, IE_ARMOR_COLOR, 0x17 ) GemRB.SetPlayerStat(MyChar, IE_EA, 2 ) Str=GemRB.GetVar("Ability 1") |