Merge pull request #9611 from obrakmann/fix3285_default-stance-defend

Change the default stance to Defend for human players

OpenRA.Mods.Common/Traits/AutoTarget.cs

@@ -16,7 +16,7 @@ using OpenRA.Traits;
 namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("The actor will automatically engage the enemy when it is in range.")]
-	public class AutoTargetInfo : ITraitInfo, Requires<AttackBaseInfo>
+	public class AutoTargetInfo : ITraitInfo, Requires<AttackBaseInfo>, UsesInit<StanceInit>
 	{
 		[Desc("It will try to hunt down the enemy if it is not set to defend.")]
 		public readonly bool AllowMovement = true;
@@ -24,8 +24,12 @@ namespace OpenRA.Mods.Common.Traits
 		[Desc("Set to a value >1 to override weapons maximum range for this.")]
 		public readonly int ScanRadius = -1;
 
-		[Desc("Possible values are HoldFire, ReturnFire, Defend and AttackAnything.")]
+		[Desc("Possible values are HoldFire, ReturnFire, Defend and AttackAnything.",
-		public readonly UnitStance InitialStance = UnitStance.AttackAnything;
+			"Used for computer-controlled players, both Lua-scripted and regular Skirmish AI alike.")]
+		public readonly UnitStance InitialStanceAI = UnitStance.AttackAnything;
+
+		[Desc("Possible values are HoldFire, ReturnFire, Defend and AttackAnything. Used for human players.")]
+		public readonly UnitStance InitialStance = UnitStance.Defend;
 
 		[Desc("Allow the player to change the unit stance.")]
 		public readonly bool EnableStances = true;
@@ -40,7 +44,7 @@ namespace OpenRA.Mods.Common.Traits
 
 		public readonly bool TargetWhenDamaged = true;
 
-		public object Create(ActorInitializer init) { return new AutoTarget(init.Self, this); }
+		public object Create(ActorInitializer init) { return new AutoTarget(init, this); }
 	}
 
 	public enum UnitStance { HoldFire, ReturnFire, Defend, AttackAnything }
@@ -59,11 +63,17 @@ namespace OpenRA.Mods.Common.Traits
 		// NOT SYNCED: do not refer to this anywhere other than UI code
 		public UnitStance PredictedStance;
 
-		public AutoTarget(Actor self, AutoTargetInfo info)
+		public AutoTarget(ActorInitializer init, AutoTargetInfo info)
 		{
+			var self = init.Self;
 			this.info = info;
 			attack = self.Trait<AttackBase>();
-			Stance = info.InitialStance;
+
+			if (init.Contains<StanceInit>())
+				Stance = init.Get<StanceInit, UnitStance>();
+			else
+				Stance = self.Owner.IsBot || !self.Owner.Playable ? info.InitialStanceAI : info.InitialStance;
+
 			PredictedStance = Stance;
 			at = self.TraitOrDefault<AttackFollow>();
 		}
@@ -198,4 +208,12 @@ namespace OpenRA.Mods.Common.Traits
 	[Desc("Will not get automatically targeted by enemy (like walls)")]
 	class AutoTargetIgnoreInfo : TraitInfo<AutoTargetIgnore> { }
 	class AutoTargetIgnore { }
+
+	public class StanceInit : IActorInit<UnitStance>
+	{
+		[FieldFromYamlKey] readonly UnitStance value = UnitStance.AttackAnything;
+		public StanceInit() { }
+		public StanceInit(UnitStance init) { value = init; }
+		public UnitStance Value(World world) { return value; }
+	}
 }

OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs

@@ -2266,6 +2266,17 @@ namespace OpenRA.Mods.Common.UtilityCommands
 					}
 				}
 
+				// Add InitialStance for bots
+				if (engineVersion < 20151025)
+				{
+					if (depth == 1 && node.Key == "AutoTarget")
+					{
+						var stance = node.Value.Nodes.FirstOrDefault(n => n.Key == "InitialStance");
+						if (stance != null)
+							node.Value.Nodes.Add(new MiniYamlNode("InitialStanceAI", stance.Value.Value));
+					}
+				}
+
 				UpgradeActorRules(engineVersion, ref node.Value.Nodes, node, depth + 1);
 			}
 		}

mods/cnc/rules/vehicles.yaml

@@ -150,7 +150,7 @@ ARTY:
 	AttackFrontal:
 	WithMuzzleOverlay:
 	AutoTarget:
-		InitialStance: Defend
+		InitialStanceAI: Defend
 	SpawnActorOnDeath:
 		Actor: ARTY.Husk
 	Explodes:
@@ -488,7 +488,7 @@ MLRS:
 	WithReloadingTurret:
 		AmmoPoolName: primary
 	AutoTarget:
-		InitialStance: Defend
+		InitialStanceAI: Defend
 	RenderRangeCircle:
 	SpawnActorOnDeath:
 		Actor: MLRS.Husk
@@ -526,6 +526,7 @@ STNK:
 	AttackFrontal:
 	AutoTarget:
 		InitialStance: HoldFire
+		InitialStanceAI: ReturnFire
 	Targetable:
 	SpawnActorOnDeath:
 		Actor: STNK.Husk

mods/d2k/rules/infantry.yaml

@@ -126,6 +126,8 @@ fremen:
 		Range: 4c768
 	AutoTarget:
 		ScanRadius: 7
+		InitialStance: HoldFire
+		InitialStanceAI: ReturnFire
 	Armament@PRIMARY:
 		Weapon: Fremen_S
 	Armament@SECONDARY:

mods/d2k/rules/vehicles.yaml

@@ -210,7 +210,7 @@ siege_tank:
 		Weapon: UnitExplodeMed
 		EmptyWeapon: UnitExplodeMed
 	AutoTarget:
-		InitialStance: Defend
+		InitialStanceAI: Defend
 	Selectable:
 		Class: siegetank
 	SpawnActorOnDeath:
@@ -245,7 +245,7 @@ missile_tank:
 		LocalOffset: -128,128,171, -128,-128,171
 	AttackFrontal:
 	AutoTarget:
-		InitialStance: Defend
+		InitialStanceAI: Defend
 	Explodes:
 		Weapon: UnitExplodeMed
 		EmptyWeapon: UnitExplodeMed
@@ -394,6 +394,7 @@ stealth_raider:
 		IsPlayerPalette: true
 	AutoTarget:
 		InitialStance: HoldFire
+		InitialStanceAI: ReturnFire
 	-MustBeDestroyed:
 
 deviator:
@@ -423,7 +424,7 @@ deviator:
 		LocalOffset: -299,0,85
 	AttackFrontal:
 	AutoTarget:
-		InitialStance: Defend
+		InitialStanceAI: Defend
 	Explodes:
 		Weapon: UnitExplodeLarge
 		EmptyWeapon: UnitExplodeLarge

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

@@ -654,7 +654,7 @@ Rules:
 		Health:
 			HP: 200
 		AutoTarget:
-			InitialStance: Defend
+			InitialStanceAI: Defend
 	SNIPER.soviets:
 		Inherits: SNIPER
 		Buildable:

mods/ra/maps/intervention/intervention.lua

@@ -40,7 +40,6 @@ BaseRearAttackWpts = { GroundAttackWpt1.Location, BaseRearAttackWpt1.Location, B
 SovietHarvesters = { Harvester1, Harvester2, Harvester3 }
 HarvesterGuard = { HarvGuard1, HarvGuard2, HarvGuard3 }
 
-UBoats = { Uboat1, Uboat2, Uboat3, Uboat4, Uboat5, Uboat6 }
 UboatPatrolWpts1 = { UboatPatrolWpt1.Location, UboatPatrolWpt2.Location, UboatPatrolWpt3.Location, UboatPatrolWpt4.Location }
 UboatPatrolWpts2 = { UboatPatrolWpt4.Location, UboatPatrolWpt2.Location, UboatPatrolWpt1.Location }
 UBoatPatrolUnits = { "ss" }
@@ -183,8 +182,6 @@ SetupWorld = function()
 		end)
 	end)
 
-	Utils.Do(UBoats, function(a) a.Stance = "Defend" end)
-
 	Utils.Do(Map.NamedActors, function(actor)
 		if actor.Owner == soviets and actor.HasProperty("StartBuildingRepairs") then
 			Trigger.OnDamaged(actor, function(building)

mods/ra/maps/intervention/map.yaml

@@ -2053,26 +2053,32 @@ Actors:
 		Location: 17,92
 		Owner: Soviets
 		Facing: 128
+		Stance: Defend
 	Uboat2: ss
 		Location: 20,91
 		Owner: Soviets
 		Facing: 128
+		Stance: Defend
 	Uboat3: ss
 		Location: 17,112
 		Owner: Soviets
 		Facing: 192
+		Stance: Defend
 	Uboat4: ss
 		Location: 34,120
 		Owner: Soviets
 		Facing: 160
+		Stance: Defend
 	Uboat5: ss
 		Location: 24,126
 		Owner: Soviets
 		Facing: 160
+		Stance: Defend
 	Uboat6: ss
 		Location: 29,131
 		Owner: Soviets
 		Facing: 192
+		Stance: Defend
 	WarFactory: weap
 		Location: 70,72
 		Owner: Soviets

mods/ra/rules/aircraft.yaml

@@ -273,6 +273,7 @@ HELI:
 		CanHover: True
 	AutoTarget:
 		InitialStance: HoldFire
+		InitialStanceAI: HoldFire
 	WithSpriteRotorOverlay:
 		Offset: 0,0,85
 	AmmoPool:
@@ -326,6 +327,7 @@ HIND:
 		CanHover: True
 	AutoTarget:
 		InitialStance: HoldFire
+		InitialStanceAI: HoldFire
 	WithSpriteRotorOverlay:
 	AmmoPool:
 		Ammo: 24

mods/ra/rules/infantry.yaml

@@ -32,6 +32,8 @@ DOG:
 		Voice: Attack
 	AttackMove:
 		Voice: Move
+	AutoTarget:
+		InitialStance: AttackAnything
 	Targetable:
 		TargetTypes: Ground, Infantry
 	WithInfantryBody:
@@ -517,7 +519,8 @@ SNIPER:
 	RevealsShroud:
 		Range: 6c0
 	AutoTarget:
-		InitialStance: ReturnFire
+		InitialStance: HoldFire
+		InitialStanceAI: ReturnFire
 	Armament@PRIMARY:
 		Weapon: Sniper
 	Armament@GARRISONED:

mods/ra/rules/ships.yaml

@@ -43,7 +43,8 @@ SS:
 	SelectionDecorations:
 		VisualBounds: 38,38
 	AutoTarget:
-		InitialStance: ReturnFire
+		InitialStance: HoldFire
+		InitialStanceAI: ReturnFire
 	DetectCloaked:
 		CloakTypes: Underwater
 		Range: 4c0
@@ -98,7 +99,8 @@ MSUB:
 	SelectionDecorations:
 		VisualBounds: 44,44
 	AutoTarget:
-		InitialStance: ReturnFire
+		InitialStance: HoldFire
+		InitialStanceAI: ReturnFire
 	DetectCloaked:
 		CloakTypes: Underwater
 		Range: 4c0

mods/ra/rules/vehicles.yaml

@@ -723,7 +723,8 @@ STNK:
 	RevealsShroud:
 		Range: 6c0
 	AutoTarget:
-		InitialStance: ReturnFire
+		InitialStance: HoldFire
+		InitialStanceAI: ReturnFire
 	Armament:
 		Weapon: APTusk
 		LocalOffset: 400,0,0

mods/ts/rules/nod-vehicles.yaml

@@ -272,5 +272,6 @@ STNK:
 		Voice: Attack
 	AutoTarget:
 		InitialStance: HoldFire
+		InitialStanceAI: ReturnFire
 	-MustBeDestroyed: