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

Action container rejig (#20260)

Browse Source 
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
This commit is contained in:
Leon Friedrich
2023-09-23 04:49:39 -04:00
committed by GitHub
parent c80c90ed65
commit 684b334806
50 changed files with 889 additions and 740 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Shared/Spider/SharedSpiderSystem.cs
View File

@@ -15,20 +15,18 @@ public abstract class SharedSpiderSystem : EntitySystem
{
base.Initialize();
SubscribeLocalEvent<SpiderComponent, ComponentStartup>(OnSpiderStartup);
SubscribeLocalEvent<SpiderComponent, MapInitEvent>(OnInit);
SubscribeLocalEvent<SpiderWebObjectComponent, ComponentStartup>(OnWebStartup);
}
private void OnSpiderStartup(EntityUid uid, SpiderComponent component, ComponentStartup args)
private void OnInit(EntityUid uid, SpiderComponent component, MapInitEvent args)
{
if (_net.IsClient)
return;
_action.AddAction(uid, Spawn(component.WebAction), null);
_action.AddAction(uid, ref component.Action, component.WebAction, uid);
}
private void OnWebStartup(EntityUid uid, SpiderWebObjectComponent component, ComponentStartup args)
{
// TODO dont use this. use some general random appearance system
_appearance.SetData(uid, SpiderWebVisuals.Variant, _robustRandom.Next(1, 3));
}
}

2
Content.Shared/Spider/SpiderComponent.cs
View File

@@ -16,6 +16,8 @@ public sealed partial class SpiderComponent : Component
[ViewVariables(VVAccess.ReadWrite)]
[DataField("webAction", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
public string WebAction = "ActionSpiderWeb";
[DataField] public EntityUid? Action;
}
public sealed partial class SpiderWebActionEvent : InstantActionEvent { }