Slight trigger refactor (#4320)

* Trigger tweaks

* Finish trigger refactor

* Clusterflash too

Resources/Prototypes/Entities/Objects/Weapons/Guns/Explosives/grenades.yml

@@ -22,6 +22,7 @@
     heavyImpactRange: 2
     lightImpactRange: 4
     flashRange: 7
+  - type: ExplodeOnTrigger
   - type: Damageable
   - type: Destructible
     thresholds:
@@ -55,7 +56,12 @@
     - Belt
   - type: OnUseTimerTrigger
     delay: 3.5
-  - type: FlashExplosive
+  - type: FlashOnTrigger
+    range: 7
+  - type: SoundOnTrigger
+    sound:
+      path: "/Audio/Effects/flash_bang.ogg"
+  - type: DeleteOnTrigger
   - type: Damageable
   - type: Destructible
     thresholds:
@@ -90,6 +96,7 @@
     heavyImpactRange: 3
     lightImpactRange: 5
     flashRange: 10
+  - type: ExplodeOnTrigger
   - type: Damageable
   - type: Destructible
     thresholds:
@@ -123,6 +130,7 @@
     devastationRange: 25
     heavyImpactRange: 25
     flashRange: 50
+  - type: ExplodeOnTrigger
   - type: Damageable
   - type: Destructible
     thresholds:

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

@@ -39,8 +39,13 @@
     soundHit: /Audio/Weapons/Guns/Hits/snap.ogg
     damages:
       Piercing: 10
-  - type: FlashAreaOnCollide
+  - type: FlashOnTrigger
     range: 1
+  - type: SoundOnTrigger
+    sound:
+      path: "/Audio/Effects/flash_bang.ogg"
+  - type: TriggerOnCollide
+  - type: DeleteOnTrigger
 
 - type: entity
   id: BulletBaseHV
@@ -151,7 +156,9 @@
     netsync: false
     sprite: Objects/Weapons/Guns/Projectiles/rocket.rsi
     state: frag
-  - type: ExplosiveProjectile
+  - type: ExplodeOnTrigger
+  - type: DeleteOnTrigger
+  - type: TriggerOnCollide
   - type: Projectile
     deleteOnCollide: false
   - type: Explosive
@@ -191,7 +198,9 @@
     netsync: false
     sprite: Objects/Weapons/Guns/Projectiles/grenade.rsi
     state: grenade
-  - type: ExplosiveProjectile
+  - type: ExplodeOnTrigger
+  - type: DeleteOnTrigger
+  - type: TriggerOnCollide
   - type: Projectile
     deleteOnCollide: false
   - type: Explosive
@@ -213,8 +222,13 @@
   - type: Projectile
     deleteOnCollide: false
     soundHit: /Audio/Effects/flash_bang.ogg
-  - type: FlashAreaOnCollide
+  - type: FlashOnTrigger
     range: 7
+  - type: SoundOnTrigger
+    sound:
+      path: "/Audio/Effects/flash_bang.ogg"
+  - type: TriggerOnCollide
+  - type: DeleteOnTrigger
 
 # This is supposed to spawn shrapnel and stuff so uhh... TODO?
 - type: entity
@@ -227,7 +241,9 @@
     netsync: false
     sprite: Objects/Weapons/Guns/Projectiles/grenade.rsi
     state: grenade
-  - type: ExplosiveProjectile
+  - type: ExplodeOnTrigger
+  - type: DeleteOnTrigger
+  - type: TriggerOnCollide
   - type: Projectile
     deleteOnCollide: false
   - type: Explosive