compat for handy compat

Author: Toneblock

README.md

@@ -7,6 +7,8 @@ This mod contains a slightly customisable **keybind** and **colour**. To change
 
 Holding the keybind while scoring a winning hand will mimic vanilla behaviour, useful in cases where you want to avoid drawing more cards
 
+When [Handy](https://github.com/SleepyG11/HandyBalatro) is installed, the keybind is hard-set to '**enter**'
+
 # Installation
 
 Install [Lovely](https://github.com/ethangreen-dev/lovely-injector)
@@ -15,4 +17,4 @@ Install [Lovely](https://github.com/ethangreen-dev/lovely-injector)
 Install [Steamodded](https://github.com/Steamopollys/Steamodded) (must be **1.0.0 or higher**)
 
 
-Download the newest release ([linked here](https://github.com/Toneblock/balatro-NotJustYet/releases/latest)), extract the .zip, and place it into your Mods folder
+Download the newest release ([linked here](https://github.com/Toneblock/balatro-NotJustYet/releases/latest)), extract the .zip, and place the folder within into your Mods folder

lovely.toml

@@ -59,18 +59,18 @@ if not true then
 '''
 match_indent = true
 
-# actions compat?
+# add button
 [[patches]]
 [patches.pattern]
 target = "functions/UI_definitions.lua"
 pattern = '''G.SETTINGS.play_button_pos == 1 and play_button or discard_button,'''
 position = "after"
 payload = '''
-GLOBAL_njy_action and {n=G.UIT.C, config={id = 'njy_end_button',align = "tm", padding = 0.3, r = 0.1, minw = 1.3, minh = button_height, hover = true, colour = G.C.GREEN, button = "njy_attempt_endround", one_press = true, shadow = true, func = 'njy_can_endround'}, nodes={
+{n=G.UIT.C, config={id = 'njy_end_button',align = "tm", padding = 0.3, r = 0.1, minw = 1.3, minh = button_height, hover = true, colour = G.C.GREEN, button = "njy_attempt_endround", one_press = true, shadow = true, func = 'njy_can_endround'}, nodes={
       {n=G.UIT.R, config={align = "cm", padding = 0}, nodes={
         {n=G.UIT.T, config={text = "End", scale = text_scale, colour = G.C.UI.TEXT_LIGHT, focus_args = {button = 'y', orientation = 'bm'}, func = 'set_button_pip'}}
       }}
-    }} or nil,
+    }},
 '''
 match_indent = true
 
@@ -81,7 +81,7 @@ target = "game.lua"
 pattern = '''config = {align="bm", offset = {x=0,y=0.3},major = G.hand, bond = 'Weak'}'''
 position = "at"
 payload = '''
-config = {align="bm", offset = {x=GLOBAL_njy_action and 0.65 or -0.65,y=0.3},major = G.hand, bond = 'Weak'}
+config = {align="bm", offset = {x=0.65,y=0.3},major = G.hand, bond = 'Weak'}
 '''
 match_indent = true
 
@@ -152,8 +152,8 @@ match_indent = true
 [[patches]]
 [patches.pattern]
 target = "engine/controller.lua"
-pattern = "if key == 'v' then"
-position = "before"
+pattern = "function Controller:key_press_update(key, dt)"
+position = "after"
 payload = '''
 if key == G.njy_keybind then
 	GLOBAL_njy_vanilla_override = true

main.lua

@@ -6,7 +6,7 @@
 --- MOD_DESCRIPTION: Prevents scoring from ending the round early
 --- BADGE_COLOUR: ffffff
 --- DEPENDENCIES: [Steamodded>=1.0.0~ALPHA-1103a]
---- VERSION: 0.5.0
+--- VERSION: 0.5.2
 --- PRIORITY: 1
 
 ----------------------------------------------
@@ -24,30 +24,6 @@ G.njy_colour = 'GREEN'
 
 
 
---[[
-
--- attempt at dynamic actions compat... it "works" but occasionally the button loses clickability so it's just permanently in different pos now
-
-if SMODS.Mods["ACT"] then GLOBAL_njy_action = true end
-
-local old_buttons = create_UIBox_buttons
-local end_button = {n=G.UIT.C, config={id = 'njy_end_button',align = "tm", padding = 0.3, r = 0.1, minw = 1.3, minh = 1.3, hover = true, colour = G.C.GREEN, button = "njy_attempt_endround", one_press = true, shadow = true, func = 'njy_can_endround'}, nodes={
-	{n=G.UIT.R, config={align = "cm", padding = 0}, nodes={
-		{n=G.UIT.T, config={text = "End", scale = 0.45, colour = G.C.UI.TEXT_LIGHT, focus_args = {button = 'y', orientation = 'bm'}, func = 'set_button_pip'}}
-	}}
-}}
-function create_UIBox_buttons()
-	local t = old_buttons()
-	if not GLOBAL_njy_action then
-		table.insert(t.nodes, 1, end_button) 
-	end
-	return t
-end
-
-]]
-
-GLOBAL_njy_action = true
-
 G.FUNCS.njy_can_endround = function(e)	-- wtf is this talisman check? [[Fixed it! -Math]] ty for fix
 	if not to_big then
 		function to_big(x) return x end
@@ -69,6 +45,8 @@ G.FUNCS.njy_attempt_endround = function(e)
 	end
 end
 
+G.FUNCS.njy_endround = true	-- apparently handy uses this for detection so... here's the "function" lmao, thankfully it's not used for anything else
+
 SMODS.Atlas({
     key = "modicon",
     path = "njy_icon.png",