Psionic Power Rolling Rework

Content.Server/Abilities/Psionics/PsionicAbilitiesSystem.cs

@@ -12,6 +12,7 @@
 using System.Linq;
 using Robust.Server.Player;
 using Content.Server.Chat.Managers;
+using Content.Server.Psionics.Glimmer;
 
 namespace Content.Server.Abilities.Psionics
 {
@@ -122,6 +123,8 @@ public void InitializePsionicPower(EntityUid uid, PsionicPowerPrototype proto, P
             AddPsionicStatSources(proto, psionic);
             RefreshPsionicModifiers(uid, psionic);
             SendFeedbackMessage(uid, proto, playFeedback);
+            UpdatePowerSlots(psionic);
+            //UpdatePsionicDanger(uid, psionic); // TODO: After Glimmer Refactor
             //SendFeedbackAudio(uid, proto, playPopup); // TODO: This one is coming next!
         }
 
@@ -297,6 +300,27 @@ private void SendFeedbackMessage(EntityUid uid, PsionicPowerPrototype proto, boo
                 session.Channel);
         }
 
+        private void UpdatePowerSlots(PsionicComponent psionic)
+        {
+            var slotsUsed = 0;
+            foreach (var power in psionic.ActivePowers)
+                slotsUsed += power.PowerSlotCost;
+
+            psionic.PowerSlotsTaken = slotsUsed;
+        }
+
+        /// <summary>
+        ///     Psions over a certain power threshold become a glimmer source. This cannot be fully implemented until after I rework Glimmer
+        /// </summary>
+        //private void UpdatePsionicDanger(EntityUid uid, PsionicComponent psionic)
+        //{
+        //   if (psionic.PowerSlotsTaken <= psionic.PowerSlots)
+        //        return;
+        //
+        //    EnsureComp<GlimmerSourceComponent>(uid, out var glimmerSource);
+        //    glimmerSource.SecondsPerGlimmer = 10 / (psionic.PowerSlotsTaken - psionic.PowerSlots);
+        //}
+
         /// <summary>
         ///     Remove all Psychic Actions listed in an entity's Psionic Component. Unfortunately, removing actions associated with a specific Power Prototype is not supported.
         /// </summary>

Content.Server/StationEvents/Events/NoosphericZapRule.cs

@@ -35,9 +35,9 @@ protected override void Started(EntityUid uid, NoosphericZapRuleComponent compon
             _stunSystem.TryParalyze(psion, TimeSpan.FromSeconds(component.StunDuration), false);
             _statusEffectsSystem.TryAddStatusEffect(psion, "Stutter", TimeSpan.FromSeconds(component.StutterDuration), false, "StutteringAccent");
 
-            if (psionicComponent.CanReroll)
+            if (!psionicComponent.CanReroll)
             {
-                psionicComponent.CanReroll = false;
+                psionicComponent.CanReroll = true;
                 _popupSystem.PopupEntity(Loc.GetString("noospheric-zap-seize-potential-regained"), psion, psion, Shared.Popups.PopupType.LargeCaution);
             }
             else

Content.Shared/Psionics/PsionicComponent.cs

@@ -8,11 +8,19 @@ namespace Content.Shared.Abilities.Psionics
     public sealed partial class PsionicComponent : Component
     {
         /// <summary>
-        ///     How close a Psion is to awakening a new power.
-        ///     TODO: Implement this in a separate PR.
+        ///     How close a Psion is to generating a new power. When Potentia reaches the NextPowerCost, it is "Spent" in order to "Buy" a random new power.
+        ///     TODO: Psi-Potentiometry should be able to read how much Potentia a person has.
+        /// </summary>
+        [DataField]
+        public float Potentia;
+
+        /// <summary>
+        ///     Each time a Psion rolls for a new power, they roll a number between 0 and 100, adding any relevant modifiers. This number is then added to Potentia,
+        ///     meaning that it carries over between rolls. When a character has an amount of potentia equal to at least 100 * 2^(total powers), the potentia is then spent, and a power is generated.
+        ///     This variable stores the cost of the next power.
         /// </summary>
         [DataField]
-        public float Potentia = 0;
+        public float NextPowerCost = 100;
 
         /// <summary>
         ///     The baseline chance of obtaining a psionic power when rolling for one.
@@ -24,7 +32,7 @@ public sealed partial class PsionicComponent : Component
         ///     Whether or not a Psion has an available "Reroll" to spend on attempting to gain powers.
         /// </summary>
         [DataField]
-        public bool CanReroll;
+        public bool CanReroll = true;
 
         /// <summary>
         ///     The Base amount of time (in minutes) this Psion is given the stutter effect if they become mindbroken.
@@ -142,6 +150,18 @@ private set
         public float CurrentDampening;
 
         /// <summary>
+        ///     How many "Slots" an entity has for psionic powers. This is not a hard limit, and is instead used for calculating the cost to generate new powers.
+        ///     Exceeding this limit causes an entity to become a Glimmer Source.
+        /// </summary>
+        [DataField]
+        public int PowerSlots = 1;
+
+        /// <summary>
+        ///     How many "Slots" are currently occupied by psionic powers.
+        /// </summary>
+        [ViewVariables(VVAccess.ReadWrite)]
+        public int PowerSlotsTaken;
+
         ///     List of descriptors this entity will bring up for psychognomy. Used to remove
         ///     unneccesary subs for unique psionic entities like e.g. Oracle.
         /// </summary>

Content.Shared/Psionics/PsionicPowerPrototype.cs

@@ -86,4 +86,10 @@ public sealed partial class PsionicPowerPrototype : IPrototype
     /// </summary>
     [DataField]
     public float DampeningModifier = 0;
+
+    /// <summary>
+    ///     How many "Power Slots" this power occupies.
+    /// </summary>
+    [DataField]
+    public int PowerSlotCost = 1;
 }

Resources/Locale/en-US/psionics/psionic-powers.ftl

@@ -86,7 +86,9 @@ telepathy-power-initialization-feedback =
     The voices I've heard all my life begin to clear, yet they do not leave me. Before, they were as incoherent whispers,
     now my senses broaden, I come to a realization that they are part of a communal shared hallucination. Behind every voice is a glimmering sentience.
 
+# Psionic System Messages
 mindbreaking-feedback = The light of life vanishes from {CAPITALIZE($entity)}'s eyes, leaving behind a husk pretending at sapience
 examine-mindbroken-message =
     Eyes unblinking, staring deep into the horizon. {CAPITALIZE($entity)} is a sack of meat pretending it has a soul.
-    There is nothing behind its gaze, no evidence there can be found of the divine light of creation.
+    There is nothing behind its gaze, no evidence there can be found of the divine light of creation.
+psionic-roll-failed = For a moment, my consciousness expands, yet I feel that it is not enough.

Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml

@@ -23,6 +23,7 @@
   - !type:AddComponentSpecial
     components:
     - type: Psionic
+      powerSlots: 2
   - !type:AddComponentSpecial
     components:
     - type: InnatePsionicPowers

Resources/Prototypes/Psionics/psionics.yml

@@ -119,6 +119,7 @@
     - type: UniversalLanguageSpeaker
   initializationFeedback: xenoglossy-power-initialization-feedback
   metapsionicFeedback: psionic-language-power-feedback # Reuse for telepathy, clairaudience, etc
+  powerSlotCost: 0
 
 - type: psionicPower
   id: PsychognomyPower #i.e. reverse physiognomy
@@ -128,6 +129,7 @@
     - type: Psychognomist
   initializationFeedback: psychognomy-power-initialization-feedback
   metapsionicFeedback: psionic-language-power-feedback
+  powerSlotCost: 0
 
 - type: psionicPower
   id: TelepathyPower
@@ -137,3 +139,4 @@
     - type: Telepathy
   initializationFeedback: telepathy-power-initialization-feedback
   metapsionicFeedback: psionic-language-power-feedback # Reuse for telepathy, clairaudience, etc
+  powerSlotCost: 0

Resources/Prototypes/Roles/Jobs/Science/research_director.yml

@@ -29,6 +29,7 @@
     components:
     - type: BibleUser # Nyano - Lets them heal with bibles
     - type: Psionic # Nyano - They start with telepathic chat
+      powerSlots: 3
   - !type:AddImplantSpecial
     implants: [ MindShieldImplant ]
   - !type:AddComponentSpecial