[Fix] Shinamo grenades aren't trash (#794)

Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml

@@ -33,7 +33,7 @@
 
 - type: entity
   name: china lake
-  parent: [BaseWeaponLauncher, BaseGunWieldable]
+  parent: BaseWeaponLauncher # WD removed BaseGunWieldable
   id: WeaponLauncherChinaLake
   description: PLOOP
   components:
@@ -57,6 +57,8 @@
       - SemiAuto
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/grenade_launcher.ogg
+    minAngle: 10 # WD
+    maxAngle: 10 # WD
   - type: BallisticAmmoProvider
     whitelist:
       tags:

Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml

@@ -764,6 +764,9 @@
   - type: ActiveTimerTrigger
     timeRemaining: 0.3
   - type: DeleteOnTrigger
+  - type: SoundOnTrigger # WD
+    sound:
+      path: "/Audio/Effects/flash_bang.ogg"
 
 # This is supposed to spawn shrapnel and stuff so uhh... TODO?
 - type: entity

Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Launcher/shinano.yml

@@ -9,6 +9,9 @@
     layers:
       - state: icon
         map: ["enum.GunVisualLayers.Base"]
+      - state: shinano
+        visible: false
+        map: [ "enum.ModuleVisualState.ShutterModule" ]
   - type: Item
     sprite: White/Objects/Weapons/Guns/Launchers/shinano-inhands.rsi
     size: Large
@@ -16,6 +19,7 @@
     - 0,0,2,1
   - type: Clothing
     sprite: White/Objects/Weapons/Guns/Launchers/shinano-inhands.rsi
+    quickEquip: false
     slots:
     - Back
     - suitStorage
@@ -44,11 +48,22 @@
         name: Shutter Module
         insertSound: /Audio/White/Gun/Modules/insertmodule.ogg
         ejectSound: /Audio/White/Gun/Modules/ejectmodule.ogg
-        priority: 1
+        priority: 4
         whitelist:
           tags:
           - BaseShutterModule
   - type: ContainerContainer
     containers:
       shutter_module: !type:ContainerSlot
+      ballistic-ammo: !type:Container
+        ents: []
   - type: Appearance
+  - type: EmitSoundOnPickup
+    sound:
+      collection: RiflesPickUp
+  - type: EmitSoundOnDrop
+    sound:
+      collection: RiflesDrop
+  - type: EmitSoundOnLand
+    sound:
+      collection: RiflesDrop

Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Modules/modules.yml

@@ -142,3 +142,6 @@
     value: "shinano"
     module_type: "shutter_module"
     tag: Grenade
+  - type: Sprite
+    sprite: White\Objects\Weapons\modulesOnWeapon.rsi
+    state: telescopic

Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Projectiles/shinanogrenades.yml

@@ -1,5 +1,6 @@
 - type: entity
   id: BaseBulletShinanoGranade
+  parent: BaseBullet
   abstract: true
   name: base shinano granade
   components:
@@ -39,12 +40,17 @@
     layers:
       - state: grenade
   - type: FlashOnTrigger
-    range: 5
+    range: 6
-    stunTime: 2 # WD
+    stunTime: 3
-    knockdownTime: 10 # WD
+    knockdownTime: 10
   - type: SpawnOnTrigger
     proto: GrenadeFlashEffect
+  - type: ActiveTimerTrigger
+    timeRemaining: 0.6
   - type: DeleteOnTrigger
+  - type: SoundOnTrigger
+    sound:
+      path: "/Audio/Effects/flash_bang.ogg"
 
 - type: entity
   parent: BaseBulletShinanoGranade
@@ -66,6 +72,8 @@
         Quantity: 50
   - type: SoundOnTrigger
     sound: /Audio/Items/smoke_grenade_smoke.ogg
+  - type: ActiveTimerTrigger
+    timeRemaining: 0.6
   - type: DeleteOnTrigger
 
 - type: entity
@@ -85,6 +93,8 @@
   - type: ContainerContainer
     containers:
       cluster-payload: !type:Container
+  - type: ActiveTimerTrigger
+    timeRemaining: 0.5
 
 - type: entity
   parent: [BaseBullet, BaseBulletTrail]
@@ -99,7 +109,7 @@
   - type: Projectile
     damage:
       types:
-        Blunt: 15
+        Blunt: 20
   - type: StaminaDamageOnCollide
     ignoreResistances: true
-    damage: 80
+    damage: 100

Resources/Textures/White/Objects/Weapons/Guns/Launchers/shinano-icons.rsi/meta.json

@@ -12,6 +12,9 @@
         },
         {
             "name": "bolt-open"
+        },
+        {
+            "name": "shinano"
         }
     ]
 }