From: <lyn...@us...> - 2008-09-18 13:45:10
|
Revision: 5339 http://gemrb.svn.sourceforge.net/gemrb/?rev=5339&view=rev Author: lynxlupodian Date: 2008-09-18 20:45:20 +0000 (Thu, 18 Sep 2008) Log Message: ----------- iwd2: create the player early on, so CheckFeatCondition can be used also squashed a runtime error when creating more than one character Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/iwd2/CharGen.py gemrb/trunk/gemrb/GUIScripts/iwd2/CharGen9.py Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/CharGen.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/CharGen.py 2008-09-18 20:39:36 UTC (rev 5338) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/CharGen.py 2008-09-18 20:45:20 UTC (rev 5339) @@ -3,6 +3,9 @@ from CharOverview import * def OnLoad(): + MyChar = GemRB.GetVar ("Slot") + GemRB.CreatePlayer ("charbase", MyChar | 0x8000 ) + UpdateOverview(1) return Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/CharGen9.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/CharGen9.py 2008-09-18 20:39:36 UTC (rev 5338) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/CharGen9.py 2008-09-18 20:45:20 UTC (rev 5339) @@ -11,7 +11,8 @@ def OnLoad(): UpdateOverview(9) - GemRB.SetButtonState(CharGenWindow, PersistButtons['Next'], IE_GUI_BUTTON_UNPRESSED) # Fixes button being pre-pressed + if CharGenWindow: + GemRB.SetButtonState(CharGenWindow, PersistButtons['Next'], IE_GUI_BUTTON_UNPRESSED) # Fixes button being pre-pressed return def SetRaceAbilities(MyChar, racetitle): @@ -106,8 +107,7 @@ GemRB.UnloadWindow (CharGenWindow) #set my character up - MyChar = GemRB.GetVar ("Slot") - GemRB.CreatePlayer ("charbase", MyChar | 0x8000 ) + MyChar = GemRB.GetVar ("Slot") GemRB.SetPlayerStat (MyChar, IE_SEX, GemRB.GetVar ("Gender") ) GemRB.SetPlayerStat (MyChar, IE_RACE, GemRB.GetVar ("BaseRace") ) race = GemRB.GetVar ("Race") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ave...@us...> - 2008-10-05 15:27:36
|
Revision: 5398 http://gemrb.svn.sourceforge.net/gemrb/?rev=5398&view=rev Author: avenger_teambg Date: 2008-10-05 15:24:55 +0000 (Sun, 05 Oct 2008) Log Message: ----------- fixed ingame options windows to not break the game script (by unloading it) Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/iwd2/GUIINV.py gemrb/trunk/gemrb/GUIScripts/iwd2/GUIOPT.py gemrb/trunk/gemrb/GUIScripts/iwd2/GUIREC.py gemrb/trunk/gemrb/GUIScripts/iwd2/GUISAVE.py gemrb/trunk/gemrb/GUIScripts/iwd2/GUISPL.py gemrb/trunk/gemrb/GUIScripts/iwd2/Options.py Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/GUIINV.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/GUIINV.py 2008-10-05 14:52:00 UTC (rev 5397) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/GUIINV.py 2008-10-05 15:24:55 UTC (rev 5398) @@ -70,7 +70,6 @@ OldPortraitWindow = GUICommonWindows.PortraitWindow PortraitWindow = OpenPortraitWindow () OldOptionsWindow = GUICommonWindows.OptionsWindow - OptionsWindow = GUICommonWindows.OptionsWindow OptionsWindow = GemRB.LoadWindow (0) SetupMenuWindowControls (OptionsWindow, 0, "OpenInventoryWindow") GemRB.SetWindowFrame (Window) Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/GUIOPT.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/GUIOPT.py 2008-10-05 14:52:00 UTC (rev 5397) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/GUIOPT.py 2008-10-05 15:24:55 UTC (rev 5398) @@ -23,11 +23,14 @@ ################################################### import GemRB +import GUICommonWindows from GUIDefines import * from GUISAVE import * +from GUICommon import CloseOtherWindow +from GUICommonWindows import * ################################################### -OptionsWindow = None +GameOptionsWindow = None VideoOptionsWindow = None AudioOptionsWindow = None GameplayOptionsWindow = None @@ -36,131 +39,542 @@ LoadMsgWindow = None SaveMsgWindow = None QuitMsgWindow = None -MoviesWindow = None +MovieWindow = None KeysWindow = None +OptionsWindow = None +PortraitWindow = None +OldPortraitWindow = None +OldOptionsWindow = None ################################################### -def OpenOptionsWindow (): - global OptionsWindow +def CloseOptionsWindow (): + global GameOptionsWindow, OptionsWindow, PortraitWindow + global OldPortraitWindow, OldOptionsWindow - GemRB.HideGUI() + if GameOptionsWindow == None: + return - if OptionsWindow: - if VideoOptionsWindow: OpenVideoOptionsWindow () - if AudioOptionsWindow: OpenAudioOptionsWindow () - if GameplayOptionsWindow: OpenGameplayOptionsWindow () - if FeedbackOptionsWindow: OpenFeedbackOptionsWindow () - if AutopauseOptionsWindow: OpenAutopauseOptionsWindow () - if LoadMsgWindow: OpenLoadMsgWindow () - if SaveMsgWindow: OpenSaveMsgWindow () - if QuitMsgWindow: OpenQuitMsgWindow () - if KeysWindow: OpenKeysWindow () - if MoviesWindow: OpenMoviesWindow () + GemRB.UnloadWindow (GameOptionsWindow) + GemRB.UnloadWindow (OptionsWindow) + GemRB.UnloadWindow (PortraitWindow) - GemRB.UnloadWindow (OptionsWindow) - OptionsWindow = None - GemRB.SetVar ("OtherWindow", -1) + GameOptionsWindow = None + GemRB.SetVar ("OtherWindow", -1) + GemRB.SetVisible (0,1) + GemRB.UnhideGUI () + GUICommonWindows.OptionsWindow = OldOptionsWindow + OldOptionsWindow = None + GUICommonWindows.PortraitWindow = OldPortraitWindow + OldPortraitWindow = None + return - GemRB.UnhideGUI () +################################################### +def OpenOptionsWindow (): + global GameOptionsWindow, OptionsWindow, PortraitWindow + global OldPortraitWindow, OldOptionsWindow + + if CloseOtherWindow (OpenOptionsWindow): + CloseOptionsWindow () return - GemRB.LoadWindowPack("GUIOPT", 800, 600) - OptionsWindow = GemRB.LoadWindow(2) - GemRB.SetVar ("OtherWindow", OptionsWindow) - - VersionLabel = GemRB.GetControl(OptionsWindow, 0x1000000B) - GemRB.SetText(OptionsWindow, VersionLabel, GEMRB_VERSION) - - LoadButton = GemRB.GetControl(OptionsWindow, 5) - SaveButton = GemRB.GetControl(OptionsWindow, 6) - QuitButton = GemRB.GetControl(OptionsWindow, 10) - GraphicsButton = GemRB.GetControl(OptionsWindow, 7) - SoundButton = GemRB.GetControl(OptionsWindow, 8) - GamePlayButton = GemRB.GetControl(OptionsWindow, 9) - MoviesButton = GemRB.GetControl(OptionsWindow, 14) - KeyboardButton = GemRB.GetControl(OptionsWindow, 13) - ReturnButton = GemRB.GetControl(OptionsWindow, 11) - - GemRB.SetText(OptionsWindow, LoadButton, 13729) - GemRB.SetEvent(OptionsWindow, LoadButton, IE_GUI_BUTTON_ON_PRESS, "OpenLoadMsgWindow") - GemRB.SetText(OptionsWindow, SaveButton, 13730) - GemRB.SetEvent(OptionsWindow, SaveButton, IE_GUI_BUTTON_ON_PRESS, "SaveGamePress") - GemRB.SetText(OptionsWindow, QuitButton, 13731) - GemRB.SetEvent(OptionsWindow, QuitButton, IE_GUI_BUTTON_ON_PRESS, "OpenQuitMsgWindow") - GemRB.SetText(OptionsWindow, GraphicsButton, 17162) - GemRB.SetEvent(OptionsWindow, GraphicsButton, IE_GUI_BUTTON_ON_PRESS, "GraphicsPress") - GemRB.SetText(OptionsWindow, SoundButton, 17164) - GemRB.SetEvent(OptionsWindow, SoundButton, IE_GUI_BUTTON_ON_PRESS, "SoundPress") - GemRB.SetText(OptionsWindow, GamePlayButton, 17165) - GemRB.SetEvent(OptionsWindow, GamePlayButton, IE_GUI_BUTTON_ON_PRESS, "GamePlayPress") - GemRB.SetText(OptionsWindow, MoviesButton, 15415) - GemRB.SetEvent(OptionsWindow, MoviesButton, IE_GUI_BUTTON_ON_PRESS, "MoviePress") - GemRB.SetText(OptionsWindow, KeyboardButton, 33468) + GemRB.HideGUI () + GemRB.SetVisible (0,0) - GemRB.SetText(OptionsWindow, ReturnButton, 10308) - GemRB.SetEvent(OptionsWindow, ReturnButton, IE_GUI_BUTTON_ON_PRESS, "OpenOptionsWindow") - - GemRB.UnhideGUI () + GemRB.LoadWindowPack ("GUIOPT", 800, 600) + GameOptionsWindow = Window = GemRB.LoadWindow (2) + GemRB.SetVar ("OtherWindow", GameOptionsWindow) + #saving the original portrait window + OldPortraitWindow = GUICommonWindows.PortraitWindow + PortraitWindow = OpenPortraitWindow () + OldOptionsWindow = GUICommonWindows.OptionsWindow + OptionsWindow = GemRB.LoadWindow (0) + SetupMenuWindowControls (OptionsWindow, 0, "OpenOptionsWindow") + GemRB.SetWindowFrame (Window) + + LoadButton = GemRB.GetControl (Window, 5) + SaveButton = GemRB.GetControl (Window, 6) + QuitButton = GemRB.GetControl (Window, 10) + GraphicsButton = GemRB.GetControl (Window, 7) + SoundButton = GemRB.GetControl (Window, 8) + GamePlayButton = GemRB.GetControl (Window, 9) + MoviesButton = GemRB.GetControl (Window, 14) + KeyboardButton = GemRB.GetControl (Window, 13) + ReturnButton = GemRB.GetControl (Window, 11) + + GemRB.SetText (Window, LoadButton, 13729) + GemRB.SetEvent (Window, LoadButton, IE_GUI_BUTTON_ON_PRESS, "OpenLoadMsgWindow") + GemRB.SetText (Window, SaveButton, 13730) + GemRB.SetEvent (Window, SaveButton, IE_GUI_BUTTON_ON_PRESS, "OpenSaveMsgWindow") + GemRB.SetText (Window, QuitButton, 13731) + GemRB.SetEvent (Window, QuitButton, IE_GUI_BUTTON_ON_PRESS, "OpenQuitMsgWindow") + GemRB.SetText (Window, GraphicsButton, 17162) + GemRB.SetEvent (Window, GraphicsButton, IE_GUI_BUTTON_ON_PRESS, "OpenVideoOptionsWindow") + GemRB.SetText (Window, SoundButton, 17164) + GemRB.SetEvent (Window, SoundButton, IE_GUI_BUTTON_ON_PRESS, "OpenAudioOptionsWindow") + GemRB.SetText (Window, GamePlayButton, 17165) + GemRB.SetEvent (Window, GamePlayButton, IE_GUI_BUTTON_ON_PRESS, "OpenGameplayOptionsWindow") + GemRB.SetText (Window, MoviesButton, 15415) + GemRB.SetEvent (Window, MoviesButton, IE_GUI_BUTTON_ON_PRESS, "OpenMovieWindow") + GemRB.SetText (Window, KeyboardButton, 33468) + GemRB.SetEvent (Window, KeyboardButton, IE_GUI_BUTTON_ON_PRESS, "OpenKeyboardWindow") + GemRB.SetText (Window, ReturnButton, 10308) + GemRB.SetEvent (Window, ReturnButton, IE_GUI_BUTTON_ON_PRESS, "OpenOptionsWindow") + + VersionLabel = GemRB.GetControl (Window, 0x1000000B) + GemRB.SetText (Window, VersionLabel, GEMRB_VERSION) + + GemRB.SetVisible (Window, 1) + GemRB.SetVisible (OptionsWindow, 1) + GemRB.SetVisible (PortraitWindow, 1) return -def LoadGamePress(): +def CloseVideoOptionsWindow (): OpenOptionsWindow () - GemRB.QuitGame () - GemRB.SetNextScript ("GUILOAD") + OpenOptionsWindow () + +def OpenVideoOptionsWindow (): + """Open video options window""" + global GameOptionsWindow, HelpTextArea + + if GameOptionsWindow: + GemRB.UnloadWindow (GameOptionsWindow) + GameOptionsWindow = None + + GameOptionsWindow = Window = GemRB.LoadWindow (6) + + HelpTextArea = OptHelpText ('VideoOptions', Window, 33, 18038) + + OptDone ('VideoOptions', Window, 21) + OptCancel ('VideoOptions', Window, 32) + + OptSlider ('Brightness', Window, 3, 'Brightness Correction', 4) + OptSlider ('Contrast', Window, 22, 'Gamma Correction', 1) + + OptRadio ('BPP', Window, 5, 37, 'BitsPerPixel', 16) + OptRadio ('BPP', Window, 6, 37, 'BitsPerPixel', 24) + OptRadio ('BPP', Window, 7, 37, 'BitsPerPixel', 32) + OptCheckbox ('FullScreen', Window, 9, 38, 'Full Screen', 1) + + OptCheckbox ('TransShadow', Window, 51, 50, 'Translucent Shadows', 1) + OptCheckbox ('SoftMirrBlt', Window, 40, 44, 'SoftMirrorBlt' ,1) + OptCheckbox ('SoftTransBlt', Window, 41, 46, 'SoftSrcKeyBlt' ,1) + OptCheckbox ('SoftStandBlt', Window, 42, 48, 'SoftBltFast' ,1) + + GemRB.ShowModal (GameOptionsWindow, MODAL_SHADOW_GRAY) return -def SaveGamePress(): +def DisplayHelpFullScreen (): + GemRB.SetText (GameOptionsWindow, HelpTextArea, 18000) + GemRB.SetFullScreen (GemRB.GetVar("Full Screen")) + +def DisplayHelpBPP (): + GemRB.SetText (GameOptionsWindow, HelpTextArea, 17205) + +def DisplayHelpBrightness (): + GemRB.SetText (GameOptionsWindow, HelpTextArea, 17203) + GemRB.SetGamma (GemRB.GetVar("Brightness Correction"),GemRB.GetVar("Gamma Correction")) + +def DisplayHelpContrast (): + GemRB.SetText (GameOptionsWindow, HelpTextArea, 17204) + GemRB.SetGamma (GemRB.GetVar("Brightness Correction"),GemRB.GetVar("Gamma Correction")) + +def DisplayHelpSoftMirrBlt (): + GemRB.SetText (GameOptionsWindow, HelpTextArea, 18004) + +def DisplayHelpSoftTransBlt (): + GemRB.SetText (GameOptionsWindow, HelpTextArea, 18006) + +def DisplayHelpSoftStandBlt (): + GemRB.SetText (GameOptionsWindow, HelpTextArea, 18007) + +def DisplayHelpTransShadow (): + GemRB.SetText (GameOptionsWindow, HelpTextArea, 20620) + + +################################################### + +def CloseAudioOptionsWindow (): OpenOptionsWindow () - GemRB.SetVar("QuitAfterSave",0) - OpenSaveWindow () - #save the game without quitting - return + OpenOptionsWindow () -def QuitGamePress(): +def OpenAudioOptionsWindow (): + """Open audio options window""" + global GameOptionsWindow, HelpTextArea + + if GameOptionsWindow: + GemRB.UnloadWindow (GameOptionsWindow) + GameOptionsWindow = None + + GameOptionsWindow = Window = GemRB.LoadWindow (7) + + HelpTextArea = OptHelpText ('AudioOptions', Window, 14, 18040) + + OptDone ('AudioOptions', Window, 24) + OptCancel ('AudioOptions', Window, 25) + OptButton ('CharacterSounds', Window, 13, 17778) + + OptSlider ('AmbientVolume', Window, 1, 'Volume Ambients', 10) + OptSlider ('SoundFXVolume', Window, 2, 'Volume SFX', 10) + OptSlider ('VoiceVolume', Window, 3, 'Volume Voices', 10) + OptSlider ('MusicVolume', Window, 4, 'Volume Music', 10) + OptSlider ('MovieVolume', Window, 22, 'Volume Movie', 10) + + OptCheckbox ('CreativeEAX', Window, 26, 28, 'Environmental Audio', 1) + GemRB.ShowModal (GameOptionsWindow, MODAL_SHADOW_GRAY) + + +def DisplayHelpAmbientVolume (): + GemRB.SetText (GameOptionsWindow, HelpTextArea, 18008) + GemRB.UpdateAmbientsVolume() + +def DisplayHelpSoundFXVolume (): + GemRB.SetText (GameOptionsWindow, HelpTextArea, 18009) + +def DisplayHelpVoiceVolume (): + GemRB.SetText (GameOptionsWindow, HelpTextArea, 18010) + +def DisplayHelpMusicVolume (): + GemRB.SetText (GameOptionsWindow, HelpTextArea, 18011) + GemRB.UpdateMusicVolume() + +def DisplayHelpMovieVolume (): + GemRB.SetText (GameOptionsWindow, HelpTextArea, 18012) + +def DisplayHelpCreativeEAX (): + GemRB.SetText (GameOptionsWindow, HelpTextArea, 18022) + + +################################################### + +def CloseGameplayOptionsWindow (): OpenOptionsWindow () - GemRB.QuitGame () - GemRB.SetNextScript ("Start") + OpenOptionsWindow () + +def OpenGameplayOptionsWindow (): + """Open gameplay options window""" + global GameOptionsWindow, HelpTextArea + + if GameOptionsWindow: + GemRB.UnloadWindow (GameOptionsWindow) + GameOptionsWindow = None + + #gameplayoptions + GameOptionsWindow = Window = GemRB.LoadWindow (8) + + + HelpTextArea = OptHelpText ('GameplayOptions', Window, 40, 18042) + + OptDone ('GameplayOptions', Window, 7) + OptCancel ('GameplayOptions', Window, 20) + + OptSlider ('TooltipDelay', Window, 1, 'Tooltips', TOOLTIP_DELAY_FACTOR) + OptSlider ('MouseScrollingSpeed', Window, 2, 'Mouse Scroll Speed', 5) + OptSlider ('KeyboardScrollingSpeed', Window, 3, 'Keyboard Scroll Speed', 5) + OptSlider ('Difficulty', Window, 12, 'Difficulty Level', 0) + + OptCheckbox ('DitherAlways', Window, 14, 25, 'Always Dither', 1) + OptCheckbox ('Gore', Window, 19, 27, 'Gore', 1) + OptCheckbox ('Infravision', Window, 42, 44, 'Infravision', 1) + OptCheckbox ('Weather', Window, 47, 46, 'Weather', 1) + OptCheckbox ('MaxHitpoints', Window, 50, 49, 'Maximum HP', 1) + + OptButton ('FeedbackOptions', Window, 5, 17163) + OptButton ('AutopauseOptions', Window, 6, 17166) + + GemRB.ShowModal (GameOptionsWindow, MODAL_SHADOW_GRAY) return -def GraphicsPress(): - global OptionsWindow - GemRB.UnloadWindow(OptionsWindow) - GemRB.SetNextScript("Graphics") +def DisplayHelpTooltipDelay (): + GemRB.SetText (GameOptionsWindow, HelpTextArea, 18017) + GemRB.SetTooltipDelay (GemRB.GetVar ("Tooltips") ) + +def DisplayHelpMouseScrollingSpeed (): + GemRB.SetText (GameOptionsWindow, HelpTextArea, 18018) + GemRB.SetMouseScrollSpeed (GemRB.GetVar ("Mouse Scroll Speed") ) + +def DisplayHelpKeyboardScrollingSpeed (): + GemRB.SetText (GameOptionsWindow, HelpTextArea, 18019) + +def DisplayHelpDifficulty (): + GemRB.SetText (GameOptionsWindow, HelpTextArea, 18020) + +def DisplayHelpDitherAlways (): + GemRB.SetText (GameOptionsWindow, HelpTextArea, 18021) + +def DisplayHelpGore (): + GemRB.SetText (GameOptionsWindow, HelpTextArea, 18023) + +def DisplayHelpInfravision (): + GemRB.SetText (GameOptionsWindow, HelpTextArea, 11797) + +def DisplayHelpWeather (): + GemRB.SetText (GameOptionsWindow, HelpTextArea, 20619) + +def DisplayHelpRestUntilHealed (): + GemRB.SetText (GameOptionsWindow, HelpTextArea, 2242) + +def DisplayMaxHitpoints (): + GemRB.SetText (GameOptionsWindow, HelpTextArea, 15136) + +################################################### + +def CloseFeedbackOptionsWindow (): + global GameOptionsWindow + + GemRB.UnloadWindow (GameOptionsWindow) + GameOptionsWindow = None + OpenGameplayOptionsWindow () + + +def OpenFeedbackOptionsWindow (): + """Open feedback options window""" + global GameOptionsWindow, HelpTextArea + + if GameOptionsWindow: + GemRB.UnloadWindow (GameOptionsWindow) + GameOptionsWindow = None + + #feedback + GameOptionsWindow = Window = GemRB.LoadWindow (9) + + HelpTextArea = OptHelpText ('FeedbackOptions', Window, 28, 18043) + + OptDone ('FeedbackOptions', Window, 26) + OptCancel ('FeedbackOptions', Window, 27) + + OptSlider ('MarkerFeedback', Window, 8, 'GUI Feedback Level', 1) + OptSlider ('LocatorFeedback', Window, 9, 'Locator Feedback Level', 1) + + OptCheckbox ('ToHitRolls', Window, 10, 32, 'Rolls', 1) + OptCheckbox ('CombatInfo', Window, 11, 33, 'Combat Info', 1) + OptCheckbox ('Actions', Window, 12, 34, 'Actions', 1) + OptCheckbox ('States', Window, 13, 35, 'State Changes', 1) + OptCheckbox ('Selection', Window, 14, 36, 'Selection Text', 1) + OptCheckbox ('Miscellaneous', Window, 15, 37, 'Miscellaneous Text', 1) + + GemRB.ShowModal (Window, MODAL_SHADOW_GRAY) return - -def SoundPress(): - global OptionsWindow - GemRB.UnloadWindow(OptionsWindow) - GemRB.SetNextScript("Sound") + +def DisplayHelpMarkerFeedback (): + GemRB.SetText (GameOptionsWindow, HelpTextArea, 18024) + +def DisplayHelpLocatorFeedback (): + GemRB.SetText (GameOptionsWindow, HelpTextArea, 18025) + +def DisplayHelpToHitRolls (): + GemRB.SetText (GameOptionsWindow, HelpTextArea, 18026) + +def DisplayHelpCombatInfo (): + GemRB.SetText (GameOptionsWindow, HelpTextArea, 18027) + +def DisplayHelpActions (): + GemRB.SetText (GameOptionsWindow, HelpTextArea, 18028) + +def DisplayHelpStates (): + GemRB.SetText (GameOptionsWindow, HelpTextArea, 18029) + +def DisplayHelpSelection (): + GemRB.SetText (GameOptionsWindow, HelpTextArea, 18030) + +def DisplayHelpMiscellaneous (): + GemRB.SetText (GameOptionsWindow, HelpTextArea, 18031) + + +################################################### + +def CloseAutopauseOptionsWindow (): + global GameOptionsWindow + + GemRB.UnloadWindow (GameOptionsWindow) + GameOptionsWindow = None + OpenGameplayOptionsWindow () return - -def GamePlayPress(): - global OptionsWindow - GemRB.UnloadWindow(OptionsWindow) - GemRB.SetNextScript("GamePlay") + +def OpenAutopauseOptionsWindow (): + """Open autopause options window""" + global GameOptionsWindow, HelpTextArea + + if GameOptionsWindow: + GemRB.UnloadWindow (GameOptionsWindow) + GameOptionsWindow = None + + GameOptionsWindow = Window = GemRB.LoadWindow (10) + + HelpTextArea = OptHelpText ('AutopauseOptions', Window, 15, 18044) + + OptDone ('AutopauseOptions', Window, 11) + OptCancel ('AutopauseOptions', Window, 14) + + OptCheckbox ('CharacterHit', Window, 1, 17, 'Auto Pause State', 1) + OptCheckbox ('CharacterInjured', Window, 2, 18, 'Auto Pause State', 2) + OptCheckbox ('CharacterDead', Window, 3, 19, 'Auto Pause State', 4) + OptCheckbox ('CharacterAttacked', Window, 4, 20, 'Auto Pause State', 8) + OptCheckbox ('WeaponUnusable', Window, 5, 21, 'Auto Pause State', 16) + OptCheckbox ('TargetGone', Window, 13, 22, 'Auto Pause State', 32) + OptCheckbox ('EndOfRound', Window, 25, 24, 'Auto Pause State', 64) + OptCheckbox ('EnemySighted', Window, 26, 27, 'Auto Pause State', 128) + OptCheckbox ('SpellCast', Window, 34, 30, 'Auto Pause State', 256) + OptCheckbox ('TrapFound', Window, 31, 33, 'Auto Pause State', 512) + OptCheckbox ('CenterOnActor', Window, 31, 33, 'Auto Pause Center', 1) + + GemRB.ShowModal (Window, MODAL_SHADOW_GRAY) return -def MoviePress(): - global OptionsWindow - GemRB.UnloadWindow(OptionsWindow) - GemRB.SetNextScript("Movies") +def DisplayHelpCharacterHit (): + GemRB.SetText (GameOptionsWindow, HelpTextArea, 18032) + +def DisplayHelpCharacterInjured (): + GemRB.SetText (GameOptionsWindow, HelpTextArea, 18033) + +def DisplayHelpCharacterDead (): + GemRB.SetText (GameOptionsWindow, HelpTextArea, 18034) + +def DisplayHelpCharacterAttacked (): + GemRB.SetText (GameOptionsWindow, HelpTextArea, 18035) + +def DisplayHelpWeaponUnusable (): + GemRB.SetText (GameOptionsWindow, HelpTextArea, 18036) + +def DisplayHelpTargetGone (): + GemRB.SetText (GameOptionsWindow, HelpTextArea, 18037) + +def DisplayHelpEndOfRound (): + GemRB.SetText (GameOptionsWindow, HelpTextArea, 10640) + +def DisplayHelpEnemySighted (): + GemRB.SetText (GameOptionsWindow, HelpTextArea, 23514) + +def DisplayHelpSpellCast (): + GemRB.SetText (GameOptionsWindow, HelpTextArea, 58171) + +def DisplayHelpTrapFound (): + GemRB.SetText (GameOptionsWindow, HelpTextArea, 31872) + +def DisplayHelpCenterOnActor (): + GemRB.SetText (GameOptionsWindow, HelpTextArea, 10571) + +################################################### + +def CloseCharacterSoundsWindow (): + global GameOptionsWindow + + GemRB.UnloadWindow (GameOptionsWindow) + GameOptionsWindow = None + OpenGameplayOptionsWindow () return +def OpenCharacterSoundsWindow (): + """Open character sounds window""" + global GameOptionsWindow, HelpTextArea + + if GameOptionsWindow: + GemRB.UnloadWindow (GameOptionsWindow) + GameOptionsWindow = None + + GameOptionsWindow = Window = GemRB.LoadWindow (12) + + HelpTextArea = OptHelpText ('CharacterSounds', Window, 16, 18041) + + OptDone ('CharacterSounds', Window, 24) + OptCancel ('CharacterSounds', Window, 25) + + OptCheckbox ('Subtitles', Window, 5, 20, 'Subtitles', 1) + OptCheckbox ('AttackSounds', Window, 6, 18, 'Attack Sounds', 1) + OptCheckbox ('Footsteps', Window, 7, 19, 'Footsteps', 1) + OptRadio ('CommandSounds', Window, 8, 21, 'Command Sounds Frequency', 1) + OptRadio ('CommandSounds', Window, 9, 21, 'Command Sounds Frequency', 2) + OptRadio ('CommandSounds', Window, 10, 21, 'Command Sounds Frequency', 3) + OptRadio ('SelectionSounds', Window, 58, 57, 'Selection Sounds Frequency', 1) + OptRadio ('SelectionSounds', Window, 59, 57, 'Selection Sounds Frequency', 2) + OptRadio ('SelectionSounds', Window, 60, 57, 'Selection Sounds Frequency', 3) + + GemRB.ShowModal (Window, MODAL_SHADOW_GRAY) + +def DisplayHelpSubtitles (): + GemRB.SetText (GameOptionsWindow, HelpTextArea, 18015) + +def DisplayHelpAttackSounds (): + GemRB.SetText (GameOptionsWindow, HelpTextArea, 18013) + +def DisplayHelpFootsteps (): + GemRB.SetText (GameOptionsWindow, HelpTextArea, 18014) + +def DisplayHelpCommandSounds (): + GemRB.SetText (GameOptionsWindow, HelpTextArea, 18016) + +def DisplayHelpSelectionSounds (): + GemRB.SetText (GameOptionsWindow, HelpTextArea, 11352) + +################################################### + +def CloseMovieWindow (): + GemRB.UnloadWindow (MovieWindow) + return + +def MoviePlayPress(): + s = GemRB.GetVar("MovieIndex") + for i in range(0, GemRB.GetTableRowCount(MoviesTable) ): + t = GemRB.GetTableRowName(MoviesTable, i) + if GemRB.GetVar(t)==1: + if s==0: + s = GemRB.GetTableRowName(MoviesTable, i) + GemRB.PlayMovie(s, 1) + GemRB.InvalidateWindow(MovieWindow) + return + s = s - 1 + return + +def MovieCreditsPress(): + GemRB.PlayMovie("CREDITS") + GemRB.InvalidateWindow(MovieWindow) + return + +def OpenMovieWindow (): + global MovieWindow, TextAreaControl, MoviesTable + + GemRB.LoadWindowPack("GUIMOVIE", 800, 600) + MovieWindow = Window = GemRB.LoadWindow(2) + GemRB.SetWindowFrame (Window) + #reloading the guiopt windowpack + GemRB.LoadWindowPack ("GUIOPT", 800, 600) + TextAreaControl = GemRB.GetControl(Window, 0) + GemRB.SetTextAreaFlags(Window, TextAreaControl,IE_GUI_TEXTAREA_SELECTABLE) + PlayButton = GemRB.GetControl(Window, 2) + CreditsButton = GemRB.GetControl(Window, 3) + DoneButton = GemRB.GetControl(Window, 4) + MoviesTable = GemRB.LoadTable("MOVIDESC") + for i in range(0, GemRB.GetTableRowCount(MoviesTable) ): + t = GemRB.GetTableRowName(MoviesTable, i) + if GemRB.GetVar(t)==1: + s = GemRB.GetTableValue(MoviesTable, i, 0) + GemRB.TextAreaAppend(Window, TextAreaControl, s,-1) + GemRB.SetVarAssoc(Window, TextAreaControl, "MovieIndex",0) + GemRB.SetText(Window, PlayButton, 17318) + GemRB.SetText(Window, CreditsButton, 15591) + GemRB.SetText(Window, DoneButton, 11973) + GemRB.SetEvent(Window, PlayButton, IE_GUI_BUTTON_ON_PRESS, "MoviePlayPress") + GemRB.SetEvent(Window, CreditsButton, IE_GUI_BUTTON_ON_PRESS, "MovieCreditsPress") + GemRB.SetEvent(Window, DoneButton, IE_GUI_BUTTON_ON_PRESS, "CloseMovieWindow") + GemRB.ShowModal (Window, MODAL_SHADOW_GRAY) + return + +################################################### + +def OpenSaveMsgWindow (): + GemRB.SetVar("QuitAfterSave",0) + OpenSaveWindow () + #save the game without quitting + return + +################################################### + def OpenLoadMsgWindow (): global LoadMsgWindow - GemRB.HideGUI() - if LoadMsgWindow: - GemRB.UnloadWindow (LoadMsgWindow) - LoadMsgWindow = None - GemRB.SetVar ("FloatWindow", -1) - - GemRB.UnhideGUI () return LoadMsgWindow = Window = GemRB.LoadWindow (4) - GemRB.SetVar ("FloatWindow", LoadMsgWindow) # Load Button = GemRB.GetControl (Window, 0) @@ -170,33 +584,66 @@ # Cancel Button = GemRB.GetControl (Window, 1) GemRB.SetText (Window, Button, 13727) - GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenLoadMsgWindow") + GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "CloseLoadMsgWindow") # Loading a game will destroy ... Text = GemRB.GetControl (Window, 3) GemRB.SetText (Window, Text, 19531) - GemRB.UnhideGUI () GemRB.ShowModal (Window, MODAL_SHADOW_GRAY) return +def CloseLoadMsgWindow (): + global LoadMsgWindow + + GemRB.UnloadWindow (LoadMsgWindow) + LoadMsgWindow = None + GemRB.SetVisible (GameOptionsWindow, 1) + GemRB.SetVisible (OptionsWindow, 1) + GemRB.SetVisible (PortraitWindow, 1) + return + +def LoadGamePress (): + global LoadMsgWindow + + GemRB.UnloadWindow (LoadMsgWindow) + LoadMsgWindow = None + GemRB.QuitGame () + OpenOptionsWindow() + GemRB.SetNextScript ("GUILOAD") + return + +#save game AND quit +def SaveGamePress (): + global QuitMsgWindow + + GemRB.UnloadWindow (QuitMsgWindow) + QuitMsgWindow = None + #we need to set a state: quit after save + GemRB.SetVar("QuitAfterSave",1) + OpenOptionsWindow() + OpenSaveWindow () + return + +def QuitGamePress (): + global QuitMsgWindow + + GemRB.UnloadWindow (QuitMsgWindow) + QuitMsgWindow = None + GemRB.QuitGame () + OpenOptionsWindow() + GemRB.SetNextScript ("Start") + return + +################################################### + def OpenQuitMsgWindow (): global QuitMsgWindow - GemRB.HideGUI() - if QuitMsgWindow: - GemRB.UnloadWindow (QuitMsgWindow) - QuitMsgWindow = None - GemRB.SetVar ("FloatWindow", -1) - GemRB.SetVisible (GemRB.GetVar ("OtherWindow"), 1) - - GemRB.UnhideGUI () return QuitMsgWindow = Window = GemRB.LoadWindow (5) - GemRB.SetVar ("FloatWindow", QuitMsgWindow) - GemRB.SetVisible (GemRB.GetVar ("OtherWindow"), 0) # Save Button = GemRB.GetControl (Window, 0) @@ -211,12 +658,94 @@ # Cancel Button = GemRB.GetControl (Window, 2) GemRB.SetText (Window, Button, 13727) - GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "OpenQuitMsgWindow") + GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "CloseQuitMsgWindow") # The game has not been saved .... Text = GemRB.GetControl (Window, 3) GemRB.SetText (Window, Text, 16456) - GemRB.UnhideGUI () GemRB.ShowModal (Window, MODAL_SHADOW_GRAY) return + +def CloseQuitMsgWindow (): + global QuitMsgWindow + + GemRB.UnloadWindow (QuitMsgWindow) + QuitMsgWindow = None + GemRB.SetVisible (GameOptionsWindow, 1) + GemRB.SetVisible (OptionsWindow, 1) + GemRB.SetVisible (PortraitWindow, 1) + return + +################################################### +################################################### + +# These functions help to setup controls found +# in Video, Audio, Gameplay, Feedback and Autopause +# options windows + +# These controls are usually made from an active +# control (button, slider ...) and a label + + +def OptSlider (name, window, slider_id, variable, value): + """Standard slider for option windows""" + slider = GemRB.GetControl (window, slider_id) + GemRB.SetVarAssoc (window, slider, variable, value) + GemRB.SetEvent (window, slider, IE_GUI_SLIDER_ON_CHANGE, "DisplayHelp" + name) + return slider + +def OptRadio (name, window, button_id, label_id, variable, value): + """Standard radio button for option windows""" + + button = GemRB.GetControl (window, button_id) + GemRB.SetButtonFlags (window, button, IE_GUI_BUTTON_RADIOBUTTON, OP_OR) + GemRB.SetEvent (window, button, IE_GUI_BUTTON_ON_PRESS, "DisplayHelp" + name) + GemRB.SetVarAssoc (window, button, variable, value) + + label = GemRB.GetControl (window, label_id) + GemRB.SetButtonFlags (window, label, IE_GUI_BUTTON_NO_IMAGE, OP_SET) + GemRB.SetButtonState (window, label, IE_GUI_BUTTON_LOCKED) + + return button + +def OptCheckbox (name, window, button_id, label_id, variable, value): + """Standard checkbox for option windows""" + + button = GemRB.GetControl (window, button_id) + GemRB.SetButtonFlags (window, button, IE_GUI_BUTTON_CHECKBOX, OP_OR) + GemRB.SetEvent (window, button, IE_GUI_BUTTON_ON_PRESS, "DisplayHelp" + name) + GemRB.SetVarAssoc (window, button, variable, value) + + label = GemRB.GetControl (window, label_id) + GemRB.SetButtonFlags (window, label, IE_GUI_BUTTON_NO_IMAGE, OP_SET) + GemRB.SetButtonState (window, label, IE_GUI_BUTTON_LOCKED) + + return button + +def OptButton (name, window, button_id, label_strref): + """Standard subwindow button for option windows""" + button = GemRB.GetControl (window, button_id) + GemRB.SetEvent (window, button, IE_GUI_BUTTON_ON_PRESS, "Open%sWindow" %name) + GemRB.SetText (window, button, label_strref) + +def OptDone (name, window, button_id): + """Standard `Done' button for option windows""" + button = GemRB.GetControl (window, button_id) + GemRB.SetText (window, button, 11973) # Done + GemRB.SetEvent (window, button, IE_GUI_BUTTON_ON_PRESS, "Close%sWindow" %name) + +def OptCancel (name, window, button_id): + """Standard `Cancel' button for option windows""" + button = GemRB.GetControl (window, button_id) + GemRB.SetText (window, button, 13727) # Cancel + GemRB.SetEvent (window, button, IE_GUI_BUTTON_ON_PRESS, "Close%sWindow" %name) + +def OptHelpText (name, window, text_id, text_strref): + """Standard textarea with context help for option windows""" + text = GemRB.GetControl (window, text_id) + GemRB.SetText (window, text, text_strref) + return text + +################################################### +# End of file GUIOPT.py Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/GUIREC.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/GUIREC.py 2008-10-05 14:52:00 UTC (rev 5397) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/GUIREC.py 2008-10-05 15:24:55 UTC (rev 5398) @@ -75,7 +75,6 @@ OldPortraitWindow = GUICommonWindows.PortraitWindow PortraitWindow = OpenPortraitWindow () OldOptionsWindow = GUICommonWindows.OptionsWindow - OptionsWindow = GUICommonWindows.OptionsWindow OptionsWindow = GemRB.LoadWindow (0) SetupMenuWindowControls (OptionsWindow, 0, "OpenRecordsWindow") GemRB.SetWindowFrame (Window) Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/GUISAVE.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/GUISAVE.py 2008-10-05 14:52:00 UTC (rev 5397) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/GUISAVE.py 2008-10-05 15:24:55 UTC (rev 5398) @@ -127,7 +127,6 @@ StartLoadScreen() GemRB.SaveGame(Pos, Slotname, 22) #saves a game with version 2.2 GemRB.UnloadWindow (ConfirmWindow) - #CloseSaveWindow () GemRB.SetVisible (SaveWindow,1) return Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/GUISPL.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/GUISPL.py 2008-10-05 14:52:00 UTC (rev 5397) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/GUISPL.py 2008-10-05 15:24:55 UTC (rev 5398) @@ -69,7 +69,6 @@ OldPortraitWindow = GUICommonWindows.PortraitWindow PortraitWindow = OpenPortraitWindow () OldOptionsWindow = GUICommonWindows.OptionsWindow - OptionsWindow = GUICommonWindows.OptionsWindow OptionsWindow = GemRB.LoadWindow (0) SetupMenuWindowControls (OptionsWindow, 0, "OpenSpellBookWindow") GemRB.SetWindowFrame (Window) Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/Options.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/Options.py 2008-10-05 14:52:00 UTC (rev 5397) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/Options.py 2008-10-05 15:24:55 UTC (rev 5398) @@ -43,6 +43,7 @@ GemRB.SetText(OptionsWindow, MoviesButton, 15415) GemRB.SetEvent(OptionsWindow, MoviesButton, IE_GUI_BUTTON_ON_PRESS, "MoviePress") GemRB.SetText(OptionsWindow, KeyboardButton, 33468) + GemRB.SetEvent(OptionsWindow, MoviesButton, IE_GUI_BUTTON_ON_PRESS, "KeyboardPress") GemRB.SetText(OptionsWindow, ReturnButton, 10308) GemRB.SetEvent(OptionsWindow, ReturnButton, IE_GUI_BUTTON_ON_PRESS, "ReturnPress") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ave...@us...> - 2008-10-14 21:44:38
|
Revision: 5444 http://gemrb.svn.sourceforge.net/gemrb/?rev=5444&view=rev Author: avenger_teambg Date: 2008-10-14 21:44:31 +0000 (Tue, 14 Oct 2008) Log Message: ----------- enabled repeated clicks for skill/feat/ability screens Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/iwd2/Abilities.py gemrb/trunk/gemrb/GUIScripts/iwd2/Feats.py gemrb/trunk/gemrb/GUIScripts/iwd2/Skills.py Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/Abilities.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/Abilities.py 2008-10-14 21:05:22 UTC (rev 5443) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/Abilities.py 2008-10-14 21:44:31 UTC (rev 5444) @@ -83,6 +83,8 @@ global AbilityTable global KitIndex, Minimum, Maximum + #enable repeated clicks + GemRB.SetRepeatClickFlags(GEM_RK_DISABLE, OP_NAND) Kit = GemRB.GetVar("Class Kit") ClassTable = GemRB.LoadTable("classes") Class = GemRB.GetVar("Class")-1 @@ -209,6 +211,8 @@ return def BackPress(): + #disable repeated clicks + GemRB.SetRepeatClickFlags(GEM_RK_DISABLE, OP_NAND) GemRB.UnloadWindow(AbilityWindow) GemRB.SetNextScript("CharGen5") for i in range(0,6): Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/Feats.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/Feats.py 2008-10-14 21:05:22 UTC (rev 5443) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/Feats.py 2008-10-14 21:44:31 UTC (rev 5444) @@ -306,6 +306,7 @@ return def NextPress(): + GemRB.SetRepeatClickFlags(GEM_RK_DISABLE, OP_OR) GemRB.UnloadWindow(FeatWindow) GemRB.SetNextScript("CharGen7") return Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/Skills.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/Skills.py 2008-10-14 21:05:22 UTC (rev 5443) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/Skills.py 2008-10-14 21:44:31 UTC (rev 5444) @@ -81,6 +81,8 @@ global SkillTable, CostTable, PointsLeft global KitName, Level, ClassColumn + #enable repeated clicks + GemRB.SetRepeatClickFlags(GEM_RK_DISABLE, OP_NAND) GemRB.SetVar("Level",1) #for simplicity Class = GemRB.GetVar("Class") - 1 ClassTable = GemRB.LoadTable("classes") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ave...@us...> - 2008-10-16 20:45:32
|
Revision: 5456 http://gemrb.svn.sourceforge.net/gemrb/?rev=5456&view=rev Author: avenger_teambg Date: 2008-10-16 20:45:21 +0000 (Thu, 16 Oct 2008) Log Message: ----------- setting some base stats on the character sheet so feat requirements work better (this is just for testing the theory) Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/iwd2/Abilities.py gemrb/trunk/gemrb/GUIScripts/iwd2/CharGen3.py gemrb/trunk/gemrb/GUIScripts/iwd2/CharGen6.py gemrb/trunk/gemrb/GUIScripts/iwd2/CharOverview.py gemrb/trunk/gemrb/GUIScripts/iwd2/GUIMA.py gemrb/trunk/gemrb/GUIScripts/iwd2/Skills.py Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/Abilities.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/Abilities.py 2008-10-15 20:17:56 UTC (rev 5455) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/Abilities.py 2008-10-16 20:45:21 UTC (rev 5456) @@ -215,7 +215,7 @@ GemRB.SetRepeatClickFlags(GEM_RK_DISABLE, OP_NAND) GemRB.UnloadWindow(AbilityWindow) GemRB.SetNextScript("CharGen5") - for i in range(0,6): + for i in range(6): GemRB.SetVar("Ability "+str(i),0) #scrapping the abilities return Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/CharGen3.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/CharGen3.py 2008-10-15 20:17:56 UTC (rev 5455) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/CharGen3.py 2008-10-16 20:45:21 UTC (rev 5456) @@ -3,5 +3,10 @@ from CharOverview import * def OnLoad(): + MyChar = GemRB.GetVar("Slot") + GemRB.SetPlayerStat (MyChar, IE_SEX, GemRB.GetVar ("Gender") ) + GemRB.SetPlayerStat (MyChar, IE_RACE, GemRB.GetVar ("BaseRace") ) + race = GemRB.GetVar ("Race") + GemRB.SetPlayerStat (MyChar, IE_SUBRACE, race & 255 ) UpdateOverview(3) - return \ No newline at end of file + return Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/CharGen6.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/CharGen6.py 2008-10-15 20:17:56 UTC (rev 5455) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/CharGen6.py 2008-10-16 20:45:21 UTC (rev 5456) @@ -3,5 +3,13 @@ from CharOverview import * def OnLoad(): + #setting the stats so the feat code will work + MyChar = GemRB.GetVar("Slot") + GemRB.SetPlayerStat (MyChar, IE_STR, GemRB.GetVar ("Ability 1")) + GemRB.SetPlayerStat (MyChar, IE_DEX, GemRB.GetVar ("Ability 2")) + GemRB.SetPlayerStat (MyChar, IE_CON, GemRB.GetVar ("Ability 3")) + GemRB.SetPlayerStat (MyChar, IE_INT, GemRB.GetVar ("Ability 4")) + GemRB.SetPlayerStat (MyChar, IE_WIS, GemRB.GetVar ("Ability 5")) + GemRB.SetPlayerStat (MyChar, IE_CHR, GemRB.GetVar ("Ability 6")) UpdateOverview(6) - return \ No newline at end of file + return Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/CharOverview.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/CharOverview.py 2008-10-15 20:17:56 UTC (rev 5455) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/CharOverview.py 2008-10-16 20:45:21 UTC (rev 5456) @@ -9,6 +9,7 @@ import GemRB from GUIDefines import * +from ie_stats import * CharGenWindow = 0 TextAreaControl = 0 Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/GUIMA.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/GUIMA.py 2008-10-15 20:17:56 UTC (rev 5455) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/GUIMA.py 2008-10-16 20:45:21 UTC (rev 5456) @@ -207,14 +207,14 @@ def QueryText (): Data = "" row = 0 - while 1: - GemRB.SetVar ("row", row) - GemRB.SetVarAssoc (NoteWindow, NoteLabel, "row", row) - line = GemRB.QueryText (NoteWindow, NoteLabel) - if len(line)<=0: - break - Data += line+"\n" - row += 1 + while 1: + GemRB.SetVar ("row", row) + GemRB.SetVarAssoc (NoteWindow, NoteLabel, "row", row) + line = GemRB.QueryText (NoteWindow, NoteLabel) + if len(line)<=0: + break + Data += line+"\n" + row += 1 return Data def SetMapNote (): Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/Skills.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/Skills.py 2008-10-15 20:17:56 UTC (rev 5455) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/Skills.py 2008-10-16 20:45:21 UTC (rev 5456) @@ -22,7 +22,7 @@ GemRB.SetLabelTextColor(SkillWindow,SumLabel, 255, 255, 0) GemRB.SetText(SkillWindow, SumLabel, str(PointsLeft) ) - for i in range(0,10): + for i in range(10): Pos=TopIndex+i Cost = GemRB.GetTableValue(CostTable, Pos, ClassColumn) # Skill cost is currently restricted to base classes. This means it is fairly easy @@ -130,7 +130,7 @@ for i in range(0,RowCount): GemRB.SetVar("Skill "+str(i),0) # Racial/Class bonuses don't factor in char-gen or leveling - # so can be safely ignored + # so can be safely ignored GemRB.SetToken("number",str(PointsLeft) ) @@ -217,13 +217,26 @@ return def BackPress(): + MyChar = GemRB.GetVar("Slot") + TmpTable = GemRB.LoadTable ("skillsta") + for i in range(GemRB.GetTableRowCount(TmpTable)): + GemRB.SetVar("Skill "+str(i),0) + StatID=GemRB.GetTableValue (TmpTable, i, 2) + GemRB.SetPlayerStat (MyChar, StatID, 0) + GemRB.UnloadTable (TmpTable) GemRB.UnloadWindow(SkillWindow) - for i in range(GemRB.GetTableRowCount(SkillTable)): - GemRB.SetVar("Skill "+str(i),0) GemRB.SetNextScript("CharGen6") return def NextPress(): + MyChar = GemRB.GetVar("Slot") + #setting skills + TmpTable = GemRB.LoadTable ("skillsta") + SkillCount = GemRB.GetTableRowCount (TmpTable) + for i in range (SkillCount): + StatID=GemRB.GetTableValue (TmpTable, i, 2) + GemRB.SetPlayerStat (MyChar, StatID, GemRB.GetVar ("Skill "+str(i) ) ) + GemRB.UnloadTable (TmpTable) GemRB.UnloadWindow(SkillWindow) GemRB.SetNextScript("Feats") #feats return This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ave...@us...> - 2008-10-16 21:51:13
|
Revision: 5458 http://gemrb.svn.sourceforge.net/gemrb/?rev=5458&view=rev Author: avenger_teambg Date: 2008-10-16 21:51:08 +0000 (Thu, 16 Oct 2008) Log Message: ----------- fixed classlevel presets, so class dependent feats are working Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/iwd2/CharGen4.py gemrb/trunk/gemrb/GUIScripts/iwd2/Class.py gemrb/trunk/gemrb/GUIScripts/iwd2/Feats.py Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/CharGen4.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/CharGen4.py 2008-10-16 21:50:31 UTC (rev 5457) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/CharGen4.py 2008-10-16 21:51:08 UTC (rev 5458) @@ -2,6 +2,27 @@ import GemRB from CharOverview import * +#this is the same list as in GUIREC +#barbarian, bard, cleric, druid, fighter, monk, paladin, ranger, rogue, sorcerer, wizard +Classes = [IE_LEVELBARBARIAN, IE_LEVELBARD, IE_LEVELCLERIC, IE_LEVELDRUID, \ +IE_LEVEL, IE_LEVELMONK, IE_LEVELPALADIN, IE_LEVELRANGER, IE_LEVEL3, \ +IE_LEVELSORCEROR, IE_LEVEL2] + def OnLoad(): + MyChar = GemRB.GetVar ("Slot") + #base class + Class=GemRB.GetVar ("BaseClass") + GemRB.SetPlayerStat (MyChar, IE_CLASS, Class) + #kit + GemRB.SetPlayerStat (MyChar, IE_KIT, GemRB.GetVar ("Class") ) + + #works only for the first level character generation + #if this code ever needs to be more versatile, consider saving the + #class values somewhere + for i in range(len(Classes)): + GemRB.SetPlayerStat (MyChar, Classes[i], 0) + + GemRB.SetPlayerStat (MyChar, Classes[Class-1], 1) + print "Set class stat ",Classes[Class-1], " to 1" UpdateOverview(4) - return \ No newline at end of file + return Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/Class.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/Class.py 2008-10-16 21:50:31 UTC (rev 5457) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/Class.py 2008-10-16 21:51:08 UTC (rev 5458) @@ -154,6 +154,8 @@ GemRB.UnloadWindow(ClassWindow) GemRB.SetNextScript("CharGen3") GemRB.SetVar("Class",0) #scrapping the class value + MyChar = GemRB.GetVar("Slot") + GemRB.SetPlayerStat (IE_CLASS, 0) return def NextPress(): Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/Feats.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/Feats.py 2008-10-16 21:50:31 UTC (rev 5457) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/Feats.py 2008-10-16 21:51:08 UTC (rev 5458) @@ -53,6 +53,9 @@ c_op = GemRB.GetTableValue(FeatReqTable, feat, "C_OP") d_op = GemRB.GetTableValue(FeatReqTable, feat, "D_OP") slot = GemRB.GetVar("Slot") + + print "Stats:",a_stat, b_stat, c_stat, d_stat + print "Vals :",a_value, b_value, c_value, d_value return GemRB.CheckFeatCondition(slot, a_stat, a_value, b_stat, b_value, c_stat, c_value, d_stat, d_value, a_op, b_op, c_op, d_op) # checks if a feat was granted due to class/kit/race and returns the number @@ -313,13 +316,26 @@ return #Custom feat check functions -def Check_AnyOfThree(pl, a, ass, b, bs, c, cs, *garbage): +def Check_AnyOfThree(pl, ass, a, bs, b, cs, c, *garbage): + + print a,ass,b,bs,c,cs if GemRB.GetPlayerStat(pl, ass)==a: return True if GemRB.GetPlayerStat(pl, bs)==b: return True if GemRB.GetPlayerStat(pl, cs)==c: return True return False -def Check_AllOfThreeGE(pl, a, ass, b, bs, c, cs, *garbage): +#Custom feat check functions +def Check_AnyOfThreeGE(pl, ass, a, bs, b, cs, c, *garbage): + + print a,ass,b,bs,c,cs + if GemRB.GetPlayerStat(pl, ass)>=a: return True + if GemRB.GetPlayerStat(pl, bs)>=b: return True + if GemRB.GetPlayerStat(pl, cs)>=c: return True + return False + +def Check_AllOfThreeGE(pl, ass, a, bs, b, cs, c, *garbage): + + print a,ass,b,bs,c,cs if GemRB.GetPlayerStat(pl, ass) < a: return False if GemRB.GetPlayerStat(pl, bs) < b: return False if GemRB.GetPlayerStat(pl, cs) < c: return False This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wjp...@us...> - 2009-02-01 23:01:30
|
Revision: 5620 http://gemrb.svn.sourceforge.net/gemrb/?rev=5620&view=rev Author: wjpalenstijn Date: 2009-02-01 23:01:26 +0000 (Sun, 01 Feb 2009) Log Message: ----------- use classes in IWD2 GUIScripts Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/iwd2/Abilities.py gemrb/trunk/gemrb/GUIScripts/iwd2/Alignment.py gemrb/trunk/gemrb/GUIScripts/iwd2/Appearance.py gemrb/trunk/gemrb/GUIScripts/iwd2/AutoPause.py gemrb/trunk/gemrb/GUIScripts/iwd2/CSound.py gemrb/trunk/gemrb/GUIScripts/iwd2/CharGen9.py gemrb/trunk/gemrb/GUIScripts/iwd2/CharOverview.py gemrb/trunk/gemrb/GUIScripts/iwd2/CharSound.py gemrb/trunk/gemrb/GUIScripts/iwd2/Class.py gemrb/trunk/gemrb/GUIScripts/iwd2/Enemy.py gemrb/trunk/gemrb/GUIScripts/iwd2/Feats.py gemrb/trunk/gemrb/GUIScripts/iwd2/Feedback.py gemrb/trunk/gemrb/GUIScripts/iwd2/GUICommonWindows.py gemrb/trunk/gemrb/GUIScripts/iwd2/GUIINV.py gemrb/trunk/gemrb/GUIScripts/iwd2/GUIJRNL.py gemrb/trunk/gemrb/GUIScripts/iwd2/GUILOAD.py gemrb/trunk/gemrb/GUIScripts/iwd2/GUIMA.py gemrb/trunk/gemrb/GUIScripts/iwd2/GUIOPT.py gemrb/trunk/gemrb/GUIScripts/iwd2/GUIREC.py gemrb/trunk/gemrb/GUIScripts/iwd2/GUISAVE.py gemrb/trunk/gemrb/GUIScripts/iwd2/GUISPL.py gemrb/trunk/gemrb/GUIScripts/iwd2/GUISTORE.py gemrb/trunk/gemrb/GUIScripts/iwd2/GUIWORLD.py gemrb/trunk/gemrb/GUIScripts/iwd2/GamePlay.py gemrb/trunk/gemrb/GUIScripts/iwd2/Gender.py gemrb/trunk/gemrb/GUIScripts/iwd2/Graphics.py gemrb/trunk/gemrb/GUIScripts/iwd2/ImportFile.py gemrb/trunk/gemrb/GUIScripts/iwd2/LoadScreen.py gemrb/trunk/gemrb/GUIScripts/iwd2/MessageWindow.py gemrb/trunk/gemrb/GUIScripts/iwd2/Movies.py gemrb/trunk/gemrb/GUIScripts/iwd2/Name.py gemrb/trunk/gemrb/GUIScripts/iwd2/Options.py gemrb/trunk/gemrb/GUIScripts/iwd2/Portrait.py gemrb/trunk/gemrb/GUIScripts/iwd2/Race.py gemrb/trunk/gemrb/GUIScripts/iwd2/SPParty.py gemrb/trunk/gemrb/GUIScripts/iwd2/SPPartyFormation.py gemrb/trunk/gemrb/GUIScripts/iwd2/Skills.py gemrb/trunk/gemrb/GUIScripts/iwd2/Songs.py gemrb/trunk/gemrb/GUIScripts/iwd2/Sound.py gemrb/trunk/gemrb/GUIScripts/iwd2/Start.py gemrb/trunk/gemrb/GUIScripts/iwd2/SubRaces.py gemrb/trunk/gemrb/GUIScripts/iwd2/TextScreen.py Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/Abilities.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/Abilities.py 2009-02-01 22:59:13 UTC (rev 5619) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/Abilities.py 2009-02-01 23:01:26 UTC (rev 5620) @@ -14,32 +14,32 @@ def CalcLimits(Abidx): global Minimum, Maximum, Add - RaceTable = GemRB.LoadTable("races") - Abracead = GemRB.LoadTable("ABRACEAD") + RaceTable = GemRB.LoadTableObject("races") + Abracead = GemRB.LoadTableObject("ABRACEAD") RaceID = GemRB.GetVar("Race") - RowIndex = GemRB.FindTableValue(RaceTable, 3, RaceID) - RaceName = GemRB.GetTableRowName(RaceTable, RowIndex) + RowIndex = RaceTable.FindValue(3, RaceID) + RaceName = RaceTable.GetRowName(RowIndex) Minimum = 3 Maximum = 18 - Abclasrq = GemRB.LoadTable("ABCLASRQ") - tmp = GemRB.GetTableValue(Abclasrq, KitIndex, Abidx) + Abclasrq = GemRB.LoadTableObject("ABCLASRQ") + tmp = Abclasrq.GetValue(KitIndex, Abidx) if tmp!=0 and tmp>Minimum: Minimum = tmp - Abracerq = GemRB.LoadTable("ABRACERQ") - Race = GemRB.GetTableRowIndex(Abracerq, RaceName) - tmp = GemRB.GetTableValue(Abracerq, Race, Abidx*2) + Abracerq = GemRB.LoadTableObject("ABRACERQ") + Race = Abracerq.GetRowIndex(RaceName) + tmp = Abracerq.GetValue(Race, Abidx*2) if tmp!=0 and tmp>Minimum: Minimum = tmp - tmp = GemRB.GetTableValue(Abracerq, Race, Abidx*2+1) + tmp = Abracerq.GetValue(Race, Abidx*2+1) if tmp!=0 and tmp>Maximum: Maximum = tmp - Race = GemRB.GetTableRowIndex(Abracead, RaceName) - Add = GemRB.GetTableValue(Abracead, Race, Abidx) + Race = Abracead.GetRowIndex(RaceName) + Add = Abracead.GetValue(Race, Abidx) Maximum = Maximum + Add Minimum = Minimum + Add if Minimum<1: @@ -50,31 +50,31 @@ def RollPress(): global PointsLeft, Add - GemRB.InvalidateWindow(AbilityWindow) + AbilityWindow.Invalidate() GemRB.SetVar("Ability",0) - SumLabel = GemRB.GetControl(AbilityWindow, 0x10000002) - GemRB.SetLabelTextColor(AbilityWindow,SumLabel, 255, 255, 0) + SumLabel = AbilityWindow.GetControl(0x10000002) + SumLabel.SetTextColor(255, 255, 0) PointsLeft=16 - GemRB.SetLabelUseRGB(AbilityWindow, SumLabel, 1) - GemRB.SetText(AbilityWindow, SumLabel, str(PointsLeft)) + SumLabel.SetUseRGB(1) + SumLabel.SetText(str(PointsLeft)) for i in range(0,6): CalcLimits(i) v = 10+Add b = v//2-5 GemRB.SetVar("Ability "+str(i), v ) - Label = GemRB.GetControl(AbilityWindow, 0x10000003+i) - GemRB.SetText(AbilityWindow, Label, str(v) ) + Label = AbilityWindow.GetControl(0x10000003+i) + Label.SetText(str(v) ) - Label = GemRB.GetControl(AbilityWindow, 0x10000024+i) - GemRB.SetLabelUseRGB(AbilityWindow, Label, 1) + Label = AbilityWindow.GetControl(0x10000024+i) + Label.SetUseRGB(1) if b<0: - GemRB.SetLabelTextColor(AbilityWindow,Label,255,0,0) + Label.SetTextColor(255,0,0) elif b>0: - GemRB.SetLabelTextColor(AbilityWindow,Label,0,255,0) + Label.SetTextColor(0,255,0) else: - GemRB.SetLabelTextColor(AbilityWindow,Label,255,255,255) - GemRB.SetText(AbilityWindow, Label, "%+d"%(b)) + Label.SetTextColor(255,255,255) + Label.SetText("%+d"%(b)) return def OnLoad(): @@ -86,82 +86,82 @@ #enable repeated clicks GemRB.SetRepeatClickFlags(GEM_RK_DISABLE, OP_NAND) Kit = GemRB.GetVar("Class Kit") - ClassTable = GemRB.LoadTable("classes") + ClassTable = GemRB.LoadTableObject("classes") Class = GemRB.GetVar("Class")-1 if Kit == 0: - KitName = GemRB.GetTableRowName(ClassTable, Class) + KitName = ClassTable.GetRowName(Class) else: - KitList = GemRB.LoadTable("kitlist") + KitList = GemRB.LoadTableObject("kitlist") #rowname is just a number, first value row what we need here - KitName = GemRB.GetTableValue(KitList, Kit, 0) + KitName = KitList.GetValue(Kit, 0) - Abclasrq = GemRB.LoadTable("ABCLASRQ") - KitIndex = GemRB.GetTableRowIndex(Abclasrq, KitName) + Abclasrq = GemRB.LoadTableObject("ABCLASRQ") + KitIndex = Abclasrq.GetRowIndex(KitName) GemRB.LoadWindowPack("GUICG", 800 ,600) - AbilityTable = GemRB.LoadTable("ability") - AbilityWindow = GemRB.LoadWindow(4) + AbilityTable = GemRB.LoadTableObject("ability") + AbilityWindow = GemRB.LoadWindowObject(4) 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 = AbilityWindow.GetControl(i+30) + Button.SetEvent(IE_GUI_BUTTON_ON_PRESS, "JustPress") + Button.SetVarAssoc("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 = AbilityWindow.GetControl(i*2+16) + Button.SetEvent(IE_GUI_BUTTON_ON_PRESS, "LeftPress") + Button.SetVarAssoc("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 ) + Button = AbilityWindow.GetControl(i*2+17) + Button.SetEvent(IE_GUI_BUTTON_ON_PRESS, "RightPress") + Button.SetVarAssoc("Ability", i ) - BackButton = GemRB.GetControl(AbilityWindow,36) - GemRB.SetText(AbilityWindow,BackButton,15416) - DoneButton = GemRB.GetControl(AbilityWindow,0) - GemRB.SetText(AbilityWindow,DoneButton,36789) - GemRB.SetButtonState(AbilityWindow, DoneButton, IE_GUI_BUTTON_DISABLED) - GemRB.SetButtonFlags(AbilityWindow, DoneButton, IE_GUI_BUTTON_DEFAULT,OP_OR) + BackButton = AbilityWindow.GetControl(36) + BackButton.SetText(15416) + DoneButton = AbilityWindow.GetControl(0) + DoneButton.SetText(36789) + DoneButton.SetState(IE_GUI_BUTTON_DISABLED) + DoneButton.SetFlags(IE_GUI_BUTTON_DEFAULT,OP_OR) - TextAreaControl = GemRB.GetControl(AbilityWindow, 29) - GemRB.SetText(AbilityWindow,TextAreaControl,17247) + TextAreaControl = AbilityWindow.GetControl(29) + TextAreaControl.SetText(17247) - GemRB.SetEvent(AbilityWindow,DoneButton,IE_GUI_BUTTON_ON_PRESS,"NextPress") - GemRB.SetEvent(AbilityWindow,BackButton,IE_GUI_BUTTON_ON_PRESS,"BackPress") - GemRB.SetVisible(AbilityWindow,1) + DoneButton.SetEvent(IE_GUI_BUTTON_ON_PRESS,"NextPress") + BackButton.SetEvent(IE_GUI_BUTTON_ON_PRESS,"BackPress") + AbilityWindow.SetVisible(1) return def RightPress(): global PointsLeft - GemRB.InvalidateWindow(AbilityWindow) + AbilityWindow.Invalidate() Abidx = GemRB.GetVar("Ability") Ability = GemRB.GetVar("Ability "+str(Abidx) ) #should be more elaborate CalcLimits(Abidx) GemRB.SetToken("MINIMUM",str(Minimum) ) GemRB.SetToken("MAXIMUM",str(Maximum) ) - GemRB.SetText(AbilityWindow, TextAreaControl, GemRB.GetTableValue(AbilityTable, Abidx, 1) ) + TextAreaControl.SetText(AbilityTable.GetValue(Abidx, 1) ) if Ability<=Minimum: return Ability -= 1 GemRB.SetVar("Ability "+str(Abidx), Ability) PointsLeft = PointsLeft + 1 - SumLabel = GemRB.GetControl(AbilityWindow, 0x10000002) - GemRB.SetText(AbilityWindow, SumLabel, str(PointsLeft) ) - GemRB.SetLabelTextColor(AbilityWindow,SumLabel, 255, 255, 0) - Label = GemRB.GetControl(AbilityWindow, 0x10000003+Abidx) - GemRB.SetText(AbilityWindow, Label, str(Ability) ) - Label = GemRB.GetControl(AbilityWindow, 0x10000024+Abidx) + SumLabel = AbilityWindow.GetControl(0x10000002) + SumLabel.SetText(str(PointsLeft) ) + SumLabel.SetTextColor(255, 255, 0) + Label = AbilityWindow.GetControl(0x10000003+Abidx) + Label.SetText(str(Ability) ) + Label = AbilityWindow.GetControl(0x10000024+Abidx) b = Ability // 2 - 5 if b<0: - GemRB.SetLabelTextColor(AbilityWindow,Label,255,0,0) + Label.SetTextColor(255,0,0) elif b>0: - GemRB.SetLabelTextColor(AbilityWindow,Label,0,255,0) + Label.SetTextColor(0,255,0) else: - GemRB.SetLabelTextColor(AbilityWindow,Label,255,255,255) - GemRB.SetText(AbilityWindow, Label, "%+d"%(b)) - GemRB.SetButtonState(AbilityWindow, DoneButton, IE_GUI_BUTTON_DISABLED) + Label.SetTextColor(255,255,255) + Label.SetText("%+d"%(b)) + DoneButton.SetState(IE_GUI_BUTTON_DISABLED) return def JustPress(): @@ -171,19 +171,19 @@ CalcLimits(Abidx) GemRB.SetToken("MINIMUM",str(Minimum) ) GemRB.SetToken("MAXIMUM",str(Maximum) ) - GemRB.SetText(AbilityWindow, TextAreaControl, GemRB.GetTableValue(AbilityTable, Abidx, 1) ) + TextAreaControl.SetText(AbilityTable.GetValue(Abidx, 1) ) return def LeftPress(): global PointsLeft Abidx = GemRB.GetVar("Ability") - GemRB.InvalidateWindow(AbilityWindow) + AbilityWindow.Invalidate() CalcLimits(Abidx) GemRB.SetToken("MINIMUM",str(Minimum) ) GemRB.SetToken("MAXIMUM",str(Maximum) ) Ability = GemRB.GetVar("Ability "+str(Abidx) ) - GemRB.SetText(AbilityWindow, TextAreaControl, GemRB.GetTableValue(AbilityTable, Abidx, 1) ) + TextAreaControl.SetText(AbilityTable.GetValue(Abidx, 1) ) if PointsLeft == 0: return if Ability>=Maximum: #should be more elaborate @@ -191,35 +191,37 @@ Ability += 1 GemRB.SetVar("Ability "+str(Abidx), Ability) PointsLeft = PointsLeft - 1 - SumLabel = GemRB.GetControl(AbilityWindow, 0x10000002) + SumLabel = AbilityWindow.GetControl(0x10000002) if PointsLeft == 0: - GemRB.SetLabelTextColor(AbilityWindow,SumLabel, 255, 255, 255) - GemRB.SetText(AbilityWindow, SumLabel, str(PointsLeft) ) - Label = GemRB.GetControl(AbilityWindow, 0x10000003+Abidx) - GemRB.SetText(AbilityWindow, Label, str(Ability) ) - Label = GemRB.GetControl(AbilityWindow, 0x10000024+Abidx) + SumLabel.SetTextColor(255, 255, 255) + SumLabel.SetText(str(PointsLeft) ) + Label = AbilityWindow.GetControl(0x10000003+Abidx) + Label.SetText(str(Ability) ) + Label = AbilityWindow.GetControl(0x10000024+Abidx) b = Ability // 2 - 5 if b<0: - GemRB.SetLabelTextColor(AbilityWindow,Label,255,0,0) + Label.SetTextColor(255,0,0) elif b>0: - GemRB.SetLabelTextColor(AbilityWindow,Label,0,255,0) + Label.SetTextColor(0,255,0) else: - GemRB.SetLabelTextColor(AbilityWindow,Label,255,255,255) - GemRB.SetText(AbilityWindow, Label, "%+d"%(b)) + Label.SetTextColor(255,255,255) + Label.SetText("%+d"%(b)) if PointsLeft == 0: - GemRB.SetButtonState(AbilityWindow, DoneButton,IE_GUI_BUTTON_ENABLED) + DoneButton.SetState(IE_GUI_BUTTON_ENABLED) return def BackPress(): #disable repeated clicks GemRB.SetRepeatClickFlags(GEM_RK_DISABLE, OP_NAND) - GemRB.UnloadWindow(AbilityWindow) + if AbilityWindow: + AbilityWindow.Unload() GemRB.SetNextScript("CharGen5") for i in range(6): GemRB.SetVar("Ability "+str(i),0) #scrapping the abilities return def NextPress(): - GemRB.UnloadWindow(AbilityWindow) + if AbilityWindow: + AbilityWindow.Unload() GemRB.SetNextScript("CharGen6") #skills return Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/Alignment.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/Alignment.py 2009-02-01 22:59:13 UTC (rev 5619) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/Alignment.py 2009-02-01 23:01:26 UTC (rev 5620) @@ -10,56 +10,58 @@ global AlignmentWindow, TextAreaControl, DoneButton global AlignmentTable - ClassTable = GemRB.LoadTable("classes") + ClassTable = GemRB.LoadTableObject("classes") Class = GemRB.GetVar("Class")-1 - KitName = GemRB.GetTableRowName(ClassTable, Class) + KitName = ClassTable.GetRowName(Class) - AlignmentOk = GemRB.LoadTable("ALIGNMNT") + AlignmentOk = GemRB.LoadTableObject("ALIGNMNT") GemRB.LoadWindowPack("GUICG", 800, 600) - AlignmentTable = GemRB.LoadTable("aligns") - AlignmentWindow = GemRB.LoadWindow(3) + AlignmentTable = GemRB.LoadTableObject("aligns") + AlignmentWindow = GemRB.LoadWindowObject(3) for i in range(0,9): - Button = GemRB.GetControl(AlignmentWindow, i+2) - GemRB.SetButtonFlags(AlignmentWindow, Button, IE_GUI_BUTTON_RADIOBUTTON,OP_OR) - GemRB.SetButtonState(AlignmentWindow, Button, IE_GUI_BUTTON_DISABLED) - GemRB.SetText(AlignmentWindow, Button, GemRB.GetTableValue(AlignmentTable,i,0) ) + Button = AlignmentWindow.GetControl(i+2) + Button.SetFlags(IE_GUI_BUTTON_RADIOBUTTON,OP_OR) + Button.SetState(IE_GUI_BUTTON_DISABLED) + Button.SetText(AlignmentTable.GetValue(i,0) ) for i in range(0,9): - Button = GemRB.GetControl(AlignmentWindow, i+2) - if GemRB.GetTableValue(AlignmentOk, KitName, GemRB.GetTableValue(AlignmentTable, i, 4) ) != 0: - GemRB.SetButtonState(AlignmentWindow, Button, IE_GUI_BUTTON_ENABLED) - GemRB.SetEvent(AlignmentWindow, Button, IE_GUI_BUTTON_ON_PRESS, "AlignmentPress") - GemRB.SetVarAssoc(AlignmentWindow, Button, "Alignment", i+1) + Button = AlignmentWindow.GetControl(i+2) + if AlignmentOk.GetValue(KitName, AlignmentTable.GetValue(i, 4) ) != 0: + Button.SetState(IE_GUI_BUTTON_ENABLED) + Button.SetEvent(IE_GUI_BUTTON_ON_PRESS, "AlignmentPress") + Button.SetVarAssoc("Alignment", i+1) - BackButton = GemRB.GetControl(AlignmentWindow,13) - GemRB.SetText(AlignmentWindow,BackButton,15416) - DoneButton = GemRB.GetControl(AlignmentWindow,0) - GemRB.SetText(AlignmentWindow,DoneButton,36789) - GemRB.SetButtonFlags(AlignmentWindow, DoneButton, IE_GUI_BUTTON_DEFAULT,OP_OR) + BackButton = AlignmentWindow.GetControl(13) + BackButton.SetText(15416) + DoneButton = AlignmentWindow.GetControl(0) + DoneButton.SetText(36789) + DoneButton.SetFlags(IE_GUI_BUTTON_DEFAULT,OP_OR) - TextAreaControl = GemRB.GetControl(AlignmentWindow, 11) - GemRB.SetText(AlignmentWindow,TextAreaControl,9602) + TextAreaControl = AlignmentWindow.GetControl(11) + TextAreaControl.SetText(9602) - GemRB.SetEvent(AlignmentWindow,DoneButton,IE_GUI_BUTTON_ON_PRESS,"NextPress") - GemRB.SetEvent(AlignmentWindow,BackButton,IE_GUI_BUTTON_ON_PRESS,"BackPress") - GemRB.SetButtonState(AlignmentWindow,DoneButton,IE_GUI_BUTTON_DISABLED) - GemRB.SetVisible(AlignmentWindow,1) + DoneButton.SetEvent(IE_GUI_BUTTON_ON_PRESS,"NextPress") + BackButton.SetEvent(IE_GUI_BUTTON_ON_PRESS,"BackPress") + DoneButton.SetState(IE_GUI_BUTTON_DISABLED) + AlignmentWindow.SetVisible(1) return def AlignmentPress(): Alignment = GemRB.GetVar("Alignment")-1 - GemRB.SetText(AlignmentWindow, TextAreaControl, GemRB.GetTableValue(AlignmentTable,Alignment,1) ) - GemRB.SetButtonState(AlignmentWindow, DoneButton, IE_GUI_BUTTON_ENABLED) + TextAreaControl.SetText(AlignmentTable.GetValue(Alignment,1) ) + DoneButton.SetState(IE_GUI_BUTTON_ENABLED) return def BackPress(): - GemRB.UnloadWindow(AlignmentWindow) + if AlignmentWindow: + AlignmentWindow.Unload() GemRB.SetNextScript("CharGen4") GemRB.SetVar("Alignment",-1) #scrapping the alignment value return def NextPress(): - GemRB.UnloadWindow(AlignmentWindow) + if AlignmentWindow: + AlignmentWindow.Unload() GemRB.SetNextScript("CharGen5") #appearance return Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/Appearance.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/Appearance.py 2009-02-01 22:59:13 UTC (rev 5619) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/Appearance.py 2009-02-01 23:01:26 UTC (rev 5620) @@ -26,10 +26,9 @@ global ColorWindow, PDollButton global Color1, Color2, Color3, Color4, PDollResRef - GemRB.SetButtonFlags(ColorWindow, PDollButton, IE_GUI_BUTTON_ANIMATED,OP_OR) - GemRB.SetButtonPLT(ColorWindow, PDollButton, PDollResRef, \ - 0, Color4, Color3, Color2, 0, 0, Color1, 0) - GemRB.SetButtonBAM(ColorWindow, PDollButton, PDollResRef,10,0,0) + PDollButton.SetFlags(IE_GUI_BUTTON_ANIMATED,OP_OR) + PDollButton.SetPLT(PDollResRef, 0, Color4, Color3, Color2, 0, 0, Color1, 0) + PDollButton.SetBAM(PDollResRef,10,0,0) return def OnLoad(): @@ -39,77 +38,73 @@ global Color1, Color2, Color3, Color4, PDollResRef GemRB.LoadWindowPack("GUICG", 800, 600) - ColorWindow=GemRB.LoadWindow(13) + ColorWindow=GemRB.LoadWindowObject(13) - RaceTable = GemRB.LoadTable("races") - Race = GemRB.FindTableValue (RaceTable, 3, GemRB.GetVar ("Race") ) - HairTable = GemRB.LoadTable(GemRB.GetTableValue(RaceTable, Race, 5)) - SkinTable = GemRB.LoadTable(GemRB.GetTableValue(RaceTable, Race, 6)) - ColorTable = GemRB.LoadTable("clowncol") + RaceTable = GemRB.LoadTableObject("races") + Race = RaceTable.FindValue (3, GemRB.GetVar ("Race") ) + HairTable = GemRB.LoadTableObject(RaceTable.GetValue(Race, 5)) + SkinTable = GemRB.LoadTableObject(RaceTable.GetValue(Race, 6)) + ColorTable = GemRB.LoadTableObject("clowncol") #set these colors to some default - PortraitTable = GemRB.LoadTable("pictures") + PortraitTable = GemRB.LoadTableObject("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) - GemRB.SetButtonFlags(ColorWindow, PDollButton, IE_GUI_BUTTON_PICTURE,OP_OR) - GemRB.SetButtonState(ColorWindow, PDollButton, IE_GUI_BUTTON_LOCKED) + Color1=PortraitTable.GetValue(PortraitIndex,1) + Color2=PortraitTable.GetValue(PortraitIndex,2) + Color3=PortraitTable.GetValue(PortraitIndex,3) + Color4=PortraitTable.GetValue(PortraitIndex,4) + PDollButton = ColorWindow.GetControl(1) + PDollButton.SetFlags(IE_GUI_BUTTON_PICTURE,OP_OR) + PDollButton.SetState(IE_GUI_BUTTON_LOCKED) - HairButton = GemRB.GetControl(ColorWindow, 2) - 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) + HairButton = ColorWindow.GetControl(2) + HairButton.SetFlags(IE_GUI_BUTTON_PICTURE,OP_OR) + HairButton.SetEvent(IE_GUI_BUTTON_ON_PRESS,"HairPress") + HairButton.SetBAM("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) + SkinButton = ColorWindow.GetControl(3) + SkinButton.SetFlags(IE_GUI_BUTTON_PICTURE,OP_OR) + SkinButton.SetEvent(IE_GUI_BUTTON_ON_PRESS,"SkinPress") + SkinButton.SetBAM("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) + MajorButton = ColorWindow.GetControl(5) + MajorButton.SetFlags(IE_GUI_BUTTON_PICTURE,OP_OR) + MajorButton.SetEvent(IE_GUI_BUTTON_ON_PRESS,"MajorPress") + MajorButton.SetBAM("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) + MinorButton = ColorWindow.GetControl(4) + MinorButton.SetFlags(IE_GUI_BUTTON_PICTURE,OP_OR) + MinorButton.SetEvent(IE_GUI_BUTTON_ON_PRESS,"MinorPress") + MinorButton.SetBAM("COLGRAD", 1, 0, Color4) - BackButton = GemRB.GetControl(ColorWindow,13) - GemRB.SetText(ColorWindow,BackButton,15416) - DoneButton = GemRB.GetControl(ColorWindow,0) - GemRB.SetText(ColorWindow,DoneButton,11973) - GemRB.SetButtonFlags(ColorWindow, DoneButton, IE_GUI_BUTTON_DEFAULT,OP_OR) + BackButton = ColorWindow.GetControl(13) + BackButton.SetText(15416) + DoneButton = ColorWindow.GetControl(0) + DoneButton.SetText(11973) + DoneButton.SetFlags(IE_GUI_BUTTON_DEFAULT,OP_OR) - GemRB.SetEvent(ColorWindow,DoneButton,IE_GUI_BUTTON_ON_PRESS,"NextPress") - GemRB.SetEvent(ColorWindow,BackButton,IE_GUI_BUTTON_ON_PRESS,"BackPress") + DoneButton.SetEvent(IE_GUI_BUTTON_ON_PRESS,"NextPress") + BackButton.SetEvent(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) + PDollTable = GemRB.LoadTableObject ("avatars") + table = GemRB.LoadTableObject ("avprefr") + AnimID = 0x6000 + table.GetValue (GemRB.GetVar("BaseRace"), 0) - table = GemRB.LoadTable ("avprefc") - AnimID = AnimID + GemRB.GetTableValue (table, GemRB.GetVar("BaseClass"), 0) - GemRB.UnloadTable (table) + table = GemRB.LoadTableObject ("avprefc") + AnimID = AnimID + table.GetValue (GemRB.GetVar("BaseClass"), 0) - table = GemRB.LoadTable ("avprefg") - AnimID = AnimID + GemRB.GetTableValue (table, GemRB.GetVar("Gender"), 0) - GemRB.UnloadTable (table) + table = GemRB.LoadTableObject ("avprefg") + AnimID = AnimID + table.GetValue (GemRB.GetVar("Gender"), 0) - PDollResRef = GemRB.GetTableValue (PDollTable, hex(AnimID), "AT_1") + "G1" + PDollResRef = PDollTable.GetValue (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) + ColorWindow.SetVisible(1) return def RandomDonePress(): @@ -119,91 +114,93 @@ def DonePress(): global Color1, Color2, Color3, Color4, ColorWindow, ColorIndex, PickedColor, ColorPicker - GemRB.UnloadWindow(ColorPicker) - GemRB.SetVisible(ColorWindow,1) + if ColorPicker: + ColorPicker.Unload() + ColorWindow.SetVisible(1) if ColorIndex==0: - PickedColor=GemRB.GetTableValue(HairTable, GemRB.GetVar("Selected"),0) + PickedColor=HairTable.GetValue(GemRB.GetVar("Selected"),0) Color1=PickedColor - GemRB.SetButtonBAM(ColorWindow, HairButton, "COLGRAD", 1, 0, Color1) + HairButton.SetBAM("COLGRAD", 1, 0, Color1) RefreshPDoll() return if ColorIndex==1: - PickedColor=GemRB.GetTableValue(SkinTable, GemRB.GetVar("Selected"),0) + PickedColor=SkinTable.GetValue(GemRB.GetVar("Selected"),0) Color2=PickedColor - GemRB.SetButtonBAM(ColorWindow, SkinButton, "COLGRAD", 1, 0, Color2) + SkinButton.SetBAM("COLGRAD", 1, 0, Color2) RefreshPDoll() return if ColorIndex==2: - PickedColor=GemRB.GetTableValue(ColorTable, 0, GemRB.GetVar("Selected")) + PickedColor=ColorTable.GetValue(0, GemRB.GetVar("Selected")) Color3=PickedColor - GemRB.SetButtonBAM(ColorWindow, MajorButton, "COLGRAD", 1, 0, Color3) + MajorButton.SetBAM("COLGRAD", 1, 0, Color3) RefreshPDoll() return - PickedColor=GemRB.GetTableValue(ColorTable, 1, GemRB.GetVar("Selected")) + PickedColor=ColorTable.GetValue(1, GemRB.GetVar("Selected")) Color4=PickedColor - GemRB.SetButtonBAM(ColorWindow, MinorButton, "COLGRAD", 1, 0, Color4) + MinorButton.SetBAM("COLGRAD", 1, 0, Color4) RefreshPDoll() return def CancelPress(): global ColorPicker, ColorWindow - GemRB.UnloadWindow (ColorPicker) - GemRB.SetVisible (ColorWindow, 1) + if ColorPicker: + ColorPicker.Unload () + ColorWindow.SetVisible (1) def GetColor(): global ColorPicker, ColorIndex, PickedColor - ColorPicker=GemRB.LoadWindow(14) + ColorPicker=GemRB.LoadWindowObject(14) GemRB.SetVar("Selected",-1) for i in range(33): - Button = GemRB.GetControl(ColorPicker, i) - GemRB.SetButtonState(ColorPicker, Button, IE_GUI_BUTTON_DISABLED) - GemRB.SetButtonFlags(ColorPicker, Button, IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_RADIOBUTTON,OP_OR) + Button = ColorPicker.GetControl(i) + Button.SetState(IE_GUI_BUTTON_DISABLED) + Button.SetFlags(IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_RADIOBUTTON,OP_OR) Selected = -1 m = 33 if ColorIndex==0: - m=GemRB.GetTableRowCount(HairTable) + m=HairTable.GetRowCount() t=HairTable if ColorIndex==1: - m=GemRB.GetTableRowCount(SkinTable) + m=SkinTable.GetRowCount() t=SkinTable for i in range(0,m): if ColorIndex<2: - MyColor=GemRB.GetTableValue(t,i,0) + MyColor=t.GetValue(i,0) else: - MyColor=GemRB.GetTableValue(ColorTable, ColorIndex-2, i) + MyColor=ColorTable.GetValue(ColorIndex-2, i) if MyColor == "*": break - Button = GemRB.GetControl(ColorPicker, i) - GemRB.SetButtonBAM(ColorPicker, Button, "COLGRAD", 2, 0, MyColor) + Button = ColorPicker.GetControl(i) + Button.SetBAM("COLGRAD", 2, 0, MyColor) if PickedColor == MyColor: GemRB.SetVar("Selected",i) Selected = i - GemRB.SetButtonState(ColorPicker, Button, IE_GUI_BUTTON_ENABLED) - GemRB.SetVarAssoc(ColorPicker, Button, "Selected",i) - GemRB.SetEvent(ColorPicker, Button, IE_GUI_BUTTON_ON_PRESS, "DonePress") + Button.SetState(IE_GUI_BUTTON_ENABLED) + Button.SetVarAssoc("Selected",i) + Button.SetEvent(IE_GUI_BUTTON_ON_PRESS, "DonePress") - Button = GemRB.GetControl(ColorPicker, 33) + Button = ColorPicker.GetControl(33) #default button - GemRB.SetVarAssoc(ColorPicker, Button, "Selected", 0) - GemRB.SetEvent(ColorPicker, Button, IE_GUI_BUTTON_ON_PRESS, "RandomDonePress") - GemRB.SetText(ColorPicker, Button, "RND") + Button.SetVarAssoc("Selected", 0) + Button.SetEvent(IE_GUI_BUTTON_ON_PRESS, "RandomDonePress") + Button.SetText("RND") - CancelButton = GemRB.GetControl(ColorPicker, 35) - GemRB.SetText(ColorPicker, CancelButton, 13727) - GemRB.SetEvent(ColorPicker, CancelButton, IE_GUI_BUTTON_ON_PRESS, "CancelPress") + CancelButton = ColorPicker.GetControl(35) + CancelButton.SetText(13727) + CancelButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "CancelPress") - GemRB.SetVisible(ColorPicker,1) + ColorPicker.SetVisible(1) return def HairPress(): global ColorIndex, PickedColor # GemRB.UnloadWindow(ColorWindow) - GemRB.SetVisible(ColorWindow,0) + ColorWindow.SetVisible(0) ColorIndex = 0 PickedColor = Color1 GetColor() @@ -213,7 +210,7 @@ global ColorIndex, PickedColor # GemRB.UnloadWindow(ColorWindow) - GemRB.SetVisible(ColorWindow,0) + ColorWindow.SetVisible(0) ColorIndex = 1 PickedColor = Color2 GetColor() @@ -223,7 +220,7 @@ global ColorIndex, PickedColor # GemRB.UnloadWindow(ColorWindow) - GemRB.SetVisible(ColorWindow,0) + ColorWindow.SetVisible(0) ColorIndex = 2 PickedColor = Color3 GetColor() @@ -233,25 +230,24 @@ global ColorIndex, PickedColor # GemRB.UnloadWindow(ColorWindow) - GemRB.SetVisible(ColorWindow,0) + ColorWindow.SetVisible(0) ColorIndex = 3 PickedColor = Color4 GetColor() return def BackPress(): - GemRB.UnloadWindow(ColorWindow) + if ColorWindow: + ColorWindow.Unload() GemRB.SetNextScript("CharGen7") return def NextPress(): - GemRB.UnloadWindow(ColorWindow) + if ColorWindow: + ColorWindow.Unload() GemRB.SetVar("Color1",Color1) GemRB.SetVar("Color2",Color2) GemRB.SetVar("Color3",Color3) GemRB.SetVar("Color4",Color4) - GemRB.UnloadTable(HairTable) - GemRB.UnloadTable(SkinTable) - GemRB.UnloadTable(ColorTable) GemRB.SetNextScript("CSound") #character sound return Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/AutoPause.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/AutoPause.py 2009-02-01 22:59:13 UTC (rev 5619) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/AutoPause.py 2009-02-01 23:01:26 UTC (rev 5620) @@ -6,175 +6,177 @@ GemRB.LoadWindowPack("GUIOPT", 800, 600) - AutoPauseWindow = GemRB.LoadWindow(10) - GemRB.SetWindowFrame( AutoPauseWindow) + AutoPauseWindow = GemRB.LoadWindowObject(10) + AutoPauseWindow.SetFrame( ) - TextAreaControl = GemRB.GetControl(AutoPauseWindow, 15) + TextAreaControl = AutoPauseWindow.GetControl(15) - ChHitButton = GemRB.GetControl(AutoPauseWindow, 17) - ChHitButtonB = GemRB.GetControl(AutoPauseWindow, 1) - GemRB.SetButtonSprites(AutoPauseWindow, ChHitButtonB, "GBTNOPT4", 0, 0, 1, 2, 3) + ChHitButton = AutoPauseWindow.GetControl(17) + ChHitButtonB = AutoPauseWindow.GetControl(1) + ChHitButtonB.SetSprites("GBTNOPT4", 0, 0, 1, 2, 3) - ChInjured = GemRB.GetControl(AutoPauseWindow, 18) - ChInjuredB = GemRB.GetControl(AutoPauseWindow, 2) - GemRB.SetButtonSprites(AutoPauseWindow, ChInjuredB, "GBTNOPT4", 0, 0, 1, 2, 3) + ChInjured = AutoPauseWindow.GetControl(18) + ChInjuredB = AutoPauseWindow.GetControl(2) + ChInjuredB.SetSprites("GBTNOPT4", 0, 0, 1, 2, 3) - ChDeath = GemRB.GetControl(AutoPauseWindow, 19) - ChDeathB = GemRB.GetControl(AutoPauseWindow, 3) - GemRB.SetButtonSprites(AutoPauseWindow, ChDeathB, "GBTNOPT4", 0, 0, 1, 2, 3) + ChDeath = AutoPauseWindow.GetControl(19) + ChDeathB = AutoPauseWindow.GetControl(3) + ChDeathB.SetSprites("GBTNOPT4", 0, 0, 1, 2, 3) - ChAttacked = GemRB.GetControl(AutoPauseWindow, 20) - ChAttackedB = GemRB.GetControl(AutoPauseWindow, 4) - GemRB.SetButtonSprites(AutoPauseWindow, ChAttackedB, "GBTNOPT4", 0, 0, 1, 2, 3) + ChAttacked = AutoPauseWindow.GetControl(20) + ChAttackedB = AutoPauseWindow.GetControl(4) + ChAttackedB.SetSprites("GBTNOPT4", 0, 0, 1, 2, 3) - WeaponUnusable = GemRB.GetControl(AutoPauseWindow, 21) - WeaponUnusableB = GemRB.GetControl(AutoPauseWindow, 5) - GemRB.SetButtonSprites(AutoPauseWindow, WeaponUnusableB, "GBTNOPT4", 0, 0, 1, 2, 3) + WeaponUnusable = AutoPauseWindow.GetControl(21) + WeaponUnusableB = AutoPauseWindow.GetControl(5) + WeaponUnusableB.SetSprites("GBTNOPT4", 0, 0, 1, 2, 3) - TargetDestroyed = GemRB.GetControl(AutoPauseWindow, 22) - TargetDestroyedB = GemRB.GetControl(AutoPauseWindow, 13) - GemRB.SetButtonSprites(AutoPauseWindow, TargetDestroyedB, "GBTNOPT4", 0, 0, 1, 2, 3) + TargetDestroyed = AutoPauseWindow.GetControl(22) + TargetDestroyedB = AutoPauseWindow.GetControl(13) + TargetDestroyedB.SetSprites("GBTNOPT4", 0, 0, 1, 2, 3) - EndOfRound = GemRB.GetControl(AutoPauseWindow, 24) - EndOfRoundB = GemRB.GetControl(AutoPauseWindow, 25) - GemRB.SetButtonSprites(AutoPauseWindow, EndOfRoundB, "GBTNOPT4", 0, 0, 1, 2, 3) + EndOfRound = AutoPauseWindow.GetControl(24) + EndOfRoundB = AutoPauseWindow.GetControl(25) + EndOfRoundB.SetSprites("GBTNOPT4", 0, 0, 1, 2, 3) - EnemySighted = GemRB.GetControl(AutoPauseWindow, 31) - EnemySightedB = GemRB.GetControl(AutoPauseWindow, 30) - GemRB.SetButtonSprites(AutoPauseWindow, EnemySightedB, "GBTNOPT4", 0, 0, 1, 2, 3) + EnemySighted = AutoPauseWindow.GetControl(31) + EnemySightedB = AutoPauseWindow.GetControl(30) + EnemySightedB.SetSprites("GBTNOPT4", 0, 0, 1, 2, 3) - SpellCast = GemRB.GetControl(AutoPauseWindow, 37) - SpellCastB = GemRB.GetControl(AutoPauseWindow, 36) - GemRB.SetButtonSprites(AutoPauseWindow, SpellCastB, "GBTNOPT4", 0, 0, 1, 2, 3) + SpellCast = AutoPauseWindow.GetControl(37) + SpellCastB = AutoPauseWindow.GetControl(36) + SpellCastB.SetSprites("GBTNOPT4", 0, 0, 1, 2, 3) - TrapFound = GemRB.GetControl(AutoPauseWindow, 28) - TrapFoundB = GemRB.GetControl(AutoPauseWindow, 26) - GemRB.SetButtonSprites(AutoPauseWindow, TrapFoundB, "GBTNOPT4", 0, 0, 1, 2, 3) + TrapFound = AutoPauseWindow.GetControl(28) + TrapFoundB = AutoPauseWindow.GetControl(26) + TrapFoundB.SetSprites("GBTNOPT4", 0, 0, 1, 2, 3) - AutopauseCenter = GemRB.GetControl(AutoPauseWindow, 34) - AutopauseCenterB = GemRB.GetControl(AutoPauseWindow, 33) - GemRB.SetButtonSprites(AutoPauseWindow, AutopauseCenterB, "GBTNOPT4", 0, 0, 1, 2, 3) + AutopauseCenter = AutoPauseWindow.GetControl(34) + AutopauseCenterB = AutoPauseWindow.GetControl(33) + AutopauseCenterB.SetSprites("GBTNOPT4", 0, 0, 1, 2, 3) - OkButton = GemRB.GetControl(AutoPauseWindow, 11) - CancelButton = GemRB.GetControl(AutoPauseWindow, 14) + OkButton = AutoPauseWindow.GetControl(11) + CancelButton = AutoPauseWindow.GetControl(14) - GemRB.SetText(AutoPauseWindow, TextAreaControl, 18044) - GemRB.SetText(AutoPauseWindow, OkButton, 11973) - GemRB.SetText(AutoPauseWindow, CancelButton, 13727) + TextAreaControl.SetText(18044) + OkButton.SetText(11973) + CancelButton.SetText(13727) - GemRB.SetEvent(AutoPauseWindow, ChHitButton, IE_GUI_BUTTON_ON_PRESS, "ChHitButtonPress") - GemRB.SetButtonFlags(AutoPauseWindow, ChHitButtonB,IE_GUI_BUTTON_CHECKBOX, OP_OR) - GemRB.SetEvent(AutoPauseWindow, ChHitButtonB, IE_GUI_BUTTON_ON_PRESS, "ChHitButtonPress") + ChHitButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "ChHitButtonPress") + ChHitButtonB.SetFlags(IE_GUI_BUTTON_CHECKBOX, OP_OR) + ChHitButtonB.SetEvent(IE_GUI_BUTTON_ON_PRESS, "ChHitButtonPress") - GemRB.SetEvent(AutoPauseWindow, ChInjured, IE_GUI_BUTTON_ON_PRESS, "ChInjuredPress") - GemRB.SetButtonFlags(AutoPauseWindow, ChInjuredB,IE_GUI_BUTTON_CHECKBOX, OP_OR) - GemRB.SetEvent(AutoPauseWindow, ChInjuredB, IE_GUI_BUTTON_ON_PRESS, "ChInjuredPress") + ChInjured.SetEvent(IE_GUI_BUTTON_ON_PRESS, "ChInjuredPress") + ChInjuredB.SetFlags(IE_GUI_BUTTON_CHECKBOX, OP_OR) + ChInjuredB.SetEvent(IE_GUI_BUTTON_ON_PRESS, "ChInjuredPress") - GemRB.SetEvent(AutoPauseWindow, ChDeath, IE_GUI_BUTTON_ON_PRESS, "ChDeathPress") - GemRB.SetButtonFlags(AutoPauseWindow, ChDeathB,IE_GUI_BUTTON_CHECKBOX, OP_OR) - GemRB.SetEvent(AutoPauseWindow, ChDeathB, IE_GUI_BUTTON_ON_PRESS, "ChDeathPress") + ChDeath.SetEvent(IE_GUI_BUTTON_ON_PRESS, "ChDeathPress") + ChDeathB.SetFlags(IE_GUI_BUTTON_CHECKBOX, OP_OR) + ChDeathB.SetEvent(IE_GUI_BUTTON_ON_PRESS, "ChDeathPress") - GemRB.SetEvent(AutoPauseWindow, ChAttacked, IE_GUI_BUTTON_ON_PRESS, "ChAttackedPress") - GemRB.SetButtonFlags(AutoPauseWindow, ChAttackedB,IE_GUI_BUTTON_CHECKBOX, OP_OR) - GemRB.SetEvent(AutoPauseWindow, ChAttackedB, IE_GUI_BUTTON_ON_PRESS, "ChAttackedPress") + ChAttacked.SetEvent(IE_GUI_BUTTON_ON_PRESS, "ChAttackedPress") + ChAttackedB.SetFlags(IE_GUI_BUTTON_CHECKBOX, OP_OR) + ChAttackedB.SetEvent(IE_GUI_BUTTON_ON_PRESS, "ChAttackedPress") - GemRB.SetEvent(AutoPauseWindow, WeaponUnusable, IE_GUI_BUTTON_ON_PRESS, "WeaponUnusablePress") - GemRB.SetButtonFlags(AutoPauseWindow, WeaponUnusableB,IE_GUI_BUTTON_CHECKBOX, OP_OR) - GemRB.SetEvent(AutoPauseWindow, WeaponUnusableB, IE_GUI_BUTTON_ON_PRESS, "WeaponUnusablePress") + WeaponUnusable.SetEvent(IE_GUI_BUTTON_ON_PRESS, "WeaponUnusablePress") + WeaponUnusableB.SetFlags(IE_GUI_BUTTON_CHECKBOX, OP_OR) + WeaponUnusableB.SetEvent(IE_GUI_BUTTON_ON_PRESS, "WeaponUnusablePress") - GemRB.SetEvent(AutoPauseWindow, TargetDestroyed, IE_GUI_BUTTON_ON_PRESS, "TargetDestroyedPress") - GemRB.SetButtonFlags(AutoPauseWindow, TargetDestroyedB,IE_GUI_BUTTON_CHECKBOX, OP_OR) - GemRB.SetEvent(AutoPauseWindow, TargetDestroyedB, IE_GUI_BUTTON_ON_PRESS, "TargetDestroyedPress") + TargetDestroyed.SetEvent(IE_GUI_BUTTON_ON_PRESS, "TargetDestroyedPress") + TargetDestroyedB.SetFlags(IE_GUI_BUTTON_CHECKBOX, OP_OR) + TargetDestroyedB.SetEvent(IE_GUI_BUTTON_ON_PRESS, "TargetDestroyedPress") - GemRB.SetEvent(AutoPauseWindow, EndOfRound, IE_GUI_BUTTON_ON_PRESS, "EndOfRoundPress") - GemRB.SetButtonFlags(AutoPauseWindow, EndOfRoundB,IE_GUI_BUTTON_CHECKBOX, OP_OR) - GemRB.SetEvent(AutoPauseWindow, EndOfRoundB, IE_GUI_BUTTON_ON_PRESS, "EndOfRoundPress") + EndOfRound.SetEvent(IE_GUI_BUTTON_ON_PRESS, "EndOfRoundPress") + EndOfRoundB.SetFlags(IE_GUI_BUTTON_CHECKBOX, OP_OR) + EndOfRoundB.SetEvent(IE_GUI_BUTTON_ON_PRESS, "EndOfRoundPress") - GemRB.SetEvent(AutoPauseWindow, EnemySighted, IE_GUI_BUTTON_ON_PRESS, "EnemySightedPress") - GemRB.SetButtonFlags(AutoPauseWindow, EnemySightedB,IE_GUI_BUTTON_CHECKBOX, OP_OR) - GemRB.SetEvent(AutoPauseWindow, EnemySightedB, IE_GUI_BUTTON_ON_PRESS, "EnemySightedPress") + EnemySighted.SetEvent(IE_GUI_BUTTON_ON_PRESS, "EnemySightedPress") + EnemySightedB.SetFlags(IE_GUI_BUTTON_CHECKBOX, OP_OR) + EnemySightedB.SetEvent(IE_GUI_BUTTON_ON_PRESS, "EnemySightedPress") - GemRB.SetEvent(AutoPauseWindow, SpellCast, IE_GUI_BUTTON_ON_PRESS, "SpellCastPress") - GemRB.SetButtonFlags(AutoPauseWindow, SpellCastB,IE_GUI_BUTTON_CHECKBOX, OP_OR) - GemRB.SetEvent(AutoPauseWindow, SpellCastB, IE_GUI_BUTTON_ON_PRESS, "SpellCastPress") + SpellCast.SetEvent(IE_GUI_BUTTON_ON_PRESS, "SpellCastPress") + SpellCastB.SetFlags(IE_GUI_BUTTON_CHECKBOX, OP_OR) + SpellCastB.SetEvent(IE_GUI_BUTTON_ON_PRESS, "SpellCastPress") - GemRB.SetEvent(AutoPauseWindow, TrapFound, IE_GUI_BUTTON_ON_PRESS, "TrapFoundPress") - GemRB.SetButtonFlags(AutoPauseWindow, TrapFoundB,IE_GUI_BUTTON_CHECKBOX, OP_OR) - GemRB.SetEvent(AutoPauseWindow, TrapFoundB, IE_GUI_BUTTON_ON_PRESS, "TrapFoundPress") + TrapFound.SetEvent(IE_GUI_BUTTON_ON_PRESS, "TrapFoundPress") + TrapFoundB.SetFlags(IE_GUI_BUTTON_CHECKBOX, OP_OR) + TrapFoundB.SetEvent(IE_GUI_BUTTON_ON_PRESS, "TrapFoundPress") - GemRB.SetEvent(AutoPauseWindow, AutopauseCenter, IE_GUI_BUTTON_ON_PRESS, "AutopauseCenterPress") - GemRB.SetButtonFlags(AutoPauseWindow, AutopauseCenterB,IE_GUI_BUTTON_CHECKBOX, OP_OR) - GemRB.SetEvent(AutoPauseWindow, AutopauseCenterB, IE_GUI_BUTTON_ON_PRESS, "AutopauseCenterPress") + AutopauseCenter.SetEvent(IE_GUI_BUTTON_ON_PRESS, "AutopauseCenterPress") + AutopauseCenterB.SetFlags(IE_GUI_BUTTON_CHECKBOX, OP_OR) + AutopauseCenterB.SetEvent(IE_GUI_BUTTON_ON_PRESS, "AutopauseCenterPress") - GemRB.SetEvent(AutoPauseWindow, OkButton, IE_GUI_BUTTON_ON_PRESS, "OkPress") - GemRB.SetEvent(AutoPauseWindow, CancelButton, IE_GUI_BUTTON_ON_PRESS, "CancelPress") + OkButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "OkPress") + CancelButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "CancelPress") - GemRB.SetVarAssoc(AutoPauseWindow, AutopauseCenterB, "Auto Pause Center",1) + AutopauseCenterB.SetVarAssoc("Auto Pause Center",1) - GemRB.SetVarAssoc(AutoPauseWindow, ChHitButtonB, "Auto Pause State",1) - GemRB.SetVarAssoc(AutoPauseWindow, ChInjuredB, "Auto Pause State",2) - GemRB.SetVarAssoc(AutoPauseWindow, ChDeathB, "Auto Pause State",4) - GemRB.SetVarAssoc(AutoPauseWindow, ChAttackedB, "Auto Pause State",8) - GemRB.SetVarAssoc(AutoPauseWindow, WeaponUnusableB, "Auto Pause State",16) - GemRB.SetVarAssoc(AutoPauseWindow, TargetDestroyedB, "Auto Pause State",32) - GemRB.SetVarAssoc(AutoPauseWindow, EndOfRoundB, "Auto Pause State",64) - GemRB.SetVarAssoc(AutoPauseWindow, EnemySightedB, "Auto Pause State",128) - GemRB.SetVarAssoc(AutoPauseWindow, SpellCastB, "Auto Pause State",256) - GemRB.SetVarAssoc(AutoPauseWindow, TrapFoundB, "Auto Pause State",512) + ChHitButtonB.SetVarAssoc("Auto Pause State",1) + ChInjuredB.SetVarAssoc("Auto Pause State",2) + ChDeathB.SetVarAssoc("Auto Pause State",4) + ChAttackedB.SetVarAssoc("Auto Pause State",8) + WeaponUnusableB.SetVarAssoc("Auto Pause State",16) + TargetDestroyedB.SetVarAssoc("Auto Pause State",32) + EndOfRoundB.SetVarAssoc("Auto Pause State",64) + EnemySightedB.SetVarAssoc("Auto Pause State",128) + SpellCastB.SetVarAssoc("Auto Pause State",256) + TrapFoundB.SetVarAssoc("Auto Pause State",512) - GemRB.SetVisible(AutoPauseWindow,1) + AutoPauseWindow.SetVisible(1) return def ChHitButtonPress(): - GemRB.SetText(AutoPauseWindow, TextAreaControl, 18032) + TextAreaControl.SetText(18032) return def ChInjuredPress(): - GemRB.SetText(AutoPauseWindow, TextAreaControl, 18033) + TextAreaControl.SetText(18033) return def ChDeathPress(): - GemRB.SetText(AutoPauseWindow, TextAreaControl, 18034) + TextAreaControl.SetText(18034) return def ChAttackedPress(): - GemRB.SetText(AutoPauseWindow, TextAreaControl, 18035) + TextAreaControl.SetText(18035) return def WeaponUnusablePress(): - GemRB.SetText(AutoPauseWindow, TextAreaControl, 18036) + TextAreaControl.SetText(18036) return def TargetDestroyedPress(): - GemRB.SetText(AutoPauseWindow, TextAreaControl, 18037) + TextAreaControl.SetText(18037) return def EndOfRoundPress(): - GemRB.SetText(AutoPauseWindow, TextAreaControl, 10640) + TextAreaControl.SetText(10640) return def EnemySightedPress(): - GemRB.SetText(AutoPauseWindow, TextAreaControl, 23514) + TextAreaControl.SetText(23514) return def SpellCastPress(): - GemRB.SetText(AutoPauseWindow, TextAreaControl, 26311) + TextAreaControl.SetText(26311) return def TrapFoundPress(): - GemRB.SetText(AutoPauseWindow, TextAreaControl, 18560) #iwd2 has it here + TextAreaControl.SetText(18560) #iwd2 has it here return def AutopauseCenterPress(): - GemRB.SetText(AutoPauseWindow, TextAreaControl, 24888) #iwd2 has it here + TextAreaControl.SetText(24888) #iwd2 has it here return def OkPress(): - GemRB.UnloadWindow(AutoPauseWindow) + if AutoPauseWindow: + AutoPauseWindow.Unload() GemRB.SetNextScript("GamePlay") return def CancelPress(): - GemRB.UnloadWindow(AutoPauseWindow) + if AutoPauseWindow: + AutoPauseWindow.Unload() GemRB.SetNextScript("GamePlay") return Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/CSound.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/CSound.py 2009-02-01 22:59:13 UTC (rev 5619) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/CSound.py 2009-02-01 23:01:26 UTC (rev 5620) @@ -11,45 +11,47 @@ GemRB.LoadWindowPack("GUICG", 800, 600) #this hack will redraw the base CG window - SoundWindow = GemRB.LoadWindow(19) + SoundWindow = GemRB.LoadWindowObject(19) GemRB.SetVar("Sound",0) #scrapping the sound value - BackButton = GemRB.GetControl(SoundWindow,10) - GemRB.SetText(SoundWindow,BackButton,15416) - DoneButton = GemRB.GetControl(SoundWindow,0) - GemRB.SetText(SoundWindow,DoneButton,36789) - GemRB.SetButtonFlags(SoundWindow, DoneButton, IE_GUI_BUTTON_DEFAULT,OP_OR) + BackButton = SoundWindow.GetControl(10) + BackButton.SetText(15416) + DoneButton = SoundWindow.GetControl(0) + DoneButton.SetText(36789) + DoneButton.SetFlags(IE_GUI_BUTTON_DEFAULT,OP_OR) - TextAreaControl = GemRB.GetControl(SoundWindow, 50) - GemRB.SetText(SoundWindow,TextAreaControl,17236) + TextAreaControl = SoundWindow.GetControl(50) + TextAreaControl.SetText(17236) - TextAreaControl = GemRB.GetControl(SoundWindow, 45) - GemRB.SetTextAreaFlags(SoundWindow, TextAreaControl,IE_GUI_TEXTAREA_SELECTABLE) - GemRB.SetVarAssoc(SoundWindow, TextAreaControl, "Sound", 0) - RowCount=GemRB.GetCharSounds(SoundWindow, TextAreaControl) + TextAreaControl = SoundWindow.GetControl(45) + TextAreaControl.SetFlags(IE_GUI_TEXTAREA_SELECTABLE) + TextAreaControl.SetVarAssoc("Sound", 0) + RowCount=TextAreaControl.GetCharSounds() - DefaultButton = GemRB.GetControl(SoundWindow,47) - GemRB.SetText(SoundWindow, DefaultButton, 33479) + DefaultButton = SoundWindow.GetControl(47) + DefaultButton.SetText(33479) - GemRB.SetEvent(SoundWindow,DoneButton,IE_GUI_BUTTON_ON_PRESS,"NextPress") - GemRB.SetEvent(SoundWindow,BackButton,IE_GUI_BUTTON_ON_PRESS,"BackPress") - GemRB.SetEvent(SoundWindow,DefaultButton,IE_GUI_BUTTON_ON_PRESS,"DefaultPress") - GemRB.SetVisible(SoundWindow,1) + DoneButton.SetEvent(IE_GUI_BUTTON_ON_PRESS,"NextPress") + BackButton.SetEvent(IE_GUI_BUTTON_ON_PRESS,"BackPress") + DefaultButton.SetEvent(IE_GUI_BUTTON_ON_PRESS,"DefaultPress") + SoundWindow.SetVisible(1) return def DefaultPress(): GemRB.SetVar("Sound",0) #scrapping the sound value - GemRB.SetVarAssoc(SoundWindow, TextAreaControl, "Sound", 0) + TextAreaControl.SetVarAssoc("Sound", 0) return def BackPress(): - GemRB.UnloadWindow(SoundWindow) + if SoundWindow: + SoundWindow.Unload() GemRB.SetNextScript("Appearance") GemRB.SetVar("Sound",0) #scrapping the sound value return def NextPress(): - GemRB.SetToken("VoiceSet", GemRB.QueryText(SoundWindow, TextAreaControl)) - GemRB.UnloadWindow(SoundWindow) + GemRB.SetToken("VoiceSet", TextAreaControl.QueryText()) + if SoundWindow: + SoundWindow.Unload() GemRB.SetNextScript("CharGen8") #name return Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/CharGen9.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/CharGen9.py 2009-02-01 22:59:13 UTC (rev 5619) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/CharGen9.py 2009-02-01 23:01:26 UTC (rev 5620) @@ -12,154 +12,148 @@ def OnLoad(): UpdateOverview(9) if CharGenWindow: - GemRB.SetButtonState(CharGenWindow, PersistButtons['Next'], IE_GUI_BUTTON_UNPRESSED) # Fixes button being pre-pressed + PersistButtons['Next'].SetState(IE_GUI_BUTTON_UNPRESSED) # Fixes button being pre-pressed return def SetRaceAbilities(MyChar, racetitle): - ability = GemRB.LoadTable ("racespab") - resource = GemRB.GetTableValue (ability, racetitle, "SPECIAL_ABILITIES_FILE") - GemRB.UnloadTable (ability) + ability = GemRB.LoadTableObject ("racespab") + resource = ability.GetValue (racetitle, "SPECIAL_ABILITIES_FILE") if resource=="*": return - ability = GemRB.LoadTable (resource) - rows = GemRB.GetTableRowCount (ability) + ability = GemRB.LoadTableObject (resource) + rows = ability.GetRowCount () for i in range(rows): - resource = GemRB.GetTableValue (ability, i, 0) - count = GemRB.GetTableValue (ability, i,1) + resource = ability.GetValue (i, 0) + count = ability.GetValue (i,1) for j in range(count): GemRB.LearnSpell (MyChar, resource) - GemRB.UnloadTable (ability) return def SetRaceResistances(MyChar, racetitle): - resistances = GemRB.LoadTable ("racersmd") - GemRB.SetPlayerStat (MyChar, IE_RESISTFIRE, GemRB.GetTableValue ( resistances, racetitle, "FIRE") ) - GemRB.SetPlayerStat (MyChar, IE_RESISTCOLD, GemRB.GetTableValue ( resistances, racetitle, "COLD") ) - GemRB.SetPlayerStat (MyChar, IE_RESISTELECTRICITY, GemRB.GetTableValue ( resistances, racetitle, "ELEC") ) - GemRB.SetPlayerStat (MyChar, IE_RESISTACID, GemRB.GetTableValue ( resistances, racetitle, "ACID") ) - GemRB.SetPlayerStat (MyChar, IE_RESISTMAGIC, GemRB.GetTableValue ( resistances, racetitle, "SPELL") ) - GemRB.SetPlayerStat (MyChar, IE_RESISTMAGICFIRE, GemRB.GetTableValue ( resistances, racetitle, "MAGIC_FIRE") ) - GemRB.SetPlayerStat (MyChar, IE_RESISTMAGICCOLD, GemRB.GetTableValue ( resistances, racetitle, "MAGIC_COLD") ) - GemRB.SetPlayerStat (MyChar, IE_RESISTSLASHING, GemRB.GetTableValue ( resistances, racetitle, "SLASHING") ) - GemRB.SetPlayerStat (MyChar, IE_RESISTCRUSHING, GemRB.GetTableValue ( resistances, racetitle, "BLUDGEONING") ) - GemRB.SetPlayerStat (MyChar, IE_RESISTPIERCING, GemRB.GetTableValue ( resistances, racetitle, "PIERCING") ) - GemRB.SetPlayerStat (MyChar, IE_RESISTMISSILE, GemRB.GetTableValue ( resistances, racetitle, "MISSILE") ) - GemRB.UnloadTable (resistances) + resistances = GemRB.LoadTableObject ("racersmd") + GemRB.SetPlayerStat (MyChar, IE_RESISTFIRE, resistances.GetValue ( racetitle, "FIRE") ) + GemRB.SetPlayerStat (MyChar, IE_RESISTCOLD, resistances.GetValue ( racetitle, "COLD") ) + GemRB.SetPlayerStat (MyChar, IE_RESISTELECTRICITY, resistances.GetValue ( racetitle, "ELEC") ) + GemRB.SetPlayerStat (MyChar, IE_RESISTACID, resistances.GetValue ( racetitle, "ACID") ) + GemRB.SetPlayerStat (MyChar, IE_RESISTMAGIC, resistances.GetValue ( racetitle, "SPELL") ) + GemRB.SetPlayerStat (MyChar, IE_RESISTMAGICFIRE, resistances.GetValue ( racetitle, "MAGIC_FIRE") ) + GemRB.SetPlayerStat (MyChar, IE_RESISTMAGICCOLD, resistances.GetValue ( racetitle, "MAGIC_COLD") ) + GemRB.SetPlayerStat (MyChar, IE_RESISTSLASHING, resistances.GetValue ( racetitle, "SLASHING") ) + GemRB.SetPlayerStat (MyChar, IE_RESISTCRUSHING, resistances.GetValue ( racetitle, "BLUDGEONING") ) + GemRB.SetPlayerStat (MyChar, IE_RESISTPIERCING, resistances.GetValue ( racetitle, "PIERCING") ) + GemRB.SetPlayerStat (MyChar, IE_RESISTMISSILE, resistances.GetValue ( racetitle, "MISSILE") ) return def ClearPress(): global BioData GemRB.SetToken("BIO", "") - GemRB.SetText (BioWindow, EditControl, GemRB.GetToken("BIO") ) + EditControl.SetText (GemRB.GetToken("BIO") ) return def RevertPress(): - BioTable = GemRB.LoadTable ("bios") + BioTable = GemRB.LoadTableObject ("bios") Class = GemRB.GetVar ("BaseClass") - StrRef = GemRB.GetTableValue(BioTable,Class,1) + StrRef = BioTable.GetValue(Class,1) GemRB.SetToken ("BIO", GemRB.GetString(StrRef) ) - GemRB.UnloadTable (BioTable) - GemRB.SetText (BioWindow, EditControl, GemRB.GetToken("BIO") ) + EditControl.SetText (GemRB.GetToken("BIO") ) return def BioCancelPress(): GemRB.SetToken("BIO",BioData) - GemRB.UnloadWindow (BioWindow) + if BioWindow: + BioWindow.Unload () return def BioDonePress(): - GemRB.UnloadWindow (BioWindow) + if BioWindow: + BioWindow.Unload () return def BioPress(): global BioWindow, EditControl, BioData BioData = GemRB.GetToken("BIO") - BioWindow = Window = GemRB.LoadWindow (51) - Button = GemRB.GetControl (Window, 5) - GemRB.SetText (Window, Button, 2240) - GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "RevertPress") + BioWindow = Window = GemRB.LoadWindowObject (51) + Button = Window.GetControl (5) + Button.SetText (2240) + Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "RevertPress") - Button = GemRB.GetControl (Window, 6) - GemRB.SetText (Window, Button, 18622) - GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "ClearPress") + Button = Window.GetControl (6) + Button.SetText (18622) + Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "ClearPress") - Button = GemRB.GetControl (Window, 1) - GemRB.SetText (Window, Button, 11962) - GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "BioDonePress") + Button = Window.GetControl (1) + Button.SetText (11962) + Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "BioDonePress") - Button = GemRB.GetControl (Window, 2) - GemRB.SetText (Window, Button, 36788) - GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_PRESS, "BioCancelPress") + Button = Window.GetControl (2) + Button.SetText (36788) + Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "BioCancelPress") - EditControl = GemRB.GetControl (Window, 4) + EditControl = Window.GetControl (4) BioData = GemRB.GetToken("BIO") if BioData == "": RevertPress() else: - GemRB.SetText (Window, EditControl, BioData ) - GemRB.ShowModal (Window, MODAL_SHADOW_GRAY) + EditControl.SetText (BioData ) + Window.ShowModal (MODAL_SHADOW_GRAY) return def NextPress(): - GemRB.UnloadWindow (CharGenWindow) + if CharGenWindow: + CharGenWindow.Unload () #set my character up MyChar = GemRB.GetVar ("Slot") GemRB.SetPlayerStat (MyChar, IE_SEX, GemRB.GetVar ("Gender") ) GemRB.SetPlayerStat (MyChar, IE_RACE, GemRB.GetVar ("BaseRace") ) race = GemRB.GetVar ("Race") GemRB.SetPlayerStat (MyChar, IE_SUBRACE, race & 255 ) - TmpTable = GemRB.LoadTable ("races") - row = GemRB.FindTableValue (TmpTable, 3, race ) - racename = GemRB.GetTableRowName (TmpTable, row) + TmpTable = GemRB.LoadTableObject ("races") + row = TmpTable.FindValue (3, race ) + racename = TmpTable.GetRowName (row) if row!=-1: SetRaceResistances( MyChar, racename ) SetRaceAbilities( MyChar, racename ) - GemRB.UnloadTable (TmpTable) #base class Class=GemRB.GetVar ("BaseClass") GemRB.SetPlayerStat (MyChar, IE_CLASS, Class) #kit GemRB.SetPlayerStat (MyChar, IE_KIT, GemRB.GetVar ("Class") ) - AlignmentTable = GemRB.LoadTable ("aligns") + AlignmentTable = GemRB.LoadTableObject ("aligns") t=GemRB.GetVar ("Alignment") - GemRB.SetPlayerStat (MyChar, IE_ALIGNMENT, GemRB.GetTableValue (AlignmentTable, t, 3) ) - TmpTable=GemRB.LoadTable ("repstart") - #t=GemRB.FindTableValue (AlignmentTable,3,t) - t=GemRB.GetTableValue (TmpTable,t,0) + GemRB.SetPlayerStat (MyChar, IE_ALIGNMENT, AlignmentTable.GetValue (t, 3) ) + TmpTable=GemRB.LoadTableObject ("repstart") + #t=AlignmentTable.FindValue (3,t) + t=TmpTable.GetValue (t,0) GemRB.SetPlayerStat (MyChar, IE_REPUTATION, t) - GemRB.UnloadTable (TmpTable) - TmpTable=GemRB.LoadTable ("strtgold") - a = GemRB.GetTableValue (TmpTable, Class, 1) #number of dice - b = GemRB.GetTableValue (TmpTable, Class, 0) #size - c = GemRB.GetTableValue (TmpTable, Class, 2) #adjustment - d = GemRB.GetTableValue (TmpTable, Class, 3) #external multiplier - e = GemRB.GetTableValue (TmpTable, Class, 4) #level bonus rate + TmpTable=GemRB.LoadTableObject ("strtgold") + a = TmpTable.GetValue (Class, 1) #number of dice + b = TmpTable.GetValue (Class, 0) #size + c = TmpTable.GetValue (Class, 2) #adjustment + d = TmpTable.GetValue (Class, 3) #external multiplier + e = TmpTable.GetValue (Class, 4) #level bonus rate t = GemRB.GetPlayerStat (MyChar, IE_LEVEL) if t>1: e=e*(t-1) else: e=0 - GemRB.UnloadTable (AlignmentTable) - GemRB.UnloadTable (TmpTable) t = GemRB.Roll(a,b,c)*d+e GemRB.SetPlayerStat (MyChar, IE_GOLD, t) GemRB.SetPlayerStat (MyChar, IE_HATEDRACE, GemRB.GetVar ("HatedRace") ) - TmpTable = GemRB.LoadTable ("ability") - AbilityCount = GemRB.GetTableRowCount (TmpTable) + TmpTable = GemRB.LoadTableObject ("ability") + AbilityCount = TmpTable.GetRowCount () for i in range (AbilityCount): - StatID=GemRB.GetTableValue (TmpTable, i,4) + StatID=TmpTable.GetValue (i,4) GemRB.SetPlayerStat (MyChar, StatID, GemRB.GetVar ("Ability "+str(i) ) ) - GemRB.UnloadTable (TmpTable) -# TmpTable=GemRB.LoadTable ("weapprof") -# ProfCount = GemRB.GetTableRowCount (TmpTable) +# TmpTable=GemRB.LoadTableObject ("weapprof") +# ProfCount = TmpTable.GetRowCount () # for i in range(ProfCount): -# StatID=GemRB.GetTableValue (TmpTable, i, 0) +# StatID=TmpTable.GetValue (i, 0) # GemRB.SetPlayerStat (MyChar, StatID, GemRB.GetVar ("Prof "+str(i) ) ) SetColorStat (MyChar, IE_HAIR_COLOR, GemRB.GetVar ("Color1") ) SetColorStat (MyChar, IE_SKIN_COLOR, GemRB.GetVar ("Color2") ) @@ -184,12 +178,11 @@ GemRB.SetPlayerName (MyChar, GemRB.GetToken ("CHARNAME"), 0) #setting skills - TmpTable = GemRB.LoadTable ("skillsta") - SkillCount = GemRB.GetTableRowCount (TmpTable) + TmpTable = GemRB.LoadTableObject ("skillsta") + SkillCount = TmpTable.GetRowCount () for i in range (SkillCount): - StatID=GemRB.GetTableValue (TmpTable, i, 2) + StatID=TmpTable.GetValue (i, 2) GemRB.SetPlayerStat (MyChar, StatID, GemRB.GetVar ("Skill "+str(i) ) ) - GemRB.UnloadTable (TmpTable) #setting feats @@ -199,10 +192,10 @@ GemRB.FillPlayerInfo(MyChar, LargePortrait, SmallPortrait) GemRB.SetNextScript ("SPPartyFormation") - TmpTable = GemRB.LoadTable ("strtxp") + TmpTable = GemRB.LoadTableObject ("strtxp") #starting xp is race dependent - xp = GemRB.GetTableValue (TmpTable, racename, "VALUE") + xp = TmpTable.GetValue (racename, "VALUE") GemRB.SetPlayerStat (MyChar, IE_XP, xp ) return Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/CharOverview.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/CharOverview.py 2009-02-01 22:59:13 UTC (rev 5619) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/CharOverview.py 2009-02-01 23:01:26 UTC (rev 5620) @@ -22,8 +22,8 @@ ### Utility functions def AddText(strref, row = False): - if row: return GemRB.TextAreaAppend(CharGenWindow, TextAreaControl, strref, row); - return GemRB.TextAreaAppend(CharGenWindow, TextAreaControl, strref) + if row: return TextAreaControl.Append(strref, row); + return TextAreaControl.Append(strref) ### End utility functions def UpdateOverview(CurrentStep): @@ -33,27 +33,27 @@ GlobalStep = CurrentStep GemRB.LoadWindowPack("GUICG", 800 ,600) - CharGenWindow = GemRB.LoadWindow(0) - GemRB.SetWindowFrame(CharGenWindow) - PortraitButton = GemRB.GetControl(CharGenWindow, 12) - GemRB.SetButtonFlags(CharGenWindow, PortraitButton, IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_NO_IMAGE,OP_SET) + CharGenWindow = GemRB.LoadWindowObject(0) + CharGenWindow.SetFrame() + PortraitButton = CharGenWindow.GetControl(12) + PortraitButton.SetFlags(IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_NO_IMAGE,OP_SET) # Handle portrait PortraitName = GemRB.GetToken('LargePortrait') if PortraitName != '' and CurrentStep > 1: - GemRB.SetButtonPicture(CharGenWindow, PortraitButton, PortraitName, 'NOPORTLG') + PortraitButton.SetPicture(PortraitName, 'NOPORTLG') # Handle step buttons TextLookup = [11956, 11957, 11959, 11958, 11960, 11983, 11961, 11963] for i, Step in enumerate(Steps): - StepButtons[Step] = GemRB.GetControl(CharGenWindow, i) - GemRB.SetText(CharGenWindow, StepButtons[Step], TextLookup[i]) + StepButtons[Step] = CharGenWindow.GetControl(i) + StepButtons[Step].SetText(TextLookup[i]) State = IE_GUI_BUTTON_DISABLED if CurrentStep - 1 == i: State = IE_GUI_BUTTON_ENABLED - GemRB.SetButtonFlags(CharGenWindow, StepButtons[Step], IE_GUI_BUTTON_DEFAULT, OP_OR) - GemRB.SetEvent(CharGenWindow, StepButtons[Step], IE_GUI_BUTTON_ON_PRESS, 'NextPress') - GemRB.SetButtonState(CharGenWindow, StepButtons[Step], State) + StepButtons[Step].SetFlags(IE_GUI_BUTTON_DEFAULT, OP_OR) + StepButtons[Step].SetEvent(IE_GUI_BUTTON_ON_PRESS, 'NextPress') + StepButtons[Step].SetState(State) # Handle (not so) persistent buttons # This array handles all the default values for the buttons @@ -67,7 +67,7 @@ } States = [IE_GUI_BUTTON_DISABLED, IE_GUI_BUTTON_ENABLED] for Key in ControlLookup: - PersistButtons[Key] = GemRB.GetControl(CharGenWindow, ControlLookup[Key][0]) + PersistButtons[Key] = CharGenWindow.GetControl(ControlLookup[Key][0]) Text = ControlLookup[Key][1] State = States[ControlLookup[Key][2]] Event = ControlLookup[Key][3] @@ -93,23 +93,23 @@ Text = 13727 Event = 'CancelPress' - GemRB.SetText(CharGenWindow, PersistButtons[Key], Text) - GemRB.SetButtonState(CharGenWindow, PersistButtons[Key], State) + PersistButtons[Key].SetText(Text) + PersistButtons[Key].SetState(State) if Event: - GemRB.SetEvent(CharGenWindow, PersistButtons[Key], IE_GUI_BUTTON_ON_PRESS, Event) + PersistButtons[Key].SetEvent(IE_GUI_BUTTON_ON_PRESS, Event) # Handle character overview information - TextAreaControl = GemRB.GetControl(CharGenWindow, 9) + TextAreaControl = CharGenWindow.GetControl(9) Tables = [] for tbl in ['races', 'classes', 'aligns', 'ability', 'skillsta', 'skills', 'featreq', 'feats']: - Tables.append(GemRB.LoadTable(tbl)) + Tables.append(GemRB.LoadTableObject(tbl)) if GemRB.GetVar('Gender') > 0: if GemRB.GetToken('CHARNAME') == '': - GemRB.SetText(CharGenWindow, TextAreaControl, 12135) + TextAreaControl.SetText(12135) else: - GemRB.SetText(CharGenWindow, TextAreaControl, 1047) + TextAreaControl.SetText(1047) AddText(': ' + GemRB.GetToken('CHARNAME')) AddText(12135, -1) AddText(': ') @@ -119,24 +119,24 @@ if GemRB.GetVar('Race') > 0: AddText(1048, -1) AddText(': ') - AddText(GemRB.GetTableValue(Tables[0], GemRB.FindTableValue(Tables[0], 3, GemRB.GetVar('Race')), 2)) + AddText(Tables[0].GetValue(Tables[0].FindValue(3, GemRB.GetVar('Race')), 2)) if GemRB.GetVar('Class') > 0: AddText(11959, -1) AddText(': ') - AddText(GemRB.GetTableValue(Tables[1], GemRB.GetVar('Class') - 1, 0)) + AddText(Tables[1].GetValue(GemRB.GetVar('Class') - 1, 0)) if GemRB.GetVar('Alignment') > 0: AddText(11958, -1) AddText(': ') - AddText(Ge... [truncated message content] |
From: <lyn...@us...> - 2009-02-07 15:30:40
|
Revision: 5667 http://gemrb.svn.sourceforge.net/gemrb/?rev=5667&view=rev Author: lynxlupodian Date: 2009-02-07 15:30:32 +0000 (Sat, 07 Feb 2009) Log Message: ----------- iwd2: fixed the kit display in guirec Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/iwd2/GUICommonWindows.py gemrb/trunk/gemrb/GUIScripts/iwd2/GUIREC.py Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/GUICommonWindows.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/GUICommonWindows.py 2009-02-07 14:20:14 UTC (rev 5666) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/GUICommonWindows.py 2009-02-07 15:30:32 UTC (rev 5667) @@ -403,43 +403,33 @@ RaceTitle = Table.GetValue (row, 2) return RaceTitle -def GetKitIndex (actor, Class): - #Class = GemRB.GetPlayerStat (actor, IE_CLASS) - KitTable = GemRB.LoadTableObject ("kitlist") +# NOTE: this function returns the kit index in the class table! +# NOTE: this function is called with the primary classes +# TODO: get a multikit character if they are possible and make things work +def GetKitIndex (actor, ClassIndex): + ClassTable = GemRB.LoadTableObject ("classes") Kit = GemRB.GetPlayerStat (actor, IE_KIT) - KitIndex = 0 - if Kit&0xc000ffff == 0x40000000: - print "Kit value: 0x%04X"%Kit - KitIndex = Kit>>16 & 0xfff + # the search offset skips the primary classes + KitIndex = ClassTable.FindValue (2, Kit, 10) + if KitIndex == -1: + return 0 - #looking for kit by the usability flag - if KitIndex == 0: - KitIndex = KitTable.FindValue (6, Kit) - if KitIndex == -1: - KitIndex = 0 - # needed so barbarians don't override other kits - elif Class != KitTable.GetValue (KitIndex, 7): - print "KitIndex before hack", KitIndex - KitIndex = 0 - return KitIndex -def GetActorClassTitle (actor, Class): +def GetActorClassTitle (actor, ClassIndex): ClassTitle = GemRB.GetPlayerStat (actor, IE_TITLE1) + if ClassTitle: + return ClassTitle #Class = GemRB.GetPlayerStat (actor, IE_CLASS) ClassTable = GemRB.LoadTableObject ("classes") - Class = ClassTable.FindValue ( 5, Class ) - KitTable = GemRB.LoadTableObject ("kitlist") - KitIndex = GetKitIndex (actor, Class) + KitIndex = GetKitIndex (actor, ClassIndex) + if KitIndex == 0: + ClassTitle = ClassTable.GetValue (ClassIndex, 0) + else: + ClassTitle = ClassTable.GetValue (KitIndex, 0) - if ClassTitle == 0: - if KitIndex == 0: - ClassTitle=ClassTable.GetValue (Class, 2) - else: - ClassTitle=KitTable.GetValue (KitIndex, 2) - if ClassTitle == "*": return 0 return ClassTitle Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/GUIREC.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/GUIREC.py 2009-02-07 14:20:14 UTC (rev 5666) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/GUIREC.py 2009-02-07 15:30:32 UTC (rev 5667) @@ -218,7 +218,7 @@ #TODO: get special level penalty for subrace adj = 0 RecordsTextArea.Append (": "+str(levelsum) ) - RecordsTextArea.Append ("[/color]\n") + RecordsTextArea.Append ("[/color]") #the class name for highest highest = None tmp = 0 @@ -233,6 +233,7 @@ highest = i tmp = level + RecordsTextArea.Append ("\n") #effective character level if adj: RecordsTextArea.Append (40311,-1) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ave...@us...> - 2009-02-17 17:32:25
|
Revision: 5708 http://gemrb.svn.sourceforge.net/gemrb/?rev=5708&view=rev Author: avenger_teambg Date: 2009-02-17 17:32:20 +0000 (Tue, 17 Feb 2009) Log Message: ----------- cancel buttons for iwd2 save/load screens Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/iwd2/GUILOAD.py gemrb/trunk/gemrb/GUIScripts/iwd2/GUISAVE.py Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/GUILOAD.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/GUILOAD.py 2009-02-17 17:20:31 UTC (rev 5707) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/GUILOAD.py 2009-02-17 17:32:20 UTC (rev 5708) @@ -1,4 +1,28 @@ -#load window +# -*-python-*- +# GemRB - Infinity Engine Emulator +# Copyright (C) 2003 The GemRB Project +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# $Id$ + + +# GUILOAD.py - Load window + +################################################### + import GemRB from LoadScreen import * @@ -7,152 +31,158 @@ GameCount = 0 ScrollBar = 0 -def OnLoad(): +def OnLoad (): global LoadWindow, TextAreaControl, GameCount, ScrollBar - GemRB.SetVar("PlayMode",2) #iwd2 is always using 'mpsave' - GemRB.LoadWindowPack("GUILOAD", 800 ,600) - LoadWindow = GemRB.LoadWindowObject(0) - LoadWindow.SetFrame( ) + GemRB.SetVar ("PlayMode",2) #iwd2 is always using 'mpsave' + GemRB.LoadWindowPack ("GUILOAD", 800 ,600) + LoadWindow = GemRB.LoadWindowObject (0) + LoadWindow.SetFrame () - CancelButton=LoadWindow.GetControl(22) - CancelButton.SetText(13727) - CancelButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "CancelPress") - GemRB.SetVar("LoadIdx",0) - GemRB.SetVar("TopIndex",0) + CancelButton=LoadWindow.GetControl (22) + CancelButton.SetText (13727) + CancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "CancelPress") + CancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) - for i in range(5): - Button = LoadWindow.GetControl(55+i) - Button.SetText(15590) - Button.SetEvent(IE_GUI_BUTTON_ON_PRESS, "LoadGamePress") - Button.SetState(IE_GUI_BUTTON_DISABLED) - Button.SetVarAssoc("LoadIdx",i) + GemRB.SetVar ("LoadIdx",0) + for i in range (5): + Button = LoadWindow.GetControl (55+i) + Button.SetText (15590) + Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "LoadGamePress") + Button.SetState (IE_GUI_BUTTON_DISABLED) + Button.SetVarAssoc ("LoadIdx",i) - Button = LoadWindow.GetControl(60+i) - Button.SetText(13957) - Button.SetEvent(IE_GUI_BUTTON_ON_PRESS, "DeleteGamePress") - Button.SetState(IE_GUI_BUTTON_DISABLED) - Button.SetVarAssoc("LoadIdx",i) + Button = LoadWindow.GetControl (60+i) + Button.SetText (13957) + Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "DeleteGamePress") + Button.SetState (IE_GUI_BUTTON_DISABLED) + Button.SetVarAssoc ("LoadIdx",i) #area previews - Button = LoadWindow.GetControl(1+i) + Button = LoadWindow.GetControl (1+i) Button.SetState (IE_GUI_BUTTON_LOCKED) - Button.SetFlags(IE_GUI_BUTTON_NO_IMAGE|IE_GUI_BUTTON_PICTURE,OP_SET) + Button.SetFlags (IE_GUI_BUTTON_NO_IMAGE|IE_GUI_BUTTON_PICTURE,OP_SET) #PC portraits - for j in range(PARTY_SIZE): - Button = LoadWindow.GetControl(25+i*PARTY_SIZE+j) + for j in range (PARTY_SIZE): + Button = LoadWindow.GetControl (25 + i*PARTY_SIZE + j) Button.SetState (IE_GUI_BUTTON_LOCKED) - Button.SetFlags(IE_GUI_BUTTON_NO_IMAGE|IE_GUI_BUTTON_PICTURE,OP_SET) - Button.SetSize(21, 21) + Button.SetFlags (IE_GUI_BUTTON_NO_IMAGE|IE_GUI_BUTTON_PICTURE,OP_SET) + Button.SetSize (21, 21) - ScrollBar=LoadWindow.GetControl(23) - ScrollBar.SetEvent(IE_GUI_SCROLLBAR_ON_CHANGE, "ScrollBarPress") - GameCount=GemRB.GetSaveGameCount() #count of games in save folder? - TopIndex=GameCount-5 - ScrollBar.SetVarAssoc("TopIndex", GameCount) - ScrollBarPress() - LoadWindow.SetVisible(1) + ScrollBar=LoadWindow.GetControl (23) + ScrollBar.SetEvent (IE_GUI_SCROLLBAR_ON_CHANGE, "ScrollBarPress") + GameCount=GemRB.GetSaveGameCount () #count of games in save folder? + if GameCount>4: + TopIndex = GameCount-5 + else: + TopIndex = 0 + + ScrollBar.SetVarAssoc ("TopIndex", GameCount) + ScrollBarPress () + LoadWindow.SetVisible (1) return -def ScrollBarPress(): +def ScrollBarPress (): #draw load game portraits - Pos = GemRB.GetVar("TopIndex") - for i in range(5): + Pos = GemRB.GetVar ("TopIndex") + for i in range (5): ActPos = Pos + i - Button1 = LoadWindow.GetControl(55+i) - Button2 = LoadWindow.GetControl(60+i) + Button1 = LoadWindow.GetControl (55+i) + Button2 = LoadWindow.GetControl (60+i) if ActPos<GameCount: - Button1.SetState(IE_GUI_BUTTON_ENABLED) - Button2.SetState(IE_GUI_BUTTON_ENABLED) + Button1.SetState (IE_GUI_BUTTON_ENABLED) + Button2.SetState (IE_GUI_BUTTON_ENABLED) else: - Button1.SetState(IE_GUI_BUTTON_DISABLED) - Button2.SetState(IE_GUI_BUTTON_DISABLED) + Button1.SetState (IE_GUI_BUTTON_DISABLED) + Button2.SetState (IE_GUI_BUTTON_DISABLED) if ActPos<GameCount: - Slotname = GemRB.GetSaveGameAttrib(0,ActPos) + Slotname = GemRB.GetSaveGameAttrib (0,ActPos) else: Slotname = "" - Label = LoadWindow.GetControl(0x10000005+i) - Label.SetText(Slotname) + Label = LoadWindow.GetControl (0x10000005+i) + Label.SetText (Slotname) if ActPos<GameCount: - Slotname = GemRB.GetSaveGameAttrib(4,ActPos) + Slotname = GemRB.GetSaveGameAttrib (4,ActPos) else: Slotname = "" - Label = LoadWindow.GetControl(0x1000000a+i) - Label.SetText(Slotname) + Label = LoadWindow.GetControl (0x1000000a+i) + Label.SetText (Slotname) if ActPos<GameCount: - Slotname = GemRB.GetSaveGameAttrib(3,ActPos) + Slotname = GemRB.GetSaveGameAttrib (3,ActPos) else: Slotname = "" - Label = LoadWindow.GetControl(0x1000000f+i) - Label.SetText(Slotname) + Label = LoadWindow.GetControl (0x1000000f+i) + Label.SetText (Slotname) - Button=LoadWindow.GetControl(1+i) + Button=LoadWindow.GetControl (1+i) if ActPos<GameCount: - Button.SetSaveGamePreview(ActPos) + Button.SetSaveGamePreview (ActPos) else: - Button.SetPicture("") - for j in range(PARTY_SIZE): - Button=LoadWindow.GetControl(25+i*PARTY_SIZE+j) + Button.SetPicture ("") + for j in range (PARTY_SIZE): + Button=LoadWindow.GetControl (25 + i*PARTY_SIZE + j) if ActPos<GameCount: - Button.SetSaveGamePortrait(ActPos,j) + Button.SetSaveGamePortrait (ActPos,j) else: - Button.SetPicture("") + Button.SetPicture ("") return -def LoadGamePress(): +def LoadGamePress (): if LoadWindow: - LoadWindow.Unload() - Pos = GemRB.GetVar("TopIndex")+GemRB.GetVar("LoadIdx") + LoadWindow.Unload () + Pos = GemRB.GetVar ("TopIndex")+GemRB.GetVar ("LoadIdx") StartLoadScreen() - GemRB.LoadGame(Pos) # load & start game - GemRB.EnterGame() + GemRB.LoadGame (Pos) #loads and enters savegame + GemRB.EnterGame () return def DeleteGameConfirm(): global GameCount - TopIndex = GemRB.GetVar("TopIndex") - Pos = TopIndex +GemRB.GetVar("LoadIdx") - GemRB.DeleteSaveGame(Pos) + TopIndex = GemRB.GetVar ("TopIndex") + Pos = TopIndex +GemRB.GetVar ("LoadIdx") + GemRB.DeleteSaveGame (Pos) if TopIndex>0: - GemRB.SetVar("TopIndex",TopIndex-1) - GameCount=GemRB.GetSaveGameCount() #count of games in save folder? - ScrollBar.SetVarAssoc("TopIndex", GameCount) - ScrollBarPress() + GemRB.SetVar ("TopIndex",TopIndex-1) + GameCount=GemRB.GetSaveGameCount () #count of games in save folder? + ScrollBar.SetVarAssoc ("TopIndex", GameCount) + ScrollBarPress () if ConfirmWindow: - ConfirmWindow.Unload() - LoadWindow.SetVisible(1) - return + ConfirmWindow.Unload () + LoadWindow.SetVisible (1) + return -def DeleteGameCancel(): +def DeleteGameCancel (): if ConfirmWindow: - ConfirmWindow.Unload() - LoadWindow.SetVisible(1) + ConfirmWindow.Unload () + LoadWindow.SetVisible (1) return -def DeleteGamePress(): +def DeleteGamePress (): global ConfirmWindow - LoadWindow.SetVisible(0) - ConfirmWindow=GemRB.LoadWindowObject(1) - Text=ConfirmWindow.GetControl(0) - Text.SetText(15305) - DeleteButton=ConfirmWindow.GetControl(1) - DeleteButton.SetText(13957) - DeleteButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "DeleteGameConfirm") - CancelButton=ConfirmWindow.GetControl(2) - CancelButton.SetText(13727) - CancelButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "DeleteGameCancel") - ConfirmWindow.SetVisible(1) + LoadWindow.SetVisible (0) + ConfirmWindow=GemRB.LoadWindowObject (1) + Text=ConfirmWindow.GetControl (0) + Text.SetText (15305) + DeleteButton=ConfirmWindow.GetControl (1) + DeleteButton.SetText (13957) + DeleteButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "DeleteGameConfirm") + CancelButton=ConfirmWindow.GetControl (2) + CancelButton.SetText (13727) + CancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "DeleteGameCancel") + CancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) + + ConfirmWindow.SetVisible (1) return -def CancelPress(): +def CancelPress (): if LoadWindow: - LoadWindow.Unload() - GemRB.SetNextScript("Start") + LoadWindow.Unload () + GemRB.SetNextScript ("Start") return Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/GUISAVE.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/GUISAVE.py 2009-02-17 17:20:31 UTC (rev 5707) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/GUISAVE.py 2009-02-17 17:32:20 UTC (rev 5708) @@ -1,4 +1,28 @@ -#load window +# -*-python-*- +# GemRB - Infinity Engine Emulator +# Copyright (C) 2003 The GemRB Project +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# $Id$ + + +# GUISAVE.py - Save window + +################################################### + import GemRB from LoadScreen import * from GUICommon import CloseOtherWindow @@ -27,8 +51,9 @@ CancelButton=Window.GetControl (22) CancelButton.SetText (13727) CancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "OpenSaveWindow") + CancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) + GemRB.SetVar ("LoadIdx",0) - for i in range(5): Button = Window.GetControl (55+i) Button.SetText (15588) @@ -183,6 +208,8 @@ CancelButton=ConfirmWindow.GetControl (8) CancelButton.SetText (13727) CancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "AbortedSaveGame") + CancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) + ConfirmWindow.SetVisible (1) NameField.SetStatus (IE_GUI_CONTROL_FOCUSED) return @@ -230,6 +257,8 @@ CancelButton=ConfirmWindow.GetControl (2) CancelButton.SetText (13727) CancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "DeleteGameCancel") + CancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) + ConfirmWindow.SetVisible (1) return This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ave...@us...> - 2009-02-28 21:43:25
|
Revision: 5757 http://gemrb.svn.sourceforge.net/gemrb/?rev=5757&view=rev Author: avenger_teambg Date: 2009-02-28 21:43:15 +0000 (Sat, 28 Feb 2009) Log Message: ----------- more cancel buttons in iwd2 Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/iwd2/AutoPause.py gemrb/trunk/gemrb/GUIScripts/iwd2/CharSound.py gemrb/trunk/gemrb/GUIScripts/iwd2/Feedback.py gemrb/trunk/gemrb/GUIScripts/iwd2/GUIOPT.py gemrb/trunk/gemrb/GUIScripts/iwd2/GamePlay.py gemrb/trunk/gemrb/GUIScripts/iwd2/Graphics.py gemrb/trunk/gemrb/GUIScripts/iwd2/Movies.py gemrb/trunk/gemrb/GUIScripts/iwd2/Options.py gemrb/trunk/gemrb/GUIScripts/iwd2/SPParty.py gemrb/trunk/gemrb/GUIScripts/iwd2/SPPartyFormation.py gemrb/trunk/gemrb/GUIScripts/iwd2/Songs.py gemrb/trunk/gemrb/GUIScripts/iwd2/Sound.py gemrb/trunk/gemrb/GUIScripts/iwd2/Start.py Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/AutoPause.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/AutoPause.py 2009-02-28 21:30:29 UTC (rev 5756) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/AutoPause.py 2009-02-28 21:43:15 UTC (rev 5757) @@ -1,182 +1,206 @@ -#autopause +# -*-python-*- +# GemRB - Infinity Engine Emulator +# Copyright (C) 2003 The GemRB Project +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# $Id$ + +# autopause options using GUIOPT + import GemRB -def OnLoad(): +def OnLoad (): global AutoPauseWindow, TextAreaControl - GemRB.LoadWindowPack("GUIOPT", 800, 600) - - AutoPauseWindow = GemRB.LoadWindowObject(10) - AutoPauseWindow.SetFrame( ) + GemRB.LoadWindowPack ("GUIOPT", 800, 600) - TextAreaControl = AutoPauseWindow.GetControl(15) + AutoPauseWindow = GemRB.LoadWindowObject (10) + AutoPauseWindow.SetFrame ( ) - ChHitButton = AutoPauseWindow.GetControl(17) - ChHitButtonB = AutoPauseWindow.GetControl(1) - ChHitButtonB.SetSprites("GBTNOPT4", 0, 0, 1, 2, 3) + TextAreaControl = AutoPauseWindow.GetControl (15) - ChInjured = AutoPauseWindow.GetControl(18) - ChInjuredB = AutoPauseWindow.GetControl(2) - ChInjuredB.SetSprites("GBTNOPT4", 0, 0, 1, 2, 3) + ChHitButton = AutoPauseWindow.GetControl (17) + ChHitButtonB = AutoPauseWindow.GetControl (1) + ChHitButtonB.SetSprites ("GBTNOPT4", 0, 0, 1, 2, 3) - ChDeath = AutoPauseWindow.GetControl(19) - ChDeathB = AutoPauseWindow.GetControl(3) - ChDeathB.SetSprites("GBTNOPT4", 0, 0, 1, 2, 3) + ChInjured = AutoPauseWindow.GetControl (18) + ChInjuredB = AutoPauseWindow.GetControl (2) + ChInjuredB.SetSprites ("GBTNOPT4", 0, 0, 1, 2, 3) - ChAttacked = AutoPauseWindow.GetControl(20) - ChAttackedB = AutoPauseWindow.GetControl(4) - ChAttackedB.SetSprites("GBTNOPT4", 0, 0, 1, 2, 3) + ChDeath = AutoPauseWindow.GetControl (19) + ChDeathB = AutoPauseWindow.GetControl (3) + ChDeathB.SetSprites ("GBTNOPT4", 0, 0, 1, 2, 3) - WeaponUnusable = AutoPauseWindow.GetControl(21) - WeaponUnusableB = AutoPauseWindow.GetControl(5) - WeaponUnusableB.SetSprites("GBTNOPT4", 0, 0, 1, 2, 3) + ChAttacked = AutoPauseWindow.GetControl (20) + ChAttackedB = AutoPauseWindow.GetControl (4) + ChAttackedB.SetSprites ("GBTNOPT4", 0, 0, 1, 2, 3) - TargetDestroyed = AutoPauseWindow.GetControl(22) - TargetDestroyedB = AutoPauseWindow.GetControl(13) - TargetDestroyedB.SetSprites("GBTNOPT4", 0, 0, 1, 2, 3) + WeaponUnusable = AutoPauseWindow.GetControl (21) + WeaponUnusableB = AutoPauseWindow.GetControl (5) + WeaponUnusableB.SetSprites ("GBTNOPT4", 0, 0, 1, 2, 3) - EndOfRound = AutoPauseWindow.GetControl(24) - EndOfRoundB = AutoPauseWindow.GetControl(25) - EndOfRoundB.SetSprites("GBTNOPT4", 0, 0, 1, 2, 3) + TargetDestroyed = AutoPauseWindow.GetControl (22) + TargetDestroyedB = AutoPauseWindow.GetControl (13) + TargetDestroyedB.SetSprites ("GBTNOPT4", 0, 0, 1, 2, 3) - EnemySighted = AutoPauseWindow.GetControl(31) - EnemySightedB = AutoPauseWindow.GetControl(30) - EnemySightedB.SetSprites("GBTNOPT4", 0, 0, 1, 2, 3) + EndOfRound = AutoPauseWindow.GetControl (24) + EndOfRoundB = AutoPauseWindow.GetControl (25) + EndOfRoundB.SetSprites ("GBTNOPT4", 0, 0, 1, 2, 3) - SpellCast = AutoPauseWindow.GetControl(37) - SpellCastB = AutoPauseWindow.GetControl(36) - SpellCastB.SetSprites("GBTNOPT4", 0, 0, 1, 2, 3) + EnemySighted = AutoPauseWindow.GetControl (31) + EnemySightedB = AutoPauseWindow.GetControl (30) + EnemySightedB.SetSprites ("GBTNOPT4", 0, 0, 1, 2, 3) - TrapFound = AutoPauseWindow.GetControl(28) - TrapFoundB = AutoPauseWindow.GetControl(26) - TrapFoundB.SetSprites("GBTNOPT4", 0, 0, 1, 2, 3) + SpellCast = AutoPauseWindow.GetControl (37) + SpellCastB = AutoPauseWindow.GetControl (36) + SpellCastB.SetSprites ("GBTNOPT4", 0, 0, 1, 2, 3) - AutopauseCenter = AutoPauseWindow.GetControl(34) - AutopauseCenterB = AutoPauseWindow.GetControl(33) - AutopauseCenterB.SetSprites("GBTNOPT4", 0, 0, 1, 2, 3) + TrapFound = AutoPauseWindow.GetControl (28) + TrapFoundB = AutoPauseWindow.GetControl (26) + TrapFoundB.SetSprites ("GBTNOPT4", 0, 0, 1, 2, 3) - OkButton = AutoPauseWindow.GetControl(11) - CancelButton = AutoPauseWindow.GetControl(14) - - TextAreaControl.SetText(18044) - OkButton.SetText(11973) - CancelButton.SetText(13727) + AutopauseCenter = AutoPauseWindow.GetControl (34) + AutopauseCenterB = AutoPauseWindow.GetControl (33) + AutopauseCenterB.SetSprites ("GBTNOPT4", 0, 0, 1, 2, 3) - ChHitButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "ChHitButtonPress") - ChHitButtonB.SetFlags(IE_GUI_BUTTON_CHECKBOX, OP_OR) - ChHitButtonB.SetEvent(IE_GUI_BUTTON_ON_PRESS, "ChHitButtonPress") + OkButton = AutoPauseWindow.GetControl (11) + CancelButton = AutoPauseWindow.GetControl (14) - ChInjured.SetEvent(IE_GUI_BUTTON_ON_PRESS, "ChInjuredPress") - ChInjuredB.SetFlags(IE_GUI_BUTTON_CHECKBOX, OP_OR) - ChInjuredB.SetEvent(IE_GUI_BUTTON_ON_PRESS, "ChInjuredPress") + TextAreaControl.SetText (18044) + OkButton.SetText (11973) + OkButton.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_OR) - ChDeath.SetEvent(IE_GUI_BUTTON_ON_PRESS, "ChDeathPress") - ChDeathB.SetFlags(IE_GUI_BUTTON_CHECKBOX, OP_OR) - ChDeathB.SetEvent(IE_GUI_BUTTON_ON_PRESS, "ChDeathPress") + CancelButton.SetText (13727) + CancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) - ChAttacked.SetEvent(IE_GUI_BUTTON_ON_PRESS, "ChAttackedPress") - ChAttackedB.SetFlags(IE_GUI_BUTTON_CHECKBOX, OP_OR) - ChAttackedB.SetEvent(IE_GUI_BUTTON_ON_PRESS, "ChAttackedPress") + ChHitButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "ChHitButtonPress") + ChHitButtonB.SetFlags (IE_GUI_BUTTON_CHECKBOX, OP_OR) + ChHitButtonB.SetEvent (IE_GUI_BUTTON_ON_PRESS, "ChHitButtonPress") - WeaponUnusable.SetEvent(IE_GUI_BUTTON_ON_PRESS, "WeaponUnusablePress") - WeaponUnusableB.SetFlags(IE_GUI_BUTTON_CHECKBOX, OP_OR) - WeaponUnusableB.SetEvent(IE_GUI_BUTTON_ON_PRESS, "WeaponUnusablePress") + ChInjured.SetEvent (IE_GUI_BUTTON_ON_PRESS, "ChInjuredPress") + ChInjuredB.SetFlags (IE_GUI_BUTTON_CHECKBOX, OP_OR) + ChInjuredB.SetEvent (IE_GUI_BUTTON_ON_PRESS, "ChInjuredPress") - TargetDestroyed.SetEvent(IE_GUI_BUTTON_ON_PRESS, "TargetDestroyedPress") - TargetDestroyedB.SetFlags(IE_GUI_BUTTON_CHECKBOX, OP_OR) - TargetDestroyedB.SetEvent(IE_GUI_BUTTON_ON_PRESS, "TargetDestroyedPress") + ChDeath.SetEvent (IE_GUI_BUTTON_ON_PRESS, "ChDeathPress") + ChDeathB.SetFlags (IE_GUI_BUTTON_CHECKBOX, OP_OR) + ChDeathB.SetEvent (IE_GUI_BUTTON_ON_PRESS, "ChDeathPress") - EndOfRound.SetEvent(IE_GUI_BUTTON_ON_PRESS, "EndOfRoundPress") - EndOfRoundB.SetFlags(IE_GUI_BUTTON_CHECKBOX, OP_OR) - EndOfRoundB.SetEvent(IE_GUI_BUTTON_ON_PRESS, "EndOfRoundPress") + ChAttacked.SetEvent (IE_GUI_BUTTON_ON_PRESS, "ChAttackedPress") + ChAttackedB.SetFlags (IE_GUI_BUTTON_CHECKBOX, OP_OR) + ChAttackedB.SetEvent (IE_GUI_BUTTON_ON_PRESS, "ChAttackedPress") - EnemySighted.SetEvent(IE_GUI_BUTTON_ON_PRESS, "EnemySightedPress") - EnemySightedB.SetFlags(IE_GUI_BUTTON_CHECKBOX, OP_OR) - EnemySightedB.SetEvent(IE_GUI_BUTTON_ON_PRESS, "EnemySightedPress") + WeaponUnusable.SetEvent (IE_GUI_BUTTON_ON_PRESS, "WeaponUnusablePress") + WeaponUnusableB.SetFlags (IE_GUI_BUTTON_CHECKBOX, OP_OR) + WeaponUnusableB.SetEvent (IE_GUI_BUTTON_ON_PRESS, "WeaponUnusablePress") - SpellCast.SetEvent(IE_GUI_BUTTON_ON_PRESS, "SpellCastPress") - SpellCastB.SetFlags(IE_GUI_BUTTON_CHECKBOX, OP_OR) - SpellCastB.SetEvent(IE_GUI_BUTTON_ON_PRESS, "SpellCastPress") + TargetDestroyed.SetEvent (IE_GUI_BUTTON_ON_PRESS, "TargetDestroyedPress") + TargetDestroyedB.SetFlags (IE_GUI_BUTTON_CHECKBOX, OP_OR) + TargetDestroyedB.SetEvent (IE_GUI_BUTTON_ON_PRESS, "TargetDestroyedPress") - TrapFound.SetEvent(IE_GUI_BUTTON_ON_PRESS, "TrapFoundPress") - TrapFoundB.SetFlags(IE_GUI_BUTTON_CHECKBOX, OP_OR) - TrapFoundB.SetEvent(IE_GUI_BUTTON_ON_PRESS, "TrapFoundPress") + EndOfRound.SetEvent (IE_GUI_BUTTON_ON_PRESS, "EndOfRoundPress") + EndOfRoundB.SetFlags (IE_GUI_BUTTON_CHECKBOX, OP_OR) + EndOfRoundB.SetEvent (IE_GUI_BUTTON_ON_PRESS, "EndOfRoundPress") - AutopauseCenter.SetEvent(IE_GUI_BUTTON_ON_PRESS, "AutopauseCenterPress") - AutopauseCenterB.SetFlags(IE_GUI_BUTTON_CHECKBOX, OP_OR) - AutopauseCenterB.SetEvent(IE_GUI_BUTTON_ON_PRESS, "AutopauseCenterPress") + EnemySighted.SetEvent (IE_GUI_BUTTON_ON_PRESS, "EnemySightedPress") + EnemySightedB.SetFlags (IE_GUI_BUTTON_CHECKBOX, OP_OR) + EnemySightedB.SetEvent (IE_GUI_BUTTON_ON_PRESS, "EnemySightedPress") - OkButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "OkPress") - CancelButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "CancelPress") + SpellCast.SetEvent (IE_GUI_BUTTON_ON_PRESS, "SpellCastPress") + SpellCastB.SetFlags (IE_GUI_BUTTON_CHECKBOX, OP_OR) + SpellCastB.SetEvent (IE_GUI_BUTTON_ON_PRESS, "SpellCastPress") - AutopauseCenterB.SetVarAssoc("Auto Pause Center",1) + TrapFound.SetEvent (IE_GUI_BUTTON_ON_PRESS, "TrapFoundPress") + TrapFoundB.SetFlags (IE_GUI_BUTTON_CHECKBOX, OP_OR) + TrapFoundB.SetEvent (IE_GUI_BUTTON_ON_PRESS, "TrapFoundPress") - ChHitButtonB.SetVarAssoc("Auto Pause State",1) - ChInjuredB.SetVarAssoc("Auto Pause State",2) - ChDeathB.SetVarAssoc("Auto Pause State",4) - ChAttackedB.SetVarAssoc("Auto Pause State",8) - WeaponUnusableB.SetVarAssoc("Auto Pause State",16) - TargetDestroyedB.SetVarAssoc("Auto Pause State",32) - EndOfRoundB.SetVarAssoc("Auto Pause State",64) - EnemySightedB.SetVarAssoc("Auto Pause State",128) - SpellCastB.SetVarAssoc("Auto Pause State",256) - TrapFoundB.SetVarAssoc("Auto Pause State",512) + AutopauseCenter.SetEvent (IE_GUI_BUTTON_ON_PRESS, "AutopauseCenterPress") + AutopauseCenterB.SetFlags (IE_GUI_BUTTON_CHECKBOX, OP_OR) + AutopauseCenterB.SetEvent (IE_GUI_BUTTON_ON_PRESS, "AutopauseCenterPress") - AutoPauseWindow.SetVisible(1) + OkButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "OkPress") + CancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "CancelPress") + + AutopauseCenterB.SetVarAssoc ("Auto Pause Center",1) + + ChHitButtonB.SetVarAssoc ("Auto Pause State",1) + ChInjuredB.SetVarAssoc ("Auto Pause State",2) + ChDeathB.SetVarAssoc ("Auto Pause State",4) + ChAttackedB.SetVarAssoc ("Auto Pause State",8) + WeaponUnusableB.SetVarAssoc ("Auto Pause State",16) + TargetDestroyedB.SetVarAssoc ("Auto Pause State",32) + EndOfRoundB.SetVarAssoc ("Auto Pause State",64) + EnemySightedB.SetVarAssoc ("Auto Pause State",128) + SpellCastB.SetVarAssoc ("Auto Pause State",256) + TrapFoundB.SetVarAssoc ("Auto Pause State",512) + + AutoPauseWindow.SetVisible (1) return -def ChHitButtonPress(): - TextAreaControl.SetText(18032) +def ChHitButtonPress (): + TextAreaControl.SetText (18032) return -def ChInjuredPress(): - TextAreaControl.SetText(18033) +def ChInjuredPress (): + TextAreaControl.SetText (18033) return -def ChDeathPress(): - TextAreaControl.SetText(18034) +def ChDeathPress (): + TextAreaControl.SetText (18034) return -def ChAttackedPress(): - TextAreaControl.SetText(18035) +def ChAttackedPress (): + TextAreaControl.SetText (18035) return -def WeaponUnusablePress(): - TextAreaControl.SetText(18036) +def WeaponUnusablePress (): + TextAreaControl.SetText (18036) return -def TargetDestroyedPress(): - TextAreaControl.SetText(18037) +def TargetDestroyedPress (): + TextAreaControl.SetText (18037) return -def EndOfRoundPress(): - TextAreaControl.SetText(10640) +def EndOfRoundPress (): + TextAreaControl.SetText (10640) return -def EnemySightedPress(): - TextAreaControl.SetText(23514) +def EnemySightedPress (): + TextAreaControl.SetText (23514) return -def SpellCastPress(): - TextAreaControl.SetText(26311) +def SpellCastPress (): + TextAreaControl.SetText (26311) return -def TrapFoundPress(): - TextAreaControl.SetText(18560) #iwd2 has it here +def TrapFoundPress (): + TextAreaControl.SetText (18560) #iwd2 has it here return -def AutopauseCenterPress(): - TextAreaControl.SetText(24888) #iwd2 has it here +def AutopauseCenterPress (): + TextAreaControl.SetText (24888) #iwd2 has it here return -def OkPress(): +def OkPress (): if AutoPauseWindow: - AutoPauseWindow.Unload() - GemRB.SetNextScript("GamePlay") + AutoPauseWindow.Unload () + GemRB.SetNextScript ("GamePlay") return -def CancelPress(): +def CancelPress (): if AutoPauseWindow: - AutoPauseWindow.Unload() - GemRB.SetNextScript("GamePlay") + AutoPauseWindow.Unload () + GemRB.SetNextScript ("GamePlay") return Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/CharSound.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/CharSound.py 2009-02-28 21:30:29 UTC (rev 5756) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/CharSound.py 2009-02-28 21:43:15 UTC (rev 5757) @@ -1,4 +1,25 @@ -#Character Sound Options Menu +# -*-python-*- +# GemRB - Infinity Engine Emulator +# Copyright (C) 2003 The GemRB Project +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# $Id$ + +#Character Sound Options Menu using GUIOPT + import GemRB CSoundWindow = 0 @@ -29,26 +50,29 @@ CancelButton = CSoundWindow.GetControl(25) TextAreaControl.SetText(18041) OkButton.SetText(11973) + OkButton.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_OR) + CancelButton.SetText(13727) - + CancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) + SubtitlesButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "SubtitlesPress") SubtitlesButtonB.SetEvent(IE_GUI_BUTTON_ON_PRESS, "SubtitlesPress") SubtitlesButtonB.SetFlags(IE_GUI_BUTTON_CHECKBOX, OP_OR) SubtitlesButtonB.SetVarAssoc("Subtitles", 1) SubtitlesButtonB.SetSprites("GBTNOPT4", 0, 0, 1, 2, 3) - + AttackSoundButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "AttackSoundPress") AttackSoundButtonB.SetEvent(IE_GUI_BUTTON_ON_PRESS, "AttackSoundPress") AttackSoundButtonB.SetFlags(IE_GUI_BUTTON_CHECKBOX, OP_OR) AttackSoundButtonB.SetVarAssoc("Attack Sound", 1) #can't find the right variable name, this is a dummy name AttackSoundButtonB.SetSprites("GBTNOPT4", 0, 0, 1, 2, 3) - + MovementSoundButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "MovementSoundPress") MovementSoundButtonB.SetEvent(IE_GUI_BUTTON_ON_PRESS, "MovementSoundPress") MovementSoundButtonB.SetFlags(IE_GUI_BUTTON_CHECKBOX, OP_OR) MovementSoundButtonB.SetVarAssoc("Movement Sound", 1) #can't find the right variable name, this is a dummy name MovementSoundButtonB.SetSprites("GBTNOPT4", 0, 0, 1, 2, 3) - + CommandSoundButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "CommandSoundPress") CSAlwaysButtonB.SetEvent(IE_GUI_BUTTON_ON_PRESS, "CommandSoundPress") CSAlwaysButtonB.SetFlags(IE_GUI_BUTTON_RADIOBUTTON, OP_OR) @@ -62,7 +86,7 @@ CSNeverButtonB.SetFlags(IE_GUI_BUTTON_RADIOBUTTON, OP_OR) CSNeverButtonB.SetVarAssoc("Command Sounds Frequency", 1) CSNeverButtonB.SetSprites("GBTNOPT4", 0, 0, 1, 2, 3) - + SelectionSoundButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "SelectionSoundPress") SSAlwaysButtonB.SetEvent(IE_GUI_BUTTON_ON_PRESS, "SelectionSoundPress") SSAlwaysButtonB.SetFlags(IE_GUI_BUTTON_RADIOBUTTON, OP_OR) @@ -76,38 +100,38 @@ SSNeverButtonB.SetFlags(IE_GUI_BUTTON_RADIOBUTTON, OP_OR) SSNeverButtonB.SetVarAssoc("Selection Sounds Frequency", 1) SSNeverButtonB.SetSprites("GBTNOPT4", 0, 0, 1, 2, 3) - + OkButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "OkPress") CancelButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "CancelPress") CSoundWindow.SetVisible(1) return - + def SubtitlesPress(): TextAreaControl.SetText(18015) return - + def AttackSoundPress(): TextAreaControl.SetText(18013) return - + def MovementSoundPress(): TextAreaControl.SetText(18014) return - + def CommandSoundPress(): TextAreaControl.SetText(18016) return - + def SelectionSoundPress(): TextAreaControl.SetText(11352) return - + def OkPress(): if CSoundWindow: CSoundWindow.Unload() GemRB.SetNextScript("Options") return - + def CancelPress(): if CSoundWindow: CSoundWindow.Unload() Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/Feedback.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/Feedback.py 2009-02-28 21:30:29 UTC (rev 5756) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/Feedback.py 2009-02-28 21:43:15 UTC (rev 5757) @@ -40,15 +40,18 @@ Miscellaneous = FeedbackWindow.GetControl(37) MiscellaneousB = FeedbackWindow.GetControl(15) MiscellaneousB.SetSprites("GBTNOPT4", 0, 0, 1, 2, 3) - + OkButton = FeedbackWindow.GetControl(26) CancelButton = FeedbackWindow.GetControl(27) TextAreaControl = FeedbackWindow.GetControl(28) TextAreaControl.SetText(18043) OkButton.SetText(11973) + OkButton.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_OR) + CancelButton.SetText(13727) - + CancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) + MarkerSlider.SetEvent(IE_GUI_BUTTON_ON_PRESS, "MarkerSliderPress") MarkerSliderS.SetEvent(IE_GUI_SLIDER_ON_CHANGE, "MarkerSliderPress") MarkerSliderS.SetVarAssoc("GUI Feedback Level",1) Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/GUIOPT.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/GUIOPT.py 2009-02-28 21:30:29 UTC (rev 5756) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/GUIOPT.py 2009-02-28 21:43:15 UTC (rev 5757) @@ -122,6 +122,7 @@ KeyboardButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "OpenKeyboardWindow") ReturnButton.SetText (10308) ReturnButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "OpenOptionsWindow") + ReturnButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) VersionLabel = Window.GetControl (0x1000000B) VersionLabel.SetText (GEMRB_VERSION) @@ -595,11 +596,13 @@ Button = Window.GetControl (0) Button.SetText (15590) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "LoadGamePress") + Button.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_OR) # Cancel Button = Window.GetControl (1) Button.SetText (13727) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "CloseLoadMsgWindow") + Button.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) # Loading a game will destroy ... Text = Window.GetControl (3) Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/GamePlay.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/GamePlay.py 2009-02-28 21:30:29 UTC (rev 5756) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/GamePlay.py 2009-02-28 21:43:15 UTC (rev 5757) @@ -33,8 +33,13 @@ OkButton = GamePlayWindow.GetControl(7) CancelButton = GamePlayWindow.GetControl(20) TextAreaControl.SetText(18042) + OkButton.SetText(11973) + OkButton.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_OR) + CancelButton.SetText(13727) + CancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) + FeedbackButton.SetText(17163) AutoPauseButton.SetText(17166) DelayButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "DelayPress") Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/Graphics.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/Graphics.py 2009-02-28 21:30:29 UTC (rev 5756) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/Graphics.py 2009-02-28 21:43:15 UTC (rev 5757) @@ -79,6 +79,8 @@ TextAreaControl.SetText(18038) OkButton.SetText(11973) CancelButton.SetText(13727) + CancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) + BrightnessButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "BrightnessPress") BrightnessSlider.SetEvent(IE_GUI_SLIDER_ON_CHANGE, "BrightnessPress") ContrastButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "ContrastPress") Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/Movies.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/Movies.py 2009-02-28 21:30:29 UTC (rev 5756) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/Movies.py 2009-02-28 21:43:15 UTC (rev 5757) @@ -25,9 +25,12 @@ PlayButton.SetText(17318) CreditsButton.SetText(15591) DoneButton.SetText(11973) + DoneButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) + PlayButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "PlayPress") CreditsButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "CreditsPress") DoneButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "DonePress") + MovieWindow.SetVisible(1) return Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/Options.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/Options.py 2009-02-28 21:30:29 UTC (rev 5756) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/Options.py 2009-02-28 21:43:15 UTC (rev 5757) @@ -1,4 +1,25 @@ -#Options Menu +# -*-python-*- +# GemRB - Infinity Engine Emulator +# Copyright (C) 2003 The GemRB Project +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# $Id$ + +# Options.py - scripts to control options windows mostly from GUIOPT winpack + import GemRB OptionsWindow = 0 @@ -6,36 +27,36 @@ def OnLoad(): global OptionsWindow GemRB.LoadWindowPack("GUIOPT", 800, 600) - + MessageBarWindow = GemRB.LoadWindowObject(0) MessageBarWindow.SetVisible(1) #This will startup the window as grayed - + CharactersBarWindow = GemRB.LoadWindowObject(1) CharactersBarWindow.SetVisible(1) - + GemRB.DrawWindows() - + MessageBarWindow.SetVisible(0) CharactersBarWindow.SetVisible(0) - + if MessageBarWindow: MessageBarWindow.Unload() if CharactersBarWindow: CharactersBarWindow.Unload() - + OptionsWindow = GemRB.LoadWindowObject(13) OptionsWindow.SetFrame () - + VersionLabel = OptionsWindow.GetControl(0x1000000B) VersionLabel.SetText(GEMRB_VERSION) - + GraphicsButton = OptionsWindow.GetControl(7) SoundButton = OptionsWindow.GetControl(8) GamePlayButton = OptionsWindow.GetControl(9) MoviesButton = OptionsWindow.GetControl(14) KeyboardButton = OptionsWindow.GetControl(13) ReturnButton = OptionsWindow.GetControl(11) - + GraphicsButton.SetText(17162) GraphicsButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "GraphicsPress") SoundButton.SetText(17164) @@ -45,35 +66,37 @@ MoviesButton.SetText(15415) MoviesButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "MoviePress") KeyboardButton.SetText(33468) - MoviesButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "KeyboardPress") + KeyboardButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "KeyboardPress") + ReturnButton.SetText(10308) ReturnButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "ReturnPress") - + ReturnButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) + OptionsWindow.SetVisible(1) - + return - + def ReturnPress(): global OptionsWindow if OptionsWindow: OptionsWindow.Unload() GemRB.SetNextScript("Start") return - + def GraphicsPress(): global OptionsWindow if OptionsWindow: OptionsWindow.Unload() GemRB.SetNextScript("Graphics") return - + def SoundPress(): global OptionsWindow if OptionsWindow: OptionsWindow.Unload() GemRB.SetNextScript("Sound") return - + def GamePlayPress(): global OptionsWindow if OptionsWindow: Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/SPParty.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/SPParty.py 2009-02-28 21:30:29 UTC (rev 5756) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/SPParty.py 2009-02-28 21:43:15 UTC (rev 5757) @@ -26,6 +26,7 @@ CancelButton = PartySelectWindow.GetControl(11) CancelButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "CancelPress") CancelButton.SetText(13727) + CancelButton.SetFlags(IE_GUI_BUTTON_CANCEL,OP_OR) DoneButton = PartySelectWindow.GetControl(10) DoneButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "DonePress") Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/SPPartyFormation.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/SPPartyFormation.py 2009-02-28 21:30:29 UTC (rev 5756) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/SPPartyFormation.py 2009-02-28 21:43:15 UTC (rev 5757) @@ -1,110 +1,135 @@ -#Single Player Party Formation +# -*-python-*- +# GemRB - Infinity Engine Emulator +# Copyright (C) 2003 The GemRB Project +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# $Id$ + +# Single Player Party Formation (GUISP) + import GemRB PartyFormationWindow = 0 ExitWindow = 0 -def OnLoad(): +def OnLoad (): global PartyFormationWindow - GemRB.LoadWindowPack("GUISP", 800, 600) - - PartyFormationWindow = GemRB.LoadWindowObject(0) - PartyFormationWindow.SetFrame( ) - ExitButton = PartyFormationWindow.GetControl(30) - ExitButton.SetText(13906) - ExitButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "ExitPress") - ModifyCharactersButton = PartyFormationWindow.GetControl(43) - ModifyCharactersButton.SetText(18816) - ModifyCharactersButton.SetState(IE_GUI_BUTTON_DISABLED) - ModifyCharactersButton.SetEvent(IE_GUI_BUTTON_ON_PRESS,"ModifyCharactersPress") + GemRB.LoadWindowPack ("GUISP", 800, 600) - DoneButton = PartyFormationWindow.GetControl(28) - DoneButton.SetText(11973) + PartyFormationWindow = GemRB.LoadWindowObject (0) + PartyFormationWindow.SetFrame ( ) + ExitButton = PartyFormationWindow.GetControl (30) + ExitButton.SetText (13906) + ExitButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "ExitPress") + ExitButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) + + ModifyCharactersButton = PartyFormationWindow.GetControl (43) + ModifyCharactersButton.SetText (18816) + ModifyCharactersButton.SetState (IE_GUI_BUTTON_DISABLED) + ModifyCharactersButton.SetEvent (IE_GUI_BUTTON_ON_PRESS,"ModifyCharactersPress") + + DoneButton = PartyFormationWindow.GetControl (28) + DoneButton.SetText (11973) + DoneButton.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_OR) + Portraits = 0 - - for i in range(18,24): - Label = PartyFormationWindow.GetControl(0x10000012+i) + + for i in range (18,24): + Label = PartyFormationWindow.GetControl (0x10000012+i) #removing this label, it just disturbs us - Label.SetSize(0, 0) - Button = PartyFormationWindow.GetControl(i-12) - ResRef = GemRB.GetPlayerPortrait(i-17, 1) + Label.SetSize (0, 0) + Button = PartyFormationWindow.GetControl (i-12) + ResRef = GemRB.GetPlayerPortrait (i-17, 1) if ResRef == "": - Button.SetFlags(IE_GUI_BUTTON_NORMAL,OP_SET) + Button.SetFlags (IE_GUI_BUTTON_NORMAL,OP_SET) else: - Button.SetPicture(ResRef) - Button.SetFlags(IE_GUI_BUTTON_PICTURE, OP_OR) + Button.SetPicture (ResRef) + Button.SetFlags (IE_GUI_BUTTON_PICTURE, OP_OR) Portraits = Portraits+1 - Button.SetVarAssoc("Slot",i-17) - Button.SetEvent(IE_GUI_BUTTON_ON_PRESS, "GeneratePress") + Button.SetVarAssoc ("Slot",i-17) + Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "GeneratePress") - Button = PartyFormationWindow.GetControl(i) - Button.SetVarAssoc("Slot",i-17) + Button = PartyFormationWindow.GetControl (i) + Button.SetVarAssoc ("Slot",i-17) if ResRef == "": - Button.SetText(10264) + Button.SetText (10264) else: - Button.SetText(GemRB.GetPlayerName(i-17,0) ) + Button.SetText (GemRB.GetPlayerName (i-17,0) ) - Button.SetEvent(IE_GUI_BUTTON_ON_PRESS, "GeneratePress") - + Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "GeneratePress") + if Portraits == 0: - DoneButton.SetState(IE_GUI_BUTTON_DISABLED) + DoneButton.SetState (IE_GUI_BUTTON_DISABLED) else: - DoneButton.SetState(IE_GUI_BUTTON_ENABLED) - DoneButton.SetFlags(IE_GUI_BUTTON_DEFAULT, OP_OR) - DoneButton.SetEvent(IE_GUI_BUTTON_ON_PRESS,"EnterGamePress") + DoneButton.SetState (IE_GUI_BUTTON_ENABLED) + DoneButton.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_OR) + DoneButton.SetEvent (IE_GUI_BUTTON_ON_PRESS,"EnterGamePress") - PartyFormationWindow.SetVisible(1) + PartyFormationWindow.SetVisible (1) return - -def ExitPress(): + +def ExitPress (): global PartyFormationWindow, ExitWindow - PartyFormationWindow.SetVisible(0) - ExitWindow = GemRB.LoadWindowObject(7) - - TextArea = ExitWindow.GetControl(0) - TextArea.SetText(11329) - - CancelButton = ExitWindow.GetControl(2) - CancelButton.SetText(13727) - CancelButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "ExitCancelPress") - - DoneButton = ExitWindow.GetControl(1) - DoneButton.SetText(11973) - DoneButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "ExitDonePress") - - ExitWindow.SetVisible(1) + PartyFormationWindow.SetVisible (0) + ExitWindow = GemRB.LoadWindowObject (7) + + TextArea = ExitWindow.GetControl (0) + TextArea.SetText (11329) + + CancelButton = ExitWindow.GetControl (2) + CancelButton.SetText (13727) + CancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "ExitCancelPress") + + DoneButton = ExitWindow.GetControl (1) + DoneButton.SetText (11973) + DoneButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "ExitDonePress") + + ExitWindow.SetVisible (1) return - -def ExitDonePress(): + +def ExitDonePress (): global PartyFormationWindow, ExitWindow if ExitWindow: - ExitWindow.Unload() + ExitWindow.Unload () if PartyFormationWindow: - PartyFormationWindow.Unload() - GemRB.SetNextScript("Start") + PartyFormationWindow.Unload () + GemRB.SetNextScript ("Start") return - -def ExitCancelPress(): + +def ExitCancelPress (): global PartyFormationWindow, ExitWindow if ExitWindow: - ExitWindow.Unload() - PartyFormationWindow.SetVisible(1) + ExitWindow.Unload () + PartyFormationWindow.SetVisible (1) return - -def GeneratePress(): + +def GeneratePress (): global PartyFormationWindow - slot = GemRB.GetVar("Slot") - ResRef = GemRB.GetPlayerPortrait(slot, 0) + slot = GemRB.GetVar ("Slot") + ResRef = GemRB.GetPlayerPortrait (slot, 0) if ResRef: print "Already existing slot, we should drop it" if PartyFormationWindow: - PartyFormationWindow.Unload() - GemRB.SetNextScript("CharGen") + PartyFormationWindow.Unload () + GemRB.SetNextScript ("CharGen") return -def EnterGamePress(): - GemRB.SetVar("PlayMode",2) #iwd2 is always using 'mpsave' - GemRB.EnterGame() +def EnterGamePress (): + GemRB.SetVar ("PlayMode",2) #iwd2 is always using 'mpsave' + GemRB.EnterGame () return Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/Songs.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/Songs.py 2009-02-28 21:30:29 UTC (rev 5756) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/Songs.py 2009-02-28 21:43:15 UTC (rev 5757) @@ -24,6 +24,8 @@ PlayButton.SetText(17318) CreditsButton.SetText(15591) DoneButton.SetText(11973) + DoneButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) + PlayButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "PlayPress") CreditsButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "CreditsPress") DoneButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "DonePress") Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/Sound.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/Sound.py 2009-02-28 21:30:29 UTC (rev 5756) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/Sound.py 2009-02-28 21:43:15 UTC (rev 5757) @@ -29,8 +29,13 @@ CancelButton = SoundWindow.GetControl(25) TextAreaControl.SetText(18040) CharacterSoundButton.SetText(17778) + OkButton.SetText(11973) + OkButton.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_OR) + CancelButton.SetText(13727) + CancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) + AmbientButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "AmbientPress") AmbientSlider.SetEvent(IE_GUI_SLIDER_ON_CHANGE, "AmbientPress") AmbientSlider.SetVarAssoc("Volume Ambients",10) @@ -38,7 +43,7 @@ SoundEffectsButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "SoundEffectsPress") SoundEffectsSlider.SetEvent(IE_GUI_SLIDER_ON_CHANGE, "SoundEffectsPress") SoundEffectsSlider.SetVarAssoc("Volume SFX",10) - + DialogueButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "DialoguePress") DialogueSlider.SetEvent(IE_GUI_SLIDER_ON_CHANGE, "DialoguePress") DialogueSlider.SetVarAssoc("Volume Voices",10) @@ -62,45 +67,45 @@ CancelButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "CancelPress") SoundWindow.SetVisible(1) return - + def AmbientPress(): TextAreaControl.SetText(18008) GemRB.UpdateAmbientsVolume () return - + def SoundEffectsPress(): TextAreaControl.SetText(18009) return - + def DialoguePress(): TextAreaControl.SetText(18010) return - + def MusicPress(): TextAreaControl.SetText(18011) GemRB.UpdateMusicVolume () return - + def MoviesPress(): TextAreaControl.SetText(18012) return - + def EnvironmentalPress(): TextAreaControl.SetText(18022) return - + def CharacterSoundPress(): if SoundWindow: SoundWindow.Unload() GemRB.SetNextScript("CharSound") return - + def OkPress(): if SoundWindow: SoundWindow.Unload() GemRB.SetNextScript("Options") return - + def CancelPress(): if SoundWindow: SoundWindow.Unload() Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/Start.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/Start.py 2009-02-28 21:30:29 UTC (rev 5756) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/Start.py 2009-02-28 21:43:15 UTC (rev 5757) @@ -1,3 +1,24 @@ +# -*-python-*- +# GemRB - Infinity Engine Emulator +# Copyright (C) 2003 The GemRB Project +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# $Id$ + +# import GemRB from LoadScreen import * @@ -77,7 +98,7 @@ #GemRB.UnloadWindow(StartWindow) StartWindow.SetVisible(0) ProtocolWindow = GemRB.LoadWindowObject(1) - + #Disabling Unused Buttons in this Window Button = ProtocolWindow.GetControl(2) Button.SetState(IE_GUI_BUTTON_DISABLED) @@ -88,40 +109,41 @@ Button = ProtocolWindow.GetControl(9) Button.SetState(IE_GUI_BUTTON_DISABLED) Button.SetFlags(IE_GUI_BUTTON_NO_IMAGE, OP_OR) - + SinglePlayerButton = ProtocolWindow.GetControl(10) SinglePlayerButton.SetFlags(IE_GUI_BUTTON_RADIOBUTTON,OP_OR) SinglePlayerButton.SetText(15413) - + IPXButton = ProtocolWindow.GetControl(0) IPXButton.SetFlags(IE_GUI_BUTTON_RADIOBUTTON,OP_OR) IPXButton.SetText(13967) - + TCPIPButton = ProtocolWindow.GetControl(1) TCPIPButton.SetFlags(IE_GUI_BUTTON_RADIOBUTTON,OP_OR) TCPIPButton.SetText(13968) - + SinglePlayerButton.SetVarAssoc("Last Protocol Used", 0) IPXButton.SetVarAssoc("Last Protocol Used", 1) TCPIPButton.SetVarAssoc("Last Protocol Used", 2) - + TextArea = ProtocolWindow.GetControl(7) TextArea.SetText(11316) - + DoneButton = ProtocolWindow.GetControl(6) DoneButton.SetText(11973) DoneButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "ProtocolDonePress") - + DoneButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) + ProtocolWindow.SetVisible(1) return - + def ProtocolDonePress(): global StartWindow, ProtocolWindow if ProtocolWindow: ProtocolWindow.Unload() - + ProtocolButton = StartWindow.GetControl(0x00) - + LastProtocol = GemRB.GetVar("Last Protocol Used") if LastProtocol == 0: ProtocolButton.SetText(15413) @@ -129,10 +151,10 @@ ProtocolButton.SetText(13967) elif LastProtocol == 2: ProtocolButton.SetText(13968) - + StartWindow.SetVisible(1) return - + def LoadPress(): global StartWindow @@ -155,7 +177,7 @@ StartWindow.Unload() GemRB.SetNextScript("Options") return - + def QuitPress(): global StartWindow, QuitWindow StartWindow.SetVisible(0) @@ -163,24 +185,24 @@ CancelButton = QuitWindow.GetControl(2) CancelButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "QuitCancelPress") CancelButton.SetFlags(IE_GUI_BUTTON_CANCEL, OP_OR) - + QuitButton = QuitWindow.GetControl(1) QuitButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "QuitQuitPress") QuitButton.SetFlags(IE_GUI_BUTTON_DEFAULT, OP_OR) - + TextArea = QuitWindow.GetControl(0) CancelButton.SetText(13727) QuitButton.SetText(15417) TextArea.SetText(19532) QuitWindow.SetVisible(1) return - + def NewGamePress(): global StartWindow if StartWindow: StartWindow.Unload() GemRB.SetNextScript("SPParty") - return + return def QuitCancelPress(): global StartWindow, QuitWindow @@ -188,7 +210,7 @@ QuitWindow.Unload() StartWindow.SetVisible(1) return - + def QuitQuitPress(): GemRB.Quit() return This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ave...@us...> - 2009-02-28 22:48:52
|
Revision: 5758 http://gemrb.svn.sourceforge.net/gemrb/?rev=5758&view=rev Author: avenger_teambg Date: 2009-02-28 22:48:47 +0000 (Sat, 28 Feb 2009) Log Message: ----------- more default buttons Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/iwd2/Abilities.py gemrb/trunk/gemrb/GUIScripts/iwd2/Alignment.py gemrb/trunk/gemrb/GUIScripts/iwd2/Appearance.py gemrb/trunk/gemrb/GUIScripts/iwd2/CSound.py gemrb/trunk/gemrb/GUIScripts/iwd2/CharOverview.py gemrb/trunk/gemrb/GUIScripts/iwd2/Class.py gemrb/trunk/gemrb/GUIScripts/iwd2/Enemy.py gemrb/trunk/gemrb/GUIScripts/iwd2/Feats.py gemrb/trunk/gemrb/GUIScripts/iwd2/GUIMA.py gemrb/trunk/gemrb/GUIScripts/iwd2/GUISPL.py gemrb/trunk/gemrb/GUIScripts/iwd2/GUIWORLD.py gemrb/trunk/gemrb/GUIScripts/iwd2/Gender.py gemrb/trunk/gemrb/GUIScripts/iwd2/ImportFile.py gemrb/trunk/gemrb/GUIScripts/iwd2/Name.py gemrb/trunk/gemrb/GUIScripts/iwd2/Portrait.py gemrb/trunk/gemrb/GUIScripts/iwd2/Race.py gemrb/trunk/gemrb/GUIScripts/iwd2/SPPartyFormation.py gemrb/trunk/gemrb/GUIScripts/iwd2/Skills.py gemrb/trunk/gemrb/GUIScripts/iwd2/SubRaces.py Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/Abilities.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/Abilities.py 2009-02-28 21:43:15 UTC (rev 5757) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/Abilities.py 2009-02-28 22:48:47 UTC (rev 5758) @@ -118,10 +118,12 @@ BackButton = AbilityWindow.GetControl(36) BackButton.SetText(15416) + BackButton.SetFlags(IE_GUI_BUTTON_CANCEL,OP_OR) + DoneButton = AbilityWindow.GetControl(0) DoneButton.SetText(36789) + DoneButton.SetFlags(IE_GUI_BUTTON_DEFAULT,OP_OR) DoneButton.SetState(IE_GUI_BUTTON_DISABLED) - DoneButton.SetFlags(IE_GUI_BUTTON_DEFAULT,OP_OR) TextAreaControl = AbilityWindow.GetControl(29) TextAreaControl.SetText(17247) Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/Alignment.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/Alignment.py 2009-02-28 21:43:15 UTC (rev 5757) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/Alignment.py 2009-02-28 22:48:47 UTC (rev 5758) @@ -19,13 +19,13 @@ GemRB.LoadWindowPack("GUICG", 800, 600) AlignmentTable = GemRB.LoadTableObject("aligns") AlignmentWindow = GemRB.LoadWindowObject(3) - for i in range(0,9): + for i in range(9): Button = AlignmentWindow.GetControl(i+2) Button.SetFlags(IE_GUI_BUTTON_RADIOBUTTON,OP_OR) Button.SetState(IE_GUI_BUTTON_DISABLED) Button.SetText(AlignmentTable.GetValue(i,0) ) - for i in range(0,9): + for i in range(9): Button = AlignmentWindow.GetControl(i+2) if AlignmentOk.GetValue(KitName, AlignmentTable.GetValue(i, 4) ) != 0: Button.SetState(IE_GUI_BUTTON_ENABLED) @@ -34,6 +34,8 @@ BackButton = AlignmentWindow.GetControl(13) BackButton.SetText(15416) + BackButton.SetFlags(IE_GUI_BUTTON_CANCEL,OP_OR) + DoneButton = AlignmentWindow.GetControl(0) DoneButton.SetText(36789) DoneButton.SetFlags(IE_GUI_BUTTON_DEFAULT,OP_OR) Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/Appearance.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/Appearance.py 2009-02-28 21:43:15 UTC (rev 5757) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/Appearance.py 2009-02-28 22:48:47 UTC (rev 5758) @@ -167,7 +167,7 @@ if ColorIndex==1: m=SkinTable.GetRowCount() t=SkinTable - for i in range(0,m): + for i in range(m): if ColorIndex<2: MyColor=t.GetValue(i,0) else: @@ -192,6 +192,7 @@ CancelButton = ColorPicker.GetControl(35) CancelButton.SetText(13727) CancelButton.SetEvent(IE_GUI_BUTTON_ON_PRESS, "CancelPress") + CancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) ColorPicker.SetVisible(1) return Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/CSound.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/CSound.py 2009-02-28 21:43:15 UTC (rev 5757) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/CSound.py 2009-02-28 22:48:47 UTC (rev 5758) @@ -8,7 +8,7 @@ def OnLoad(): global SoundWindow, TextAreaControl, DoneButton, TopIndex - + GemRB.LoadWindowPack("GUICG", 800, 600) #this hack will redraw the base CG window SoundWindow = GemRB.LoadWindowObject(19) @@ -16,6 +16,8 @@ BackButton = SoundWindow.GetControl(10) BackButton.SetText(15416) + BackButton.SetFlags(IE_GUI_BUTTON_CANCEL,OP_OR) + DoneButton = SoundWindow.GetControl(0) DoneButton.SetText(36789) DoneButton.SetFlags(IE_GUI_BUTTON_DEFAULT,OP_OR) @@ -27,7 +29,7 @@ TextAreaControl.SetFlags(IE_GUI_TEXTAREA_SELECTABLE) TextAreaControl.SetVarAssoc("Sound", 0) RowCount=TextAreaControl.GetCharSounds() - + DefaultButton = SoundWindow.GetControl(47) DefaultButton.SetText(33479) Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/CharOverview.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/CharOverview.py 2009-02-28 21:43:15 UTC (rev 5757) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/CharOverview.py 2009-02-28 22:48:47 UTC (rev 5758) @@ -80,9 +80,12 @@ State = States[1] Event = 'ImportPress' - if Key == 'Back' and CurrentStep == 1: - State = States[0] - Event = 0 + if Key == 'Back': + if CurrentStep == 1: + State = States[0] + Event = 0 + else: + PersistButtons[Key].SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) if Key == 'Next' and CurrentStep == 9: Text = 11962 @@ -92,6 +95,7 @@ if Key == 'Start' and CurrentStep == 1: Text = 13727 Event = 'CancelPress' + PersistButtons[Key].SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) PersistButtons[Key].SetText(Text) PersistButtons[Key].SetState(State) Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/Class.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/Class.py 2009-02-28 21:43:15 UTC (rev 5757) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/Class.py 2009-02-28 22:48:47 UTC (rev 5758) @@ -37,7 +37,7 @@ def OnLoad(): global ClassWindow, TextAreaControl, DoneButton, BackButton global ClassTable, ClassCount - + GemRB.LoadWindowPack("GUICG", 800, 600) #this replaces help02.2da for class restrictions ClassTable = GemRB.LoadTableObject("classes") @@ -80,6 +80,8 @@ BackButton = ClassWindow.GetControl(17) BackButton.SetText(15416) + BackButton.SetFlags(IE_GUI_BUTTON_CANCEL,OP_OR) + DoneButton = ClassWindow.GetControl(0) DoneButton.SetText(36789) DoneButton.SetFlags(IE_GUI_BUTTON_DEFAULT,OP_OR) @@ -134,7 +136,7 @@ Button.SetState(IE_GUI_BUTTON_ENABLED) Button.SetEvent(IE_GUI_BUTTON_ON_PRESS, "ClassPress2") Button.SetVarAssoc("Class", i) - + BackButton.SetEvent(IE_GUI_BUTTON_ON_PRESS,"BackPress2") return Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/Enemy.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/Enemy.py 2009-02-28 21:43:15 UTC (rev 5757) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/Enemy.py 2009-02-28 22:48:47 UTC (rev 5758) @@ -12,7 +12,7 @@ global TopIndex TopIndex=GemRB.GetVar("TopIndex") - for i in range(0, 11): + for i in range(11): Button = RaceWindow.GetControl(i+22) Val = RaceTable.GetValue(i+TopIndex,0) if Val==0: @@ -43,12 +43,14 @@ if RaceCount<0: RaceCount=0 - for i in range(0,11): + for i in range(11): Button = RaceWindow.GetControl(i+22) Button.SetFlags(IE_GUI_BUTTON_RADIOBUTTON,OP_OR) BackButton = RaceWindow.GetControl(10) BackButton.SetText(15416) + BackButton.SetFlags(IE_GUI_BUTTON_CANCEL,OP_OR) + DoneButton = RaceWindow.GetControl(11) DoneButton.SetText(11973) DoneButton.SetFlags(IE_GUI_BUTTON_DEFAULT,OP_OR) Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/Feats.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/Feats.py 2009-02-28 21:43:15 UTC (rev 5757) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/Feats.py 2009-02-28 22:48:47 UTC (rev 5758) @@ -169,7 +169,7 @@ global FeatTable, FeatReqTable global KitName, Level, PointsLeft global ClassColumn, KitColumn, RaceColumn, FeatsClassColumn - + GemRB.SetVar("Level",1) #for simplicity Race = GemRB.GetVar("Race") @@ -216,14 +216,14 @@ #Always raise one level at once PointsLeft += FeatLevelTable.GetValue(Level, 0) PointsLeft += FeatClassTable.GetValue(Level, ClassColumn) - + #racial abilities which seem to be hardcoded in the IWD2 engine #are implemented in races.2da if Level<1: TmpTable = GemRB.LoadTableObject('races') PointsLeft += TmpTable.GetValue(RaceName,'FEATBONUS') ### - + GemRB.SetToken("number",str(PointsLeft) ) GemRB.LoadWindowPack("GUICG", 800, 600) @@ -247,6 +247,8 @@ BackButton = FeatWindow.GetControl(105) BackButton.SetText(15416) + BackButton.SetFlags(IE_GUI_BUTTON_CANCEL,OP_OR) + DoneButton = FeatWindow.GetControl(0) DoneButton.SetText(36789) DoneButton.SetFlags(IE_GUI_BUTTON_DEFAULT,OP_OR) @@ -301,7 +303,7 @@ # if ActPoint > Level: #Level is 0 for level 1 # return GemRB.SetVar("Feat "+str(Pos), ActPoint+1) - PointsLeft = PointsLeft - 1 + PointsLeft = PointsLeft - 1 RedrawFeats() return Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/GUIMA.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/GUIMA.py 2009-02-28 21:43:15 UTC (rev 5757) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/GUIMA.py 2009-02-28 22:48:47 UTC (rev 5758) @@ -264,8 +264,8 @@ #set Label = NoteWindow.GetControl (0) Label.SetEvent (IE_GUI_BUTTON_ON_PRESS,"SetMapNote") + Label.SetText (11973) Label.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_OR) - Label.SetText (11973) #cancel Label = NoteWindow.GetControl (2) Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/GUISPL.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/GUISPL.py 2009-02-28 21:43:15 UTC (rev 5757) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/GUISPL.py 2009-02-28 22:48:47 UTC (rev 5758) @@ -238,6 +238,7 @@ #back Button = Window.GetControl (5) Button.SetText (15416) + Button.SetFlags(IE_GUI_BUTTON_CANCEL,OP_OR) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "OpenSpellBookSpellInfoWindow") index = GemRB.GetVar ("SpellButton") Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/GUIWORLD.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/GUIWORLD.py 2009-02-28 21:43:15 UTC (rev 5757) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/GUIWORLD.py 2009-02-28 22:48:47 UTC (rev 5758) @@ -74,7 +74,9 @@ #end dialog Button = Window.GetControl (0) Button.SetText (9371) + Button.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_OR) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "CloseContinueWindow") + if hideflag: GemRB.UnhideGUI () @@ -266,6 +268,7 @@ # Done Button = Window.GetControl (51) #no caption on this button + Button.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "LeaveContainer") GemRB.SetVar ("LeftTopIndex", 0) Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/Gender.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/Gender.py 2009-02-28 21:43:15 UTC (rev 5757) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/Gender.py 2009-02-28 22:48:47 UTC (rev 5758) @@ -34,6 +34,8 @@ BackButton = GenderWindow.GetControl(6) BackButton.SetText(15416) + BackButton.SetFlags(IE_GUI_BUTTON_CANCEL,OP_OR) + DoneButton = GenderWindow.GetControl(0) DoneButton.SetText(36789) DoneButton.SetFlags(IE_GUI_BUTTON_DEFAULT,OP_OR) Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/ImportFile.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/ImportFile.py 2009-02-28 21:43:15 UTC (rev 5757) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/ImportFile.py 2009-02-28 22:48:47 UTC (rev 5758) @@ -34,6 +34,7 @@ CancelButton = ImportWindow.GetControl(1) CancelButton.SetText(15416) + CancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) # disable the three extraneous buttons in the bottom row for i in [16, 13, 15]: Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/Name.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/Name.py 2009-02-28 21:43:15 UTC (rev 5757) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/Name.py 2009-02-28 22:48:47 UTC (rev 5758) @@ -13,6 +13,7 @@ BackButton = NameWindow.GetControl(3) BackButton.SetText(15416) + BackButton.SetFlags(IE_GUI_BUTTON_CANCEL,OP_OR) DoneButton = NameWindow.GetControl(0) DoneButton.SetText(11973) Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/Portrait.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/Portrait.py 2009-02-28 21:43:15 UTC (rev 5757) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/Portrait.py 2009-02-28 22:48:47 UTC (rev 5758) @@ -7,86 +7,87 @@ LastPortrait = 0 Gender = 0 -def SetPicture(): +def SetPicture (): global PortraitsTable, LastPortrait - PortraitName = PortraitsTable.GetRowName(LastPortrait)+"L" - PortraitButton.SetPicture(PortraitName) + PortraitName = PortraitsTable.GetRowName (LastPortrait)+"L" + PortraitButton.SetPicture (PortraitName) return -def OnLoad(): +def OnLoad (): global AppearanceWindow, PortraitButton, PortraitsTable, LastPortrait global Gender - - Gender=GemRB.GetVar("Gender") - GemRB.LoadWindowPack("GUICG", 800, 600) - AppearanceWindow = GemRB.LoadWindowObject(11) - #AppearanceWindow.SetFrame( ) + Gender=GemRB.GetVar ("Gender") + GemRB.LoadWindowPack ("GUICG", 800, 600) + AppearanceWindow = GemRB.LoadWindowObject (11) + #AppearanceWindow.SetFrame () + #Load the Portraits Table - PortraitsTable = GemRB.LoadTableObject("PICTURES") + PortraitsTable = GemRB.LoadTableObject ("PICTURES") LastPortrait = 0 - PortraitButton = AppearanceWindow.GetControl(1) - PortraitButton.SetFlags(IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_NO_IMAGE,OP_SET) + PortraitButton = AppearanceWindow.GetControl (1) + PortraitButton.SetFlags (IE_GUI_BUTTON_PICTURE|IE_GUI_BUTTON_NO_IMAGE,OP_SET) PortraitButton.SetState (IE_GUI_BUTTON_LOCKED) - LeftButton = AppearanceWindow.GetControl(2) - RightButton = AppearanceWindow.GetControl(3) + LeftButton = AppearanceWindow.GetControl (2) + RightButton = AppearanceWindow.GetControl (3) - BackButton = AppearanceWindow.GetControl(5) - BackButton.SetText(15416) + BackButton = AppearanceWindow.GetControl (5) + BackButton.SetText (15416) + BackButton.SetFlags (IE_GUI_BUTTON_CANCEL,OP_OR) - CustomButton = AppearanceWindow.GetControl(6) - CustomButton.SetText(17545) + CustomButton = AppearanceWindow.GetControl (6) + CustomButton.SetText (17545) - DoneButton = AppearanceWindow.GetControl(0) - DoneButton.SetText(36789) - DoneButton.SetFlags(IE_GUI_BUTTON_DEFAULT,OP_OR) + DoneButton = AppearanceWindow.GetControl (0) + DoneButton.SetText (36789) + DoneButton.SetFlags (IE_GUI_BUTTON_DEFAULT,OP_OR) - RightButton.SetEvent(IE_GUI_BUTTON_ON_PRESS,"RightPress") - LeftButton.SetEvent(IE_GUI_BUTTON_ON_PRESS,"LeftPress") - BackButton.SetEvent(IE_GUI_BUTTON_ON_PRESS,"BackPress") - CustomButton.SetEvent(IE_GUI_BUTTON_ON_PRESS,"CustomPress") - DoneButton.SetEvent(IE_GUI_BUTTON_ON_PRESS,"NextPress") - + RightButton.SetEvent (IE_GUI_BUTTON_ON_PRESS,"RightPress") + LeftButton.SetEvent (IE_GUI_BUTTON_ON_PRESS,"LeftPress") + BackButton.SetEvent (IE_GUI_BUTTON_ON_PRESS,"BackPress") + CustomButton.SetEvent (IE_GUI_BUTTON_ON_PRESS,"CustomPress") + DoneButton.SetEvent (IE_GUI_BUTTON_ON_PRESS,"NextPress") + while True: - if PortraitsTable.GetValue(LastPortrait, 0) == Gender: - SetPicture() + if PortraitsTable.GetValue (LastPortrait, 0) == Gender: + SetPicture () break LastPortrait = LastPortrait + 1 - AppearanceWindow.SetVisible(1) + AppearanceWindow.SetVisible (1) return -def RightPress(): +def RightPress (): global LastPortrait while True: LastPortrait = LastPortrait + 1 - if LastPortrait >= PortraitsTable.GetRowCount(): + if LastPortrait >= PortraitsTable.GetRowCount (): LastPortrait = 0 - if PortraitsTable.GetValue(LastPortrait, 0) == Gender: - SetPicture() + if PortraitsTable.GetValue (LastPortrait, 0) == Gender: + SetPicture () return -def LeftPress(): +def LeftPress (): global LastPortrait while True: LastPortrait = LastPortrait - 1 if LastPortrait < 0: - LastPortrait = PortraitsTable.GetRowCount()-1 - if PortraitsTable.GetValue(LastPortrait, 0) == Gender: - SetPicture() + LastPortrait = PortraitsTable.GetRowCount ()-1 + if PortraitsTable.GetValue (LastPortrait, 0) == Gender: + SetPicture () return -def BackPress(): +def BackPress (): if AppearanceWindow: - AppearanceWindow.Unload() - GemRB.SetNextScript("CharGen") - GemRB.SetVar("Gender",0) #scrapping the gender value + AppearanceWindow.Unload () + GemRB.SetNextScript ("CharGen") + GemRB.SetVar ("Gender",0) #scrapping the gender value return -def CustomDone(): +def CustomDone (): Window = CustomWindow Portrait = PortraitList1.QueryText () @@ -100,12 +101,12 @@ GemRB.SetNextScript ("CharGen2") return -def CustomAbort(): +def CustomAbort (): if CustomWindow: CustomWindow.Unload () return -def LargeCustomPortrait(): +def LargeCustomPortrait (): Window = CustomWindow Portrait = PortraitList1.QueryText () @@ -128,7 +129,7 @@ Button.SetPicture (Portrait, "NOPORTMD") return -def SmallCustomPortrait(): +def SmallCustomPortrait (): Window = CustomWindow Portrait = PortraitList2.QueryText () @@ -151,7 +152,7 @@ Button.SetPicture (Portrait, "NOPORTSM") return -def CustomPress(): +def CustomPress (): global PortraitList1, PortraitList2 global RowCount1, RowCount2 global CustomWindow @@ -171,11 +172,13 @@ Button = Window.GetControl (6) Button.SetText (11973) + BackButton.SetFlags (IE_GUI_BUTTON_DEFAULT,OP_OR) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "CustomDone") Button.SetState (IE_GUI_BUTTON_DISABLED) Button = Window.GetControl (7) Button.SetText (15416) + BackButton.SetFlags (IE_GUI_BUTTON_CANCEL,OP_OR) Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, "CustomAbort") Button = Window.GetControl (0) @@ -191,13 +194,13 @@ Window.ShowModal (MODAL_SHADOW_NONE) return -def NextPress(): +def NextPress (): if AppearanceWindow: - AppearanceWindow.Unload() + AppearanceWindow.Unload () PortraitTable = GemRB.LoadTableObject ("pictures") PortraitName = PortraitTable.GetRowName (LastPortrait ) GemRB.SetToken ("SmallPortrait", PortraitName+"S") GemRB.SetToken ("LargePortrait", PortraitName+"L") - #GemRB.SetVar("PortraitIndex",LastPortrait) - GemRB.SetNextScript("CharGen2") #Before race + #GemRB.SetVar ("PortraitIndex",LastPortrait) + GemRB.SetNextScript ("CharGen2") #Before race return Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/Race.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/Race.py 2009-02-28 21:43:15 UTC (rev 5757) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/Race.py 2009-02-28 22:48:47 UTC (rev 5758) @@ -32,6 +32,8 @@ BackButton = RaceWindow.GetControl (11) BackButton.SetText (15416) + BackButton.SetFlags(IE_GUI_BUTTON_CANCEL,OP_OR) + DoneButton = RaceWindow.GetControl (0) DoneButton.SetText (36789) DoneButton.SetState (IE_GUI_BUTTON_DISABLED) Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/SPPartyFormation.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/SPPartyFormation.py 2009-02-28 21:43:15 UTC (rev 5757) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/SPPartyFormation.py 2009-02-28 22:48:47 UTC (rev 5758) @@ -92,10 +92,12 @@ CancelButton = ExitWindow.GetControl (2) CancelButton.SetText (13727) + CancelButton.SetFlags (IE_GUI_BUTTON_CANCEL, OP_OR) CancelButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "ExitCancelPress") DoneButton = ExitWindow.GetControl (1) DoneButton.SetText (11973) + DoneButton.SetFlags (IE_GUI_BUTTON_DEFAULT, OP_OR) DoneButton.SetEvent (IE_GUI_BUTTON_ON_PRESS, "ExitDonePress") ExitWindow.SetVisible (1) Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/Skills.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/Skills.py 2009-02-28 21:43:15 UTC (rev 5757) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/Skills.py 2009-02-28 22:48:47 UTC (rev 5758) @@ -127,7 +127,7 @@ SkillRacTable = GemRB.LoadTableObject("SKILLRAC") - for i in range(0,RowCount): + for i in range(RowCount): GemRB.SetVar("Skill "+str(i),0) # Racial/Class bonuses don't factor in char-gen or leveling # so can be safely ignored @@ -136,7 +136,7 @@ GemRB.LoadWindowPack("GUICG", 800 ,600) SkillWindow = GemRB.LoadWindowObject(6) - for i in range(0,10): + for i in range(10): Button = SkillWindow.GetControl(i+93) Button.SetVarAssoc("Skill",i) Button.SetEvent(IE_GUI_BUTTON_ON_PRESS, "JustPress") @@ -151,6 +151,8 @@ BackButton = SkillWindow.GetControl(105) BackButton.SetText(15416) + BackButton.SetFlags(IE_GUI_BUTTON_CANCEL,OP_OR) + DoneButton = SkillWindow.GetControl(0) DoneButton.SetText(36789) DoneButton.SetFlags(IE_GUI_BUTTON_DEFAULT,OP_OR) Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/SubRaces.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/SubRaces.py 2009-02-28 21:43:15 UTC (rev 5757) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/SubRaces.py 2009-02-28 22:48:47 UTC (rev 5758) @@ -56,6 +56,8 @@ BackButton = RaceWindow.GetControl(8) BackButton.SetText(15416) + BackButton.SetFlags(IE_GUI_BUTTON_CANCEL,OP_OR) + DoneButton = RaceWindow.GetControl(0) DoneButton.SetText(36789) DoneButton.SetState(IE_GUI_BUTTON_ENABLED) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lyn...@us...> - 2010-03-24 12:36:21
|
Revision: 7506 http://gemrb.svn.sourceforge.net/gemrb/?rev=7506&view=rev Author: lynxlupodian Date: 2010-03-24 12:36:15 +0000 (Wed, 24 Mar 2010) Log Message: ----------- iwd2: kill the extra loading of the races table Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/iwd2/Abilities.py gemrb/trunk/gemrb/GUIScripts/iwd2/Appearance.py gemrb/trunk/gemrb/GUIScripts/iwd2/CharGen9.py gemrb/trunk/gemrb/GUIScripts/iwd2/Class.py gemrb/trunk/gemrb/GUIScripts/iwd2/Feats.py gemrb/trunk/gemrb/GUIScripts/iwd2/GUICommonWindows.py gemrb/trunk/gemrb/GUIScripts/iwd2/GUIREC.py gemrb/trunk/gemrb/GUIScripts/iwd2/Race.py gemrb/trunk/gemrb/GUIScripts/iwd2/SubRaces.py Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/Abilities.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/Abilities.py 2010-03-24 12:07:15 UTC (rev 7505) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/Abilities.py 2010-03-24 12:36:15 UTC (rev 7506) @@ -19,6 +19,7 @@ # #character generation, ability (GUICG4) import GemRB +from GUICommon import RaceTable AbilityWindow = 0 TextAreaControl = 0 @@ -33,7 +34,6 @@ def CalcLimits(Abidx): global Minimum, Maximum, Add - RaceTable = GemRB.LoadTableObject("races") Abracead = GemRB.LoadTableObject("ABRACEAD") RaceID = GemRB.GetVar("Race") RowIndex = RaceTable.FindValue(3, RaceID) Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/Appearance.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/Appearance.py 2010-03-24 12:07:15 UTC (rev 7505) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/Appearance.py 2010-03-24 12:36:15 UTC (rev 7506) @@ -19,6 +19,7 @@ # #character generation, color (GUICG13) import GemRB +from GUICommon import RaceTable global IE_ANIM_ID ColorTable = 0 @@ -59,7 +60,6 @@ GemRB.LoadWindowPack("GUICG", 800, 600) ColorWindow=GemRB.LoadWindowObject(13) - RaceTable = GemRB.LoadTableObject("races") Race = RaceTable.FindValue (3, GemRB.GetVar ("Race") ) HairTable = GemRB.LoadTableObject(RaceTable.GetValue(Race, 5)) SkinTable = GemRB.LoadTableObject(RaceTable.GetValue(Race, 6)) Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/CharGen9.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/CharGen9.py 2010-03-24 12:07:15 UTC (rev 7505) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/CharGen9.py 2010-03-24 12:36:15 UTC (rev 7506) @@ -20,7 +20,7 @@ #character generation (GUICG 0) import GemRB from ie_stats import * -from GUICommon import SetColorStat +from GUICommon import SetColorStat, RaceTable from CharOverview import * BioWindow = 0 @@ -130,9 +130,8 @@ GemRB.SetPlayerStat (MyChar, IE_RACE, GemRB.GetVar ("BaseRace") ) race = GemRB.GetVar ("Race") GemRB.SetPlayerStat (MyChar, IE_SUBRACE, race & 255 ) - TmpTable = GemRB.LoadTableObject ("races") - row = TmpTable.FindValue (3, race ) - racename = TmpTable.GetRowName (row) + row = RaceTable.FindValue (3, race ) + racename = RaceTable.GetRowName (row) if row!=-1: SetRaceResistances( MyChar, racename ) SetRaceAbilities( MyChar, racename ) Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/Class.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/Class.py 2010-03-24 12:07:15 UTC (rev 7505) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/Class.py 2010-03-24 12:36:15 UTC (rev 7506) @@ -19,6 +19,7 @@ # #character generation, class (GUICG2) import GemRB +from GUICommon import RaceTable ClassWindow = 0 TextAreaControl = 0 @@ -62,9 +63,8 @@ ClassTable = GemRB.LoadTableObject("classes") ClassCount = ClassTable.GetRowCount()+1 ClassWindow = GemRB.LoadWindowObject(2) - TmpTable=GemRB.LoadTableObject("races") - rid = TmpTable.FindValue(3, GemRB.GetVar('BaseRace')) - RaceName = TmpTable.GetRowName(rid) + rid = RaceTable.FindValue(3, GemRB.GetVar('BaseRace')) + RaceName = RaceTable.GetRowName(rid) #radiobutton groups must be set up before doing anything else to them j = 0 Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/Feats.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/Feats.py 2010-03-24 12:07:15 UTC (rev 7505) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/Feats.py 2010-03-24 12:36:15 UTC (rev 7506) @@ -20,6 +20,7 @@ #character generation, skills (GUICG6) import GemRB from ie_stats import * +from GUICommon import RaceTable FeatWindow = 0 TextAreaControl = 0 @@ -192,7 +193,6 @@ GemRB.SetVar("Level",1) #for simplicity Race = GemRB.GetVar("Race") - RaceTable = GemRB.LoadTableObject("races") RaceColumn = RaceTable.FindValue(3, Race) RaceName = RaceTable.GetRowName(RaceColumn) # could use column ID as well, but they tend to change :) @@ -239,8 +239,7 @@ #racial abilities which seem to be hardcoded in the IWD2 engine #are implemented in races.2da if Level<1: - TmpTable = GemRB.LoadTableObject('races') - PointsLeft += TmpTable.GetValue(RaceName,'FEATBONUS') + PointsLeft += RaceTable.GetValue(RaceName,'FEATBONUS') ### GemRB.SetToken("number",str(PointsLeft) ) Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/GUICommonWindows.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/GUICommonWindows.py 2010-03-24 12:07:15 UTC (rev 7505) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/GUICommonWindows.py 2010-03-24 12:36:15 UTC (rev 7506) @@ -366,14 +366,13 @@ return def GetActorRaceTitle (actor): - Table = GemRB.LoadTableObject ("races") RaceID = GemRB.GetPlayerStat (actor, IE_SUBRACE) if RaceID: RaceID += GemRB.GetPlayerStat (actor, IE_RACE)<<16 else: RaceID = GemRB.GetPlayerStat (actor, IE_RACE) - row = Table.FindValue (3, RaceID ) - RaceTitle = Table.GetValue (row, 2) + row = RaceTable.FindValue (3, RaceID ) + RaceTitle = RaceTable.GetValue (row, 2) return RaceTitle # NOTE: this function is called with the primary classes Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/GUIREC.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/GUIREC.py 2010-03-24 12:07:15 UTC (rev 7505) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/GUIREC.py 2010-03-24 12:36:15 UTC (rev 7506) @@ -27,7 +27,7 @@ import GUICommonWindows from GUIDefines import * from ie_stats import * -from GUICommon import CloseOtherWindow, SetColorStat +from GUICommon import CloseOtherWindow, SetColorStat, RaceTable from GUICommonWindows import * SelectWindow = 0 @@ -240,7 +240,6 @@ #favoured class RecordsTextArea.Append (40310,-1) - RaceTable = GemRB.LoadTableObject("races") ClassTable = GemRB.LoadTableObject("classes") AlignTable = GemRB.LoadTableObject("aligns") Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/Race.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/Race.py 2010-03-24 12:07:15 UTC (rev 7505) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/Race.py 2010-03-24 12:36:15 UTC (rev 7506) @@ -19,21 +19,20 @@ # #character generation, race (GUICG2) import GemRB +from GUICommon import RaceTable RaceWindow = 0 TextAreaControl = 0 DoneButton = 0 -RaceTable = 0 SubRacesTable = 0 def OnLoad(): global RaceWindow, TextAreaControl, DoneButton - global RaceTable, SubRacesTable + global SubRacesTable GemRB.LoadWindowPack("GUICG", 800 ,600) RaceWindow = GemRB.LoadWindowObject (8) - RaceTable = GemRB.LoadTableObject ("races") RaceCount = RaceTable.GetRowCount () SubRacesTable = GemRB.LoadTableObject ("SUBRACES") Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/SubRaces.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/SubRaces.py 2010-03-24 12:07:15 UTC (rev 7505) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/SubRaces.py 2010-03-24 12:36:15 UTC (rev 7506) @@ -19,21 +19,20 @@ # #character generation, SubRaces (GUICG54) import GemRB +from GUICommon import RaceTable RaceWindow = 0 TextAreaControl = 0 DoneButton = 0 -RaceTable = 0 SubRacesTable = 0 def OnLoad(): global RaceWindow, TextAreaControl, DoneButton - global RaceTable, SubRacesTable + global SubRacesTable GemRB.LoadWindowPack("GUICG", 800, 600) RaceWindow = GemRB.LoadWindowObject(54) - RaceTable = GemRB.LoadTableObject("races") RaceCount = RaceTable.GetRowCount() SubRacesTable = GemRB.LoadTableObject("SUBRACES") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lyn...@us...> - 2010-03-24 18:39:56
|
Revision: 7507 http://gemrb.svn.sourceforge.net/gemrb/?rev=7507&view=rev Author: lynxlupodian Date: 2010-03-24 18:39:50 +0000 (Wed, 24 Mar 2010) Log Message: ----------- iwd2: remove over-loading of classes.2da Modified Paths: -------------- gemrb/trunk/gemrb/GUIScripts/iwd2/Abilities.py gemrb/trunk/gemrb/GUIScripts/iwd2/Alignment.py gemrb/trunk/gemrb/GUIScripts/iwd2/Class.py gemrb/trunk/gemrb/GUIScripts/iwd2/Feats.py gemrb/trunk/gemrb/GUIScripts/iwd2/GUICommonWindows.py gemrb/trunk/gemrb/GUIScripts/iwd2/GUIREC.py gemrb/trunk/gemrb/GUIScripts/iwd2/Skills.py Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/Abilities.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/Abilities.py 2010-03-24 12:36:15 UTC (rev 7506) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/Abilities.py 2010-03-24 18:39:50 UTC (rev 7507) @@ -19,7 +19,7 @@ # #character generation, ability (GUICG4) import GemRB -from GUICommon import RaceTable +from GUICommon import RaceTable, ClassTable AbilityWindow = 0 TextAreaControl = 0 @@ -105,7 +105,6 @@ #enable repeated clicks GemRB.SetRepeatClickFlags(GEM_RK_DISABLE, OP_NAND) Kit = GemRB.GetVar("Class Kit") - ClassTable = GemRB.LoadTableObject("classes") Class = GemRB.GetVar("Class")-1 if Kit == 0: KitName = ClassTable.GetRowName(Class) Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/Alignment.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/Alignment.py 2010-03-24 12:36:15 UTC (rev 7506) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/Alignment.py 2010-03-24 18:39:50 UTC (rev 7507) @@ -19,6 +19,7 @@ # #character generation, alignment (GUICG3) import GemRB +from GUICommon import ClassTable AlignmentWindow = 0 TextAreaControl = 0 @@ -29,7 +30,6 @@ global AlignmentWindow, TextAreaControl, DoneButton global AlignmentTable - ClassTable = GemRB.LoadTableObject("classes") Class = GemRB.GetVar("Class")-1 KitName = ClassTable.GetRowName(Class) Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/Class.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/Class.py 2010-03-24 12:36:15 UTC (rev 7506) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/Class.py 2010-03-24 18:39:50 UTC (rev 7507) @@ -19,13 +19,12 @@ # #character generation, class (GUICG2) import GemRB -from GUICommon import RaceTable +from GUICommon import RaceTable, ClassTable ClassWindow = 0 TextAreaControl = 0 DoneButton = 0 BackButton = 0 -ClassTable = 0 ClassCount = 0 HasSubClass = 0 ClassID = 0 @@ -56,11 +55,10 @@ def OnLoad(): global ClassWindow, TextAreaControl, DoneButton, BackButton - global ClassTable, ClassCount + global ClassCount GemRB.LoadWindowPack("GUICG", 800, 600) #this replaces help02.2da for class restrictions - ClassTable = GemRB.LoadTableObject("classes") ClassCount = ClassTable.GetRowCount()+1 ClassWindow = GemRB.LoadWindowObject(2) rid = RaceTable.FindValue(3, GemRB.GetVar('BaseRace')) Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/Feats.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/Feats.py 2010-03-24 12:36:15 UTC (rev 7506) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/Feats.py 2010-03-24 18:39:50 UTC (rev 7507) @@ -20,7 +20,7 @@ #character generation, skills (GUICG6) import GemRB from ie_stats import * -from GUICommon import RaceTable +from GUICommon import RaceTable, ClassTable FeatWindow = 0 TextAreaControl = 0 @@ -199,7 +199,6 @@ RaceColumn = RaceTable.GetValue(RaceName, "SKILL_COLUMN") Class = GemRB.GetVar("Class") - 1 - ClassTable = GemRB.LoadTableObject("classes") KitName = ClassTable.GetRowName(Class) # classcolumn is base class or 0 if it is not a kit ClassColumn = ClassTable.GetValue(Class, 3) - 1 Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/GUICommonWindows.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/GUICommonWindows.py 2010-03-24 12:36:15 UTC (rev 7506) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/GUICommonWindows.py 2010-03-24 18:39:50 UTC (rev 7507) @@ -377,7 +377,6 @@ # NOTE: this function is called with the primary classes def GetKitIndex (actor, ClassIndex): - ClassTable = GemRB.LoadTableObject ("classes") Kit = GemRB.GetPlayerStat (actor, IE_KIT) KitIndex = -1 @@ -399,7 +398,6 @@ return ClassTitle #Class = GemRB.GetPlayerStat (actor, IE_CLASS) - ClassTable = GemRB.LoadTableObject ("classes") KitIndex = GetKitIndex (actor, ClassIndex) if KitIndex == 0: ClassTitle = ClassTable.GetValue (ClassIndex, 0) Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/GUIREC.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/GUIREC.py 2010-03-24 12:36:15 UTC (rev 7506) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/GUIREC.py 2010-03-24 18:39:50 UTC (rev 7507) @@ -27,7 +27,7 @@ import GUICommonWindows from GUIDefines import * from ie_stats import * -from GUICommon import CloseOtherWindow, SetColorStat, RaceTable +from GUICommon import CloseOtherWindow, SetColorStat, RaceTable, ClassTable from GUICommonWindows import * SelectWindow = 0 @@ -240,7 +240,6 @@ #favoured class RecordsTextArea.Append (40310,-1) - ClassTable = GemRB.LoadTableObject("classes") AlignTable = GemRB.LoadTableObject("aligns") #get the subrace value Modified: gemrb/trunk/gemrb/GUIScripts/iwd2/Skills.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/iwd2/Skills.py 2010-03-24 12:36:15 UTC (rev 7506) +++ gemrb/trunk/gemrb/GUIScripts/iwd2/Skills.py 2010-03-24 18:39:50 UTC (rev 7507) @@ -19,6 +19,7 @@ # #character generation, skills (GUICG6) import GemRB +from GUICommon import RaceTable, ClassTable SkillWindow = 0 TextAreaControl = 0 @@ -104,7 +105,6 @@ GemRB.SetRepeatClickFlags(GEM_RK_DISABLE, OP_NAND) GemRB.SetVar("Level",1) #for simplicity Class = GemRB.GetVar("Class") - 1 - ClassTable = GemRB.LoadTableObject("classes") KitName = ClassTable.GetRowName(Class) #classcolumn is base class ClassColumn=GemRB.GetVar("BaseClass") - 1 @@ -122,7 +122,6 @@ # Humans recieve +2 skill points at level 1 and +1 skill points each level thereafter # Recommend creation of SKILRACE.2da with levels as rows and race names as columns - RaceTable = GemRB.LoadTableObject("RACES") RaceName = RaceTable.GetRowName(RaceTable.FindValue(3, GemRB.GetVar('Race'))) ### Example code for implementation of SKILRACE.2da This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |