Merge remote-tracking branch 'darkademic/dev'

OpenRA.Mods.CA/Projectiles/ProjectileHusk.cs

@@ -21,7 +21,7 @@
 namespace OpenRA.Mods.CA.Projectiles
 {
 	[Desc("Projectile with customisable acceleration vector, recieve dead actor speed by using range modifier, used as aircraft husk.")]
-	public class ProjetcileHuskInfo : IProjectileInfo
+	public class ProjectileHuskInfo : IProjectileInfo
 	{
 		public readonly string Image = null;
 
@@ -93,12 +93,12 @@ public class ProjetcileHuskInfo : IProjectileInfo
 		[Desc("Use the Player Palette to render the trail sequence.")]
 		public readonly bool TrailUsePlayerPalette = false;
 
-		public IProjectile Create(ProjectileArgs args) { return new ProjetcileHusk(this, args); }
+		public IProjectile Create(ProjectileArgs args) { return new ProjectileHusk(this, args); }
 	}
 
-	public class ProjetcileHusk : IProjectile, ISync
+	public class ProjectileHusk : IProjectile, ISync
 	{
-		readonly ProjetcileHuskInfo info;
+		readonly ProjectileHuskInfo info;
 		readonly Animation anim;
 		readonly ProjectileArgs args;
 		readonly string trailPalette;
@@ -118,7 +118,7 @@ public class ProjetcileHusk : IProjectile, ISync
 		WPos pos, lastPos;
 		int smokeTicks;
 
-		public ProjetcileHusk(ProjetcileHuskInfo info, ProjectileArgs args)
+		public ProjectileHusk(ProjectileHuskInfo info, ProjectileArgs args)
 		{
 			this.info = info;
 			this.args = args;

mod.config

@@ -9,7 +9,7 @@
 MOD_ID="ca"
 
 # The OpenRA engine version to use for this project.
-ENGINE_VERSION="prep-CA23"
+ENGINE_VERSION="ca-engine/1.02"
 
 ##############################################################################
 # Packaging
@@ -102,7 +102,7 @@ PACKAGING_OVERWRITE_MOD_VERSION="True"
 AUTOMATIC_ENGINE_MANAGEMENT="True"
 
 # The URL to download the engine files from when AUTOMATIC_ENGINE_MANAGEMENT is enabled.
-AUTOMATIC_ENGINE_SOURCE="https://github.com/inq8/OpenRA/archive/refs/heads/${ENGINE_VERSION}.zip"
+AUTOMATIC_ENGINE_SOURCE="https://github.com/darkademic/OpenRA/archive/refs/heads/${ENGINE_VERSION}.zip"
 
 # Temporary file/directory names used by automatic engine management.
 # Paths outside the SDK directory are not officially supported.

mods/ca/maps/ca04-containment/rules.yaml

@@ -147,8 +147,6 @@ SEAL:
 	-ChangesHealth@ELITE:
 	GainsExperience:
 		ExperienceModifier: 250000
-	ReloadAmmoPoolCA:
-		Delay: 250
 	Mobile:
 		Speed: 54
 

mods/ca/rules/aircraft.yaml

@@ -3591,7 +3591,7 @@ PMAK:
 		Strengths: • Strong vs Heavy Armor, Defenses, Light Armor
 		Weaknesses: • Weak vs Infantry\n• Cannot attack Aircraft
 	Valued:
-		Cost: 2200
+		Cost: 2400
 	Tooltip:
 		Name: Peacemaker
 		GenericName: Aircraft
@@ -4026,8 +4026,8 @@ SHDE:
 		InitialStance: HoldFire
 		InitialStanceAI: AttackAnything
 	AmmoPool:
-		Ammo: 2
-		ReloadDelay: 70
+		Ammo: 3
+		ReloadDelay: 50
 		AmmoCondition: ammo
 	WithAmmoPipsDecoration:
 		Position: BottomLeft

mods/ca/rules/custom/composition-tester.yaml

@@ -28,7 +28,7 @@ Player:
 	-ConquestVictoryConditions:
 	PlayerResources:
 		SelectableCash: 5000, 7500, 10000, 15000, 20000, 25000, 30000, 35000, 40000, 45000, 50000, 75000, 100000, 200000
-		DefaultCash: 20000
+		DefaultCash: 30000
 	ClassicProductionQueue@Building:
 		BuildTimeSpeedReduction: 0
 		SpeedUp: True
@@ -657,7 +657,6 @@ YURI:
 SEAL:
 	Buildable:
 		Prerequisites: ~player.allies
-	-ProvidesPrerequisite@GUNHERO:
 
 XO:
 	Buildable:

mods/ca/rules/defaults.yaml

@@ -627,6 +627,17 @@
 		RequiresCondition: resourcedrain
 		Color: ffff0022
 
+^UpgradeOverlay:
+	WithDecoration@UpgradeOverlay:
+		Image: upgrade
+		Palette: chrome
+		Sequence: upgrade
+		Position: Center
+		RequiresCondition: upgrading
+		BlinkInterval: 5
+		BlinkPattern: on
+		ValidRelationships: Ally, Neutral
+
 ^GDIUpgrade:
 	GrantConditionOnPrerequisite@HOLD:
 		Condition: hold
@@ -981,8 +992,8 @@
 ^HealingCooldown:
 	GrantConditionOnHealingReceived@HEALINGCOOLDOWN:
 		Condition: heal-cooldown
-		RequiredHealing: 75000
-		StackDuration: 625
+		RequiredHealing: 50000
+		StackDuration: 1125
 		MinimumHealing: 2500
 		DamageTypes: DirectHeal
 		ShowSelectionBar: true
@@ -2874,6 +2885,7 @@
 	Inherits@7: ^BotBuilding
 	Inherits@8: ^Chillable
 	Inherits@wflash: ^WhiteFlash
+	Inherits@rflash: ^RedFlash
 	Inherits@gflash: ^GreenFlash
 	Inherits@HACKABLE: ^Hackable
 	Inherits@oilcost: ^OilRefCostReduction
@@ -3152,7 +3164,6 @@
 
 ^FakeBuilding:
 	Inherits: ^Building
-	Inherits@REDHIGHLIGHT: ^RedFlash
 	GivesBuildableArea:
 		AreaTypes: fake
 	RequiresBuildableArea:

mods/ca/rules/infantry.yaml

@@ -1272,6 +1272,7 @@ GNRL:
 
 THF:
 	Inherits: ^Soldier
+	Inherits@SELECTION: ^SelectableSupportUnit
 	Buildable:
 		Queue: InfantrySQ, InfantryMQ
 		BuildAtProductionType: Soldier
@@ -1366,7 +1367,7 @@ SHOK:
 	UpdatesPlayerStatistics:
 		AddToArmyValue: true
 	Health:
-		HP: 7000
+		HP: 8500
 	Mobile:
 		Voice: Move
 	RevealsShroud:
@@ -3186,7 +3187,7 @@ BRUT:
 	Armor:
 		Type: Light
 	Mobile:
-		Speed: 66
+		Speed: 60
 		Voice: Move
 	Passenger:
 		CargoType: Vehicle
@@ -3796,7 +3797,10 @@ YURI:
 	KeepsDistance:
 
 SEAL:
-	Inherits: RMBO
+	Inherits: ^Soldier
+	Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
+	Inherits@COMMANDOSKULL: ^CommandoSkull
+	Inherits@HEALINGCOOLDOWN: ^HealingCooldown
 	Valued:
 		Cost: 1000
 	Tooltip:
@@ -3805,6 +3809,13 @@ SEAL:
 		HP: 16000
 	UpdatesPlayerStatistics:
 		AddToArmyValue: true
+	Passenger:
+		CustomPipType: red
+		Voice: Move
+	AttackMove:
+		Voice: Move
+	RevealsShroud:
+		Range: 6c0
 	Buildable:
 		BuildPaletteOrder: 185
 		Prerequisites: ~infantry.usa, atek, ~techlevel.high
@@ -3821,26 +3832,92 @@ SEAL:
 	Mobile:
 		Speed: 60
 		Locomotor: seal
+		Voice: Move
+	Guard:
+		Voice: Move
 	Armament:
 		Weapon: mp5
 		PauseOnCondition: onwater
 	Armament@BATF:
 		Name: batf
 		Weapon: mp5BATF
 		MuzzleSequence: garrison-muzzle
-	Armament@sapper:
-		Weapon: PlaceC4seal
+	Armament@C4Place:
+		Weapon: PlaceC4Seal
 		Cursor: c4
 		OutsideRangeCursor: c4
 		Name: secondary
-		RequiresCondition: ammo
-	-ExternalCondition@PRODUCED:
-	-VoiceAnnouncement:
+		PauseOnCondition: !prepared && !onwater
+	Armament@C4Prepare:
+		Weapon: PrepareC4Seal
+		Cursor: c4
+		OutsideRangeCursor: c4
+		Name: tertiary
+		PauseOnCondition: !ammo
+		RequiresCondition: !onwater
+	AmmoPool@PreparedC4:
+		Name: prepared-c4
+		Ammo: 1
+		InitialAmmo: 0
+		AmmoCondition: prepared
+		Armaments: secondary
+	AmmoPool@C4:
+		Name: c4
+		Ammo: 1
+		AmmoCondition: ammo
+		Armaments: secondary
+	ReloadAmmoPoolCA@C4:
+		Delay: 250 # match PlaceC4Seal ReloadDelay
+		AmmoPool: c4
+		ShowSelectionBar: true
+		SelectionBarColor: 990000
+	ReloadAmmoPoolCA@PreparedC4:
+		AmmoPool: prepared-c4
+		Delay: 100
+		RequiresCondition: preparing-c4
+		ShowSelectionBar: true
+		SelectionBarColor: ff0000
+	GrantConditionOnAttack@PreparingC4:
+		Condition: preparing-c4
+		ArmamentNames: tertiary
+		RevokeDelay: 51
+	AttackFrontal:
+		Voice: Attack
+		Armaments: primary, secondary, tertiary
+		PauseOnCondition: being-warped
+		FacingTolerance: 0
+	Demolition:
+		DetonationDelay: 45
+		Voice: Demolish
+		DamageTypes: ExplosionDeath
+	AnnounceOnKill:
+	ProducibleWithLevel:
+		Prerequisites: barracks.upgraded
+	WithProductionIconOverlay:
+		Types: Veterancy
+		Prerequisites: barracks.upgraded
+	IgnoresDisguise:
+	DetectCloaked:
+		DetectionTypes: Cloak, Thief
+		Range: 5c0
+	-Crushable:
+	TakeCover:
+		SpeedModifier: 70
+	TargetSpecificOrderVoice:
+		Orders: Attack, ForceAttack
+		TargetTypeVoices:
+			Vehicle: Demolish
+			Structure: Demolish
 	GrantConditionOnTerrain:
 		TerrainTypes: Water
 		Condition: onwater
 	WithInfantryBody:
 		DefaultAttackSequence: shoot
+		IdleSequences: idle1,idle2,idle3
+		AttackSequences:
+			primary: shoot
+			secondary: plant
+			tertiary: plant
 		RequiresCondition: !being-warped && !onwater && !parachute
 	WithInfantryBody@PARACHUTE:
 		StandSequences: parachute
@@ -3860,22 +3937,10 @@ SEAL:
 		FallbackSequence: splash
 		CrushedSequence: die-crushed
 		DeathSequence: splash
-	AmmoPool:
-		Armaments: secondary
-		Ammo: 1
-		AmmoCondition: ammo
-	ReloadAmmoPoolCA:
-		Delay: 300
-		Count: 1
-		ShowSelectionBar: true
-		SelectionBarColor: dd0000
 	WithDecoration@COMMANDOSKULL:
 		Sequence: pip-seal
+	-AutoTargetPriority@ATTACKANYTHING:
 	-Targetable@HERO:
-	-Targetable@MindControlImmune:
-	-Targetable@ChaosImmune:
-	GrantConditionOnHealingReceived@HEALINGCOOLDOWN:
-		RequiredHealing: 40000
 
 XO:
 	Inherits: ^VehicleTD-NOUPG
@@ -4131,6 +4196,8 @@ CDOG:
 		Cost: 400
 	Tooltip:
 		Name: Cyberdog
+	Armor:
+		Type: Light
 	Health:
 		HP: 15000
 	Voiced:

mods/ca/rules/powers.yaml

@@ -1726,7 +1726,7 @@
 		PauseOnCondition: disabled || empdisable || being-warped
 		Icon: fleetrecall
 		IconPalette: chromes
-		ChargeInterval: 5250
+		ChargeInterval: 4500
 		Name: Fleet Recall
 		KeepFormation: true
 		Description: \nRecalls all selected Scrin fleet vessels back\n    to the Signal Transmitter.\n\nApplies to: Mothership, Planetary Assault Carrier, Devastator

mods/ca/rules/scrin.yaml

@@ -4392,7 +4392,7 @@ PTUR:
 		DecorationBounds: 1024, 1194, 0, -256
 	Building:
 	Health:
-		HP: 45000
+		HP: 46000
 	Armor:
 		Type: Concrete
 	RevealsShroud: