From cf4530e3a6566523b1bee49fa7d82ceb4281ef9c Mon Sep 17 00:00:00 2001 From: Spatison <137375981+Spatison@users.noreply.github.com> Date: Thu, 25 Jul 2024 16:33:11 +0300 Subject: [PATCH] Shinano (#494) * Shinano * A < a --- .../Explosion/TriggerOnLandComponent.cs | 2 +- .../FlashSoundSuppressionComponent.cs | 2 +- .../weapons/guns/ammunition/boxes/shinano.ftl | 8 ++++--- .../ammunition/cartridges/shinanogrenade.ftl | 10 ++++---- .../Catalog/Fills/Lockers/security.yml | 2 ++ .../Guns/Ammunition/Boxes/shinanobox.yml | 13 ++++++++++ .../Guns/Ammunition/shinanogrenades.yml | 17 +++++++++++++ .../Guns/Projectiles/shinanogrenades.yml | 24 +++++++++++++++++-- .../Entities/Objects/Weapons/Guns/shinano.yml | 3 +++ Resources/Prototypes/_White/tags.yml | 3 +++ 10 files changed, 73 insertions(+), 11 deletions(-) diff --git a/Content.Server/_White/Explosion/TriggerOnLandComponent.cs b/Content.Server/_White/Explosion/TriggerOnLandComponent.cs index 7b98d13a38..64a7d1fe6a 100644 --- a/Content.Server/_White/Explosion/TriggerOnLandComponent.cs +++ b/Content.Server/_White/Explosion/TriggerOnLandComponent.cs @@ -4,5 +4,5 @@ public sealed partial class TriggerOnLandComponent : Component { [DataField] - public float Delay = 0.3f; + public float Delay = 1f; } diff --git a/Content.Shared/_White/BuffedFlashGrenade/FlashSoundSuppressionComponent.cs b/Content.Shared/_White/BuffedFlashGrenade/FlashSoundSuppressionComponent.cs index 467ac826b7..6343ff2ca3 100644 --- a/Content.Shared/_White/BuffedFlashGrenade/FlashSoundSuppressionComponent.cs +++ b/Content.Shared/_White/BuffedFlashGrenade/FlashSoundSuppressionComponent.cs @@ -6,5 +6,5 @@ namespace Content.Shared._White.BuffedFlashGrenade; public sealed partial class FlashSoundSuppressionComponent : Component { [DataField, ViewVariables(VVAccess.ReadWrite)] - public float MaxRange = 3f; + public float MaxRange = 2f; } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/white/entities/objects/weapons/guns/ammunition/boxes/shinano.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/white/entities/objects/weapons/guns/ammunition/boxes/shinano.ftl index ad4c4d8a54..7e3b79a1e8 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/white/entities/objects/weapons/guns/ammunition/boxes/shinano.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/white/entities/objects/weapons/guns/ammunition/boxes/shinano.ftl @@ -1,8 +1,10 @@ ent-BaseShinanoGrenadeAmmoProvider = { ent-BaseAmmoProvider } .desc = { ent-BaseAmmoProvider.desc } -ent-BoxShinanoGrenadeFlash = коробка гранат (светошумовые) +ent-BoxShinanoGrenadeFlash = коробка светошумовых гранат (40мм) .desc = Заставь их плакать. -ent-BoxShinanoGrenadeSmoke = коробка гранат (слезоточивые) +ent-BoxShinanoGrenadeSmoke = коробка слезоточивых гранат (40мм) .desc = Заставь их плакать. -ent-BoxShinanoGrenadeBeanbag = коробка гранат (травматические) +ent-BoxShinanoGrenadeStinger = коробка травматических гранат (40мм) + .desc = Это точно никого не убьет? +ent-BoxShinanoGrenadeBeanbag = коробка травматических пуль (40мм) .desc = Это точно никого не убьет? \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/white/entities/objects/weapons/guns/ammunition/cartridges/shinanogrenade.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/white/entities/objects/weapons/guns/ammunition/cartridges/shinanogrenade.ftl index 8b9fb638f8..e9d15796f4 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/white/entities/objects/weapons/guns/ammunition/cartridges/shinanogrenade.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/white/entities/objects/weapons/guns/ammunition/cartridges/shinanogrenade.ftl @@ -1,8 +1,10 @@ -ent-BaseShinanoGrenade = Граната +ent-BaseShinanoGrenade = граната (40мм) .desc = { ent-BaseCartridge.desc } -ent-ShinanoGrenadeFlash = Светошумовая граната +ent-ShinanoGrenadeFlash = светошумовая граната (40мм) .desc = { ent-BaseShinanoGrenade.desc } -ent-ShinanoGrenadeSmoke = Слезоточивая граната +ent-ShinanoGrenadeSmoke = слезоточивая граната (40мм) .desc = { ent-BaseShinanoGrenade.desc } -ent-ShinanoGrenadeBeanbag = Травматическая граната +ent-ShinanoGrenadeStinger = травматическая граната (40мм) + .desc = { ent-BaseShinanoGrenade.desc } +ent-ShinanoGrenadeBeanbag = травматическая пуля (40мм) .desc = { ent-BaseShinanoGrenade.desc } \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml index 36db90fc01..c20e61ccb1 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml @@ -22,6 +22,7 @@ - id: WeaponLauncherShinano - id: BoxShinanoGrenadeFlash - id: BoxShinanoGrenadeSmoke + - id: BoxShinanoGrenadeStinger - id: BoxShinanoGrenadeBeanbag - type: entity @@ -46,6 +47,7 @@ - id: WeaponLauncherShinano - id: BoxShinanoGrenadeFlash - id: BoxShinanoGrenadeSmoke + - id: BoxShinanoGrenadeStinger - id: BoxShinanoGrenadeBeanbag - type: entity diff --git a/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shinanobox.yml b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shinanobox.yml index bd445330a2..07f11ff9a6 100644 --- a/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shinanobox.yml +++ b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shinanobox.yml @@ -36,6 +36,19 @@ - state: boxwide - state: shellflare +- type: entity + name: shinano grenade stinger dispenser + parent: BaseShinanoGrenadeAmmoProvider + id: BoxShinanoGrenadeStinger + description: A dispenser box full of stinger grenade, designed for Shinano. + components: + - type: BallisticAmmoProvider + proto: ShinanoGrenadeStinger + - type: Sprite + layers: + - state: boxwide + - state: shellflare + - type: entity name: shinano grenade beanbag dispenser parent: BaseShinanoGrenadeAmmoProvider diff --git a/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Ammunition/shinanogrenades.yml b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Ammunition/shinanogrenades.yml index 9e7f719406..c45844898b 100644 --- a/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Ammunition/shinanogrenades.yml +++ b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Ammunition/shinanogrenades.yml @@ -45,6 +45,23 @@ state: smoke suffix: false +- type: entity + id: ShinanoGrenadeStinger + name: shinano stinger grenade + parent: BaseShinanoGrenade + components: + - type: CartridgeAmmo + proto: ShinanoBulletGrenadeStinger + - type: Sprite + sprite: Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi + layers: + - state: blast + map: ["enum.AmmoVisualLayers.Base"] + - type: Appearance + - type: SpentAmmoVisuals + state: stinger + suffix: false + - type: entity id: ShinanoGrenadeBeanbag name: beanbag shinano grenade diff --git a/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Projectiles/shinanogrenades.yml b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Projectiles/shinanogrenades.yml index 63c2c621cd..613c588ab3 100644 --- a/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Projectiles/shinanogrenades.yml +++ b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Projectiles/shinanogrenades.yml @@ -22,7 +22,6 @@ - ItemMask restitution: 0.3 # fite me friction: 0.2 - - type: DeleteOnTrigger - type: Physics bodyType: Dynamic - type: TimedDespawn @@ -40,9 +39,11 @@ layers: - state: grenade - type: FlashOnTrigger - range: 3 + range: 5 + forceStun: true - type: SpawnOnTrigger proto: GrenadeFlashEffect + - type: DeleteOnTrigger - type: entity parent: BaseBulletShinanoGranade @@ -64,6 +65,25 @@ Quantity: 50 - type: SoundOnTrigger sound: /Audio/Items/smoke_grenade_smoke.ogg + - type: DeleteOnTrigger + +- type: entity + id: ShinanoBulletGrenadeStinger + name: stinger shinano grenade + parent: BaseBulletShinanoGranade + noSpawn: true + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + layers: + - state: grenade + - type: ClusterGrenade + fillPrototype: PelletClusterRubber + maxGrenadesCount: 30 + grenadeType: enum.GrenadeType.Shoot + - type: ContainerContainer + containers: + cluster-payload: !type:Container - type: entity parent: [BaseBullet, BaseBulletTrail] diff --git a/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/shinano.yml b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/shinano.yml index 52d3f5a13a..0b976dcb5b 100644 --- a/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/shinano.yml +++ b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/shinano.yml @@ -11,6 +11,9 @@ map: ["enum.GunVisualLayers.Base"] - type: Item sprite: White/Objects/Weapons/Guns/Launchers/shinano-inhands.rsi + size: Large + shape: + - 0,0,2,1 - type: Clothing sprite: White/Objects/Weapons/Guns/Launchers/shinano-inhands.rsi slots: diff --git a/Resources/Prototypes/_White/tags.yml b/Resources/Prototypes/_White/tags.yml index e3c0bd07de..479ac4738b 100644 --- a/Resources/Prototypes/_White/tags.yml +++ b/Resources/Prototypes/_White/tags.yml @@ -82,6 +82,9 @@ - type: Tag id: DoorjackUsable +- type: Tag + id: ShinanoGrenade + - type: Tag id: Card