incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Disable Ring drop for now

Browse source 
We can discuss its fate later.
This commit is contained in:
NepDisk 2026-01-30 00:06:32 -05:00
parent 300ffd94ea
commit f3767c5e77
5 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/d_player.h
View file

@ -672,7 +672,7 @@ struct player_t
UINT8 ringtransparency; // When consuming lots of rings, fade out the rings again. UINT8 ringtransparency; // When consuming lots of rings, fade out the rings again.
UINT8 airdroptime; // Tracks how long airdrop has been active, used for delay before airdrop kicks in. UINT8 airdroptime; // Tracks how long airdrop has been active, used for delay before airdrop kicks in.
boolean ringdrop; // Set when having ringdrop applied. //boolean ringdrop; // Set when having ringdrop applied.
mobj_t *shieldtracer; // Blankart: Shield mobj mobj_t *shieldtracer; // Blankart: Shield mobj

12
src/k_kart.c
View file

@ -6944,7 +6944,7 @@ static void K_AirDrop(player_t *player, ticcmd_t *cmd)
{ {
// Conditions! // Conditions!
player->airdroptime = 0; player->airdroptime = 0;
player->ringdrop = false; //player->ringdrop = false;
return; return;
} }
@ -6953,16 +6953,16 @@ static void K_AirDrop(player_t *player, ticcmd_t *cmd)
SINT8 airbrakedelay = TICRATE/3; SINT8 airbrakedelay = TICRATE/3;
if (player->airdroptime < airbrakedelay) if (player->airdroptime < airbrakedelay)
{ {
if (player->rings > 0) /*if (player->rings > 0)
{ {
player->ringlock = 6; player->ringlock = 6;
} }
player->ringdrop = false; player->ringdrop = false;*/
} }
else else
{ {
if (!player->ringdelay && player->rings > 0) /*if (!player->ringdelay && player->rings > 0)
{ {
mobj_t *ring = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_RING); mobj_t *ring = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_RING);
P_SetMobjState(ring, S_FASTRING1); P_SetMobjState(ring, S_FASTRING1);
@ -6985,9 +6985,9 @@ static void K_AirDrop(player_t *player, ticcmd_t *cmd)
if (player->rings <= 0) if (player->rings <= 0)
{ {
player->ringdrop = false; player->ringdrop = false;
} }*/
K_SpawnFallLines(player, player->ringdrop); K_SpawnFallLines(player, /*player->ringdrop*/ false);
K_SpawnAirdropTrail(player); K_SpawnAirdropTrail(player);
player->mo->momz -= FixedMul(gravity, mapobjectscale)*P_MobjFlip(player->mo); player->mo->momz -= FixedMul(gravity, mapobjectscale)*P_MobjFlip(player->mo);
} }

8
src/lua_playerlib.c
View file

@ -832,9 +832,9 @@ static int player_get(lua_State *L)
case player_airdroptime: case player_airdroptime:
lua_pushinteger(L, plr->airdroptime); lua_pushinteger(L, plr->airdroptime);
break; break;
case player_ringdrop: /*case player_ringdrop:
lua_pushinteger(L, plr->ringdrop); lua_pushinteger(L, plr->ringdrop);
break; break;*/
case player_shieldtracer: case player_shieldtracer:
LUA_PushUserdata(L, plr->shieldtracer, META_MOBJ); LUA_PushUserdata(L, plr->shieldtracer, META_MOBJ);
break; break;
@ -1613,9 +1613,9 @@ static int player_set(lua_State *L)
case player_airdroptime: case player_airdroptime:
plr->airdroptime = luaL_checkinteger(L, 3); plr->airdroptime = luaL_checkinteger(L, 3);
break; break;
case player_ringdrop: /*case player_ringdrop:
plr->ringdrop = luaL_checkinteger(L, 3); plr->ringdrop = luaL_checkinteger(L, 3);
break; break;*/
case player_shieldtracer: case player_shieldtracer:
return NOSET; return NOSET;
case player_bubblecool: case player_bubblecool:

4
src/p_enemy.c
View file

@ -3230,14 +3230,14 @@ void A_AttractChase(void *thing)
if (actor->extravalue1 >= 21) if (actor->extravalue1 >= 21)
{ {
if (actor->extravalue3 && !P_IsObjectOnGround(actor->target)) /*if (actor->extravalue3 && !P_IsObjectOnGround(actor->target))
{ {
actor->target->momz -= (FixedMul(gravity, mapobjectscale))*P_MobjFlip(actor->target); actor->target->momz -= (FixedMul(gravity, mapobjectscale))*P_MobjFlip(actor->target);
actor->target->player->ringboost += 7; actor->target->player->ringboost += 7;
actor->target->player->ringtime += 7; actor->target->player->ringtime += 7;
actor->target->player->ringdrop = true; actor->target->player->ringdrop = true;
} }
else else*/
{ {
// Base add is 4 tics for 9,9, adds 1 tic for each point closer to the 1,1 end // Base add is 4 tics for 9,9, adds 1 tic for each point closer to the 1,1 end
actor->target->player->ringboost += K_GetKartRingPower(actor->target->player, true); actor->target->player->ringboost += K_GetKartRingPower(actor->target->player, true);

2
src/p_saveg.c
View file

@ -685,7 +685,7 @@ static void P_NetSyncPlayers(savebuffer_t *save)
SYNC(players[i].ringtransparency); SYNC(players[i].ringtransparency);
SYNC(players[i].airdroptime); SYNC(players[i].airdroptime);
SYNCBOOLEAN(players[i].ringdrop); //SYNCBOOLEAN(players[i].ringdrop);
RSYNC(players[i].shieldtracer); RSYNC(players[i].shieldtracer);