tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Buff heat and flame damage (#23238)

Browse Source
This commit is contained in:
Nemanja
2023-12-30 18:28:00 -05:00
committed by GitHub
parent 83d51dbd77
commit cfb129c5a4
12 changed files with 23 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Server/Atmos/EntitySystems/FlammableSystem.cs
View File

@@ -394,10 +394,9 @@ namespace Content.Server.Atmos.EntitySystems
EnsureComp<IgnitionSourceComponent>(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);

2
Content.Server/Lathe/Components/LatheHeatProducingComponent.cs
View File

@@ -14,7 +14,7 @@ public sealed partial class LatheHeatProducingComponent : Component
/// The amount of energy produced each second when producing an item.
/// </summary>
[DataField, ViewVariables(VVAccess.ReadWrite)]
public float EnergyPerSecond = 40000;
public float EnergyPerSecond = 30000;
[DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
public TimeSpan NextSecond;

8
Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
View File

@@ -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:

2
Resources/Prototypes/Entities/Mobs/NPCs/argocyte.yml
View File

@@ -43,7 +43,7 @@
canResistFire: true
damage:
types:
Heat: 3
Heat: 9
- type: FireVisuals
sprite: Mobs/Effects/onfire.rsi
normalState: Generic_mob_burning

2
Resources/Prototypes/Entities/Mobs/Player/terminator.yml
View File

@@ -47,7 +47,7 @@
- type: Flammable
damage:
types:
Heat: 2.0
Heat: 6.0
# slightly wider thresholds
- type: Temperature
heatDamageThreshold: 390

4
Resources/Prototypes/Entities/Mobs/Species/base.yml
View File

@@ -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

6
Resources/Prototypes/Entities/Mobs/Species/moth.yml
View File

@@ -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

2
Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
View File

@@ -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

10
Resources/Prototypes/Entities/Mobs/base.yml
View File

@@ -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

4
Resources/Prototypes/Entities/Objects/Misc/kudzu.yml
View File

@@ -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

4
Resources/Prototypes/Entities/Objects/Misc/spider_web.yml
View File

@@ -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]

4
Resources/Prototypes/Entities/Structures/barricades.yml
View File

@@ -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