thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'less-shrink' into 'master'

Browse source 
Less sandbag

See merge request KartKrew/Kart!2402
This commit is contained in:
Oni 2024-05-21 01:23:48 +00:00
commit c36c682bb5
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/k_roulette.c
View file

@ -812,13 +812,21 @@ INT32 K_KartGetItemOdds(const player_t *player, itemroulette_t *const roulette,
case KITEM_MINE: case KITEM_MINE:
case KITEM_GROW: case KITEM_GROW:
case KITEM_BUBBLESHIELD: case KITEM_BUBBLESHIELD:
case KITEM_FLAMESHIELD:
{ {
conditions.cooldownOnStart = true; conditions.cooldownOnStart = true;
conditions.powerItem = true; conditions.powerItem = true;
break; break;
} }
case KITEM_FLAMESHIELD:
case KITEM_GARDENTOP:
{
conditions.cooldownOnStart = true;
conditions.powerItem = true;
conditions.notNearEnd = true;
break;
}
case KITEM_SPB: case KITEM_SPB:
{ {
conditions.cooldownOnStart = true; conditions.cooldownOnStart = true;

2
src/objects/shrink.c
View file

@ -455,7 +455,7 @@ void Obj_PohbeeThinker(mobj_t *pohbee)
{ {
mobj_t *gun = NULL; mobj_t *gun = NULL;
K_SetItemCooldown(KITEM_SHRINK, 20*TICRATE); K_SetItemCooldown(KITEM_SHRINK, 60*TICRATE);
pohbee->momx = pohbee->momy = pohbee->momz = 0; pohbee->momx = pohbee->momy = pohbee->momz = 0;
pohbee->spritexscale = pohbee->spriteyscale = 2*FRACUNIT; pohbee->spritexscale = pohbee->spriteyscale = 2*FRACUNIT;