Merge pull request #8 from UndeadZeratul/main

Flamenwerfer Tweaks
HDest-Community · Aug 10, 2023 · 2edfe8a · 2edfe8a
2 parents 3d1f4cd + 8141a93
commit 2edfe8a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 20 deletions.
diff --git 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                      = ".";

diff --git 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";
 	}
@@ -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;