Merge pull request #59 from Lailloken/dev

v1.24.5-hotfix2 merge

Lailloken UI.ahk

@@ -370,12 +370,6 @@ Return
 LLK_HotstringClip(A_ThisHotkey, 1)
 Return
 
-Enter::
-If LLK_ImageSearch("bestiary")
-	LLK_HotstringClip("best")
-Else SendInput, {Enter}
-Return
-
 Tab::
 If (lab_mode = 1)
 {
@@ -878,25 +872,40 @@ Loop, Parse, betrayal_divisions, `,, `,
 Return
 
 Bestiary_search:
-If (hotstringboard = "")
+If (A_Gui = "")
 {
-	SoundBeep
+	Gui, bestiary_menu: New, -Caption +LastFound +AlwaysOnTop +ToolWindow +Border HWNDhwnd_bestiary_menu
+	Gui, bestiary_menu: Margin, 4, 2
+	Gui, bestiary_menu: Color, Black
+	WinSet, Transparent, %trans%
+	Gui, bestiary_menu: Font, s%fSize0% cWhite, Fontin SmallCaps
+	Gui, bestiary_menu: Add, Text, Section gBestiary_search BackgroundTrans Center, bleed
+	Gui, bestiary_menu: Add, Text, xs y+0 gBestiary_search BackgroundTrans Center, curse
+	Gui, bestiary_menu: Add, Text, xs y+0 gBestiary_search BackgroundTrans Center, freeze
+	Gui, bestiary_menu: Add, Text, xs y+0 gBestiary_search BackgroundTrans Center, ignite
+	Gui, bestiary_menu: Add, Text, xs y+0 gBestiary_search BackgroundTrans Center, poison
+	Gui, bestiary_menu: Add, Text, xs y+0 gBestiary_search BackgroundTrans Center, shock
+	MouseGetPos, mouseXpos, mouseYpos
+	Gui, bestiary_menu: Show, x%mouseXpos% y%mouseYpos%
 	Return
 }
-If InStr(hotstringboard, "curse")
+If (A_GuiControl = "curse")
 	clipboard := "warding"
-Else If InStr(hotstringboard, "bleed")
+Else If (A_GuiControl = "bleed")
 	clipboard := "sealing|lizard"
-Else If InStr(hotstringboard, "shock")
+Else If (A_GuiControl = "shock")
 	clipboard := "earthing|conger"
-Else If InStr(hotstringboard, "freeze") || InStr(Clipboard, "chill")
+Else If (A_GuiControl = "freeze")
 	clipboard := "convection|deer"
-Else If InStr(hotstringboard, "ignite")
+Else If (A_GuiControl = "ignite")
 	clipboard := "damping|urchin"
-Else If InStr(hotstringboard, "poison")
+Else If (A_GuiControl = "poison")
 	clipboard := "antitoxin|skunk"
 Else clipboard := ""
-SendInput, ^{v}
+WinActivate, ahk_group poe_window
+WinWaitActive, ahk_group poe_window
+SendInput, ^{a}^{v}
+Gui, bestiary_menu: Destroy
 Return
 
 Betrayal_search:
@@ -1623,11 +1632,14 @@ If !WinActive("ahk_group poe_window") && !WinActive("ahk_class AutoHotkeyGUI")
 	If (inactive_counter = 3)
 	{
 		Gui, context_menu: Destroy
+		Gui, bestiary_menu: Destroy
 		LLK_Overlay("hide")
 	}
 }
 If WinActive("ahk_group poe_window") || WinActive("ahk_class AutoHotkeyGUI")
 {
+	If !WinActive("ahk_class AutoHotkeyGUI") && WinExist("ahk_id " hwnd_bestiary_menu)
+		Gui, bestiary_menu: Destroy
 	If (inactive_counter != 0)
 	{
 		inactive_counter := 0
@@ -2313,6 +2325,8 @@ Else
 		GoSub, Betrayal_search
 	If LLK_ImageSearch("gwennen")
 		GoSub, Gwennen_search
+	If LLK_ImageSearch("bestiary")
+		GoSub, Bestiary_search
 }
 Return
 
@@ -3446,4 +3460,4 @@ LLK_ToolTip(message, duration := 1, x := "", y := "")
 	SetTimer, ToolTip_clear, % 1000 * duration
 }
 
-#include External Functions.ahk
+#include External Functions.ahk