From 20c6981d615f2f4161a9c1d11960a093e439d209 Mon Sep 17 00:00:00 2001 From: minenice55 Date: Mon, 27 Apr 2026 21:28:03 -0400 Subject: [PATCH] let bubble shield tank damage for a bit after being spawned --- src/d_main.cpp | 2 +- src/k_items.c | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/d_main.cpp b/src/d_main.cpp index 9ce6e8c2c..bdbef1236 100644 --- a/src/d_main.cpp +++ b/src/d_main.cpp @@ -102,7 +102,7 @@ #define ASSET_HASH_TEXTURES_KART 0xb4211b2f32b6a291 #define ASSET_HASH_CHARS_KART 0x1e68a3e01aa5c68b #define ASSET_HASH_MAPS_KART 0x38558ed00da41ce9 -#define ASSET_HASH_MAIN_PK3 0xd2bf7373c266f900 +#define ASSET_HASH_MAIN_PK3 0xe35da6fd33982681 #define ASSET_HASH_MAPPATCH_PK3 0x1745690024efbaf8 #define ASSET_HASH_BONUSCHARS_KART 0x60e6f13d822a7461 #ifdef USE_PATCH_FILE diff --git a/src/k_items.c b/src/k_items.c index 8bd03134a..7b74100ef 100644 --- a/src/k_items.c +++ b/src/k_items.c @@ -1774,8 +1774,13 @@ static void K_DoHyudoroSteal(player_t *player) && !(players[i].itemflags & IF_ITEMOUT) && !players[i].itemblink //todo: make this more modular for hold-button items (these should never be stolen when being used) - && !players[i].bubblecool - && !players[i].attractioncharge + && !( + players[i].flametimer + + players[i].bubblecool + + players[i].bubbleblowup + + players[i].bubblebuffer + + players[i].attractioncharge + ) )) { kartitemflags_e flags = K_GetItemFlags(players[i].itemtype); @@ -2620,6 +2625,8 @@ void K_PlayerItemThink(player_t *player, boolean onground) S_StartSound(player->mo, sfx_s3k3f); if (player->bubblehealth <= 0 || player->bubblehealth > MAXBUBBLEHEALTH) player->bubblehealth = MAXBUBBLEHEALTH; + // bit of mercy so bubble doesn't get instantly killed on creation + player->bubblebuffer = TICRATE/2; } if (!HOLDING_ITEM && NO_HYUDORO)