thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-26 20:11:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing and cleaning rocket sneaker boost state separation shit

Browse source 
- Fixed rocket sneaker tripwire state not activating
- Exposed sneaker boost variables to lua
- Made bots at least aware of the new sneaker boost type...? Probably.
This commit is contained in:
eebrozgi 2025-06-03 06:43:44 +03:00
parent 78652200f6
commit 333734fdf3
3 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/k_botitem.cpp
View file

@ -531,7 +531,7 @@ static void K_BotItemSneaker(const player_t *player, ticcmd_t *cmd)
|| player->speedboost > (FRACUNIT/8) // Have another type of boost (tethering) || player->speedboost > (FRACUNIT/8) // Have another type of boost (tethering)
|| player->botvars.itemconfirm > 4*TICRATE) // Held onto it for too long || player->botvars.itemconfirm > 4*TICRATE) // Held onto it for too long
{ {
if (player->sneakertimer == 0 && K_ItemButtonWasDown(player) == false) if (player->sneakertimer == 0 && player->weaksneakertimer == 0 && K_ItemButtonWasDown(player) == false)
{ {
cmd->buttons |= BT_ATTACK; cmd->buttons |= BT_ATTACK;
//player->botvars.itemconfirm = 2*TICRATE; //player->botvars.itemconfirm = 2*TICRATE;
@ -567,7 +567,7 @@ static void K_BotItemRocketSneaker(const player_t *player, ticcmd_t *cmd)
if (player->botvars.itemconfirm > TICRATE) if (player->botvars.itemconfirm > TICRATE)
{ {
if (player->sneakertimer == 0 && K_ItemButtonWasDown(player) == false) if (player->sneakertimer == 0 && player->weaksneakertimer == 0 && K_ItemButtonWasDown(player) == false)
{ {
cmd->buttons |= BT_ATTACK; cmd->buttons |= BT_ATTACK;
//player->botvars.itemconfirm = 0; //player->botvars.itemconfirm = 0;
@ -1605,7 +1605,7 @@ static void K_BotItemIceCube(const player_t *player, ticcmd_t *cmd)
return; return;
} }
if (player->sneakertimer) if (player->sneakertimer || player->weaksneakertimer)
{ {
return; return;
} }

3
src/k_kart.c
View file

@ -3071,7 +3071,8 @@ tripwirepass_t K_TripwirePassConditions(const player_t *player)
{ {
if ( if (
player->invincibilitytimer || player->invincibilitytimer ||
player->sneakertimer player->sneakertimer ||
player->weaksneakertimer
) )
return TRIPWIRE_BLASTER; return TRIPWIRE_BLASTER;

8
src/lua_playerlib.c
View file

@ -1124,6 +1124,14 @@ static int player_set(lua_State *L)
plr->sneakertimer = luaL_checkinteger(L, 3); plr->sneakertimer = luaL_checkinteger(L, 3);
else if (fastcmp(field,"numsneakers")) else if (fastcmp(field,"numsneakers"))
plr->numsneakers = luaL_checkinteger(L, 3); plr->numsneakers = luaL_checkinteger(L, 3);
else if (fastcmp(field,"panelsneakertimer"))
plr->panelsneakertimer = luaL_checkinteger(L, 3);
else if (fastcmp(field,"numpanelsneakers"))
plr->numpanelsneakers = luaL_checkinteger(L, 3);
else if (fastcmp(field,"weaksneakertimer"))
plr->weaksneakertimer = luaL_checkinteger(L, 3);
else if (fastcmp(field,"numpweaksneakers"))
plr->numweaksneakers = luaL_checkinteger(L, 3);
else if (fastcmp(field,"floorboost")) else if (fastcmp(field,"floorboost"))
plr->floorboost = luaL_checkinteger(L, 3); plr->floorboost = luaL_checkinteger(L, 3);
else if (fastcmp(field,"growshrinktimer")) else if (fastcmp(field,"growshrinktimer"))