Pause combo timer and fill time on treasure

Jiskster · Sep 5, 2024 · 17cfc66 · 17cfc66
1 parent 66d0dc7
commit 17cfc66
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/Lua/Gimmicks/treasures.lua b/src/Lua/Gimmicks/treasures.lua
@@ -80,6 +80,7 @@ addHook("MobjThinker", function(mo)
 			P_AddPlayerScore(mo.player_got, TREASURE_SCORE_AWARD)
 			PTSR.add_wts_score(mo.player_got, mo, TREASURE_SCORE_AWARD, 15, SKINCOLOR_YELLOW)
 			S_FadeMusic(100, 500, mo.player_got)
+			PTSR:FillCombo(mo.player_got)
 
 			if mo.player_got.mo then
 				mo.player_got.mo.state = S_PLAY_FALL

diff --git a/src/Lua/PlayerScripts/player_combohandle.lua b/src/Lua/PlayerScripts/player_combohandle.lua
@@ -83,7 +83,7 @@ end
 
 function PTSR.CanComboTimeDecrease(player)
 	if player.mo and player.mo.valid then
-		return not (player.mo.pizza_in or player.mo.pizza_out)
+		return not (player.mo.pizza_in or player.mo.pizza_out or player.ptsr.treasure_got)
 	end
 
 	return false