From 748292324a0f2f24f7f66238b4a8e596036650d5 Mon Sep 17 00:00:00 2001
From: reaperrr <thereaperrr@aol.com>
Date: Sun, 11 Oct 2020 15:06:53 +0200
Subject: [PATCH] Update RA/TD light guns cosmetic effects

Use single piff instead of piffs per impact on
M60s and M1, but in return add visual inaccuracy.

Gave minigunner MG two additional delayed effect warheads
to match sound and fire animation.
---
 mods/cnc/weapons/smallcaliber.yaml | 13 +++++++++++-
 mods/ra/weapons/smallcaliber.yaml  | 34 ++++++++++++++++++++++++++++--
 2 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/mods/cnc/weapons/smallcaliber.yaml b/mods/cnc/weapons/smallcaliber.yaml
index 876a0be800..299f5d7041 100644
--- a/mods/cnc/weapons/smallcaliber.yaml
+++ b/mods/cnc/weapons/smallcaliber.yaml
@@ -99,6 +99,7 @@ HeliAAGun:
 		DamageTypes: Prone50Percent, TriggerProne, BulletDeath
 	Warhead@2Eff: CreateEffect
 		Explosions: piff
+		Inaccuracy: 171
 
 Pistol:
 	Inherits: ^LightMG
@@ -109,9 +110,19 @@ Pistol:
 		Damage: 100
 		Versus:
 			None: 100
+	Warhead@2Eff: CreateEffect
+		Inaccuracy: 128
 
 M16:
 	Inherits: ^LightMG
+	Warhead@2Eff2: CreateEffect
+		Delay: 2
+		Explosions: piff
+		Inaccuracy: 171
+	Warhead@2Eff3: CreateEffect
+		Delay: 4
+		Explosions: piff
+		Inaccuracy: 171
 
 MachineGun:
 	Inherits: ^LightMG
@@ -122,7 +133,7 @@ MachineGun:
 			Wood: 10
 			Light: 70
 	Warhead@2Eff: CreateEffect
-		Explosions: piffs
+		Inaccuracy: 213
 
 MachineGunH:
 	Inherits: MachineGun
diff --git a/mods/ra/weapons/smallcaliber.yaml b/mods/ra/weapons/smallcaliber.yaml
index 3e2de0598a..3104cf3418 100644
--- a/mods/ra/weapons/smallcaliber.yaml
+++ b/mods/ra/weapons/smallcaliber.yaml
@@ -93,6 +93,12 @@ FLAK-23-AG:
 			Heavy: 10
 			Concrete: 10
 		DamageTypes: Prone50Percent, TriggerProne, DefaultDeath
+	Warhead@2Eff: CreateEffect
+		Explosions: piff
+		Inaccuracy: 171
+	Warhead@3EffWater: CreateEffect
+		Explosions: water_piff
+		Inaccuracy: 171
 
 Vulcan:
 	Inherits: ^HeavyMG
@@ -252,9 +258,9 @@ Pistol:
 		Versus:
 			None: 100
 	Warhead@2Eff: CreateEffect
-		Explosions: piff
+		Inaccuracy: 128
 	Warhead@3EffWater: CreateEffect
-		Explosions: water_piff
+		Inaccuracy: 128
 
 M1Carbine:
 	Inherits: ^LightMG
@@ -264,6 +270,26 @@ M1Carbine:
 	Warhead@1Dam: SpreadDamage
 		Versus:
 			Wood: 30
+	Warhead@2Eff2: CreateEffect
+		Delay: 2
+		Explosions: piff
+		Inaccuracy: 171
+	Warhead@3EffWater2: CreateEffect
+		Delay: 2
+		ValidTargets: Water, Underwater
+		InvalidTargets: Bridge
+		Explosions: water_piff
+		Inaccuracy: 171
+	Warhead@2Eff3: CreateEffect
+		Delay: 4
+		Explosions: piff
+		Inaccuracy: 171
+	Warhead@3EffWater3: CreateEffect
+		Delay: 4
+		ValidTargets: Water, Underwater
+		InvalidTargets: Bridge
+		Explosions: water_piff
+		Inaccuracy: 171
 
 M60mg:
 	Inherits: ^LightMG
@@ -274,6 +300,10 @@ M60mg:
 	Warhead@1Dam: SpreadDamage
 		Versus:
 			Light: 30
+	Warhead@2Eff: CreateEffect
+		Inaccuracy: 213
+	Warhead@3EffWater: CreateEffect
+		Inaccuracy: 213
 
 ^SnipeWeapon:
 	ReloadDelay: 80