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

Re-organize all projects (#4166)

Browse Source
This commit is contained in:
DrSmugleaf
2021-06-09 22:19:39 +02:00
committed by GitHub
parent 9f50e4061b
commit ff1a2d97ea
1773 changed files with 5258 additions and 5508 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/Objectives/Conditions/DieCondition.cs
View File

@@ -1,7 +1,5 @@
#nullable enable
using Content.Server.Mobs;
using Content.Server.Objectives.Interfaces;
using Content.Shared.GameObjects.Components.Mobs.State;
using JetBrains.Annotations;
using Robust.Shared.Localization;
using Robust.Shared.Serialization.Manager.Attributes;
@@ -13,9 +11,9 @@ namespace Content.Server.Objectives.Conditions
[DataDefinition]
public class DieCondition : IObjectiveCondition
{
private Mind? _mind;
private Mind.Mind? _mind;
public IObjectiveCondition GetAssigned(Mind mind)
public IObjectiveCondition GetAssigned(Mind.Mind mind)
{
return new DieCondition {_mind = mind};
}

6
Content.Server/Objectives/Conditions/KillPersonCondition.cs
View File

@@ -1,7 +1,5 @@
#nullable enable
using Content.Server.Mobs;
using Content.Server.Objectives.Interfaces;
using Content.Shared.GameObjects.Components.Mobs.State;
using Robust.Shared.Localization;
using Robust.Shared.Utility;
@@ -9,8 +7,8 @@ namespace Content.Server.Objectives.Conditions
{
public abstract class KillPersonCondition : IObjectiveCondition
{
protected Mind? Target;
public abstract IObjectiveCondition GetAssigned(Mind mind);
protected Mind.Mind? Target;
public abstract IObjectiveCondition GetAssigned(Mind.Mind mind);
public string Title => Loc.GetString("Kill {0}", Target?.OwnedEntity?.Name ?? "");

7
Content.Server/Objectives/Conditions/KillRandomPersonCondition.cs
View File

@@ -1,8 +1,7 @@
using System.Linq;
using Content.Server.GameObjects.Components.Mobs;
using Content.Server.Mobs;
using Content.Server.Mind.Components;
using Content.Server.Objectives.Interfaces;
using Content.Shared.GameObjects.Components.Mobs.State;
using Content.Shared.MobState;
using JetBrains.Annotations;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
@@ -15,7 +14,7 @@ namespace Content.Server.Objectives.Conditions
[DataDefinition]
public class KillRandomPersonCondition : KillPersonCondition
{
public override IObjectiveCondition GetAssigned(Mind mind)
public override IObjectiveCondition GetAssigned(Mind.Mind mind)
{
var entityMgr = IoCManager.Resolve<IEntityManager>();
var allHumans = entityMgr.ComponentManager.EntityQuery<MindComponent>(true).Where(mc =>

6
Content.Server/Objectives/Conditions/StayAliveCondition.cs
View File

@@ -1,7 +1,5 @@
#nullable enable
using Content.Server.Mobs;
using Content.Server.Objectives.Interfaces;
using Content.Shared.GameObjects.Components.Mobs.State;
using JetBrains.Annotations;
using Robust.Shared.Localization;
using Robust.Shared.Serialization.Manager.Attributes;
@@ -13,9 +11,9 @@ namespace Content.Server.Objectives.Conditions
[DataDefinition]
public class StayAliveCondition : IObjectiveCondition
{
private Mind? _mind;
private Mind.Mind? _mind;
public IObjectiveCondition GetAssigned(Mind mind)
public IObjectiveCondition GetAssigned(Mind.Mind mind)
{
return new StayAliveCondition {_mind = mind};
}

6
Content.Server/Objectives/Conditions/StealCondition.cs
View File

@@ -1,7 +1,7 @@
#nullable enable
using System;
using Content.Server.Containers;
using Content.Server.GameObjects;
using Content.Server.Mobs;
using Content.Server.Objectives.Interfaces;
using JetBrains.Annotations;
using Robust.Shared.Containers;
@@ -19,11 +19,11 @@ namespace Content.Server.Objectives.Conditions
[DataDefinition]
public class StealCondition : IObjectiveCondition, ISerializationHooks
{
private Mind? _mind;
private Mind.Mind? _mind;
[DataField("prototype")] private string _prototypeId = string.Empty;
[DataField("amount")] private int _amount = 1;
public IObjectiveCondition GetAssigned(Mind mind)
public IObjectiveCondition GetAssigned(Mind.Mind mind)
{
return new StealCondition
{