epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename RallyPoint.RallyPoint to RallyPoint.Offset

Browse Source
This commit is contained in:
Matthias Mailänder
2015-08-05 23:31:29 +02:00
parent f11331a7cd
commit b536e677fb
8 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Common/Traits/Buildings/RallyPoint.cs
View File

@@ -17,8 +17,8 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Used to waypoint units after production or repair is finished.")] [Desc("Used to waypoint units after production or repair is finished.")]
public class RallyPointInfo : ITraitInfo public class RallyPointInfo : ITraitInfo
{ {
public readonly CVec RallyPoint = new CVec(1, 3);
public readonly string IndicatorPalettePrefix = "player"; public readonly string IndicatorPalettePrefix = "player";
public readonly CVec Offset = new CVec(1, 3);
public object Create(ActorInitializer init) { return new RallyPoint(init.Self, this); } public object Create(ActorInitializer init) { return new RallyPoint(init.Self, this); }
} }

6
OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs
View File

@@ -1730,6 +1730,12 @@ namespace OpenRA.Mods.Common.UtilityCommands
node.Key = "SpawnActorOnDeath"; 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); UpgradeActorRules(engineVersion, ref node.Value.Nodes, node, depth + 1);
} }
} }

4
mods/cnc/rules/structures.yaml
View File

@@ -329,7 +329,7 @@ AFLD:
WithIdleOverlay@DISH: WithIdleOverlay@DISH:
Sequence: idle-dish Sequence: idle-dish
RallyPoint: RallyPoint:
RallyPoint: 4,2 Offset: 4,2
Exit@1: Exit@1:
SpawnOffset: -1024,0,0 SpawnOffset: -1024,0,0
ExitCell: 3,1 ExitCell: 3,1
@@ -374,7 +374,7 @@ WEAP:
WithProductionDoorOverlay: WithProductionDoorOverlay:
Sequence: build-top Sequence: build-top
RallyPoint: RallyPoint:
RallyPoint: 0,3 Offset: 0,3
Exit@1: Exit@1:
SpawnOffset: -341,-341,0 SpawnOffset: -341,-341,0
ExitCell: 0,2 ExitCell: 0,2

2
mods/cnc/rules/tech.yaml
View File

@@ -73,7 +73,7 @@ BIO:
LowPowerSlowdown: 3 LowPowerSlowdown: 3
ProductionBar: ProductionBar:
RallyPoint: RallyPoint:
RallyPoint: -1,-1 Offset: -1,-1
SpawnActorOnDeath: SpawnActorOnDeath:
HuskActor: BIO.Husk HuskActor: BIO.Husk
ProvidesPrerequisite@buildingname: ProvidesPrerequisite@buildingname:

10
mods/d2k/rules/structures.yaml
View File

@@ -136,7 +136,7 @@ barracks:
RevealsShroud: RevealsShroud:
Range: 5c0 Range: 5c0
RallyPoint: RallyPoint:
RallyPoint: 1,3 Offset: 1,3
Exit@1: Exit@1:
SpawnOffset: 352,576,0 SpawnOffset: 352,576,0
ExitCell: 0,2 ExitCell: 0,2
@@ -287,7 +287,7 @@ light:
atreides: light.atreides atreides: light.atreides
ordos: light.ordos ordos: light.ordos
RallyPoint: RallyPoint:
RallyPoint: 2,2 Offset: 2,2
Exit@1: Exit@1:
SpawnOffset: 544,-224,0 SpawnOffset: 544,-224,0
ExitCell: 2,1 ExitCell: 2,1
@@ -339,7 +339,7 @@ heavy:
RevealsShroud: RevealsShroud:
Range: 4c0 Range: 4c0
RallyPoint: RallyPoint:
RallyPoint: 0,3 Offset: 0,3
Exit@1: Exit@1:
SpawnOffset: 256,192,0 SpawnOffset: 256,192,0
ExitCell: 0,2 ExitCell: 0,2
@@ -440,7 +440,7 @@ starport:
RevealsShroud: RevealsShroud:
Range: 7c0 Range: 7c0
RallyPoint: RallyPoint:
RallyPoint: 1,3 Offset: 1,3
Exit@1: Exit@1:
SpawnOffset: 0,-480,0 SpawnOffset: 0,-480,0
ExitCell: 2,2 ExitCell: 2,2
@@ -665,7 +665,7 @@ repair:
ValuePercentage: 50 ValuePercentage: 50
FinishRepairingNotification: UnitRepaired FinishRepairingNotification: UnitRepaired
RallyPoint: RallyPoint:
RallyPoint: 1,3 Offset: 1,3
RenderBuilding: RenderBuilding:
Image: repair.harkonnen Image: repair.harkonnen
RaceImages: RaceImages:

2
mods/ra/rules/structures.yaml
View File

@@ -1390,7 +1390,7 @@ KENN:
Bib: Bib:
HasMinibib: True HasMinibib: True
RallyPoint: RallyPoint:
RallyPoint: 0,2 Offset: 0,2
Exit: Exit:
SpawnOffset: -280,400,0 SpawnOffset: -280,400,0
ExitCell: 0,1 ExitCell: 0,1

4
mods/ts/rules/gdi-structures.yaml
View File

@@ -87,7 +87,7 @@ GAPILE:
RevealsShroud: RevealsShroud:
Range: 5c0 Range: 5c0
RallyPoint: RallyPoint:
RallyPoint: 2,3 Offset: 2,3
Exit@1: Exit@1:
SpawnOffset: -256,1024,0 SpawnOffset: -256,1024,0
ExitCell: 2,2 ExitCell: 2,2
@@ -130,7 +130,7 @@ GAWEAP:
RevealsShroud: RevealsShroud:
Range: 4c0 Range: 4c0
RallyPoint: RallyPoint:
RallyPoint: 6,1 Offset: 6,1
Exit@1: Exit@1:
SpawnOffset: -384,-384,0 SpawnOffset: -384,-384,0
ExitCell: 4,1 ExitCell: 4,1

4
mods/ts/rules/nod-structures.yaml
View File

@@ -100,7 +100,7 @@ NAHAND:
SpawnOffset: 384,768,0 SpawnOffset: 384,768,0
ExitCell: 3,2 ExitCell: 3,2
RallyPoint: RallyPoint:
RallyPoint: 3,3 Offset: 3,3
Production: Production:
Produces: Infantry Produces: Infantry
PrimaryBuilding: PrimaryBuilding:
@@ -138,7 +138,7 @@ NAWEAP:
RevealsShroud: RevealsShroud:
Range: 4c0 Range: 4c0
RallyPoint: RallyPoint:
RallyPoint: 6,1 Offset: 6,1
Exit@1: Exit@1:
SpawnOffset: -384,-384,0 SpawnOffset: -384,-384,0
ExitCell: 4,1 ExitCell: 4,1