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

ConstructionGL2 Part 2: Better guided steps and recipes. (#5103)

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-11-02 11:24:32 +01:00
committed by GitHub
parent 5be8271907
commit 5a5006e4cf
45 changed files with 725 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Shared/Construction/Steps/ArbitraryInsertConstructionGraphStep.cs
View File

@@ -9,7 +9,7 @@ namespace Content.Shared.Construction.Steps
{
[DataField("name")] public string Name { get; private set; } = string.Empty;
[DataField("icon")] public SpriteSpecifier Icon { get; private set; } = SpriteSpecifier.Invalid;
[DataField("icon")] public SpriteSpecifier? Icon { get; private set; } = null;
public override void DoExamine(ExaminedEvent examinedEvent)
{
@@ -18,5 +18,15 @@ namespace Content.Shared.Construction.Steps
examinedEvent.Message.AddMarkup(Loc.GetString("construction-insert-arbitrary-entity", ("stepName", Name)));
}
public override ConstructionGuideEntry GenerateGuideEntry()
{
return new ConstructionGuideEntry()
{
Localization = "construction-presenter-arbitrary-step",
Arguments = new (string, object)[]{("name", Name)},
Icon = Icon,
};
}
}
}

1
Content.Shared/Construction/Steps/ConstructionGraphStep.cs
View File

@@ -16,5 +16,6 @@ namespace Content.Shared.Construction.Steps
public IReadOnlyList<IGraphAction> Completed => _completed;
public abstract void DoExamine(ExaminedEvent examinedEvent);
public abstract ConstructionGuideEntry GenerateGuideEntry();
}
}

23
Content.Shared/Construction/Steps/MaterialConstructionGraphStep.cs
View File

@@ -6,6 +6,7 @@ using Robust.Shared.IoC;
using Robust.Shared.Localization;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
namespace Content.Shared.Construction.Steps
{
@@ -14,16 +15,16 @@ namespace Content.Shared.Construction.Steps
{
// TODO: Make this use the material system.
// TODO TODO: Make the material system not shit.
[DataField("material")] public string MaterialPrototypeId { get; } = "Steel";
[DataField("material", required:true, customTypeSerializer:typeof(PrototypeIdSerializer<StackPrototype>))]
public string MaterialPrototypeId { get; } = "Steel";
[DataField("amount")] public int Amount { get; } = 1;
public StackPrototype MaterialPrototype =>
IoCManager.Resolve<IPrototypeManager>().Index<StackPrototype>(MaterialPrototypeId);
public override void DoExamine(ExaminedEvent examinedEvent)
{
examinedEvent.Message.AddMarkup(Loc.GetString("construction-insert-material-entity", ("amount", Amount), ("materialName", MaterialPrototype.Name)));
var material = IoCManager.Resolve<IPrototypeManager>().Index<StackPrototype>(MaterialPrototypeId);
examinedEvent.Message.AddMarkup(Loc.GetString("construction-insert-material-entity", ("amount", Amount), ("materialName", material.Name)));
}
public override bool EntityValid(IEntity entity)
@@ -40,5 +41,17 @@ namespace Content.Shared.Construction.Steps
return stack != null;
}
public override ConstructionGuideEntry GenerateGuideEntry()
{
var material = IoCManager.Resolve<IPrototypeManager>().Index<StackPrototype>(MaterialPrototypeId);
return new ConstructionGuideEntry()
{
Localization = "construction-presenter-material-step",
Arguments = new (string, object)[]{("amount", Amount), ("material", material.Name)},
Icon = material.Icon,
};
}
}
}

12
Content.Shared/Construction/Steps/ToolConstructionGraphStep.cs
View File

@@ -35,5 +35,17 @@ namespace Content.Shared.Construction.Steps
examinedEvent.PushMarkup(Loc.GetString("construction-use-tool-entity", ("toolName", Loc.GetString(quality.ToolName))));
}
public override ConstructionGuideEntry GenerateGuideEntry()
{
var quality = IoCManager.Resolve<IPrototypeManager>().Index<ToolQualityPrototype>(Tool);
return new ConstructionGuideEntry()
{
Localization = "construction-presenter-tool-step",
Arguments = new (string, object)[]{("tool", quality.ToolName)},
Icon = quality.Icon,
};
}
}
}