From 8524401c03dafd27f235803a5b021d267e6f890c Mon Sep 17 00:00:00 2001 From: James R Date: Sat, 2 Mar 2024 18:39:29 -0800 Subject: [PATCH 1/2] Scale Gachabom and Ballhog with Grow/Shrink --- src/k_kart.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/k_kart.c b/src/k_kart.c index 3f9dfa551..8be8c9d35 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -12406,6 +12406,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 @@ -12434,6 +12436,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; @@ -12772,7 +12775,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 = ( From 1ebac1f553239166c16992cd3dda8f58b8bc3c9f Mon Sep 17 00:00:00 2001 From: James R Date: Sat, 2 Mar 2024 18:46:56 -0800 Subject: [PATCH 2/2] Scale SPB with Grow/Shrink --- src/k_kart.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/k_kart.c b/src/k_kart.c index 8be8c9d35..6096c03a9 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -12448,7 +12448,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; }