From e21f64a55f36902fd30c525ec9e093d7c56b63bd Mon Sep 17 00:00:00 2001 From: Lailloken <61888437+Lailloken@users.noreply.github.com> Date: Sun, 15 Sep 2024 12:34:33 +0200 Subject: [PATCH 1/4] updated English UI & tooltips --- data/english/UI.txt | 6 ++++-- data/english/help tooltips.json | 9 ++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/data/english/UI.txt b/data/english/UI.txt index 49c66542..af84d3b0 100644 --- a/data/english/UI.txt +++ b/data/english/UI.txt @@ -164,11 +164,13 @@ global_confirm = "confirm" global_mouse = "l#m#r" ;## left, middle, right mouse-button global_coordinates = "coordinates" - global_time = "time" + global_time = "time:" global_refresh = "refresh" global_settings = "settings" global_regex = "copy regex" global_clipboard = "copied to clipboard" + global_start = "start" + global_cancel = "cancel" mechanic_bestiary = "bestiary" mechanic_betrayal = "betrayal" @@ -244,7 +246,7 @@ betrayal_fortification = "fortification" betrayal_research = "research" betrayal_intervention = "intervention" - betrayal_abort = "press esc, or go back to the game to abort" + betrayal_abort = "go back to the game to abort" diff --git a/data/english/help tooltips.json b/data/english/help tooltips.json index 17826593..96ed8e09 100644 --- a/data/english/help tooltips.json +++ b/data/english/help tooltips.json @@ -490,9 +490,7 @@ "use it to snip 4 to 5 lines of text from the character-stats" ], "ocr colors": [ - "customize the color patterns used to highlight specific mods/rewards", - "each pattern has two buttons: font | background", - "click the buttons to open the color palette, or right-click to reset to default" + "customize the color patterns used to highlight specific mods/rewards" ], "ocr debug": [ "holding the right crtl-key while scanning the screen will open a window that displays the screen-cap as well as the text the script was able to read from it" @@ -544,7 +542,8 @@ ], "screenchecks image-calibration": [ "follow the instructions from before clicking this", - "opens the clipping tool: use it to clip the ui element from " + "left-click: automatic calibration", + "right-click: manually screen-cap the ui element shown in " ], "screenchecks image-test": [ "click this button while the ui element shown in is visible, the test should return positive", @@ -967,7 +966,7 @@ ], "betrayal": [ "(/bold)(/underline)instructions:", - "-> open the syndicate board", + "-> open the syndicate board and make sure the x-button is fully visible", "-> click to let the tool calibrate, OR right-click to manually calibrate", "-> follow the instructions in " ], From daee9c309675c91b5e400b9720310cd549c199bf Mon Sep 17 00:00:00 2001 From: Lailloken <61888437+Lailloken@users.noreply.github.com> Date: Sun, 15 Sep 2024 12:36:08 +0200 Subject: [PATCH 2/4] v1.55.4 modules --- modules/betrayal-info.ahk | 15 +++++---------- modules/hotkeys.ahk | 3 ++- modules/item-checker.ahk | 8 ++++---- modules/leveling tracker.ahk | 5 +---- modules/omni-key.ahk | 15 +++------------ modules/qol tools.ahk | 25 +++++++++++++++++++------ modules/screen-checks.ahk | 5 +---- modules/settings menu.ahk | 17 +++++------------ 8 files changed, 40 insertions(+), 53 deletions(-) diff --git a/modules/betrayal-info.ahk b/modules/betrayal-info.ahk index aea2cbc3..64b10045 100644 --- a/modules/betrayal-info.ahk +++ b/modules/betrayal-info.ahk @@ -102,16 +102,11 @@ BetrayalCalibrate(cHWND := "") Gui, betrayal_setup: Show, NA x10000 y10000 WinGetPos,,, w, h, % "ahk_id " vars.hwnd.betrayal_setup.main Gui, betrayal_setup: Show, % "x" vars.monitor.x + vars.client.xc - w//2 " y" vars.monitor.y + vars.client.yc - h//2 - Loop ;use this kind of loop instead of a hard-coded hotkey to close this setup-window - { - If !WinActive("ahk_id "vars.hwnd.betrayal_setup.main) || GetKeyState("ESC", "P") - { - If IsObject(vars.hwnd.betrayal_setup) - LLK_ToolTip(LangTrans("global_screencap") "`n" LangTrans("global_abort"),,,,, "red") - Else LLK_ToolTip(LangTrans("global_screencap") "`n" LangTrans("global_success"),,,,, "lime") - Break - } - } + While WinActive("ahk_id " vars.hwnd.betrayal_setup.main) ;use this kind of loop instead of a hard-coded hotkey to close this setup-window + Sleep 100 + If IsObject(vars.hwnd.betrayal_setup) + LLK_ToolTip(LangTrans("global_screencap") "`n" LangTrans("global_abort"),,,,, "red") + Else LLK_ToolTip(LangTrans("global_screencap") "`n" LangTrans("global_success"),,,,, "lime") } DeleteObject(hbmBetrayal), Gdip_DisposeImage(pBetrayal) vars.hwnd.Delete("betrayal_setup") diff --git a/modules/hotkeys.ahk b/modules/hotkeys.ahk index 6401c200..caeff0f4 100644 --- a/modules/hotkeys.ahk +++ b/modules/hotkeys.ahk @@ -512,7 +512,8 @@ Return ~+LButton UP::IteminfoTrigger(1) +RButton::IteminfoMarker() -#If (vars.pixelsearch.inventory.check || !settings.features.pixelchecks) && (settings.iteminfo.trigger || settings.mapinfo.trigger) && !vars.general.shift_trigger && (vars.general.wMouse = vars.hwnd.poe_client) ;shift-right-clicking currency to shift-click items after +#If (settings.iteminfo.trigger || settings.mapinfo.trigger) && !vars.general.shift_trigger && (vars.general.wMouse = vars.hwnd.poe_client) && Screenchecks_PixelSearch("inventory") +;shift-right-clicking currency to shift-click items after ~+RButton UP::IteminfoTrigger() diff --git a/modules/item-checker.ahk b/modules/item-checker.ahk index 4b795b03..32779d8d 100644 --- a/modules/item-checker.ahk +++ b/modules/item-checker.ahk @@ -20,7 +20,7 @@ settings.iteminfo.ilvl := (settings.general.lang_client != "english") ? 0 : !Blank(check := ini.settings["enable item-levels"]) ? check : 0 settings.iteminfo.itembase := !Blank(check := ini.settings["enable base-info"]) ? check : 1 settings.iteminfo.override := !Blank(check := ini.settings["enable blacklist-override"]) ? check : 0 - settings.iteminfo.compare := (settings.general.lang_client != "english") || !settings.features.pixelchecks ? 0 : !Blank(check := ini.settings["enable gear-tracking"]) ? check : 0 + settings.iteminfo.compare := (settings.general.lang_client != "english") ? 0 : !Blank(check := ini.settings["enable gear-tracking"]) ? check : 0 settings.iteminfo.rules := {} settings.iteminfo.rules.res_weapons := (settings.general.lang_client != "english") ? 0 : !Blank(check := ini.settings["weapon res override"]) ? check : 0 @@ -2347,14 +2347,14 @@ IteminfoOverlays() ;show update buttons for specific gear-slots underneath the c local global vars, settings - If settings.iteminfo.compare && settings.features.pixelchecks + If settings.iteminfo.compare For slot, val in vars.iteminfo.compare.slots { - If vars.pixelsearch.inventory.check && LLK_IsBetween(vars.general.xMouse, val.x1, val.x2) && LLK_IsBetween(vars.general.yMouse, val.y1, val.y2) && (vars.log.areaID != "login") + If LLK_IsBetween(vars.general.xMouse, val.x1, val.x2) && LLK_IsBetween(vars.general.yMouse, val.y1, val.y2) && (vars.log.areaID != "login") && Screenchecks_PixelSearch("inventory") && !WinExist("ahk_id "vars.hwnd.iteminfo_comparison[slot]) && (vars.general.wMouse != vars.hwnd.iteminfo.main) && (vars.general.wMouse != vars.hwnd.omni_context.main) && WinActive("ahk_group poe_window") LLK_Overlay(vars.hwnd.iteminfo_comparison[slot], "show",, "iteminfo_button_" slot) Else If WinExist("ahk_id " vars.hwnd.iteminfo_comparison[slot]) - && (!vars.pixelsearch.inventory.check || !(LLK_IsBetween(vars.general.xMouse, val.x1, val.x2) && LLK_IsBetween(vars.general.yMouse, val.y1, val.y2)) || (vars.general.wMouse = vars.hwnd.iteminfo.main) || (vars.general.wMouse = vars.hwnd.omni_context.main) || (vars.log.areaID = "login") || !WinActive("ahk_group poe_window")) + && (!(LLK_IsBetween(vars.general.xMouse, val.x1, val.x2) && LLK_IsBetween(vars.general.yMouse, val.y1, val.y2)) || (vars.general.wMouse = vars.hwnd.iteminfo.main) || (vars.general.wMouse = vars.hwnd.omni_context.main) || (vars.log.areaID = "login") || !WinActive("ahk_group poe_window") || !Screenchecks_PixelSearch("inventory")) LLK_Overlay(vars.hwnd.iteminfo_comparison[slot], "hide") } } diff --git a/modules/leveling tracker.ahk b/modules/leveling tracker.ahk index 086960d5..b06a9751 100644 --- a/modules/leveling tracker.ahk +++ b/modules/leveling tracker.ahk @@ -1085,16 +1085,13 @@ LeveltrackerProgress(mode := 0) ;advances the guide and redraws the overlay For raw_index, step in guide.text_raw { guide.group1.Push(step) - If (InStr(step, "enter") || InStr(step, "(img:waypoint) to") || (InStr(step, "sail to ") && !InStr(step, "wraeclast")) || InStr(step, "(img:portal) to")) - && !InStr(step, "arena:") ;&& !InStr(step, "the warden's_chambers") && !InStr(step, "sewer_outlet") && !InStr(step, "resurrection_site") && !InStr(step, "the_black_core") + If (InStr(step, "enter") || InStr(step, "(img:waypoint) to") || (InStr(step, "sail to ") && !InStr(step, "wraeclast")) || InStr(step, "(img:portal) to")) && InStr(step, "areaid") && !(InStr(step, "enter") < InStr(step, "kill")) && !(InStr(step, "enter") < InStr(step, "activate") && !InStr(step, "airlock")) && !InStr(step, "complete the") { Loop - { If InStr(guide.text_raw[raw_index + A_Index], "(hint)") guide.group1.Push(guide.text_raw[raw_index + A_Index]) Else Break - } Break } } diff --git a/modules/omni-key.ahk b/modules/omni-key.ahk index 2634ca33..c7c73a74 100644 --- a/modules/omni-key.ahk +++ b/modules/omni-key.ahk @@ -21,14 +21,8 @@ WinWaitActive, % "ahk_id " vars.hwnd.poe_client } - If !settings.features.pixelchecks - Screenchecks_PixelSearch("inventory") - - If vars.pixelsearch.inventory.check + If Screenchecks_PixelSearch("inventory") { - If !settings.features.pixelchecks - vars.pixelsearch.inventory.check := 0 - If WinExist("ahk_id " vars.hwnd.maptrackernotes_edit.main) { MaptrackerNoteAdd(), OmniRelease() @@ -37,7 +31,7 @@ If settings.hotkeys.item_descriptions && settings.hotkeys.rebound_alt SendInput, % "{" settings.hotkeys.item_descriptions " down}^{c}{" settings.hotkeys.item_descriptions " up}" - Else SendInput !^{c} + Else SendInput, !^{c} ClipWait, 0.1 } @@ -142,10 +136,7 @@ Omnikey2() Return } - If !settings.features.pixelchecks - Screenchecks_PixelSearch("gamescreen") - - If !vars.pixelsearch.gamescreen.check + If !Screenchecks_PixelSearch("gamescreen") { Screenchecks_ImageSearch() If settings.features.betrayal && vars.imagesearch.betrayal.check diff --git a/modules/qol tools.ahk b/modules/qol tools.ahk index d499015f..8fe3c223 100644 --- a/modules/qol tools.ahk +++ b/modules/qol tools.ahk @@ -131,22 +131,35 @@ Alarm(hotkey := 1, cHWND := "", mode := "") Gui, alarm_set: Color, Black Gui, alarm_set: Margin, 0, 0 Gui, alarm_set: Font, % "s" Max(6, settings.alarm.fSize * 0.7) " cWhite", % vars.system.font - vars.hwnd.alarm.alarm_set := alarm_set + vars.hwnd.alarm.alarm_set := alarm_set, LLK_PanelDimensions([LangTrans("global_name"), LangTrans("global_time")], Max(6, settings.alarm.fSize * 0.7), wText, hText) - Gui, alarm_set: Add, Edit, % "Section cBlack HWNDhwnd Center r1 w" vars.alarm.wTimers + Gui, alarm_set: Add, Edit, % "r1 Hidden w" vars.alarm.wTimers + Gui, alarm_set: Add, Text, % "xp yp hp Section Right Border 0x200 w" wText, % LangTrans("global_time") " " + Gui, alarm_set: Add, Edit, % "ys x+-1 cBlack HWNDhwnd Center r1 w" vars.alarm.wTimers If !(cHWND = "start") { - Gui, alarm_set: Add, Edit, % "Section xs y+-1 cBlack Center Limit HWNDhwnd1 r1 w" vars.alarm.wTimers + Gui, alarm_set: Add, Text, % "Section hp xs y+-1 Right Border 0x200 w" wText, % LangTrans("global_name") " " + Gui, alarm_set: Add, Edit, % "ys x+-1 cBlack Center Limit HWNDhwnd1 r1 w" vars.alarm.wTimers vars.alarm.override := "" } vars.hwnd.alarm.edit := hwnd, vars.hwnd.alarm.edit1 := hwnd1 Gui, alarm_set: Add, Button, % "xp yp hp wp Hidden Default gAlarm cBlack", OK + If (cHWND = "start") { - WinGetPos, xEdit, yEdit, wEdit, hEdit,% "ahk_id " vars.hwnd.alarm["timer_" vars.alarm.override] - Gui, alarm_set: Show, % "x" xEdit " y" yEdit + WinGetPos, xEdit, yEdit, wEdit, hEdit, % "ahk_id " vars.hwnd.alarm["timer_" vars.alarm.override] + xPos := xEdit - wText + 1, yPos := yEdit } - Else Gui, alarm_set: Show, % "x" vars.alarm.xPanel + vars.alarm.wPanel//2 - vars.alarm.wTimers//2 " y"vars.alarm.yPanel + Else xPos := vars.alarm.xPanel + vars.alarm.wPanel//2 - wText, yPos := vars.alarm.yPanel + + Gui, alarm_set: Add, Text, % "Section xs y+-1 Center Border gAlarm 0x200 w" Round((wText + vars.alarm.wTimers - 1) / 2), % LangTrans("global_start") + Gui, alarm_set: Add, Text, % "ys Center Border gHotkeysESC 0x200 w" Round((wText + vars.alarm.wTimers - 1) / 2) " x+" (Mod(wText + vars.alarm.wTimers - 1, 2) ? -1 : 0), % LangTrans("global_cancel") + Gui, alarm_set: Show, % "NA x10000 y10000" + + WinGetPos, xWin, yWin, wWin, hWin, ahk_id %alarm_set% + xPos := (xPos < vars.monitor.x) ? vars.monitor.x : (xPos + wWin >= vars.monitor.x + vars.monitor.w) ? vars.monitor.x + vars.monitor.w - wWin : xPos + yPos := (yPos + hWin >= vars.monitor.y + vars.monitor.h) ? vars.monitor.y + vars.monitor.h - hWin : yPos + Gui, alarm_set: Show, % "x" xPos " y" yPos ControlFocus,, ahk_id %hwnd% Return } diff --git a/modules/screen-checks.ahk b/modules/screen-checks.ahk index e5e7be1e..7cee56bd 100644 --- a/modules/screen-checks.ahk +++ b/modules/screen-checks.ahk @@ -17,14 +17,12 @@ } Else settings.general.oGamescreen := 0 - settings.features.pixelchecks := LLK_IniRead("ini\config.ini", "Settings", "background pixel-checks", 1) ;reminder: keep it in config.ini (instead of screen checks.ini) because it's not resolution-specific vars.pixelsearch := {}, parse := LLK_IniRead("data\Resolutions.ini", vars.client.h "p", "gamescreen coordinates") If InStr(parse, ",") vars.pixelsearch.gamescreen := {"x1": SubStr(parse, 1, InStr(parse, ",") - 1), "y1": SubStr(parse, InStr(parse, ",") + 1)} ini := IniBatchRead("ini\screen checks (" vars.client.h "p).ini") vars.pixelsearch.gamescreen.color1 := ini.gamescreen["color 1"] - vars.pixelsearch.gamescreen.check := 0 vars.pixelsearch.inventory := {"x1": 0, "x2": 0, "x3": 6, "y1": 0, "y2": 6, "y3": 0, "check": 0} Loop 3 vars.pixelsearch.inventory["color" A_Index] := ini.inventory["color " A_Index] @@ -300,6 +298,5 @@ Screenchecks_PixelSearch(name) ;performing pixel-checks If !pixel_check break } - vars.pixelsearch[name].check := pixel_check ? 1 : 0 ;global variable that is checked in the main loop - Return vars.pixelsearch[name].check + Return pixel_check } diff --git a/modules/settings menu.ahk b/modules/settings menu.ahk index c7691795..13f2c3a4 100644 --- a/modules/settings menu.ahk +++ b/modules/settings menu.ahk @@ -340,7 +340,7 @@ Settings_cloneframes() GUI := "settings_menu" vars.settings.GUI_toggle, x_anchor := vars.settings.x_anchor Gui, %GUI%: Add, Link, % "Section x" x_anchor " y"vars.settings.ySelection, wiki page - If vars.pixelsearch.gamescreen.x1 && (vars.pixelsearch.gamescreen.x1 != "ERROR") && settings.features.pixelchecks || vars.log.file_location + If vars.pixelsearch.gamescreen.x1 && (vars.pixelsearch.gamescreen.x1 != "ERROR") || vars.log.file_location { Gui, %GUI%: Font, underline bold Gui, %GUI%: Add, Text, % "xs Section y+"vars.settings.spacing, % LangTrans("m_clone_toggle") @@ -349,7 +349,7 @@ Settings_cloneframes() vars.hwnd.help_tooltips["settings_cloneframes toggle-info"] := hwnd } - If vars.pixelsearch.gamescreen.x1 && (vars.pixelsearch.gamescreen.x1 != "ERROR") && settings.features.pixelchecks + If vars.pixelsearch.gamescreen.x1 && (vars.pixelsearch.gamescreen.x1 != "ERROR") { Gui, %GUI%: Add, Checkbox, % "xs Section gSettings_cloneframes2 HWNDhwnd Checked"settings.cloneframes.pixelchecks, % LangTrans("m_clone_gamescreen") vars.hwnd.settings.hide_menu := hwnd, vars.hwnd.help_tooltips["settings_cloneframes pixelchecks"] := hwnd @@ -1195,11 +1195,8 @@ Settings_iteminfo() Gui, %GUI%: Add, Checkbox, % "xs Section gSettings_iteminfo2 HWNDhwnd Checked"settings.iteminfo.trigger, % LangTrans("m_iteminfo_shift") vars.hwnd.settings.trigger := hwnd, vars.hwnd.help_tooltips["settings_iteminfo shift-click"] := hwnd - If settings.features.pixelchecks - { - Gui, %GUI%: Add, Checkbox, % "xs Section gSettings_iteminfo2 HWNDhwnd Checked"settings.iteminfo.compare (settings.general.lang_client != "english" ? " cGray" : ""), % LangTrans("m_iteminfo_league") - vars.hwnd.settings.compare := hwnd, vars.hwnd.help_tooltips["settings_" (settings.general.lang_client = "english" ? "iteminfo league-start" : "lang unavailable") ] := hwnd - } + Gui, %GUI%: Add, Checkbox, % "xs Section gSettings_iteminfo2 HWNDhwnd Checked"settings.iteminfo.compare (settings.general.lang_client != "english" ? " cGray" : ""), % LangTrans("m_iteminfo_league") + vars.hwnd.settings.compare := hwnd, vars.hwnd.help_tooltips["settings_" (settings.general.lang_client = "english" ? "iteminfo league-start" : "lang unavailable") ] := hwnd If !settings.iteminfo.compare { @@ -2504,6 +2501,7 @@ Settings_OCR() Gui, %GUI%: Add, Progress, % "xp yp wp hp Border BackgroundBlack HWNDhwnd11 c" array.2, 100 vars.hwnd.settings["color_" index "1"] := hwnd00, vars.hwnd.settings["color_" index "_panel1"] := hwnd01, vars.hwnd.settings["color_" index "_text1"] := hwndtext vars.hwnd.settings["color_" index "2"] := hwnd10, vars.hwnd.settings["color_" index "_panel2"] := hwnd11, vars.hwnd.settings["color_" index "_text2"] := hwndback + vars.hwnd.help_tooltips["settings_generic color double" handle] := hwnd01, vars.hwnd.help_tooltips["settings_generic color double1" handle] := hwnd11, handle .= "|" } } @@ -2913,8 +2911,6 @@ Settings_screenchecks() Gui, %GUI%: Add, Text, % "ys", % LangTrans((key = "inventory" ? "global_" : "m_screen_") key) } Gui, %GUI%: Font, norm - Gui, %GUI%: Add, Checkbox, % "hp xs Section gSettings_screenchecks2 HWNDhwnd Checked" settings.features.pixelchecks, % LangTrans("m_screen_pixel", 2) - vars.hwnd.settings.pixelchecks := vars.hwnd.help_tooltips["settings_screenchecks pixel-background"] := hwnd If vars.client.stream { @@ -2980,9 +2976,6 @@ Settings_screenchecks2(cHWND := "") Switch check { - Case "pixelchecks": - IniWrite, % LLK_ControlGet(cHWND), ini\config.ini, settings, background pixel-checks - settings.features.pixelchecks := LLK_ControlGet(cHWND) Case "folder": If FileExist("img\Recognition ("vars.client.h "p)\GUI") Run, % "explore img\Recognition ("vars.client.h "p)\GUI\" From 13ae7d7657c46bbae05290ce5fd69e0d06b341a3 Mon Sep 17 00:00:00 2001 From: Lailloken <61888437+Lailloken@users.noreply.github.com> Date: Sun, 15 Sep 2024 12:44:34 +0200 Subject: [PATCH 3/4] v1.55.4 initial --- Lailloken UI.ahk | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/Lailloken UI.ahk b/Lailloken UI.ahk index 590b7811..90fcd1cc 100644 --- a/Lailloken UI.ahk +++ b/Lailloken UI.ahk @@ -813,7 +813,7 @@ Loop_main() } IteminfoOverlays() - If vars.client.stream && !vars.general.drag && !WinExist("LLK-UI: notepad reminder") && !WinExist("LLK-UI: alarm set") && WinActive("ahk_group poe_ahk_window") && vars.general.wMouse && LLK_HasVal(vars.hwnd, vars.general.wMouse,,,, 1) && !WinActive("ahk_id " vars.general.wMouse) + If vars.client.stream && !vars.general.drag && !WinExist("LLK-UI: notepad reminder") && !WinExist("LLK-UI: alarm set") && !WinExist("ahk_id " vars.hwnd.betrayal_setup.main) && WinActive("ahk_group poe_ahk_window") && vars.general.wMouse && LLK_HasVal(vars.hwnd, vars.general.wMouse,,,, 1) && !WinActive("ahk_id " vars.general.wMouse) WinActivate, % "ahk_id " vars.general.wMouse If !vars.general.drag && (vars.general.wMouse != vars.hwnd.settings.main) && WinActive("ahk_group poe_ahk_window") && vars.hwnd.stash.main && !vars.stash.wait && !vars.stash.enter && (vars.stash.GUI || WinExist("ahk_id " vars.hwnd.stash.main)) && LLK_IsBetween(vars.general.xMouse, vars.client.x, vars.client.x + vars.stash.width) && LLK_IsBetween(vars.general.yMouse, vars.client.y, vars.client.y + vars.client.h) @@ -894,16 +894,10 @@ Loop_main() LLK_Overlay("show") } - If settings.features.pixelchecks - { - For key in vars.pixelsearch.list - Screenchecks_PixelSearch(key) - } - LeveltrackerFade() location := vars.log.areaID ;short-cut variable If (vars.cloneframes.enabled - && ((settings.cloneframes.pixelchecks && vars.pixelsearch.gamescreen.check) || !settings.cloneframes.pixelchecks)) ;user is on gamescreen, or auto-toggle is disabled + && ((settings.cloneframes.pixelchecks && Screenchecks_PixelSearch("gamescreen")) || !settings.cloneframes.pixelchecks)) ;user is on gamescreen, or auto-toggle is disabled && (!settings.cloneframes.hide || (settings.cloneframes.hide && !InStr(location, "hideout") && !InStr(location, "_town") && !InStr(location, "heisthub") && (location != "login"))) ;outside hideout/town/login, or auto-toggle is disabled && !vars.sanctum.active || (vars.settings.active = "clone-frames") ;accessing the clone-frames section of the settings From 5db09f1da29c7a67d29896cc857625dcfb738211 Mon Sep 17 00:00:00 2001 From: Lailloken <61888437+Lailloken@users.noreply.github.com> Date: Sun, 15 Sep 2024 13:03:49 +0200 Subject: [PATCH 4/4] updated version-file and changelogs --- data/changelog.json | 6 ++++++ data/versions.json | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/data/changelog.json b/data/changelog.json index 7ecf9f7b..a54f98c2 100644 --- a/data/changelog.json +++ b/data/changelog.json @@ -1,4 +1,10 @@ [ + [ + ["1.55.4", 15504], + "betrayal-info: geforce now screen-cap fix", + "act-tracker: improved import for custom guides", + "alarm-timer: streamlining and improvements" + ], [ ["1.55.3", 15503], "stash-ninja: added bookmarking to permanently highlight specific items" diff --git a/data/versions.json b/data/versions.json index b755f39f..9085bb82 100644 --- a/data/versions.json +++ b/data/versions.json @@ -1,3 +1,3 @@ { - "_release": [15503, "https://github.com/Lailloken/Lailloken-UI/archive/refs/heads/main.zip"] + "_release": [15504, "https://github.com/Lailloken/Lailloken-UI/archive/refs/heads/main.zip"] } \ No newline at end of file