stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-17 23:21:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

Replaced the Force Shield's shitty drop dash I coded with a much more interesting and experimental ability.

Browse source 
* The Dodge Dash
* Allows you to dash - no control, no falling, no key response - for 2 + (number of extra shield hitpoints) tics.
* If you're holding movement keys down, you dash in the direction you're holding - otherwise, you dash directly forward.
* You're spinning (spindash spin, not jump spin) until your dash is over, then your momentum is cut down significantly and you end up in falling frames.
* It may not necessarily be super useful for Sonic, but it helps the other characters.
* http://gfycat.com/BogusFailingFritillarybutterfly
* http://gfycat.com/PoliticalIdealisticBallpython (outdated speed, shows any direction)
This commit is contained in:
toasterbabe 2016-09-29 20:02:58 +01:00
parent 9a2dd50e4d
commit 35dda1cd72
2 changed files with 49 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/p_mobj.c
View file

@ -3214,14 +3214,6 @@ static void P_PlayerZMovement(mobj_t *mo)
P_ElementalFire(mo->player, true);
}
}
else if ((mo->player->powers[pw_shield] & SH_FORCE) == SH_FORCE) // Force Shield's drop dash.
{
fixed_t magnitude = min(max(FixedHypot((FixedHypot(mo->momx, mo->momy)), mo->momz), abs(mo->momz)*2), 75<<FRACBITS); // vertical momentum is amplified here, since otherwise this was kind of weak.
P_InstaThrust(mo, mo->angle, magnitude);
S_StartSound(mo, sfx_zoom);
mo->player->pflags |= PF_SPINNING;
P_SetPlayerMobjState(mo, S_PLAY_SPIN);
}
}
mo->player->pflags &= ~(PF_THOKKED|PF_CANCARRY|PF_SHIELDABILITY/*|PF_GLIDING*/);
mo->player->jumping = 0;
@ -6713,6 +6705,7 @@ void P_MobjThinker(mobj_t *mobj)
case MT_BLACKORB:
case MT_WHITEORB:
case MT_GREENORB:
case MT_BLUEORB:
case MT_PITYORB:
if (!P_AddShield(mobj))
return;
@ -6723,20 +6716,9 @@ void P_MobjThinker(mobj_t *mobj)
if ((mobj->target)
&& (mobj->target->player)
&& (mobj->target->player->homing))
P_SetMobjState(mobj, mobj->info->painstate);
break;
case MT_BLUEORB:
if (!P_AddShield(mobj))
return;
if ((mobj->target)
&& (mobj->target->player)
&& (mobj->target->player->pflags & PF_SHIELDABILITY))
{
mobj->frame &= ~FF_TRANSMASK;
if (!(leveltime & 15))
{
S_StartSound(mobj->target, sfx_ding);
}
P_SetMobjState(mobj, mobj->info->painstate);
mobj->tics++;
}
break;
case MT_WATERDROP:

52
src/p_user.c
View file

@ -867,6 +867,15 @@ void P_DoPlayerPain(player_t *player, mobj_t *source, mobj_t *inflictor)
// Useful when you want to kill everything the player is doing.
void P_ResetPlayer(player_t *player)
{
if (player->mo
&& (player->powers[pw_shield] & SH_FORCE) == SH_FORCE // Dash.
&& player->pflags & PF_SHIELDABILITY)
{
P_SetPlayerMobjState(player->mo, S_PLAY_FALL);
player->mo->flags &= ~MF_NOGRAVITY;
player->pflags &= ~PF_FULLSTASIS;
}
player->pflags &= ~(PF_SPINNING|PF_STARTDASH|PF_JUMPED|PF_GLIDING|PF_THOKKED|PF_CANCARRY|PF_SHIELDABILITY);
player->powers[pw_carry] = CR_NONE;
player->jumping = 0;
@ -3835,7 +3844,7 @@ void P_DoJumpShield(player_t *player)
player->pflags &= ~PF_JUMPED;
player->secondjump = 0;
player->jumping = 0;
player->pflags |= PF_THOKKED;
player->pflags |= PF_THOKKED|PF_SHIELDABILITY;
player->pflags &= ~PF_SPINNING;
P_SetPlayerMobjState(player->mo, S_PLAY_FALL);
S_StartSound(player->mo, sfx_wdjump);
@ -6930,8 +6939,21 @@ static void P_MovePlayer(player_t *player)
{
if (!(player->pflags & PF_THOKKED))
{
player->pflags |= PF_THOKKED|PF_SHIELDABILITY;
S_StartSound(player->mo, sfx_ding);
angle_t dashangle = player->mo->angle;
if (player->cmd.forwardmove || player->cmd.sidemove)
{
dashangle += R_PointToAngle2(0, 0, player->cmd.forwardmove<<FRACBITS, -player->cmd.sidemove<<FRACBITS);
}
P_ResetPlayer(player);
player->homing = 2;
if ((player->powers[pw_shield] & SH_NOSTACK) - SH_FORCE)
player->homing++;
S_StartSound(player->mo, sfx_s3k47);
P_SetPlayerMobjState(player->mo, S_PLAY_SPIN);
player->pflags |= PF_SPINNING|PF_THOKKED|PF_SHIELDABILITY;
player->mo->flags |= MF_NOGRAVITY;
P_InstaThrust(player->mo, dashangle, 64*FRACUNIT);
player->mo->momz = 0;
}
}
}
@ -6950,7 +6972,25 @@ static void P_MovePlayer(player_t *player)
}
// HOMING option.
if ((player->powers[pw_shield] & SH_NOSTACK) == SH_ATTRACT
if ((player->powers[pw_shield] & SH_FORCE) == SH_FORCE // Dash.
&& player->pflags & PF_SHIELDABILITY)
{
if (player->homing)
{
player->pflags |= PF_FULLSTASIS;
player->mo->momz = 0;
if (!(player->pflags & PF_SPINNING))
player->homing = 0;
}
if (player->homing == 0)
{
P_ResetPlayer(player);
player->mo->momx >>= 3;
player->mo->momy >>= 3;
}
}
else if ((player->powers[pw_shield] & SH_NOSTACK) == SH_ATTRACT // Sonic 3D Blast.
&& player->pflags & PF_SHIELDABILITY)
{
if (player->homing && player->mo->tracer)
@ -6969,7 +7009,7 @@ static void P_MovePlayer(player_t *player)
if (!(player->pflags & PF_JUMPED))
player->homing = 0;
}
else if (player->charability == CA_HOMINGTHOK)
else if (player->charability == CA_HOMINGTHOK) // Sonic Adventure.
{
// If you've got a target, chase after it!
if (player->homing && player->mo->tracer)
@ -9185,7 +9225,7 @@ void P_PlayerThink(player_t *player)
player->losstime--;
// Flash player after being hit.
if (player->powers[pw_flashing] > 0 && player->powers[pw_flashing] < flashingtics && (leveltime & 1))
if ((player->powers[pw_flashing] > 0 && player->powers[pw_flashing] < flashingtics && (leveltime & 1)) || ((player->powers[pw_shield] & SH_FORCE) == SH_FORCE && player->pflags & PF_SHIELDABILITY))
player->mo->flags2 |= MF2_DONTDRAW;
else
player->mo->flags2 &= ~MF2_DONTDRAW;