Merge branch 'master' of github.com:patrickwieth/YMCA

patrickwieth · Sep 1, 2024 · 91787f7 · 91787f7
2 parents 4f1121c + f789ff5
commit 91787f7
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 19 deletions.
diff --git a/mods/ca/rules/defaults.yaml b/mods/ca/rules/defaults.yaml
@@ -2062,7 +2062,6 @@ PROC.Dummy:
 		PlayerPalette: playerra2
 	WithDeathAnimation:
 		DeathSequencePalette: playerra2
-		CrushedSequencePalette: overlayplayertd
 
 ^InfantryRASprite:
 	RenderSprites:

diff --git a/mods/ca/rules/soviet/vehicles.yaml b/mods/ca/rules/soviet/vehicles.yaml
@@ -142,13 +142,13 @@ Chem_Sprayer:
 		Weaknesses: • Weak vs Heavy Armor, Aircraft
 		Attributes: • Light Vehicles spraying chemicals
 	Valued:
-		Cost: 700
+		Cost: 600
 	Tooltip:
 		Name: Chemical Sprayer
 	Health:
 		HP: 25000
 	Mobile:
-		Speed: 80
+		Speed: 95
 	Armament:
 		Weapon: Chem_Spray
 		Recoil: 85
@@ -170,7 +170,7 @@ Chem_Sprayer.Range:
 	WithProductionIconOverlay@Crosshair:
 		Types: Crosshair
 	Valued:
-		Cost: 1100
+		Cost: 1000
 	Tooltip:
 		Name: Chemical Sprayer (Range)
 	Armament:
@@ -191,7 +191,7 @@ Chem_Sprayer.Range.Metal_Acid:
 	WithProductionIconOverlay@Metal_Acid_right:
 		Types: Metal_Acid_right
 	Valued:
-		Cost: 1500
+		Cost: 1200
 	Tooltip:
 		Name: Chemical Sprayer (Range, Metal Acid)
 	Armament:
@@ -209,7 +209,7 @@ Chem_Sprayer.Range.Spread:
 	WithProductionIconOverlay@Spread_right:
 		Types: Spread_right
 	Valued:
-		Cost: 1400
+		Cost: 1100
 	Tooltip:
 		Name: Chemical Sprayer (Range, Spread)
 	Armament:
@@ -227,7 +227,7 @@ Chem_Sprayer.Splash:
 	WithProductionIconOverlay@splash:
 		Types: Splash
 	Valued:
-		Cost: 1000
+		Cost: 900
 	Tooltip:
 		Name: Chemical Sprayer (Splash)
 	Armament:
@@ -248,7 +248,7 @@ Chem_Sprayer.Splash.Metal_Acid:
 	WithProductionIconOverlay@Metal_Acid_right:
 		Types: Metal_Acid_right
 	Valued:
-		Cost: 1400
+		Cost: 1200
 	Tooltip:
 		Name: Chemical Sprayer (Splash, Metal Acid)
 	Armament:
@@ -266,7 +266,7 @@ Chem_Sprayer.Splash.Spread:
 	WithProductionIconOverlay@Spread_right:
 		Types: Spread_right
 	Valued:
-		Cost: 1300
+		Cost: 1100
 	Tooltip:
 		Name: Chemical Sprayer (Splash, Spread)
 	Armament:
@@ -305,7 +305,7 @@ Chem_Sprayer.Cloud.Metal_Acid:
 	WithProductionIconOverlay@Metal_Acid_right:
 		Types: Metal_Acid_right
 	Valued:
-		Cost: 1400
+		Cost: 1200
 	Tooltip:
 		Name: Chemical Sprayer (Cloud, Metal Acid)
 	Armament:
@@ -323,7 +323,7 @@ Chem_Sprayer.Cloud.Spread:
 	WithProductionIconOverlay@Spread_right:
 		Types: Spread_right
 	Valued:
-		Cost: 1300
+		Cost: 1100
 	Tooltip:
 		Name: Chemical Sprayer (Cloud, Spread)
 	Armament:
@@ -558,6 +558,8 @@ Heavy_Tank.Tesla:
 		Types: Tesla
 	Valued:
 		Cost: 1300
+	Armament:
+		Weapon: 125mm.short
 	Tooltip:
 		Name: Heavy Tank (Tesla Defense)
 

diff --git a/mods/ca/rules/soviet/weapons.yaml b/mods/ca/rules/soviet/weapons.yaml
@@ -1,9 +1,9 @@
 Chem_Shell:
 	Inherits: ^Cannon
 	Inherits: ^Chemical
-	ReloadDelay: 90
+	ReloadDelay: 60
 	Burst: 2
-	Range: 4c0
+	Range: 4c512
 	InvalidTargets: Air
 	Projectile: BulletCA
 		Speed: 200
@@ -12,7 +12,7 @@ Chem_Shell:
 		LaunchAngle: 90
 	Warhead@1Dam: SpreadDamage
 		Spread: 0c512
-		Damage: 3400
+		Damage: 4500
 		Falloff: 100, 24, 12
 		InvalidTargets: Air
 		DamageTypes: Prone50Percent, TriggerProne, PoisonDeath
@@ -52,15 +52,15 @@ Acid_Shell:
 		Image: acidshell
 	Warhead@1Dam: SpreadDamage
 		Spread: 0c256
-		Damage: 5000
+		Damage: 6000
 		Falloff: 100, 24, 12
 	Warhead@3Eff: CreateEffect
 		Explosions: acid_flame
 
 Chem_Spray_Big:
 	Inherits: ^Chemical
 	ValidTargets: Ground, Water
-	Range: 4c512
+	Range: 5c512
 	ReloadDelay: 60
 	Projectile: Bullet
 		Speed: 204
@@ -86,8 +86,8 @@ Chem_Spray_Big:
 Chem_Spray:
 	Inherits: ^Chemical
 	ValidTargets: Ground, Water
-	Range: 4c0
-	ReloadDelay: 60
+	Range: 6c0
+	ReloadDelay: 50
 	Projectile: Bullet
 		Speed: 150
 		Blockable: True
@@ -110,7 +110,7 @@ Chem_Spray:
 
 Chem_Spray.Range:
 	Inherits: Chem_Spray
-	Range: 7c0
+	Range: 9c0
 	Burst: 2
 
 Chem_Spray.Range.Spread:

diff --git a/mods/ca/weapons/ballistics.yaml b/mods/ca/weapons/ballistics.yaml
@@ -71,6 +71,13 @@
 	ReloadDelay: 70
 	Burst: 2
 
+125mm.short:
+	Inherits: ^Cannon
+	Inherits: ^ShellHeavy
+	ReloadDelay: 60
+	Range: 4c0
+	Burst: 2
+
 125mmLasher:
 	Inherits: 125mm
 	ReloadDelay: 40