diff --git a/Content.Server/_DV/CosmicCult/Abilities/CosmicSiphonSystem.cs b/Content.Server/_DV/CosmicCult/Abilities/CosmicSiphonSystem.cs index 95f5232464..7d4275c7b5 100644 --- a/Content.Server/_DV/CosmicCult/Abilities/CosmicSiphonSystem.cs +++ b/Content.Server/_DV/CosmicCult/Abilities/CosmicSiphonSystem.cs @@ -43,22 +43,22 @@ public sealed class CosmicSiphonSystem : EntitySystem SubscribeLocalEvent(OnCosmicSiphonDoAfter); } - private void OnCosmicSiphon(Entity uid, ref EventCosmicSiphon args) + private void OnCosmicSiphon(Entity ent, ref EventCosmicSiphon args) { - if (uid.Comp.EntropyStored >= uid.Comp.EntropyStoredCap) + if (ent.Comp.EntropyStored >= ent.Comp.EntropyStoredCap) { - _popup.PopupEntity(Loc.GetString("cosmicability-siphon-full"), uid, uid); + _popup.PopupEntity(Loc.GetString("cosmicability-siphon-full"), ent, ent); return; } if (HasComp(args.Target) || _mobState.IsDead(args.Target)) { - _popup.PopupEntity(Loc.GetString("cosmicability-siphon-fail", ("target", Identity.Entity(args.Target, EntityManager))), uid, uid); + _popup.PopupEntity(Loc.GetString("cosmicability-siphon-fail", ("target", Identity.Entity(args.Target, EntityManager))), ent, ent); return; } if (args.Handled) return; - var doargs = new DoAfterArgs(EntityManager, uid, uid.Comp.CosmicSiphonDelay, new EventCosmicSiphonDoAfter(), uid, args.Target) + var doargs = new DoAfterArgs(EntityManager, ent, ent.Comp.CosmicSiphonDelay, new EventCosmicSiphonDoAfter(), ent, args.Target) { DistanceThreshold = 2f, Hidden = true, @@ -72,7 +72,7 @@ public sealed class CosmicSiphonSystem : EntitySystem _doAfter.TryStartDoAfter(doargs); } - private void OnCosmicSiphonDoAfter(Entity uid, ref EventCosmicSiphonDoAfter args) + private void OnCosmicSiphonDoAfter(Entity ent, ref EventCosmicSiphonDoAfter args) { if (args.Args.Target is not { } target) return; @@ -80,40 +80,40 @@ public sealed class CosmicSiphonSystem : EntitySystem return; args.Handled = true; - if (TryComp(uid, out var actor)) + if (TryComp(ent, out var actor)) RaiseNetworkEvent(new CosmicSiphonIndicatorEvent(GetNetEntity(target)), actor.PlayerSession); - var siphonQuantity = uid.Comp.CosmicSiphonQuantity; + var siphonQuantity = ent.Comp.CosmicSiphonQuantity; if (_mobState.IsCritical(target)) // If the target is in crit, we get much more entropy from them, but kill them in the process. { - siphonQuantity = HasComp(target) ? uid.Comp.SiphonQuantityCritMindshield : uid.Comp.SiphonQuantityCrit; + siphonQuantity = HasComp(target) ? ent.Comp.SiphonQuantityCritMindshield : ent.Comp.SiphonQuantityCrit; - _damageable.TryChangeDamage(target, uid.Comp.SiphonCritDamage); - _popup.PopupEntity(Loc.GetString("cosmicability-siphon-crit", ("user", Identity.Entity(uid, EntityManager)), ("target", Identity.Entity(target, EntityManager))), uid, PopupType.MediumCaution); + _damageable.TryChangeDamage(target, ent.Comp.SiphonCritDamage); + _popup.PopupEntity(Loc.GetString("cosmicability-siphon-crit", ("user", Identity.Entity(ent, EntityManager)), ("target", Identity.Entity(target, EntityManager))), ent, PopupType.MediumCaution); } - if (siphonQuantity + uid.Comp.EntropyStored > uid.Comp.EntropyStoredCap) - siphonQuantity = uid.Comp.EntropyStoredCap - uid.Comp.EntropyStored; + if (siphonQuantity + ent.Comp.EntropyStored > ent.Comp.EntropyStoredCap) + siphonQuantity = ent.Comp.EntropyStoredCap - ent.Comp.EntropyStored; - uid.Comp.EntropyStored += siphonQuantity; - uid.Comp.EntropyBudget += siphonQuantity; - Dirty(uid, uid.Comp); + ent.Comp.EntropyStored += siphonQuantity; + ent.Comp.EntropyBudget += siphonQuantity; + Dirty(ent, ent.Comp); if (_cosmicCult.EntityIsCultist(target)) { _statusEffects.TryAddStatusEffect(target, "EntropicDegen", TimeSpan.FromSeconds(_random.Next(21) + 40), true); //40-60 seconds, 4-6 cold damage per siphon - _popup.PopupEntity(Loc.GetString("cosmicability-siphon-cultist-success", ("target", Identity.Entity(target, EntityManager))), uid, uid); + _popup.PopupEntity(Loc.GetString("cosmicability-siphon-cultist-success", ("target", Identity.Entity(target, EntityManager))), ent, ent); } else { - _popup.PopupEntity(Loc.GetString("cosmicability-siphon-success", ("target", Identity.Entity(target, EntityManager))), uid, uid); - _alerts.ShowAlert(uid, uid.Comp.EntropyAlert); - _cultRule.IncrementCultObjectiveEntropy(uid); + _popup.PopupEntity(Loc.GetString("cosmicability-siphon-success", ("target", Identity.Entity(target, EntityManager))), ent, ent); + _alerts.ShowAlert(ent.Owner, ent.Comp.EntropyAlert); + _cultRule.IncrementCultObjectiveEntropy(ent); } - if (uid.Comp.CosmicEmpowered) // if you're empowered there's a 50% chance to flicker lights on siphon + if (ent.Comp.CosmicEmpowered) // if you're empowered there's a 50% chance to flicker lights on siphon { _lights.Clear(); - _lookup.GetEntitiesInRange(Transform(uid).Coordinates, 5, _lights, LookupFlags.StaticSundries); + _lookup.GetEntitiesInRange(Transform(ent).Coordinates, 5, _lights, LookupFlags.StaticSundries); foreach (var light in _lights) // static range of 5. because. { if (!_random.Prob(0.5f)) diff --git a/Content.Server/_DV/CosmicCult/CosmicCultRuleSystem.cs b/Content.Server/_DV/CosmicCult/CosmicCultRuleSystem.cs index ad5e31bd9a..fa6609d539 100644 --- a/Content.Server/_DV/CosmicCult/CosmicCultRuleSystem.cs +++ b/Content.Server/_DV/CosmicCult/CosmicCultRuleSystem.cs @@ -776,35 +776,35 @@ public sealed class CosmicCultRuleSystem : GameRuleSystem uid, ref ComponentShutdown args) + private void OnComponentShutdown(Entity ent, ref ComponentShutdown args) { - if (AssociatedGamerule(uid) is not { } cult) + if (AssociatedGamerule(ent) is not { } cult) return; - if (TerminatingOrDeleted(uid)) + if (TerminatingOrDeleted(ent)) return; var cosmicGamerule = cult.Comp; - if(TryComp(uid, out var crawlerComp)) - _stun.TryCrawling((uid, crawlerComp), TimeSpan.FromSeconds(2), refresh: true); + if(TryComp(ent, out var crawlerComp)) + _stun.TryCrawling((ent, crawlerComp), TimeSpan.FromSeconds(2), refresh: true); - foreach (var actionEnt in uid.Comp.ActionEntities) _actions.RemoveAction(actionEnt); + foreach (var actionEnt in ent.Comp.ActionEntities) _actions.RemoveAction(actionEnt); - if (TryComp(uid, out var transmitter)) + if (TryComp(ent, out var transmitter)) transmitter.Channels.Remove("CosmicRadio"); - if (TryComp(uid, out var radio)) + if (TryComp(ent, out var radio)) radio.Channels.Remove("CosmicRadio"); - RemComp(uid); - RemComp(uid); - RemComp(uid); - RemComp(uid); - RemComp(uid); - RemComp(uid); - RemComp(uid); + RemComp(ent); + RemComp(ent); + RemComp(ent); + RemComp(ent); + RemComp(ent); + RemComp(ent); + RemComp(ent); - _antag.SendBriefing(uid, Loc.GetString("cosmiccult-role-deconverted-fluff"), Color.FromHex("#4cabb3"), _deconvertSound); - _antag.SendBriefing(uid, Loc.GetString("cosmiccult-role-deconverted-briefing"), Color.FromHex("#cae8e8"), null); + _antag.SendBriefing(ent, Loc.GetString("cosmiccult-role-deconverted-fluff"), Color.FromHex("#4cabb3"), _deconvertSound); + _antag.SendBriefing(ent, Loc.GetString("cosmiccult-role-deconverted-briefing"), Color.FromHex("#cae8e8"), null); - if (!_mind.TryGetMind(uid, out var mindId, out var mind)) + if (!_mind.TryGetMind(ent, out var mindId, out var mind)) return; _mind.ClearObjectives(mindId, mind); @@ -814,13 +814,14 @@ public sealed class CosmicCultRuleSystem : GameRuleSystem /// Add the starting powers to the cultist. /// - private void OnStartCultist(Entity uid, ref ComponentInit args) + private void OnStartCultist(Entity ent, ref ComponentInit args) { - _eye.RefreshVisibilityMask(uid.Owner); - _alerts.ShowAlert(uid, uid.Comp.EntropyAlert); - if (!HasComp(uid)) return; // Non-humanoids don't get abilities - foreach (var actionId in uid.Comp.CosmicCultActions) + _eye.RefreshVisibilityMask(ent.Owner); + _alerts.ShowAlert(ent.Owner, ent.Comp.EntropyAlert); + + if (!HasComp(ent)) return; // Non-humanoids don't get abilities + foreach (var actionId in ent.Comp.CosmicCultActions) { - var actionEnt = _actions.AddAction(uid, actionId); - uid.Comp.ActionEntities.Add(actionEnt); + var actionEnt = _actions.AddAction(ent, actionId); + ent.Comp.ActionEntities.Add(actionEnt); } } /// /// Add the Monument summon action to the cult lead. /// - private void OnStartCultLead(Entity uid, ref ComponentInit args) + private void OnStartCultLead(Entity ent, ref ComponentInit args) { - if (_cultRule.AssociatedGamerule(uid) is not { } cult) + if (_cultRule.AssociatedGamerule(ent) is not { } cult) return; - if (!HasComp(uid)) return; // Non-humanoids don't get abilities + if (!HasComp(ent)) return; // Non-humanoids don't get abilities if (!cult.Comp.MonumentPlaced) // There's no monument, grant them an action to place one - _actions.AddAction(uid, ref uid.Comp.CosmicMonumentPlaceActionEntity, uid.Comp.CosmicMonumentPlaceAction, uid); + _actions.AddAction(ent, ref ent.Comp.CosmicMonumentPlaceActionEntity, ent.Comp.CosmicMonumentPlaceAction, ent); if (cult.Comp.MonumentMoved) return; // If the monument was already moved, don't let them do it again. var objectiveQuery = EntityQueryEnumerator(); while (objectiveQuery.MoveNext(out _, out var objectiveComp)) { if (objectiveComp.Tier == 2) // If it's stage 2, give them the move action - _actions.AddAction(uid, ref uid.Comp.CosmicMonumentMoveActionEntity, uid.Comp.CosmicMonumentMoveAction, uid); + _actions.AddAction(ent, ref ent.Comp.CosmicMonumentMoveActionEntity, ent.Comp.CosmicMonumentMoveAction, ent); } } - private void OnGetVisMask(Entity uid, ref GetVisMaskEvent args) + private void OnGetVisMask(Entity ent, ref GetVisMaskEvent args) { args.VisibilityMask |= (int)VisibilityFlags.CosmicCultMonument; } @@ -222,28 +223,28 @@ public sealed partial class CosmicCultSystem : SharedCosmicCultSystem #endregion #region Movespeed - private void OnStartInfluenceStride(Entity uid, ref ComponentInit args) // i wish movespeed was easier to work with + private void OnStartInfluenceStride(Entity ent, ref ComponentInit args) // i wish movespeed was easier to work with { - _movementSpeed.RefreshMovementSpeedModifiers(uid); + _movementSpeed.RefreshMovementSpeedModifiers(ent); } - private void OnEndInfluenceStride(Entity uid, ref ComponentRemove args) // that movespeed applies more-or-less correctly + private void OnEndInfluenceStride(Entity ent, ref ComponentRemove args) // that movespeed applies more-or-less correctly { - _movementSpeed.RefreshMovementSpeedModifiers(uid); + _movementSpeed.RefreshMovementSpeedModifiers(ent); } - private void OnStartImposition(Entity uid, ref ComponentInit args) // these functions just make sure + private void OnStartImposition(Entity ent, ref ComponentInit args) // these functions just make sure { - _movementSpeed.RefreshMovementSpeedModifiers(uid); + _movementSpeed.RefreshMovementSpeedModifiers(ent); } - private void OnEndImposition(Entity uid, ref ComponentRemove args) // as various cosmic cult effects get added and removed + private void OnEndImposition(Entity ent, ref ComponentRemove args) // as various cosmic cult effects get added and removed { - _movementSpeed.RefreshMovementSpeedModifiers(uid); + _movementSpeed.RefreshMovementSpeedModifiers(ent); } - private void OnRefreshMoveSpeed(EntityUid uid, InfluenceStrideComponent comp, RefreshMovementSpeedModifiersEvent args) + private void OnRefreshMoveSpeed(EntityUid ent, InfluenceStrideComponent comp, RefreshMovementSpeedModifiersEvent args) { args.ModifySpeed(1.15f, 1.15f); } - private void OnImpositionMoveSpeed(EntityUid uid, CosmicImposingComponent comp, RefreshMovementSpeedModifiersEvent args) + private void OnImpositionMoveSpeed(EntityUid ent, CosmicImposingComponent comp, RefreshMovementSpeedModifiersEvent args) { args.ModifySpeed(0.8f, 0.8f); }