From 881574a829615b0040364853a7a09770696b05e6 Mon Sep 17 00:00:00 2001 From: Aviu00 <93730715+Aviu00@users.noreply.github.com> Date: Mon, 17 Jun 2024 17:12:02 +0000 Subject: [PATCH] Nerfs (#361) * - tweak: Nerfs mostly. * - tweak: Less tc. * - tweak: Ebow tweak. * - tweak: More nerfs. * - fix: firerate. --- .../Rules/Components/NukeopsRuleComponent.cs | 2 +- .../Knockdown/KnockdownOnCollideComponent.cs | 8 +++++ .../Knockdown/KnockdownOnCollideSystem.cs | 30 +++++++++++++++++++ .../Prototypes/Catalog/uplink_catalog.yml | 2 +- .../Entities/Clothing/OuterClothing/armor.yml | 4 +-- .../Clothing/OuterClothing/hardsuits.yml | 6 ++-- .../Guns/Ammunition/Cartridges/shotgun.yml | 6 ++-- .../Guns/Ammunition/Projectiles/shotgun.yml | 4 +-- .../Weapons/Guns/Projectiles/bolts.yml | 11 +++---- .../Objects/Weapons/Guns/Snipers/snipers.yml | 2 ++ .../Objects/Weapons/Guns/mini_ebow.yml | 4 +-- 11 files changed, 58 insertions(+), 21 deletions(-) create mode 100644 Content.Shared/_White/Knockdown/KnockdownOnCollideComponent.cs create mode 100644 Content.Shared/_White/Knockdown/KnockdownOnCollideSystem.cs diff --git a/Content.Server/GameTicking/Rules/Components/NukeopsRuleComponent.cs b/Content.Server/GameTicking/Rules/Components/NukeopsRuleComponent.cs index a02807293f..828ea95c7d 100644 --- a/Content.Server/GameTicking/Rules/Components/NukeopsRuleComponent.cs +++ b/Content.Server/GameTicking/Rules/Components/NukeopsRuleComponent.cs @@ -84,7 +84,7 @@ public sealed partial class NukeopsRuleComponent : Component /// This amount of TC will be given to each nukie /// [DataField] - public int WarTCAmountPerNukie = 50; + public int WarTCAmountPerNukie = 40; /// /// Delay between war declaration and nuke ops arrival on station map. Gives crew time to prepare diff --git a/Content.Shared/_White/Knockdown/KnockdownOnCollideComponent.cs b/Content.Shared/_White/Knockdown/KnockdownOnCollideComponent.cs new file mode 100644 index 0000000000..5e33cac2e4 --- /dev/null +++ b/Content.Shared/_White/Knockdown/KnockdownOnCollideComponent.cs @@ -0,0 +1,8 @@ +namespace Content.Shared._White.Knockdown; + +[RegisterComponent] +public sealed partial class KnockdownOnCollideComponent : Component +{ + [DataField] + public float BlurTime = 20f; +} diff --git a/Content.Shared/_White/Knockdown/KnockdownOnCollideSystem.cs b/Content.Shared/_White/Knockdown/KnockdownOnCollideSystem.cs new file mode 100644 index 0000000000..5806f41a36 --- /dev/null +++ b/Content.Shared/_White/Knockdown/KnockdownOnCollideSystem.cs @@ -0,0 +1,30 @@ +using Content.Shared.Eye.Blinding.Components; +using Content.Shared.Projectiles; +using Content.Shared.Standing.Systems; +using Content.Shared.StatusEffect; + +namespace Content.Shared._White.Knockdown; + +public sealed class KnockdownOnCollideSystem : EntitySystem +{ + [Dependency] private readonly SharedStandingStateSystem _standing = default!; + [Dependency] private readonly StatusEffectsSystem _statusEffects = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnProjectileHit); + } + + private void OnProjectileHit(Entity ent, ref ProjectileHitEvent args) + { + _standing.TryLieDown(args.Target, null, true); + + if (ent.Comp.BlurTime <= 0f) + return; + + _statusEffects.TryAddStatusEffect(args.Target, "BlurryVision", + TimeSpan.FromSeconds(ent.Comp.BlurTime), true); + } +} diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 17b530d031..d7934b1d6b 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -17,7 +17,7 @@ description: uplink-revolver-python-desc productEntity: WeaponRevolverPythonAP cost: - Telecrystal: 6 # Originally was 13 TC but was not used due to high cost + Telecrystal: 8 # Originally was 13 TC but was not used due to high cost categories: - UplinkWeaponry saleLimit: 1 diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml index 6dc1eb2a83..2599f28127 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml @@ -61,7 +61,7 @@ coefficients: Blunt: 0.4 Slash: 0.4 - Piercing: 0.7 + Piercing: 0.9 Heat: 0.9 Caustic: 0.9 - type: ExplosionResistance @@ -106,7 +106,7 @@ Piercing: 0.9 Heat: 0.4 # this technically means it protects against fires pretty well? -heat is just for lasers and stuff, not atmos temperature - type: Reflect - reflectProb: 1 + reflectProb: 0.5 reflects: - Energy diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index 9c13d1fe69..a77bb76049 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -576,7 +576,7 @@ Blunt: 0.5 Slash: 0.5 Piercing: 0.5 - Heat: 0.2 + Heat: 0.4 Radiation: 0.01 Caustic: 0.5 - type: Item @@ -609,7 +609,7 @@ coefficients: Blunt: 0.4 Slash: 0.4 - Piercing: 0.3 + Piercing: 0.4 Heat: 0.5 Radiation: 0.25 Caustic: 0.4 @@ -642,7 +642,7 @@ Blunt: 0.2 Slash: 0.2 Piercing: 0.2 - Heat: 0.2 + Heat: 0.4 Radiation: 0.2 Caustic: 0.2 - type: ClothingSpeedModifier diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml index 1439f1eb32..fb7cb21ae3 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml @@ -10,7 +10,7 @@ - ShellShotgun - type: CartridgeAmmo count: 6 - spread: 22 + spread: 28 soundEject: collection: ShellEject - type: Sprite @@ -130,7 +130,7 @@ maxTransferAmount: 7 - type: SpentAmmoVisuals state: "practice" - + - type: entity id: ShellShotgunImprovised name: improvised shotgun shell @@ -146,7 +146,7 @@ node: shell - type: CartridgeAmmo count: 10 - spread: 45 + spread: 45 proto: PelletShotgunImprovised - type: SpentAmmoVisuals state: "improvised" diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml index 698e6b7b19..8f07ec2a4a 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml @@ -10,7 +10,7 @@ - type: Projectile damage: types: - Piercing: 28 + Piercing: 40 - type: entity id: PelletShotgunBeanbag @@ -87,7 +87,7 @@ damage: types: Piercing: 3 - Slash: 3 + Slash: 3 - type: entity id: PelletShotgunTranquilizer diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/bolts.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/bolts.yml index 5e3cf9944a..ebd0a74a03 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/bolts.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/bolts.yml @@ -26,10 +26,7 @@ hard: false mask: - Opaque - - type: StunOnCollide - stunAmount: 1 - knockdownAmount: 1 - slowdownAmount: 5 - walkSpeedModifier: 0.5 - runSpeedModifier: 0.3 - + - type: KnockdownOnCollide + - type: StaminaDamageOnCollide + ignoreResistances: false + damage: 60 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml index 485c2a9f0c..6336098609 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml @@ -65,6 +65,8 @@ - CartridgeAntiMateriel capacity: 5 proto: CartridgeAntiMateriel + - type: Gun + fireRate: 0.6 - type: Wieldable forceTwoHanded: True - type: Telescope diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/mini_ebow.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/mini_ebow.yml index aaadbb7aa5..9e058ee512 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/mini_ebow.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/mini_ebow.yml @@ -15,11 +15,11 @@ - Belt - type: Gun resetOnHandSelected: false - fireRate: 0.3 + fireRate: 0.5 soundGunshot: path: /Audio/Weapons/click.ogg - type: RechargeBasicEntityAmmo - rechargeCooldown: 2.5 + rechargeCooldown: 1.5 rechargeSound: path: /Audio/Weapons/Guns/MagIn/revolver_magin.ogg - type: BasicEntityAmmoProvider