v1.50.9 merge

- item-info: rune dagger base-stats fix - leveling tracker: potential timer UI fix - map-info: large font-size fix
Lailloken · Oct 12, 2023 · ea1d6c6 · ea1d6c6
2 parents 992d094 + adf80ce
commit ea1d6c6
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 16 deletions.
diff --git a/Lailloken UI.ahk b/Lailloken UI.ahk
@@ -223,6 +223,11 @@ HelpToolTip(HWND_key)
 	global vars, settings
 
 	WinGetPos,, y,, h, % "ahk_id "vars.hwnd.help_tooltips[HWND_key]
+	If Blank(y) || Blank(h)
+	{
+		MouseGetPos, x, y
+		h := settings.general.fHeight
+	}
 	HWND_key := StrReplace(HWND_key, "|"), check := SubStr(HWND_key, 1, InStr(HWND_key, "_") - 1), control := SubStr(HWND_key, InStr(HWND_key, "_") + 1)
 	HWND_checks := {"cheatsheets": "cheatsheet_menu", "maptracker": "maptracker_logs", "notepad": 0, "leveltracker": "leveltracker_screencap", "snip": 0, "lab": 0, "searchstrings": "searchstrings_menu" ;cont
 	, "updater": "update_notification", "geartracker": 0, "seed-explorer": "legion"}
@@ -444,7 +449,7 @@ Init_general()
 	global vars, settings
 
 	legacy_version := LLK_IniRead("ini\config.ini", "versions", "ini-version")
-	If IsNumber(legacy_version) && (legacy_version < 15000) || FileExist("modules\alarm-timer.ahk") || FileExist("modules\delve-helper.ahk")
+	If IsNumber(legacy_version) && (legacy_version < 15000) || FileExist("modules\alarm-timer.ahk") ;|| FileExist("modules\delve-helper.ahk")
 	{
 		MsgBox,, Script updated incorrectly, Updating from legacy to v1.50+ requires a clean installation.`nThe script will now exit.
 		ExitApp
@@ -1059,7 +1064,7 @@ UpdateCheck(timer := 0) ;checks for updates: timer refers to whether this functi
 		Gui, update_download: Add, Progress, range0-10 HWNDhwnd BackgroundBlack cGreen, 0
 		Gui, update_download: Show
 		UpdateDownload(hwnd)
-		branch := InStr(versions_live._release.2, "/main/") ? "main" : "beta"
+		branch := InStr(versions_live._release.2, "/main.zip") ? "main" : "beta"
 		If !FileExist("update\update_"vars.updater.latest.1 ".zip")
 			UrlDownloadToFile, % versions_live._release.2, % "update\update_"vars.updater.latest.1 ".zip"
 		If ErrorLevel || !FileExist("update\update_"vars.updater.latest.1 ".zip")

diff --git a/README.md b/README.md
@@ -3,8 +3,8 @@ A light-weight AHK script with UI and QoL features for Path of Exile, emphasizin
 <br>
 
 ## Download & Setup
-[![img](https://github.com/Lailloken/Lailloken-UI/blob/beta/img/readme/autohotkey.png)](https://www.autohotkey.com/download/) [![img](https://github.com/Lailloken/Lailloken-UI/blob/beta/img/readme/guide.png)](https://github.com/Lailloken/Lailloken-UI/wiki) [![img](https://github.com/Lailloken/Lailloken-UI/blob/beta/img/readme/download.png)](https://github.com/Lailloken/Lailloken-UI/archive/refs/heads/beta.zip)  
-[![img](https://github.com/Lailloken/Lailloken-UI/blob/beta/img/readme/help.png)](https://github.com/Lailloken/Lailloken-UI/wiki/Known-Issues-&-Limitations) [![img](https://github.com/Lailloken/Lailloken-UI/blob/beta/img/readme/releases.png)](https://github.com/Lailloken/Lailloken-UI/releases) [![img](https://github.com/Lailloken/Lailloken-UI/blob/beta/img/readme/changelog.png)](https://github.com/Lailloken/Lailloken-UI/blob/main/data/changelog.json)
+[![img](https://github.com/Lailloken/Lailloken-UI/blob/main/img/readme/autohotkey.png)](https://www.autohotkey.com/download/) [![img](https://github.com/Lailloken/Lailloken-UI/blob/main/img/readme/guide.png)](https://github.com/Lailloken/Lailloken-UI/wiki) [![img](https://github.com/Lailloken/Lailloken-UI/blob/main/img/readme/download.png)](https://github.com/Lailloken/Lailloken-UI/archive/refs/heads/main.zip)  
+[![img](https://github.com/Lailloken/Lailloken-UI/blob/main/img/readme/help.png)](https://github.com/Lailloken/Lailloken-UI/wiki/Known-Issues-&-Limitations) [![img](https://github.com/Lailloken/Lailloken-UI/blob/main/img/readme/releases.png)](https://github.com/Lailloken/Lailloken-UI/releases) [![img](https://github.com/Lailloken/Lailloken-UI/blob/main/img/readme/changelog.png)](https://github.com/Lailloken/Lailloken-UI/blob/main/data/changelog.json)
 <br>
 <br>
 

diff --git a/data/changelog.json b/data/changelog.json
@@ -1,4 +1,11 @@
 [
+  [
+	["1.50.9", 15009],
+	"v1.50 now out of beta",
+	"item-info: rune dagger fix",
+	"leveling tracker: timer ui fix",
+	"map-info: large font-size fix"
+  ],
   [
 	["1.50.8", 15008],
 	"mapping tracker: sanctum support",

diff --git a/data/versions.json b/data/versions.json
@@ -1,6 +1,6 @@
 {
   "_release": [
-    15008,
-	"https://github.com/Lailloken/Lailloken-UI/archive/refs/heads/beta.zip"
+	15009,
+	"https://github.com/Lailloken/Lailloken-UI/archive/refs/heads/main.zip"
   ]
 }
diff --git a/modules/item-checker.ahk b/modules/item-checker.ahk
@@ -306,7 +306,7 @@ Iteminfo2_stats()
 			item.ilvl_max := class_val.HasKey("_ilvl_max") ? class_val["_ilvl_max"] : item.ilvl_max ;get class-specific max ilvl, e.g. gloves = 85
 			For subtype, subtype_val in class_val ;parse through the sub-types within the class, e.g. armour/evasion
 			{
-				If subtype_val.HasKey(item.itembase) || InStr(item.class, subtype) && (item.class != "body armours") && (item.class != "jewels") && (item.class != "warstaves") || InStr(clip, "Added Small Passive Skills grant:") && (subtype = "cluster")
+				If subtype_val.HasKey(item.itembase) || InStr(item.class, subtype) && (item.class != "body armours") && (item.class != "jewels") && (item.class != "warstaves") && item.class != "rune daggers" || InStr(clip, "Added Small Passive Skills grant:") && (subtype = "cluster")
 				{
 					item.ilvl_max := subtype_val.HasKey("_ilvl_max") ? subtype_val["_ilvl_max"] : item.ilvl_max ;get sub-type-specific max ilvl, e.g. cluster jewels = 84
 					If (item.type = "defense") ;get defense-stats (min/max values, combined, block)

diff --git a/modules/leveling tracker.ahk b/modules/leveling tracker.ahk
@@ -466,7 +466,9 @@ LeveltrackerImport()
 	KeyWait, LButton
 	If (SubStr(Clipboard, 1, 2) != "[{") || !InStr(Clipboard, """enter""")
 	{
-		LLK_ToolTip("invalid import data",,,,, "red")
+		If (SubStr(Clipboard, 1, 2) = "[{") && !InStr(Clipboard, """enter""")
+			LLK_ToolTip("""gems only"" exports`nnot supported", 2,,,, "red")
+		Else LLK_ToolTip("invalid import data",,,,, "red")
 		Return
 	}
 
@@ -595,7 +597,7 @@ LeveltrackerImport()
 							Case "quest_text":
 								ss_text .= " (quest:" StrReplace(ss_parts.value, " ", "_") ") "
 							Case "generic":
-								ss_text .= """" ss_parts.value """"
+								ss_text .= """" ss_parts.value """ "
 							Default:
 								If settings.general.dev
 									MsgBox, % "unknown type: " ss_parts.type
@@ -1626,10 +1628,14 @@ LeveltrackerTimerGUI()
 	Gui, %leveltracker_timer%: Add, Text, % "ys Border Center 0x200 x+-1 HWNDhwnd hp w"vars.leveltracker.custom_fontwidth*7, % "act "(timer.current_act = 11 ? 10 : timer.current_act)
 	vars.hwnd.leveltracker_timer.pause	:= hwnd
 
-	Gui, %leveltracker_timer%: Show, % "NA x10000 y10000"
-	WinGetPos,,, w, h, ahk_id %leveltracker_timer%
-	Gui, %leveltracker_timer%: Show, % "NA x"vars.client.xc - w/2 " y"vars.client.y + vars.client.h - vars.leveltracker.h2
-	LLK_Overlay(vars.hwnd.leveltracker_timer.main, "show")
+	ControlGetPos, xControl,,,,, % ahk_id %hwnd%
+	If !Blank(xControl)
+	{
+		Gui, %leveltracker_timer%: Show, % "NA x10000 y10000"
+		WinGetPos,,, w, h, ahk_id %leveltracker_timer%
+		Gui, %leveltracker_timer%: Show, % "NA x"vars.client.xc - w/2 " y"vars.client.y + vars.client.h - vars.leveltracker.h2
+		LLK_Overlay(vars.hwnd.leveltracker_timer.main, "show")
+	}
 	LLK_Overlay(hwnd_old, "destroy")
 }
 

diff --git a/modules/map-info.ahk b/modules/map-info.ahk
@@ -156,8 +156,10 @@ MapinfoGUI(mode := 1)
 		Gui, %mapinfo%: Show, NA x10000 y10000
 		WinGetPos,,, w, h, % "ahk_id "vars.hwnd.mapinfo.main
 		MouseGetPos, xPos, yPos
-		x := (mode = 2) ? vars.client.x + vars.client.w - w : (xPos - w/2 < vars.client.x) ? vars.client.x : (xPos + w/2 > vars.client.x + vars.client.w) ? vars.client.x + vars.client.w - w : xPos - w/2
-		y := (mode = 2) ? vars.client.yc - h/2 : (yPos - (h + settings.mapinfo.fHeight * 2) < vars.client.y) ? yPos + h*0.1 : yPos - (h + settings.mapinfo.fHeight * 2)
+		y := (mode = 2) ? vars.client.yc - h/2 : (yPos - (h + vars.client.h/25) < vars.client.y) ? yPos + vars.client.h/25 : yPos - (h + vars.client.h/25), oob := (y + h > vars.client.y + vars.client.h) ? 1 : 0
+		If oob
+			x := (xPos - vars.client.h/25 - w < vars.client.x) ? xPos + vars.client.h/25 : xPos - vars.client.h/25 - w, y := (yPos + h/2 > vars.client.y + vars.client.h) ? vars.client.y + vars.client.h - h : (yPos - h/2 < vars.client.y) ? vars.client.y : yPos - h/2
+		Else x := (mode = 2) ? vars.client.x + vars.client.w - w : (xPos - w/2 < vars.client.x) ? vars.client.x : (xPos + w/2 > vars.client.x + vars.client.w) ? vars.client.x + vars.client.w - w : xPos - w/2
 	}
 	Gui, %mapinfo%: Show, % (mode ? "NA " : "") "x"x " y"y
 	WinGetPos,,, w, h, % "ahk_id "vars.hwnd.mapinfo.main

diff --git a/modules/qol tools.ahk b/modules/qol tools.ahk
@@ -317,7 +317,7 @@ Lab(mode := "", override := 0)
 		WinWaitActive, ahk_group poe_window
 		If !step
 		{
-			LLK_ToolTip("lab-import aborted", 1.5, vars.client.xc, vars.client.yc,, "red"), Gdip_DisposeImage(pBitmap)
+			LLK_ToolTip("lab-import aborted", 1.5, vars.client.xc, vars.client.yc,, "red", settings.general.fSize + 4,,, 1), Gdip_DisposeImage(pBitmap)
 			Return
 		}
 		pBitmap_copy := Gdip_CloneBitmapArea(pBitmap, 257, 42, 1175, 556,, 1), Gdip_DisposeImage(pBitmap)