Skip to content

Commit

Permalink
v1.53.3 merge
Browse files Browse the repository at this point in the history 
- image-checks: most checks don't require screen-clipping anymore
- map-info: added pinned map mods to settings for easier switching between builds
- stash-ninja: streamlined setup and customization of individual tabs
- stash-ninja: added support for fragment and breach tabs
- stash-ninja: added optional auto-profiles setting to find worthwhile sales more easily
  • Loading branch information
@Lailloken
Lailloken committed May 21, 2024
2 parents 4d7f9bd + d1f5db2 commit 1562f0f
Show file tree
Hide file tree
Showing 14 changed files with 678 additions and 486 deletions.
40 changes: 23 additions & 17 deletions Lailloken UI.ahk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -470,9 +470,16 @@ Init_general()
}
ini_version := LLK_IniRead("ini\config.ini", "versions", "ini", 0)
If !ini_version
IniWrite, 15000, ini\config.ini, versions, ini
IniWrite, 15303, ini\config.ini, versions, ini

settings.general.version := ini_version ? ini_version : 15000
If (ini_version < 15303)
{
IniWrite, % (ini_version := 15303), ini\config.ini, versions, ini
FileDelete, % "img\Recognition (" vars.client.h "p)\GUI\betrayal.bmp"
If LLK_IniRead("ini\config.ini", "features", "enable betrayal-info", 0)
MsgBox, % "The betrayal image-check was changed in v1.53.3 and needs to be recalibrated."
}
settings.general.version := ini_version ? ini_version : 15303
settings.general.trans := 230
settings.general.blocked_hotkeys := {"!": 1, "^": 1, "+": 1}
settings.general.character := LLK_IniRead("ini\config.ini", "Settings", "active character")
Expand Down Expand Up @@ -584,6 +591,18 @@ Loop_main()
Init_cloneframes()
}

If vars.hwnd.settings && !vars.settings.wait
If (vars.settings.color != "Black") && WinActive("ahk_id " vars.hwnd.settings.main)
{
Gui, % vars.hwnd.settings.GUI_name ": Color", Black
vars.settings.color := "Black"
}
Else If (vars.settings.color != "202030") && !WinActive("ahk_id " vars.hwnd.settings.main)
{
Gui, % vars.hwnd.settings.GUI_name ": Color", 202030
vars.settings.color := "202030"
}

If vars.hwnd.mapinfo_modsearch.main && WinExist("ahk_id " vars.hwnd.mapinfo_modsearch.main) && !WinActive("ahk_id " vars.hwnd.mapinfo_modsearch.main)
LLK_Overlay(vars.hwnd.mapinfo_modsearch.main, "destroy"), vars.hwnd.mapinfo_modsearch.main := ""

Expand Down Expand Up @@ -644,7 +663,8 @@ Loop_main()
{
If !IsObject(val)
Continue
x1 := vars.client.x + val.coords.1, x2 := vars.client.x + val.coords.1 + vars.stash[tab].box, y1 := vars.client.y + val.coords.2, y2 := vars.client.y + val.coords.2 + vars.stash[tab].box
box := InStr(item, "tab_") ? vars.stash.buttons : vars.stash[tab].box
x1 := vars.client.x + val.coords.1, x2 := vars.client.x + val.coords.1 + box * (InStr(item, "tab_") ? 4.5 : 1), y1 := vars.client.y + val.coords.2, y2 := vars.client.y + val.coords.2 + box
If LLK_IsBetween(vars.general.xMouse, x1, x2) && LLK_IsBetween(vars.general.yMouse, y1, y2)
{
stashhover := {"x1": x1, "x2": x2, "y1": y1, "y2": y2}
Expand All @@ -662,20 +682,6 @@ Loop_main()
Else If WinActive("ahk_group poe_ahk_window") && vars.stash.hover && !vars.stash.enter && !LLK_IsBetween(vars.general.xMouse, vars.client.x, vars.client.x + vars.stash.width)
vars.stash.hover := "", Stash_("refresh")

/*
If !vars.stash.wait && WinExist("ahk_id " vars.hwnd.stash.main)
{
If (vars.general.wMouse = vars.hwnd.stash.main) && (stashhoverHWND != vars.general.cMouse) && (check := LLK_HasVal(vars.hwnd.stash, vars.general.cMouse))
{
If (check != vars.stash.hover)
vars.stash.hover := check, Stash_("refresh")
}
Else If (vars.general.wMouse != vars.hwnd.stash.main) && vars.stash.hover
vars.stash.hover := "", Stash_("refresh")
stashhoverHWND := vars.general.cMouse
}
*/

If settings.general.hide_toolbar && WinActive("ahk_group poe_ahk_window")
{
If vars.general.wMouse && vars.hwnd.LLK_panel.main && !WinExist("ahk_id " vars.hwnd.LLK_panel.main) && LLK_IsBetween(vars.general.xMouse, vars.toolbar.x, vars.toolbar.x2) && LLK_IsBetween(vars.general.yMouse, vars.toolbar.y, vars.toolbar.y2)
Expand Down
8 changes: 8 additions & 0 deletions data/changelog.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
[
[
["1.53.3", 15303],
"image-checks: most checks don't require screen-clipping anymore",
"map-info: added pinned map mods to settings for easier switching between builds",
"stash-ninja: streamlined setup and customization of individual tabs",
"stash-ninja: added support for fragment and breach tabs",
"stash-ninja: added optional auto-profiles setting to find worthwhile sales more easily"
],
[
["1.53.2", 15302],
"hotfix 1: omni-key activated the stash-ninja feature when pressed on items with <scarab> in their names",
Expand Down
6 changes: 5 additions & 1 deletion data/english/UI.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@
global_delete = "del"
global_scan = "scanning..."
global_match = "no match"
global_match = "not specific enough"
global_window = "settings menu"
global_general = "general settings:"
global_ui = "ui settings:"
Expand All @@ -107,7 +108,6 @@
global_type = "type:"
global_add = "add"
global_calibrate = "cal"
global_calibrate = "calibrate"
global_calibrate = "calibration required"
global_import = "import"
global_test = "test"
Expand Down Expand Up @@ -710,6 +710,8 @@
m_mapinfo_textcolors = "text-colors:"
m_mapinfo_header = "header" ;## as in line at the top of a section/paragraph
m_mapinfo_logbook = "logbook-colors:"
m_mapinfo_modsettings = "map-mod settings:"
m_mapinfo_pinned = "pinned mods:"
m_mapinfo_modsearch = "mod search:"
m_mapinfo_roll_highlight = "highlight map rolls"

Expand Down Expand Up @@ -776,11 +778,13 @@
m_stash_leagues = "league:"
m_stash_tabs = "stash tab configuration:"
m_stash_limits = "price-range profiles:"
m_stash_profiles = "apply trade value to profiles 1-4"
m_stash_history = "show price history"
m_stash_exalt = "show exalt rates"
m_stash_mintrade = "minimum trade value (chaos):"
m_stash_bulk = "show bulk-sale suggestions"
m_stash_margins = "margins:"
m_stash_active = "active tab:"



Expand Down
108 changes: 49 additions & 59 deletions data/english/help tooltips.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"background color: click to open the color-palette, right click to reset"
],
"active character": [
"type in your character name and press enter",
"type in your character name and press <enter>",
"specifying it here enables optional features such as level tracking and e-exp calculations"
],
"active character status": [
Expand Down Expand Up @@ -418,7 +418,7 @@
"logbook mods use positive rankings, with 4 being the best value"
],
"mapinfo modsearch": [
"type in map-mods (in-game wording) and press enter to list them and customize their highlighting"
"type in map-mods (in-game wording) and press <enter> to list them below"
],
"mapinfo roll highlight": [
"map rolls (quant, rarity, etc.) will be highlighted if they meet certain requirements"
Expand All @@ -430,7 +430,12 @@
],
"mapinfo requirements": [
"specify required/desired minimum values for each roll",
"quantity, rarity, pack size\nmaps, scarabs, currency"
"quantity, rarity, pack size, maps, scarabs, currency"
],
"mapinfo mod settings": [
"below, you can customize the tiering of specific map mods, without requiring maps that have them",
"hover over mods and press number keys 1-4 to apply highlighting, or space to strike them out",
"use the mod search to find mods, click the – and + buttons to (un)pin mods for quick access"
],
"necro enable": [
"screen-reading feature that scans the necropolis lantern ui and enables mod highlighting"
Expand Down Expand Up @@ -509,8 +514,8 @@
"captures certain pixel-values and stores them for future checks"
],
"screenchecks pixel-test": [
"click this button while the ui element mentioned in <info> is visible, the test should return positive",
"click it again while the ui element mentioned in <info> is not visible, the test should return negative"
"click this button while the ui element shown in <info> is visible, the test should return positive",
"click it again while the ui element shown in <info> is not visible, the test should return negative"
],
"screenchecks pixel-info": [
"hold to see instructions"
Expand All @@ -531,12 +536,13 @@
"opens the clipping tool: use it to clip the ui element from <info>"
],
"screenchecks image-test": [
"click this button while the ui element mentioned in <info> is visible, the test should return positive",
"click it again while the ui element mentioned in <info> is not visible, the test should return negative"
"click this button while the ui element shown in <info> is visible, the test should return positive",
"click it again while the ui element shown in <info> is not visible, the test should return negative",
"if tests keep returning negative after automatic calibration, right-click the <cal> button and snip the marked area shown in <info>"
],
"screenchecks folder": [
"opens the folder with calibration files",
"if tests keep failing, open the files to check if they have the correct data"
"if tests keep failing, open the img-files to check if they represent the correct image-clip"
],
"searchstrings poe-regex": [
"3rd-party website for regex-strings"
Expand Down Expand Up @@ -572,12 +578,12 @@
"this is part of the imported leveling guide and contains strings for every gem"
],
"searchstrings add": [
"type in a name and press enter"
"type in a name and press <enter>"
],
"stash enable": [
"stash feature that highlights items in specific stash tabs according to rough market prices",
"long-press the omni-key (default: middle mouse-button) while hovering over a scarab to activate the feature",
"ui/scaling requirements:\n- there needs to be at least one tab-folder in your stash in general\n- tabs supported by this feature cannot be inside a folder"
"long-press the omni-key (default: middle mouse-button) while hovering over an item in a tab to activate the feature",
"- there needs to be at least one tab-folder in your stash in general\n- tabs supported by this feature cannot be inside a folder"
],
"stash calibrate": [
"move the settings window to the right side of the screen",
Expand All @@ -586,39 +592,44 @@
],
"stash history": [
"shows an additional bar-chart with an item's price history for this week",
"this will be shown next to conversion rates when hovering over a highlighted item-slot",
"it's a timeline with bars that each represent a day and display the change in price compared to the first day"
"this will be shown next to conversion rates when hovering over a highlighted item-slot",
"it's a timeline with bars that each represent a day and display the change in price compared to the first day"
],
"stash exalt": [
"also shows exalt-equivalent prices when hovering over highlighted items or pricing items"
],
"stash bulk": [
"whenever you right-click an item in the tab to price it, an additional panel with bulk-sale suggestions will be displayed",
"click a preferred target margin, then click a suggestion in the table to paste the price into the game ui and confirm it"
"click a preferred target margin, then click a suggestion in the table to paste the price into the game ui and confirm it"
],
"stash mintrade": [
"bulk-sale suggestions under this value will not be shown (unless they are the only option: in that case, they will be highlighted red)"
"you can specify an \"i don't want to trade below x chaos\" value here",
"bulk-sales below this value will not be suggested, unless they are the only option (they will be highlighted red then)",
"type in a number and press <enter>"
],
"stash autoprofiles": [
"profiles 1-4 will be set up automatically according to your preferred trade value",
">> rule of thumb <<\nhighlighted items are worth trading if:\nstack-size >= profile-number",
"profile 5 will be left untouched in order to allow creating a trash/vendor tier"
],
"stash margins": [
"specify your preferred target margins:\nadd as many as you want and separate them with commas, then press <enter>",
"- does not support decimal values\n- red highlighting = unsaved changes"
"- does not support decimal values\n- red highlighting = unsaved changes"
],
"stash config": [
"to configure individual tabs, open them in game and long-press the omni-key over an item in the tab",
"once the stash-ninja overlay is active, settings for the active tab will appear below"
],
"stash gap": [
"refers to the horizontal gap between item boxes/slots in the stash tab",
"fine-tune this value to make the overlay scale correctly on your screen"
],
"stash limits": [
"you can configure up to 5 price-range profiles",
"profile # (left), max price (top), min price (bot), measuring unit: c, e, d, % (right)",
"input-box structure:\nprofile # | max value\nunit: c, e, d, % | min value",
"leaving min/max price blank will treat them as unlimited, leaving the measuring unit blank will disable the profile entirely",
"while the overlay is on screen, press number-keys 1 to 5 to switch between profiles"
],
"stash test": [
"open the selected tab in game, then long-click this button to preview the overlay"
],
"stash placeholder": [
"coming soon (tm)"
],
"update check": [
"checks for updates on script launch and in the background while running",
"if there is an update available, the toolbar will turn green"
Expand Down Expand Up @@ -771,7 +782,7 @@
"hold to delete all images"
],
"skilltree-cap caption": [
"type in a caption and press enter"
"type in a caption and press <enter>"
]
},
"maptracker": {
Expand All @@ -788,7 +799,7 @@
"right-click to open the export folder"
],
"logviewer filter": [
"type in keywords (separated by commas) and press ENTER to only show specific runs: simple words are treated as map names, simple numbers as map tiers (e.g. \"crimson temple, 16\")",
"type in keywords (separated by commas) and press <enter> to only show specific runs: simple words are treated as map names, simple numbers as map tiers (e.g. \"crimson temple, 16\")",
"you can search inside columns by using search operators (check the book icon on the far left)"
],
"logviewer sum avg": [
Expand Down Expand Up @@ -843,8 +854,8 @@
},
"maptrackernotes": {
"help": [
"type in custom notes and press ENTER: include \"X#\" before the note to limit it to X runs",
"omni-click voidstones, scarabs, etc.",
"type in custom notes and press <enter>: include \"X#\" before the note to limit it to X runs",
"omni-click map-device items to add them as notes",
"long-click a note to remove it, or the header to clear everything"
]
},
Expand Down Expand Up @@ -874,65 +885,44 @@
"-> the minimap has to be in the center",
"-> the info-panel (img) has to be fully visible",
"-> click <cal>",
"-> follow the instructions in <test>",
"",
"(/bold)(/underline)used for:",
"-> omni-key context, clone-frames toggling"
"-> follow the instructions in <test>"
],
"inventory": [
"(/bold)(/underline)instructions:",
"-> open the inventory",
"-> the top-right corner (img: yellow) has to be fully visible",
"-> click <cal>",
"-> follow the instructions in <test>",
"",
"(/bold)(/underline)used for:",
"-> item-info league-start mode",
"-> mapping tracker portal reminder",
"-> item/map-info shift-click"
"-> follow the instructions in <test>"
],
"betrayal": [
"(/bold)(/underline)instructions:",
"-> open the syndicate board",
"-> don't move or zoom into it",
"-> click <cal> and clip the marked area (img)",
"-> follow the instructions in <test>",
"",
"(/bold)(/underline)used for:",
"-> betrayal-info overlay"
"-> click <cal> to let the tool calibrate, OR right-click to manually calibrate",
"-> follow the instructions in <test>"
],
"necro_lantern": [
"(/bold)(/underline)instructions:",
"-> open the lantern ui for a zone",
"-> click <cal> and clip the marked area (img)",
"-> follow the instructions in <test>",
"",
"(/bold)(/underline)used for:",
"-> necropolis: lantern highlighting"
"-> click <cal> to open the snipping tool, then clip the marked area shown in the img",
"-> follow the instructions in <test>"
],
"skilltree": [
"(/bold)(/underline)instructions:",
"-> open the skilltree",
"-> click <cal> and clip the marked area (img)",
"-> follow the instructions in <test>",
"",
"(/bold)(/underline)used for:",
"-> leveling tracker: skilltree overlay"
"-> click <cal> to let the tool calibrate, OR right-click to manually calibrate",
"-> follow the instructions in <test>"
],
"stash": [
"(/bold)(/underline)instructions:",
"-> open the stash",
"-> click <cal> and clip the marked area (img)",
"-> follow the instructions in <test>",
"",
"(/bold)(/underline)used for:",
"-> mapping tracker: loot tracker"
"-> click <cal> to let the tool calibrate, OR right-click to manually calibrate",
"-> follow the instructions in <test>"
]
},
"searchstrings": {
"config entry-about": [
"use-cases have their own entries that will be listed in the context-menu",
"type in a descriptive name for the string(s) and press enter"
"type in a descriptive name for the string(s) and press <enter>"
],
"config entry-list": [
"click an entry to edit its string(s), long-click <del> to remove it",
Expand Down
Loading

0 comments on commit 1562f0f

Please sign in to comment.