Гранатомет СБ (#483)

* tweak: Гранатомет СБ * Синано
2024-07-24 02:19:31 +03:00
parent 0d99c5afe7
commit 6aa5544bdb
22 changed files with 323 additions and 153 deletions
--- 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
@@ -0,0 +1,8 @@
+ent-BaseShinanoGrenadeAmmoProvider = { ent-BaseAmmoProvider }
+    .desc = { ent-BaseAmmoProvider.desc }
+ent-BoxShinanoGrenadeFlash = коробка гранат (светошумовые)
+    .desc = Заставь их плакать.
+ent-BoxShinanoGrenadeSmoke = коробка гранат (слезоточивые)
+    .desc = Заставь их плакать.
+ent-BoxShinanoGrenadeBeanbag = коробка гранат (травматические)
+    .desc = Это точно никого не убьет?
--- 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
@@ -0,0 +1,8 @@
+ent-BaseShinanoGrenade = Граната
+    .desc = { ent-BaseCartridge.desc }
+ent-ShinanoGrenadeFlash = Светошумовая граната 
+    .desc = { ent-BaseShinanoGrenade.desc }
+ent-ShinanoGrenadeSmoke = Слезоточивая граната 
+    .desc = { ent-BaseShinanoGrenade.desc }
+ent-ShinanoGrenadeBeanbag = Травматическая граната 
+    .desc = { ent-BaseShinanoGrenade.desc }
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/white/entities/objects/weapons/guns/launchers/shinano.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/white/entities/objects/weapons/guns/launchers/shinano.ftl
@@ -0,0 +1,2 @@
+ent-WeaponLauncherShinano = Синано
+    .desc = Однозарядный гранатомёт, которым снаряжаются колониальные полиции, охранные подразделения и наёмники везде, где есть влияние Нанотрейзен. Печально известен среди пикетирующих и революционеров, так как БЛУП - это первое, что они слышут, перед тем как начинается насилие.
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/white/entities/objects/weapons/melee/experimental_stunbaton.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/white/entities/objects/weapons/melee/experimental_stunbaton.ftl
--- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -19,6 +19,10 @@
      - id: ClothingOuterHardsuitWarden
      - id: OxygenTankFilled
      - id: LightModule
+      - id: WeaponLauncherShinano
+      - id: BoxShinanoGrenadeFlash
+      - id: BoxShinanoGrenadeSmoke
+      - id: BoxShinanoGrenadeBeanbag

 - type: entity
  id: LockerWardenFilled
@@ -39,6 +43,10 @@
      - id: MagazinePistol
      - id: BoxMindshield
      - id: LightModule
+      - id: WeaponLauncherShinano
+      - id: BoxShinanoGrenadeFlash
+      - id: BoxShinanoGrenadeSmoke
+      - id: BoxShinanoGrenadeBeanbag

 - type: entity
  id: LockerSecurityFilled
--- a/Resources/Prototypes/Entities/Effects/chemistry_effects.yml
+++ b/Resources/Prototypes/Entities/Effects/chemistry_effects.yml
@@ -48,6 +48,23 @@
    tags:
    - HideContextMenu

+#WD EDIT
+- type: entity
+  parent: BaseFoam
+  id: SmokeTear
+  name: smoketear
+  noSpawn: true
+  components:
+  - type: Sprite
+    color: "#B54B3BBA"
+    sprite: Effects/chemsmoke.rsi
+    state: chemsmoke
+  - type: TimedDespawn
+    lifetime: 10
+  - type: Tag
+    tags:
+    - HideContextMenu
+
 - type: entity
  parent: BaseFoam
  id: Foam
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
@@ -393,6 +393,7 @@
  - type: SmokeOnTrigger
    duration: 10
    spreadAmount: 30
+    smokePrototype: SmokeTear # WD EDIT
    solution:
      reagents:
      - ReagentId: TearGas
--- a/Resources/Prototypes/Reagents/narcotics.yml
+++ b/Resources/Prototypes/Reagents/narcotics.yml
@@ -522,7 +522,7 @@
  desc: reagent-desc-tear-gas
  physicalDesc: reagent-physical-desc-milky
  flavor: salty
-  color: "#96a8b5"
+  color: "#B54B3BBA"
  boilingPoint: 255.0
  meltingPoint: 36.0
  metabolisms:
--- a/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shinanobox.yml
+++ b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shinanobox.yml
@@ -0,0 +1,50 @@
+- type: entity
+  parent: BaseAmmoProvider
+  id: BaseShinanoGrenadeAmmoProvider
+  abstract: true
+  components:
+    - type: BallisticAmmoProvider
+      mayTransfer: true
+      whitelist:
+        tags:
+        - ShinanoGrenade
+      capacity: 4
+
+- type: entity
+  name: shinano grenade flash dispenser
+  parent: BaseShinanoGrenadeAmmoProvider
+  id: BoxShinanoGrenadeFlash
+  description: A dispenser box full of flash grenade, designed for Shinano.
+  components:
+    - type: BallisticAmmoProvider
+      proto: ShinanoGrenadeFlash
+    - type: Sprite
+      layers:
+        - state: boxwide
+        - state: shellflash
+
+- type: entity
+  name: shinano grenade smoke dispenser
+  parent: BaseShinanoGrenadeAmmoProvider
+  id: BoxShinanoGrenadeSmoke
+  description: A dispenser box full of smoke grenade, designed for Shinano.
+  components:
+    - type: BallisticAmmoProvider
+      proto: ShinanoGrenadeSmoke
+    - type: Sprite
+      layers:
+        - state: boxwide
+        - state: shellflare
+
+- type: entity
+  name: shinano grenade beanbag dispenser
+  parent: BaseShinanoGrenadeAmmoProvider
+  id: BoxShinanoGrenadeBeanbag
+  description: A dispenser box full of beanbag grenade, designed for Shinano.
+  components:
+    - type: BallisticAmmoProvider
+      proto: ShinanoGrenadeBeanbag
+    - type: Sprite
+      layers:
+        - state: boxwide
+        - state: shellbeanbag
--- a/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Ammunition/shinanogrenades.yml
+++ b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Ammunition/shinanogrenades.yml
@@ -0,0 +1,63 @@
+- type: entity
+  id: BaseShinanoGrenade
+  name: base shinano grenade
+  parent: BaseItem
+  abstract: true
+  components:
+  - type: Tag
+    tags:
+    - ShinanoGrenade
+  - type: Item
+    size: Small
+  - type: Sprite
+
+- type: entity
+  id: ShinanoGrenadeFlash
+  name: shinano flash grenade
+  parent: BaseShinanoGrenade
+  components:
+  - type: CartridgeAmmo
+    proto: ShinanoBulletGrenadeFlash
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi
+    layers:
+    - state: blast
+      map: ["enum.AmmoVisualLayers.Base"]
+  - type: Appearance
+  - type: SpentAmmoVisuals
+    state: flash
+    suffix: false
+
+- type: entity
+  id: ShinanoGrenadeSmoke
+  name: shinano smoke grenade
+  parent: BaseShinanoGrenade
+  components:
+  - type: CartridgeAmmo
+    proto: ShinanoBulletGrenadeSmoke
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi
+    layers:
+    - state: blast
+      map: ["enum.AmmoVisualLayers.Base"]
+  - type: Appearance
+  - type: SpentAmmoVisuals
+    state: smoke
+    suffix: false
+
+- type: entity
+  id: ShinanoGrenadeBeanbag
+  name: beanbag shinano grenade
+  parent: BaseShinanoGrenade
+  components:
+  - type: CartridgeAmmo
+    proto: ShinanoBulletGrenadeBeanbag
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi
+    layers:
+    - state: blast
+      map: ["enum.AmmoVisualLayers.Base"]
+  - type: Appearance
+  - type: SpentAmmoVisuals
+    state: beanbag
+    suffix: false
--- a/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Projectiles/shinanogrenades.yml
+++ b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Projectiles/shinanogrenades.yml
@@ -0,0 +1,84 @@
+- type: entity
+  id: BaseBulletShinanoGranade
+  name: base shinano granade
+  abstract: true
+  components:
+  - type: MovedByPressure
+  - type: FlyBySound
+  - type: Clickable
+  - type: Sprite
+    noRot: false
+    sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
+    layers:
+      - state: grenade
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.25,-0.25,0.25,0.25"
+        density: 20
+        mask:
+        - ItemMask
+        restitution: 0.3  # fite me
+        friction: 0.2
+  - type: DeleteOnTrigger
+  - type: Physics
+    bodyType: Dynamic
+  - type: TimedDespawn
+    lifetime: 10
+  - type: TriggerOnLand
+
+- type: entity
+  id: ShinanoBulletGrenadeFlash
+  name: flash shinano grenade
+  parent: BaseBulletShinanoGranade
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
+    layers:
+      - state: grenade
+  - type: FlashOnTrigger
+    range: 3
+  - type: SpawnOnTrigger
+    proto: GrenadeFlashEffect
+
+- type: entity
+  id: ShinanoBulletGrenadeSmoke
+  name: smoke shinano grenade
+  parent: BaseBulletShinanoGranade
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
+    layers:
+      - state: grenade
+  - type: SmokeOnTrigger
+    duration: 10
+    spreadAmount: 30
+    smokePrototype: SmokeTear
+    solution:
+      reagents:
+      - ReagentId: TearGas
+        Quantity: 50
+  - type: SoundOnTrigger
+    sound: /Audio/Items/smoke_grenade_smoke.ogg
+
+- type: entity
+  id: ShinanoBulletGrenadeBeanbag
+  name: beanbag shinano grenade
+  noSpawn: true
+  parent: [BaseBullet, BaseBulletTrail]
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
+    layers:
+      - state: grenade
+  - type: Projectile
+    damage:
+      types:
+        Blunt: 15
+  - type: StaminaDamageOnCollide
+    ignoreResistances: true
+    damage: 80
--- a/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/riotgrenadelauncher.txt
+++ b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/riotgrenadelauncher.txt
@@ -1,5 +0,0 @@
- type: entity
-  name: BaseWeaponLauncher
-  parent: BaseItem
-  id: BaseWeaponLauncher
-  description: A rooty tooty point and shooty.
--- a/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/riotgrenadelauncher.yml
+++ b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/riotgrenadelauncher.yml
@@ -1,147 +0,0 @@
- type: entity
-  name: Riot Launcher
-  parent: BaseItem
-  id: RiotWeaponLauncher
-  description: ShitSec Launcher
-  components:
-  - type: Sprite
-    sprite: White/Objects/Weapons/Guns/Launchers/china_lake-icons.rsi
-    layers:
-      - state: icon
-        map: ["enum.GunVisualLayers.Base"]
-  - type: Item
-    sprite: White/Objects/Weapons/Guns/Launchers/china_lake-inhands.rsi
-  - type: Clothing
-    sprite: White/Objects/Weapons/Guns/Launchers/china_lake-inhands.rsi
-    slots:
-    - Back
-    - suitStorage
-  - type: AmmoCounter
-  - type: Gun
-    fireRate: 1
-    selectedMode: SemiAuto
-    projectileSpeed: 10
-    projectileSpeedModified: 10
-    availableModes:
-      - SemiAuto
-    soundGunshot:
-      path: /Audio/Weapons/Guns/Gunshots/grenade_launcher.ogg
-  - type: BallisticAmmoProvider
-    whitelist:
-      tags:
-        - RiotGrenade
-    capacity: 1
-    proto: RiotGrenadeFlash
-    soundInsert:
-      path: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg
-    autoCycle: false
-
- type: entity
-  id: BaseRiotGrenade
-  name: base riot grenade
-  parent: BaseItem
-  abstract: true
-  components:
-  - type: Tag
-    tags:
-    - RiotGrenade
-  - type: Item
-    size: Small
-  - type: Sprite
-
- type: entity
-  id: RiotGrenadeFlash
-  name: riot flash grenade
-  parent: BaseRiotGrenade
-  components:
-  - type: CartridgeAmmo
-    proto: RiotBulletGrenadeFlash
-  - type: Sprite
-    sprite: Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi
-    layers:
-    - state: blast
-      map: ["enum.AmmoVisualLayers.Base"]
-  - type: Appearance
-  - type: SpentAmmoVisuals
-    state: flash
-    suffix: false
-
- type: entity
-  id: RiotGrenadeSmoke
-  name: riot smoke grenade
-  parent: BaseRiotGrenade
-  components:
-  - type: CartridgeAmmo
-    proto: RiotBulletGrenadeSmoke
-  - type: Sprite
-    sprite: Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi
-    layers:
-    - state: blast
-      map: ["enum.AmmoVisualLayers.Base"]
-  - type: Appearance
-  - type: SpentAmmoVisuals
-    state: smoke
-    suffix: false
-
- type: entity
-  id: BaseBulletRiotGranade
-  name: base roit granade
-  abstract: true
-  components:
-  - type: MovedByPressure
-  - type: FlyBySound
-  - type: Clickable
-  - type: Sprite
-    noRot: false
-    sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
-    layers:
-      - state: grenade
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape:
-          !type:PhysShapeAabb
-          bounds: "-0.25,-0.25,0.25,0.25"
-        density: 20
-        mask:
-        - ItemMask
-        restitution: 0.3  # fite me
-        friction: 0.2
-  - type: DeleteOnTrigger
-  - type: Physics
-    bodyType: Dynamic
-  - type: TimedDespawn
-    lifetime: 10
-  - type: TriggerOnLand
-
- type: entity
-  id: RiotBulletGrenadeFlash
-  name: flash riot grenade
-  parent: BaseBulletRiotGranade
-  noSpawn: true
-  components:
-  - type: Sprite
-    sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
-    layers:
-      - state: grenade
-  - type: FlashOnTrigger
-    range: 7
-    forceStun: true
-  - type: SpawnOnTrigger
-    proto: GrenadeFlashEffect
-
- type: entity
-  id: RiotBulletGrenadeSmoke
-  name: smoke riot grenade
-  parent: BaseBulletRiotGranade
-  noSpawn: true
-  components:
-  - type: Sprite
-    sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
-    layers:
-      - state: grenade
-  - type: SmokeOnTrigger
-    duration: 30
-    spreadAmount: 50
-  - type: SoundOnTrigger
-    sound: /Audio/Items/smoke_grenade_smoke.ogg
--- a/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/shinano.yml
+++ b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/shinano.yml
@@ -0,0 +1,37 @@
+- type: entity
+  name: Shinano
+  parent: BaseItem
+  id: WeaponLauncherShinano
+  description: A single-shot grenade launcher, which is equipped with colonial police, security units and mercenaries wherever there is a Nanotrain influence. He is notorious among picketers and revolutionaries, as BLUP is the first thing they hear before violence begins.
+  components:
+  - type: Sprite
+    sprite: White/Objects/Weapons/Guns/Launchers/shinano-icons.rsi
+    layers:
+      - state: icon
+        map: ["enum.GunVisualLayers.Base"]
+  - type: Item
+    sprite: White/Objects/Weapons/Guns/Launchers/shinano-inhands.rsi
+  - type: Clothing
+    sprite: White/Objects/Weapons/Guns/Launchers/shinano-inhands.rsi
+    slots:
+    - Back
+    - suitStorage
+  - type: AmmoCounter
+  - type: Gun
+    fireRate: 1
+    selectedMode: SemiAuto
+    projectileSpeed: 15
+    projectileSpeedModified: 15
+    availableModes:
+      - SemiAuto
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/grenade_launcher.ogg
+  - type: BallisticAmmoProvider
+    whitelist:
+      tags:
+        - ShinanoGrenade
+    capacity: 1
+    proto: ShinanoGrenadeFlash
+    soundInsert:
+      path: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg
+    autoCycle: false
--- a/Resources/Textures/White/Objects/Weapons/Guns/Launchers/shinano-icons.rsi/bolt-open.png
+++ b/Resources/Textures/White/Objects/Weapons/Guns/Launchers/shinano-icons.rsi/bolt-open.png
--- a/Resources/Textures/White/Objects/Weapons/Guns/Launchers/shinano-icons.rsi/icon.png
+++ b/Resources/Textures/White/Objects/Weapons/Guns/Launchers/shinano-icons.rsi/icon.png
--- a/Resources/Textures/White/Objects/Weapons/Guns/Launchers/shinano-icons.rsi/meta.json
+++ b/Resources/Textures/White/Objects/Weapons/Guns/Launchers/shinano-icons.rsi/meta.json
@@ -0,0 +1,17 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-4.0",
+    "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/pull/6042/commits/64916c98f4847acc4adf3a2416bf78c005fd7dd7, https://github.com/discordia-space/CEV-Eris/blob/master/icons/obj/guns/launcher/grenadelauncher.dmi, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111",
+    "size": {
+        "x": 48,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "bolt-open"
+        }
+    ]
+}
--- a/Resources/Textures/White/Objects/Weapons/Guns/Launchers/shinano-inhands.rsi/equipped-BACKPACK.png
+++ b/Resources/Textures/White/Objects/Weapons/Guns/Launchers/shinano-inhands.rsi/equipped-BACKPACK.png
--- a/Resources/Textures/White/Objects/Weapons/Guns/Launchers/shinano-inhands.rsi/equipped-SUITSTORAGE.png
+++ b/Resources/Textures/White/Objects/Weapons/Guns/Launchers/shinano-inhands.rsi/equipped-SUITSTORAGE.png
--- a/Resources/Textures/White/Objects/Weapons/Guns/Launchers/shinano-inhands.rsi/inhand-left.png
+++ b/Resources/Textures/White/Objects/Weapons/Guns/Launchers/shinano-inhands.rsi/inhand-left.png
--- a/Resources/Textures/White/Objects/Weapons/Guns/Launchers/shinano-inhands.rsi/inhand-right.png
+++ b/Resources/Textures/White/Objects/Weapons/Guns/Launchers/shinano-inhands.rsi/inhand-right.png
--- a/Resources/Textures/White/Objects/Weapons/Guns/Launchers/shinano-inhands.rsi/meta.json
+++ b/Resources/Textures/White/Objects/Weapons/Guns/Launchers/shinano-inhands.rsi/meta.json
@@ -0,0 +1,27 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-4.0",
+    "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/pull/6042/commits/64916c98f4847acc4adf3a2416bf78c005fd7dd7, https://github.com/discordia-space/CEV-Eris/blob/master/icons/obj/guns/launcher/grenadelauncher.dmi, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+		{
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        }
+    ]
+}