From 7bbe70eecfa10489be6003f8799a85d9a90e36dd Mon Sep 17 00:00:00 2001 From: Inconnu <177014427+Inconnu1337@users.noreply.github.com> Date: Tue, 22 Oct 2024 14:18:07 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D1=80=D0=B5=D0=B2?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=D0=BD=D1=82=D0=B0,=20=D0=BD=D0=B5=D0=B1?= =?UTF-8?q?=D0=BE=D0=BB=D1=8C=D1=88=D0=BE=D0=B9=20=D1=80=D0=B5=D0=B1=D0=B0?= =?UTF-8?q?=D0=BB=D0=B0=D0=BD=D1=81=20(#664)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Почему / Баланс нерф щитов а то пипяо ## Требования - [x] Я прочитал(а) и следую [Руководство по созданию пулл реквестов](https://docs.spacestation14.com/en/general-development/codebase-info/pull-request-guidelines.html). Я понимаю, что в противном случае мой ПР может быть закрыт по усмотрению мейнтейнера. - [x] Я добавил скриншоты/видео к этому пулл реквесту, демонстрирующие его изменения в игре, **или** этот пулл реквест не требует демонстрации в игре **Чейнджлог** :cl: - add: Добавлено замедление щитам - tweak: Снижена цена рейдерской брони с 12 до 8 ТК - fix: Исправлен баг, который позволял ревенанту отожрать пузо и болтировать обесточенные шлюзы --- .../EntitySystems/RevenantSystem.Abilities.cs | 7 +++++-- .../Revenant/Components/RevenantComponent.cs | 4 ++-- Resources/Prototypes/Catalog/uplink_catalog.yml | 2 +- .../Prototypes/Entities/Clothing/Head/helmets.yml | 1 - .../Prototypes/Entities/Objects/Shields/shields.yml | 11 +++++++++++ 5 files changed, 19 insertions(+), 6 deletions(-) diff --git a/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs b/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs index 1a502e6fc12..e088a90e5b8 100644 --- a/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs +++ b/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs @@ -43,6 +43,7 @@ using Content.Shared.Whitelist; using Content.Shared.ADT.Silicon.Components; using Content.Shared.Stunnable; +using Content.Server.Power.Components; // ADT-Revenant-Tweak namespace Content.Server.Revenant.EntitySystems; @@ -61,7 +62,7 @@ public sealed partial class RevenantSystem [Dependency] private readonly SharedAudioSystem _audio = default!; [Dependency] private readonly SharedMindSystem _mind = default!; [Dependency] private readonly SharedDoorSystem _door = default!; - [Dependency] private readonly WeldableSystem _weld = default!; +// [Dependency] private readonly WeldableSystem _weld = default!; ADT-Revenant-Tweak [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; [Dependency] private readonly SharedTransformSystem _transformSystem = default!; @@ -454,7 +455,9 @@ private void OnLockAction(EntityUid uid, RevenantComponent component, RevenantLo continue; if (!TryComp(ent, out var boltsComp)) continue; - if (!boltsComp.BoltWireCut && door.State == DoorState.Closed && !boltsComp.BoltsDown) + if (!TryComp(ent, out var powerComp)) + continue; + if (!boltsComp.BoltWireCut && door.State == DoorState.Closed && !boltsComp.BoltsDown && powerComp.Powered) { _door.SetBoltsDown((ent, boltsComp), true, uid); _audio.PlayPvs(component.LockSound, ent); diff --git a/Content.Shared/Revenant/Components/RevenantComponent.cs b/Content.Shared/Revenant/Components/RevenantComponent.cs index d6d97002619..163c863c572 100644 --- a/Content.Shared/Revenant/Components/RevenantComponent.cs +++ b/Content.Shared/Revenant/Components/RevenantComponent.cs @@ -232,7 +232,7 @@ public sealed partial class RevenantComponent : Component /// The amount of essence that is needed to use the ability. /// [ViewVariables(VVAccess.ReadWrite), DataField("hysteriaCost")] - public FixedPoint2 HysteriaCost = -60; + public FixedPoint2 HysteriaCost = 60; /// /// The status effects applied after the ability @@ -316,7 +316,7 @@ public sealed partial class RevenantComponent : Component /// The amount of essence that is needed to use the ability. /// [ViewVariables(VVAccess.ReadWrite), DataField("lockCost")] - public FixedPoint2 LockCost = -50; + public FixedPoint2 LockCost = 50; /// /// The status effects applied after the ability diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index cac8974be81..41fd3533c6c 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -1546,7 +1546,7 @@ icon: { sprite: /Textures/Clothing/OuterClothing/Armor/syndie-raid.rsi, state: icon } productEntity: ClothingBackpackDuffelSyndicateRaidBundle cost: - Telecrystal: 12 # ADT-Tweak 8>13 + Telecrystal: 8 # ADT-Tweak categories: - UplinkWearables conditions: diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml index 6c8a93f3dfa..625ef7a0561 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml @@ -386,7 +386,6 @@ Slash: 0.85 Piercing: 0.85 Heat: 0.85 - staminaModifier: 0.3 # ADT-Tweak #Bone Helmet - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Shields/shields.yml b/Resources/Prototypes/Entities/Objects/Shields/shields.yml index e8d47c5f14d..cb053662b3b 100644 --- a/Resources/Prototypes/Entities/Objects/Shields/shields.yml +++ b/Resources/Prototypes/Entities/Objects/Shields/shields.yml @@ -30,6 +30,12 @@ Slash: 1 Piercing: 1 Heat: 1 + # ADT-Tweak-Start + - type: ClothingSpeedModifier + walkModifier: 0.8 + sprintModifier: 0.7 + - type: HeldSpeedModifier + # ADT-Tweak-End - type: Damageable damageContainer: Shield - type: Destructible @@ -451,6 +457,11 @@ flatReductions: Heat: 1 Piercing: 1 + # ADT-Tweak-Start + - type: ClothingSpeedModifier + walkModifier: 1 + sprintModifier: 1 + # ADT-Tweak-End - type: Appearance - type: Damageable damageContainer: Shield