Kill Mana

Content.Client/Shadowkin/ShadowkinSystem.cs

@@ -88,13 +88,6 @@ public override void Update(float frameTime)
         // intensity = clamp intensity min, max
 
         var tintIntensity = 0.65f;
-        if (TryComp<PsionicComponent>(uid, out var magic))
-        {
-            var min = 0.45f;
-            var max = 0.75f;
-            tintIntensity = Math.Clamp(min + (magic.Mana / magic.MaxMana) * 0.333f, min, max);
-        }
-
         UpdateShader(new Vector3(humanoid.EyeColor.R, humanoid.EyeColor.G, humanoid.EyeColor.B), tintIntensity);
     }
 

Content.Server/Abilities/Psionics/Abilities/DarkSwapSystem.cs

@@ -40,7 +40,7 @@ private void OnPowerUsed(DarkSwapActionEvent args)
                     args.Handled = true;
                 }
             }
-            else if (_psionics.OnAttemptPowerUse(args.Performer, "DarkSwap", args.ManaCost))
+            else if (_psionics.OnAttemptPowerUse(args.Performer, "DarkSwap"))
             {
                 var newethereal = EnsureComp<EtherealComponent>(args.Performer);
                 newethereal.Darken = true;

Content.Server/Abilities/Psionics/AnomalyPowerSystem.cs

@@ -49,7 +49,7 @@ public override void Initialize()
 
     private void OnPowerUsed(EntityUid uid, PsionicComponent component, AnomalyPowerActionEvent args)
     {
-        if (!_psionics.OnAttemptPowerUse(args.Performer, args.Settings.PowerName, args.Settings.ManaCost, args.Settings.CheckInsulation))
+        if (!_psionics.OnAttemptPowerUse(args.Performer, args.Settings.PowerName, args.Settings.CheckInsulation))
             return;
 
         var overcharged = args.Settings.DoSupercritical ? _glimmerSystem.GlimmerOutput * component.CurrentAmplification

Content.Server/Abilities/Psionics/PsionicAbilitiesSystem.Functions.cs

@@ -432,34 +432,6 @@ public override void OnAddPsionic(
     }
 }
 
-[UsedImplicitly]
-public sealed partial class PsionicModifyMana : PsionicPowerFunction
-{
-    [DataField]
-    public float MaxManaModifier;
-
-    [DataField]
-    public float ManaGainModifier;
-
-    [DataField]
-    public float ManaGainMultiplierModifier;
-
-    public override void OnAddPsionic(
-        EntityUid uid,
-        IComponentFactory factory,
-        IEntityManager entityManager,
-        ISerializationManager serializationManager,
-        ISharedPlayerManager playerManager,
-        ILocalizationManager loc,
-        PsionicComponent psionicComponent,
-        PsionicPowerPrototype proto)
-    {
-        psionicComponent.MaxMana += MaxManaModifier;
-        psionicComponent.ManaGain += ManaGainModifier;
-        psionicComponent.ManaGainMultiplier += ManaGainMultiplierModifier;
-    }
-}
-
 [UsedImplicitly]
 public sealed partial class PsionicModifyGlimmer : PsionicPowerFunction
 {

Content.Server/Abilities/Psionics/PsionicFamiliarSystem.cs

@@ -36,7 +36,7 @@ public override void Initialize()
     private void OnSummon(EntityUid uid, PsionicComponent psionicComponent, SummonPsionicFamiliarActionEvent args)
     {
         if (psionicComponent.Familiars.Count >= psionicComponent.FamiliarLimit
-            || !_psionics.OnAttemptPowerUse(args.Performer, args.PowerName, args.ManaCost, args.CheckInsulation)
+            || !_psionics.OnAttemptPowerUse(args.Performer, args.PowerName, args.CheckInsulation)
             || args.Handled || args.FamiliarProto is null)
             return;
 

Content.Server/Psionics/PsionicsSystem.cs

@@ -82,7 +82,6 @@ public override void Initialize()
         SubscribeLocalEvent<PsionicComponent, MobStateChangedEvent>(OnMobstateChanged);
         SubscribeLocalEvent<PsionicComponent, DamageChangedEvent>(OnDamageChanged);
         SubscribeLocalEvent<PsionicComponent, AttackAttemptEvent>(OnAttackAttempt);
-        SubscribeLocalEvent<PsionicComponent, OnManaUpdateEvent>(OnManaUpdate);
 
         SubscribeLocalEvent<PsionicComponent, ComponentStartup>(OnInit);
         SubscribeLocalEvent<PsionicComponent, ComponentRemove>(OnRemove);
@@ -180,8 +179,6 @@ private void CheckAntiPsionic(EntityUid entity, AntiPsionicWeaponComponent compo
 
     private void OnInit(EntityUid uid, PsionicComponent component, ComponentStartup args)
     {
-        UpdateManaAlert(uid, component);
-
         component.AmplificationSources.Add(BaselineAmplification, _random.NextFloat(component.BaselineAmplification.Item1, component.BaselineAmplification.Item2));
         component.DampeningSources.Add(BaselineDampening, _random.NextFloat(component.BaselineDampening.Item1, component.BaselineDampening.Item2));
 
@@ -195,25 +192,12 @@ private void OnInit(EntityUid uid, PsionicComponent component, ComponentStartup
 
     private void OnRemove(EntityUid uid, PsionicComponent component, ComponentRemove args)
     {
-        _alerts.ClearAlert(uid, component.ManaAlert);
-
         if (!HasComp<NpcFactionMemberComponent>(uid))
             return;
 
         _npcFactonSystem.RemoveFaction(uid, "PsionicInterloper");
     }
 
-    public void UpdateManaAlert(EntityUid uid, PsionicComponent component)
-    {
-        var severity = (short) ContentHelpers.RoundToLevels(component.Mana, component.MaxMana, 8);
-        _alerts.ShowAlert(uid, component.ManaAlert, severity);
-    }
-
-    private void OnManaUpdate(EntityUid uid, PsionicComponent component, ref OnManaUpdateEvent args)
-    {
-        UpdateManaAlert(uid, component);
-    }
-
     private void OnStamHit(EntityUid uid, AntiPsionicWeaponComponent component, TakeStaminaDamageEvent args)
     {
         if (!HasComp<PsionicComponent>(args.Target))

Content.Server/Shadowkin/EtherealStunItemSystem.cs

@@ -29,9 +29,6 @@ private void OnUseInHand(EntityUid uid, EtherealStunItemComponent component, Use
 
             if (TryComp<StaminaComponent>(ent, out var stamina))
                 _stamina.TakeStaminaDamage(ent, stamina.CritThreshold, stamina, ent);
-
-            if (TryComp<PsionicComponent>(ent, out var magic))
-                magic.Mana = 0;
         }
 
         if (!component.DeleteOnUse)

Content.Server/Shadowkin/ShadowkinSystem.cs

@@ -28,9 +28,7 @@ public override void Initialize()
     {
         base.Initialize();
         SubscribeLocalEvent<ShadowkinComponent, ComponentStartup>(OnInit);
-        SubscribeLocalEvent<ShadowkinComponent, ExaminedEvent>(OnExamined);
         SubscribeLocalEvent<ShadowkinComponent, OnMindbreakEvent>(OnMindbreak);
-        SubscribeLocalEvent<ShadowkinComponent, OnManaUpdateEvent>(OnManaUpdate);
         SubscribeLocalEvent<ShadowkinComponent, RejuvenateEvent>(OnRejuvenate);
         SubscribeLocalEvent<ShadowkinComponent, EyeColorInitEvent>(OnEyeColorChange);
     }
@@ -51,43 +49,6 @@ private void OnEyeColorChange(EntityUid uid, ShadowkinComponent component, EyeCo
         Dirty(uid, humanoid);
     }
 
-    private void OnExamined(EntityUid uid, ShadowkinComponent component, ExaminedEvent args)
-    {
-        if (!args.IsInDetailsRange
-            || !TryComp<PsionicComponent>(uid, out var magic)
-            || HasComp<MindbrokenComponent>(uid))
-            return;
-
-        var severity = "shadowkin-power-" + ContentHelpers.RoundToLevels(magic.Mana, magic.MaxMana, 6);
-        var powerType = Loc.GetString(severity);
-
-        if (args.Examined == args.Examiner)
-            args.PushMarkup(Loc.GetString("shadowkin-power-examined-self",
-                ("power", Math.Floor(magic.Mana)),
-                ("powerMax", Math.Floor(magic.MaxMana)),
-                ("powerType", powerType)
-            ));
-        else
-            args.PushMarkup(Loc.GetString("shadowkin-power-examined-other",
-                ("target", uid),
-                ("powerType", powerType)
-            ));
-    }
-
-    private void OnManaUpdate(EntityUid uid, ShadowkinComponent component, ref OnManaUpdateEvent args)
-    {
-        if (!TryComp<PsionicComponent>(uid, out var magic))
-            return;
-
-        if (component.SleepManaRegen
-            && TryComp<SleepingComponent>(uid, out var sleep))
-            magic.ManaGainMultiplier = component.SleepManaRegenMultiplier;
-        else
-            magic.ManaGainMultiplier = 1;
-
-        Dirty(uid, magic); // Update Shadowkin Overlay.
-    }
-
     private void OnMindbreak(EntityUid uid, ShadowkinComponent component, ref OnMindbreakEvent args)
     {
         if (TryComp<MindbrokenComponent>(uid, out var mindbreak))
@@ -117,13 +78,7 @@ private void OnRejuvenate(EntityUid uid, ShadowkinComponent component, Rejuvenat
             Dirty(uid, humanoid);
         }
 
-        EnsureComp<PsionicComponent>(uid, out var magic);
-        magic.Mana = 200;
-        magic.MaxMana = 200;
-        magic.ManaGain = 0.25f;
-        magic.MindbreakingFeedback = "shadowkin-blackeye";
-        magic.NoMana = "shadowkin-tired";
-
+        EnsureComp<PsionicComponent>(uid, out _);
         if (_prototypeManager.TryIndex<PsionicPowerPrototype>("ShadowkinPowers", out var shadowkinPowers))
             _psionicAbilitiesSystem.InitializePsionicPower(uid, shadowkinPowers);
     }

Content.Shared/Actions/Events/AnomalyPowerActionEvent.cs

@@ -76,8 +76,6 @@ public partial record struct AnomalyPowerSettings()
 {
     public string PowerName = string.Empty;
 
-    public float ManaCost;
-
     public bool CheckInsulation;
 
     /// <summary>

Content.Shared/Actions/Events/DarkSwapActionEvent.cs

@@ -1,9 +1,6 @@
 namespace Content.Shared.Actions.Events;
 public sealed partial class DarkSwapActionEvent : InstantActionEvent
 {
-    [DataField]
-    public float ManaCost;
-
     [DataField]
     public bool CheckInsulation;
-}
+}

Content.Shared/Actions/Events/SummonPsionicFamiliarActionEvent.cs

@@ -16,12 +16,6 @@ public sealed partial class SummonPsionicFamiliarActionEvent : InstantActionEven
     [DataField]
     public string PowerName;
 
-    /// <summary>
-    ///     How much Mana this power should cost, if any.
-    /// </summary>
-    [DataField]
-    public float ManaCost;
-
     /// <summary>
     ///     Whether this power checks if the wearer is psionically insulated.
     /// </summary>

Content.Shared/Chat/SharedSuicideSystem.cs

@@ -50,7 +50,7 @@ public void ApplyLethalDamage(Entity<DamageableComponent> target, ProtoId<Damage
         // Mob thresholds are sorted from alive -> crit -> dead,
         // grabbing the last key will give us how much damage is needed to kill a target from zero
         // The exact lethal damage amount is adjusted based on their current damage taken
-        var lethalAmountOfDamage = mobThresholds.Thresholds.Keys.Last() - target.Comp.TotalDamage;
+        var lethalAmountOfDamage = mobThresholds.Thresholds.Keys.Last() - target.Comp.Damage.GetTotal();
 
         // We don't want structural damage for the same reasons listed above
         if (!_prototypeManager.TryIndex(damageType, out var damagePrototype) || damagePrototype.ID == "Structural")

Content.Shared/Psionics/PsionicComponent.cs

@@ -7,35 +7,9 @@
 
 namespace Content.Shared.Abilities.Psionics
 {
-    [RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true)]
+    [RegisterComponent, NetworkedComponent]
     public sealed partial class PsionicComponent : Component
     {
-        /// <summary>
-        ///     Current Mana.
-        /// </summary>
-        [DataField, AutoNetworkedField]
-        public float Mana = 50;
-
-        /// <summary>
-        ///     Max Mana Possible.
-        /// </summary>
-        [DataField, AutoNetworkedField]
-        public float MaxMana = 100;
-
-        /// <summary>
-        ///     How much energy is gained per second.
-        /// </summary>
-        [DataField]
-        public float ManaGain = 1;
-
-        /// <summary>
-        ///     ManaGain Multiplier
-        /// </summary>
-        [DataField]
-        public float ManaGainMultiplier = 1;
-
-        public float ManaAccumulator;
-
         [DataField]
         public bool BypassManaCheck;
 
@@ -230,10 +204,6 @@ private set
         [DataField]
         public string AlreadyCasting = "already-casting";
 
-        /// Popup to play if there no Mana left for a power to execute.
-        [DataField]
-        public string NoMana = "no-mana";
-
         /// <summary>
         ///     The list of Familiars currently bound to this Psion.
         /// </summary>
@@ -261,8 +231,5 @@ private set
 
         [DataField]
         public Dictionary<string, float> AvailablePowers = new();
-
-        [DataField]
-        public ProtoId<AlertPrototype> ManaAlert = "Mana";
     }
 }

Content.Shared/Psionics/PsionicEvents.cs

@@ -12,6 +12,3 @@ public record struct OnSetPsionicStatsEvent(float AmplificationChangedAmount, fl
 
 [ByRefEvent]
 public record struct OnMindbreakEvent();
-
-[ByRefEvent]
-public record struct OnManaUpdateEvent();