tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

action refactor proper ecs edition (#27422)

Browse Source
This commit is contained in:
deltanedas
2025-05-28 19:52:11 +00:00
committed by GitHub
parent a9f7cfbcb6
commit b3825dce97
111 changed files with 1995 additions and 2901 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Content.Shared/Actions/ActionUpgradeSystem.cs
View File

@@ -1,5 +1,6 @@
using System.Diagnostics.CodeAnalysis;
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using Content.Shared.Actions.Components;
using Content.Shared.Actions.Events;
using Robust.Shared.Prototypes;
using Robust.Shared.Utility;
@@ -22,13 +23,13 @@ public sealed class ActionUpgradeSystem : EntitySystem
private void OnActionUpgradeEvent(EntityUid uid, ActionUpgradeComponent component, ActionUpgradeEvent args)
{
if (!CanUpgrade(args.NewLevel, component.EffectedLevels, out var newActionProto)
|| !_actions.TryGetActionData(uid, out var actionComp))
|| _actions.GetAction(uid) is not {} action)
return;
var originalContainer = actionComp.Container;
var originalAttachedEntity = actionComp.AttachedEntity;
var originalContainer = action.Comp.Container;
var originalAttachedEntity = action.Comp.AttachedEntity;
_actionContainer.RemoveAction(uid, actionComp);
_actionContainer.RemoveAction((action, action));
EntityUid? upgradedActionId = null;
if (originalContainer != null
@@ -150,16 +151,16 @@ public sealed class ActionUpgradeSystem : EntitySystem
// RaiseActionUpgradeEvent(newLevel, actionId.Value);
if (!CanUpgrade(newLevel, actionUpgradeComponent.EffectedLevels, out var newActionPrototype)
|| !_actions.TryGetActionData(actionId, out var actionComp))
|| _actions.GetAction(actionId) is not {} action)
return null;
newActionProto ??= newActionPrototype;
DebugTools.AssertNotNull(newActionProto);
var originalContainer = actionComp.Container;
var originalAttachedEntity = actionComp.AttachedEntity;
var originalContainer = action.Comp.Container;
var originalAttachedEntity = action.Comp.AttachedEntity;
_actionContainer.RemoveAction(actionId.Value, actionComp);
_actionContainer.RemoveAction((action, action.Comp));
EntityUid? upgradedActionId = null;
if (originalContainer != null