-- Spin
addHook("PlayerThink", function(player)
    if (player.pflags & PF_SPINNING)
	and not (player.mo and player.mo.skin == "mario")
	and not (player.mo and player.mo.skin == "trip")
	and not (player.pflags & PF_JUMPED)
	and not P_IsObjectOnGround(player.mo)
	and not (player.mo.eflags & (MFE_TOUCHWATER))
        player.pflags = $|PF_JUMPED|PF_THOKKED&~PF_SPINNING
		player.powers[pw_strong] = STR_ANIM
	end
--water skipping activation	
	if (player.mo.eflags & (MFE_TOUCHWATER))
    and not (player.mo and player.mo.skin == "trip")	
	and not P_IsObjectOnGround(player.mo)
	and (player.pflags & PF_JUMPED)
    and (player.pflags & PF_THOKKED)	
	and (player.powers[pw_strong] == STR_ANIM)	
        player.pflags = $|PF_SPINNING&~PF_JUMPED
		player.pflags = $ & ~PF_THOKKED
	end
-- Jump	
	if not P_IsObjectOnGround(player.mo)
    and (player.pflags & PF_SPINNING)
	and (player.pflags & PF_JUMPED)
		player.pflags = $ & ~PF_SPINNING
	end
end)


 --Trip Fix
addHook("PlayerThink", function(player)
    if (player.mo and player.mo.skin == "trip")
    and (player.pflags & PF_SPINNING)
	and (player.powers[pw_super])
	and not (player.mo.state == S_PLAY_SUPER_TRANS1)	
	and not (player.pflags & PF_JUMPED)
	and not P_IsObjectOnGround(player.mo)
	and not (player.mo.eflags & (MFE_TOUCHWATER))
        player.pflags = $|PF_JUMPED|PF_THOKKED&~PF_SPINNING
	end
--water skipping activation	
	if (player.mo.eflags & (MFE_TOUCHWATER))
    and (player.mo and player.mo.skin == "trip")
	and (player.powers[pw_super])
	and not (player.mo.state == S_PLAY_SUPER_TRANS1)	
	and not P_IsObjectOnGround(player.mo)
	and not (player.mo.state == S_PLAY_TRSPIKE)
	and not (player.mo.state == S_PLAY_JUMP)
	and (player.pflags & PF_JUMPED)		
        player.pflags = $|PF_SPINNING&~PF_JUMPED
		player.pflags = $ & ~PF_THOKKED
	end
end)