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

Cleanup warning in StealConditionSystem (#37903)

Browse Source 
Fix 1 warning in StealConditionSystem
This commit is contained in:
Tayrtahn
2025-05-28 12:17:43 -04:00
committed by GitHub
parent f6dcae8d3a
commit 447f866745
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Server/Objectives/Systems/StealConditionSystem.cs
View File

@@ -79,7 +79,7 @@ public sealed class StealConditionSystem : EntitySystem
var group = _proto.Index(condition.Comp.StealGroup); var group = _proto.Index(condition.Comp.StealGroup);
string localizedName = Loc.GetString(group.Name); string localizedName = Loc.GetString(group.Name);
var title =condition.Comp.OwnerText == null var title = condition.Comp.OwnerText == null
? Loc.GetString(condition.Comp.ObjectiveNoOwnerText, ("itemName", localizedName)) ? Loc.GetString(condition.Comp.ObjectiveNoOwnerText, ("itemName", localizedName))
: Loc.GetString(condition.Comp.ObjectiveText, ("owner", Loc.GetString(condition.Comp.OwnerText)), ("itemName", localizedName)); : Loc.GetString(condition.Comp.ObjectiveText, ("owner", Loc.GetString(condition.Comp.OwnerText)), ("itemName", localizedName));
@@ -93,12 +93,12 @@ public sealed class StealConditionSystem : EntitySystem
} }
private void OnGetProgress(Entity<StealConditionComponent> condition, ref ObjectiveGetProgressEvent args) private void OnGetProgress(Entity<StealConditionComponent> condition, ref ObjectiveGetProgressEvent args)
{ {
args.Progress = GetProgress(args.Mind, condition); args.Progress = GetProgress((args.MindId, args.Mind), condition);
} }
private float GetProgress(MindComponent mind, StealConditionComponent condition) private float GetProgress(Entity<MindComponent> mind, StealConditionComponent condition)
{ {
if (!_containerQuery.TryGetComponent(mind.OwnedEntity, out var currentManager)) if (!_containerQuery.TryGetComponent(mind.Comp.OwnedEntity, out var currentManager))
return 0; return 0;
var containerStack = new Stack<ContainerManagerComponent>(); var containerStack = new Stack<ContainerManagerComponent>();
@@ -128,7 +128,7 @@ public sealed class StealConditionSystem : EntitySystem
} }
//check pulling object //check pulling object
if (TryComp<PullerComponent>(mind.OwnedEntity, out var pull)) //TO DO: to make the code prettier? don't like the repetition if (TryComp<PullerComponent>(mind.Comp.OwnedEntity, out var pull)) //TO DO: to make the code prettier? don't like the repetition
{ {
var pulledEntity = pull.Pulling; var pulledEntity = pull.Pulling;
if (pulledEntity != null) if (pulledEntity != null)
@@ -155,7 +155,7 @@ public sealed class StealConditionSystem : EntitySystem
} }
} while (containerStack.TryPop(out currentManager)); } while (containerStack.TryPop(out currentManager));
var result = count / (float) condition.CollectionSize; var result = count / (float)condition.CollectionSize;
result = Math.Clamp(result, 0, 1); result = Math.Clamp(result, 0, 1);
return result; return result;
} }