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

Some internal "race" to "faction" renaming

Browse Source
This commit is contained in:
Pavel Penev
2015-08-22 02:32:37 +03:00
parent d803a06a1e
commit 09f67d18bb
29 changed files with 75 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Game/GameInformation.cs
View File

@@ -147,10 +147,10 @@ namespace OpenRA
public bool IsHuman;
public bool IsBot;
// The faction name (aka Country)
// The faction's display name.
public string FactionName;
// The faction id (aka Country, aka Race)
// The faction ID, a.k.a. the faction's internal name.
public string FactionId;
public HSLColor Color;

6
OpenRA.Game/Map/MapPlayers.cs
View File

@@ -28,7 +28,7 @@ namespace OpenRA
public MapPlayers(Ruleset rules, int playerCount)
{
var firstRace = rules.Actors["world"].Traits
var firstFaction = rules.Actors["world"].Traits
.WithInterface<FactionInfo>().First(f => f.Selectable).InternalName;
Players = new Dictionary<string, PlayerReference>
@@ -37,7 +37,7 @@ namespace OpenRA
"Neutral", new PlayerReference
{
Name = "Neutral",
Faction = firstRace,
Faction = firstFaction,
OwnsWorld = true,
NonCombatant = true
}
@@ -46,7 +46,7 @@ namespace OpenRA
"Creeps", new PlayerReference
{
Name = "Creeps",
Faction = firstRace,
Faction = firstFaction,
NonCombatant = true,
Enemies = Exts.MakeArray(playerCount, i => "Multi{0}".F(i))
}

4
OpenRA.Game/Traits/BodyOrientation.cs
View File

@@ -61,7 +61,7 @@ namespace OpenRA.Traits
{
this.info = info;
var self = init.Self;
var race = init.Contains<FactionInit>() ? init.Get<FactionInit, string>() : self.Owner.Faction.InternalName;
var faction = init.Contains<FactionInit>() ? init.Get<FactionInit, string>() : self.Owner.Faction.InternalName;
quantizedFacings = Exts.Lazy(() =>
{
@@ -73,7 +73,7 @@ namespace OpenRA.Traits
if (qboi == null)
throw new InvalidOperationException("Actor type '" + self.Info.Name + "' does not define a quantized body orientation.");
return qboi.QuantizedBodyFacings(self.Info, self.World.Map.SequenceProvider, race);
return qboi.QuantizedBodyFacings(self.Info, self.World.Map.SequenceProvider, faction);
});
}

2
OpenRA.Game/Traits/TraitsInterfaces.cs
View File

@@ -322,7 +322,7 @@ namespace OpenRA.Traits
WRot QuantizeOrientation(WRot orientation, int facings);
}
public interface IQuantizeBodyOrientationInfo { int QuantizedBodyFacings(ActorInfo ai, SequenceProvider sequenceProvider, string race); }
public interface IQuantizeBodyOrientationInfo { int QuantizedBodyFacings(ActorInfo ai, SequenceProvider sequenceProvider, string faction); }
public interface ITargetableInfo
{