v1.56.7 BETA merge

Lailloken · web-flow · commit b8acf1865929 · 2025-02-08T12:20:01.000+01:00
- act-tracker: enabled timer for poe2
- added basic controller support: context-menu and item-info
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,22 @@
+# currently unused folders/files
+img/Betrayal/
+
+# local folders created by the tool on startup/demand
+cheat-sheets/
+cheat-sheets?2/
+exports/
+ini/
+ini?2/
+update/
+
+# custom, user-defined hotkeys
+modules/hotkeys?custom*
+
+# sub-folders/files within img, created on demand
+img/recognition*/
+img/GUI/skill-tree*/
+img/*.json
+img/*.jpg
+
+# files created by specific features on demand
+data/global/?stash-ninja??prices*
diff --git a/Lailloken UI.ahk b/Lailloken UI.ahk
@@ -165,8 +165,8 @@ Exit()
 	If !vars.poe_version && IsObject(vars.betrayal.board) && (vars.betrayal.board0 != Json.Dump(vars.betrayal.board))
 		IniWrite, % """" Json.Dump(vars.betrayal.board) """", ini\betrayal info.ini, settings, board
 	timer := vars.leveltracker.timer
-	If !vars.poe_version && IsNumber(timer.current_split) && (timer.current_split != timer.current_split0)
-		IniWrite, % vars.leveltracker.timer.current_split, ini\leveling tracker.ini, % "current run" settings.leveltracker.profile, time
+	If IsNumber(timer.current_split) && (timer.current_split != timer.current_split0)
+		IniWrite, % vars.leveltracker.timer.current_split, % "ini" vars.poe_version "\leveling tracker.ini", % "current run" settings.leveltracker.profile, time
 
 	If vars.maptracker.map.date_time
 		Maptracker_Save()
diff --git a/README.md b/README.md
@@ -7,8 +7,8 @@ A light-weight AHK script with UI and QoL features for Path of Exile 1 and 2, em
 |---|---|---|---|
 
 ## Contributions
-| [![image](https://raw.githubusercontent.com/Lailloken/Lailloken-UI/main/img/readme/_issues.png)](https://github.com/Lailloken/Lailloken-UI/issues/339) | ![image](https://raw.githubusercontent.com/Lailloken/Lailloken-UI/main/img/readme/_code.png) |
-|---|---|
+| [![image](https://raw.githubusercontent.com/Lailloken/Lailloken-UI/main/img/readme/_issues.png)](https://github.com/Lailloken/Lailloken-UI/issues/339) | ![image](https://raw.githubusercontent.com/Lailloken/Lailloken-UI/main/img/readme/_code.png) | [![image](https://raw.githubusercontent.com/Lailloken/Lailloken-UI/main/img/readme/_translations.png)](https://github.com/Lailloken/Lailloken-UI/issues/326) |
+|---|---|---|
 <br>
 
 ## Context: What is this project?
diff --git a/data/changelog.json b/data/changelog.json
@@ -1,4 +1,9 @@
 [
+  [
+	["1.56.7", 15607],
+	"act-tracker: enabled timer for poe2",
+	"added basic controller support: context-menu and item-info"
+  ],
   [
 	["1.56.6", 15606],
 	"act-tracker: tweaks for poe2 default guide",
diff --git a/data/english/UI.txt b/data/english/UI.txt
@@ -177,6 +177,7 @@
 		global_apply			=	"apply"
 		global_apply			=	"apply changes"
 		global_global			=	"global"
+		global_controller		=	"controller"	;## gamepad
 
 		mechanic_bestiary		=	"bestiary"
 		mechanic_betrayal		=	"betrayal"
diff --git a/data/versions.json b/data/versions.json
@@ -1,3 +1,3 @@
 {
-  "_release": [15606, "https://github.com/Lailloken/Lailloken-UI/archive/refs/heads/main.zip"]
+  "_release": [15607, "https://github.com/Lailloken/Lailloken-UI/archive/refs/heads/main.zip"]
 }
diff --git a/img/GUI/leveling tracker/quest_2.png b/img/GUI/leveling tracker/quest_2.png
diff --git a/img/readme/_help.png b/img/readme/_help.png
diff --git a/img/readme/legacy_003.jpg b/img/readme/legacy_003.jpg
diff --git a/img/readme/necropolis_001.jpg b/img/readme/necropolis_001.jpg
diff --git a/img/readme/necropolis_002.jpg b/img/readme/necropolis_002.jpg
diff --git a/modules/client log.ahk b/modules/client log.ahk
@@ -25,6 +25,16 @@
 		If !mode && !IsObject(log_content) && (check := InStr(log_read, " Generating level ", 1, 0, 3))
 			log_content := StrSplit(SubStr(log_read, check), "`n", "`r" vars.lang.system_fullstop.1)
 
+		If Blank(vars.general.input_method) && (check := InStr(log_read, "current input mode = ",, 0))
+		{
+			method := SubStr(log_read, 1, check + 23), method := SubStr(method, InStr(method, "`n",, 0) + 1)
+			timestamp := SubStr(method, 1, InStr(method, " ",,, 2) - 1)
+			Loop, Parse, timestamp
+				timestamp := (A_Index = 1) ? "" : timestamp, timestamp .= IsNumber(A_LoopField) ? A_LoopField : ""
+			method := SubStr(method, InStr(method, " ",, 0) + 1), method := Trim(method, "'")
+			vars.general.input_method := [method, timestamp]
+		}
+
 		If settings.general.character && Blank(log_character.1)
 		&& (InStr(log_read, " " settings.general.character " " Lang_Trans("system_parenthesis")) || InStr(log_read, " " settings.general.character " " Lang_Trans("log_whois")))
 			log_character := StrSplit(log_read, "`n", "`r" vars.lang.system_fullstop.1), log_character := [log_character[Log_FindLines(log_character, "character")]]
@@ -388,6 +398,19 @@ Log_Parse(content, ByRef areaID, ByRef areaname, ByRef areaseed, ByRef arealevel
 		}
 		Else If InStr(loopfield, " connected to ") && InStr(loopfield, ".login.") || InStr(loopfield, "*****")
 			areaID := "login"
+		Else If InStr(loopfield, "current input mode = ")
+		{
+			timestamp := SubStr(loopfield, 1, InStr(loopfield, " ",,, 2) - 1)
+			Loop, Parse, timestamp
+				timestamp := (A_Index = 1) ? "" : timestamp, timestamp .= IsNumber(A_LoopField) ? A_LoopField : ""
+			method := SubStr(loopfield, InStr(loopfield, " ",, 0) + 1), method := Trim(method, "'")
+			If (timestamp > vars.general.input_method.2)
+			{
+				vars.general.input_method := [method, timestamp]
+				If (vars.settings.active = "general")
+					Settings_menu("general")
+			}
+		}
 
 		If Lang_Match(loopfield, vars.lang.log_enter)
 			parse := SubStr(loopfield, InStr(loopfield, vars.lang.log_enter.1)), areaname := LLK_StringCase(Lang_Trim(parse, vars.lang.log_enter, Lang_Trans("log_location")))
diff --git a/modules/item-checker.ahk b/modules/item-checker.ahk
@@ -1518,7 +1518,12 @@ Iteminfo_GUI()
 
 	Gui, %GUI_name%: Show, NA AutoSize x10000 y10000 ;show the GUI outside the monitor's area to get dimensions
 	WinGetPos,,, w, h, % "ahk_id " vars.hwnd.iteminfo.main
-	If (vars.iteminfo.UI.xPos != "") ;if tooltip is being refreshed to apply changes in settings, use previous coordinates
+	If (vars.general.input_method.1 = 2)
+	{
+		xPos := vars.monitor.x + vars.client.xc + vars.client.h * 0.174 - w
+		yPos := vars.monitor.y + vars.client.yc + vars.client.h * 0.104 - h//2
+	}
+	Else If (vars.iteminfo.UI.xPos != "") ;if tooltip is being refreshed to apply changes in settings, use previous coordinates
 	{
 		xPos := vars.iteminfo.UI.xPos, yPos := vars.iteminfo.UI.yPos
 		xPos := (xPos + w > vars.client.x + vars.client.w) ? vars.client.x + vars.client.w - w : xPos
diff --git a/modules/leveling tracker.ahk b/modules/leveling tracker.ahk
@@ -24,6 +24,9 @@
 			IniWrite, % "", % "ini" vars.poe_version "\leveling tracker.ini", % "current run" settings.leveltracker.profile, act %A_Index%
 	}
 
+	If vars.poe_version
+		vars.leveltracker.acts := ["1", "2", "3", "1c", "2c", "3c"]
+
 	For index0, val in ["", 2, 3]
 	{
 		vars.leveltracker["PoB" val] := {}
@@ -52,7 +55,7 @@
 	If vars.poe_version && !FileExist("img\GUI\skill-tree" settings.leveltracker.profile "\PoE 2\")
 		FileCreateDir, % "img\GUI\skill-tree" settings.leveltracker.profile "\PoE 2\"
 
-	settings.leveltracker.timer := vars.client.stream || vars.poe_version ? 0 : !Blank(check := ini.settings["enable timer"]) ? check : 0
+	settings.leveltracker.timer := vars.client.stream ? 0 : !Blank(check := ini.settings["enable timer"]) ? check : 0
 	settings.leveltracker.pausetimer := !Blank(check := ini.settings["hideout pause"]) ? check : 0
 	settings.leveltracker.fade := !Blank(check := ini.settings["enable fading"]) ? check : 0
 	settings.leveltracker.fadetime := !Blank(check := ini.settings["fade-time"]) ? check : 5000
@@ -110,7 +113,11 @@
 	{
 		vars.leveltracker.timer.current_act := A_Index
 		If Blank(check := ini["current run" settings.leveltracker.profile]["act " A_Index])
+		{
+			If vars.poe_version && (A_Index = 7)
+				vars.leveltracker.timer.current_act := 11
 			Break
+		}
 		vars.leveltracker.timer.total_time += check
 	}
 	vars.leveltracker.skilltree := {"active": !Blank(check := ini.settings["last skilltree-image" settings.leveltracker.profile]) ? check : "00"}
@@ -961,7 +968,7 @@ Leveltracker_Import(profile := "")
 							Case "quest":
 								npc := quests[quest]["reward_offers"][quest]["quest_npc"]
 								npc := (npc = "lady dialla") ? "dialla" : (npc = "captain fairgraves") ? "fairgraves" : (npc = "commander kirac") ? "kirac" : InStr(npc, " ") ? SubStr(npc, 1, InStr(npc, " ") - 1) : npc
-								step_text := npc ? StrReplace(step_text, "hand in ", npc ": ") "<" StrReplace(quests[quest].name, " ", "_") "> " : step_text "<" StrReplace(quests[quest].name, " ", "_") "> "
+								step_text := npc ? "(img:quest) " StrReplace(step_text, "hand in ", npc ": ") "<" StrReplace(quests[quest].name, " ", "_") "> " : step_text "<" StrReplace(quests[quest].name, " ", "_") "> "
 							Case "quest_text":
 								value := " (quest:" StrReplace(value, " ", "_") ") "
 								step_text .= value ;!InStr(step_text, "kill") ? value : "" ;omit quest-items related to killing bosses
@@ -1034,7 +1041,7 @@ Leveltracker_Import(profile := "")
 				{
 					If !IsObject(ss_parts)
 					{
-						text := (SubStr(ss_parts, 1, 1) = " ") ? SubStr(ss_parts, 2) : ss_parts ;, text := (SubStr(text, 0) = " ") ? SubStr(text, 1, -1) : text
+						text := !ss_array.parts[ss_part_index + 1].value ? Trim(ss_parts, " ") : (SubStr(ss_parts, 1, 1) = " ") ? SubStr(ss_parts, 2) : ss_parts
 						ss_text .= ((ss_text != "(hint)") ? "" : "_______") StrReplace(text, " ", "_")
 					}
 					Else
@@ -1044,7 +1051,7 @@ Leveltracker_Import(profile := "")
 							Case "dir":
 								ss_text .= " (img:"ss_parts.dirIndex ") "
 							Case "waypoint":
-								ss_text .= (InStr(ss_text, "broken") ? "" : "the_") " (img:waypoint) "
+								ss_text .= (InStr(ss_text, "broken") ? "" : "_the") " (img:waypoint) "
 							Case "quest_text":
 								ss_text .= " (quest:" StrReplace(ss_parts.value, " ", "_") ") "
 							Case "generic":
@@ -2163,8 +2170,8 @@ Leveltracker_Progress(mode := 0) ;advances the guide and redraws the overlay
 	guide := vars.leveltracker.guide, areas := db.leveltracker.areas, timer := vars.leveltracker.timer ;short-cut variables
 	vars.leveltracker.fade := mode ? 0 : vars.leveltracker.fade, vars.leveltracker.toggle := mode ? 1 : vars.leveltracker.toggle
 
-	If !vars.log.act
-		vars.log.act := areas[vars.log.areaID].act
+	If !vars.log.act || (vars.log.act = "c")
+		vars.log.act := areas[StrReplace(vars.log.areaID, "c_")].act . (InStr(vars.log.areaID, "c_") ? "c" : "")
 
 	If (mode = 1)
 		GuiControl,, % vars.hwnd.LLK_panel.leveltracker, img\GUI\leveltracker.png
@@ -2378,8 +2385,8 @@ Leveltracker_Progress(mode := 0) ;advances the guide and redraws the overlay
 	If settings.leveltracker.timer
 	{
 		Gui, %GUI_name_controls2%: Add, Text, % "Section Border 0x200 BackgroundTrans HWNDhwnd Center w" wPanels (timer.current_act = 11 ? " cLime" : (timer.pause = -1) ? " cGray" : ""), % FormatSeconds(timer.total_time + (timer.current_act = 11 ? 0 : timer.current_split), 0)
-		vars.hwnd.leveltracker.timer_total := hwnd
-		Gui, %GUI_name_controls2%: Add, Text, % "ys hp Border 0x200 BackgroundTrans HWNDhwnd Center w" wButtons * 2, % "a" (timer.current_act = 11 ? 10 : timer.current_act)
+		vars.hwnd.leveltracker.timer_total := hwnd, act := (timer.current_act = 11 ? (vars.poe_version ? 6 : 10) : timer.current_act), act := vars.poe_version ? vars.leveltracker.acts[act] : act
+		Gui, %GUI_name_controls2%: Add, Text, % "ys hp Border 0x200 BackgroundTrans HWNDhwnd Center w" wButtons * 2, % "a" act
 		vars.hwnd.leveltracker.timer_button := hwnd
 		Gui, %GUI_name_controls2%: Add, Text, % "ys hp Border 0x200 BackgroundTrans HWNDhwnd Center w" wPanels (timer.current_act = 11 ? " cLime" : (timer.pause = -1) ? " cGray" : ""), % FormatSeconds(timer.current_split, 0)
 		vars.hwnd.leveltracker.timer_act := hwnd
@@ -2714,7 +2721,7 @@ Leveltracker_Timer(mode := "")
 	{
 		If (mode = "pause") && (timer.current_act = 11)
 			error := [Lang_Trans("lvltracker_timererror", 1), 1.5, "yellow"]
-		Else If (mode = "reset") && (vars.log.areaID != "1_1_1")
+		Else If (mode = "reset") && !(vars.log.areaID = "1_1_1" || vars.log.areaID = "g1_1")
 			error := [Lang_Trans("lvltracker_timererror", 2), 2, "red"]
 		Else If (mode = "reset") && !timer.pause
 			error := [Lang_Trans("lvltracker_timererror", 3), 1, "red"]
@@ -2736,18 +2743,17 @@ Leveltracker_Timer(mode := "")
 				Leveltracker_ProgressReset(settings.leveltracker.profile)
 				IniWrite, % "", % "ini" vars.poe_version "\leveling tracker.ini", % "current run" settings.leveltracker.profile, name
 				IniWrite, 0, % "ini" vars.poe_version "\leveling tracker.ini", % "current run" settings.leveltracker.profile, time
-				Loop, vars.poe_version ? 6 : 10
+				Loop, % vars.poe_version ? 6 : 10
 					IniWrite, % "", % "ini" vars.poe_version "\leveling tracker.ini", % "current run" settings.leveltracker.profile, act %A_Index%
 				vars.leveltracker.Delete("timer")
 				Init_leveltracker(), Leveltracker_Progress(1)
-				KeyWait, RButton
 				Return
 			}
 			Else Return
 		}
 		Else If (mode = "pause") && (timer.current_act != 11)
 		{
-			If !InStr(timer.name, ",") && (vars.log.areaID = "1_1_1")
+			If !InStr(timer.name, ",") && (vars.log.areaID = "1_1_1" || vars.log.areaID = "g1_1")
 			{
 				FormatTime, date,, ShortDate
 				FormatTime, time,, Time
@@ -2774,13 +2780,16 @@ Leveltracker_Timer(mode := "")
 	If vars.hwnd.leveltracker.main && (timer.pause = 0) ;advance the timer
 	{
 		timer.current_split += (timer.current_act = 11) ? 0 : 1, timer.pause := (settings.leveltracker.pausetimer && InStr(vars.log.areaID, "hideout")) || (timer.current_act = 11) ? 1 : 0
-		If vars.log.act && (timer.current_act + 1 = vars.log.act) ;player enters the next act: save previous act's time, add it to total time, then reset it
+		If vars.log.act && (timer.current_act + 1 = (InStr(vars.log.act, "c") ? StrReplace(vars.log.act, "c") + 3 : vars.log.act)
+		|| vars.poe_version && vars.log.act = 11 && timer.current_act = 6) ;player enters the next act: save previous act's time, add it to total time, then reset it
 		{
 			IniWrite, % timer.current_split, % "ini" vars.poe_version "\leveling tracker.ini", % "current run" settings.leveltracker.profile, % "act "timer.current_act
 			If InStr(timer.name, ",")
 				Leveltracker_TimerCSV()
-			timer.total_time += timer.current_split, timer.current_act += 1, timer.current_split := (timer.current_act = 11) ? timer.current_split : 0
-			GuiControl, Text, % vars.hwnd.leveltracker.timer_button, % "a" (timer.current_act = 11 ? 10 : timer.current_act)
+			timer.total_time += timer.current_split, timer.current_act += 1, timer.current_act := (vars.poe_version && timer.current_act = 7) ? 11 : timer.current_act
+			timer.current_split := (timer.current_act = 11) ? timer.current_split : 0
+			act := (timer.current_act = 11 ? (vars.poe_version ? 6 : 10) : timer.current_act), act := vars.poe_version ? vars.leveltracker.acts[act] : act
+			GuiControl, Text, % vars.hwnd.leveltracker.timer_button, % "a" act
 			IniWrite, % timer.current_split, % "ini" vars.poe_version "\leveling tracker.ini", % "current run" settings.leveltracker.profile, time
 			If (timer.current_act = 11)
 				Leveltracker_Progress(1)
@@ -2801,7 +2810,7 @@ Leveltracker_TimerCSV()
 	global vars, settings
 
 	If !FileExist("exports\campaign runs" (vars.poe_version ? " (PoE 2)" : "") ".csv")
-		FileAppend, % """date, time"",act 1,act 2,act 3,act 4,act 5,act 6,act 7,act 8,act 9,act 10", % "exports\campaign runs" (vars.poe_version ? " (PoE 2)" : "") ".csv"
+		FileAppend, % """date, time"",act 1,act 2,act 3,act 4,act 5,act 6" (!vars.poe_version ? ",act 7,act 8,act 9,act 10" : ""), % "exports\campaign runs" (vars.poe_version ? " (PoE 2)" : "") ".csv"
 
 	FileRead, csv, % "exports\campaign runs" (vars.poe_version ? " (PoE 2)" : "") ".csv"
 	If InStr(csv, vars.leveltracker.timer.name)
diff --git a/modules/omni-key.ahk b/modules/omni-key.ahk
@@ -21,7 +21,7 @@
 		WinWaitActive, % "ahk_id " vars.hwnd.poe_client
 	}
 
-	If Screenchecks_PixelSearch("inventory")
+	If (vars.general.input_method.1 = 2) || Screenchecks_PixelSearch("inventory")
 	{
 		If WinExist("ahk_id " vars.hwnd.maptrackernotes_edit.main)
 		{
@@ -408,8 +408,16 @@ Omni_ContextMenu()
 	MouseGetPos, mouseX, mouseY
 	Gui, omni_context: Show, % "NA x10000 y10000"
 	WinGetPos,,, w, h, % "ahk_id " vars.hwnd.omni_context.main
-	xTarget := (mouseX + w > vars.client.x + vars.client.w) ? vars.client.x + vars.client.w - w : mouseX
-	yTarget := (mouseY + h > vars.client.y + vars.client.h) ? vars.client.y + vars.client.h - h : mouseY
+	If (vars.general.input_method.1 = 2)
+	{
+		xTarget := vars.monitor.x + vars.client.xc + vars.client.h * 0.174 - w
+		yTarget := vars.monitor.y + vars.client.yc + vars.client.h * 0.104 - h//2
+	}
+	Else
+	{
+		xTarget := (mouseX + w > vars.client.x + vars.client.w) ? vars.client.x + vars.client.w - w : mouseX
+		yTarget := (mouseY + h > vars.client.y + vars.client.h) ? vars.client.y + vars.client.h - h : mouseY
+	}
 	If (w > 50)
 		Gui, omni_context: Show, % "NA x" xTarget " y" yTarget
 	Else Gui, omni_context: Destroy
diff --git a/modules/settings menu.ahk b/modules/settings menu.ahk
@@ -671,7 +671,7 @@ Settings_general()
 		Gui, %GUI%: Add, Text, % "xs Section y+"vars.settings.spacing, % Lang_Trans("m_general_client", 2)
 		Gui, %GUI%: Font, norm
 
-		Gui, %GUI%: Add, Text, % "ys cLime", % "path of exile " (vars.poe_version ? 2 : 1)
+		Gui, %GUI%: Add, Text, % "ys cLime", % "path of exile " (vars.poe_version ? 2 : 1) . (vars.general.input_method.1 = 2 ? " (" Lang_Trans("global_controller") ")" : "")
 		Gui, %GUI%: Add, Text, % "xs Section", % Lang_Trans("m_general_language", 2) " "
 		Gui, %GUI%: Add, Text, % "ys x+0 c" (settings.general.lang_client = "unknown" ? "Red" : "Lime"), % (settings.general.lang_client = "unknown") ? Lang_Trans("m_general_language", 3) : settings.general.lang_client
 
@@ -1503,7 +1503,7 @@ Settings_leveltracker()
 	Gui, %GUI%: Font, bold underline
 	Gui, %GUI%: Add, Text, % "xs Section y+"vars.settings.spacing, % Lang_Trans("global_general")
 	Gui, %GUI%: Font, norm
-	If !vars.client.stream && !vars.poe_version
+	If !vars.client.stream
 	{
 		Gui, %GUI%: Add, Checkbox, % "xs Section gSettings_leveltracker2 HWNDhwnd Checked"settings.leveltracker.timer, % Lang_Trans("m_lvltracker_timer")
 		vars.hwnd.settings.timer := vars.hwnd.help_tooltips["settings_leveltracker timer"] := hwnd

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,9 @@`
`1`	`1`	`[`
	`2`	`+ [`
	`3`	`+ ["1.56.7", 15607],`
	`4`	`+ "act-tracker: enabled timer for poe2",`
	`5`	`+ "added basic controller support: context-menu and item-info"`
	`6`	`+ ],`
`2`	`7`	`[`
`3`	`8`	`["1.56.6", 15606],`
`4`	`9`	`"act-tracker: tweaks for poe2 default guide",`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`{`
`2`		`- "_release": [15606, "https://github.com/Lailloken/Lailloken-UI/archive/refs/heads/main.zip"]`
	`2`	`+ "_release": [15607, "https://github.com/Lailloken/Lailloken-UI/archive/refs/heads/main.zip"]`
`3`	`3`	`}`