From 5dd098d136c6d8642d9e8d7183fe935809105865 Mon Sep 17 00:00:00 2001 From: eebrozgi Date: Sun, 22 Jun 2025 14:37:49 +0300 Subject: [PATCH 1/2] (UNTESTED) No UFO damage carryover on Master difficulty I'm not sure if it's replay compatible --- src/objects/ufo.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/objects/ufo.c b/src/objects/ufo.c index 7f77e18ce..7a3ff0c74 100644 --- a/src/objects/ufo.c +++ b/src/objects/ufo.c @@ -1285,6 +1285,7 @@ static mobj_t *InitSpecialUFO(waypoint_t *start) // Set specialDamage as early as possible, for glass ball's sake if (grandprixinfo.gp && grandprixinfo.specialDamage) + if (grandprixinfo.masterbots == false) { 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: From 0b041703edae2c09817bc5f3db1dcd44a71be82b Mon Sep 17 00:00:00 2001 From: eebrozgi Date: Fri, 27 Jun 2025 21:46:49 +0300 Subject: [PATCH 2/2] better syntax pp --- src/objects/ufo.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/objects/ufo.c b/src/objects/ufo.c index 7a3ff0c74..be6441c33 100644 --- a/src/objects/ufo.c +++ b/src/objects/ufo.c @@ -1284,8 +1284,8 @@ static mobj_t *InitSpecialUFO(waypoint_t *start) } // Set specialDamage as early as possible, for glass ball's sake - if (grandprixinfo.gp && grandprixinfo.specialDamage) - if (grandprixinfo.masterbots == false) + // (...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); // Use this if you want to spy on what the health ends up being: