From b536e677fb217225391caa9dbb63cc2a141547da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <matthias@mailaender.name>
Date: Wed, 5 Aug 2015 23:31:29 +0200
Subject: [PATCH] rename RallyPoint.RallyPoint to RallyPoint.Offset

---
 OpenRA.Mods.Common/Traits/Buildings/RallyPoint.cs  |  2 +-
 OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs |  6 ++++++
 mods/cnc/rules/structures.yaml                     |  4 ++--
 mods/cnc/rules/tech.yaml                           |  2 +-
 mods/d2k/rules/structures.yaml                     | 10 +++++-----
 mods/ra/rules/structures.yaml                      |  2 +-
 mods/ts/rules/gdi-structures.yaml                  |  4 ++--
 mods/ts/rules/nod-structures.yaml                  |  4 ++--
 8 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/OpenRA.Mods.Common/Traits/Buildings/RallyPoint.cs b/OpenRA.Mods.Common/Traits/Buildings/RallyPoint.cs
index 98e65ccea0..ee637cb26b 100644
--- a/OpenRA.Mods.Common/Traits/Buildings/RallyPoint.cs
+++ b/OpenRA.Mods.Common/Traits/Buildings/RallyPoint.cs
@@ -17,8 +17,8 @@ namespace OpenRA.Mods.Common.Traits
 	[Desc("Used to waypoint units after production or repair is finished.")]
 	public class RallyPointInfo : ITraitInfo
 	{
-		public readonly CVec RallyPoint = new CVec(1, 3);
 		public readonly string IndicatorPalettePrefix = "player";
+		public readonly CVec Offset = new CVec(1, 3);
 
 		public object Create(ActorInitializer init) { return new RallyPoint(init.Self, this); }
 	}
diff --git a/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs b/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs
index 7556e5e636..249c854709 100644
--- a/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs
+++ b/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs
@@ -1730,6 +1730,12 @@ namespace OpenRA.Mods.Common.UtilityCommands
 						node.Key = "SpawnActorOnDeath";
 				}
 
+				if (engineVersion < 20150810)
+				{
+					if (depth == 2 && parentKey == "RallyPoint" && node.Key == "RallyPoint")
+						node.Key = "Offset";
+				}
+
 				UpgradeActorRules(engineVersion, ref node.Value.Nodes, node, depth + 1);
 			}
 		}
diff --git a/mods/cnc/rules/structures.yaml b/mods/cnc/rules/structures.yaml
index 44861f0a3b..21753d330a 100644
--- a/mods/cnc/rules/structures.yaml
+++ b/mods/cnc/rules/structures.yaml
@@ -329,7 +329,7 @@ AFLD:
 	WithIdleOverlay@DISH:
 		Sequence: idle-dish
 	RallyPoint:
-		RallyPoint: 4,2
+		Offset: 4,2
 	Exit@1:
 		SpawnOffset: -1024,0,0
 		ExitCell: 3,1
@@ -374,7 +374,7 @@ WEAP:
 	WithProductionDoorOverlay:
 		Sequence: build-top
 	RallyPoint:
-		RallyPoint: 0,3
+		Offset: 0,3
 	Exit@1:
 		SpawnOffset: -341,-341,0
 		ExitCell: 0,2
diff --git a/mods/cnc/rules/tech.yaml b/mods/cnc/rules/tech.yaml
index f6e5c844e1..edd0af273d 100644
--- a/mods/cnc/rules/tech.yaml
+++ b/mods/cnc/rules/tech.yaml
@@ -73,7 +73,7 @@ BIO:
 		LowPowerSlowdown: 3
 	ProductionBar:
 	RallyPoint:
-		RallyPoint: -1,-1
+		Offset: -1,-1
 	SpawnActorOnDeath:
 		HuskActor: BIO.Husk
 	ProvidesPrerequisite@buildingname:
diff --git a/mods/d2k/rules/structures.yaml b/mods/d2k/rules/structures.yaml
index 91270d1dd4..0c3e8b00ff 100644
--- a/mods/d2k/rules/structures.yaml
+++ b/mods/d2k/rules/structures.yaml
@@ -136,7 +136,7 @@ barracks:
 	RevealsShroud:
 		Range: 5c0
 	RallyPoint:
-		RallyPoint: 1,3
+		Offset: 1,3
 	Exit@1:
 		SpawnOffset: 352,576,0
 		ExitCell: 0,2
@@ -287,7 +287,7 @@ light:
 			atreides: light.atreides
 			ordos: light.ordos
 	RallyPoint:
-		RallyPoint: 2,2
+		Offset: 2,2
 	Exit@1:
 		SpawnOffset: 544,-224,0
 		ExitCell: 2,1
@@ -339,7 +339,7 @@ heavy:
 	RevealsShroud:
 		Range: 4c0
 	RallyPoint:
-		RallyPoint: 0,3
+		Offset: 0,3
 	Exit@1:
 		SpawnOffset: 256,192,0
 		ExitCell: 0,2
@@ -440,7 +440,7 @@ starport:
 	RevealsShroud:
 		Range: 7c0
 	RallyPoint:
-		RallyPoint: 1,3
+		Offset: 1,3
 	Exit@1:
 		SpawnOffset: 0,-480,0
 		ExitCell: 2,2
@@ -665,7 +665,7 @@ repair:
 		ValuePercentage: 50
 		FinishRepairingNotification: UnitRepaired
 	RallyPoint:
-		RallyPoint: 1,3
+		Offset: 1,3
 	RenderBuilding:
 		Image: repair.harkonnen
 		RaceImages:
diff --git a/mods/ra/rules/structures.yaml b/mods/ra/rules/structures.yaml
index 8bfd5f2124..b7abdebfe3 100644
--- a/mods/ra/rules/structures.yaml
+++ b/mods/ra/rules/structures.yaml
@@ -1390,7 +1390,7 @@ KENN:
 	Bib:
 		HasMinibib: True
 	RallyPoint:
-		RallyPoint: 0,2
+		Offset: 0,2
 	Exit:
 		SpawnOffset: -280,400,0
 		ExitCell: 0,1
diff --git a/mods/ts/rules/gdi-structures.yaml b/mods/ts/rules/gdi-structures.yaml
index e273925598..7f5b2a6a79 100644
--- a/mods/ts/rules/gdi-structures.yaml
+++ b/mods/ts/rules/gdi-structures.yaml
@@ -87,7 +87,7 @@ GAPILE:
 	RevealsShroud:
 		Range: 5c0
 	RallyPoint:
-		RallyPoint: 2,3
+		Offset: 2,3
 	Exit@1:
 		SpawnOffset: -256,1024,0
 		ExitCell: 2,2
@@ -130,7 +130,7 @@ GAWEAP:
 	RevealsShroud:
 		Range: 4c0
 	RallyPoint:
-		RallyPoint: 6,1
+		Offset: 6,1
 	Exit@1:
 		SpawnOffset: -384,-384,0
 		ExitCell: 4,1
diff --git a/mods/ts/rules/nod-structures.yaml b/mods/ts/rules/nod-structures.yaml
index fc4b00fd10..a76b4f7271 100644
--- a/mods/ts/rules/nod-structures.yaml
+++ b/mods/ts/rules/nod-structures.yaml
@@ -100,7 +100,7 @@ NAHAND:
 		SpawnOffset: 384,768,0
 		ExitCell: 3,2
 	RallyPoint:
-		RallyPoint: 3,3
+		Offset: 3,3
 	Production:
 		Produces: Infantry
 	PrimaryBuilding:
@@ -138,7 +138,7 @@ NAWEAP:
 	RevealsShroud:
 		Range: 4c0
 	RallyPoint:
-		RallyPoint: 6,1
+		Offset: 6,1
 	Exit@1:
 		SpawnOffset: -384,-384,0
 		ExitCell: 4,1