From cfb129c5a4fcdf996ab16defd35e24ed909ca663 Mon Sep 17 00:00:00 2001 From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Date: Sat, 30 Dec 2023 18:28:00 -0500 Subject: [PATCH] Buff heat and flame damage (#23238) --- Content.Server/Atmos/EntitySystems/FlammableSystem.cs | 5 ++--- .../Lathe/Components/LatheHeatProducingComponent.cs | 2 +- Resources/Prototypes/Entities/Mobs/NPCs/animals.yml | 8 +------- Resources/Prototypes/Entities/Mobs/NPCs/argocyte.yml | 2 +- .../Prototypes/Entities/Mobs/Player/terminator.yml | 2 +- Resources/Prototypes/Entities/Mobs/Species/base.yml | 4 ++-- Resources/Prototypes/Entities/Mobs/Species/moth.yml | 6 +++--- .../Prototypes/Entities/Mobs/Species/reptilian.yml | 2 +- Resources/Prototypes/Entities/Mobs/base.yml | 10 +++++----- Resources/Prototypes/Entities/Objects/Misc/kudzu.yml | 4 ++-- .../Prototypes/Entities/Objects/Misc/spider_web.yml | 4 ++-- .../Prototypes/Entities/Structures/barricades.yml | 4 ++-- 12 files changed, 23 insertions(+), 30 deletions(-) diff --git a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs index f2434a54be..069429481c 100644 --- a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs +++ b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs @@ -394,10 +394,9 @@ namespace Content.Server.Atmos.EntitySystems EnsureComp(uid); _ignitionSourceSystem.SetIgnited(uid); - // TODO FLAMMABLE: further balancing - var damageScale = Math.Min((int)flammable.FireStacks, 5); + var damageScale = MathF.Min(flammable.FireStacks, 5); - if(TryComp(uid, out TemperatureComponent? temp)) + if (TryComp(uid, out TemperatureComponent? temp)) _temperatureSystem.ChangeHeat(uid, 12500 * damageScale, false, temp); _damageableSystem.TryChangeDamage(uid, flammable.Damage * damageScale); diff --git a/Content.Server/Lathe/Components/LatheHeatProducingComponent.cs b/Content.Server/Lathe/Components/LatheHeatProducingComponent.cs index ea5912ad2f..9da535eed8 100644 --- a/Content.Server/Lathe/Components/LatheHeatProducingComponent.cs +++ b/Content.Server/Lathe/Components/LatheHeatProducingComponent.cs @@ -14,7 +14,7 @@ public sealed partial class LatheHeatProducingComponent : Component /// The amount of energy produced each second when producing an item. /// [DataField, ViewVariables(VVAccess.ReadWrite)] - public float EnergyPerSecond = 40000; + public float EnergyPerSecond = 30000; [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))] public TimeSpan NextSecond; diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 6ed65d6856..8f8cb59d5e 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -1187,16 +1187,10 @@ types: Piercing: 9 - type: Temperature - heatDamageThreshold: 400 + heatDamageThreshold: 360 coldDamageThreshold: 285 currentTemperature: 310.15 specificHeat: 42 - coldDamage: - types: - Cold : 0.1 #per second, scales with temperature & other constants - heatDamage: - types: - Heat : 0.1 #per second, scales with temperature & other constants - type: Sprite drawdepth: Mobs layers: diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/argocyte.yml b/Resources/Prototypes/Entities/Mobs/NPCs/argocyte.yml index 4c36efa177..472daed59b 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/argocyte.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/argocyte.yml @@ -43,7 +43,7 @@ canResistFire: true damage: types: - Heat: 3 + Heat: 9 - type: FireVisuals sprite: Mobs/Effects/onfire.rsi normalState: Generic_mob_burning diff --git a/Resources/Prototypes/Entities/Mobs/Player/terminator.yml b/Resources/Prototypes/Entities/Mobs/Player/terminator.yml index 0867419f8b..c65b367393 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/terminator.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/terminator.yml @@ -47,7 +47,7 @@ - type: Flammable damage: types: - Heat: 2.0 + Heat: 6.0 # slightly wider thresholds - type: Temperature heatDamageThreshold: 390 diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml index 9f1a146f7f..71a60e9aa4 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/base.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml @@ -266,7 +266,7 @@ - type: Blindable # Other - type: Temperature - heatDamageThreshold: 360 + heatDamageThreshold: 325 coldDamageThreshold: 260 currentTemperature: 310.15 specificHeat: 42 @@ -275,7 +275,7 @@ Cold: 0.1 #per second, scales with temperature & other constants heatDamage: types: - Heat: 0.1 #per second, scales with temperature & other constants + Heat: 1.5 #per second, scales with temperature & other constants - type: ThermalRegulator metabolismHeat: 800 radiatedHeat: 100 diff --git a/Resources/Prototypes/Entities/Mobs/Species/moth.yml b/Resources/Prototypes/Entities/Mobs/Species/moth.yml index acb5abcda1..5dc1fba979 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/moth.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/moth.yml @@ -47,9 +47,9 @@ - type: Flammable damage: types: - Heat: 1.5 # moths burn more easily + Heat: 4.5 # moths burn more easily - type: Temperature # Moths hate the heat and thrive in the cold. - heatDamageThreshold: 335 + heatDamageThreshold: 320 coldDamageThreshold: 230 currentTemperature: 310.15 specificHeat: 46 @@ -58,7 +58,7 @@ Cold : 0.05 #per second, scales with temperature & other constants heatDamage: types: - Heat : 0.2 #per second, scales with temperature & other constants + Heat : 3 #per second, scales with temperature & other constants - type: Sprite # sprite again because we want different layer ordering noRot: true drawdepth: Mobs diff --git a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml index 7d5f3cdddc..b01f838119 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml @@ -57,7 +57,7 @@ Cold : 0.1 #per second, scales with temperature & other constants heatDamage: types: - Heat : 0.1 #per second, scales with temperature & other constants + Heat : 1.5 #per second, scales with temperature & other constants - type: entity parent: BaseSpeciesDummy diff --git a/Resources/Prototypes/Entities/Mobs/base.yml b/Resources/Prototypes/Entities/Mobs/base.yml index 8fb534e9fa..788b14f322 100644 --- a/Resources/Prototypes/Entities/Mobs/base.yml +++ b/Resources/Prototypes/Entities/Mobs/base.yml @@ -114,7 +114,7 @@ components: - type: AtmosExposed - type: Temperature - heatDamageThreshold: 360 + heatDamageThreshold: 325 coldDamageThreshold: 0 currentTemperature: 310.15 coldDamage: #per second, scales with temperature & other constants @@ -123,7 +123,7 @@ specificHeat: 42 heatDamage: #per second, scales with temperature & other constants types: - Heat : 0.1 + Heat : 1.5 - type: ThermalRegulator metabolismHeat: 800 radiatedHeat: 100 @@ -149,7 +149,7 @@ normalBodyTemperature: 310.15 thermalRegulationTemperatureThreshold: 25 - type: Temperature - heatDamageThreshold: 360 + heatDamageThreshold: 325 coldDamageThreshold: 260 currentTemperature: 310.15 specificHeat: 42 @@ -158,7 +158,7 @@ Cold: 1 #per second, scales with temperature & other constants heatDamage: types: - Heat: 1 #per second, scales with temperature & other constants + Heat: 1.5 #per second, scales with temperature & other constants - type: Barotrauma damage: types: @@ -175,7 +175,7 @@ canResistFire: true damage: #per second, scales with number of fire 'stacks' types: - Heat: 1 + Heat: 3 - type: FireVisuals sprite: Mobs/Effects/onfire.rsi normalState: Generic_mob_burning diff --git a/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml b/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml index 48b0068d94..5f3f8bb5cb 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/kudzu.yml @@ -54,7 +54,7 @@ types: {} damage: types: - Heat: 1 + Heat: 3 - type: Reactive groups: Flammable: [Touch] @@ -179,7 +179,7 @@ fireSpread: true damage: types: - Heat: 1 + Heat: 3 - type: GrowingKudzu growthTickChance: 0.3 - type: AtmosExposed diff --git a/Resources/Prototypes/Entities/Objects/Misc/spider_web.yml b/Resources/Prototypes/Entities/Objects/Misc/spider_web.yml index 0cba7656cb..af65ac95a8 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/spider_web.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/spider_web.yml @@ -66,7 +66,7 @@ types: {} damage: types: - Heat: 1 + Heat: 5 - type: Reactive groups: Flammable: [Touch] @@ -153,7 +153,7 @@ types: {} damage: types: - Heat: 1 + Heat: 5 - type: Reactive groups: Flammable: [Touch] diff --git a/Resources/Prototypes/Entities/Structures/barricades.yml b/Resources/Prototypes/Entities/Structures/barricades.yml index a66376c0d9..7f697519cd 100644 --- a/Resources/Prototypes/Entities/Structures/barricades.yml +++ b/Resources/Prototypes/Entities/Structures/barricades.yml @@ -59,7 +59,7 @@ fireSpread: true damage: types: - Heat: 1 #per second, scales with number of fire 'stacks' + Heat: 3 #per second, scales with number of fire 'stacks' - type: Appearance - type: FireVisuals sprite: Effects/fire.rsi @@ -107,7 +107,7 @@ fireSpread: true damage: types: - Heat: 1 #per second, scales with number of fire 'stacks' + Heat: 3 #per second, scales with number of fire 'stacks' - type: Appearance - type: FireVisuals sprite: Effects/fire.rsi