From 2f2469136ebd25399ecdb18656cfd114bcd2d26e Mon Sep 17 00:00:00 2001 From: UndeadZeratul Date: Wed, 9 Aug 2023 21:00:12 -0500 Subject: [PATCH 1/3] Tweak Flame Projectile Make smol so it don't bump into wall, actually immolate things. --- .../weapons/Flamenwerfer 77/flamenwerfer77.zs | 29 ++++++++----------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/zscript/icarus/weapons/Flamenwerfer 77/flamenwerfer77.zs b/zscript/icarus/weapons/Flamenwerfer 77/flamenwerfer77.zs index 3009a95..83f7a80 100644 --- a/zscript/icarus/weapons/Flamenwerfer 77/flamenwerfer77.zs +++ b/zscript/icarus/weapons/Flamenwerfer 77/flamenwerfer77.zs @@ -497,6 +497,7 @@ class HDFireCone : HDActor DamageFunction (0); Alpha 0.5; Scale 0.05; + Radius 0.6; RenderStyle "Add"; Decal "Scorch"; +RIPPER @@ -512,28 +513,22 @@ class HDFireCone : HDActor Spawn: FLMP ABCDEFGHIJKLMNOP 2 { - scale.x+=0.1; - scale.y+=0.1; + scale+=(0.1, 0.1); A_FadeOut(0.05); - if (!invoker.PrettyLights) - { - invoker.PrettyLights = CVar.GetCVar('Flamer_PrettyLights'); - } - if (invoker.PrettyLights.GetBool()) - { - A_SpawnItemEx("FireballLight"); - } + if (!invoker.PrettyLights) invoker.PrettyLights = CVar.GetCVar('Flamer_PrettyLights'); + + if (invoker.PrettyLights.GetBool()) A_SpawnItemEx("FireballLight"); + + let burnRange = HDCONST_ONEMETRE * 2 * scale.x; - BlockThingsIterator it = BlockThingsIterator.Create(self, HDCONST_ONEMETRE * 2); + BlockThingsIterator it = BlockThingsIterator.Create(self, burnRange); while (it.Next()) { - if (it.thing.Health <= 0 || !it.thing.bISMONSTER || Distance3D(it.thing) > HDCONST_ONEMETRE * 2) - { - continue; - } - it.thing.DamageMobj(self, target, random(15, 30), 'Heat', DMG_THRUSTLESS); - it.thing.A_GiveInventory("Heat", 100); + if ( + Distance3D(it.thing) <= burnRange + && it.thing.bshootable + ) A_Immolate(it.thing, target, 20); } } stop; From 251ff84c8a9208dab67ad087b37f5ce9a44d7150 Mon Sep 17 00:00:00 2001 From: UndeadZeratul Date: Wed, 9 Aug 2023 21:00:35 -0500 Subject: [PATCH 2/3] Clean up Pickup Message --- LANGUAGE.en | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LANGUAGE.en b/LANGUAGE.en index 4fa5c57..958b855 100644 --- a/LANGUAGE.en +++ b/LANGUAGE.en @@ -198,7 +198,7 @@ PICKUP_FLAMENWERFER77_SUFFIX = ". It werfs flammen."; PICKUP_FRONTIERSMAN_PREFIX = "You got the "; PICKUP_FRONTIERSMAN_SUFFIX = "."; PICKUP_GASTANK_PREFIX = "You got a "; -PICKUP_GASTANK_SUFFIX = ". The cheap chineseum casing might react violently to extreme heat, pressure or sudden shock."; +PICKUP_GASTANK_SUFFIX = ". Better be careful not to let this one light up."; PICKUP_GFB9_PREFIX = "You got the "; PICKUP_GFB9_CAPACITOR = "High-Capacity "; PICKUP_GFB9_SUFFIX = "."; From 8141a9350ecfc5de8468903950a2cab5211c68a2 Mon Sep 17 00:00:00 2001 From: UndeadZeratul Date: Wed, 9 Aug 2023 22:10:52 -0500 Subject: [PATCH 3/3] Make Weapon Help Text more clear --- zscript/icarus/weapons/Flamenwerfer 77/flamenwerfer77.zs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zscript/icarus/weapons/Flamenwerfer 77/flamenwerfer77.zs b/zscript/icarus/weapons/Flamenwerfer 77/flamenwerfer77.zs index 83f7a80..1fe55d8 100644 --- a/zscript/icarus/weapons/Flamenwerfer 77/flamenwerfer77.zs +++ b/zscript/icarus/weapons/Flamenwerfer 77/flamenwerfer77.zs @@ -124,8 +124,8 @@ class HDFlamethrower : HDWeapon Override string gethelptext() { return - WEPHELP_FIRE.." Burn the heretic. Kill the mutant. Purge the unclean.\n" - ..WEPHELP_ALTFIRE.." Get Back, Xeno Scum!\n" + WEPHELP_FIRE.." Throw Flames.\n" + ..WEPHELP_ALTFIRE.." Airblast\n" ..WEPHELP_RELOAD.." Reload Canister\n" ..WEPHELP_UNLOAD.." Unload Canister\n"; }