item toggling giga rework + full ninja refactor (#28039)
* 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
@@ -16,6 +16,7 @@ namespace Content.Shared.Ninja.Systems;
|
||||
/// </summary>
|
||||
public sealed class DashAbilitySystem : EntitySystem
|
||||
{
|
||||
[Dependency] private readonly ActionContainerSystem _actionContainer = default!;
|
||||
[Dependency] private readonly IGameTiming _timing = default!;
|
||||
[Dependency] private readonly SharedAudioSystem _audio = default!;
|
||||
[Dependency] private readonly SharedChargesSystem _charges = default!;
|
||||
@@ -23,48 +24,40 @@ public sealed class DashAbilitySystem : EntitySystem
|
||||
[Dependency] private readonly ExamineSystemShared _examine = default!;
|
||||
[Dependency] private readonly SharedPopupSystem _popup = default!;
|
||||
[Dependency] private readonly SharedTransformSystem _transform = default!;
|
||||
[Dependency] private readonly ActionContainerSystem _actionContainer = default!;
|
||||
|
||||
public override void Initialize()
|
||||
{
|
||||
base.Initialize();
|
||||
|
||||
SubscribeLocalEvent<DashAbilityComponent, GetItemActionsEvent>(OnGetItemActions);
|
||||
SubscribeLocalEvent<DashAbilityComponent, GetItemActionsEvent>(OnGetActions);
|
||||
SubscribeLocalEvent<DashAbilityComponent, DashEvent>(OnDash);
|
||||
SubscribeLocalEvent<DashAbilityComponent, MapInitEvent>(OnMapInit);
|
||||
}
|
||||
|
||||
private void OnMapInit(EntityUid uid, DashAbilityComponent component, MapInitEvent args)
|
||||
private void OnMapInit(Entity<DashAbilityComponent> ent, ref MapInitEvent args)
|
||||
{
|
||||
_actionContainer.EnsureAction(uid, ref component.DashActionEntity, component.DashAction);
|
||||
Dirty(uid, component);
|
||||
var (uid, comp) = ent;
|
||||
_actionContainer.EnsureAction(uid, ref comp.DashActionEntity, comp.DashAction);
|
||||
Dirty(uid, comp);
|
||||
}
|
||||
|
||||
private void OnGetItemActions(EntityUid uid, DashAbilityComponent comp, GetItemActionsEvent args)
|
||||
private void OnGetActions(Entity<DashAbilityComponent> ent, ref GetItemActionsEvent args)
|
||||
{
|
||||
var ev = new AddDashActionEvent(args.User);
|
||||
RaiseLocalEvent(uid, ev);
|
||||
|
||||
if (ev.Cancelled)
|
||||
return;
|
||||
|
||||
args.AddAction(ref comp.DashActionEntity, comp.DashAction);
|
||||
if (CheckDash(ent, args.User))
|
||||
args.AddAction(ent.Comp.DashActionEntity);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Handle charges and teleport to a visible location.
|
||||
/// </summary>
|
||||
private void OnDash(EntityUid uid, DashAbilityComponent comp, DashEvent args)
|
||||
private void OnDash(Entity<DashAbilityComponent> ent, ref DashEvent args)
|
||||
{
|
||||
if (!_timing.IsFirstTimePredicted)
|
||||
return;
|
||||
|
||||
var (uid, comp) = ent;
|
||||
var user = args.Performer;
|
||||
args.Handled = true;
|
||||
|
||||
var ev = new DashAttemptEvent(user);
|
||||
RaiseLocalEvent(uid, ev);
|
||||
if (ev.Cancelled)
|
||||
if (!CheckDash(uid, user))
|
||||
return;
|
||||
|
||||
if (!_hands.IsHolding(user, uid, out var _))
|
||||
@@ -73,15 +66,8 @@ public sealed class DashAbilitySystem : EntitySystem
|
||||
return;
|
||||
}
|
||||
|
||||
TryComp<LimitedChargesComponent>(uid, out var charges);
|
||||
if (_charges.IsEmpty(uid, charges))
|
||||
{
|
||||
_popup.PopupClient(Loc.GetString("dash-ability-no-charges", ("item", uid)), user, user);
|
||||
return;
|
||||
}
|
||||
var origin = _transform.GetMapCoordinates(user);
|
||||
var target = args.Target.ToMap(EntityManager, _transform);
|
||||
// prevent collision with the user duh
|
||||
if (!_examine.InRangeUnOccluded(origin, target, SharedInteractionSystem.MaxRaycastRange, null))
|
||||
{
|
||||
// can only dash if the destination is visible on screen
|
||||
@@ -89,36 +75,28 @@ public sealed class DashAbilitySystem : EntitySystem
|
||||
return;
|
||||
}
|
||||
|
||||
_transform.SetCoordinates(user, args.Target);
|
||||
_transform.AttachToGridOrMap(user);
|
||||
_audio.PlayPredicted(comp.BlinkSound, user, user);
|
||||
if (charges != null)
|
||||
_charges.UseCharge(uid, charges);
|
||||
if (!_charges.TryUseCharge(uid))
|
||||
{
|
||||
_popup.PopupClient(Loc.GetString("dash-ability-no-charges", ("item", uid)), user, user);
|
||||
return;
|
||||
}
|
||||
|
||||
var xform = Transform(user);
|
||||
_transform.SetCoordinates(user, xform, args.Target);
|
||||
_transform.AttachToGridOrMap(user, xform);
|
||||
args.Handled = true;
|
||||
}
|
||||
|
||||
public bool CheckDash(EntityUid uid, EntityUid user)
|
||||
{
|
||||
var ev = new CheckDashEvent(user);
|
||||
RaiseLocalEvent(uid, ref ev);
|
||||
return !ev.Cancelled;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Raised on the item before adding the dash action
|
||||
/// Raised on the item before adding the dash action and when using the action.
|
||||
/// </summary>
|
||||
public sealed class AddDashActionEvent : CancellableEntityEventArgs
|
||||
{
|
||||
public EntityUid User;
|
||||
|
||||
public AddDashActionEvent(EntityUid user)
|
||||
{
|
||||
User = user;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Raised on the item before dashing is done.
|
||||
/// </summary>
|
||||
public sealed class DashAttemptEvent : CancellableEntityEventArgs
|
||||
{
|
||||
public EntityUid User;
|
||||
|
||||
public DashAttemptEvent(EntityUid user)
|
||||
{
|
||||
User = user;
|
||||
}
|
||||
}
|
||||
[ByRefEvent]
|
||||
public record struct CheckDashEvent(EntityUid User, bool Cancelled = false);
|
||||
|
||||
Reference in New Issue
Block a user