Merge pull request #12614 from reaperrr/prep-slim-ra-weapons4-other

Prepare RA weapons for inheritance part 4 - other weapons
2017-01-24 16:45:13 +01:00
parent 83d6100c18 58a79162f5
commit f3e58056fa
2 changed files with 60 additions and 65 deletions
--- a/mods/ra/weapons/largecaliber.yaml
+++ b/mods/ra/weapons/largecaliber.yaml
@@ -233,3 +233,63 @@ TurretGun:
 		Explosions: small_splash
 		ImpactSounds: splash9.aud
 		ValidImpactTypes: Water
+
+Grenade:
+	ReloadDelay: 60
+	Range: 4c0
+	Report: grenade1.aud
+	Projectile: Bullet
+		Speed: 136
+		Blockable: false
+		LaunchAngle: 62
+		Inaccuracy: 554
+		Image: BOMB
+	Warhead@1Dam: SpreadDamage
+		Spread: 256
+		Damage: 60
+		Versus:
+			None: 50
+			Wood: 100
+			Light: 25
+			Heavy: 25
+			Concrete: 100
+		DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
+	Warhead@2Smu: LeaveSmudge
+		SmudgeType: Crater
+		InvalidTargets: Vehicle, Tank, Structure, Wall, Husk, Trees
+	Warhead@3Eff: CreateEffect
+		Explosions: med_explosion
+		ImpactSounds: kaboom25.aud
+		InvalidImpactTypes: Water
+	Warhead@4EffWater: CreateEffect
+		Explosions: small_splash
+		ImpactSounds: splash9.aud
+		ValidImpactTypes: Water
+
+DepthCharge:
+	ReloadDelay: 60
+	Range: 5c0
+	ValidTargets: Underwater
+	Projectile: Bullet
+		Speed: 85
+		Image: BOMB
+		LaunchAngle: 62
+		Blockable: false
+		Inaccuracy: 128
+	Warhead@1Dam: SpreadDamage
+		Spread: 128
+		Damage: 80
+		ValidTargets: Underwater
+		Versus:
+			None: 30
+			Wood: 75
+			Light: 75
+			Concrete: 50
+		DamageTypes: ExplosionDeath
+	Warhead@3Eff: CreateEffect
+		Explosions: large_splash
+		ImpactSounds: h2obomb2.aud
+	Warhead@4EffHit: CreateEffect
+		Explosions: small_explosion
+		ImpactSounds: kaboom15.aud
+		ValidImpactTypes: WaterHit
--- a/mods/ra/weapons/other.yaml
+++ b/mods/ra/weapons/other.yaml
@@ -80,71 +80,6 @@ Napalm:
 	Warhead@3Eff: CreateEffect
 		Explosions: napalm
 		ImpactSounds: firebl3.aud
-		InvalidImpactTypes: Water
-	Warhead@4Eff: CreateEffect
-		Explosions: med_splash
-		ImpactSounds: splash9.aud
-		ValidImpactTypes: Water
-
-Grenade:
-	ReloadDelay: 60
-	Range: 4c0
-	Report: grenade1.aud
-	Projectile: Bullet
-		Speed: 136
-		Blockable: false
-		LaunchAngle: 62
-		Inaccuracy: 554
-		Image: BOMB
-	Warhead@1Dam: SpreadDamage
-		Spread: 256
-		Damage: 60
-		Versus:
-			None: 50
-			Wood: 100
-			Light: 25
-			Heavy: 25
-			Concrete: 100
-		DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
-	Warhead@2Smu: LeaveSmudge
-		SmudgeType: Crater
-		InvalidTargets: Vehicle, Tank, Structure, Wall, Husk, Trees
-	Warhead@3Eff: CreateEffect
-		Explosions: med_explosion
-		ImpactSounds: kaboom25.aud
-		InvalidImpactTypes: Water
-	Warhead@4EffWater: CreateEffect
-		Explosions: small_splash
-		ImpactSounds: splash9.aud
-		ValidImpactTypes: Water
-
-DepthCharge:
-	ReloadDelay: 60
-	Range: 5c0
-	ValidTargets: Underwater
-	Projectile: Bullet
-		Speed: 85
-		Image: BOMB
-		LaunchAngle: 62
-		Blockable: false
-		Inaccuracy: 128
-	Warhead@1Dam: SpreadDamage
-		Spread: 128
-		Damage: 80
-		ValidTargets: Underwater
-		Versus:
-			None: 30
-			Wood: 75
-			Light: 75
-			Concrete: 50
-		DamageTypes: ExplosionDeath
-	Warhead@3Eff: CreateEffect
-		Explosions: large_splash
-		ImpactSounds: h2obomb2.aud
-	Warhead@4EffHit: CreateEffect
-		Explosions: small_explosion
-		ImpactSounds: kaboom15.aud
-		ValidImpactTypes: WaterHit

 TeslaZap:
 	ReloadDelay: 3