From 5d05e7deb3465d49f0753f76da5dab01d5d2ab1e Mon Sep 17 00:00:00 2001 From: iDesmond <44869755+iDesmond@users.noreply.github.com> Date: Sun, 8 Jun 2025 00:56:01 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D1=87=D0=B8=D0=BD=D0=BA=D0=B0=20?= =?UTF-8?q?=D0=B1=D0=B0=D0=B3=D0=B0=20=D1=84=D0=B8=D0=B7=D0=B8=D0=BA=D0=B8?= =?UTF-8?q?=20=D0=BC=D0=B5=D1=85=D0=BE=D0=B2=20=D0=B8=20=D0=BF=D0=BE=D0=B4?= =?UTF-8?q?=D0=BE=D0=B2=20(#2288)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: pacable --- .../Friction/TileFrictionController.cs | 6 ++++ .../Entities/Objects/Specific/Mech/mechs.yml | 36 ++++++++++--------- .../Objects/Specific/Mech/lockermech.yml | 2 +- .../Entities/Objects/Specific/Mech/mechs.yml | 15 ++++---- 4 files changed, 34 insertions(+), 25 deletions(-) diff --git a/Content.Shared/Friction/TileFrictionController.cs b/Content.Shared/Friction/TileFrictionController.cs index 36e971862a..e0ce5e21ca 100644 --- a/Content.Shared/Friction/TileFrictionController.cs +++ b/Content.Shared/Friction/TileFrictionController.cs @@ -14,6 +14,7 @@ using Robust.Shared.Physics.Components; using Robust.Shared.Physics.Controllers; using Robust.Shared.Physics.Dynamics; using Robust.Shared.Physics.Systems; +using Content.Shared.Mech.Components; //sunrise-edit namespace Content.Shared.Friction { @@ -30,6 +31,7 @@ namespace Content.Shared.Friction private EntityQuery _pullerQuery; private EntityQuery _pullableQuery; private EntityQuery _gridQuery; + private EntityQuery _mechQuery; //sunrise-edit private float _frictionModifier; private float _minDamping; @@ -49,6 +51,7 @@ namespace Content.Shared.Friction _pullerQuery = GetEntityQuery(); _pullableQuery = GetEntityQuery(); _gridQuery = GetEntityQuery(); + _mechQuery = GetEntityQuery(); //sunrise-edit } public override void UpdateBeforeSolve(bool prediction, float frameTime) @@ -62,6 +65,9 @@ namespace Content.Shared.Friction // Only apply friction when it's not a mob (or the mob doesn't have control) // We may want to instead only apply friction to dynamic entities and not mobs ever. + if (_mechQuery.HasComp(uid)) //sunrise-edit + continue; //sunrise-edit + if (prediction && !body.Predict || _mover.UseMobMovement(uid)) continue; diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml index 73bb04957c..bf42d0b5b7 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml @@ -119,7 +119,7 @@ - type: InteractionOutline - type: MovementSpeedModifier baseWalkSpeed: 1 - baseSprintSpeed: 2 + baseSprintSpeed: 3.9 # sunrise-edit - type: Tag tags: - DoorBumpOpener @@ -129,6 +129,8 @@ - type: WiresPanel - type: Physics bodyType: Dynamic + angularDamping: 10 # sunrise-edit + linearDamping: 10 # sunrise-edit - type: Fixtures fixtures: fix1: @@ -239,7 +241,7 @@ Blunt: 14 #intentionally shit so people realize that going into combat with the ripley is usually a bad idea. - type: MovementSpeedModifier baseWalkSpeed: 2.5 - baseSprintSpeed: 3.8 + baseSprintSpeed: 5.5 # sunrise-edit - type: Reflect reflectProb: 0.15 spread: 180 @@ -307,7 +309,7 @@ Blunt: 20 - type: MovementSpeedModifier baseWalkSpeed: 1.5 - baseSprintSpeed: 2.5 + baseSprintSpeed: 4.3 # sunrise-edit - type: Damageable damageModifierSet: MediumArmorNT - type: Reflect @@ -377,7 +379,7 @@ Blunt: 26 - type: MovementSpeedModifier baseWalkSpeed: 2.5 - baseSprintSpeed: 4 + baseSprintSpeed: 5.7 # sunrise-edit - type: CanMoveInAir - type: MovementAlwaysTouching - type: Reflect @@ -467,7 +469,7 @@ path: "/Audio/Items/drill_use.ogg" - type: MovementSpeedModifier baseWalkSpeed: 2 - baseSprintSpeed: 2.75 + baseSprintSpeed: 4.2 # sunrise-edit - type: CanMoveInAir - type: MovementAlwaysTouching - type: Reflect @@ -615,7 +617,7 @@ Structural: 2 - type: MovementSpeedModifier baseWalkSpeed: 2.4 - baseSprintSpeed: 3.7 + baseSprintSpeed: 5.2 # sunrise-edit - type: Reflect reflectProb: 0.15 spread: 180 @@ -694,7 +696,7 @@ Structural: 2 - type: MovementSpeedModifier baseWalkSpeed: 2.25 - baseSprintSpeed: 3.6 + baseSprintSpeed: 5.2 # sunrise-edit - type: Access tags: - Maintenance @@ -775,7 +777,7 @@ bluntStaminaDamageFactor: 1.5 - type: MovementSpeedModifier baseWalkSpeed: 2 - baseSprintSpeed: 3 + baseSprintSpeed: 5.2 # sunrise-edit - type: Reflect reflectProb: 0.20 spread: 180 @@ -847,8 +849,8 @@ Structural: 250 bluntStaminaDamageFactor: 1.5 - type: MovementSpeedModifier - baseWalkSpeed: 1.5 - baseSprintSpeed: 2 + baseWalkSpeed: 2.7 # sunrise-edit + baseSprintSpeed: 3.7 # sunrise-edit - type: Damageable damageModifierSet: MediumArmorNT - type: CanMoveInAir @@ -923,7 +925,7 @@ Structural: 80 - type: MovementSpeedModifier baseWalkSpeed: 3.2 - baseSprintSpeed: 4 + baseSprintSpeed: 6 # sunrise-edit - type: Reflect reflectProb: 0.65 spread: 180 @@ -1000,7 +1002,7 @@ bluntStaminaDamageFactor: 1.5 - type: MovementSpeedModifier baseWalkSpeed: 2 - baseSprintSpeed: 3 + baseSprintSpeed: 4.7 # sunrise-edit - type: Reflect reflectProb: 0.20 spread: 180 @@ -1092,7 +1094,7 @@ bluntStaminaDamageFactor: 1.5 - type: MovementSpeedModifier baseWalkSpeed: 1 - baseSprintSpeed: 1.5 + baseSprintSpeed: 2.7 # sunrise-edit - type: Damageable damageModifierSet: HeavyArmorNT - type: CanMoveInAir @@ -1179,7 +1181,7 @@ bluntStaminaDamageFactor: 1.5 - type: MovementSpeedModifier baseWalkSpeed: 1 - baseSprintSpeed: 1.5 + baseSprintSpeed: 3.2 # sunrise-edit - type: Damageable damageModifierSet: HeavyArmorNT - type: CanMoveInAir @@ -1269,7 +1271,7 @@ bluntStaminaDamageFactor: 1.5 - type: MovementSpeedModifier baseWalkSpeed: 2 - baseSprintSpeed: 3 + baseSprintSpeed: 4.8 # sunrise-edit - type: Damageable damageModifierSet: MediumArmorSyndi - type: CanMoveInAir @@ -1359,7 +1361,7 @@ bluntStaminaDamageFactor: 1.5 - type: MovementSpeedModifier baseWalkSpeed: 1.5 - baseSprintSpeed: 2 + baseSprintSpeed: 3.8 # sunrise-edit - type: Damageable damageModifierSet: MediumArmorSyndi - type: CanMoveInAir @@ -1444,7 +1446,7 @@ bluntStaminaDamageFactor: 1.5 - type: MovementSpeedModifier baseWalkSpeed: 1 - baseSprintSpeed: 1.5 + baseSprintSpeed: 2.7 # sunrise-edit - type: Damageable damageModifierSet: HeavyArmorSyndi - type: CanMoveInAir diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/lockermech.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/lockermech.yml index 0cb61c703a..9656a56441 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/lockermech.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/lockermech.yml @@ -37,7 +37,7 @@ Blunt: 5 - type: MovementSpeedModifier baseWalkSpeed: 1 - baseSprintSpeed: 1.5 + baseSprintSpeed: 3.1 - type: Reflect reflectProb: 0.15 spread: 180 diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/mechs.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/mechs.yml index 0ddaafa718..0708504408 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/mechs.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/mechs.yml @@ -52,18 +52,18 @@ - type: InputMover - type: InteractionOutline - type: MovementSpeedModifier - baseWalkSpeed: 1 - baseSprintSpeed: 0.75 - friction: 5 - weightlessFriction: 5 - weightlessAcceleration: 3.5 - weightlessModifier: 3 + baseWalkSpeed: 1.7 + baseSprintSpeed: 1.7 + baseFriction: 15 + baseWeightlessModifier: 10 - type: MovementAlwaysTouching - type: Pullable - type: Clickable - type: WiresPanel - type: Physics bodyType: Dynamic + angularDamping: 2 + linearDamping: 2 - type: MobState allowedStates: - Alive @@ -114,7 +114,8 @@ enabled: false mask: /Textures/Effects/LightMasks/cone.png autoRot: true - radius: 9 + radius: 30 + energy: 3 netsync: false - type: entity