mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2026-04-26 20:11:47 +00:00
Merge branch 'ufos-revenge' into 'master'
UFO's determination - Nerf Sealed Star UFO damage carryover See merge request kart-krew-dev/ring-racers-internal!2615
This commit is contained in:
commit
b5b2656ea0
1 changed files with 3 additions and 1 deletions
|
|
@ -1286,7 +1286,9 @@ static mobj_t *InitSpecialUFO(waypoint_t *start)
|
||||||
// Set specialDamage as early as possible, for glass ball's sake
|
// Set specialDamage as early as possible, for glass ball's sake
|
||||||
if (grandprixinfo.gp && grandprixinfo.specialDamage)
|
if (grandprixinfo.gp && grandprixinfo.specialDamage)
|
||||||
{
|
{
|
||||||
ufo->health -= min(4*(UINT32)mobjinfo[MT_SPECIAL_UFO].spawnhealth/10, grandprixinfo.specialDamage/6);
|
ufo->health -= min(2*(UINT32)mobjinfo[MT_SPECIAL_UFO].spawnhealth/10, grandprixinfo.specialDamage/12);
|
||||||
|
// Use this if you want to spy on what the health ends up being:
|
||||||
|
//CONS_Printf("the UFO weeps: %d hp\n", ufo->health );
|
||||||
}
|
}
|
||||||
|
|
||||||
ufo_speed(ufo) = FixedMul(UFO_START_SPEED, K_GetKartGameSpeedScalar(gamespeed));
|
ufo_speed(ufo) = FixedMul(UFO_START_SPEED, K_GetKartGameSpeedScalar(gamespeed));
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue