small qol changes

running out of hands no longer triggers end of round

hold keybind during scoring to mimic vanilla behaviour

Author: Toneblock

README.md

@@ -1,7 +1,9 @@
 # NotJustYet
 (Steamodded 1.0) Prevents scoring from ending the round early
 
-Default keybind is 'LShift'. In case you want to change it, open the internal main.lua. 
+Default keybind is 'LShift'. This is customizable via the main.lua, although I'm not exactly sure what keys work
+
+Holding the keybind during the end of a scoring hand will mimic vanilla behavior, useful in cases where you do not want to draw extra cards
 
 # Installation
 
@@ -11,4 +13,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/tag/v0.3.0)), extract the .zip, and place it into your Mods folder
+Download the newest release ([linked here](https://github.com/Toneblock/balatro-NotJustYet/releases/tag/v0.4.0)), extract the .zip, and place it into your Mods folder

lovely/njy_lovely.toml

@@ -10,7 +10,10 @@ target = "game.lua"
 pattern = "if G.GAME.chips - G.GAME.blind.chips >= 0 or G.GAME.current_round.hands_left < 1 then"
 position = "at"
 payload = '''
-if G.GAME.current_round.hands_left < 1 then
+if not to_big then
+	function to_big(x) return x end
+end
+if (G.GAME.current_round.hands_left < 1 and to_big(self.GAME.chips) < to_big(self.GAME.blind.chips)) or (GLOBAL_njy_vanilla_override and to_big(self.GAME.chips) >= to_big(self.GAME.blind.chips)) then
 '''
 match_indent = true
 
@@ -21,7 +24,10 @@ target = "game.lua"
 pattern = "if Big:new(G.GAME.chips) >= Big:new(G.GAME.blind.chips) or G.GAME.current_round.hands_left < 1 then"
 position = "at"
 payload = '''
-if G.GAME.current_round.hands_left < 1 then
+if not to_big then
+	function to_big(x) return x end
+end
+if (G.GAME.current_round.hands_left < 1 and to_big(self.GAME.chips) < to_big(self.GAME.blind.chips)) or (GLOBAL_njy_vanilla_override and to_big(self.GAME.chips) >= to_big(self.GAME.blind.chips)) then
 '''
 match_indent = true
 
@@ -32,7 +38,10 @@ target = "game.lua"
 pattern = "if to_big(G.GAME.chips) >= to_big(G.GAME.blind.chips) or G.GAME.current_round.hands_left <= 0 then"
 position = "at"
 payload = '''
-if G.GAME.current_round.hands_left <= 0 then
+if not to_big then
+	function to_big(x) return x end
+end
+if (G.GAME.current_round.hands_left < 1 and to_big(self.GAME.chips) < to_big(self.GAME.blind.chips)) or (GLOBAL_njy_vanilla_override and to_big(self.GAME.chips) >= to_big(self.GAME.blind.chips)) then
 '''
 match_indent = true
 
@@ -132,6 +141,7 @@ pattern = "if key == 'v' then"
 position = "before"
 payload = '''
 if key == G.njy_keybind then
+	GLOBAL_njy_vanilla_override = true
 	if G.STATE_COMPLETE == true and G.buttons and G.buttons.states and G.buttons.states.visible and G.buttons.states.visible == true and G.GAME and G.GAME.chips and G.GAME.blind and G.GAME.blind.chips then
 		if not to_big then
 			function to_big(x) return x end
@@ -145,3 +155,17 @@ if key == G.njy_keybind then
 end
 '''
 match_indent = true
+
+# this is dumb and i should not be doing this
+[[patches]]
+[patches.pattern]
+target = "engine/controller.lua"
+pattern = '''if key == "a" and self.held_keys["g"] and not _RELEASE_MODE then'''
+position = "before"
+payload = '''
+if key == G.njy_keybind then
+	GLOBAL_njy_vanilla_override = nil
+end
+'''
+match_indent = true
+

main.lua

@@ -11,14 +11,17 @@
 ----------------------------------------------
 ------------MOD CODE -------------------------
 
--- The variable below defines the keybind used for ending the round. Feel free to change it to anything else, like 'w', or 'enter'
+-- The variable below defines the keybind used for ending the round. Feel free to change it to anything else, like 'w', or '9'
 
 G.njy_keybind = 'lshift'
 
 
 
 
 
+
+
+
 G.FUNCS.njy_can_endround = function(e)	-- wtf is this talisman check? [[Fixed it! -Math]]
 	if not to_big then
 		function to_big(x) return x end