ling balance!!! (Simple-Station#405)

* ling gamemode * more shit * gaming * Update game_presets.yml * Update secret_weights.yml * gaming 2 * shittery * fart * fart 2 * gorbing * balance stasis again * fart * goobing * chat is this real? * real. * g * fucking chemical regen i fucking hate it i hate you i hate everythi * fart * fart 2 * Add _timing * fart 3 * fart 5 * fart 6: electrical boogaloo * balance issue --------- Co-authored-by: whateverusername0 <whateveremail> Co-authored-by: Aidenkrz <[email protected]>
VMSolidus · Aug 16, 2024 · 92ced32 · 92ced32
1 parent e3d45bd
commit 92ced32
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 54 deletions.
diff --git a/Content.Server/Goobstation/Changeling/ChangelingSystem.cs b/Content.Server/Goobstation/Changeling/ChangelingSystem.cs
@@ -57,6 +57,7 @@
 using System.Numerics;
 using Content.Shared.Camera;
 using Robust.Shared.Timing;
+using Content.Shared.Gravity;
 
 namespace Content.Server.Changeling;
 
@@ -182,11 +183,12 @@ public void Cycle(EntityUid uid, ChangelingComponent comp)
     {
         UpdateChemicals(uid, comp);
 
-        if (comp.StrainedMusclesActivated)
+        if (comp.StrainedMusclesActive)
         {
             var stamina = EnsureComp<StaminaComponent>(uid);
             _stamina.TakeStaminaDamage(uid, 7.5f, visual: false);
-            if (_stamina.GetStaminaDamage(uid) >= stamina.CritThreshold)
+            if (_stamina.GetStaminaDamage(uid) >= stamina.CritThreshold
+            || !HasComp<GravityComponent>(uid))
                 ToggleStrainedMuscles(uid, comp);
         }
     }
@@ -613,12 +615,12 @@ private void OnAbsorbDoAfter(EntityUid uid, ChangelingComponent comp, ref Absorb
         EnsureComp<AbsorbedComponent>(target);
 
         var popup = Loc.GetString("changeling-absorb-end-self-ling");
-        var bonusChemicals = 10;
+        var bonusChemicals = 0;
         var bonusEvolutionPoints = 0;
         if (HasComp<ChangelingComponent>(target))
         {
-            bonusChemicals += 30;
-            bonusEvolutionPoints += 8;
+            bonusChemicals += 60;
+            bonusEvolutionPoints += 10;
         }
         else
         {
@@ -842,17 +844,17 @@ private void OnToggleStrainedMuscles(EntityUid uid, ChangelingComponent comp, re
     }
     private void ToggleStrainedMuscles(EntityUid uid, ChangelingComponent comp)
     {
-        if (!comp.StrainedMusclesActivated)
+        if (!comp.StrainedMusclesActive)
         {
             _speed.ChangeBaseSpeed(uid, 125f, 150f, 1f);
             _popup.PopupEntity(Loc.GetString("changeling-muscles-start"), uid, uid);
-            comp.StrainedMusclesActivated = true;
+            comp.StrainedMusclesActive = true;
         }
         else
         {
             _speed.ChangeBaseSpeed(uid, 100f, 100f, 1f);
             _popup.PopupEntity(Loc.GetString("changeling-muscles-end"), uid, uid);
-            comp.StrainedMusclesActivated = false;
+            comp.StrainedMusclesActive = false;
         }
 
         PlayMeatySound(uid, comp);

diff --git a/Content.Shared/Goobstation/Changeling/ChangelingComponent.cs b/Content.Shared/Goobstation/Changeling/ChangelingComponent.cs
@@ -44,7 +44,7 @@ public sealed partial class ChangelingComponent : Component
     public EntityUid? ArmorEntity, ArmorHelmetEntity;
     public EntityUid? SpacesuitEntity, SpacesuitHelmetEntity;
 
-    public bool StrainedMusclesActivated = false;
+    public bool StrainedMusclesActive = false;
 
     public bool IsInLesserForm = false;
 

diff --git a/Resources/Locale/en-US/Goobstation/changeling/store/changeling-catalog.ftl b/Resources/Locale/en-US/Goobstation/changeling/store/changeling-catalog.ftl
@@ -4,81 +4,74 @@
 evolutionmenu-combat-armblade-name = Arm Blade
 evolutionmenu-combat-armblade-desc =
     Reform one of your arms into a grotesque blade, composed of bone and flesh, able to pry open airlocks and cut through your foes like butter.
-    Costs 15 chemicals on activation, slows chemical regeneration.
+    Costs 15 chemicals.
 
 evolutionmenu-combat-boneshard-name = Bone Shard
 evolutionmenu-combat-boneshard-desc =
     Break off shards of your bone and shape them into a throwing star which embeds into your foes. But a one timer opportinuty.
-    Costs 15 chemicals on activation.
+    Costs 15 chemicals.
 
 evolutionmenu-combat-armor-name = Chitinous Armor
 evolutionmenu-combat-armor-desc =
     Inflate your body into an all-consuming chitinous mass of armor.
     Provides extensive protection against physical damage, but less against other types.
     It massively slows your movement, and maintaining its shape slows chemical generation.
     WARNING: Requires you to absorb at least 2 organics to use the ability.
-    Costs 25 chemicals on activation, significantly slows chemical regeneration.
+    Costs 25 chemicals.
 
 evolutionmenu-combat-shield-name = Organic Shield
 evolutionmenu-combat-shield-desc =
     Reforms one of your arms into a large, fleshy shield.
     Blocks attacks automatically, but very brittle.
     WARNING: Requires you to absorb at least 1 organic to use the ability.
-    Costs 20 chemicals on activation.
+    Costs 20 chemicals.
 
 evolutionmenu-combat-shriek-dissonant-name = Dissonant Shriek
 evolutionmenu-combat-shriek-dissonant-desc =
     You emit an EMP blast, which disables technology in the surrounding area, including radio headsets.
     Good for escaping cyborgs and security.
     WARNING: Requires you to absorb at least 1 organic to use the ability.
-    Costs 30 chemicals on activation.
+    Costs 30 chemicals.
 
 evolutionmenu-combat-shriek-resonant-name = Resonant Shriek
 evolutionmenu-combat-shriek-resonant-desc =
     You emit a tone beyond the range of human hearing,
     bursting lights and causing disorientation in an area around yourself.
     Good for escaping groups, or hindering people from fleeing.
     WARNING: Requires you to absorb at least 1 organic to use the ability.
-    Costs 30 chemicals on activation.
+    Costs 30 chemicals.
 
 evolutionmenu-combat-strainedmuscles-name = Strained Muscles
 evolutionmenu-combat-strainedmuscles-desc =
     You reduce lactic acid buildup in your leg muscles, allowing you to move at extremely fast speeds.
     While active, you will take steadily increments of stamina damage and eventually pass out.
-    Cost-free on activation, halts chemical regeneration.
-
-evolutionmenu-combat-spiders-name = Spider Infestation
-evolutionmenu-combat-spiders-desc =
-    One full grown hunter spider spawns from your mouth, being loyal to only you, and friendly with other spiders.
-    You can spawn up to three spiders total, and change their orders via other actions.
-    Costs 50 chemicals.
-    IMPORTANT: You must absorb at least 5 organics to activate the ability.
+    Cost-free.
 
 # sting
 
 evolutionmenu-sting-blind-name = Blind Sting
 evolutionmenu-sting-blind-desc =
     Silently sting an organic target, completely blinding them for a short time, and rendering them near-sighted until oculine is applied.
     May be used while under the effects of Lesser Form.
-    Costs 30 chemicals.
+    Costs 35 chemicals.
 
 evolutionmenu-sting-cryo-name = Cryogenic Sting
 evolutionmenu-sting-cryo-desc =
     Inject an organic target with a cocktail of chemicals that chills the blood.
     May be used while under the effects of Lesser Form.
-    Costs 30 chemicals.
+    Costs 35 chemicals.
 
 evolutionmenu-sting-lethargic-name = Lethargic Sting
 evolutionmenu-sting-lethargic-desc =
     Inject an organic target with a cocktail of anesthetics, slowing the victim down for a decent amount of time.
     May be used while under the effects of Lesser Form.
-    Costs 50 chemicals.
+    Costs 35 chemicals.
 
 evolutionmenu-sting-mute-name = Mute Sting
 evolutionmenu-sting-mute-desc =
     Inject mute toxin into an organic target, completely silencing them for a while.
     May be used while under the effects of Lesser Form.
-    Costs 30 chemicals.
+    Costs 35 chemicals.
 
 evolutionmenu-sting-transform-name = Transformation Sting
 evolutionmenu-sting-transform-desc =
@@ -101,7 +94,7 @@ evolutionmenu-utility-panacea-desc =
 evolutionmenu-utility-eyesight-name = Augmented Eyesight
 evolutionmenu-utility-eyesight-desc =
     Evolve additional features in your eyes, such as flash protection.
-    Cost-free on activation.
+    Cost-free.
 
 evolutionmenu-utility-biodegrade-name = Biodegrade
 evolutionmenu-utility-biodegrade-desc =
@@ -111,8 +104,7 @@ evolutionmenu-utility-biodegrade-desc =
 
 evolutionmenu-utility-chameleon-name = Chameleon Skin
 evolutionmenu-utility-chameleon-desc =
-    Alter the pigment in your skin to match your surroundings, rendering you invisible.
-    WARNING: Halts chemical regeneration!
+    Alter the pigment in your skin to match your surroundings, rendering you invisible.p
     Costs 20 chemicals.
 
 evolutionmenu-utility-stims-name = Ephedrine Overdose
@@ -123,31 +115,19 @@ evolutionmenu-utility-stims-desc =
 
 evolutionmenu-utility-fleshmend-name = Fleshmend
 evolutionmenu-utility-fleshmend-desc =
-    Rapidly heal yourself of all bruises and burns. Significantly weaker when below 20 normal body temperature.
+    Rapidly heal yourself of all bruises and burns.
     Costs 35 chemicals.
 
-evolutionmenu-utility-lastresort-name = Last Resort
-evolutionmenu-utility-lastresort-desc =
-    Abandon your current body and becomes a headslug in a last ditch effort to evade discovery or capture.
-    As a headslug, you can lay eggs inside anybody, and, after some time, a monkey with your original conciousness will burst out of the body.
-    Requires you to absorb at least 1 organic to use the ability.
-    Costs 20 chemicals.
-
 evolutionmenu-utility-lesserform-name = Lesser Form
 evolutionmenu-utility-lesserform-desc =
     Abandon your current form and turn into a sentient monkey.
     Costs 20 chemicals.
 
 evolutionmenu-utility-spacesuit-name = Space Adaptation
 evolutionmenu-utility-spacesuit-desc =
-    Get rid of useless tissue in order to facilitate space travel. A source of oxygen is still required for space walking. Slows chemical regeneration while active.
+    Get rid of useless tissue in order to facilitate space travel. A source of oxygen is still required for space walking.
     Costs 20 chemicals.
 
 evolutionmenu-utility-hivemindaccess-name = Hivemind Access
 evolutionmenu-utility-hivemindaccess-desc =
-    Tunes our chemical receptors for hivemind communication, giving us access to the hivemind network, allowing us to recognize other changelings who have also bought this ability.
-
-evolutionmenu-utility-contort-name = Contort Body
-evolutionmenu-utility-contort-desc =
-    Allows you to contort your body, making you capable of fitting yourself in and under things where you normally don't fit, such as tables and closed airlocks.
-    Costs 25 chemicals.
+    Tunes our chemical receptors for hivemind communication, allowing us to recognize other changelings who have also bought this ability.
diff --git a/Resources/Prototypes/Goobstation/Changeling/Actions/changeling.yml b/Resources/Prototypes/Goobstation/Changeling/Actions/changeling.yml
@@ -253,7 +253,7 @@
 - type: entity
   id: ActionStingBlind
   name: Blind Sting
-  description: Silently sting your target, blinding them for a short time and rendering them near sighted. Costs 30 chemicals.
+  description: Silently sting your target, blinding them for a short time and rendering them near sighted. Costs 35 chemicals.
   noSpawn: true
   components:
   - type: EntityTargetAction
@@ -268,13 +268,13 @@
       state: sting_blind
     event: !type:StingBlindEvent {}
   - type: ChangelingAction
-    chemicalCost: 30
+    chemicalCost: 35
     useInLesserForm: true
 
 - type: entity
   id: ActionStingCryo
   name: Cryogenic Sting
-  description: Silently sting your target, constantly slowing and freezing them. Costs 30 chemicals.
+  description: Silently sting your target, constantly slowing and freezing them. Costs 35 chemicals.
   noSpawn: true
   components:
   - type: EntityTargetAction
@@ -289,13 +289,13 @@
       state: sting_cryo
     event: !type:StingCryoEvent {}
   - type: ChangelingAction
-    chemicalCost: 30
+    chemicalCost: 35
     useInLesserForm: true
 
 - type: entity
   id: ActionStingLethargic
   name: Lethargic Sting
-  description: Silently inject a cocktail of anesthetics into the target. Costs 50 chemicals.
+  description: Silently inject a cocktail of anesthetics into the target. Costs 35 chemicals.
   noSpawn: true
   components:
   - type: EntityTargetAction
@@ -310,13 +310,13 @@
       state: sting_lethargic
     event: !type:StingLethargicEvent {}
   - type: ChangelingAction
-    chemicalCost: 50
+    chemicalCost: 35
     useInLesserForm: true
 
 - type: entity
   id: ActionStingMute
   name: Mute Sting
-  description: Silently sting your target, completely silencing them for a short time. Costs 30 chemicals.
+  description: Silently sting your target, completely silencing them for a short time. Costs 35 chemicals.
   noSpawn: true
   components:
   - type: EntityTargetAction
@@ -331,7 +331,7 @@
       state: sting_mute
     event: !type:StingMuteEvent {}
   - type: ChangelingAction
-    chemicalCost: 30
+    chemicalCost: 35
     useInLesserForm: true
 
 - type: entity
@@ -540,7 +540,7 @@
 - type: entity
   id: ActionHivemindAccess
   name: Hivemind Access
-  description: Tune your chemical receptors for hivemind communication. Costs 0 chemicals.
+  description: Tune your chemical receptors for hivemind communication.
   noSpawn: true
   components:
   - type: InstantAction