thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-01-07 07:22:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

More whip tuning

Browse source
This commit is contained in:
AJ Martinez 2023-10-14 16:09:21 -07:00
parent b67aa8af4f
commit 1eab3a6838
4 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/k_kart.c
View file

@ -1410,7 +1410,7 @@ static void K_UpdateDraft(player_t *player)
}
// Want to berserk attack? Get your speed FIRST.
if (player->instaWhipCharge >= INSTAWHIP_CHARGETIME)
if (player->instaWhipCharge >= INSTAWHIP_TETHERBLOCK)
return;
// Not enough speed to draft.
@ -11045,7 +11045,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
if (chargingwhip)
{
player->instaWhipCharge = min(player->instaWhipCharge + 1, INSTAWHIP_CHARGETIME + 1);
player->instaWhipCharge = min(player->instaWhipCharge + 1, INSTAWHIP_TETHERBLOCK + 1);
if (player->instaWhipCharge == 1)
{

2
src/k_kart.h
View file

@ -35,6 +35,8 @@ Make sure this matches the actual number of states
#define INSTAWHIP_DROPGUARD (12)
#define INSTAWHIP_RINGDRAINEVERY (TICRATE/2)
#define INSTAWHIP_HOLD_DELAY (TICRATE*2)
// MUST be longer or equal to INSTAWHIP_CHARGETIME.
#define INSTAWHIP_TETHERBLOCK (TICRATE*2)
#define GUARDBREAK_COOLDOWN (TICRATE*4)
#define FLAMESHIELD_MAX (120)

10
src/p_inter.c
View file

@ -108,14 +108,6 @@ void P_RampConstant(const BasicFF_t *FFInfo, INT32 Start, INT32 End)
// GET STUFF
//
boolean P_Whipping(player_t *player)
{
if (player->instaWhipCharge)
return true;
if (player->whip && !P_MobjWasRemoved(player->whip))
return true;
return false;
}
//
// P_CanPickupItem
@ -132,7 +124,7 @@ boolean P_CanPickupItem(player_t *player, UINT8 weapon)
// 2: Eggbox
// 3: Paperitem
if (weapon != 2 && P_Whipping(player))
if (weapon != 2 && player->instaWhipCharge)
return false;
if (weapon)

1
src/p_local.h
View file

@ -544,7 +544,6 @@ void P_CheckTimeLimit(void);
void P_CheckPointLimit(void);
boolean P_CheckRacers(void);
boolean P_Whipping(player_t *player);
boolean P_CanPickupItem(player_t *player, UINT8 weapon);
boolean P_IsPickupCheesy(player_t *player, UINT8 type);
void P_UpdateLastPickup(player_t *player, UINT8 type);