From 15737d7b8abe3e037325aa49f209c1d680204433 Mon Sep 17 00:00:00 2001 From: James R Date: Tue, 22 Jul 2025 20:51:44 -0700 Subject: [PATCH] Toxomister: clouds spawn with 15s fuse --- src/objects/toxomister.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/objects/toxomister.cpp b/src/objects/toxomister.cpp index 1741cf7f0..2a300deef 100644 --- a/src/objects/toxomister.cpp +++ b/src/objects/toxomister.cpp @@ -324,18 +324,22 @@ struct Cloud : Mobj } else { - if (!fuse) + if (FixedHypot(momx, momy) > 2 * mapobjectscale) { - fuse = 3*TICRATE; instathrust(angle, 2 * mapobjectscale); } - if (leveltime & 1) + if (fuse > 3*TICRATE) { - renderflags ^= RF_DONTDRAW; + fuse = 3*TICRATE; } } + if (fuse <= 3*TICRATE && (leveltime & 1)) + { + renderflags ^= RF_DONTDRAW; + } + return true; } @@ -396,6 +400,7 @@ void Pole::spawn_clouds_in_orbit() cloud->spriteyoffset(24*FRACUNIT); cloud->hitlag(2 + i * 4); cloud->scale_between(1, cloud->scale(), cloud->scale() / 5); + cloud->fuse = 15*TICRATE; a += a_incr; }