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

Merge branch 'big-gachabom' into 'master'

Browse source 
Scale Gachabom, Ballhog and SPB with Grow/Shrink

See merge request KartKrew/Kart!1993
This commit is contained in:
James R. 2024-03-03 05:18:42 +00:00
commit 27764435f9
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/k_kart.c
View file

@ -12407,6 +12407,8 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
{
INT32 numhogs = min((player->ballhogcharge / BALLHOGINCREMENT), player->itemamount);
K_SetItemOut(player); // need this to set itemscale
if (numhogs <= 0)
{
// no tapfire scams
@ -12435,6 +12437,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
K_PlayAttackTaunt(player->mo);
}
K_UnsetItemOut(player);
player->ballhogcharge = 0;
player->itemflags &= ~IF_HOLDREADY;
player->botvars.itemconfirm = 0;
@ -12446,7 +12449,9 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO)
{
player->itemamount--;
K_SetItemOut(player);
K_ThrowKartItem(player, true, MT_SPB, 1, 0, 0);
K_UnsetItemOut(player);
K_PlayAttackTaunt(player->mo);
player->botvars.itemconfirm = 0;
}
@ -12773,7 +12778,9 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
case KITEM_GACHABOM:
if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO)
{
K_SetItemOut(player); // need this to set itemscale
K_ThrowKartItem(player, true, MT_GACHABOM, 0, 0, 0);
K_UnsetItemOut(player);
K_PlayAttackTaunt(player->mo);
player->itemamount--;
player->roundconditions.gachabom_miser = (