v1.56.2 BETA merge

- mainly PoE 2 changes - item-info: now poe2 compatible (but limited) - map-tracker: now poe2 compatible - omni-key context menu: added poe2db links
Lailloken · Dec 17, 2024 · 6875bd2 · 6875bd2
2 parents a81b03a + a0cd212
commit 6875bd2
Show file tree

Hide file tree

Showing 14 changed files with 461 additions and 211 deletions.
diff --git a/Lailloken UI.ahk b/Lailloken UI.ahk
@@ -168,7 +168,7 @@ Exit()
 	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 !vars.poe_version && vars.maptracker.map.date_time
+	If vars.maptracker.map.date_time
 		Maptracker_Save()
 }
 
@@ -472,6 +472,10 @@ Init_vars()
 	vars.client := {}
 	vars.GUI := []
 	vars.omnikey := {}
+	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
+	, "Bows": 1, "Staves": 1, "Two Hand Swords": 1, "Two Hand Axes": 1, "Two Hand Maces": 1, "Quarterstaves": 1, "Crossbows": 1, "Traps": 1
+	, "Amulets": 1, "Rings": 1, "Belts": 1, "Gloves": 2, "Boots": 2, "Body Armours": 2, "Helmets": 2
+	, "Quivers": 1, "Foci": 1, "Shields": 2, "Jewels": 1, "Life Flasks": 1, "Mana Flasks": 1, "Charms": 1}
 	vars.leveltracker := {}
 	vars.lang := {}, vars.lang2 := {}
 	vars.log := {} ;store data related to the game's log here
@@ -1046,7 +1050,7 @@ Loop_main()
 		location := vars.log.areaID ;short-cut variable
 		If (vars.cloneframes.enabled
 		&& ((settings.cloneframes.pixelchecks && Screenchecks_PixelSearch("gamescreen")) || !settings.cloneframes.pixelchecks)) ;user is on gamescreen, or auto-toggle is disabled
-		&& (!settings.cloneframes.hide || (settings.cloneframes.hide && !InStr(location, "hideout") && !InStr(location, "_town") && !InStr(location, "heisthub") && (location != "login"))) ;outside hideout/town/login, or auto-toggle is disabled
+		&& (!settings.cloneframes.hide || (settings.cloneframes.hide && !LLK_StringCompare(location, ["hideout"]) && !InStr(location, "_town") && !InStr(location, "heisthub") && (location != "login"))) ;outside hideout/town/login, or auto-toggle is disabled
 		&& !vars.sanctum.active
 		|| (vars.settings.active = "clone-frames") ;accessing the clone-frames section of the settings
 			Cloneframes_Show()

diff --git a/README.md b/README.md
@@ -1,14 +1,14 @@
 ## About:
-A light-weight AHK script with UI and QoL features for Path of Exile, emphasizing ease-of-use, minimalist design, low hotkey requirements, and seamless integration into the game-client. **`This project is not affiliated with or endorsed by Grinding Gear Games (GGG) in any way`**.  
+A light-weight AHK script with UI and QoL features for Path of Exile 1 and 2, emphasizing ease-of-use, minimalist design, low hotkey requirements, and seamless integration into the game-client. **`This project is not affiliated with or endorsed by Grinding Gear Games (GGG) in any way`**.  
 <br>
 
 ## Download & Setup
 | [![img](https://raw.githubusercontent.com/Lailloken/Lailloken-UI/main/img/readme/_autohotkey.png)](https://www.autohotkey.com/) | [![img](https://raw.githubusercontent.com/Lailloken/Lailloken-UI/main/img/readme/_guide.png)](https://github.com/Lailloken/Lailloken-UI/wiki) | [![img](https://raw.githubusercontent.com/Lailloken/Lailloken-UI/main/img/readme/_download.png)](https://github.com/Lailloken/Lailloken-UI/archive/refs/heads/main.zip) | [![img](https://raw.githubusercontent.com/Lailloken/Lailloken-UI/main/img/readme/_releases.png)](https://github.com/Lailloken/Lailloken-UI/releases) |
 |---|---|---|---|
 
 ## Contributions
-| [![image](https://raw.githubusercontent.com/Lailloken/Lailloken-UI/main/img/readme/_translations.png)](https://github.com/Lailloken/Lailloken-UI/discussions/326) | [![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) |
+|---|---|
 <br>
 
 ## Context: What is this project?
@@ -56,12 +56,14 @@ A light-weight AHK script with UI and QoL features for Path of Exile, emphasizin
 <br>
 
 ### [Clone-frames](https://github.com/Lailloken/Lailloken-UI/wiki/Clone-frames): pseudo interface-customization, functionally similar to 'Weakauras'  
+**`Path of Exile 2 compatible`**  
 | example: rage meter | example: cooldowns / charges | example: flask status |
 |---|---|---|
 | ![img](https://raw.githubusercontent.com/Lailloken/Lailloken-UI/main/img/readme/cloneframes_001.jpg) | ![img](https://raw.githubusercontent.com/Lailloken/Lailloken-UI/main/img/readme/cloneframes_002.jpg) | ![img](https://raw.githubusercontent.com/Lailloken/Lailloken-UI/main/img/readme/cloneframes_003.jpg) |
 <br>
 
-### [Item-info](https://github.com/Lailloken/Lailloken-UI/wiki/Item-info): compact & customizable tooltip to determine loot quality at a glance
+### [Item-info](https://github.com/Lailloken/Lailloken-UI/wiki/Item-info): compact & customizable tooltip to determine loot quality at a glance  
+**`Path of Exile 2 compatible (but limited by the game's clipboard-copy)`**  
 | example: rare | example: unique| example: anointed |
 |---|---|---|
 | ![img](https://raw.githubusercontent.com/Lailloken/Lailloken-UI/main/img/readme/iteminfo_001.png) | ![img](https://raw.githubusercontent.com/Lailloken/Lailloken-UI/main/img/readme/iteminfo_002.png) | ![img](https://raw.githubusercontent.com/Lailloken/Lailloken-UI/main/img/readme/iteminfo_003.png) |
@@ -92,23 +94,27 @@ A light-weight AHK script with UI and QoL features for Path of Exile, emphasizin
 <br>
 
 ### [Context-menu](https://github.com/Lailloken/Lailloken-UI/wiki/Minor-Features) for items: single-hotkey access to features and popular 3rd-party websites  
+**`Path of Exile 2 compatible`**  
 | ![img](https://raw.githubusercontent.com/Lailloken/Lailloken-UI/main/img/readme/contextmenu_001.jpg) | ![img](https://raw.githubusercontent.com/Lailloken/Lailloken-UI/main/img/readme/contextmenu_002.jpg) | ![img](https://raw.githubusercontent.com/Lailloken/Lailloken-UI/main/img/readme/contextmenu_003.jpg) |
 |---|---|---|
 <br>
 
 ### \*[Map-Tracker](https://github.com/Lailloken/Lailloken-UI/wiki/Map%E2%80%90Tracker): collect, save, view, and export mapping-related data for statistical analysis
+**`Path of Exile 2 compatible`**  
 | in-game log viewer |
 |---|
 | ![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) |
 <br>
 
 ### Overhauled [map-info panel](https://github.com/Lailloken/Lailloken-UI/wiki/Map-info-panel): streamlined & customizable map-mod tooltip and panel
+**`Path of Exile 2 compatible`**  
 | tooltip for rolling maps | re-check mods on demand in maps | search/pin mods for quick access when switching builds |
 |---|---|---|
 | ![image](https://raw.githubusercontent.com/Lailloken/Lailloken-UI/main/img/readme/mapinfo_001.png) | ![image](https://raw.githubusercontent.com/Lailloken/Lailloken-UI/main/img/readme/mapinfo_002.png) | ![image](https://raw.githubusercontent.com/Lailloken/Lailloken-UI/main/img/readme/mapinfo_003.png) |
 <br>
 
 ### [Search-strings](https://github.com/Lailloken/Lailloken-UI/wiki/Search-strings): customizable, single-hotkey menu for every individual in-game search  
+**`Path of Exile 2 compatible`**  
 | built-in: beast-crafting | example: Gwennen | example: vendor |
 |---|---|---|
 | ![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) |
@@ -118,10 +124,12 @@ A light-weight AHK script with UI and QoL features for Path of Exile, emphasizin
 | essence tooltip to check the next tier's stats | orb of horizons tooltips | countdown & stopwatch |
 |---|---|---|
 | ![image](https://raw.githubusercontent.com/Lailloken/Lailloken-UI/main/img/readme/qol_001.png) | ![image](https://raw.githubusercontent.com/Lailloken/Lailloken-UI/main/img/readme/qol_002.png) | ![image](https://raw.githubusercontent.com/Lailloken/Lailloken-UI/main/img/readme/qol_003.png) |
+||| **Path of Exile 2 compatible** |
 
 | in-client notepad & sticky-notes | quick-access overlay and tracker for casual lab-runs |
 |---|---|
 | ![image](https://raw.githubusercontent.com/Lailloken/Lailloken-UI/main/img/readme/qol_004.png) | ![image](https://raw.githubusercontent.com/Lailloken/Lailloken-UI/main/img/readme/qol_005.jpg) |
+| **Path of Exile 2 compatible** ||
 <br>
 
 ### [Seed-explorer](https://github.com/Lailloken/Lailloken-UI/wiki/Seed-explorer): in-client UI to quickly test a legion jewel in every socket
@@ -131,6 +139,7 @@ A light-weight AHK script with UI and QoL features for Path of Exile, emphasizin
 <br>
 
 ### [Cheat-sheet Overlay Toolkit](https://github.com/Lailloken/Lailloken-UI/wiki/Cheat-sheet-Overlay-Toolkit): create customizable, context-sensitive overlays
+**`Path of Exile 2 compatible`**  
 | image overlay | app "overlay" | custom/advanced overlay |
 |---|---|---|
 | ![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) |
@@ -158,6 +167,8 @@ A light-weight AHK script with UI and QoL features for Path of Exile, emphasizin
 ### Acknowledgements
 - `item-info` uses a custom version of [Path of Building's](https://github.com/PathOfBuildingCommunity/PathOfBuilding) datamined resources
 
+- several features use data provided by poedb
+
 - `leveling tracker` uses leveling guides generated via [exile-leveling](https://github.com/HeartofPhos/exile-leveling) and was implemented with the help of its maintainer
 
 - `stash-ninja` uses price-data provided by [poe.ninja](https://poe.ninja/), and bulk-exchange support was implemented with [BocikPG](https://github.com/BocikPG)'s help

diff --git a/data/changelog.json b/data/changelog.json
@@ -1,4 +1,11 @@
 [
+  [
+	["1.56.2", 15602],
+	"still beta, mainly poe2 changes",
+	"item-info: now poe2 compatible (but limited)",
+	"map-tracker: now poe2 compatible",
+	"omni-key context menu: added poe2db links"
+  ],
   [
 	["1.56.1", 15601],
 	"still beta, mainly poe2 changes",

diff --git a/data/english/client.txt b/data/english/client.txt
@@ -190,6 +190,11 @@
 		log_expedition			=	"Rog:"				;## for some reason, Rog is always displayed as simply "Rog", regardless of when he speaks (at least in English)
 		log_expedition			=	"Tujen, the Haggler:"
 
+		log_expedition 2		=	"Dannig:"			;## PoE2 only displays the names
+		log_expedition 2		=	"Gwennen:"
+		log_expedition 2		=	"Rog:"
+		log_expedition 2		=	"Tujen:"
+
 
 
 ;#####################################################

diff --git a/data/english/help tooltips.json b/data/english/help tooltips.json
@@ -50,7 +50,7 @@
     ],
     "ascendancy": [
       "the game only logs ascendancies when a character levels up",
-      "this label will be out of sync if you have recently (re)specced but not leveled up yet"
+      "this label will be out of sync if you have recently (re)specced but not leveled up yet: in that case, click the refresh button on the left"
     ],
     "active build": [
       "optional: type in a name/description of your build and press <enter>",
@@ -247,6 +247,14 @@
       "adds the ilvl requirement to each mod, which exposes high-tier but low-lvl mods",
       "this option caters more to advanced users because it adds even more information"
     ],
+    "iteminfo marking global": [
+      "colors used to highlight globally (un)desired mods",
+      "click a box to open the color-palette, right click to reset"
+    ],
+    "iteminfo marking class": [
+      "colors used to highlight class-specificly (un)desired mods",
+      "click a box to open the color-palette, right click to reset"
+    ],
     "iteminfo item-tier": [
       "click a box to open the color-palette, right click to reset",
       "<fr> refers to fractured, <#> to untiered mods",
@@ -256,7 +264,8 @@
       "click a box to open the color-palette, right click to reset"
     ],
     "iteminfo override": [
-      "undesired mods will always be highlighted like t6 ones, except fractured ones"
+      "tiers/ilvl on undesired mods (except fractured) will be highlighted by the <undesired> color instead of the usual color",
+      "this will also hide icons on undesired mods to improve visual clarity"
     ],
     "iteminfo rules": [
       "single-click solution to mark larger mod groups as (un)desired",
@@ -995,6 +1004,9 @@
       "supported inputs:\n\"xyz\" (search), \"!abc\" (exclude), \"xyz !abc\" (search xyz, exclude abc), \"abc, xyz, ...\" (search abc, and xyz, ...)",
       "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\")"
     ],
+    "logviewer search mapinfo 2": [
+      "supported inputs:\n\"xyz\" (search), \"!abc\" (exclude), \"xyz !abc\" (search xyz, exclude abc), \"abc, xyz, ...\" (search abc, and xyz, ...)"
+    ],
     "logviewer header mapinfo": [
       "mods rolled on a map (optional, has to be enabled first):\nclick highlighted cells in this column to view a list of logged mods",
       "header is clickable for searching:\nclick to paste \"yes\" into the search, r-click to paste \"no\", double-(r-)click to search immediately"
@@ -1017,6 +1029,9 @@
       "supported inputs:\n\"xyz\" (search), \"!abc\" (exclude), \"xyz !abc\" (search xyz, exclude abc), \"abc, xyz, ...\" (search abc, and xyz, ...)",
       "available short-hand inputs: \"elder\" for elder guardians, \"sirus\" for conquerors"
     ],
+    "logviewer search content 2": [
+      "supported inputs:\n\"xyz\" (search), \"!abc\" (exclude), \"xyz !abc\" (search xyz, exclude abc), \"abc, xyz, ...\" (search abc, and xyz, ...)"
+    ],
     "logviewer header content": [
       "side-content you encountered in a map (optional, has to be enabled first)",
       "header & icons are clickable for searching:\nclick to paste \"<content>\" into the search, r-click to paste \"!<content>\", double-(r-)click to search immediately"

diff --git a/data/versions.json b/data/versions.json
@@ -1,3 +1,3 @@
 {
-  "_release": [15601, "https://github.com/Lailloken/Lailloken-UI/archive/refs/heads/main.zip"]
+  "_release": [15602, "https://github.com/Lailloken/Lailloken-UI/archive/refs/heads/main.zip"]
 }