Revert "Mario kart 8 crown sounds"

This reverts commit bfeb794.
Jiskster · Dec 9, 2024 · d1f0f1e · d1f0f1e
1 parent b82e9ce
commit d1f0f1e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 12 deletions.
diff --git a/src/Lua/InbuiltModeScripts/juggernaut.lua b/src/Lua/InbuiltModeScripts/juggernaut.lua
@@ -93,7 +93,6 @@ PTSR_AddHook("onparry", function(pmo, victim)
 				PTSR.juggernaut_crownholder = nil
 
 				P_DoPlayerPain(victim.player)
-				S_StartSound(nil, sfx_ptsrc1, victim.player)
 
 				local output_text = victim.player.name.. " lost their crown!"
 				chatprint("\x82".. "*" .. output_text)
@@ -176,7 +175,6 @@ local function JN_FindAndMakeNewJuggernaut()
 	PTSR.juggernaut_crownholder = chosen_player.realmo
 
 	S_StartSound(nil, sfx_s24f)
-	S_StartSound(nil, sfx_ptsrc2, chosen_player)
 
 	newcrown.flags = $ | (MF_NOCLIP | MF_NOGRAVITY)
 
@@ -218,15 +216,15 @@ addHook("MobjThinker", function(mobj)
 
 	-- despawn timer
 	if mobj.crownorphan then
-		mobj.crownorphan = $ - 1
-
-		if not mobj.crownorphan and JG_GetPlayerCount() ~= 0 then
+		 mobj.crownorphan = $ - 1
+		 
+		 if not mobj.crownorphan and JG_GetPlayerCount() ~= 0 then
 			JN_FindAndMakeNewJuggernaut()
-			
+
 			mobj.invalidcrown = true
 			P_KillMobj(mobj)
 			return
-		end
+		 end
 	end
 
 	if mobj.equip_pmo and mobj.equip_pmo.valid then

diff --git a/src/Sounds/DSPTSRC1.wav b/src/Sounds/DSPTSRC1.wav
diff --git a/src/Sounds/DSPTSRC2.wav b/src/Sounds/DSPTSRC2.wav
diff --git a/src/init.lua b/src/init.lua
@@ -1,16 +1,12 @@
 freeslot("TOL_PTSR")
 freeslot("sfx_pizzah", "sfx_pizzao", "sfx_coneba", "sfx_pepdie", "sfx_lap2", "sfx_pzprry",
-		 "sfx_prepr1", "sfx_prepr2", "sfx_prepr3", "sfx_ptsrc1", "sfx_ptsrc2", "MT_PT_PARRY",
-		 "S_PT_PARRY", "SPR_PRRY")
+		 "sfx_prepr1", "sfx_prepr2", "sfx_prepr3", "MT_PT_PARRY", "S_PT_PARRY", "SPR_PRRY")
 freeslot("sfx_evlagh")
 
 for i = 0, 2
 	sfxinfo[sfx_prepr1 + i].caption = "Boink"
 end
 
-sfxinfo[sfx_ptsrc1].caption = "Crown get!"
-sfxinfo[sfx_ptsrc2].caption = "Crown lost!"
-
 sfxinfo[sfx_pizzah].caption = "Pizzaface laughs"
 sfxinfo[sfx_coneba].caption = "Coneball laughs"
 sfxinfo[sfx_pepdie].caption = "Death"