Give john pillar killer a combo.

Jiskster · Sep 10, 2024 · 6273698 · 6273698 · luigi-budd · Sep 10, 2024
1 parent 0f637b1
commit 6273698
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/Lua/HUD/hud_combo.lua b/src/Lua/HUD/hud_combo.lua
@@ -48,7 +48,7 @@ local combo_hud = function(v, player)
 	local tween_popout_div = FU - FixedDiv(player.ptsr.combo_outro_tics*FU, tween_popout_time*FU) -- up to down value
 	local ese_popout = combo_outro_tics and ease.linear(tween_popout_div, 0, -500*FU) or 0
 
-	local ese = ease.outexpo(FU - FixedDiv(combo_tween_time*FU, PTSR.combotween*FU), combo_timeleft_prev, combo_timeleft)
+	local ese = ease.outexpo(FU - FixedDiv(combo_tween_time*FU, PTSR.combotween*FU), combo_timeleft_prev or combo_timeleft, combo_timeleft)
 	local meat = combo_tween_time and ese or combo_timeleft
 	-- (tl/maxtime)*indic_max
 	local indic_newx = FixedMul(FixedDiv(meat*FU, combo_maxtime*FU), indic_max)

diff --git a/src/Lua/PlayerScripts/pmo_pizzatimetrigger.lua b/src/Lua/PlayerScripts/pmo_pizzatimetrigger.lua
@@ -128,6 +128,11 @@ PTSR.PizzaTimeTrigger = function(mobj)
 
 			PTSR:AddComboTime(player, player.ptsr.combo_maxtime) -- give everyone combo time cause IM NICE!
 
+			-- if pizza time triggerer
+			if pmo == mobj then
+				PTSR:AddCombo(player, 1)
+			end
+
 			local angle_frompotal = mapheaderinfo[gamemap].ptsr_lapangle 
 			if angle_frompotal and tonumber(angle_frompotal) then
 				pmo.angle = FixedAngle(tonumber(angle_frompotal)*FRACUNIT)