требует баланса

space-sunrise · Dec 26, 2024 · 09971b1 · 09971b1
1 parent 79fd150
commit 09971b1
Show file tree

Hide file tree

Showing 27 changed files with 119 additions and 99 deletions.
diff --git a/Content.Client/Physics/Controllers/MoverController.cs b/Content.Client/Physics/Controllers/MoverController.cs
@@ -146,9 +146,6 @@ public override void SetSprinting(Entity<InputMoverComponent> entity, ushort sub
         // Logger.Info($"[{_gameTiming.CurTick}/{subTick}] Sprint: {enabled}");
         base.SetSprinting(entity, subTick, walking);
 
-        if (walking && _cfg.GetCVar(CCVars.ToggleWalk))
-            _alerts.ShowAlert(entity, WalkingAlert, showCooldown: false, autoRemove: false);
-        else
-            _alerts.ClearAlert(entity, WalkingAlert);
+
     }
 }
diff --git a/Content.Shared/Damage/Components/StaminaComponent.cs b/Content.Shared/Damage/Components/StaminaComponent.cs
@@ -56,4 +56,8 @@ public sealed partial class StaminaComponent : Component
 
     [DataField]
     public ProtoId<AlertPrototype> StaminaAlert = "Stamina";
+
+    // Урон от бега. ЗАБАЛАНСИ МЕНЯ!!!!!!!
+    [ViewVariables(VVAccess.ReadWrite), DataField("sprintStaminaMultiplier"), AutoNetworkedField]
+    public float SprintStaminaMultiplier = 3f;
 }
diff --git a/Content.Shared/Movement/Components/InputMoverComponent.cs b/Content.Shared/Movement/Components/InputMoverComponent.cs
@@ -70,7 +70,7 @@ public sealed partial class InputMoverComponent : Component
 
         public const float LerpTime = 1.0f;
 
-        public bool Sprinting => (HeldMoveButtons & MoveButtons.Walk) == 0x0;
+        public bool Sprinting => (HeldMoveButtons & MoveButtons.Walk) != 0x0;
 
         [ViewVariables(VVAccess.ReadWrite)]
         public bool CanMove = true;

diff --git a/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs b/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs
@@ -23,7 +23,7 @@ public sealed partial class MovementSpeedModifierComponent : Component
         public const float DefaultFriction = 20f;
         public const float DefaultFrictionNoInput = 20f;
 
-        public const float DefaultBaseWalkSpeed = 2.5f;
+        public const float DefaultBaseWalkSpeed = 3f;
         public const float DefaultBaseSprintSpeed = 4.5f;
 
         [AutoNetworkedField, ViewVariables]

diff --git a/Content.Shared/Movement/Systems/SharedMoverController.cs b/Content.Shared/Movement/Systems/SharedMoverController.cs
@@ -2,6 +2,8 @@
 using System.Numerics;
 using Content.Shared.Bed.Sleep;
 using Content.Shared.CCVar;
+using Content.Shared.Damage.Components;
+using Content.Shared.Damage.Systems;
 using Content.Shared.Friction;
 using Content.Shared.Gravity;
 using Content.Shared.Inventory;
@@ -46,6 +48,7 @@ public abstract partial class SharedMoverController : VirtualController
     [Dependency] protected readonly SharedPhysicsSystem Physics = default!;
     [Dependency] private   readonly SharedTransformSystem _transform = default!;
     [Dependency] private   readonly TagSystem _tags = default!;
+    [Dependency] private readonly StaminaSystem _staminaSystem = default!;
 
     protected EntityQuery<InputMoverComponent> MoverQuery;
     protected EntityQuery<MobMoverComponent> MobMoverQuery;
@@ -160,6 +163,22 @@ protected void HandleMobMovement(
         // Specifically don't use mover.Owner because that may be different to the actual physics body being moved.
         var weightless = _gravity.IsWeightless(physicsUid, physicsComponent, xform);
         var (walkDir, sprintDir) = GetVelocityInput(mover);
+
+        if (TryComp<StaminaComponent>(uid, out var stamina))
+        {
+            if (stamina.StaminaDamage >= stamina.CritThreshold * 0.7f)
+            {
+                walkDir = sprintDir + walkDir;
+                sprintDir = Vector2.Zero;
+            }
+            else if (sprintDir != Vector2.Zero)
+            {
+                var sprintAmount = sprintDir.Length();
+                var staminaDamage = sprintAmount * frameTime * stamina.SprintStaminaMultiplier;
+                _staminaSystem.TakeStaminaDamage(uid, staminaDamage, stamina, visual: false);
+            }
+        }
+
         var touching = false;
 
         // Handle wall-pushes.
@@ -255,7 +274,7 @@ protected void HandleMobMovement(
             if (!weightless && MobMoverQuery.TryGetComponent(uid, out var mobMover) &&
                 TryGetSound(weightless, uid, mover, mobMover, xform, out var sound, tileDef: tileDef))
             {
-                var soundModifier = mover.Sprinting ? 3.5f : 1.5f;
+                var soundModifier = sprintDir != Vector2.Zero ? 3.5f : 1.5f;
 
                 var audioParams = sound.Params
                     .WithVolume(sound.Params.Volume + soundModifier)

diff --git a/Resources/Locale/ru-RU/_strings/escape-menu/ui/options-menu.ftl b/Resources/Locale/ru-RU/_strings/escape-menu/ui/options-menu.ftl
@@ -119,7 +119,7 @@ ui-options-function-move-up = Двигаться вверх
 ui-options-function-move-left = Двигаться налево
 ui-options-function-move-down = Двигаться вниз
 ui-options-function-move-right = Двигаться направо
-ui-options-function-walk = Идти
+ui-options-function-walk = Идти/Бежать.
 ui-options-function-camera-rotate-left = Повернуть налево
 ui-options-function-camera-rotate-right = Повернуть направо
 ui-options-function-camera-reset = Сбросить камеру

diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -31,7 +31,7 @@
         layer:
         - MobLayer
   - type: MovementSpeedModifier
-    baseWalkSpeed : 2.5
+    baseWalkSpeed : 3
     baseSprintSpeed : 4.5
   - type: Sprite
     sprite: Mobs/Silicon/chassis.rsi

diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
@@ -165,8 +165,8 @@
     - type: TTS
       voice: Sentrybot
     - type: MovementSpeedModifier
-      baseWalkSpeed : 2.5
-      baseSprintSpeed : 3.5
+      baseWalkSpeed : 3
+      baseSprintSpeed : 4.5
     - type: InnateItem
       worldTargetActions:
       - Emag
@@ -214,7 +214,7 @@
     - type: TTS
       voice: Sentrybot
     - type: MovementSpeedModifier
-      baseWalkSpeed: 2.5
+      baseWalkSpeed: 3
       baseSprintSpeed: 4.5
     - type: InnateItem
       worldTargetActions:
@@ -288,4 +288,4 @@
     interactSuccessString: petting-success-derelict-cyborg
     interactFailureString: petting-failure-derelict-cyborg
     interactSuccessSound:
-      path: /Audio/Ambience/Objects/periodic_beep.ogg
+      path: /Audio/Ambience/Objects/periodic_beep.ogg
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -342,7 +342,7 @@
       0: Alive
       1: Dead
   - type: MovementSpeedModifier
-    baseWalkSpeed : 2.5
+    baseWalkSpeed : 3
     baseSprintSpeed : 5
   - type: DamageStateVisuals
     states:
@@ -500,8 +500,8 @@
       40: Critical
       60: Dead
   - type: MovementSpeedModifier
-    baseWalkSpeed : 2.5
-    baseSprintSpeed : 4
+    baseWalkSpeed : 3
+    baseSprintSpeed : 4.5
     weightlessAcceleration: 1.5
     weightlessFriction: 1
     weightlessModifier: 1
@@ -1665,7 +1665,7 @@
       10: Critical
       20: Dead
   - type: MovementSpeedModifier
-    baseWalkSpeed : 2.5
+    baseWalkSpeed : 3
     baseSprintSpeed : 5
   - type: DamageStateVisuals
     states:
@@ -1895,7 +1895,7 @@
   description: A harmless dragon.
   components:
   - type: MovementSpeedModifier
-    baseWalkSpeed: 2
+    baseWalkSpeed: 3
     baseSprintSpeed: 3
   - type: Sprite
     drawdepth: Mobs
@@ -1951,7 +1951,7 @@
   description: And they called this a lizard?
   components:
   - type: MovementSpeedModifier
-    baseWalkSpeed : 2
+    baseWalkSpeed : 3
     baseSprintSpeed : 3
   - type: Sprite
     drawdepth: Mobs
@@ -2058,7 +2058,7 @@
   description: Infiltrates your domain, spies on you, and somehow still a cool pet.
   components:
   - type: MovementSpeedModifier
-    baseWalkSpeed : 2.5
+    baseWalkSpeed : 3
     baseSprintSpeed : 6
   - type: Sprite
     drawdepth: Mobs
@@ -3267,7 +3267,7 @@
       40: Critical
       60: Dead
   - type: MovementSpeedModifier
-    baseWalkSpeed : 2.5
+    baseWalkSpeed : 3
     baseSprintSpeed : 4
   - type: Inventory
     speciesId: hamster
@@ -3478,7 +3478,7 @@
       30: Critical
       60: Dead
   - type: MovementSpeedModifier
-    baseWalkSpeed : 2.5
+    baseWalkSpeed : 3
     baseSprintSpeed : 4.5
   - type: Grammar
     attributes:

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml b/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml
@@ -50,8 +50,8 @@
       Dead:
         Base: goliath_dead
   - type: MovementSpeedModifier
-    baseWalkSpeed : 2.00
-    baseSprintSpeed : 2.00
+    baseWalkSpeed : 3
+    baseSprintSpeed : 3
   - type: MobThresholds
     thresholds:
       0: Alive

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
@@ -41,7 +41,7 @@
         0: Alive
         40: Dead
     - type: MovementSpeedModifier
-      baseWalkSpeed: 2.5
+      baseWalkSpeed: 3
       baseSprintSpeed: 3.5
     - type: Stamina
       critThreshold: 100

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml b/Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml
@@ -22,8 +22,8 @@
         layer:
         - MobLayer
   - type: MovementSpeedModifier
-    baseWalkSpeed : 2
-    baseSprintSpeed : 3
+    baseWalkSpeed : 3
+    baseSprintSpeed : 3.5
   - type: Sprite
     noRot: true
     drawdepth: Mobs
@@ -94,8 +94,8 @@
       types:
         Blunt: 6
   - type: MovementSpeedModifier
-    baseWalkSpeed : 2
-    baseSprintSpeed : 2.5
+    baseWalkSpeed : 3
+    baseSprintSpeed : 3.5
   - type: NpcFactionMember
     factions:
       - SimpleHostile
@@ -138,8 +138,8 @@
       types:
         Blunt: 5
   - type: MovementSpeedModifier
-    baseWalkSpeed : 1.5
-    baseSprintSpeed : 2
+    baseWalkSpeed : 2
+    baseSprintSpeed : 2.5
   - type: Destructible
     thresholds:
     - trigger:

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/flesh.yml b/Resources/Prototypes/Entities/Mobs/NPCs/flesh.yml
@@ -30,8 +30,8 @@
     sprite: Mobs/Aliens/flesh.rsi
   - type: MovementAlwaysTouching
   - type: MovementSpeedModifier
-    baseWalkSpeed: 1
-    baseSprintSpeed: 1.5
+    baseWalkSpeed: 2
+    baseSprintSpeed: 2.5
   - type: MobState
     allowedStates:
     - Alive
@@ -135,8 +135,8 @@
       0: Alive
       30: Dead
   - type: MovementSpeedModifier
-    baseWalkSpeed: 2
-    baseSprintSpeed: 2.5
+    baseWalkSpeed: 3
+    baseSprintSpeed: 3.5
 
 - type: entity
   parent: BaseMobFlesh
@@ -159,8 +159,8 @@
       0: Alive
       30: Dead
   - type: MovementSpeedModifier
-    baseWalkSpeed: 2
-    baseSprintSpeed: 2.5
+    baseWalkSpeed: 3
+    baseSprintSpeed: 3.5
 
 - type: entity
   parent: BaseMobFlesh
@@ -189,8 +189,8 @@
       0: Alive
       100: Dead
   - type: MovementSpeedModifier
-    baseWalkSpeed: 1.5
-    baseSprintSpeed: 2.5
+    baseWalkSpeed: 2.5
+    baseSprintSpeed: 3.5
   - type: MeleeWeapon
     soundHit:
         path: /Audio/Weapons/Xeno/alien_claw_flesh3.ogg
@@ -228,8 +228,8 @@
     sprite: Mobs/Aliens/flesh.rsi
   - type: MovementAlwaysTouching
   - type: MovementSpeedModifier
-    baseWalkSpeed: 1
-    baseSprintSpeed: 1.5
+    baseWalkSpeed: 2
+    baseSprintSpeed: 2.5
   - type: MobState
     allowedStates:
     - Alive
@@ -334,8 +334,8 @@
       0: Alive
       30: Dead
   - type: MovementSpeedModifier
-    baseWalkSpeed: 2
-    baseSprintSpeed: 2.5
+    baseWalkSpeed: 3
+    baseSprintSpeed: 3.5
 
 - type: entity
   parent: BaseMobFleshSalvage
@@ -358,5 +358,5 @@
       0: Alive
       30: Dead
   - type: MovementSpeedModifier
-    baseWalkSpeed: 2
-    baseSprintSpeed: 2.5
+    baseWalkSpeed: 3
+    baseSprintSpeed: 3.5
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/hellspawn.yml b/Resources/Prototypes/Entities/Mobs/NPCs/hellspawn.yml
@@ -31,8 +31,8 @@
     damageContainer: BiologicalMetaphysical
     damageModifierSet: HellSpawn
   - type: MovementSpeedModifier
-    baseWalkSpeed: 2
-    baseSprintSpeed: 3
+    baseWalkSpeed: 3
+    baseSprintSpeed: 3.5
   - type: Sprite
     sprite: Mobs/Demons/hellspawn.rsi
     layers:

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml b/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml
@@ -38,5 +38,5 @@
       types:
         Blunt: 20
   - type: MovementSpeedModifier
-    baseWalkSpeed : 1
-    baseSprintSpeed : 1
+    baseWalkSpeed : 2
+    baseSprintSpeed : 2.5
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml b/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml
@@ -38,7 +38,7 @@
         0: Alive
         100: Dead
     - type: MovementSpeedModifier
-      baseWalkSpeed: 2
+      baseWalkSpeed: 3
       baseSprintSpeed: 5
     - type: Tag
       tags:

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/shadows.yml b/Resources/Prototypes/Entities/Mobs/NPCs/shadows.yml
@@ -9,8 +9,8 @@
     color: "#793a80dd"
     radius: 1.1
   - type: MovementSpeedModifier
-    baseWalkSpeed: 2
-    baseSprintSpeed: 2
+    baseWalkSpeed: 3
+    baseSprintSpeed: 3.5
   - type: Fixtures
     fixtures:
       fix1:
@@ -36,7 +36,7 @@
     speedModifierThresholds:
       60: 0.7
       80: 0.5
-      
+
 - type: entity
   name: shadow cat
   parent: BaseShadowMob
@@ -64,4 +64,4 @@
       gender: epicene
   - type: Tag
     tags:
-    - VimPilot
+    - VimPilot
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
@@ -295,8 +295,8 @@
       absorbed:
         maxVol: 50
   - type: MovementSpeedModifier
-    baseWalkSpeed: 2
-    baseSprintSpeed: 3
+    baseWalkSpeed: 3
+    baseSprintSpeed: 3.5
   - type: HTN
     rootTask:
       task: CleanbotCompound