From: <lyn...@us...> - 2008-06-26 10:37:34
|
Revision: 5208 http://gemrb.svn.sourceforge.net/gemrb/?rev=5208&view=rev Author: lynxlupodian Date: 2008-06-26 03:37:31 -0700 (Thu, 26 Jun 2008) Log Message: ----------- iwd2: fixed unloading of the color window, patch by gnud Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/iwd2/Appearance.py Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/Appearance.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/Appearance.py 2008-06-14 14:27:37 UTC (rev 5207) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/Appearance.py 2008-06-26 10:37:31 UTC (rev 5208) @@ -98,9 +98,8 @@ DonePress() def DonePress(): - global Color1, Color2, Color3, Color4 + global Color1, Color2, Color3, Color4, ColorWindow GemRB.UnloadWindow(ColorPicker) - ColorWindow=GemRB.LoadWindow(13) GemRB.SetVisible(ColorWindow,1) if ColorIndex==0: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lyn...@us...> - 2008-06-26 11:01:11
|
Revision: 5209 http://gemrb.svn.sourceforge.net/gemrb/?rev=5209&view=rev Author: lynxlupodian Date: 2008-06-26 04:01:14 -0700 (Thu, 26 Jun 2008) Log Message: ----------- iwd2: lock the paperdoll "button" Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/iwd2/Appearance.py Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/Appearance.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/Appearance.py 2008-06-26 10:37:31 UTC (rev 5208) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/Appearance.py 2008-06-26 11:01:14 UTC (rev 5209) @@ -59,6 +59,7 @@ Color4=GemRB.GetTableValue(PortraitTable,PortraitIndex,4) PDollButton = GemRB.GetControl(ColorWindow, 1) GemRB.SetButtonFlags(ColorWindow, PDollButton, IE_GUI_BUTTON_PICTURE,OP_OR) + GemRB.SetButtonState(ColorWindow, PDollButton, IE_GUI_BUTTON_LOCKED) HairButton = GemRB.GetControl(ColorWindow, 2) GemRB.SetButtonFlags(ColorWindow, HairButton, IE_GUI_BUTTON_PICTURE,OP_OR) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lyn...@us...> - 2008-06-26 13:38:25
|
Revision: 5210 http://gemrb.svn.sourceforge.net/gemrb/?rev=5210&view=rev Author: lynxlupodian Date: 2008-06-26 06:38:32 -0700 (Thu, 26 Jun 2008) Log Message: ----------- iwd2: fixed the paperdoll colors not updating on change in cg Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/iwd2/Appearance.py Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/Appearance.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/Appearance.py 2008-06-26 11:01:14 UTC (rev 5209) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/Appearance.py 2008-06-26 13:38:32 UTC (rev 5210) @@ -22,7 +22,10 @@ IE_ANIM_ID = 206 def RefreshPDoll(): + global ColorWindow, PDollButton + global Color1, Color2, Color3, Color4 PDollTable = GemRB.LoadTable("avatars") + AnimID=0x6000 table=GemRB.LoadTable("avprefr") AnimID=AnimID+GemRB.GetTableValue(table,GemRB.GetVar("BaseRace"),0) @@ -30,9 +33,12 @@ AnimID=AnimID+GemRB.GetTableValue(table,GemRB.GetVar("BaseClass"),0) table=GemRB.LoadTable("avprefg") AnimID=AnimID+GemRB.GetTableValue(table, GemRB.GetVar("Gender"),0) + ResRef=GemRB.GetTableValue(PDollTable,hex(AnimID), "AT_1")+"G1" + GemRB.SetButtonFlags(ColorWindow, PDollButton, IE_GUI_BUTTON_ANIMATED,OP_OR) + GemRB.SetButtonPLT(ColorWindow, PDollButton, ResRef, \ + 0, Color4, Color3, Color2, 0, 0, Color1, 0) GemRB.SetButtonBAM(ColorWindow, PDollButton, ResRef,10,0,0) - GemRB.SetButtonFlags(ColorWindow, PDollButton, IE_GUI_BUTTON_ANIMATED,OP_OR) return def OnLoad(): @@ -99,7 +105,7 @@ DonePress() def DonePress(): - global Color1, Color2, Color3, Color4, ColorWindow + global Color1, Color2, Color3, Color4, ColorWindow, ColorIndex, PickedColor, ColorPicker GemRB.UnloadWindow(ColorPicker) GemRB.SetVisible(ColorWindow,1) @@ -129,7 +135,7 @@ return def GetColor(): - global ColorPicker + global ColorPicker, ColorIndex, PickedColor ColorPicker=GemRB.LoadWindow(14) GemRB.SetVar("Selected",-1) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lyn...@us...> - 2008-06-26 14:28:07
|
Revision: 5211 http://gemrb.svn.sourceforge.net/gemrb/?rev=5211&view=rev Author: lynxlupodian Date: 2008-06-26 07:28:08 -0700 (Thu, 26 Jun 2008) Log Message: ----------- iwd2: shortened the random color button's label so it almost fits Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/iwd2/Appearance.py Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/Appearance.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/Appearance.py 2008-06-26 13:38:32 UTC (rev 5210) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/Appearance.py 2008-06-26 14:28:08 UTC (rev 5211) @@ -172,7 +172,7 @@ #default button GemRB.SetVarAssoc(ColorPicker, Button, "Selected", 0) GemRB.SetEvent(ColorPicker, Button, IE_GUI_BUTTON_ON_PRESS, "RandomDonePress") - GemRB.SetText(ColorPicker, Button, "RANDOM") + GemRB.SetText(ColorPicker, Button, "RND") GemRB.SetVisible(ColorPicker,1) return This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lyn...@us...> - 2008-06-26 15:55:18
|
Revision: 5214 http://gemrb.svn.sourceforge.net/gemrb/?rev=5214&view=rev Author: lynxlupodian Date: 2008-06-26 08:55:26 -0700 (Thu, 26 Jun 2008) Log Message: ----------- iwd2: added a fallback for missing paperdolls todo: determine the correct values for 0x6505 that triggered this Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/iwd2/Appearance.py Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/Appearance.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/Appearance.py 2008-06-26 15:12:57 UTC (rev 5213) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/Appearance.py 2008-06-26 15:55:26 UTC (rev 5214) @@ -35,6 +35,11 @@ AnimID=AnimID+GemRB.GetTableValue(table, GemRB.GetVar("Gender"),0) ResRef=GemRB.GetTableValue(PDollTable,hex(AnimID), "AT_1")+"G1" + if ResRef == "*G1": + print "ERROR, couldn't find the paperdoll! AnimID is", hex(AnimID) + print "Falling back to an elven paperdoll." + ResRef = "CEMB1G1" + GemRB.SetButtonFlags(ColorWindow, PDollButton, IE_GUI_BUTTON_ANIMATED,OP_OR) GemRB.SetButtonPLT(ColorWindow, PDollButton, ResRef, \ 0, Color4, Color3, Color2, 0, 0, Color1, 0) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lyn...@us...> - 2008-06-27 08:34:38
|
Revision: 5218 http://gemrb.svn.sourceforge.net/gemrb/?rev=5218&view=rev Author: lynxlupodian Date: 2008-06-27 01:34:30 -0700 (Fri, 27 Jun 2008) Log Message: ----------- iwd2: don't calculate the paperdoll animation id on each paperdoll update Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/iwd2/Appearance.py Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/Appearance.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/Appearance.py 2008-06-26 17:01:37 UTC (rev 5217) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/Appearance.py 2008-06-27 08:34:30 UTC (rev 5218) @@ -20,37 +20,23 @@ Color4 = 0 PDollButton = 0 IE_ANIM_ID = 206 +PDollResRef = 0 def RefreshPDoll(): global ColorWindow, PDollButton - global Color1, Color2, Color3, Color4 - PDollTable = GemRB.LoadTable("avatars") + global Color1, Color2, Color3, Color4, PDollResRef - AnimID=0x6000 - table=GemRB.LoadTable("avprefr") - AnimID=AnimID+GemRB.GetTableValue(table,GemRB.GetVar("BaseRace"),0) - table=GemRB.LoadTable("avprefc") - AnimID=AnimID+GemRB.GetTableValue(table,GemRB.GetVar("BaseClass"),0) - table=GemRB.LoadTable("avprefg") - AnimID=AnimID+GemRB.GetTableValue(table, GemRB.GetVar("Gender"),0) - - ResRef=GemRB.GetTableValue(PDollTable,hex(AnimID), "AT_1")+"G1" - if ResRef == "*G1": - print "ERROR, couldn't find the paperdoll! AnimID is", hex(AnimID) - print "Falling back to an elven paperdoll." - ResRef = "CEMB1G1" - GemRB.SetButtonFlags(ColorWindow, PDollButton, IE_GUI_BUTTON_ANIMATED,OP_OR) - GemRB.SetButtonPLT(ColorWindow, PDollButton, ResRef, \ + GemRB.SetButtonPLT(ColorWindow, PDollButton, PDollResRef, \ 0, Color4, Color3, Color2, 0, 0, Color1, 0) - GemRB.SetButtonBAM(ColorWindow, PDollButton, ResRef,10,0,0) + GemRB.SetButtonBAM(ColorWindow, PDollButton, PDollResRef,10,0,0) return def OnLoad(): global ColorWindow, DoneButton, PDollButton global HairTable, SkinTable, ColorTable global HairButton, SkinButton, MajorButton, MinorButton - global Color1, Color2, Color3, Color4 + global Color1, Color2, Color3, Color4, PDollResRef GemRB.LoadWindowPack("GUICG", 800, 600) ColorWindow=GemRB.LoadWindow(13) @@ -100,6 +86,28 @@ GemRB.SetEvent(ColorWindow,DoneButton,IE_GUI_BUTTON_ON_PRESS,"NextPress") GemRB.SetEvent(ColorWindow,BackButton,IE_GUI_BUTTON_ON_PRESS,"BackPress") + + # calculate the paperdoll animation id from the race, class and gender + PDollTable = GemRB.LoadTable ("avatars") + table = GemRB.LoadTable ("avprefr") + AnimID = 0x6000 + GemRB.GetTableValue (table, GemRB.GetVar("BaseRace"), 0) + GemRB.UnloadTable (table) + + table = GemRB.LoadTable ("avprefc") + AnimID = AnimID + GemRB.GetTableValue (table, GemRB.GetVar("BaseClass"), 0) + GemRB.UnloadTable (table) + + table = GemRB.LoadTable ("avprefg") + AnimID = AnimID + GemRB.GetTableValue (table, GemRB.GetVar("Gender"), 0) + GemRB.UnloadTable (table) + + PDollResRef = GemRB.GetTableValue (PDollTable, hex(AnimID), "AT_1") + "G1" + if PDollResRef == "*G1": + print "ERROR, couldn't find the paperdoll! AnimID is", hex(AnimID) + print "Falling back to an elven paperdoll." + PDollResRef = "CEMB1G1" + GemRB.UnloadTable (PDollTable) + RefreshPDoll() GemRB.SetVisible(ColorWindow,1) return This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lyn...@us...> - 2008-06-28 21:59:31
|
Revision: 5224 http://gemrb.svn.sourceforge.net/gemrb/?rev=5224&view=rev Author: lynxlupodian Date: 2008-06-28 14:59:35 -0700 (Sat, 28 Jun 2008) Log Message: ----------- iwd2: cg: added the cancel button to the color chooser Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/iwd2/Appearance.py Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/Appearance.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/Appearance.py 2008-06-28 09:36:57 UTC (rev 5223) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/Appearance.py 2008-06-28 21:59:35 UTC (rev 5224) @@ -147,6 +147,11 @@ RefreshPDoll() return +def CancelPress(): + global ColorPicker, ColorWindow + GemRB.UnloadWindow (ColorPicker) + GemRB.SetVisible (ColorWindow, 1) + def GetColor(): global ColorPicker, ColorIndex, PickedColor @@ -186,6 +191,11 @@ GemRB.SetVarAssoc(ColorPicker, Button, "Selected", 0) GemRB.SetEvent(ColorPicker, Button, IE_GUI_BUTTON_ON_PRESS, "RandomDonePress") GemRB.SetText(ColorPicker, Button, "RND") + + CancelButton = GemRB.GetControl(ColorPicker, 35) + GemRB.SetText(ColorPicker, CancelButton, 13727) + GemRB.SetEvent(ColorPicker, CancelButton, IE_GUI_BUTTON_ON_PRESS, "CancelPress") + GemRB.SetVisible(ColorPicker,1) return This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |