From 22a5e12aaa39bb25913f5ec44e7c4a3a46b256d7 Mon Sep 17 00:00:00 2001 From: dhusemann Date: Thu, 19 May 2022 13:47:04 -0500 Subject: [PATCH 1/6] start magic core --- IdleCombos.ahk | 11 +++++++++++ b.ahk | 11 +++++++++++ 2 files changed, 22 insertions(+) diff --git a/IdleCombos.ahk b/IdleCombos.ahk index 3e76af7..0513c90 100644 --- a/IdleCombos.ahk +++ b/IdleCombos.ahk @@ -139,6 +139,7 @@ global BrivZone := 0 global FGCore := "`n`n" global BGCore := "`n`n" global BG2Core := "`n`n" +global BG3Core := "`n`n" ;Patron globals global MirtVariants := "" global MirtCompleted := "" @@ -1609,6 +1610,7 @@ Lg_Blacksmith: FGCore := "`n" BGCore := "`n" BG2Core := "`n" + BG3Core := "`n" If (ActiveInstance == 1) { bginstance := 2 } @@ -1626,6 +1628,9 @@ Lg_Blacksmith: else if (v.core_id == 3) { FGCore := "Core: Fast" } + else if (v.core_id == 4) { + FGCore := "Core: Magic" + } if (v.properties.toggle_preferences.reset == true) { FGCore := FGCore " (Reset at " v.area_goal ")" } @@ -1653,6 +1658,9 @@ Lg_Blacksmith: else if (v.core_id == 3) { BGCore := "Core: Fast" } + else if (v.core_id == 3) { + BGCore := "Core: Fast" + } if (v.properties.toggle_preferences.reset == true) { BGCore := BGCore " (Reset at " v.area_goal ")" } @@ -1680,6 +1688,9 @@ Lg_Blacksmith: else if (v.core_id == 3) { BG2Core := "Core: Fast" } + else if (v.core_id == 3) { + BGCore := "Core: Fast" + } if (v.properties.toggle_preferences.reset == true) { BG2Core := BG2Core " (Reset at " v.area_goal ")" } diff --git a/b.ahk b/b.ahk index 56cc40b..fde8128 100644 --- a/b.ahk +++ b/b.ahk @@ -126,6 +126,7 @@ global BrivZone := 0 global FGCore := "`n`n" global BGCore := "`n`n" global BG2Core := "`n`n" +global BG3Core := "`n`n" ;Patron globals global MirtVariants := "" global MirtCompleted := "" @@ -1561,6 +1562,7 @@ Lg_Blacksmith: FGCore := "`n" BGCore := "`n" BG2Core := "`n" + BG3Core := "`n" If (ActiveInstance == 1) { bginstance := 2 } @@ -1578,6 +1580,9 @@ Lg_Blacksmith: else if (v.core_id == 3) { FGCore := "Core: Fast" } + else if (v.core_id == 4) { + FGCore := "Core: Magic" + } if (v.properties.toggle_preferences.reset == true) { FGCore := FGCore " (Reset at " v.area_goal ")" } @@ -1605,6 +1610,9 @@ Lg_Blacksmith: else if (v.core_id == 3) { BGCore := "Core: Fast" } + else if (v.core_id == 3) { + BGCore := "Core: Fast" + } if (v.properties.toggle_preferences.reset == true) { BGCore := BGCore " (Reset at " v.area_goal ")" } @@ -1632,6 +1640,9 @@ Lg_Blacksmith: else if (v.core_id == 3) { BG2Core := "Core: Fast" } + else if (v.core_id == 3) { + BGCore := "Core: Fast" + } if (v.properties.toggle_preferences.reset == true) { BG2Core := BG2Core " (Reset at " v.area_goal ")" } From ae6fa917e1ded06142c6df7cc041d0be7130afda Mon Sep 17 00:00:00 2001 From: dhusemann Date: Thu, 19 May 2022 14:47:04 -0500 Subject: [PATCH 2/6] gui changes. more work for cleanup --- IdleCombos.ahk | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/IdleCombos.ahk b/IdleCombos.ahk index 0513c90..eb8d6a9 100644 --- a/IdleCombos.ahk +++ b/IdleCombos.ahk @@ -379,6 +379,7 @@ class MyGui { Gui, MyWindow:Add, Text, vFGCore x200 y33 w150, % FGCore Gui, MyWindow:Add, Text, vBGCore x200 y76 w150, % BGCore Gui, MyWindow:Add, Text, vBG2Core x200 y119 w150, % BG2Core + Gui, MyWindow:Add, Text, vBG3Core x200 y142 w150, % BG3Core Gui, Tab, Inventory Gui, MyWindow:Add, Text, x15 y33 w70, Current Gems: @@ -515,6 +516,7 @@ class MyGui { GuiControl, MyWindow:, FGCore, % FGCore, w250 h210 GuiControl, MyWindow:, BGCore, % BGCore, w250 h210 GuiControl, MyWindow:, BG2Core, % BG2Core, w250 h210 + GuiControl, MyWindow:, BG3Core, % BG3Core, w250 h210 ;inventory GuiControl, MyWindow:, CurrentGems, % CurrentGems, w250 h210 GuiControl, MyWindow:, SpentGems, % SpentGems, w250 h210 @@ -1659,7 +1661,7 @@ Lg_Blacksmith: BGCore := "Core: Fast" } else if (v.core_id == 3) { - BGCore := "Core: Fast" + BGCore := "Core: Magic" } if (v.properties.toggle_preferences.reset == true) { BGCore := BGCore " (Reset at " v.area_goal ")" @@ -1689,7 +1691,7 @@ Lg_Blacksmith: BG2Core := "Core: Fast" } else if (v.core_id == 3) { - BGCore := "Core: Fast" + BG2Core := "Core: Magic" } if (v.properties.toggle_preferences.reset == true) { BG2Core := BG2Core " (Reset at " v.area_goal ")" @@ -1707,6 +1709,36 @@ Lg_Blacksmith: } percenttolevel := Floor((xptolevel / levelxp) * 100) BG2Core := BG2Core "`nXP: " v.exp_total " (Lv " corelevel ")`n" xptolevel "/" levelxp " (" percenttolevel "%)" + } + else if(v.instance_id != 0){ + if (v.core_id == 1) { + BG3Core := "Core: Modest" + } + else if (v.core_id == 2) { + BG3Core := "Core: Strong" + } + else if (v.core_id == 3) { + BG3Core := "Core: Fast" + } + else if (v.core_id == 4) { + BG3Core := "Core: Magic" + } + if (v.properties.toggle_preferences.reset == true) { + BG3Core := BG3Core " (Reset at " v.area_goal ")" + } + xptolevel := v.exp_total + corelevel := 1 + levelxp := 8000 + while (xptolevel > (levelxp - 1)) { + corelevel += 1 + xptolevel -= levelxp + levelxp += 4000 + } + if (corelevel > 15) { + corelevel := corelevel " - Max 15" + } + percenttolevel := Floor((xptolevel / levelxp) * 100) + BG3Core := BG3Core "`nXP: " v.exp_total " (Lv " corelevel ")`n" xptolevel "/" levelxp " (" percenttolevel "%)" } ; } From 08f9fa7337d82dbf62f669dbd2ea31b82983faba Mon Sep 17 00:00:00 2001 From: dhusemann Date: Thu, 19 May 2022 14:50:28 -0500 Subject: [PATCH 3/6] format changes --- IdleCombos.ahk | 2 +- b.ahk | 42 +++++++++++++++++++++++++++++++++++++----- 2 files changed, 38 insertions(+), 6 deletions(-) diff --git a/IdleCombos.ahk b/IdleCombos.ahk index eb8d6a9..6ad69ef 100644 --- a/IdleCombos.ahk +++ b/IdleCombos.ahk @@ -1710,7 +1710,7 @@ Lg_Blacksmith: percenttolevel := Floor((xptolevel / levelxp) * 100) BG2Core := BG2Core "`nXP: " v.exp_total " (Lv " corelevel ")`n" xptolevel "/" levelxp " (" percenttolevel "%)" } - else if(v.instance_id != 0){ + else if(v.instance_id != 0){ if (v.core_id == 1) { BG3Core := "Core: Modest" } diff --git a/b.ahk b/b.ahk index fde8128..f76010c 100644 --- a/b.ahk +++ b/b.ahk @@ -366,6 +366,7 @@ class MyGui { Gui, MyWindow:Add, Text, vFGCore x200 y33 w150, % FGCore Gui, MyWindow:Add, Text, vBGCore x200 y76 w150, % BGCore Gui, MyWindow:Add, Text, vBG2Core x200 y119 w150, % BG2Core + Gui, MyWindow:Add, Text, vBG3Core x200 y142 w150, % BG3Core Gui, Tab, Inventory Gui, MyWindow:Add, Text, x15 y33 w70, Current Gems: @@ -1553,7 +1554,7 @@ Lg_Blacksmith: BackgroundPatron := PatronFromID(v.current_patron_id) bginstance += 1 } - else { + else if {bginst Background2Adventure := v.current_adventure_id Background2Area := v.current_area Background2Patron := PatronFromID(v.current_patron_id) @@ -1563,6 +1564,7 @@ Lg_Blacksmith: BGCore := "`n" BG2Core := "`n" BG3Core := "`n" + If (ActiveInstance == 1) { bginstance := 2 } @@ -1610,8 +1612,8 @@ Lg_Blacksmith: else if (v.core_id == 3) { BGCore := "Core: Fast" } - else if (v.core_id == 3) { - BGCore := "Core: Fast" + else if (v.core_id == 4) { + BGCore := "Core: Magic" } if (v.properties.toggle_preferences.reset == true) { BGCore := BGCore " (Reset at " v.area_goal ")" @@ -1640,8 +1642,8 @@ Lg_Blacksmith: else if (v.core_id == 3) { BG2Core := "Core: Fast" } - else if (v.core_id == 3) { - BGCore := "Core: Fast" + else if (v.core_id == 4) { + BG2Core := "Core: Magic" } if (v.properties.toggle_preferences.reset == true) { BG2Core := BG2Core " (Reset at " v.area_goal ")" @@ -1660,6 +1662,36 @@ Lg_Blacksmith: percenttolevel := Floor((xptolevel / levelxp) * 100) BG2Core := BG2Core "`nXP: " v.exp_total " (Lv " corelevel ")`n" xptolevel "/" levelxp " (" percenttolevel "%)" } + else if(v.instance_id != 0){ + if (v.core_id == 1) { + BG3Core := "Core: Modest" + } + else if (v.core_id == 2) { + BG3Core := "Core: Strong" + } + else if (v.core_id == 3) { + BG3Core := "Core: Fast" + } + else if (v.core_id == 4) { + BG3Core := "Core: Magic" + } + if (v.properties.toggle_preferences.reset == true) { + BG3Core := BG3Core " (Reset at " v.area_goal ")" + } + xptolevel := v.exp_total + corelevel := 1 + levelxp := 8000 + while (xptolevel > (levelxp - 1)) { + corelevel += 1 + xptolevel -= levelxp + levelxp += 4000 + } + if (corelevel > 15) { + corelevel := corelevel " - Max 15" + } + percenttolevel := Floor((xptolevel / levelxp) * 100) + BG3Core := BG3Core "`nXP: " v.exp_total " (Lv " corelevel ")`n" xptolevel "/" levelxp " (" percenttolevel "%)" + } ; } From a903d2b00e21840c3f204b31a9723b2cbe6138d5 Mon Sep 17 00:00:00 2001 From: dhusemann Date: Thu, 19 May 2022 15:22:31 -0500 Subject: [PATCH 4/6] more ui clean up, need to move, and more needed. --- IdleCombos.ahk | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/IdleCombos.ahk b/IdleCombos.ahk index 6ad69ef..b221a7c 100644 --- a/IdleCombos.ahk +++ b/IdleCombos.ahk @@ -105,6 +105,9 @@ global BackgroundPatron := "" global Background2Adventure := "" global Background2Area := "" global Background2Patron := "" +global Background3Adventure := "" +global Background3Area := "" +global Background3Patron := "" global AchievementInfo := "This page intentionally left blank.`n`n`n`n`n`n`n" global BlessingInfo := "`n`n`n`n`n`n" global ChampDetails := "" @@ -375,6 +378,12 @@ class MyGui { Gui, MyWindow:Add, Text, vBackground2Patron x+2 w50, % Background2Patron Gui, MyWindow:Add, Text, x15 y+p w130, Background2 Area: Gui, MyWindow:Add, Text, vBackground2Area x+2 w50, % Background2Area + Gui, MyWindow:Add, Text, x15 y142 w130, Background3 Adventure: + Gui, MyWindow:Add, Text, vBackground3Adventure x+2 w50, % Background3Adventure + Gui, MyWindow:Add, Text, x15 y+p w130, Background3 Patron: + Gui, MyWindow:Add, Text, vBackground3Patron x+2 w50, % Background3Patron + Gui, MyWindow:Add, Text, x15 y+p w130, Background3 Area: + Gui, MyWindow:Add, Text, vBackground3Area x+2 w50, % Background3Area Gui, MyWindow:Add, Text, vFGCore x200 y33 w150, % FGCore Gui, MyWindow:Add, Text, vBGCore x200 y76 w150, % BGCore @@ -1603,10 +1612,17 @@ Lg_Blacksmith: BackgroundPatron := PatronFromID(v.current_patron_id) bginstance += 1 } - else { + else if (bginstance == 1){ Background2Adventure := v.current_adventure_id Background2Area := v.current_area Background2Patron := PatronFromID(v.current_patron_id) + bginstance += 1 + } + + else { + Background3Adventure := v.current_adventure_id + Background3Area := v.current_area + Background3Patron := PatronFromID(v.current_patron_id) } ; FGCore := "`n" From c74ad0d4507141e391869fd29e38267bd2a7e8c9 Mon Sep 17 00:00:00 2001 From: dhusemann Date: Thu, 19 May 2022 16:29:50 -0500 Subject: [PATCH 5/6] more gui changes think down to solving on issue around1636 --- IdleCombos.ahk | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/IdleCombos.ahk b/IdleCombos.ahk index b221a7c..aaa4318 100644 --- a/IdleCombos.ahk +++ b/IdleCombos.ahk @@ -378,7 +378,7 @@ class MyGui { Gui, MyWindow:Add, Text, vBackground2Patron x+2 w50, % Background2Patron Gui, MyWindow:Add, Text, x15 y+p w130, Background2 Area: Gui, MyWindow:Add, Text, vBackground2Area x+2 w50, % Background2Area - Gui, MyWindow:Add, Text, x15 y142 w130, Background3 Adventure: + Gui, MyWindow:Add, Text, x15 y162 w130, Background3 Adventure: Gui, MyWindow:Add, Text, vBackground3Adventure x+2 w50, % Background3Adventure Gui, MyWindow:Add, Text, x15 y+p w130, Background3 Patron: Gui, MyWindow:Add, Text, vBackground3Patron x+2 w50, % Background3Patron @@ -388,7 +388,7 @@ class MyGui { Gui, MyWindow:Add, Text, vFGCore x200 y33 w150, % FGCore Gui, MyWindow:Add, Text, vBGCore x200 y76 w150, % BGCore Gui, MyWindow:Add, Text, vBG2Core x200 y119 w150, % BG2Core - Gui, MyWindow:Add, Text, vBG3Core x200 y142 w150, % BG3Core + Gui, MyWindow:Add, Text, vBG3Core x200 y162 w150, % BG3Core Gui, Tab, Inventory Gui, MyWindow:Add, Text, x15 y33 w70, Current Gems: @@ -522,6 +522,10 @@ class MyGui { GuiControl, MyWindow:, Background2Adventure, % Background2Adventure, w250 h210 GuiControl, MyWindow:, Background2Area, % Background2Area, w250 h210 GuiControl, MyWindow:, Background2Patron, % Background2Patron, w250 h210 + GuiControl, MyWindow:, Background3Adventure, % Background2Adventure, w250 h210 + GuiControl, MyWindow:, Background3Area, % Background2Area, w250 h210 + GuiControl, MyWindow:, Background3Patron, % Background2Patron, w250 h210 + GuiControl, MyWindow:, FGCore, % FGCore, w250 h210 GuiControl, MyWindow:, BGCore, % BGCore, w250 h210 GuiControl, MyWindow:, BG2Core, % BG2Core, w250 h210 @@ -1629,6 +1633,8 @@ Lg_Blacksmith: BGCore := "`n" BG2Core := "`n" BG3Core := "`n" + ;need to adjust this to account for 3 bginstance, count from 0-3, not sure values of ActiveInstance + ;ActiveInstance := UserDetails.details.active_game_instance_id, probably a switch based If (ActiveInstance == 1) { bginstance := 2 } From ba2fff2e30ddfcb1751005ef97a908961f86c3cb Mon Sep 17 00:00:00 2001 From: dhusemann Date: Wed, 15 Jun 2022 09:52:05 -0500 Subject: [PATCH 6/6] added 4 --- IdleCombos.ahk | 87 ++++++++++++++++++++++-------- IdleCombosegs.ahk | 132 +++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 183 insertions(+), 36 deletions(-) diff --git a/IdleCombos.ahk b/IdleCombos.ahk index b42f55a..5a1ad02 100644 --- a/IdleCombos.ahk +++ b/IdleCombos.ahk @@ -2,6 +2,10 @@ #include %A_ScriptDir% #include JSON.ahk #include idledict.ahk +;3.10 +;add working core 4 and party 4 thanks Fmagdi +;hopeful fix for opening to many chest ban thanks deathoone +;support for huge contracts thanks NeyahPeterson ;3.00 ;disabled log files by default ;2.00 @@ -51,7 +55,7 @@ ;-(Also resized the window finally) :P ;Special thanks to all the idle dragons who inspired and assisted me! -global VersionNumber := "3.00" +global VersionNumber := "3.10" global CurrentDictionary := "2.00" ;Local File globals @@ -313,6 +317,7 @@ class MyGui { ;Menu, AdvSubmenu, Add, Load New BG Adv, LoadBGAdventure Menu, AdvSubmenu, Add, End Background Adv, EndBGAdventure Menu, AdvSubmenu, Add, End Background2 Adv, EndBG2Adventure + Menu, AdvSubmenu, Add, End Background3 Adv, EndBG3Adventure Menu, AdvSubmenu, Add, &Kleho Image, KlehoImage Menu, AdvSubmenu, Add, &Incomplete Variants, IncompleteVariants Menu, AdvSubmenu, Add, Adventure List, AdventureList @@ -526,9 +531,9 @@ class MyGui { GuiControl, MyWindow:, Background2Adventure, % Background2Adventure, w250 h210 GuiControl, MyWindow:, Background2Area, % Background2Area, w250 h210 GuiControl, MyWindow:, Background2Patron, % Background2Patron, w250 h210 - GuiControl, MyWindow:, Background3Adventure, % Background2Adventure, w250 h210 - GuiControl, MyWindow:, Background3Area, % Background2Area, w250 h210 - GuiControl, MyWindow:, Background3Patron, % Background2Patron, w250 h210 + GuiControl, MyWindow:, Background3Adventure, % Background3Adventure, w250 h210 + GuiControl, MyWindow:, Background3Area, % Background3Area, w250 h210 + GuiControl, MyWindow:, Background3Patron, % Background3Patron, w250 h210 GuiControl, MyWindow:, FGCore, % FGCore, w250 h210 GuiControl, MyWindow:, BGCore, % BGCore, w250 h210 @@ -1418,13 +1423,17 @@ Hg_Blacksmith: return } + global lastadv := 0 ;fmagdi - to be used to save ended adventureid for use as default for next load + LoadAdventure() { + + GetUserDetails() while !(CurrentAdventure == "-1") { MsgBox, 5, , Please end your current adventure first. IfMsgBox Cancel return } - advtoload := 592 + advtoload := lastadv ;fmagdi - defaults to last ended adventure id, or to variable default in globals patrontoload := 0 InputBox, advtoload, Adventure to Load, Please enter the adventure_id`nyou would like to load., , 250, 150, , , , , %advtoload% if (ErrorLevel=1) { @@ -1450,6 +1459,8 @@ Hg_Blacksmith: } EndAdventure() { + GetUserDetails() ;fmagdi - updates info before ending an adventure to be sure you are ending the correct one + while (CurrentAdventure == "-1") { MsgBox, No current adventure active. return @@ -1459,6 +1470,9 @@ Hg_Blacksmith: { return } + + lastadv := CurrentAdventure ;fmagdi - saves ended adventure id for use as default when loading next adventure + advparams := DummyData "&user_id=" UserID "&hash=" UserHash "&instance_id=" InstanceID "&game_instance_id=" ActiveInstance sResult := ServerCall("softreset", advparams) GetUserDetails() @@ -1490,7 +1504,7 @@ Hg_Blacksmith: } EndBG2Adventure() { - if (ActiveInstance == "3") { + if (ActiveInstance == "3" or ActiveInstance == "4") { bginstance := 2 } else { @@ -1512,6 +1526,30 @@ Hg_Blacksmith: return } + EndBG3Adventure() { + if (ActiveInstance == "4") { + bginstance := 3 + } + else { + bginstance := 4 + } + while (Background3Adventure == "-1" or Background3Adventure == "") { + MsgBox, No background3 adventure active. + return + } + MsgBox, 4, , % "Are you sure you want to end your background3 adventure ?`nParty: " bginstance " AdvID: " Background3Adventure " Patron: " Background3Patron + IfMsgBox, No + { + return + } + advparams := DummyData "&user_id=" UserID "&hash=" UserHash "&instance_id=" InstanceID "&game_instance_id=" bginstance + sResult := ServerCall("softreset", advparams) + GetUserDetails() + SB_SetText("Background3 adventure has been ended.") + return + } + ; fmagdi -stop + FirstRun() { MsgBox, 4, , Get User ID and Hash from webrequestlog.txt? IfMsgBox, Yes @@ -1636,25 +1674,25 @@ Hg_Blacksmith: Background2Patron := PatronFromID(v.current_patron_id) bginstance += 1 } - - else { + else if (bginstance == 2){ Background3Adventure := v.current_adventure_id Background3Area := v.current_area Background3Patron := PatronFromID(v.current_patron_id) } - ; + FGCore := "`n" BGCore := "`n" BG2Core := "`n" BG3Core := "`n" - ;need to adjust this to account for 3 bginstance, count from 0-3, not sure values of ActiveInstance - ;ActiveInstance := UserDetails.details.active_game_instance_id, probably a switch based - If (ActiveInstance == 1) { - bginstance := 2 - } - Else { - bginstance := 1 - } + ; If (ActiveInstance == 1) { + ; bginstance := 2 + ; } + ; Else { + ; bginstance := 1 + ; } + + bginstance := 0 + for k, v in UserDetails.details.modron_saves if (v.instance_id == ActiveInstance) { if (v.core_id == 1) { @@ -1669,6 +1707,7 @@ Hg_Blacksmith: else if (v.core_id == 4) { FGCore := "Core: Magic" } + if (v.properties.toggle_preferences.reset == true) { FGCore := FGCore " (Reset at " v.area_goal ")" } @@ -1686,7 +1725,7 @@ Hg_Blacksmith: percenttolevel := Floor((xptolevel / levelxp) * 100) FGCore := FGCore "`nXP: " v.exp_total " (Lv " corelevel ")`n" xptolevel "/" levelxp " (" percenttolevel "%)" } - else if (v.instance_id == bginstance and v.instance_id != 0) { + else if (bginstance == 0 and v.instance_id != 0) { if (v.core_id == 1) { BGCore := "Core: Modest" } @@ -1696,7 +1735,7 @@ Hg_Blacksmith: else if (v.core_id == 3) { BGCore := "Core: Fast" } - else if (v.core_id == 3) { + else if (v.core_id == 4) { BGCore := "Core: Magic" } if (v.properties.toggle_preferences.reset == true) { @@ -1715,8 +1754,9 @@ Hg_Blacksmith: } percenttolevel := Floor((xptolevel / levelxp) * 100) BGCore := BGCore "`nXP: " v.exp_total " (Lv " corelevel ")`n" xptolevel "/" levelxp " (" percenttolevel "%)" + bginstance += 1 } - else if(v.instance_id != 0){ + else if (bginstance == 1 and v.instance_id != 0) { if (v.core_id == 1) { BG2Core := "Core: Modest" } @@ -1726,7 +1766,7 @@ Hg_Blacksmith: else if (v.core_id == 3) { BG2Core := "Core: Fast" } - else if (v.core_id == 3) { + else if (v.core_id == 4) { BG2Core := "Core: Magic" } if (v.properties.toggle_preferences.reset == true) { @@ -1745,8 +1785,9 @@ Hg_Blacksmith: } percenttolevel := Floor((xptolevel / levelxp) * 100) BG2Core := BG2Core "`nXP: " v.exp_total " (Lv " corelevel ")`n" xptolevel "/" levelxp " (" percenttolevel "%)" + bginstance += 1 } - else if(v.instance_id != 0){ + else if(bginstance == 2 and v.instance_id != 0){ if (v.core_id == 1) { BG3Core := "Core: Modest" } @@ -2960,4 +3001,4 @@ while (clipContents ~= regexpPattern) { } foundCodeString := RegExReplace(foundCodeString, "`r`n$") return foundCodeString -} +} \ No newline at end of file diff --git a/IdleCombosegs.ahk b/IdleCombosegs.ahk index d92c6ec..dac1a39 100644 --- a/IdleCombosegs.ahk +++ b/IdleCombosegs.ahk @@ -2,6 +2,10 @@ #include %A_ScriptDir% #include JSON.ahk #include idledict.ahk +;3.10 +;add working core 4 and party 4 thanks Fmagdi +;hopeful fix for opening to many chest ban thanks deathoone +;support for huge contracts thanks NeyahPeterson ;3.00 ;disable log files by default ;UPDATES TO MATCH STEAM VERSION @@ -53,7 +57,7 @@ ;-(Also resized the window finally) :P ;Special thanks to all the idle dragons who inspired and assisted me! -global VersionNumber := "3.00" +global VersionNumber := "3.10" global CurrentDictionary := "2.00" ;Local File globals @@ -108,6 +112,9 @@ global BackgroundPatron := "" global Background2Adventure := "" global Background2Area := "" global Background2Patron := "" +global Background3Adventure := "" +global Background3Area := "" +global Background3Patron := "" global AchievementInfo := "This page intentionally left blank.`n`n`n`n`n`n`n" global BlessingInfo := "`n`n`n`n`n`n" global ChampDetails := "" @@ -143,6 +150,7 @@ global BrivZone := 0 global FGCore := "`n`n" global BGCore := "`n`n" global BG2Core := "`n`n" +global BG3Core := "`n`n" ;Patron globals global MirtVariants := "" global MirtCompleted := "" @@ -312,6 +320,7 @@ class MyGui { ;Menu, AdvSubmenu, Add, Load New BG Adv, LoadBGAdventure Menu, AdvSubmenu, Add, End Background Adv, EndBGAdventure Menu, AdvSubmenu, Add, End Background2 Adv, EndBG2Adventure + Menu, AdvSubmenu, Add, End Background3 Adv, EndBG3Adventure Menu, AdvSubmenu, Add, &Kleho Image, KlehoImage Menu, AdvSubmenu, Add, &Incomplete Variants, IncompleteVariants Menu, AdvSubmenu, Add, Adventure List, AdventureList @@ -379,10 +388,17 @@ class MyGui { Gui, MyWindow:Add, Text, vBackground2Patron x+2 w50, % Background2Patron Gui, MyWindow:Add, Text, x15 y+p w130, Background2 Area: Gui, MyWindow:Add, Text, vBackground2Area x+2 w50, % Background2Area + Gui, MyWindow:Add, Text, x15 y162 w130, Background3 Adventure: + Gui, MyWindow:Add, Text, vBackground3Adventure x+2 w50, % Background3Adventure + Gui, MyWindow:Add, Text, x15 y+p w130, Background3 Patron: + Gui, MyWindow:Add, Text, vBackground3Patron x+2 w50, % Background3Patron + Gui, MyWindow:Add, Text, x15 y+p w130, Background3 Area: + Gui, MyWindow:Add, Text, vBackground3Area x+2 w50, % Background3Area Gui, MyWindow:Add, Text, vFGCore x200 y33 w150, % FGCore Gui, MyWindow:Add, Text, vBGCore x200 y76 w150, % BGCore Gui, MyWindow:Add, Text, vBG2Core x200 y119 w150, % BG2Core + Gui, MyWindow:Add, Text, vBG3Core x200 y162 w150, % BG3Core Gui, Tab, Inventory Gui, MyWindow:Add, Text, x15 y33 w70, Current Gems: @@ -518,9 +534,14 @@ class MyGui { GuiControl, MyWindow:, Background2Adventure, % Background2Adventure, w250 h210 GuiControl, MyWindow:, Background2Area, % Background2Area, w250 h210 GuiControl, MyWindow:, Background2Patron, % Background2Patron, w250 h210 + GuiControl, MyWindow:, Background3Adventure, % Background3Adventure, w250 h210 + GuiControl, MyWindow:, Background3Area, % Background3Area, w250 h210 + GuiControl, MyWindow:, Background3Patron, % Background3Patron, w250 h210 + GuiControl, MyWindow:, FGCore, % FGCore, w250 h210 GuiControl, MyWindow:, BGCore, % BGCore, w250 h210 GuiControl, MyWindow:, BG2Core, % BG2Core, w250 h210 + GuiControl, MyWindow:, BG3Core, % BG3Core, w250 h210 ;inventory GuiControl, MyWindow:, CurrentGems, % CurrentGems, w250 h210 GuiControl, MyWindow:, SpentGems, % SpentGems, w250 h210 @@ -1405,13 +1426,17 @@ Hg_Blacksmith: return } + global lastadv := 0 ;fmagdi - to be used to save ended adventureid for use as default for next load + LoadAdventure() { + + GetUserDetails() while !(CurrentAdventure == "-1") { MsgBox, 5, , Please end your current adventure first. IfMsgBox Cancel return } - advtoload := 592 + advtoload := lastadv ;fmagdi - defaults to last ended adventure id, or to variable default in globals patrontoload := 0 InputBox, advtoload, Adventure to Load, Please enter the adventure_id`nyou would like to load., , 250, 150, , , , , %advtoload% if (ErrorLevel=1) { @@ -1437,6 +1462,8 @@ Hg_Blacksmith: } EndAdventure() { + GetUserDetails() ;fmagdi - updates info before ending an adventure to be sure you are ending the correct one + while (CurrentAdventure == "-1") { MsgBox, No current adventure active. return @@ -1446,6 +1473,9 @@ Hg_Blacksmith: { return } + + lastadv := CurrentAdventure ;fmagdi - saves ended adventure id for use as default when loading next adventure + advparams := DummyData "&user_id=" UserID "&hash=" UserHash "&instance_id=" InstanceID "&game_instance_id=" ActiveInstance sResult := ServerCall("softreset", advparams) GetUserDetails() @@ -1477,7 +1507,7 @@ Hg_Blacksmith: } EndBG2Adventure() { - if (ActiveInstance == "3") { + if (ActiveInstance == "3" or ActiveInstance == "4") { bginstance := 2 } else { @@ -1499,6 +1529,30 @@ Hg_Blacksmith: return } + EndBG3Adventure() { + if (ActiveInstance == "4") { + bginstance := 3 + } + else { + bginstance := 4 + } + while (Background3Adventure == "-1" or Background3Adventure == "") { + MsgBox, No background3 adventure active. + return + } + MsgBox, 4, , % "Are you sure you want to end your background3 adventure ?`nParty: " bginstance " AdvID: " Background3Adventure " Patron: " Background3Patron + IfMsgBox, No + { + return + } + advparams := DummyData "&user_id=" UserID "&hash=" UserHash "&instance_id=" InstanceID "&game_instance_id=" bginstance + sResult := ServerCall("softreset", advparams) + GetUserDetails() + SB_SetText("Background3 adventure has been ended.") + return + } + ; fmagdi -stop + FirstRun() { MsgBox, 4, , Get User ID and Hash from webrequestlog.txt? IfMsgBox, Yes @@ -1617,21 +1671,31 @@ Hg_Blacksmith: BackgroundPatron := PatronFromID(v.current_patron_id) bginstance += 1 } - else { + else if (bginstance == 1){ Background2Adventure := v.current_adventure_id Background2Area := v.current_area Background2Patron := PatronFromID(v.current_patron_id) + bginstance += 1 } - ; + else if (bginstance == 2){ + Background3Adventure := v.current_adventure_id + Background3Area := v.current_area + Background3Patron := PatronFromID(v.current_patron_id) + } + FGCore := "`n" BGCore := "`n" BG2Core := "`n" - If (ActiveInstance == 1) { - bginstance := 2 - } - Else { - bginstance := 1 - } + BG3Core := "`n" + ; If (ActiveInstance == 1) { + ; bginstance := 2 + ; } + ; Else { + ; bginstance := 1 + ; } + + bginstance := 0 + for k, v in UserDetails.details.modron_saves if (v.instance_id == ActiveInstance) { if (v.core_id == 1) { @@ -1643,6 +1707,10 @@ Hg_Blacksmith: else if (v.core_id == 3) { FGCore := "Core: Fast" } + else if (v.core_id == 4) { + FGCore := "Core: Magic" + } + if (v.properties.toggle_preferences.reset == true) { FGCore := FGCore " (Reset at " v.area_goal ")" } @@ -1660,7 +1728,7 @@ Hg_Blacksmith: percenttolevel := Floor((xptolevel / levelxp) * 100) FGCore := FGCore "`nXP: " v.exp_total " (Lv " corelevel ")`n" xptolevel "/" levelxp " (" percenttolevel "%)" } - else if (v.instance_id == bginstance and v.instance_id != 0) { + else if (bginstance == 0 and v.instance_id != 0) { if (v.core_id == 1) { BGCore := "Core: Modest" } @@ -1670,6 +1738,9 @@ Hg_Blacksmith: else if (v.core_id == 3) { BGCore := "Core: Fast" } + else if (v.core_id == 4) { + BGCore := "Core: Magic" + } if (v.properties.toggle_preferences.reset == true) { BGCore := BGCore " (Reset at " v.area_goal ")" } @@ -1686,8 +1757,9 @@ Hg_Blacksmith: } percenttolevel := Floor((xptolevel / levelxp) * 100) BGCore := BGCore "`nXP: " v.exp_total " (Lv " corelevel ")`n" xptolevel "/" levelxp " (" percenttolevel "%)" + bginstance += 1 } - else if(v.instance_id != 0){ + else if (bginstance == 1 and v.instance_id != 0) { if (v.core_id == 1) { BG2Core := "Core: Modest" } @@ -1697,6 +1769,9 @@ Hg_Blacksmith: else if (v.core_id == 3) { BG2Core := "Core: Fast" } + else if (v.core_id == 4) { + BG2Core := "Core: Magic" + } if (v.properties.toggle_preferences.reset == true) { BG2Core := BG2Core " (Reset at " v.area_goal ")" } @@ -1713,6 +1788,37 @@ Hg_Blacksmith: } percenttolevel := Floor((xptolevel / levelxp) * 100) BG2Core := BG2Core "`nXP: " v.exp_total " (Lv " corelevel ")`n" xptolevel "/" levelxp " (" percenttolevel "%)" + bginstance += 1 + } + else if(bginstance == 2 and v.instance_id != 0){ + if (v.core_id == 1) { + BG3Core := "Core: Modest" + } + else if (v.core_id == 2) { + BG3Core := "Core: Strong" + } + else if (v.core_id == 3) { + BG3Core := "Core: Fast" + } + else if (v.core_id == 4) { + BG3Core := "Core: Magic" + } + if (v.properties.toggle_preferences.reset == true) { + BG3Core := BG3Core " (Reset at " v.area_goal ")" + } + xptolevel := v.exp_total + corelevel := 1 + levelxp := 8000 + while (xptolevel > (levelxp - 1)) { + corelevel += 1 + xptolevel -= levelxp + levelxp += 4000 + } + if (corelevel > 15) { + corelevel := corelevel " - Max 15" + } + percenttolevel := Floor((xptolevel / levelxp) * 100) + BG3Core := BG3Core "`nXP: " v.exp_total " (Lv " corelevel ")`n" xptolevel "/" levelxp " (" percenttolevel "%)" } ; }