Skip to content

Commit f36df9e

Browse files
authored
v1.56.3 BETA merge
- still beta, poe 1 and 2 changes - map-tracker: streamlined kill-tracking, improved poe2 support - item-info: re-enabled for uniques in poe2 to check dps
2 parents 6875bd2 + 188c1b6 commit f36df9e

15 files changed

+77
-144
lines changed

Lailloken UI.ahk

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -298,11 +298,11 @@ Init_client()
298298
Sleep, 2000
299299
}
300300
WinGetPos, x, y, w, h, ahk_group poe_window
301-
Gui, Test: New, -DPIScale +LastFound +AlwaysOnTop +ToolWindow -Caption
301+
Gui, Screen_Test: New, -DPIScale +LastFound +AlwaysOnTop +ToolWindow -Caption
302302
WinSet, Trans, 0
303-
Gui, Test: Show, % "NA x" x + w//2 " y" y + h//2 " Maximize"
303+
Gui, Screen_Test: Show, % "NA x" x + w//2 " y" y + h//2 " Maximize"
304304
WinGetPos, xScreenOffset_monitor, yScreenOffSet_monitor, width_native, height_native
305-
Gui, Test: Destroy
305+
Gui, Screen_Test: Destroy
306306
;WinGetPos, x, y, w, h, ahk_class Shell_TrayWnd
307307
vars.monitor := {"x": xScreenOffset_monitor, "y": yScreenOffSet_monitor, "w": width_native, "h": height_native, "xc": xScreenOffset_monitor + width_native / 2, "yc": yScreenOffSet_monitor + height_native / 2}
308308
LLK_Log("measured monitor resolution and position: " width_native "x" height_native ", " xScreenOffset_monitor ", " yScreenOffSet_monitor)
@@ -1045,7 +1045,6 @@ Loop_main()
10451045
vars.general.inactive := 0
10461046
LLK_Overlay("show")
10471047
}
1048-
10491048
Leveltracker_Fade()
10501049
location := vars.log.areaID ;short-cut variable
10511050
If (vars.cloneframes.enabled

data/changelog.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
11
[
2+
[
3+
["1.56.3", 15603],
4+
"still beta, poe 1 and 2 changes",
5+
"map-tracker: streamlined kill-tracking, improved poe2 support",
6+
"item-info: re-enabled for uniques in poe2 to check dps"
7+
],
28
[
39
["1.56.2", 15602],
410
"still beta, mainly poe2 changes",

data/english/help tooltips.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@
252252
"click a box to open the color-palette, right click to reset"
253253
],
254254
"iteminfo marking class": [
255-
"colors used to highlight class-specificly (un)desired mods",
255+
"colors used to highlight class-specifically (un)desired mods",
256256
"click a box to open the color-palette, right click to reset"
257257
],
258258
"iteminfo item-tier": [
@@ -388,7 +388,11 @@
388388
],
389389
"maptracker rename": [
390390
"tags and renames boss maps for easier searching",
391-
"example: <boss: elder> instead of <absence of value and meaning>"
391+
"example:\n<boss: elder> instead of <absence of value and meaning>"
392+
],
393+
"maptracker rename 2": [
394+
"tags and renames boss maps for easier searching",
395+
"example:\n<boss: xesht> instead of <twisted domain (boss)>"
392396
],
393397
"maptracker character": [
394398
"your character's name, class, and level will be logged",

data/english/map-info 2.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ ID = 044
260260

261261
[Monsters fire additional Projectiles]
262262
type = monsters
263-
text = extra proj: +%
263+
text = extra proj: +
264264
ID = 045
265265

266266
[Monsters have increased Area of Effect]

data/versions.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"_release": [15602, "https://github.com/Lailloken/Lailloken-UI/archive/refs/heads/main.zip"]
2+
"_release": [15603, "https://github.com/Lailloken/Lailloken-UI/archive/refs/heads/main.zip"]
33
}

modules/GUI.ahk

Lines changed: 0 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -769,76 +769,6 @@ RGB_Picker(RGB := "")
769769
Return picked_rgb
770770
}
771771

772-
/*
773-
RGB_Picker(current_rgb := "")
774-
{
775-
local
776-
global vars, settings
777-
static palette
778-
779-
If !palette
780-
{
781-
palette := []
782-
palette.Push(["330000", "660000", "990000", "CC0000", "FF0000", "FF3333", "FF6666", "FF9999", "FFCCCC"])
783-
palette.Push(["331900", "663300", "994C00", "CC6600", "FF8000", "FF9933", "FFB266", "FFCC99", "FFE5CC"])
784-
palette.Push(["333300", "666600", "999900", "CCCC00", "FFFF00", "FFFF33", "FFFF66", "FFFF99", "FFFFCC"])
785-
palette.Push(["193300", "336600", "4C9900", "66CC00", "80FF00", "99FF33", "B2FF66", "CCFF99", "E5FFCC"])
786-
palette.Push(["003300", "006600", "009900", "00CC00", "00FF00", "33FF33", "66FF66", "99FF99", "CCFFCC"])
787-
palette.Push(["003319", "006633", "00994C", "00CC66", "00FF80", "33FF99", "66FFB2", "99FFCC", "CCFFE5"])
788-
palette.Push(["003333", "006666", "009999", "00CCCC", "00FFFF", "33FFFF", "66FFFF", "99FFFF", "CCFFFF"])
789-
palette.Push(["001933", "003366", "004C99", "0066CC", "0080FF", "3399FF", "66B2FF", "99CCFF", "CCE5FF"])
790-
palette.Push(["000033", "000066", "000099", "0000CC", "0000FF", "3333FF", "6666FF", "9999FF", "CCCCFF"])
791-
palette.Push(["190033", "330066", "4C0099", "6600CC", "7F00FF", "9933FF", "B266FF", "CC99FF", "E5CCFF"])
792-
palette.Push(["330033", "660066", "990099", "CC00CC", "FF00FF", "FF33FF", "FF66FF", "FF99FF", "FFCCFF"])
793-
palette.Push(["330019", "660033", "99004C", "CC0066", "FF007F", "FF3399", "FF66B2", "FF99CC", "FFCCE5"])
794-
palette.Push(["000000", "202020", "404040", "606060", "808080", "A0A0A0", "C0C0C0", "E0E0E0", "FFFFFF"])
795-
}
796-
hwnd_GUI := {}
797-
Gui, RGB_palette: New, -Caption -DPIScale +LastFound +ToolWindow +AlwaysOnTop +Border HWNDhwnd +E0x02000000 +E0x00080000 HWNDhwnd_palette
798-
Gui, RGB_palette: Color, Black
799-
Gui, RGB_palette: Font, % "s" settings.general.fSize, % vars.system.font
800-
Gui, RGB_palette: Margin, % settings.general.fWidth, % settings.general.fWidth
801-
For index0, val0 in palette
802-
For index, val in val0
803-
{
804-
style := (A_Index = 1) ? "Section " (index0 != 1 ? "ys x+-1" : "") : "xs y+" (LLK_IsBetween(index, 5, 6) ? settings.general.fWidth / 5 : -1), columns := index0
805-
If (current_rgb = val)
806-
{
807-
Gui, RGB_palette: Add, Text, % style " Center 0x200 BackgroundTrans w" settings.general.fWidth * 2 " h" settings.general.fWidth * 2 " c" (index >= 5 ? "Black" : "White"), X
808-
style := "xp yp"
809-
}
810-
Gui, RGB_palette: Add, Progress, % style " Disabled BackgroundBlack c" val " w" settings.general.fWidth * 2 " h" settings.general.fWidth * 2 " HWNDhwnd", 100
811-
hwnd_GUI[hwnd] := val
812-
}
813-
Gui, RGB_palette: Show, % "NA x10000 y10000"
814-
WinGetPos,,, w, h, ahk_id %hwnd_palette%
815-
xPos := vars.general.xMouse - (vars.general.xMouse - vars.monitor.x + w >= vars.monitor.w ? w - settings.general.fWidth : settings.general.fWidth)
816-
yPos := vars.general.yMouse - (vars.general.yMouse - vars.monitor.y + h >= vars.monitor.h ? h - settings.general.fWidth : settings.general.fWidth)
817-
KeyWait, LButton
818-
Gui, RGB_palette: Show, % "x" xPos " y" yPos
819-
While (vars.general.wMouse != hwnd_palette) && !timeout
820-
{
821-
If !start
822-
start := A_TickCount
823-
If (A_TickCount >= start + 1000) && (vars.general.wMouse != hwnd_palette)
824-
timeout := 1
825-
Sleep 10
826-
}
827-
While Blank(picked_rgb) && (vars.general.wMouse = hwnd_palette)
828-
{
829-
If hwnd_GUI.HasKey(vars.general.cMouse) && (hover_last != vars.general.cMouse)
830-
hover_last := vars.general.cMouse
831-
Else hover_last := ""
832-
If GetKeyState("LButton", "P")
833-
picked_rgb := hwnd_GUI[hover_last]
834-
Sleep 10
835-
}
836-
KeyWait, LButton
837-
Gui, RGB_palette: Destroy
838-
Return picked_rgb
839-
}
840-
*/
841-
842772
ToolTip_Mouse(mode := "", timeout := 0)
843773
{
844774
local

modules/client log.ahk

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,7 @@
6666
Loop, Parse, % vars.log.parsing, `,, %A_Space%
6767
If Blank(vars.log[A_LoopField]) && !Blank(%A_LoopField%)
6868
vars.log[A_LoopField] := %A_LoopField%
69-
If vars.poe_version && Blank(vars.log.areaname) && !Blank(areaID)
70-
vars.log.areaname := Log_Get(areaID, "areaname")
69+
7170
vars.log.level := !vars.log.level ? 0 : vars.log.level, settings.general.lang_client := settings.general.lang_client ? settings.general.lang_client : "unknown"
7271
If !mode
7372
vars.log.access_time := A_TickCount - start
@@ -208,15 +207,27 @@ Log_FindLines(log_array, data)
208207
Log_Get(log_text, data)
209208
{
210209
local
211-
210+
global vars, settings
211+
212212
If (data = "areaname")
213-
If !LLK_StringCompare(log_text, ["map"])
213+
If !LLK_StringCompare(log_text, ["map", "breach"])
214214
%data% := log_text
215215
Else
216216
{
217-
If RegExMatch(log_text, "Hideout.*_Claimable")
217+
If LLK_StringCompare(log_text, ["breach"])
218+
{
219+
If settings.maptracker.rename
220+
Return "boss: xesht"
221+
Else Return "twisted domain (boss)"
222+
}
223+
Else If RegExMatch(log_text, "Hideout.*_Claimable")
218224
Return LLK_StringCase(StrReplace(StrReplace(log_text, "_claimable"), "maphideout") . " hideout")
219-
%data% := StrReplace(SubStr(log_text, 4), "_noboss") . (!InStr(log_text, "_noboss") && !InStr(log_text, "unique") && !InStr(log_text, "losttowers") ? " (boss)" : "")
225+
%data% := StrReplace(SubStr(log_text, 4), "_noboss")
226+
If InStr(%data%, "uberboss_")
227+
%data% := (settings.maptracker.rename ? "boss:" : "") . StrReplace(%data%, "uberboss_") . (settings.maptracker.rename ? "" : " (boss)")
228+
Else If LLK_StringCompare(%data%, ["unique"])
229+
%data% := "unique:" (InStr(%data%, "merchant") ? " nameless seer" : SubStr(%data%, 7))
230+
Else %data% .= (!InStr(log_text, "_noboss") && !InStr(log_text, "unique") && !InStr(log_text, "losttowers") ? " (boss)" : "")
220231
Loop, Parse, % %data%
221232
%data% := (A_Index = 1) ? "" : %data%, %data% .= (A_Index != 1 && RegExMatch(A_LoopField, "[A-Z]") ? " " : "") . A_LoopField
222233
}
@@ -394,10 +405,11 @@ Log_Parse(content, ByRef areaID, ByRef areaname, ByRef areaseed, ByRef arealevel
394405
parse := SubStr(loopfield, InStr(loopfield, vars.lang.log_killed.1)), parse := Lang_Trim(parse, vars.lang.log_killed)
395406
Loop, Parse, parse
396407
parse := (A_Index = 1) ? "" : parse, parse .= IsNumber(A_LoopField) ? A_LoopField : ""
408+
397409
If (vars.maptracker.refresh_kills = 1)
398410
vars.maptracker.map.kills := [parse], LLK_ToolTip(Lang_Trans("maptracker_kills", 2),,,,, "Lime"), vars.tooltip_mouse := "", vars.maptracker.refresh_kills := 2
399411
Else If (vars.maptracker.refresh_kills > 1) && Maptracker_Towncheck()
400-
vars.maptracker.map.kills.2 := parse, LLK_ToolTip(Lang_Trans("maptracker_kills", 2),,,,, "Lime"), vars.maptracker.refresh_kills := 3
412+
vars.maptracker.map.kills.2 := parse, LLK_ToolTip(Lang_Trans("maptracker_kills", 2),,,,, "Lime"), vars.maptracker.refresh_kills := 3, vars.maptracker.last_kills := parse
401413
}
402414

403415
If settings.features.maptracker && settings.maptracker.mechanics && vars.maptracker.map.id && (vars.log.areaID = vars.maptracker.map.id)

modules/clone-frames.ahk

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
Else ;when calling this function to update clone-frames, destroy old GUIs just in case
1616
{
1717
For cloneframe in vars.cloneframes.list
18-
Gui, % StrReplace(cloneframe, " ", "_") ": Destroy"
18+
Gui, % "cloneframe_" StrReplace(cloneframe, " ", "_") ": Destroy"
1919
vars.cloneframes.enabled := 0, vars.cloneframes.list := {}, vars.cloneframes.editing := ""
2020
}
2121

@@ -25,7 +25,7 @@
2525
If (key = "settings")
2626
key := "settings_cloneframe" ;dummy entry for clone-frame creation
2727
vars.cloneframes.list[key] := {"enable": !Blank(check := ini[key].enable) ? check : 1}
28-
Gui, % StrReplace(key, " ", "_") ": New", -Caption +E0x80000 +E0x20 +LastFound +AlwaysOnTop +ToolWindow +OwnDialogs HWNDhwnd
28+
Gui, % "cloneframe_" StrReplace(key, " ", "_") ": New", -Caption +E0x80000 +E0x20 +LastFound +AlwaysOnTop +ToolWindow +OwnDialogs HWNDhwnd
2929
vars.hwnd.cloneframes[key] := hwnd
3030
If vars.cloneframes.list[key].enable
3131
vars.cloneframes.enabled += 1
@@ -51,7 +51,7 @@ Cloneframes_Hide()
5151
For cloneframe in vars.cloneframes.list
5252
{
5353
If vars.hwnd.cloneframes[cloneframe] && WinExist("ahk_id " vars.hwnd.cloneframes[cloneframe])
54-
Gui, % StrReplace(cloneframe, " ", "_") ": Hide"
54+
Gui, % "cloneframe_" StrReplace(cloneframe, " ", "_") ": Hide"
5555
If vars.hwnd.cloneframe_borders.main && WinExist("ahk_id " vars.hwnd.cloneframe_borders.main)
5656
Gui, cloneframe_border: Hide
5757
If vars.hwnd.cloneframe_borders.second && WinExist("ahk_id " vars.hwnd.cloneframe_borders.second)
@@ -199,15 +199,16 @@ Cloneframes_Show()
199199
If !val.enable && !(vars.cloneframes.editing && cloneframe = vars.cloneframes.editing) || (cloneframe = "settings_cloneframe")
200200
{
201201
If WinExist("ahk_id " vars.hwnd.cloneframes[cloneframe])
202-
Gui, % StrReplace(cloneframe, " ", "_") ": Hide"
202+
Gui, % "cloneframe_" StrReplace(cloneframe, " ", "_") ": Hide"
203203
If vars.hwnd.cloneframe_borders.main && WinExist("ahk_id " vars.hwnd.cloneframe_borders.main) && !vars.cloneframes.editing
204204
Gui, cloneframe_border: Hide
205205
If vars.hwnd.cloneframe_borders.second && WinExist("ahk_id " vars.hwnd.cloneframe_borders.second) && !vars.cloneframes.editing
206206
Gui, cloneframe_border2: Hide
207207
continue
208208
}
209+
209210
If !WinExist("ahk_id " vars.hwnd.cloneframes[cloneframe])
210-
Gui, % StrReplace(cloneframe, " ", "_") ": Show", NA
211+
Gui, % "cloneframe_" StrReplace(cloneframe, " ", "_") ": Show", NA
211212
pBitmap := Gdip_BitmapFromScreen(vars.monitor.x + val.xSource "|" vars.monitor.y + val.ySource "|" val.width "|" val.height)
212213
width := val.width* val.xScale/100, height := val.height* val.yScale/100
213214
hbmBitmap := CreateDIBSection(width, height), hdcBitmap := CreateCompatibleDC(), obmBitmap := SelectObject(hdcBitmap, hbmBitmap), gBitmap := Gdip_GraphicsFromHDC(hdcBitmap)

modules/item-checker.ahk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ Iteminfo(refresh := 0) ; refresh: 1 to refresh it normally, 2 for clipboard pars
240240
If (refresh = 2)
241241
Return
242242

243-
If !vars.poe_version && !db.item_bases.HasKey(item.class) || (item.itembase = "Timeless Jewel") || vars.poe_version && (item.rarity = "unique" || !vars.omnikey.poedb[item.class]) ;|| (item.name = "Impossible Escape")
243+
If !vars.poe_version && !db.item_bases.HasKey(item.class) || (item.itembase = "Timeless Jewel") || vars.poe_version && !vars.omnikey.poedb[item.class] ;|| (item.name = "Impossible Escape")
244244
{
245245
LLK_ToolTip(Lang_Trans("ms_item-info") ":`n" Lang_Trans("iteminfo_unsupported"), 2,,,, "red"), LLK_Overlay(vars.hwnd.iteminfo.main, "destroy")
246246
Return

modules/leveling tracker.ahk

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -724,17 +724,6 @@ Leveltracker_Import(profile := "")
724724
Try vars.leveltracker["pob" profile] := LevelTracker_PobImport(StrReplace(act, "pob-code:"), profile)
725725
}
726726

727-
/*
728-
While (SubStr(gem_notes, 0) = "`n")
729-
gem_notes := SubStr(gem_notes, 1, -1)
730-
IniDelete, ini\leveling tracker.ini, Gem notes%profile%
731-
If gem_notes
732-
{
733-
StringLower, gem_notes, gem_notes
734-
gem_notes := StrReplace(gem_notes, "&", "&&")
735-
IniWrite, % gem_notes, ini\leveling tracker.ini, Gem notes%profile%
736-
}
737-
*/
738727
build_gems_all := build_gems_skill_str build_gems_supp_str build_gems_skill_dex build_gems_supp_dex build_gems_skill_int build_gems_supp_int build_gems_none ;create single gem-string for gear tracker feature
739728

740729
IniDelete, ini\leveling tracker.ini, Gems%profile%

0 commit comments

Comments
 (0)