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

moved InitialFacing from OwnedActor to Unit

Browse Source
This commit is contained in:
Bob
2010-01-13 11:54:20 +13:00
parent e7d1407458
commit a3e071c60f
7 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRa.Game/Traits/Activities/HeliReturn.cs
View File

@@ -24,7 +24,7 @@ namespace OpenRa.Game.Traits.Activities
if (isCanceled) return NextActivity; if (isCanceled) return NextActivity;
var dest = ChooseHelipad(self); var dest = ChooseHelipad(self);
var initialFacing = self.Info.Traits.Get<OwnedActorInfo>().InitialFacing; var initialFacing = self.Info.Traits.Get<UnitInfo>().InitialFacing;
if (dest == null) if (dest == null)
return Util.SequenceActivities( return Util.SequenceActivities(

1
OpenRa.Game/Traits/Building.cs
View File

@@ -14,7 +14,6 @@ namespace OpenRa.Game.Traits
public readonly int HP = 0; public readonly int HP = 0;
public readonly ArmorType Armor = ArmorType.none; public readonly ArmorType Armor = ArmorType.none;
public readonly bool Crewed = false; // replace with trait? public readonly bool Crewed = false; // replace with trait?
public readonly int InitialFacing = 128;
public readonly int Sight = 0; public readonly int Sight = 0;
public readonly bool WaterBound = false; public readonly bool WaterBound = false;
} }

4
OpenRa.Game/Traits/Helicopter.cs
View File

@@ -49,7 +49,7 @@ namespace OpenRa.Game.Traits
{ {
self.CancelActivity(); self.CancelActivity();
self.QueueActivity(new HeliFly(Util.CenterOfCell(order.TargetLocation))); self.QueueActivity(new HeliFly(Util.CenterOfCell(order.TargetLocation)));
self.QueueActivity( new Turn( self.Info.Traits.GetOrDefault<OwnedActorInfo>().InitialFacing ) ); self.QueueActivity( new Turn( self.Info.Traits.GetOrDefault<UnitInfo>().InitialFacing ) );
self.QueueActivity(new HeliLand(true)); self.QueueActivity(new HeliLand(true));
} }
@@ -66,7 +66,7 @@ namespace OpenRa.Game.Traits
self.CancelActivity(); self.CancelActivity();
self.QueueActivity(new HeliFly(order.TargetActor.CenterLocation + offsetVec)); self.QueueActivity(new HeliFly(order.TargetActor.CenterLocation + offsetVec));
self.QueueActivity( new Turn( self.Info.Traits.GetOrDefault<OwnedActorInfo>().InitialFacing ) ); self.QueueActivity( new Turn( self.Info.Traits.GetOrDefault<UnitInfo>().InitialFacing ) );
self.QueueActivity(new HeliLand(false)); self.QueueActivity(new HeliLand(false));
self.QueueActivity(order.TargetActor.Info.Name == "hpad" self.QueueActivity(order.TargetActor.Info.Name == "hpad"
? (IActivity)new Rearm() : new Repair()); ? (IActivity)new Rearm() : new Repair());

2
OpenRa.Game/Traits/Production.cs
View File

@@ -26,7 +26,7 @@ namespace OpenRa.Game.Traits
public virtual int CreationFacing( Actor self, Actor newUnit ) public virtual int CreationFacing( Actor self, Actor newUnit )
{ {
return newUnit.Info.Traits.GetOrDefault<OwnedActorInfo>().InitialFacing; return newUnit.Info.Traits.GetOrDefault<UnitInfo>().InitialFacing;
} }
public bool Produce( Actor self, NewUnitInfo producee ) public bool Produce( Actor self, NewUnitInfo producee )

1
OpenRa.Game/Traits/Unit.cs
View File

@@ -4,6 +4,7 @@ namespace OpenRa.Game.Traits
{ {
class UnitInfo : OwnedActorInfo, ITraitInfo class UnitInfo : OwnedActorInfo, ITraitInfo
{ {
public readonly int InitialFacing = 128;
public readonly int ROT = 0; public readonly int ROT = 0;
public readonly int Speed = 0; public readonly int Speed = 0;

1
RulesConverter/Program.cs
View File

@@ -109,7 +109,6 @@ namespace RulesConverter
{ "Armor", "Armor" }, { "Armor", "Armor" },
{ "Crewed", "Crewed" }, { "Crewed", "Crewed" },
{ "WaterBound", "WaterBound" }, { "WaterBound", "WaterBound" },
{ "InitialFacing", "InitialFacing" },
{ "Sight", "Sight" }, { "Sight", "Sight" },
{ "Unsellable", "Unsellable" } } { "Unsellable", "Unsellable" } }
}, },

2
ra.yaml
View File

@@ -789,7 +789,6 @@ GUN:
HP: 400 HP: 400
Armor: heavy Armor: heavy
Crewed: yes Crewed: yes
InitialFacing: 50
Sight: 6 Sight: 6
Turreted: Turreted:
ROT: 12 ROT: 12
@@ -820,7 +819,6 @@ AGUN:
HP: 400 HP: 400
Armor: heavy Armor: heavy
Crewed: yes Crewed: yes
InitialFacing: 224
Sight: 6 Sight: 6
Turreted: Turreted:
ROT: 15 ROT: 15