Glass shards can be refined by welder (#2576)

* Added refine component for glass shard

* Add refinable to rest of the shards

* Fixed windows shard count

* Now objects can vary refine time

* Windows will spawn correct shards after destruction

* Added all requested changes

* Client ignore as well

Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
This commit is contained in:
Alex Evgrashin
2020-11-22 07:05:30 +03:00
committed by GitHub
parent eb97168e30
commit ccb7719935
4 changed files with 101 additions and 11 deletions

View File

@@ -210,8 +210,9 @@
"CrematoriumEntityStorage",
"RandomArcade",
"RandomSpriteState",
"WelderRefinable",
"ConveyorAssembly",
"TwoWayLever"
"TwoWayLever",
};
}
}

View File

@@ -0,0 +1,71 @@
#nullable enable
using System.Collections.Generic;
using System.Threading.Tasks;
using Content.Server.GameObjects.Components.Interactable;
using Content.Server.GameObjects.Components.Stack;
using Content.Shared.GameObjects.Components.Interactable;
using Content.Shared.Interfaces.GameObjects.Components;
using Robust.Shared.GameObjects;
using Robust.Shared.Serialization;
using Robust.Shared.ViewVariables;
namespace Content.Server.GameObjects.Components.Construction
{
/// <summary>
/// Used for something that can be refined by welder.
/// For example, glass shard can be refined to glass sheet.
/// </summary>
[RegisterComponent]
public class WelderRefinableComponent : Component, IInteractUsing
{
[ViewVariables]
private HashSet<string>? _refineResult = default;
[ViewVariables]
private float _refineTime;
private bool _beingWelded;
public override string Name => "WelderRefinable";
public override void ExposeData(ObjectSerializer serializer)
{
base.ExposeData(serializer);
serializer.DataField(ref _refineResult, "refineResult", new HashSet<string> { "GlassStack" });
serializer.DataField(ref _refineTime, "refineTime", 2f);
}
public async Task<bool> InteractUsing(InteractUsingEventArgs eventArgs)
{
// check if object is welder
if (!eventArgs.Using.TryGetComponent(out ToolComponent? tool))
return false;
// check if someone is already welding object
if (_beingWelded)
return false;
_beingWelded = true;
if (!await tool.UseTool(eventArgs.User, Owner, _refineTime, ToolQuality.Welding))
{
// failed to veld - abort refine
_beingWelded = false;
return false;
}
// get last owner coordinates and delete it
var resultPosition = Owner.Transform.Coordinates;
Owner.Delete();
// spawn each result afrer refine
foreach (var result in _refineResult!)
{
var droppedEnt = Owner.EntityManager.SpawnEntity(result, resultPosition);
if (droppedEnt.TryGetComponent<StackComponent>(out var stackComp))
stackComp.Count = 1;
}
return true;
}
}
}

View File

@@ -33,7 +33,7 @@
spawnOnDestroy:
ShardGlass:
Min: 1
Max: 3
Max: 2
- type: SnapGrid
offset: Center
- type: Airtight
@@ -58,6 +58,10 @@
sprite: Constructible/Structures/Windows/reinforced_window.rsi
- type: Destructible
deadThreshold: 75
spawnOnDestroy:
ShardGlassReinforced:
Min: 1
Max: 2
resistances: metallicResistances
- type: Window
base: rwindow
@@ -77,6 +81,10 @@
sprite: Constructible/Structures/Windows/phoron_window.rsi
- type: Destructible
deadThreshold: 100
spawnOnDestroy:
ShardGlassPhoron:
Min: 1
Max: 2
resistances: metallicResistances
- type: Window
base: pwindow

View File

@@ -29,6 +29,9 @@
color: "#bbeeff"
- type: Item
color: "#bbeeff"
- type: WelderRefinable
refineResult:
- GlassStack
- type: entity
id: ShardGlassReinforced
@@ -40,7 +43,10 @@
color: "#96cdef"
- type: Item
color: "#96cdef"
- type: WelderRefinable
refineResult:
- GlassStack
- MetalStack
- type: entity
id: ShardGlassPhoron
name: phoron glass shard
@@ -51,3 +57,7 @@
color: "#f3b489"
- type: Item
color: "#f3b489"
- type: WelderRefinable
refineResult:
- GlassStack
- PhoronStack