Skip to content

Commit 44d07f8

Browse files
authored
v1.57.5 merge
- reminder: requires manual install if you don't have 1.57.3+ - fixes: item-info ele dps, poedb links - act-tracker: added poe2 zone layouts, improved pob gem overlay - item-info: fully functional now, automatic affix-tier conversion to t1 system
2 parents 2ef9b8e + c86b5b3 commit 44d07f8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+22949
-154
lines changed

Exile UI.ahk

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@ Init_vars()
422422
vars.omnikey.poedb := {"Claws": 1, "Daggers": 1, "Wands": 1, "One Hand Swords": 1, "One Hand Axes": 1, "One Hand Maces": 1, "Sceptres": 1, "Spears": 1, "Flails": 1
423423
, "Bows": 1, "Staves": 1, "Two Hand Swords": 1, "Two Hand Axes": 1, "Two Hand Maces": 1, "Quarterstaves": 1, "Crossbows": 1, "Traps": 1
424424
, "Amulets": 1, "Rings": 1, "Belts": 1, "Gloves": 2, "Boots": 2, "Body Armours": 2, "Helmets": 2
425-
, "Quivers": 1, "Foci": 1, "Shields": 2, "Jewels": 1, "Life Flasks": 1, "Mana Flasks": 1, "Charms": 1}
425+
, "Quivers": 1, "Foci": 1, "Shields": 2, "Bucklers": 1, "Jewels": 1, "Life Flasks": 1, "Mana Flasks": 1, "Charms": 1}
426426

427427
vars.lang := {}, vars.lang2 := {}
428428
vars.log := {} ;store data related to the game's log here
@@ -492,15 +492,22 @@ LLK_FileCheck() ;delete old files (or ones that have been moved elsewhere)
492492
FileDelete, data\%val%
493493
FileRemoveDir, data\%val%, 1
494494
}
495+
496+
If FileExist("lailloken ui.ahk")
497+
FileDelete, lailloken ui.ahk
498+
495499
For index, val in ["6) wall", "encampment_entrance", "petrified_soldiers", "access_with_nearby_switch", "follow_the_single_wagon", "road_opposite_the", "touching_the_road", "pillars_near_the", "same_direction_as_the", "for_the_broken"]
496500
If FileExist("img\GUI\leveling tracker\hints\" val ".jpg")
497501
FileDelete, % "img\GUI\leveling tracker\hints\" val ".jpg"
502+
498503
For index, val in ["the_wall_with_notes"]
499504
If FileExist("img\GUI\leveling tracker\hints 2\" val ".jpg")
500505
FileDelete, % "img\GUI\leveling tracker\hints 2\" val ".jpg"
506+
501507
For index, val in ["necropolis.ahk"]
502508
If FileExist("modules\" val)
503509
FileDelete, modules\%val%
510+
504511
If FileExist("data\global\default guide 2.txt")
505512
FileDelete, data\global\default guide 2.txt
506513
If FileExist("img\GUI\screen-checks\necro_lantern.jpg")
@@ -610,7 +617,7 @@ Loop_main()
610617
Cloneframes_Thread(), Init_cloneframes()
611618
}
612619

613-
If vars.hwnd.leveltracker_gemlinks.main && vars.general.wMouse && (vars.general.wMouse = vars.hwnd.leveltracker_gemlinks.main)
620+
If !vars.general.drag && vars.hwnd.leveltracker_gemlinks.main && vars.general.wMouse && (vars.general.wMouse = vars.hwnd.leveltracker_gemlinks.main)
614621
&& vars.general.cMouse && (check := LLK_HasVal(vars.hwnd.leveltracker_gemlinks, vars.general.cMouse)) && (vars.leveltracker.gemlinks.hover != SubStr(check, 0))
615622
Leveltracker_PobGemLinks("", SubStr(check, 0))
616623

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.57.5", 15705, 1],
4+
"reminder: requires manual install if you don't have 1.57.3+, check full release notes(/highlight)",
5+
"fixes: item-info ele dps, poedb links",
6+
"act-tracker: added poe2 zone layouts, improved pob gem overlay",
7+
"item-info: fully functional now, automatic affix-tier conversion to t1 system"
8+
],
29
[
310
["1.57.4", 15704, 1],
411
"requires manual install if you don't have 1.57.3, check full release notes(/highlight)",

data/english/UI.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@
344344

345345
lvltracker_endreached = "can't go further"
346346
lvltracker_fastforwarderror = "current location is not;included in any remaining step"
347-
lvltracker_guidemissing = "guide hasn't been;imported yet"
347+
lvltracker_guidemissing = "guide hasn't been;loaded yet"
348348
lvltracker_importerror = ""gems only" guides;are not supported" ;## PoE1 only, exile-leveling has a "gems only" option
349349
lvltracker_importerror = "invalid import data"
350350
lvltracker_multipaste = "some files are;not supported"
@@ -853,8 +853,9 @@
853853
m_lvltracker_zones = "zone-layouts"
854854
m_lvltracker_recommend = "lvl recommendations"
855855
m_lvltracker_hotkeys = "enable page-hotkeys"
856-
m_lvltracker_skilltree = "skill-tree overlay settings:"
857-
m_lvltracker_pobmanual = "use screen-caps instead of schematics"
856+
m_lvltracker_poboverlays = "pob overlay settings:"
857+
m_lvltracker_pobgems = "gems: use toggle instead of hold"
858+
m_lvltracker_pobmanual = "tree: use screen-caps instead of schematics"
858859
m_lvltracker_pob = "pob: middle-click opens screen-cap menu"
859860
m_lvltracker_screencap = "screen-cap menu"
860861
m_lvltracker_guide = "guides:"

data/english/[leveltracker] default guide 2.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
},
3434
[
3535
"(color:FF00FF)2_tasks: find (img:waypoint), (img:in-out) areaidg1_6 for (img:waypoint) ;; the grim tangle",
36-
"(hint)____ zone is diamond-shaped, exit is opposite the entrance.",
36+
"(hint)____ zone is diamond-shaped, exit is often opposite the entrance.",
3737
"(hint)____ find closest (img:checkpoint) or (img:waypoint) for orientation in the diamond.",
3838
"find and enter (img:checkpoint) areaidg1_5 ;; the red vale"
3939
],
@@ -123,9 +123,9 @@
123123
"yes"
124124
],
125125
"lines": [
126-
"find (quest:smithing_tools)",
127-
"find and kill the_executioner",
128-
"enter areaidg1_14 ;; the manor ramparts"
126+
"find (quest:smithing_tools) near a (img:checkpoint)",
127+
"find and kill the_executioner, enter areaidg1_14 ;; the manor ramparts",
128+
"(hint)____ usually (img:7) in the zone"
129129
]
130130
},
131131
{
@@ -134,8 +134,8 @@
134134
"no"
135135
],
136136
"lines": [
137-
"find and kill the_executioner",
138-
"enter areaidg1_14 ;; the manor ramparts"
137+
"find and kill the_executioner, enter areaidg1_14 ;; the manor ramparts",
138+
"(hint)____ usually (img:7) in the zone"
139139
]
140140
},
141141
{
@@ -564,7 +564,7 @@
564564
},
565565
[
566566
"(color:FF00FF)2_tasks: find (img:waypoint), (img:in-out) areaidc_g1_6 for (img:waypoint) ;; the grim tangle",
567-
"(hint)____ zone is diamond-shaped, exit is opposite the entrance.",
567+
"(hint)____ zone is diamond-shaped, exit is often opposite the entrance.",
568568
"(hint)____ find closest (img:checkpoint) or (img:waypoint) for orientation in the diamond.",
569569
"find and enter (img:checkpoint) areaidc_g1_5 ;; the red vale"
570570
],
@@ -641,8 +641,8 @@
641641
"(img:waypoint) to areaidc_g1_13_2 ;; ogham village"
642642
],
643643
[
644-
"find and kill the_executioner",
645-
"enter areaidc_g1_14 ;; the manor ramparts"
644+
"find and kill the_executioner, enter areaidc_g1_14 ;; the manor ramparts",
645+
"(hint)____ usually (img:7) in the zone"
646646
],
647647
{
648648
"condition": [

data/english/client.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -414,6 +414,7 @@
414414
items_class_Quivers = "Quivers"
415415
items_class_Foci = "Foci"
416416
items_class_Shields = "Shields"
417+
items_class_Bucklers = "Bucklers"
417418
items_class_Jewels = "Jewels"
418419
items_class_Life Flasks = "Life Flasks"
419420
items_class_Mana Flasks = "Mana Flasks"

data/english/help tooltips.json

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -190,10 +190,14 @@
190190
"cloneframes scroll": [
191191
"for fine-tuning, scroll the mouse-wheel to adjust this value by 1"
192192
],
193+
"donations howto": [
194+
"github thread with more info"
195+
],
193196
"hotkeys ingame-keybinds": [
194197
"to avoid conflicts between custom in-game keybinds and the script's hotkeys:\n- tick anything that applies to you\n- provide alternative keys when asked to"
195198
],
196199
"hotkeys movekey": [
200+
"note: only required when using cursor-movement, not wasd(/underline)",
197201
"specifying the key allows the script to adapt its behavior in certain situations",
198202
"example: not activating on-hover overlays while moving the character",
199203
"for special keys, check the links above to find proper names and formatting"
@@ -267,9 +271,13 @@
267271
"click a box to open the color-palette, right click to reset"
268272
],
269273
"iteminfo item-tier": [
274+
"click a box to open the color-palette, right click to reset",
275+
"<fr> refers to fractured, <#> to untiered mods"
276+
],
277+
"iteminfo item-tier 2": [
270278
"click a box to open the color-palette, right click to reset",
271279
"<fr> refers to fractured, <#> to untiered mods",
272-
"t1 and t6 are also used for desired/undesired"
280+
"note: poe2 tiers will be normalized / recalculated so that the best available mod on an item is t1 again. if that fails, highlighting will not be applied and the in-game tier will be displayed"
273281
],
274282
"iteminfo item-level": [
275283
"click a box to open the color-palette, right click to reset"
@@ -324,19 +332,24 @@
324332
"slightly moves the guide-overlay up so it doesn't cover the exp-bar"
325333
],
326334
"leveltracker skilltree-info": [
335+
"while hovering over a gem, hold the omni-key to show an overlay with gem setups/links",
336+
"requires the <inventory> pixel-check to be set up correctly in the <screen-checks> menu",
337+
"",
327338
"while the skill-tree is on screen, press <tab> to show overlays with skill-tree schematics",
328339
"requires the <skilltree> image-check to be set up correctly in the <screen-checks> menu"
329340
],
330-
"leveltracker skilltree-info manual": [
331-
"while the skill-tree is on screen, hold the omni-key to show overlays with skill-tree screenshots",
332-
"requires the <skilltree> image-check to be set up correctly in the <screen-checks> menu"
333-
],
334341
"leveltracker skilltree clear": [
335342
"long-click to delete the skill-tree files used to render schematics: they will be re-downloaded the next time they are needed",
336343
"deleting them is only required if the schematics are outdated or otherwise incorrect"
337344
],
345+
"leveltracker pob gems": [
346+
"the gem-overlay will stay on screen after releasing the omni-key, until you press <esc>",
347+
"this option also allows the overlay to be moved around by long-clicking a gem-name in the list(s)",
348+
"clicking a gem-name in the list(s) will start an in-game search for that gem"
349+
],
338350
"leveltracker pob manual": [
339-
"the overlay will use manual screen-caps instead of schematics rendered from pob's data"
351+
"the tree-overlay will use manual screen-caps instead of schematics rendered from pob's data",
352+
"this option also changes how the overlay is accessed: hold the omni-key while the skill-tree is on screen"
340353
],
341354
"leveltracker pob": [
342355
"m-mouse in pob will open the screen-cap menu",
@@ -380,7 +393,7 @@
380393
"(hint)____",
381394
"if text is (color:00FFFF)highlighted_like_this, hold tab to see an image",
382395
"(hint)____",
383-
"(img:in-out) (color:FEC076)zone-name for x = \"enter zone to get x, then leave again\"",
396+
"\" (img:in-out) (color:FEC076)zone-name for x \" means \"enter zone to get x, then leave again\"",
384397
"(hint)____",
385398
"(img:0), (img:2): these show cardinal directions, i.e. north, east, etc.",
386399
"(hint)____ direct pathing might sometimes be blocked, so you'll have to",
@@ -407,7 +420,8 @@
407420
"leveltracker layouts": [
408421
"hold <tab> to overlay images with possible zone-layouts (guide-panel shows # zl)",
409422
"while active, hold <middle-mouse> to view an info-panel with explanations",
410-
"click the overlay to toggle layout orientation, drag to move it, right-click to reset position, or scroll to resize it"
423+
"click the overlay to toggle layout orientation, drag to move it, right-click to reset position, or scroll to resize it",
424+
"note: these are rough guides and never 100% correct, especially after big game updates(/underline)"
411425
],
412426
"leveltracker hotkeys enable": [
413427
"allows you to switch guide-pages via customizable hotkeys"

0 commit comments

Comments
 (0)