Merge pull request #9992 from obrakmann/pr9959-new

RA balance fixed up

mods/ra/maps/desert-shellmap/map.yaml

@@ -1356,7 +1356,7 @@ Weapons:
 		Range: 10c0
 	TTankZap:
 		Range: 4c768
-	FLAK-23:
+	FLAK-23-AG:
 		Range: 4c0
 
 Voices:

mods/ra/maps/fort-lonestar/map.yaml

@@ -672,6 +672,14 @@ Rules:
 			Prerequisites: barracks
 		Valued:
 			Cost: 300
+	FTRK:
+		-Armament@AA:
+		-Armament@AG:
+		Armament:
+			Weapon: FLAK-23
+			Recoil: 85
+			LocalOffset: 512,0,192
+			MuzzleSequence: muzzle
 	ARTY:
 		Inherits: ^Tank
 		Valued:

mods/ra/rules/vehicles.yaml

@@ -563,7 +563,8 @@ TTNK:
 	Armament:
 		Weapon: TTankZap
 		LocalOffset: 0,0,213
-	AttackFrontal:
+	AttackTurreted:
+	Turreted:
 	WithIdleOverlay@SPINNER:
 		Sequence: spinner
 	SelectionDecorations:
@@ -595,8 +596,13 @@ FTRK:
 	Turreted:
 		ROT: 10
 		Offset: -298,0,298
-	Armament:
+	Armament@AA:
-		Weapon: FLAK-23
+		Weapon: FLAK-23-AA
+		Recoil: 85
+		LocalOffset: 512,0,192
+		MuzzleSequence: muzzle
+	Armament@AG:
+		Weapon: FLAK-23-AG
 		Recoil: 85
 		LocalOffset: 512,0,192
 		MuzzleSequence: muzzle
@@ -672,6 +678,7 @@ CTNK:
 		LocalYaw: -100
 	AttackFrontal:
 	PortableChrono:
+		ChargeDelay: 300
 	ProducibleWithLevel:
 		Prerequisites: vehicles.upgraded
 
@@ -718,10 +725,10 @@ STNK:
 	Armor:
 		Type: Light
 	Mobile:
-		Speed: 113
+		Speed: 142
 		Crushes: wall, mine, crate, infantry
 	RevealsShroud:
-		Range: 6c0
+		Range: 7c0
 	AutoTarget:
 		InitialStance: HoldFire
 		InitialStanceAI: ReturnFire
@@ -734,8 +741,8 @@ STNK:
 	WithTurret:
 	Cargo:
 		Types: Infantry
-		MaxWeight: 3
+		MaxWeight: 4
-		PipCount: 3
+		PipCount: 4
 	Cloak:
 		InitialDelay: 125
 		CloakDelay: 250
@@ -743,7 +750,7 @@ STNK:
 		UncloakSound: appear1.aud
 		IsPlayerPalette: true
 	DetectCloaked:
-		Range: 6c0
+		Range: 7c0
 	-MustBeDestroyed:
 	ProducibleWithLevel:
 		Prerequisites: vehicles.upgraded

mods/ra/weapons/smallcaliber.yaml

@@ -295,11 +295,34 @@ SilencedPPK:
 		Explosion: water_piffs
 		ValidImpactTypes: Water
 
-FLAK-23:
+FLAK-23-AA:
+	ReloadDelay: 10
+	Range: 8c0
+	Report: AACANON3.AUD
+	ValidTargets: Air
+	Projectile: Bullet
+		Speed: 1c682
+		Blockable: false
+	Warhead@1Dam: SpreadDamage
+		Spread: 213
+		Damage: 20
+		ValidTargets: Air, Ground, Water
+		Versus:
+			None: 40
+			Wood: 10
+			Light: 60
+			Heavy: 10
+			Concrete: 20
+		DamageTypes: Prone50Percent, TriggerProne, DefaultDeath
+	Warhead@2EffAir: CreateEffect
+		Explosion: small_explosion_air
+		ValidImpactTypes: Air, AirHit
+
+FLAK-23-AG:
 	ReloadDelay: 10
 	Range: 6c0
 	Report: AACANON3.AUD
-	ValidTargets: Air, Ground, Water
+	ValidTargets: Ground, Water
 	Projectile: Bullet
 		Speed: 1c682
 		Blockable: false
@@ -316,11 +339,8 @@ FLAK-23:
 		DamageTypes: Prone50Percent, TriggerProne, DefaultDeath
 	Warhead@2Eff: CreateEffect
 		Explosion: small_explosion
-		InvalidImpactTypes: Air, AirHit, Water
+		InvalidImpactTypes: Air, AirHit
-	Warhead@3EffAir: CreateEffect
+	Warhead@3EffWater: CreateEffect
-		Explosion: small_explosion_air
-		ValidImpactTypes: Air, AirHit
-	Warhead@4EffWater: CreateEffect
 		Explosion: small_splash
 		ValidImpactTypes: Water