КОСТЁР (#22)

* респрайт костра, новый костёр

* fix itemheating

* этот костер потребовал слишком много работы

* перекрас травы
This commit is contained in:
Ed
2024-04-03 00:48:08 +03:00
committed by GitHub
parent ca4172c987
commit 0bc1c31193
19 changed files with 196 additions and 0 deletions

View File

@@ -27,6 +27,7 @@ using Robust.Shared.Physics.Components;
using Robust.Shared.Physics.Events;
using Robust.Shared.Physics.Systems;
using Robust.Shared.Random;
using Content.Server.CrystallPunk.Temperature;
namespace Content.Server.Atmos.EntitySystems
{
@@ -296,6 +297,12 @@ namespace Content.Server.Atmos.EntitySystems
_ignitionSourceSystem.SetIgnited(uid, false);
//CrystallPunk bonfire moment
var ev = new OnFireChangedEvent(flammable.OnFire);
RaiseLocalEvent(uid, ref ev);
//CrystallPunk bonfire moment end
UpdateAppearance(uid, flammable);
}
@@ -317,9 +324,19 @@ namespace Content.Server.Atmos.EntitySystems
else
_adminLogger.Add(LogType.Flammable, $"{ToPrettyString(uid):target} set on fire by {ToPrettyString(ignitionSource):actor}");
flammable.OnFire = true;
//CrystallPunk bonfire moment
var ev = new OnFireChangedEvent(flammable.OnFire);
RaiseLocalEvent(uid, ref ev);
//CrystallPunk bonfire moment end
}
UpdateAppearance(uid, flammable);
//CrystallPunk bonfire moment
if (flammable.FirestackFadeOnIgnite != null)
flammable.FirestackFade = flammable.FirestackFadeOnIgnite.Value;
//CrystallPunk bonfire moment end
}
private void OnDamageChanged(EntityUid uid, IgniteOnHeatDamageComponent component, DamageChangedEvent args)
@@ -434,6 +451,11 @@ namespace Content.Server.Atmos.EntitySystems
_damageableSystem.TryChangeDamage(uid, flammable.Damage * damageScale, interruptsDoAfters: false);
AdjustFireStacks(uid, flammable.FirestackFade * (flammable.Resisting ? 10f : 1f), flammable);
//CrystallPunk bonfire moment
if (flammable.FirestackFadeFade != 0)
flammable.FirestackFade += flammable.FirestackFadeFade * frameTime;
//CrystallPunk bonfire moment end
}
else
{