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 'special-stage-magician' into 'master'

Browse source 
Rerandomize SF_IRONMAN on UFO hit

See merge request KartKrew/Kart!970
This commit is contained in:
Oni 2023-02-27 05:27:06 +00:00
commit ca64bcdb70
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/objects/ufo.c
View file

@ -23,6 +23,7 @@
#include "../z_zone.h" #include "../z_zone.h"
#include "../k_waypoint.h" #include "../k_waypoint.h"
#include "../k_specialstage.h" #include "../k_specialstage.h"
#include "../r_skins.h"
#define UFO_BASE_SPEED (42 * FRACUNIT) // UFO's slowest speed. #define UFO_BASE_SPEED (42 * FRACUNIT) // UFO's slowest speed.
#define UFO_SPEEDUP (FRACUNIT >> 1) // Acceleration #define UFO_SPEEDUP (FRACUNIT >> 1) // Acceleration
@ -671,6 +672,16 @@ boolean Obj_SpecialUFODamage(mobj_t *ufo, mobj_t *inflictor, mobj_t *source, UIN
return false; return false;
} }
if (source->player)
{
UINT32 skinflags = (demo.playback)
? demo.skinlist[demo.currentskinid[(source->player-players)]].flags
: skins[source->player->skin].flags;
if (skinflags & SF_IRONMAN)
SetRandomFakePlayerSkin(source->player, true);
}
// Speed up on damage! // Speed up on damage!
ufo_speed(ufo) += addSpeed; ufo_speed(ufo) += addSpeed;
@ -700,6 +711,7 @@ boolean Obj_SpecialUFODamage(mobj_t *ufo, mobj_t *inflictor, mobj_t *source, UIN
S_StopSoundByID(ufo, sfx_clawzm); S_StopSoundByID(ufo, sfx_clawzm);
P_StartQuake(64<<FRACBITS, 10); P_StartQuake(64<<FRACBITS, 10);
ufo->health -= damage; ufo->health -= damage;
return true; return true;
} }