Skip to content

Commit

Permalink
v1.56.1 BETA merge
Browse files Browse the repository at this point in the history
- added RGB sliders to color palette
- FilterSpoon: now PoE2 compatible, added style customization
- Map-Info: now PoE2 compatible
  • Loading branch information
Lailloken authored Dec 15, 2024
2 parents 4a61d9a + 5eff4c2 commit a81b03a
Show file tree
Hide file tree
Showing 16 changed files with 1,084 additions and 221 deletions.
40 changes: 39 additions & 1 deletion Lailloken UI.ahk
Original file line number Diff line number Diff line change
Expand Up @@ -574,6 +574,25 @@ LLK_ArraySort(array)
Return parse2
}

LLK_CloneObject(object)
{
local

For key, val in object
If !IsNumber(key)
is_array := 1

If is_array
new_object := []
Else new_object := {}

For key, val in object
If !IsObject(val)
new_object[key] := val
Else new_object[key] := LLK_CloneObject(val)
Return new_object
}

LLK_Error(ErrorMessage, restart := 0)
{
MsgBox, % ErrorMessage
Expand Down Expand Up @@ -641,6 +660,25 @@ LLK_HasKey(object, value, InStr := 0, case_sensitive := 0, all_results := 0, rec
Return
}

LLK_HasRegex(object, regex, all_results := 0, check_key := 0)
{
local

If !IsObject(object)
Return
parse := []
For key, val in object
If RegExMatch(!check_key ? val : key, regex)
{
If !all_results
Return key
Else parse.Push(key)
}

If all_results && parse.Count()
Return parse
}

LLK_HasVal(object, value, InStr := 0, case_sensitive := 0, all_results := 0, recurse := 0, check_decimals := 0) ; check_decimals is a band-aid fix for very specific use-cases where X and X.000[...] need to be distinguished
{
local
Expand Down Expand Up @@ -1126,7 +1164,7 @@ Startup()

GroupAdd, poe_window, ahk_class POEWindowClass
GroupAdd, poe_window, ahk_exe GeForceNOW.exe

GroupAdd, poe_ahk_window, ahk_class POEWindowClass
GroupAdd, poe_ahk_window, ahk_class AutoHotkeyGUI
GroupAdd, poe_ahk_window, ahk_exe GeForceNOW.exe
Expand Down
7 changes: 7 additions & 0 deletions data/changelog.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
[
[
["1.56.1", 15601],
"still beta, mainly poe2 changes",
"color palette is now more flexible (rgb sliders)",
"filterspoon: now poe2 compatible (still highly experimental)",
"map-info: now poe2 compatible"
],
[
["1.56.0", 15600],
"initial poe2 compatibility update: will be beta for the time being",
Expand Down
4 changes: 3 additions & 1 deletion data/english/UI.txt
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
global_enable = "enable"
global_reset = "reset"
global_color = "color"
global_color = "colors"
global_color = "colors:"
global_opacity = "opacity:"
global_tier = "tier"
global_ilvl = "ilvl"
Expand Down Expand Up @@ -357,6 +357,7 @@
lootfilter_unsaved = "long-press to discard"
lootfilter_update = "apply base filter updates"
lootfilter_addstack = "add stack:"
lootfilter_selection = "current selection:"



Expand Down Expand Up @@ -851,6 +852,7 @@
m_mapinfo_pinned = "pinned mods:"
m_mapinfo_modsearch = "mod search:"
m_mapinfo_roll_highlight = "highlight map rolls"
m_mapinfo_reset = "reset tiers"



Expand Down
2 changes: 0 additions & 2 deletions data/english/client.txt
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,6 @@





;#####################################################
;## character tracking
;#####################################################
Expand Down
18 changes: 17 additions & 1 deletion data/english/help tooltips.json
Original file line number Diff line number Diff line change
Expand Up @@ -490,9 +490,13 @@
],
"mapinfo mod settings": [
"below, you can customize the tiering of specific map mods",
"hover over mods and press number keys 1-4 to apply highlighting, or space to strike them out",
"hover over mods and press number keys 1-4 to apply highlighting, space to strike them out, or right-click to reset them to un-tiered (white)",
"use the mod search to find mods, click the – and + buttons to (un)pin mods for quick access"
],
"mapinfo reset tiers": [
"long-click to reset every map mod tier to default (white, not crossed out)",
"(/underline)note: this affects every single mod, not just the pinned ones below"
],
"alarm enable": [
"timer-widget with alarm/countdown and stopwatch functionality",
"hidden by default, hold <tab> to display it",
Expand Down Expand Up @@ -871,10 +875,22 @@
"long-click to create and apply the new file",
"(/underline)note: the /itemfilter in-game command will be used, so make sure the chat box is closed and accessible"
],
"backgroundcolor": [
"click to select the background color, right-click to reset to the previous color"
],
"bordercolor": [
"click to select the border color, right-click to reset to the previous color"
],
"textcolor": [
"click to select the text color, right-click to reset to the previous color"
],
"basefilter": [
"select the filter you want to use as the base",
"a separate file with your customizations will be created and then applied in game, leaving the base filter unchanged"
],
"gui color": [
"click to select the background color underneath item labels, or right-click to reset to default"
],
"hide": [
"hide the entire item-group in game"
],
Expand Down
Loading

0 comments on commit a81b03a

Please sign in to comment.