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

[Revert] Reverts Ninja (#15516)

Browse Source 
* Revert "[Antag] add space ninja as midround antag (#14069)"

This reverts commit c1cda0dbf8.

* Revert "[Fix] move ninja objectives into NinjaRole (#15490)"

This reverts commit 251f429fb3.
This commit is contained in:
keronshb
2023-04-19 03:43:09 -04:00
committed by GitHub
parent 6161f7d5f3
commit ac87effca0
81 changed files with 20 additions and 2742 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
Content.Server/Objectives/Conditions/DoorjackCondition.cs
View File

@@ -1,62 +0,0 @@
using Content.Server.Ninja.Systems;
using Content.Server.Objectives.Interfaces;
using Robust.Shared.Random;
using Robust.Shared.Utility;
namespace Content.Server.Objectives.Conditions;
[DataDefinition]
public sealed class DoorjackCondition : IObjectiveCondition
{
private Mind.Mind? _mind;
private int _target;
public IObjectiveCondition GetAssigned(Mind.Mind mind)
{
// TODO: clamp to number of doors on station incase its somehow a shittle or something
return new DoorjackCondition {
_mind = mind,
_target = IoCManager.Resolve<IRobustRandom>().Next(15, 40)
};
}
public string Title => Loc.GetString("objective-condition-doorjack-title", ("count", _target));
public string Description => Loc.GetString("objective-condition-doorjack-description", ("count", _target));
public SpriteSpecifier Icon => new SpriteSpecifier.Rsi(new ResourcePath("Objects/Tools/emag.rsi"), "icon");
public float Progress
{
get
{
// prevent divide-by-zero
if (_target == 0)
return 1f;
if (!NinjaSystem.GetNinjaRole(_mind, out var role))
return 0f;
return (float) role.DoorsJacked / (float) _target;
}
}
public float Difficulty => 1.5f;
public bool Equals(IObjectiveCondition? other)
{
return other is DoorjackCondition cond && Equals(_mind, cond._mind) && _target == cond._target;
}
public override bool Equals(object? obj)
{
if (ReferenceEquals(null, obj)) return false;
if (ReferenceEquals(this, obj)) return true;
return obj is DoorjackCondition cond && cond.Equals(this);
}
public override int GetHashCode()
{
return HashCode.Combine(_mind?.GetHashCode() ?? 0, _target);
}
}

62
Content.Server/Objectives/Conditions/DownloadCondition.cs
View File

@@ -1,62 +0,0 @@
using Content.Server.Ninja.Systems;
using Content.Server.Objectives.Interfaces;
using Robust.Shared.Random;
using Robust.Shared.Utility;
namespace Content.Server.Objectives.Conditions;
[DataDefinition]
public sealed class DownloadCondition : IObjectiveCondition
{
private Mind.Mind? _mind;
private int _target;
public IObjectiveCondition GetAssigned(Mind.Mind mind)
{
// TODO: clamp to number of research nodes in tree so easily maintainable
return new DownloadCondition {
_mind = mind,
_target = IoCManager.Resolve<IRobustRandom>().Next(5, 10)
};
}
public string Title => Loc.GetString("objective-condition-download-title", ("count", _target));
public string Description => Loc.GetString("objective-condition-download-description");
public SpriteSpecifier Icon => new SpriteSpecifier.Rsi(new ResourcePath("Structures/Machines/server.rsi"), "server");
public float Progress
{
get
{
// prevent divide-by-zero
if (_target == 0)
return 1f;
if (!NinjaSystem.GetNinjaRole(_mind, out var role))
return 0f;
return (float) role.DownloadedNodes.Count / (float) _target;
}
}
public float Difficulty => 2.5f;
public bool Equals(IObjectiveCondition? other)
{
return other is DownloadCondition cond && Equals(_mind, cond._mind) && _target == cond._target;
}
public override bool Equals(object? obj)
{
if (ReferenceEquals(null, obj)) return false;
if (ReferenceEquals(this, obj)) return true;
return obj is DownloadCondition cond && cond.Equals(this);
}
public override int GetHashCode()
{
return HashCode.Combine(_mind?.GetHashCode() ?? 0, _target);
}
}

70
Content.Server/Objectives/Conditions/SpiderChargeCondition.cs
View File

@@ -1,70 +0,0 @@
using Content.Server.Ninja.Systems;
using Content.Server.Objectives.Interfaces;
using Content.Server.Warps;
using Robust.Shared.Random;
using Robust.Shared.Utility;
namespace Content.Server.Objectives.Conditions;
[DataDefinition]
public sealed class SpiderChargeCondition : IObjectiveCondition
{
private Mind.Mind? _mind;
public IObjectiveCondition GetAssigned(Mind.Mind mind)
{
return new SpiderChargeCondition {
_mind = mind
};
}
public string Title
{
get
{
var entMan = IoCManager.Resolve<IEntityManager>();
if (!NinjaSystem.GetNinjaRole(_mind, out var role)
|| role.SpiderChargeTarget == null
|| !entMan.TryGetComponent<WarpPointComponent>(role.SpiderChargeTarget, out var warp)
|| warp.Location == null)
// this should never really happen but eh
return Loc.GetString("objective-condition-spider-charge-no-target");
return Loc.GetString("objective-condition-spider-charge-title", ("location", warp.Location));
}
}
public string Description => Loc.GetString("objective-condition-spider-charge-description");
public SpriteSpecifier Icon => new SpriteSpecifier.Rsi(new ResourcePath("Objects/Weapons/Bombs/spidercharge.rsi"), "icon");
public float Progress
{
get
{
if (!NinjaSystem.GetNinjaRole(_mind, out var role))
return 0f;
return role.SpiderChargeDetonated ? 1f : 0f;
}
}
public float Difficulty => 2.5f;
public bool Equals(IObjectiveCondition? other)
{
return other is SpiderChargeCondition cond && Equals(_mind, cond._mind);
}
public override bool Equals(object? obj)
{
if (ReferenceEquals(null, obj)) return false;
if (ReferenceEquals(this, obj)) return true;
return obj is SpiderChargeCondition cond && cond.Equals(this);
}
public override int GetHashCode()
{
return _mind?.GetHashCode() ?? 0;
}
}

43
Content.Server/Objectives/Conditions/SurviveCondition.cs
View File

@@ -1,43 +0,0 @@
using Content.Server.Objectives.Interfaces;
using Robust.Shared.Utility;
namespace Content.Server.Objectives.Conditions;
[DataDefinition]
public sealed class SurviveCondition : IObjectiveCondition
{
private Mind.Mind? _mind;
public IObjectiveCondition GetAssigned(Mind.Mind mind)
{
return new SurviveCondition {_mind = mind};
}
public string Title => Loc.GetString("objective-condition-survive-title");
public string Description => Loc.GetString("objective-condition-survive-description");
public SpriteSpecifier Icon => new SpriteSpecifier.Rsi(new ResourcePath("Clothing/Head/Helmets/spaceninja.rsi"), "icon");
public float Difficulty => 0.5f;
public float Progress => (_mind?.CharacterDeadIC ?? true) ? 0f : 1f;
public bool Equals(IObjectiveCondition? other)
{
return other is SurviveCondition condition && Equals(_mind, condition._mind);
}
public override bool Equals(object? obj)
{
if (ReferenceEquals(null, obj)) return false;
if (ReferenceEquals(this, obj)) return true;
if (obj.GetType() != GetType()) return false;
return Equals((SurviveCondition) obj);
}
public override int GetHashCode()
{
return (_mind != null ? _mind.GetHashCode() : 0);
}
}

52
Content.Server/Objectives/Conditions/TerrorCondition.cs
View File

@@ -1,52 +0,0 @@
using Content.Server.Ninja.Systems;
using Content.Server.Objectives.Interfaces;
using Robust.Shared.Utility;
namespace Content.Server.Objectives.Conditions;
[DataDefinition]
public sealed class TerrorCondition : IObjectiveCondition
{
private Mind.Mind? _mind;
public IObjectiveCondition GetAssigned(Mind.Mind mind)
{
return new TerrorCondition {_mind = mind};
}
public string Title => Loc.GetString("objective-condition-terror-title");
public string Description => Loc.GetString("objective-condition-terror-description");
public SpriteSpecifier Icon => new SpriteSpecifier.Rsi(new ResourcePath("Structures/Machines/computers.rsi"), "comm_icon");
public float Progress
{
get
{
if (!NinjaSystem.GetNinjaRole(_mind, out var role))
return 0f;
return role.CalledInThreat ? 1f : 0f;
}
}
public float Difficulty => 2.75f;
public bool Equals(IObjectiveCondition? other)
{
return other is TerrorCondition cond && Equals(_mind, cond._mind);
}
public override bool Equals(object? obj)
{
if (ReferenceEquals(null, obj)) return false;
if (ReferenceEquals(this, obj)) return true;
return obj is TerrorCondition cond && cond.Equals(this);
}
public override int GetHashCode()
{
return _mind?.GetHashCode() ?? 0;
}
}

13
Content.Server/Objectives/Requirements/NinjaRequirement.cs
View File

@@ -1,13 +0,0 @@
using Content.Server.Objectives.Interfaces;
using Content.Server.Ninja;
namespace Content.Server.Objectives.Requirements;
[DataDefinition]
public sealed class NinjaRequirement : IObjectiveRequirement
{
public bool CanBeAssigned(Mind.Mind mind)
{
return mind.HasRole<NinjaRole>();
}
}