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

Add support for Terrain targets with multiple positions.

Browse Source
This commit is contained in:
Paul Chote
2019-01-13 15:13:19 +00:00
parent fbb1947624
commit 62102b9f77
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
OpenRA.Game/Traits/Target.cs
View File

@@ -24,15 +24,17 @@ namespace OpenRA.Traits
readonly TargetType type; readonly TargetType type;
readonly Actor actor; readonly Actor actor;
readonly FrozenActor frozen; readonly FrozenActor frozen;
readonly WPos pos; readonly WPos terrainCenterPosition;
readonly WPos[] terrainPositions;
readonly CPos? cell; readonly CPos? cell;
readonly SubCell? subCell; readonly SubCell? subCell;
readonly int generation; readonly int generation;
Target(WPos pos) Target(WPos terrainCenterPosition, WPos[] terrainPositions = null)
{ {
type = TargetType.Terrain; type = TargetType.Terrain;
this.pos = pos; this.terrainCenterPosition = terrainCenterPosition;
this.terrainPositions = terrainPositions ?? new[] { terrainCenterPosition };
actor = null; actor = null;
frozen = null; frozen = null;
@@ -44,7 +46,8 @@ namespace OpenRA.Traits
Target(World w, CPos c, SubCell subCell) Target(World w, CPos c, SubCell subCell)
{ {
type = TargetType.Terrain; type = TargetType.Terrain;
pos = w.Map.CenterOfSubCell(c, subCell); terrainCenterPosition = w.Map.CenterOfSubCell(c, subCell);
terrainPositions = new[] { terrainCenterPosition };
cell = c; cell = c;
this.subCell = subCell; this.subCell = subCell;
@@ -59,7 +62,8 @@ namespace OpenRA.Traits
actor = a; actor = a;
generation = a.Generation; generation = a.Generation;
pos = WPos.Zero; terrainCenterPosition = WPos.Zero;
terrainPositions = null;
frozen = null; frozen = null;
cell = null; cell = null;
subCell = null; subCell = null;
@@ -70,7 +74,8 @@ namespace OpenRA.Traits
type = TargetType.FrozenActor; type = TargetType.FrozenActor;
frozen = fa; frozen = fa;
pos = WPos.Zero; terrainCenterPosition = WPos.Zero;
terrainPositions = null;
actor = null; actor = null;
cell = null; cell = null;
subCell = null; subCell = null;
@@ -78,6 +83,7 @@ namespace OpenRA.Traits
} }
public static Target FromPos(WPos p) { return new Target(p); } public static Target FromPos(WPos p) { return new Target(p); }
public static Target FromTargetPositions(Target t) { return new Target(t.CenterPosition, t.Positions.ToArray()); }
public static Target FromCell(World w, CPos c, SubCell subCell = SubCell.FullCell) { return new Target(w, c, subCell); } public static Target FromCell(World w, CPos c, SubCell subCell = SubCell.FullCell) { return new Target(w, c, subCell); }
public static Target FromActor(Actor a) { return a != null ? new Target(a) : Invalid; } public static Target FromActor(Actor a) { return a != null ? new Target(a) : Invalid; }
public static Target FromFrozenActor(FrozenActor fa) { return new Target(fa); } public static Target FromFrozenActor(FrozenActor fa) { return new Target(fa); }
@@ -160,7 +166,7 @@ namespace OpenRA.Traits
case TargetType.FrozenActor: case TargetType.FrozenActor:
return frozen.CenterPosition; return frozen.CenterPosition;
case TargetType.Terrain: case TargetType.Terrain:
return pos; return terrainCenterPosition;
default: default:
case TargetType.Invalid: case TargetType.Invalid:
throw new InvalidOperationException("Attempting to query the position of an invalid Target"); throw new InvalidOperationException("Attempting to query the position of an invalid Target");
@@ -184,7 +190,7 @@ namespace OpenRA.Traits
case TargetType.FrozenActor: case TargetType.FrozenActor:
return new[] { frozen.CenterPosition }; return new[] { frozen.CenterPosition };
case TargetType.Terrain: case TargetType.Terrain:
return new[] { pos }; return terrainPositions;
default: default:
case TargetType.Invalid: case TargetType.Invalid:
return NoPositions; return NoPositions;
@@ -212,7 +218,7 @@ namespace OpenRA.Traits
return frozen.ToString(); return frozen.ToString();
case TargetType.Terrain: case TargetType.Terrain:
return pos.ToString(); return terrainCenterPosition.ToString();
default: default:
case TargetType.Invalid: case TargetType.Invalid:
@@ -225,6 +231,6 @@ namespace OpenRA.Traits
internal Actor SerializableActor { get { return actor; } } internal Actor SerializableActor { get { return actor; } }
internal CPos? SerializableCell { get { return cell; } } internal CPos? SerializableCell { get { return cell; } }
internal SubCell? SerializableSubCell { get { return subCell; } } internal SubCell? SerializableSubCell { get { return subCell; } }
internal WPos SerializablePos { get { return pos; } } internal WPos SerializablePos { get { return terrainCenterPosition; } }
} }
} }