Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Refactors smoking to ECS, smoking actually makes you inhale reagents. (#4678)

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-09-26 15:19:00 +02:00
committed by GitHub
parent 0767bd3777
commit f913d8361d
19 changed files with 284 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Client/Entry/IgnoredComponents.cs
View File

@@ -179,7 +179,8 @@ namespace Content.Client.Entry
"Spillable",
"SpaceVillainArcade",
"Flammable",
"Smoking",
"Smokable",
"Cigar",
"Matchstick",
"Matchbox",
"BlockGameArcade",

30
Content.Client/Smoking/BurnStateVisualizer.cs
View File

@@ -1,4 +1,5 @@
using Content.Shared.Smoking;
using Content.Client.Clothing;
using Content.Shared.Smoking;
using JetBrains.Annotations;
using Robust.Client.GameObjects;
using Robust.Shared.Serialization.Manager.Attributes;
@@ -15,29 +16,46 @@ namespace Content.Client.Smoking
[DataField("unlitIcon")]
private string _unlitIcon = "icon";
[DataField("burntPrefix")]
private string _burntPrefix = "unlit";
[DataField("litPrefix")]
private string _litPrefix = "lit";
[DataField("unlitPrefix")]
private string _unlitPrefix = "unlit";
public override void OnChangeData(AppearanceComponent component)
{
base.OnChangeData(component);
if (component.TryGetData<SharedBurningStates>(SmokingVisuals.Smoking, out var smoking))
if (component.TryGetData<SmokableState>(SmokingVisuals.Smoking, out var smoking))
{
SetState(component, smoking);
}
}
private void SetState(AppearanceComponent component, SharedBurningStates burnState)
private void SetState(AppearanceComponent component, SmokableState burnState)
{
var clothing = component.Owner.GetComponentOrNull<ClothingComponent>();
if (component.Owner.TryGetComponent<ISpriteComponent>(out var sprite))
{
switch (burnState)
{
case SharedBurningStates.Lit:
case SmokableState.Lit:
if (clothing != null)
clothing.ClothingEquippedPrefix = _litPrefix;
sprite.LayerSetState(0, _litIcon);
break;
case SharedBurningStates.Burnt:
case SmokableState.Burnt:
if (clothing != null)
clothing.ClothingEquippedPrefix = _burntPrefix;
sprite.LayerSetState(0, _burntIcon);
break;
default:
case SmokableState.Unlit:
if (clothing != null)
clothing.ClothingEquippedPrefix = _unlitPrefix;
sprite.LayerSetState(0, _unlitIcon);
break;
}