make the banana throw speen be seperate from sloperoll toggle

were technically not rolling by slopes here
This commit is contained in:
Alug committed 2025-03-17 15:56:22 +01:00
1 parent 5ab7e8dd80
commit dd70743bae
3 files changed
+27 -23

No files matched your search

+18 -13
View File
@@ -3530,16 +3530,8 @@ static void K_QuiteSaltyHop(player_t *p)
}
}
// checks if slope rotation should be applied
boolean K_ShouldSlopeRoll(mobj_t *mobj)
boolean K_CheckSlopeRollDist(mobj_t *mobj)
{
if (!cv_sloperoll.value || (!mobj->player && cv_sloperoll.value != 2)) // not a player and sloperoll not set to "Everything"
return false;
// seeing a character rotate mid-hop looks really janky
if (mobj->player && mobj->player->mo->salty_jump)
return false;
const boolean usedistance = cv_sloperolldist.value && !splitscreen;
// always roll from any distance
@@ -3552,6 +3544,19 @@ boolean K_ShouldSlopeRoll(mobj_t *mobj)
return (m_dist <= rolldist);
}
// checks if slope rotation should be applied
boolean K_ShouldSlopeRoll(mobj_t *mobj)
{
if (!cv_sloperoll.value || (!mobj->player && cv_sloperoll.value != 2)) // not a player and sloperoll not set to "Everything"
return false;
// seeing a character rotate mid-hop looks really janky
if (mobj->player && mobj->player->mo->salty_jump)
return false;
return K_CheckSlopeRollDist(mobj);
}
#define SLOPEROLL_DIV 3
void K_RollMobjBySlopes(mobj_t* mo, pslope_t *slope)
{
@@ -3974,13 +3979,13 @@ static mobj_t *K_ThrowKartItem(player_t *player, boolean missile, mobjtype_t map
if (mo->eflags & MFE_UNDERWATER)
mo->momz = (117 * mo->momz) / 200;
if (cv_bananthrowroll.value && (mapthing == MT_BANANA) && K_ShouldSlopeRoll(mo))
if (cv_bananthrowroll.value && (mapthing == MT_BANANA))
{
//mo->angle = FixedAngle(M_RandomRange(-180, 180) << FRACBITS);
if (cv_bananthrowroll.value == 1)
mo->sloperoll = FixedAngle(M_RandomRange(-180, 180) << FRACBITS); // im lazy but this makes sure the banan goes back to upright when it lands lmao
if (cv_bananthrowroll.value == 1 && K_CheckSlopeRollDist(mo))
mo->sloperoll = (angle_t)FixedAngle(M_RandomRange(-180, 180) << FRACBITS); // im lazy but this makes sure the banan goes back to upright when it lands lmao
else if (cv_bananthrowroll.value == 2)
mo->rollangle = FixedAngle(M_RandomRange(-180, 180) << FRACBITS);
mo->rollangle = (angle_t)FixedAngle(M_RandomRange(-180, 180) << FRACBITS);
}
}
+1
View File
@@ -62,6 +62,7 @@ void K_ExplodePlayer(player_t *player, mobj_t *source, mobj_t *inflictor);
void K_StealBumper(player_t *player, player_t *victim, boolean force);
void K_SpawnKartExplosion(fixed_t x, fixed_t y, fixed_t z, fixed_t radius, INT32 number, mobjtype_t type, angle_t rotangle, boolean spawncenter, boolean ghostit, mobj_t *source);
void K_SpawnMineExplosion(mobj_t *source, UINT8 color);
boolean K_CheckSlopeRollDist(mobj_t *mobj);
boolean K_ShouldSlopeRoll(mobj_t *mobj);
void K_RollMobjBySlopes(mobj_t *mo, pslope_t *slope);
void K_SpawnBoostTrail(player_t *player);
+8 -10
View File
@@ -7048,15 +7048,14 @@ void P_MobjThinker(mobj_t *mobj)
break;
//{ SRB2kart Items - Death States
case MT_BANANA:
if (cv_bananthrowroll.value && K_ShouldSlopeRoll(mobj))
if (cv_bananthrowroll.value)
{
angle_t spin = FixedMul(FixedDiv(abs(mobj->momz), 8 * mobj->scale), ANGLE_67h);
//mobj->angle -= spin;
if (cv_bananthrowroll.value == 1)
mobj->sloperoll += spin; // im lazy but this makes sure the banan goes back to upright when it lands lmao
if (cv_bananthrowroll.value == 1 && K_CheckSlopeRollDist(mobj))
mobj->sloperoll += (angle_t)FixedMul(FixedDiv(abs(mobj->momz), 8 * mobj->scale), ANGLE_67h); // im lazy but this makes sure the banan goes back to upright when it lands lmao
else if (cv_bananthrowroll.value == 2)
mobj->rollangle += spin;
mobj->rollangle += (angle_t)FixedMul(FixedDiv(abs(mobj->momz), 8 * mobj->scale), ANGLE_67h);
//if (P_IsObjectOnGround(mobj) && mobj->momz * P_MobjFlip(mobj) <= 0)
}
@@ -7803,16 +7802,15 @@ void P_MobjThinker(mobj_t *mobj)
}
case MT_BANANA:
case MT_EGGMANITEM:
if (cv_bananthrowroll.value && !P_IsObjectOnGround(mobj) && K_ShouldSlopeRoll(mobj))
if (cv_bananthrowroll.value && !P_IsObjectOnGround(mobj))
{
// tilt n tumble
angle_t spin = FixedMul(FixedDiv(mobj->momz, 8 * mobj->scale), ANGLE_67h);
//mobj->angle += spin;
if (cv_bananthrowroll.value == 1)
mobj->sloperoll -= spin; // im lazy but this makes sure the banan goes back to upright when it lands lmao
if (cv_bananthrowroll.value == 1 && K_CheckSlopeRollDist(mobj))
mobj->sloperoll -= (angle_t)FixedMul(FixedDiv(mobj->momz, 8 * mobj->scale), ANGLE_67h); // im lazy but this makes sure the banan goes back to upright when it lands lmao
else if (cv_bananthrowroll.value == 2)
mobj->rollangle -= spin;
mobj->rollangle -= (angle_t)FixedMul(FixedDiv(mobj->momz, 8 * mobj->scale), ANGLE_67h);
}
mobj->friction = ORIG_FRICTION/4;