Skip to content

Commit d0fe198

Browse files
authored
v1.53.6 merge
- renamed features: leveling tracker -> act-tracker, mapping tracker -> map-tracker - item-info: inverted mod-rolls are now highlighted to avoid confusion - map-tracker: partially restructured the log-viewer, improved search - map-tracker: added conquerors and elder guardians to trackable content
2 parents a40e26e + 5969e26 commit d0fe198

35 files changed

+553
-461
lines changed

Lailloken UI.ahk

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ HelpToolTip(HWND_key)
262262
Gui, %GUI_name%: New, -Caption -DPIScale +LastFound +AlwaysOnTop +ToolWindow +Border +E0x20 +E0x02000000 +E0x00080000 HWNDtooltip
263263
Gui, %GUI_name%: Color, 202020
264264
Gui, %GUI_name%: Margin, 0, 0
265-
Gui, %GUI_name%: Font, % "s"settings.general.fSize - 2 " cWhite", % vars.system.font
265+
Gui, %GUI_name%: Font, % "s"settings.general.fSize " cWhite", % vars.system.font
266266
hwnd_old := vars.hwnd.help_tooltips.main, vars.hwnd.help_tooltips.main := tooltip, vars.general.active_tooltip := vars.general.cMouse
267267

268268
;LLK_PanelDimensions(vars.help[check][control], settings.general.fSize, width, height,,, 0)
@@ -533,6 +533,8 @@ Init_general()
533533
settings.features.browser := !Blank(check := ini.settings["enable browser features"]) ? check : 1
534534

535535
settings.updater := {"update_check": !Blank(check := ini.settings["update auto-check"]) ? check : 0}
536+
537+
vars.pics := {"global": {"help": LLK_ImageCache("img\GUI\help.png")}, "maptracker": {}}
536538
}
537539

538540
Init_vars()
@@ -1524,6 +1526,15 @@ LLK_FontSizeGet(height, ByRef font_width) ;returns a font-size that's about the
15241526
}
15251527
}
15261528

1529+
LLK_ImageCache(file)
1530+
{
1531+
local
1532+
global vars, settings
1533+
1534+
pBitmap := Gdip_CreateBitmapFromFile(file), pHBM := Gdip_CreateHBITMAPFromBitmap(pBitmap, 0), Gdip_DisposeImage(pBitmap)
1535+
Return pHBM
1536+
}
1537+
15271538
LLK_IniRead(file, section := "", key := "", default := "")
15281539
{
15291540
IniRead, iniread, % file, % section, % key, % Blank(default) ? A_Space : default

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ A light-weight AHK script with UI and QoL features for Path of Exile, emphasizin
7878
| ![image](https://raw.githubusercontent.com/Lailloken/Lailloken-UI/main/img/readme/searchstrings_001.jpg) | ![image](https://raw.githubusercontent.com/Lailloken/Lailloken-UI/main/img/readme/searchstrings_002.jpg) | ![image](https://raw.githubusercontent.com/Lailloken/Lailloken-UI/main/img/readme/searchstrings_003.jpg) |
7979
<br>
8080

81-
### [Leveling tracker](https://github.com/Lailloken/Lailloken-UI/wiki/Leveling-Tracker): leveling-related QoL features
81+
### [Act-Tracker](https://github.com/Lailloken/Lailloken-UI/wiki/Act%E2%80%90Tracker): campaign-related QoL features
8282
| \*automatic [exile-leveling](https://heartofphos.github.io/exile-leveling/) overlay | quick-access skilltree overlays | search-strings for every gem in a build |
8383
|---|---|---|
8484
| ![image](https://raw.githubusercontent.com/Lailloken/Lailloken-UI/main/img/readme/leveltracker_001.png) | ![image](https://raw.githubusercontent.com/Lailloken/Lailloken-UI/main/img/readme/leveltracker_002.jpg) | ![image](https://raw.githubusercontent.com/Lailloken/Lailloken-UI/main/img/readme/leveltracker_003.jpg) |
@@ -108,7 +108,7 @@ A light-weight AHK script with UI and QoL features for Path of Exile, emphasizin
108108
| ![image](https://raw.githubusercontent.com/Lailloken/Lailloken-UI/main/img/readme/cheatsheets_001.jpg) | ![image](https://raw.githubusercontent.com/Lailloken/Lailloken-UI/main/img/readme/cheatsheets_002.jpg) | ![image](https://raw.githubusercontent.com/Lailloken/Lailloken-UI/main/img/readme/cheatsheets_003.jpg) |
109109
<br>
110110

111-
### \*[Mapping tracker](https://github.com/Lailloken/Lailloken-UI/wiki/Mapping-tracker): collect, save, view, and export mapping-related data for statistical analysis
111+
### \*[Map-Tracker](https://github.com/Lailloken/Lailloken-UI/wiki/Map%E2%80%90Tracker): collect, save, view, and export mapping-related data for statistical analysis
112112
| in-game log viewer | loot tracking | map-mod tracking |
113113
|---|---|---|
114114
| ![image](https://raw.githubusercontent.com/Lailloken/Lailloken-UI/main/img/readme/maptracker_001.png) | ![image](https://raw.githubusercontent.com/Lailloken/Lailloken-UI/main/img/readme/maptracker_002.png) | ![image](https://raw.githubusercontent.com/Lailloken/Lailloken-UI/main/img/readme/maptracker_003.png) |

data/changelog.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
11
[
2+
[
3+
["1.53.6", 15306],
4+
"renamed features: leveling tracker -> act-tracker, mapping tracker -> map-tracker",
5+
"item-info: inverted mod-rolls are now highlighted to avoid confusion",
6+
"map-tracker: partially restructured the log-viewer, improved search",
7+
"map-tracker: added conquerors and elder guardians to trackable content"
8+
],
29
[
310
["1.53.5", 15305],
411
"hotfix 1: stash-ninja was activated by rare items that had the same name as tab-specific items",

data/english/UI.txt

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@
6363
ms_clone-frames = "clone-frames"
6464
ms_hotkeys = "hotkeys"
6565
ms_item-info = "item-info"
66-
ms_leveling tracker = "leveling tracker"
67-
ms_mapping tracker = "mapping tracker"
66+
ms_leveling tracker = "act-tracker"
67+
ms_mapping tracker = "map-tracker"
6868
ms_map-info = "map-info"
6969
ms_minor qol tools = "minor qol tools"
7070
ms_necropolis = "necropolis"
@@ -155,6 +155,9 @@
155155
global_setup = "setup"
156156
global_variance = "variance (0-255)"
157157
global_hotkey = "hotkey:"
158+
global_panelsize = "panel-size:"
159+
global_uisize = "ui-size:"
160+
global_auto = "auto" ;## as in automatic
158161

159162
mechanic_bestiary = "bestiary"
160163
mechanic_betrayal = "betrayal"
@@ -171,6 +174,14 @@
171174
mechanic_lab trial = "lab trial"
172175
mechanic_ultimatum = "ultimatum"
173176
mechanic_maven = "maven"
177+
mechanic_baran = "baran"
178+
mechanic_drox = "drox"
179+
mechanic_al-hezmin = "al-hezmin"
180+
mechanic_veritania = "veritania"
181+
mechanic_constrictor = "constrictor"
182+
mechanic_enslaver = "enslaver"
183+
mechanic_eradicator = "eradicator"
184+
mechanic_purifier = "purifier"
174185

175186

176187
;#####################################################
@@ -282,10 +293,10 @@
282293

283294

284295
;#####################################################
285-
;## leveling tracker
296+
;## leveling tracker / act-tracker
286297
;#####################################################
287298

288-
;## these strings are displayed/required when using the leveling tracker
299+
;## these strings are displayed/required when using the leveling tracker / act-tracker
289300
lvltracker_header = "skilltree configuration"
290301
lvltracker_deleteall = "del all"
291302
lvltracker_gemnotes = "no notes;for this gem"
@@ -333,6 +344,7 @@
333344
maptracker_logs = "logs:"
334345
maptracker_logs = "couldn't find any map-logs"
335346
maptracker_page = "page:"
347+
maptracker_page = "page-entries:" ;## i.e. how many entries to show on each page
336348
maptracker_header = "map-log viewer"
337349
maptracker_dialogue = "<output dialogue to chat> has to;be enabled in the game's <ui> settings"
338350

@@ -348,6 +360,8 @@
348360
maptracker_portals = "portals"
349361
maptracker_kills1 = "kills"
350362
maptracker_loot1 = "loot"
363+
maptracker_mapinfo = "mods" ;## as in map mods
364+
maptracker_notes = "notes"
351365
maptracker_content = "content" ;## refers to map-content (league-mechanics, side-areas, etc.)
352366
maptracker_search = "search:"
353367

@@ -658,11 +672,11 @@
658672

659673

660674
;#####################################################
661-
;## settings menu: leveling tracker
675+
;## settings menu: leveling tracker / act-tracker
662676
;#####################################################
663677

664-
;## these strings are displayed/required in the "leveling tracker" section of the settings menu
665-
m_lvltracker_enable = "enable the leveling tracker"
678+
;## these strings are displayed/required in the "leveling tracker / act-tracker" section of the settings menu
679+
m_lvltracker_enable = "enable the act-tracker feature"
666680
m_lvltracker_timer = "enable timer"
667681
m_lvltracker_pause = "pause timer in hideouts"
668682
m_lvltracker_fade = "fade out after x seconds:"
@@ -682,11 +696,11 @@
682696

683697

684698
;#####################################################
685-
;## settings menu: mapping tracker
699+
;## settings menu: map-tracker
686700
;#####################################################
687701

688-
;## these strings are displayed/required in the "mapping tracker" section of the settings menu
689-
m_maptracker_enable = "enable the mapping tracker"
702+
;## these strings are displayed/required in the "map-tracker" section of the settings menu
703+
m_maptracker_enable = "enable the map-tracker feature"
690704
m_maptracker_hide = "hide the panel when the tracker is paused"
691705
m_maptracker_loot = "loot"
692706
m_maptracker_kills = "kills"

data/english/client.txt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@
9595
maps_atziri = "atziri"
9696
maps_atziri = "uber atziri"
9797
maps_sirus = "sirus"
98+
maps_cortex = "cortex"
9899

99100
;## these strings are shown in the map-info panel
100101
maps_stats_full = "mods#quantity#rarity#pack size#maps#scarabs#currency" ;## map rolls/multipliers
@@ -181,6 +182,7 @@
181182
log_betrayal = "Vorici, Silent Brother:"
182183
log_ultimatum = "The Trialmaster:"
183184
log_maven = "The Maven:"
185+
184186

185187
;## expedition note: there is a difference in displayed names depending on whether the NPCs greet you when they first see you in a map (Gwennen, the Gambler) or whether the encounter has finished (Gwennen)
186188
;## always use the name displayed when they greet you
@@ -229,6 +231,16 @@
229231
items_mapcurrency = "More Currency:"
230232
items_stack = "Stack Size:"
231233
items_mapname = "# Map" ;## the format of map-items, e.g. Frozen River Map (German, for example, uses 'Frozen River'-Map)
234+
items_elderguardian = "Map is occupied by" ;## the implicit on elder-guardian maps
235+
items_enslaver = "The Enslaver"
236+
items_eradicator = "The Eradicator"
237+
items_constrictor = "The Constrictor"
238+
items_purifier = "The Purifier"
239+
items_conqueror = "Map contains # Citadel" ;## the implicit on conqueror maps
240+
items_baran = "Baran"
241+
items_drox = "Drox"
242+
items_al-hezmin = "Al-Hezmin"
243+
items_veritania = "Veritania"
232244

233245

234246
;## these strings are displayed in the in-game tooltip when hovering over an item and holding the hotkey for advanced item descriptions (usually ALT)

data/english/help tooltips.json

Lines changed: 63 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@
249249
"it will be available once a language-pack for the current language has been installed"
250250
],
251251
"leveltracker enable": [
252-
"provides an automated leveling guide overlay and several campaign qol-tools"
252+
"provides an automated campaign guide-overlay and several qol features"
253253
],
254254
"leveltracker timer": [
255255
"adds a timer between guide text and navigation buttons that records your act times and stores them in csv-files",
@@ -385,12 +385,12 @@
385385
"refreshing kills only has to be done if you have finished the map and won't go back in"
386386
],
387387
"maptracker mapinfo": [
388-
"map-mod data loaded into the map-info panel will be logged",
388+
"map-mods in the map-info panel will be logged",
389+
"this also includes information such as:\nelder guardians, conquerors, type of maven invitation, blight(-ravaged), contract/blueprint",
389390
"the map-info panel is a separate feature and has to be enabled"
390391
],
391392
"maptracker notes": [
392-
"adds an icon to the tracker panel to log custom notes for individual map runs",
393-
"long-click to view current notes, right-click to edit"
393+
"adds an icon to the tracker panel to log custom notes for individual map runs"
394394
],
395395
"maptracker color unselected": [
396396
"used for highlighted cells in the log-viewer, and for non-league dates in the date selection",
@@ -523,7 +523,7 @@
523523
"screenchecks pixel-test": [
524524
"click this button while the ui element shown in <info> is visible, the test should return positive",
525525
"click it again while the ui element shown in <info> is not visible, the test should return negative",
526-
"geforce now: move your character around a bit, then redo steps 1 & 2"
526+
"geforce now: move your character around a bit, then redo steps 1 & 2"
527527
],
528528
"screenchecks pixel-info": [
529529
"hold to see instructions"
@@ -815,58 +815,89 @@
815815
"long-click to export the list of runs below as a CSV-file, overwriting any existing file with the same date",
816816
"right-click to open the export folder"
817817
],
818-
"logviewer filter": [
819-
"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\")",
820-
"you can search inside columns by using search operators (check the book icon on the far left)"
818+
"logviewer page-entries": [
819+
"how many entries to show on each page (auto = log-viewer will adjust to available screen space)"
820+
],
821+
"logviewer search": [
822+
"each column has a search bar that supports regex and custom patterns (hover over them for more info):\npress <enter> to start a search with every input at once, or click the red x to restore the unfiltered log-viewer"
821823
],
822824
"logviewer sum avg": [
823825
"click highlighted cells in this row to display the data within a column as totals / percentages / averages"
824826
],
825-
"logviewer headers": [
826-
"some column headers can be clicked for searching: left = paste search-operator, right = paste !operator",
827-
"double-clicking will immediately start the search with the bare operator: using an operator without any keywords will simply search for runs where corresponding data had any value other than 0 or blank"
827+
"logviewer search map": [
828+
"supported inputs:\n\"xyz\" (search), \"!abc\" (exclude), \"xyz !abc\" (search xyz, exclude abc)"
828829
],
829830
"logviewer header map": [
830831
"long-click a map name to edit it, hold right-click to delete the run",
831-
"names can be clicked for searching, just like some of the headers (check the book icon in the top left)"
832+
"map names are clickable for searching:\nclick to paste \"<name>\" into the search, r-click to paste \"!<name>\", double-(r-)click to search immediately"
833+
],
834+
"logviewer search tier": [
835+
"supported inputs:\n\"x\" (exact tier), \"!x\" (exclude), \"x-y\" (between x and y), \"x+\" (x or higher)"
836+
],
837+
"logviewer header tier": [
838+
"the tier (map) or level (e.g. contract) of the run",
839+
"numbers are clickable for searching:\nclick to paste \"<tier>\" into the search, r-click to paste \"!<tier>\", double-(r-)click to search immediately"
840+
],
841+
"logviewer search run": [
842+
"supported inputs:\n\"x\" (exact time), \"x-y\" (between x and y), or \"x+\" (x or longer)",
843+
"if x/y don't include any colons, they will be treated as seconds, otherwise as (hh:)mm:ss"
832844
],
833845
"logviewer header run": [
834-
"searching for \"r:XYZ\" will only list runs that took XYZ amount of time and below",
835-
"if XYZ doesn't include any colons, the value is treated as seconds, otherwise it's treated as hh:mm:ss"
846+
"the time it took to complete the run"
836847
],
837848
"logviewer header e-exp": [
838-
"effective exp gained in a map, based on your level and the monsters'",
839-
"requires your character name in the <general> section of the settings menu"
849+
"effective exp gained in a map (i.e. after penalties), based on your level and the monsters'",
850+
"you have to specify your character's name in the <general> section of the settings menu first"
851+
],
852+
"logviewer search deaths": [
853+
"supported inputs:\n\"x\" (exact value), \"x-y\" (between x and y), or \"x+\" (x or higher)"
840854
],
841855
"logviewer header deaths": [
842-
"searching for \"d:X\" will only list runs with at least X deaths"
856+
"number of deaths in a run",
857+
"header is clickable for searching:\nclick to paste \"1+\" into the search, r-click to paste \"0\", double-(r-)click to search immediately"
858+
],
859+
"logviewer search portals": [
860+
"supported inputs:\n\"x\" (exact value), \"x-y\" (between x and y), or \"x+\" (x or higher)"
843861
],
844862
"logviewer header portals": [
845-
"searching for \"p:X\" will only list runs with at least X portals used"
863+
"number of portals used in a run"
864+
],
865+
"logviewer search kills": [
866+
"supported inputs:\n\"x\" (exact value), \"x-y\" (between x and y), or \"x+\" (x or higher)"
846867
],
847868
"logviewer header kills": [
848-
"number of monsters killed in a map: uses /kills command (optional setting, has to be enabled first)",
849-
"searching for \"k:X\" will only list runs with at least X kills"
869+
"monsters killed in a run (optional, has to be enabled first): uses the in-game /kills command",
870+
"header is clickable for searching:\nclick to paste \"1+\" into the search, r-click to paste \"0\", double-(r-)click to search immediately"
871+
],
872+
"logviewer search loot": [
873+
"supported inputs:\n\"xyz\" (search), \"!abc\" (exclude), \"xyz !abc\" (search xyz, exclude abc), \"abc, xyz, ...\" (search abc, and xyz, ...)"
850874
],
851875
"logviewer header loot": [
852-
"loot found in a map (optional setting, has to be enabled first)",
853-
"click highlighted cells in this column to view the list"
876+
"loot found in a map (optional, has to be enabled first):\nclick highlighted cells in this column to view a list with logged loot",
877+
"header is clickable for searching:\nclick to paste \"yes\" into the search, r-click to paste \"no\", double-(r-)click to search immediately"
878+
],
879+
"logviewer search mapinfo": [
880+
"supported inputs:\n\"xyz\" (search), \"!abc\" (exclude), \"xyz !abc\" (search xyz, exclude abc), \"abc, xyz, ...\" (search abc, and xyz, ...)",
881+
"you can search for mods and also general rolls, e.g. \"100q\" for 100% quantity\n(for general rolls, it will always search for <x and above>)"
854882
],
855883
"logviewer header mapinfo": [
856-
"mods rolled on a map (optional setting, has to be enabled first): click highlighted cells in this column to view the list",
857-
"the operator also allows searching for general stats (mod-count, quant, etc.), e.g. \"m:100q\" will search for 100% quant and above"
884+
"mods rolled on a map (optional, has to be enabled first):\nclick highlighted cells in this column to view a list of logged mods",
885+
"header is clickable for searching:\nclick to paste \"yes\" into the search, r-click to paste \"no\", double-(r-)click to search immediately"
886+
],
887+
"logviewer search notes": [
888+
"supported inputs:\n\"xyz\" (search), \"!abc\" (exclude), \"xyz !abc\" (search xyz, exclude abc), \"abc, xyz, ...\" (search abc, and xyz, ...)"
858889
],
859890
"logviewer header notes": [
860-
"notes can be added to individual map runs by right-clicking cells in this column",
861-
"click highlighted cells in this column to view the notes"
891+
"custom notes for runs (adding notes during/before the run is optional and has to be enabled first):\nright-click cells in this column to add/edit notes after the run, click highlighted cells to view them",
892+
"header is clickable for searching:\nclick to paste \"yes\" into the search, r-click to paste \"no\", double-(r-)click to search immediately"
862893
],
863-
"logviewer header content": [
864-
"side-content you encountered in a map (optional setting, has to be enabled first)",
865-
"the icons can be clicked for searching, just like some of the headers (check the book icon in the top left)"
894+
"logviewer search content": [
895+
"supported inputs:\n\"xyz\" (search), \"!abc\" (exclude), \"xyz !abc\" (search xyz, exclude abc), \"abc, xyz, ...\" (search abc, and xyz, ...)",
896+
"available short-hand inputs: \"elder\" for elder guardians, \"sirus\" for conquerors"
866897
],
867-
"logviewer header tier": [
868-
"the tier (map) or level (e.g. contract) of the run",
869-
"tiers can be clicked for searching, just like some of the headers (check the book icon in the top left)"
898+
"logviewer header content": [
899+
"side-content you encountered in a map (optional, has to be enabled first)",
900+
"header & icons are clickable for searching:\nclick to paste \"<content>\" into the search, r-click to paste \"!<content>\", double-(r-)click to search immediately"
870901
]
871902
},
872903
"maptrackernotes": {

data/versions.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
{
2-
"_release": [15305, "https://github.com/Lailloken/Lailloken-UI/archive/refs/heads/main.zip"],
3-
"hotfix": 1
2+
"_release": [15306, "https://github.com/Lailloken/Lailloken-UI/archive/refs/heads/main.zip"]
43
}
-186 Bytes
Loading

img/GUI/mapping tracker/al-hezmin.png

6.11 KB
Loading

img/GUI/mapping tracker/baran.png

5.25 KB
Loading

0 commit comments

Comments
 (0)