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

item toggling giga rework + full ninja refactor (#28039)

Browse Source 
* item toggle refactoring and some new systems

* add ToggleClothing component/system

* unhardcode magboots gravity logic

* make magboots and speedboots use ItemToggle and stuff

* remove now useless clothing components

* update client/server magboots systems

* add note to use ItemToggledEvent in ToggleActionEvent doc

* refactor PowerCellDraw to use ItemToggle for ui open/close control

* add TryUseCharges, refactor charges system

* update magboot trigger code

* make borg use ItemToggle, network SelectedModule instead of now removed Activated

* add AccessToggle for borg

* the giga ninja refactor

* update ninja yml

* update ItemToggle usage for some stuff

* fix activatableui requires power

* random fixing

* yaml fixing

* nuke ItemToggleDisarmMalus

* make defib use ItemToggle

* make things that use power not turn on if missing use charge

* pro

* fix sound prediction

* bruh

* proximity detector use ItemToggle

* oop

* big idiot syndrome

* fix ninja spawn rule and make it generic

* fix ninja spawn rule yml

* move loading profiles into AntagLoadProfileRule

* more ninja refactor

* ninja yml fixes

* the dreaded copy paste ops

* remove useless NinjaRuleComponent and ue AntagSelection for greeting

* fix invisibility

* move IsCompleted to SharedObjectivesSystem

* ability fixes

* oop fix powercell instantly draining itself

* sentient speedboots gaming

* make reflect use ItemToggle

* fix other test

* loadprofilerule moved into its own pr

* remove conflict with dragon refactor

* remove all GenericAntag code from ninja

* )

* probably

* remove old enabled

* great language bravo vince

* GREAT LANGUAGE

* who made this language

* because it stinks

* reparent blood-red magboots to magboots probbbly works

* most of the review stuff

* hasGrav doesnt mean what i thought it did

* make health analyzer use itemtoggle, not fail test

* fix mag/speed boots being wacky

* UNTROLL

* add ItemToggle to the random health analyzers

* a

* remove unused obsolete borg func

* untrolling

* :trollface:

* fix test

* fix

* g

* untroll

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
This commit is contained in:
deltanedas
2024-07-11 05:55:56 +00:00
committed by GitHub
parent e45f55e36d
commit 02636386b5
121 changed files with 1629 additions and 2014 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
Content.Shared/Ninja/Systems/SharedSpaceNinjaSystem.cs
View File

@@ -3,6 +3,7 @@ using Content.Shared.Ninja.Components;
using Content.Shared.Weapons.Melee.Events;
using Content.Shared.Weapons.Ranged.Events;
using Content.Shared.Popups;
using System.Diagnostics.CodeAnalysis;
namespace Content.Shared.Ninja.Systems;
@@ -14,49 +15,59 @@ public abstract class SharedSpaceNinjaSystem : EntitySystem
[Dependency] protected readonly SharedNinjaSuitSystem Suit = default!;
[Dependency] protected readonly SharedPopupSystem Popup = default!;
public EntityQuery<SpaceNinjaComponent> NinjaQuery;
public override void Initialize()
{
base.Initialize();
NinjaQuery = GetEntityQuery<SpaceNinjaComponent>();
SubscribeLocalEvent<SpaceNinjaComponent, AttackedEvent>(OnNinjaAttacked);
SubscribeLocalEvent<SpaceNinjaComponent, MeleeAttackEvent>(OnNinjaAttack);
SubscribeLocalEvent<SpaceNinjaComponent, ShotAttemptedEvent>(OnShotAttempted);
}
public bool IsNinja([NotNullWhen(true)] EntityUid? uid)
{
return NinjaQuery.HasComp(uid);
}
/// <summary>
/// Set the ninja's worn suit entity
/// </summary>
public void AssignSuit(EntityUid uid, EntityUid? suit, SpaceNinjaComponent? comp = null)
public void AssignSuit(Entity<SpaceNinjaComponent> ent, EntityUid? suit)
{
if (!Resolve(uid, ref comp) || comp.Suit == suit)
if (ent.Comp.Suit == suit)
return;
comp.Suit = suit;
Dirty(uid, comp);
ent.Comp.Suit = suit;
Dirty(ent, ent.Comp);
}
/// <summary>
/// Set the ninja's worn gloves entity
/// </summary>
public void AssignGloves(EntityUid uid, EntityUid? gloves, SpaceNinjaComponent? comp = null)
public void AssignGloves(Entity<SpaceNinjaComponent> ent, EntityUid? gloves)
{
if (!Resolve(uid, ref comp) || comp.Gloves == gloves)
if (ent.Comp.Gloves == gloves)
return;
comp.Gloves = gloves;
Dirty(uid, comp);
ent.Comp.Gloves = gloves;
Dirty(ent, ent.Comp);
}
/// <summary>
/// Bind a katana entity to a ninja, letting it be recalled and dash.
/// Does nothing if the player is not a ninja or already has a katana bound.
/// </summary>
public void BindKatana(EntityUid uid, EntityUid? katana, SpaceNinjaComponent? comp = null)
public void BindKatana(Entity<SpaceNinjaComponent?> ent, EntityUid katana)
{
if (!Resolve(uid, ref comp) || comp.Katana == katana)
if (!NinjaQuery.Resolve(ent, ref ent.Comp) || ent.Comp.Katana != null)
return;
comp.Katana = katana;
Dirty(uid, comp);
ent.Comp.Katana = katana;
Dirty(ent, ent.Comp);
}
/// <summary>
@@ -71,32 +82,32 @@ public abstract class SharedSpaceNinjaSystem : EntitySystem
/// <summary>
/// Handle revealing ninja if cloaked when attacked.
/// </summary>
private void OnNinjaAttacked(EntityUid uid, SpaceNinjaComponent comp, AttackedEvent args)
private void OnNinjaAttacked(Entity<SpaceNinjaComponent> ent, ref AttackedEvent args)
{
if (comp.Suit != null && TryComp<StealthClothingComponent>(comp.Suit, out var stealthClothing) && stealthClothing.Enabled)
{
Suit.RevealNinja(comp.Suit.Value, uid, true, null, stealthClothing);
}
TryRevealNinja(ent, disable: true);
}
/// <summary>
/// Handle revealing ninja if cloaked when attacking.
/// Only reveals, there is no cooldown.
/// </summary>
private void OnNinjaAttack(EntityUid uid, SpaceNinjaComponent comp, ref MeleeAttackEvent args)
private void OnNinjaAttack(Entity<SpaceNinjaComponent> ent, ref MeleeAttackEvent args)
{
if (comp.Suit != null && TryComp<StealthClothingComponent>(comp.Suit, out var stealthClothing) && stealthClothing.Enabled)
{
Suit.RevealNinja(comp.Suit.Value, uid, false, null, stealthClothing);
}
TryRevealNinja(ent, disable: false);
}
private void TryRevealNinja(Entity<SpaceNinjaComponent> ent, bool disable)
{
if (ent.Comp.Suit is {} uid && TryComp<NinjaSuitComponent>(ent.Comp.Suit, out var suit))
Suit.RevealNinja((uid, suit), ent, disable: disable);
}
/// <summary>
/// Require ninja to fight with HONOR, no guns!
/// </summary>
private void OnShotAttempted(EntityUid uid, SpaceNinjaComponent comp, ref ShotAttemptedEvent args)
private void OnShotAttempted(Entity<SpaceNinjaComponent> ent, ref ShotAttemptedEvent args)
{
Popup.PopupClient(Loc.GetString("gun-disabled"), uid, uid);
Popup.PopupClient(Loc.GetString("gun-disabled"), ent, ent);
args.Cancel();
}
}