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

Rerandomize Heavy Magician when recovering in GTR_BUMPERS

Browse source
This commit is contained in:
AJ Martinez 2024-03-27 22:02:57 -07:00
parent 1cdb2be7aa
commit 494843d78f
6 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/objects/ufo.c
View file

@ -925,7 +925,7 @@ boolean Obj_SpecialUFODamage(mobj_t *ufo, mobj_t *inflictor, mobj_t *source, UIN
? demo.skinlist[demo.currentskinid[(source->player-players)]].flags ? demo.skinlist[demo.currentskinid[(source->player-players)]].flags
: skins[source->player->skin].flags; : skins[source->player->skin].flags;
if (skinflags & SF_IRONMAN) if (skinflags & SF_IRONMAN)
SetRandomFakePlayerSkin(source->player, true); SetRandomFakePlayerSkin(source->player, true, false);
} }
ufo_intangible(ufo) = 60; ufo_intangible(ufo) = 60;

3
src/p_inter.c
View file

@ -3276,6 +3276,9 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
Obj_EndBungee(player); Obj_EndBungee(player);
K_BumperInflate(target->player); K_BumperInflate(target->player);
if (gametyperules & GTR_BUMPERS)
SetRandomFakePlayerSkin(player, false, true);
// Explosions are explicit combo setups. // Explosions are explicit combo setups.
if (damagetype & DMG_EXPLODE) if (damagetype & DMG_EXPLODE)
player->bumperinflate = 0; player->bumperinflate = 0;

2
src/p_spec.c
View file

@ -2017,7 +2017,7 @@ static void K_HandleLapIncrement(player_t *player)
: skins[player->skin].flags; : skins[player->skin].flags;
if (skinflags & SF_IRONMAN) if (skinflags & SF_IRONMAN)
{ {
SetRandomFakePlayerSkin(player, true); SetRandomFakePlayerSkin(player, true, false);
} }
// Always trust waypoints entering the first lap. // Always trust waypoints entering the first lap.

2
src/p_user.c
View file

@ -4542,7 +4542,7 @@ void P_PlayerThink(player_t *player)
} }
else if (!(gametyperules & GTR_CIRCUIT)) else if (!(gametyperules & GTR_CIRCUIT))
{ {
SetRandomFakePlayerSkin(player, false); SetRandomFakePlayerSkin(player, false, false);
} }
} }
} }

5
src/r_skins.c
View file

@ -518,7 +518,7 @@ void SetFakePlayerSkin(player_t* player, INT32 skinid)
} }
// Loudly rerandomize // Loudly rerandomize
void SetRandomFakePlayerSkin(player_t* player, boolean fast) void SetRandomFakePlayerSkin(player_t* player, boolean fast, boolean instant)
{ {
INT32 i; INT32 i;
UINT8 usableskins = 0, maxskinpick; UINT8 usableskins = 0, maxskinpick;
@ -549,6 +549,9 @@ void SetRandomFakePlayerSkin(player_t* player, boolean fast)
SetFakePlayerSkin(player, i); SetFakePlayerSkin(player, i);
if (instant)
return;
if (player->mo && player->spectator == false && !(player->pflags & PF_VOID)) if (player->mo && player->spectator == false && !(player->pflags & PF_VOID))
{ {
S_StartSound(player->mo, sfx_kc33); S_StartSound(player->mo, sfx_kc33);

2
src/r_skins.h
View file

@ -127,7 +127,7 @@ UINT8 R_BotDefaultSkin(void);
// Heavy Magician // Heavy Magician
void SetFakePlayerSkin(player_t* player, INT32 skinnum); void SetFakePlayerSkin(player_t* player, INT32 skinnum);
void SetRandomFakePlayerSkin(player_t* player, boolean fast); void SetRandomFakePlayerSkin(player_t* player, boolean fast, boolean instant);
void ClearFakePlayerSkin(player_t* player); void ClearFakePlayerSkin(player_t* player);
// Visual flair // Visual flair