mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2025-10-30 08:01:28 +00:00
Merge branch 'ufo-master-difficulty' into 'master'
No UFO damage carryover on Master difficulty See merge request kart-krew-dev/ring-racers-internal!2650
This commit is contained in:
commit
c3dc1871ab
1 changed files with 2 additions and 1 deletions
|
|
@ -1284,7 +1284,8 @@ 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)
|
// (...Except if you're on Master difficulty!)
|
||||||
|
if (grandprixinfo.gp && grandprixinfo.specialDamage && grandprixinfo.masterbots == false)
|
||||||
{
|
{
|
||||||
ufo->health -= min(2*(UINT32)mobjinfo[MT_SPECIAL_UFO].spawnhealth/10, grandprixinfo.specialDamage/12);
|
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:
|
// Use this if you want to spy on what the health ends up being:
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue