From 5948086002db0cf623290ef72ede895e28e7b61e Mon Sep 17 00:00:00 2001 From: Steven Van Ingelgem Date: Mon, 23 Sep 2024 19:53:14 +0200 Subject: [PATCH 1/4] Fix azerty keyboard --- .gitignore | 3 +- .../IC_BrivGemFarm_Functions.ahk | 8 ++--- AddOns/IC_Core/IC_SharedFunctions_Class.ahk | 30 +++++++++---------- 3 files changed, 21 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index 02f38727..6ec67fd3 100644 --- a/.gitignore +++ b/.gitignore @@ -15,4 +15,5 @@ AddOns/GeneratedAddonInclude.ahk AddOns/*_Addon_Management/AddonManagement.json LastGUID*.json Current*.json -SharedFunctions/ScanCodesOverride.json \ No newline at end of file +SharedFunctions/ScanCodesOverride.json +.idea/ \ No newline at end of file diff --git a/AddOns/IC_BrivGemFarm_Performance/IC_BrivGemFarm_Functions.ahk b/AddOns/IC_BrivGemFarm_Performance/IC_BrivGemFarm_Functions.ahk index 444a1c4b..3f59dfad 100644 --- a/AddOns/IC_BrivGemFarm_Performance/IC_BrivGemFarm_Functions.ahk +++ b/AddOns/IC_BrivGemFarm_Performance/IC_BrivGemFarm_Functions.ahk @@ -437,7 +437,7 @@ class IC_BrivGemFarm_Class { if (!g_SF.KillCurrentBoss() ) ; Previously/Alternatively FallBackFromBossZone() g_SF.FallBackFromBossZone() - inputValues := "{w}" ; Stack farm formation hotkey + inputValues := g_SCKeyMap["w"] ; Stack farm formation hotkey g_SF.DirectedInput(,, inputValues ) g_SF.WaitForTransition( inputValues ) g_SF.ToggleAutoProgress( 0 , false, true ) @@ -647,12 +647,12 @@ class IC_BrivGemFarm_Class g_SharedData.LoopString := "Leveling champions" formationFavorite1 := g_SF.Memory.GetFormationByFavorite( 1 ) isShandieInFormation := g_SF.IsChampInFormation( 47, formationFavorite1 ) - g_SF.LevelChampByID( 58, 170, 7000, "{q}") ; level briv + g_SF.LevelChampByID( 58, 170, 7000, g_SCKeyMap["q"]) ; level briv if (isShandieInFormation) - g_SF.LevelChampByID( 47, 230, 7000, "{q}") ; level shandie + g_SF.LevelChampByID( 47, 230, 7000, g_SCKeyMap["q"]) ; level shandie isHavilarInFormation := g_SF.IsChampInFormation( 56, formationFavorite1 ) if (isHavilarInFormation) - g_SF.LevelChampByID( 56, 15, 7000, "{q}") ; level havi + g_SF.LevelChampByID( 56, 15, 7000, g_SCKeyMap["q"]) ; level havi if (g_BrivUserSettings[ "Fkeys" ]) { keyspam := g_SF.GetFormationFKeys(g_SF.Memory.GetActiveModronFormation()) ; level other formation champions diff --git a/AddOns/IC_Core/IC_SharedFunctions_Class.ahk b/AddOns/IC_Core/IC_SharedFunctions_Class.ahk index c8dd1ef2..3ee7c1df 100644 --- a/AddOns/IC_Core/IC_SharedFunctions_Class.ahk +++ b/AddOns/IC_Core/IC_SharedFunctions_Class.ahk @@ -164,7 +164,7 @@ class IC_SharedFunctions_Class extends SH_SharedFunctions while ( !mod( this.Memory.ReadCurrentZone(), 5 ) AND ElapsedTime < maxLoopTime ) { ElapsedTime := A_TickCount - StartTime - this.DirectedInput(,,"{e}") + this.DirectedInput(,,g_SCKeyMap["e"]) if(!this.Memory.ReadQuestRemaining()) ; Quest complete, still on boss zone. Skip boss bag. this.ToggleAutoProgress(1,0,false) Sleep, %sleepTime% @@ -263,15 +263,15 @@ class IC_SharedFunctions_Class extends SH_SharedFunctions sleepTime := 125 if ( forceToggle ) - this.DirectedInput(,, "{g}" ) + this.DirectedInput(,, g_SCKeyMap["g"] ) if ( this.Memory.ReadAutoProgressToggled() != isToggled ) - this.DirectedInput(,, "{g}" ) + this.DirectedInput(,, g_SCKeyMap["g"] ) while ( this.Memory.ReadAutoProgressToggled() != isToggled AND forceState AND ElapsedTime < 5001 ) { ElapsedTime := A_TickCount - StartTime if(ElapsedTime > sleepTime * keyCount) { - this.DirectedInput(,, "{g}" ) + this.DirectedInput(,, g_SCKeyMap["g"] ) keyCount++ } } @@ -293,14 +293,14 @@ class IC_SharedFunctions_Class extends SH_SharedFunctions ElapsedTime := 0 counter := 0 sleepTime := 250 - this.DirectedInput(,, "{q}") + this.DirectedInput(,, g_SCKeyMap["q"]) gold := this.ConvQuadToDouble( this.Memory.ReadGoldFirst8Bytes(), this.Memory.ReadGoldSecond8Bytes() ) while ( gold == 0 AND ElapsedTime < maxLoopTime ) { ElapsedTime := A_TickCount - StartTime if( ElapsedTime > (counter * sleepTime)) ; input limiter.. { - this.DirectedInput(,, "{q}" ) + this.DirectedInput(,, g_SCKeyMap["q"] ) counter++ } gold := this.ConvQuadToDouble( this.Memory.ReadGoldFirst8Bytes(), this.Memory.ReadGoldSecond8Bytes() ) @@ -355,7 +355,7 @@ class IC_SharedFunctions_Class extends SH_SharedFunctions DoDashWait( DashWaitMaxZone := 2000 ) { this.ToggleAutoProgress( 0, false, true ) - this.LevelChampByID( 47, 230, 7000, "{q}") ; level shandie + this.LevelChampByID( 47, 230, 7000, g_SCKeyMap["q"]) ; level shandie ; Make sure the ability handler has the correct base address. ; It can change on game restarts or modron resets. this.Memory.ActiveEffectKeyHandler.Refresh() @@ -468,7 +468,7 @@ class IC_SharedFunctions_Class extends SH_SharedFunctions this.ResetServerCall() ; try a fall back this.FallBackFromZone() - this.DirectedInput(,, "{q}" ) ; safety for correct party + this.DirectedInput(,, g_SCKeyMap["q"] ) ; safety for correct party this.ToggleAutoProgress(1, true) lastCheck := dtCurrentZoneTime fallBackTries++ @@ -533,14 +533,14 @@ class IC_SharedFunctions_Class extends SH_SharedFunctions ;check to bench briv if (!brivBenched AND this.BenchBrivConditions(this.Settings)) { - this.DirectedInput(,,["{e}"]*) + this.DirectedInput(,,[g_SCKeyMap["e"]]) g_SharedData.SwapsMadeThisRun++ return } ;check to unbench briv if (brivBenched AND this.UnBenchBrivConditions(this.Settings)) { - this.DirectedInput(,,["{q}"]*) + this.DirectedInput(,,[g_SCKeyMap["q"]]) g_SharedData.SwapsMadeThisRun++ return } @@ -549,14 +549,14 @@ class IC_SharedFunctions_Class extends SH_SharedFunctions ; check to swap briv from favorite 2 to favorite 3 (W to E) if (!brivBenched AND isFormation2 AND isWalkZone) { - this.DirectedInput(,,["{e}"]*) + this.DirectedInput(,,[g_SCKeyMap["e"]]) g_SharedData.SwapsMadeThisRun++ return } ; check to swap briv from favorite 2 to favorite 1 (W to Q) if (!brivBenched AND isFormation2 AND !isWalkZone) { - this.DirectedInput(,,["{q}"]*) + this.DirectedInput(,,[g_SCKeyMap["q"]]) g_SharedData.SwapsMadeThisRun++ return } @@ -870,11 +870,11 @@ class IC_SharedFunctions_Class extends SH_SharedFunctions if(this.Memory.ReadCurrentZone() == 1) return if(formationFavoriteNum == 1) - spam := ["{q}"] + spam := [g_SCKeyMap["q"]] else if(formationFavoriteNum == 2) - spam := ["{w}"] + spam := [g_SCKeyMap["w"]] else if(formationFavoriteNum == 3) - spam := ["{e}"] + spam := [g_SCKeyMap["e"]] else spam := "" g_SharedData.LoopString := "Waiting for offline settings wipe..." From 4dd0fd09904c9f8768c180b875e89451e2c2f9f1 Mon Sep 17 00:00:00 2001 From: Steven Van Ingelgem Date: Mon, 23 Sep 2024 20:10:00 +0200 Subject: [PATCH 2/4] typo --- AddOns/IC_BrivGemFarm_Performance/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AddOns/IC_BrivGemFarm_Performance/README.md b/AddOns/IC_BrivGemFarm_Performance/README.md index c1ffc07a..225db58c 100644 --- a/AddOns/IC_BrivGemFarm_Performance/README.md +++ b/AddOns/IC_BrivGemFarm_Performance/README.md @@ -24,7 +24,7 @@ Instructions: Notes: -1. You can can settings at any point during the run by clicking Save Settings again. +1. You can change settings at any point during the run by clicking Save Settings again. 2. First run is ignored for stats, in case it is a partial run. 3. Settings save to and load from `BrivGemFarmSettings.json` file. 4. Recommended SB stack level is [Modron Reset Zone] - X, with X = 4 for single skip, X = 6 for double skip, X = 8 for triple skip, and X = 10 for quadruple skip. From b31289fc0b77ddb893d864b45e019797e9334f56 Mon Sep 17 00:00:00 2001 From: Steven Van Ingelgem Date: Mon, 23 Sep 2024 20:46:34 +0200 Subject: [PATCH 3/4] Small cleanup of splat and arrays --- AddOns/IC_Core/IC_SharedFunctions_Class.ahk | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/AddOns/IC_Core/IC_SharedFunctions_Class.ahk b/AddOns/IC_Core/IC_SharedFunctions_Class.ahk index 3ee7c1df..b5828698 100644 --- a/AddOns/IC_Core/IC_SharedFunctions_Class.ahk +++ b/AddOns/IC_Core/IC_SharedFunctions_Class.ahk @@ -263,15 +263,15 @@ class IC_SharedFunctions_Class extends SH_SharedFunctions sleepTime := 125 if ( forceToggle ) - this.DirectedInput(,, g_SCKeyMap["g"] ) + this.DirectedInput(,, g_SCKeyMap["g"]) if ( this.Memory.ReadAutoProgressToggled() != isToggled ) - this.DirectedInput(,, g_SCKeyMap["g"] ) + this.DirectedInput(,, g_SCKeyMap["g"]) while ( this.Memory.ReadAutoProgressToggled() != isToggled AND forceState AND ElapsedTime < 5001 ) { ElapsedTime := A_TickCount - StartTime if(ElapsedTime > sleepTime * keyCount) { - this.DirectedInput(,, g_SCKeyMap["g"] ) + this.DirectedInput(,, g_SCKeyMap["g"]) keyCount++ } } @@ -300,7 +300,7 @@ class IC_SharedFunctions_Class extends SH_SharedFunctions ElapsedTime := A_TickCount - StartTime if( ElapsedTime > (counter * sleepTime)) ; input limiter.. { - this.DirectedInput(,, g_SCKeyMap["q"] ) + this.DirectedInput(,, g_SCKeyMap["q"]) counter++ } gold := this.ConvQuadToDouble( this.Memory.ReadGoldFirst8Bytes(), this.Memory.ReadGoldSecond8Bytes() ) @@ -468,7 +468,7 @@ class IC_SharedFunctions_Class extends SH_SharedFunctions this.ResetServerCall() ; try a fall back this.FallBackFromZone() - this.DirectedInput(,, g_SCKeyMap["q"] ) ; safety for correct party + this.DirectedInput(,, g_SCKeyMap["q"]) ; safety for correct party this.ToggleAutoProgress(1, true) lastCheck := dtCurrentZoneTime fallBackTries++ @@ -533,14 +533,14 @@ class IC_SharedFunctions_Class extends SH_SharedFunctions ;check to bench briv if (!brivBenched AND this.BenchBrivConditions(this.Settings)) { - this.DirectedInput(,,[g_SCKeyMap["e"]]) + this.DirectedInput(,, g_SCKeyMap["e"]) g_SharedData.SwapsMadeThisRun++ return } ;check to unbench briv if (brivBenched AND this.UnBenchBrivConditions(this.Settings)) { - this.DirectedInput(,,[g_SCKeyMap["q"]]) + this.DirectedInput(,, g_SCKeyMap["q"]) g_SharedData.SwapsMadeThisRun++ return } @@ -549,14 +549,14 @@ class IC_SharedFunctions_Class extends SH_SharedFunctions ; check to swap briv from favorite 2 to favorite 3 (W to E) if (!brivBenched AND isFormation2 AND isWalkZone) { - this.DirectedInput(,,[g_SCKeyMap["e"]]) + this.DirectedInput(,, g_SCKeyMap["e"]) g_SharedData.SwapsMadeThisRun++ return } ; check to swap briv from favorite 2 to favorite 1 (W to Q) if (!brivBenched AND isFormation2 AND !isWalkZone) { - this.DirectedInput(,,[g_SCKeyMap["q"]]) + this.DirectedInput(,, g_SCKeyMap["q"]) g_SharedData.SwapsMadeThisRun++ return } From 94dfa17048bf0c86af49469d7950d32b1cdad784 Mon Sep 17 00:00:00 2001 From: Steven Van Ingelgem Date: Wed, 25 Sep 2024 12:14:44 +0200 Subject: [PATCH 4/4] Another typo spotted. --- AddOns/IC_BrivGemFarm_Performance/FAQ.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/AddOns/IC_BrivGemFarm_Performance/FAQ.md b/AddOns/IC_BrivGemFarm_Performance/FAQ.md index f51d15c6..17f88fdb 100644 --- a/AddOns/IC_BrivGemFarm_Performance/FAQ.md +++ b/AddOns/IC_BrivGemFarm_Performance/FAQ.md @@ -1,19 +1,19 @@ # Troubleshooting * **After the game restarts to stack with briv, the script closes again before reaching the modron reset and when it opens it is on zone 1.** -There are two cases for this to happen. - 1. Briv ran out of haste stacks before reaching the modron area but has steelbones stacks. - * This means adjustments neeed to be made. Either the modron reset area needs to be lowered, Briv's stacking conditions need to be adjusted, or both. For Briv's stacking conditions, this could mean: +There are two cases for this to happen. + 1. Briv ran out of haste stacks before reaching the modron area but has steelbones stacks. + * This means adjustments need to be made. Either the modron reset area needs to be lowered, Briv's stacking conditions need to be adjusted, or both. For Briv's stacking conditions, this could mean: * Lowering the area he stacks at. (He should not be able to kill mobs). * Increasing Briv's health. 2. By default, the script will reset the map at 41 areas past the stack zone if a modron reset has not been triggered. This is a safety measure in case the modron core has been disabled or the modron's reset area was set too high and clicking would not reach it. * This setting can be adjusted. See ``ResetZoneBuffer`` in the [advanced settings.](SETTINGS.md) * **The script is using a lot of CPU. Is there some way I can reduce its load on my computer?** -See the readme for the ``IC_GemFarm_Potato`` addon at ``Addons\IC_BrivGemFarm_Potato\README.md`` +See the readme for the ``IC_GemFarm_Potato`` addon at ``Addons\IC_BrivGemFarm_Potato\README.md`` *Still a work in progress.* * **Epic's overlay is causing problems with the game running well.** For scripting with the EGS client we recommend you: -1. Disable the overlay by moving all ``EOS*.*`` in the folder ``\Epic Games\Launcher\Portal\Extras\Overlay`` to a subfolder (such as \_disabled). Move the files back if needed for other EGS games. -2. In ``IdleChampions\IdleDragons_Data\Plugins\`` move or delete ``EOSSDK-Win64-Shipping.dll`` and ``GfxPluginEOSLoader_x64.dll`` +1. Disable the overlay by moving all ``EOS*.*`` in the folder ``\Epic Games\Launcher\Portal\Extras\Overlay`` to a subfolder (such as \_disabled). Move the files back if needed for other EGS games. +2. In ``IdleChampions\IdleDragons_Data\Plugins\x86_64`` move or delete ``EOSSDK-Win64-Shipping.dll`` and ``GfxPluginEOSLoader_x64.dll``