Rebalance fireaxe (#22731)

* Rebalance Fireaxe

* Nerf it a bit

diff --git a/Content.Server/Atmos/Components/IgniteOnMeleeHitComponent.cs b/Content.Server/Atmos/Components/IgniteOnMeleeHitComponent.cs
index 26dd9ad24d149b9f7794f728a37ef1274e46b6c5..f30b20db30207de0301a8f896f55617f2b92be2f 100644 (file)
--- a/Content.Server/Atmos/Components/IgniteOnMeleeHitComponent.cs
+++ b/Content.Server/Atmos/Components/IgniteOnMeleeHitComponent.cs
@@ -1,8 +1,11 @@
 namespace Content.Server.Atmos.Components;
 
+/// <summary>
+/// Component that can be used to add (or remove) fire stacks when used as a melee weapon.
+/// </summary>
 [RegisterComponent]
 public sealed partial class IgniteOnMeleeHitComponent : Component
 {
-    [DataField("fireStacks")]
+    [DataField]
     public float FireStacks { get; set; }
 }

diff --git a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
index a0b85a26faa6f04a6e253d1fd028b30aa31613d7..36722884e57c0e6bdf4332cbee100b36831169ef 100644 (file)
--- a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs
@@ -85,8 +85,9 @@ namespace Content.Server.Atmos.EntitySystems
                 if (!TryComp<FlammableComponent>(entity, out var flammable))
                     continue;
 
-                flammable.FireStacks += component.FireStacks;
-                Ignite(entity, args.Weapon, flammable, args.User);
+                AdjustFireStacks(entity, component.FireStacks, flammable);
+                if (component.FireStacks >= 0)
+                    Ignite(entity, args.Weapon, flammable, args.User);
             }
         }
 

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
index 0d882a66457cb25c18634ab30fc780d8c2366b5b..1a96d7d17b52dfccf20e5ba7f24a19ddd07d1ed9 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
@@ -42,6 +42,8 @@
   - type: Prying
   - type: UseDelay
     delay: 1
+  - type: IgniteOnMeleeHit
+    fireStacks: -4
 
 - type: entity
   id: FireAxeFlaming