thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

UCRP_WHIPHYUU

Browse source 
Insta-Whip another racer while you yourself are invisible from Hyuudoro, it's shrimple
Also updates the phrasing used for UCRP_TRIPWIREHYUU to match ("afflicted by Hyudoro")
This commit is contained in:
toaster 2023-10-18 01:18:34 +01:00
parent 1c887a7041
commit a7940684f6
5 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/d_player.h
View file

@ -414,6 +414,7 @@ struct roundconditions_t
// Basically the same, but it's a specific event where no is an easy default
boolean tripwire_hyuu;
boolean whip_hyuu;
boolean spb_neuter;
boolean landmine_dunk;
boolean hit_midair;

1
src/deh_soc.c
View file

@ -2993,6 +2993,7 @@ static void readcondition(UINT16 set, UINT32 id, char *word2)
re = 0;
}
else if ((offset=0) || fastcmp(params[0], "TRIPWIREHYUU")
|| (++offset && fastcmp(params[0], "WHIPHYUU"))
|| (++offset && fastcmp(params[0], "SPBNEUTER"))
|| (++offset && fastcmp(params[0], "LANDMINEDUNK"))
|| (++offset && fastcmp(params[0], "HITMIDAIR"))

8
src/k_collide.cpp
View file

@ -910,6 +910,14 @@ boolean K_InstaWhipCollide(mobj_t *shield, mobj_t *victim)
K_AddHitLag(victim, victimHitlag, true);
K_AddHitLag(attacker, attackerHitlag, false);
shield->hitlag = attacker->hitlag;
if (attackerPlayer->roundconditions.whip_hyuu == false
&& attackerPlayer->hyudorotimer > 0)
{
attackerPlayer->roundconditions.whip_hyuu = true;
attackerPlayer->roundconditions.checkthisframe = true;
}
return true;
}
return false;

6
src/m_cond.c
View file

@ -1634,6 +1634,8 @@ boolean M_CheckCondition(condition_t *cn, player_t *player)
case UCRP_TRIPWIREHYUU:
return (player->roundconditions.tripwire_hyuu);
case UCRP_WHIPHYUU:
return (player->roundconditions.whip_hyuu);
case UCRP_SPBNEUTER:
return (player->roundconditions.spb_neuter);
case UCRP_LANDMINEDUNK:
@ -2417,7 +2419,9 @@ static const char *M_GetConditionString(condition_t *cn)
return (cn->requirement == 1) ? "FAULT during POSITION" : "don't FAULT during POSITION";
case UCRP_TRIPWIREHYUU:
return "go through Tripwire after getting snared by Hyudoro";
return "go through Tripwire while afflicted by Hyudoro";
case UCRP_WHIPHYUU:
return "Insta-Whip a racer while afflicted by Hyudoro";
case UCRP_SPBNEUTER:
return "shock a Self-Propelled Bomb into submission";
case UCRP_LANDMINEDUNK:

1
src/m_cond.h
View file

@ -125,6 +125,7 @@ typedef enum
UCRP_FAULTED, // FAULT
UCRP_TRIPWIREHYUU, // Go through tripwire with Hyudoro
UCRP_WHIPHYUU, // Use Insta-Whip with Hyudoro
UCRP_SPBNEUTER, // Kill an SPB with Lightning
UCRP_LANDMINEDUNK, // huh? you died? that's weird. all i did was try to hug you...
UCRP_HITMIDAIR, // Hit another player mid-air with a kartfielditem