Merge remote-tracking branch 'darkademic/dev'

mods/ca/mod.yaml

@@ -2,7 +2,7 @@ Metadata:
 	Title: Combined Arms
 	Version: prep-CA
 	Website: https://www.moddb.com/mods/command-conquer-combined-arms
-	WebIcon32: https://www.openra.net/images/icons/ra_32x32.png
+	WebIcon32: http://caladder.darkademic.co.uk/img/icon_32x32.png
 
 PackageFormats: Mix
 

mods/ca/rules/aircraft.yaml

@@ -282,7 +282,7 @@ SUK:
 	Tooltip:
 		Name: Sukhoi Attack Plane
 	Health:
-		HP: 22500
+		HP: 18000
 	RevealsShroud:
 		Range: 12c0
 		MinRange: 10c0
@@ -2174,7 +2174,7 @@ KIRO:
 		Position: BottomLeft
 		Margin: 4, 3
 		RequiresSelection: true
-		PipCount: 4
+		PipCount: 5
 	ReloadAmmoPoolCA:
 		Delay: 125
 		Count: 10

mods/ca/rules/scrin.yaml

@@ -1498,6 +1498,7 @@ TPOD:
 	TooltipExtras:
 		Strengths: • Strong vs Heavy Armor, Light Armor
 		Weaknesses: • Cannot attack Aircraft
+		Attributes: • Can crush concrete walls.
 	Voiced:
 		VoiceSet: TripodVoice
 	Valued:
@@ -1543,6 +1544,7 @@ TPOD:
 	WithMuzzleOverlay:
 	Carryable:
 		LocalOffset: 0,0,700
+	-Crushable:
 	ProducibleWithLevel:
 		Prerequisites: vehicles.upgraded
 	TurretedFloating:

mods/ca/rules/upgrades.yaml

@@ -685,7 +685,7 @@ pcan.upgrade:
 		Description: Allows construction of Prism Cannons.\n\nReplaces: Prism Tank
 	TooltipExtras:
 		Strengths: + Increased range\n+ Increased burst damage
-		Weaknesses: – Reduced speed\n– Reduced rate of fire\n– No turret
+		Weaknesses: – Reduced rate of fire\n– No turret
 	Valued:
 		Cost: 1000
 	RenderSprites:

mods/ca/rules/vehicles.yaml

@@ -1072,7 +1072,7 @@ ISU:
 	TooltipExtras:
 		Strengths: • Strong vs Buildings, Defenses, Infantry, Light Armor
 		Weaknesses: • Cannot attack Aircraft\n• Has difficulty hitting moving targets
-		Attributes: • Concussion shells slow enemy movement and rate of fire
+		Attributes: • Concussion shells slow enemy movement and rate of fire\n• Can crush concrete walls
 	Valued:
 		Cost: 1250
 	Tooltip:
@@ -3462,10 +3462,11 @@ MLRS:
 		Description: Long-range incendiary missile artillery.
 	TooltipExtras:
 		Strengths: • Strong vs Buildings, Defenses, Infantry, Light Armor
-		Weaknesses: • Weak vs Heavy Armor\n• Cannot attack Aircraft\n• Has difficulty hitting moving targets
+		Weaknesses: • Weak vs Heavy Armor\n• Cannot attack Aircraft\n• Has difficulty hitting moving targets\n• Cannot fire while moving
 	Mobile:
 		Speed: 66
 		PauseOnCondition: aiming || being-captured || empdisable || being-warped || driver-dead || notmobile
+		BlockedCursor: move
 	Health:
 		HP: 15000
 	Armor:
@@ -3480,18 +3481,26 @@ MLRS:
 		TurnSpeed: 8
 		Offset: -128,0,128
 		RealignDelay: 0
+	AttackMove:
+		AttackMoveCondition: attack-move
 	Armament:
-		Weapon: honestjohn
+		Weapon: HonestJohn
 		LocalOffset: 0,171,0, 0,-171,0
 		PauseOnCondition: moving
+		ReloadingCondition: reloading
+	Armament@TARGETTER:
+		Name: targetter
+		Weapon: HonestJohnTargeting
+		PauseOnCondition: reloading
+		RequiresCondition: attack-move || assault-move
 	AmmoPool:
 		Ammo: 2
 		AmmoCondition: ammo
 	AttackTurreted:
+		Armaments: primary, targetter
 		TargetFrozenActors: True
 		ForceFireIgnoresActors: True
 		PauseOnCondition: empdisable || being-warped
-		OpportunityFire: False
 	WithSpriteTurret:
 		RequiresCondition: ammo > 1
 	WithSpriteTurret@OneMissile:
@@ -3501,6 +3510,7 @@ MLRS:
 		RequiresCondition: !ammo
 		Sequence: turret0
 	GrantConditionOnAttack@AIMING:
+		ArmamentNames: primary, targetter
 		Condition: aiming
 		RevokeDelay: 15
 		RevokeAll: false
@@ -3755,7 +3765,6 @@ HFTK:
 	Armor:
 		Type: Heavy
 	Mobile:
-		Locomotor: heavytracked
 		Speed: 56
 		Voice: Move
 	RevealsShroud:
@@ -3764,6 +3773,8 @@ HFTK:
 		RevealGeneratedShroud: False
 	RevealsShroud@GAPGEN:
 		Range: 4c0
+	AutoTarget:
+		ScanRadius: 4
 	Turreted:
 		TurnSpeed: 20
 	Armament@PRIMARY:
@@ -4594,7 +4605,7 @@ TITN:
 		Description: Tough, slow combat battle-mech.
 	TooltipExtras:
 		Strengths: • Strong vs Heavy Armor, Light Armor, Infantry
-		Attributes: • Can crush concrete walls
+		Attributes: • Can crush smaller vehicles and concrete walls
 	Valued:
 		Cost: 2000
 	Selectable:
@@ -4658,6 +4669,7 @@ TITN:
 		DamageCooldown: 150
 	Carryable:
 		LocalOffset: 0,0,700
+	-Crushable:
 	ProducibleWithLevel:
 		Prerequisites: vehicles.upgraded
 	SpawnActorOnDeath:
@@ -4706,12 +4718,14 @@ JUGG:
 		Prerequisites: upgc, ~vehicles.talon, ~techlevel.high
 	TooltipExtras:
 		Strengths: • Strong vs Buildings, Defenses, Infantry, Light Armor
-		Weaknesses: • Cannot attack Aircraft\n• Has difficulty hitting moving targets
+		Weaknesses: • Cannot attack Aircraft\n• Has difficulty hitting moving targets\n• Cannot fire while moving
+		Attributes: • Can crush smaller vehicles and concrete walls		
 	Mobile:
 		Locomotor: sheavytracked
 		Speed: 40
 		Voice: Move
 		PauseOnCondition: aiming || being-captured || empdisable || being-warped || driver-dead || notmobile
+		BlockedCursor: move		
 	UpdatesPlayerStatistics:
 		AddToArmyValue: true
 	Selectable:
@@ -4725,14 +4739,23 @@ JUGG:
 	WithMoveAnimation:
 		MoveSequence: run
 	WithSpriteTurret:
+	AttackMove:
+		AttackMoveCondition: attack-move	
 	Armament@PRIMARY:
 		Weapon: JuggernautGun
 		LocalOffset: 830,0,500, 830,100,500, 830,-100,500
 		Recoil: 171
 		RecoilRecovery: 30
 		MuzzleSequence: muzzle
 		PauseOnCondition: moving
+		ReloadingCondition: reloading		
+	Armament@TARGETTER:
+		Name: targetter
+		Weapon: JuggernautGunTargeting
+		PauseOnCondition: reloading
+		RequiresCondition: attack-move || assault-move
 	AttackTurreted:
+		Armaments: primary, targetter	
 		PauseOnCondition: empdisable || being-warped
 		TargetFrozenActors: True
 		ForceFireIgnoresActors: True
@@ -4756,6 +4779,7 @@ JUGG:
 	Voiced:
 		VoiceSet: DisrVoice
 	GrantConditionOnAttack@AIMING:
+		ArmamentNames: primary, targetter	
 		Condition: aiming
 		RevokeDelay: 15
 		RevokeAll: false
@@ -4764,6 +4788,7 @@ JUGG:
 		Condition: moving
 	Carryable:
 		LocalOffset: 0,0,700
+	-Crushable:
 	ProducibleWithLevel:
 		Prerequisites: vehicles.upgraded
 	Explodes:
@@ -4824,7 +4849,7 @@ DISR:
 		Voice: Move
 	RevealsShroud:
 		MinRange: 4c0
-		Range: 7c0
+		Range: 6c0
 		RevealGeneratedShroud: False
 	RevealsShroud@GAPGEN:
 		Range: 4c0
@@ -5400,7 +5425,6 @@ PTNK:
 		LocalOffset: 100,0,180
 	AttackTurreted:
 		TargetFrozenActors: True
-		OpportunityFire: False
 		PauseOnCondition: empdisable || being-warped
 		Voice: Attack
 	WithSpriteTurret:
@@ -5428,9 +5452,6 @@ PCAN:
 		Weapon: PrisCLaser
 		FireDelay: 10
 		LocalOffset: 420,0,180
-	Mobile:
-		Speed: 56
-		PauseOnCondition: aiming || being-captured || empdisable || being-warped || driver-dead || notmobile
 	-Turreted:
 	-AttackTurreted:
 	-WithSpriteTurret:
@@ -5440,10 +5461,6 @@ PCAN:
 		Voice: Attack
 	SpawnActorOnDeath:
 		Actor: PCAN.Husk
-	GrantConditionOnAttack:
-		Condition: aiming
-		RevokeDelay: 20
-		RevokeAll: false
 
 WTNK:
 	Inherits: ^TankTD
@@ -5502,8 +5519,6 @@ WTNK:
 	Armament@PRIMARYSOUND:
 		Weapon: MicrowaveZapSound
 	AttackTurreted:
-		TargetFrozenActors: True
-		OpportunityFire: False
 		PauseOnCondition: empdisable || being-warped
 		Voice: Attack
 	WithMuzzleOverlay:
@@ -5538,7 +5553,7 @@ BATF:
 		Prerequisites: atek, ~vehicles.france, ~techlevel.high
 		Description: Tough infantry transport with weapon ports\n  for infantry to fire from.
 	TooltipExtras:
-		Attributes: • Can crush concrete walls and vehicles
+		Attributes: • Can crush smaller vehicles and concrete walls
 	Valued:
 		Cost: 2000
 	Tooltip:
@@ -5907,7 +5922,7 @@ CHPR:
 	TooltipExtras:
 		Strengths: • Strong vs Heavy Armor, Defenses, Aircraft
 		Weaknesses: • Weak vs Buildings
-		Attributes: • Target is disabled while being erased
+		Attributes: • Target is disabled while being erased\n• Can crush concrete walls
 	Valued:
 		Cost: 1700
 	Tooltip:
@@ -6069,11 +6084,11 @@ APOC:
 		Description: Enormous slow tank with uranium shells and anti-air capability.
 	TooltipExtras:
 		Strengths: • Strong vs Heavy Armor, Light Armor
-		Attributes: • Can crush vehicles and concrete walls
+		Attributes: • Can crush smaller vehicles and concrete walls
 		RequiresCondition: !iraqtank-upgrade
 	TooltipExtras@IRAQ:
 		Strengths: • Strong vs Heavy Armor, Light Armor, Infantry
-		Attributes: • Can crush vehicles and concrete walls\n• Explodes and leaves radiation on death
+		Attributes: • Can crush smaller vehicles and concrete walls\n• Explodes and leaves radiation on death
 		IsStandard: false
 		RequiresCondition: iraqtank-upgrade
 	Valued:

mods/ca/weapons/ballistics.yaml

@@ -441,6 +441,20 @@ JuggernautGun:
 	Warhead@4EffWater: CreateEffect
 		Explosions: large_splash
 
+JuggernautGunTargeting:
+	Inherits: JuggernautGun
+	ReloadDelay: 25
+	-Report:
+	-Burst:
+	-StartBurstReport:
+	-Projectile:
+	-Warhead@1Dam:
+	-Warhead@2Smu:
+	-Warhead@3Eff:
+	-Warhead@4EffWater:
+	Projectile: InstantHit
+	Warhead@1Dum: Dummy
+
 2Inch:
 	Inherits: ^Cannon
 	ReloadDelay: 40

mods/ca/weapons/missiles.yaml

@@ -150,15 +150,25 @@ MaverickSU:
 		ContrailWidth: 48
 		ContrailColor: ff990088
 	Warhead@1Dam: SpreadDamage
-		Damage: 17000
+		Damage: 16000
 		Spread: 448
 		Falloff: 100, 50, 33, 5, 0
 		Versus:
-			None: 15
+			None: 0
 			Wood: 18
 			Light: 65
-			Concrete: 70
+			Concrete: 65
 			Heavy: 85
+	Warhead@2Dam: SpreadDamage
+		Damage: 1600
+		Spread: 128
+		Versus:
+			None: 100
+			Wood: 0
+			Light: 0
+			Concrete: 0
+			Heavy: 0
+			Brick: 0
 	Warhead@3Eff: CreateEffect
 		Explosions: large_explosion
 		ImpactSounds: gexp14a.aud, gexp14b.aud, gexp14c.aud, gexp14d.aud
@@ -185,19 +195,19 @@ SeismicMissile:
 		ContrailWidth: 64
 		ContrailLength: 8
 		ContrailColor: ff6600aa
-		Speed: 200
+		Speed: 180
 		LaunchAngle: 0
 	Warhead@1Dam: SpreadDamage
 		Spread: 1c0
-		Damage: 1300
+		Damage: 1850
 		Falloff: 1000, 368, 135, 50, 0
 		ValidTargets: Ground, Water
 		Versus:
-			None: 20
-			Wood: 80
-			Light: 100
+			None: 10
+			Wood: 55
+			Light: 75
 			Heavy: 100
-			Concrete: 100
+			Concrete: 75
 			Brick: 100
 		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
 	Warhead@2Smu: LeaveSmudge
@@ -1105,6 +1115,23 @@ HonestJohn:
 		Dimensions: 3,3
 		Footprint: xxx xxx xxx
 
+HonestJohnTargeting:
+	Inherits: HonestJohn
+	ReloadDelay: 25
+	-Report:
+	-Burst:
+	-BurstDelays:
+	-Projectile:
+	-Warhead@1Dam:
+	-Warhead@2Dam:
+	-Warhead@3Dam:
+	-Warhead@4Dam:
+	-Warhead@2Smu:
+	-Warhead@3Eff:
+	-Warhead@Flames:
+	Projectile: InstantHit
+	Warhead@1Dum: Dummy
+
 BikeRockets:
 	Inherits: Dragon
 	Range: 4c512