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

Replace F extension with string interpolation

Browse Source
This commit is contained in:
teinarss
2021-04-24 17:46:24 +02:00
committed by reaperrr
parent 1385aca783
commit 10676be377
300 changed files with 752 additions and 799 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Game/Player.cs
View File

@@ -118,7 +118,7 @@ namespace OpenRA
selected = selectableFactions.FirstOrDefault(f => f.InternalName == faction);
if (selected == null)
throw new YamlException("Unknown faction: {0}".F(faction));
throw new YamlException($"Unknown faction: {faction}");
}
return selected;
@@ -143,7 +143,7 @@ namespace OpenRA
{
var botInfo = botInfos.First(b => b.Type == client.Bot);
var botsOfSameType = clients.Where(c => c.Bot == client.Bot).ToArray();
return botsOfSameType.Length == 1 ? botInfo.Name : "{0} {1}".F(botInfo.Name, botsOfSameType.IndexOf(client) + 1);
return botsOfSameType.Length == 1 ? botInfo.Name : $"{botInfo.Name} {botsOfSameType.IndexOf(client) + 1}";
}
return client.Name;
@@ -230,7 +230,7 @@ namespace OpenRA
public override string ToString()
{
return "{0} ({1})".F(PlayerName, ClientIndex);
return $"{PlayerName} ({ClientIndex})";
}
public PlayerRelationship RelationshipWith(Player other)
@@ -305,7 +305,7 @@ namespace OpenRA
public LuaValue ToString(LuaRuntime runtime)
{
return "Player ({0})".F(PlayerName);
return $"Player ({PlayerName})";
}
#endregion