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:
AJ Martinez 2025-06-28 18:41:26 +00:00
commit c3dc1871ab

View file

@ -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: