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

Fix IDE0090

Browse Source
This commit is contained in:
RoosterDragon
2023-11-14 19:49:11 +00:00
committed by Gustas
parent cfde0d7867
commit b97d1a4c6c
35 changed files with 125 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
OpenRA.Game/CVec.cs
View File

@@ -61,14 +61,14 @@ namespace OpenRA
public static readonly CVec[] Directions = public static readonly CVec[] Directions =
{ {
new CVec(-1, -1), new(-1, -1),
new CVec(-1, 0), new(-1, 0),
new CVec(-1, 1), new(-1, 1),
new CVec(0, -1), new(0, -1),
new CVec(0, 1), new(0, 1),
new CVec(1, -1), new(1, -1),
new CVec(1, 0), new(1, 0),
new CVec(1, 1), new(1, 1),
}; };
#region Scripting interface #region Scripting interface

6
OpenRA.Game/Game.cs
View File

@@ -928,8 +928,8 @@ namespace OpenRA
{ {
var endpoints = new List<IPEndPoint> var endpoints = new List<IPEndPoint>
{ {
new IPEndPoint(IPAddress.IPv6Any, settings.ListenPort), new(IPAddress.IPv6Any, settings.ListenPort),
new IPEndPoint(IPAddress.Any, settings.ListenPort) new(IPAddress.Any, settings.ListenPort)
}; };
server = new Server.Server(endpoints, settings, ModData, ServerType.Multiplayer); server = new Server.Server(endpoints, settings, ModData, ServerType.Multiplayer);
@@ -950,7 +950,7 @@ namespace OpenRA
// This would break the Restart button, which relies on the PlayerIndex always being the same for local servers // This would break the Restart button, which relies on the PlayerIndex always being the same for local servers
var endpoints = new List<IPEndPoint> var endpoints = new List<IPEndPoint>
{ {
new IPEndPoint(IPAddress.Loopback, 0) new(IPAddress.Loopback, 0)
}; };
server = new Server.Server(endpoints, settings, ModData, ServerType.Local); server = new Server.Server(endpoints, settings, ModData, ServerType.Local);

2
OpenRA.Game/GameInformation.cs
View File

@@ -85,7 +85,7 @@ namespace OpenRA
{ {
var nodes = new List<MiniYamlNode> var nodes = new List<MiniYamlNode>
{ {
new MiniYamlNode("Root", FieldSaver.Save(this)) new("Root", FieldSaver.Save(this))
}; };
for (var i = 0; i < Players.Count; i++) for (var i = 0; i < Players.Count; i++)

40
OpenRA.Game/Map/Map.cs
View File

@@ -159,26 +159,26 @@ namespace OpenRA
/// <summary>Defines the order of the fields in map.yaml.</summary> /// <summary>Defines the order of the fields in map.yaml.</summary>
static readonly MapField[] YamlFields = static readonly MapField[] YamlFields =
{ {
new MapField("MapFormat"), new("MapFormat"),
new MapField("RequiresMod"), new("RequiresMod"),
new MapField("Title"), new("Title"),
new MapField("Author"), new("Author"),
new MapField("Tileset"), new("Tileset"),
new MapField("MapSize"), new("MapSize"),
new MapField("Bounds"), new("Bounds"),
new MapField("Visibility"), new("Visibility"),
new MapField("Categories"), new("Categories"),
new MapField("LockPreview", required: false, ignoreIfValue: "False"), new("LockPreview", required: false, ignoreIfValue: "False"),
new MapField("Players", "PlayerDefinitions"), new("Players", "PlayerDefinitions"),
new MapField("Actors", "ActorDefinitions"), new("Actors", "ActorDefinitions"),
new MapField("Rules", "RuleDefinitions", required: false), new("Rules", "RuleDefinitions", required: false),
new MapField("Translations", "TranslationDefinitions", required: false), new("Translations", "TranslationDefinitions", required: false),
new MapField("Sequences", "SequenceDefinitions", required: false), new("Sequences", "SequenceDefinitions", required: false),
new MapField("ModelSequences", "ModelSequenceDefinitions", required: false), new("ModelSequences", "ModelSequenceDefinitions", required: false),
new MapField("Weapons", "WeaponDefinitions", required: false), new("Weapons", "WeaponDefinitions", required: false),
new MapField("Voices", "VoiceDefinitions", required: false), new("Voices", "VoiceDefinitions", required: false),
new MapField("Music", "MusicDefinitions", required: false), new("Music", "MusicDefinitions", required: false),
new MapField("Notifications", "NotificationDefinitions", required: false), new("Notifications", "NotificationDefinitions", required: false),
}; };
// Format versions // Format versions

12
OpenRA.Game/Map/MapGrid.cs
View File

@@ -116,12 +116,12 @@ namespace OpenRA
public readonly WVec[] SubCellOffsets = public readonly WVec[] SubCellOffsets =
{ {
new WVec(0, 0, 0), // full cell - index 0 new(0, 0, 0), // full cell - index 0
new WVec(-299, -256, 0), // top left - index 1 new(-299, -256, 0), // top left - index 1
new WVec(256, -256, 0), // top right - index 2 new(256, -256, 0), // top right - index 2
new WVec(0, 0, 0), // center - index 3 new(0, 0, 0), // center - index 3
new WVec(-299, 256, 0), // bottom left - index 4 new(-299, 256, 0), // bottom left - index 4
new WVec(256, 256, 0), // bottom right - index 5 new(256, 256, 0), // bottom right - index 5
}; };
public CellRamp[] Ramps { get; } public CellRamp[] Ramps { get; }

2
OpenRA.Game/MiniYaml.cs
View File

@@ -209,7 +209,7 @@ namespace OpenRA
var result = new List<List<MiniYamlNode>> var result = new List<List<MiniYamlNode>>
{ {
new List<MiniYamlNode>() new()
}; };
var parsedLines = new List<(int Level, string Key, string Value, string Comment, MiniYamlNode.SourceLocation Location)>(); var parsedLines = new List<(int Level, string Key, string Value, string Comment, MiniYamlNode.SourceLocation Location)>();

2
OpenRA.Game/Network/GameSave.cs
View File

@@ -238,7 +238,7 @@ namespace OpenRA.Network
// Send the trait data first to guarantee that it is available when needed // Send the trait data first to guarantee that it is available when needed
foreach (var kv in TraitData) foreach (var kv in TraitData)
{ {
var data = new List<MiniYamlNode>() { new MiniYamlNode(kv.Key.ToStringInvariant(), kv.Value) }.WriteToString(); var data = new List<MiniYamlNode>() { new(kv.Key.ToStringInvariant(), kv.Value) }.WriteToString();
packetFn(0, 0, Order.FromTargetString("SaveTraitData", data, true).Serialize()); packetFn(0, 0, Order.FromTargetString("SaveTraitData", data, true).Serialize());
} }

2
OpenRA.Game/Network/GameServer.cs
View File

@@ -233,7 +233,7 @@ namespace OpenRA.Network
public string ToPOSTData(bool lanGame) public string ToPOSTData(bool lanGame)
{ {
var root = new List<MiniYamlNode>() { new MiniYamlNode("Protocol", ProtocolVersion.ToStringInvariant()) }; var root = new List<MiniYamlNode>() { new("Protocol", ProtocolVersion.ToStringInvariant()) };
foreach (var field in SerializeFields) foreach (var field in SerializeFields)
root.Add(FieldSaver.SaveField(this, field)); root.Add(FieldSaver.SaveField(this, field));

6
OpenRA.Game/Network/Handshake.cs
View File

@@ -29,7 +29,7 @@ namespace OpenRA.Network
public string Serialize() public string Serialize()
{ {
var data = new List<MiniYamlNode> { new MiniYamlNode("Handshake", FieldSaver.Save(this)) }; var data = new List<MiniYamlNode> { new("Handshake", FieldSaver.Save(this)) };
return data.WriteToString(); return data.WriteToString();
} }
} }
@@ -79,9 +79,9 @@ namespace OpenRA.Network
{ {
var data = new List<MiniYamlNode> var data = new List<MiniYamlNode>
{ {
new MiniYamlNode("Handshake", null, new("Handshake", null,
new[] { "Mod", "Version", "Password", "Fingerprint", "AuthSignature", "OrdersProtocol" }.Select(p => FieldSaver.SaveField(this, p)).ToList()), new[] { "Mod", "Version", "Password", "Fingerprint", "AuthSignature", "OrdersProtocol" }.Select(p => FieldSaver.SaveField(this, p)).ToList()),
new MiniYamlNode("Client", FieldSaver.Save(Client)) new("Client", FieldSaver.Save(Client))
}; };
return data.WriteToString(); return data.WriteToString();

4
OpenRA.Game/Network/LocalizedMessage.cs
View File

@@ -91,8 +91,8 @@ namespace OpenRA.Network
{ {
var root = new List<MiniYamlNode> var root = new List<MiniYamlNode>
{ {
new MiniYamlNode("Protocol", ProtocolVersion.ToStringInvariant()), new("Protocol", ProtocolVersion.ToStringInvariant()),
new MiniYamlNode("Key", key) new("Key", key)
}; };
if (arguments != null) if (arguments != null)

2
OpenRA.Game/Network/Session.cs
View File

@@ -265,7 +265,7 @@ namespace OpenRA.Network
{ {
var sessionData = new List<MiniYamlNode>() var sessionData = new List<MiniYamlNode>()
{ {
new MiniYamlNode("DisabledSpawnPoints", FieldSaver.FormatValue(DisabledSpawnPoints)) new("DisabledSpawnPoints", FieldSaver.FormatValue(DisabledSpawnPoints))
}; };
foreach (var client in Clients) foreach (var client in Clients)

4
OpenRA.Game/Server/Server.cs
View File

@@ -1365,8 +1365,8 @@ namespace OpenRA.Server
{ {
startGameData = new List<MiniYamlNode>() startGameData = new List<MiniYamlNode>()
{ {
new MiniYamlNode("SaveLastOrdersFrame", GameSave.LastOrdersFrame.ToStringInvariant()), new("SaveLastOrdersFrame", GameSave.LastOrdersFrame.ToStringInvariant()),
new MiniYamlNode("SaveSyncFrame", GameSave.LastSyncFrame.ToStringInvariant()) new("SaveSyncFrame", GameSave.LastSyncFrame.ToStringInvariant())
}.WriteToString(); }.WriteToString();
} }
} }

2
OpenRA.Game/World.cs
View File

@@ -583,7 +583,7 @@ namespace OpenRA
var data = tp.Trait.IssueTraitData(tp.Actor); var data = tp.Trait.IssueTraitData(tp.Actor);
if (data != null) if (data != null)
{ {
var yaml = new List<MiniYamlNode>() { new MiniYamlNode(i.ToStringInvariant(), new MiniYaml("", data)) }; var yaml = new List<MiniYamlNode>() { new(i.ToStringInvariant(), new MiniYaml("", data)) };
IssueOrder(Order.FromTargetString("GameSaveTraitData", yaml.WriteToString(), true)); IssueOrder(Order.FromTargetString("GameSaveTraitData", yaml.WriteToString(), true));
} }

12
OpenRA.Mods.Cnc/Graphics/VoxelLoader.cs
View File

@@ -88,12 +88,12 @@ namespace OpenRA.Mods.Cnc.Graphics
var channelC = ChannelSelect[(int)t.Channel]; var channelC = ChannelSelect[(int)t.Channel];
return new ModelVertex[6] return new ModelVertex[6]
{ {
new ModelVertex(coord(0, 0), s.Left, s.Top, t.Left, t.Top, channelP, channelC), new(coord(0, 0), s.Left, s.Top, t.Left, t.Top, channelP, channelC),
new ModelVertex(coord(su, 0), s.Right, s.Top, t.Right, t.Top, channelP, channelC), new(coord(su, 0), s.Right, s.Top, t.Right, t.Top, channelP, channelC),
new ModelVertex(coord(su, sv), s.Right, s.Bottom, t.Right, t.Bottom, channelP, channelC), new(coord(su, sv), s.Right, s.Bottom, t.Right, t.Bottom, channelP, channelC),
new ModelVertex(coord(su, sv), s.Right, s.Bottom, t.Right, t.Bottom, channelP, channelC), new(coord(su, sv), s.Right, s.Bottom, t.Right, t.Bottom, channelP, channelC),
new ModelVertex(coord(0, sv), s.Left, s.Bottom, t.Left, t.Bottom, channelP, channelC), new(coord(0, sv), s.Left, s.Bottom, t.Left, t.Bottom, channelP, channelC),
new ModelVertex(coord(0, 0), s.Left, s.Top, t.Left, t.Top, channelP, channelC) new(coord(0, 0), s.Left, s.Top, t.Left, t.Top, channelP, channelC)
}; };
} }

8
OpenRA.Mods.Cnc/Util.cs
View File

@@ -30,10 +30,10 @@ namespace OpenRA.Mods.Cnc
// The actual facing associated with each sprite frame. // The actual facing associated with each sprite frame.
static readonly WAngle[] SpriteFacings = static readonly WAngle[] SpriteFacings =
{ {
WAngle.Zero, new WAngle(40), new WAngle(74), new WAngle(112), new WAngle(146), new WAngle(172), new WAngle(200), new WAngle(228), WAngle.Zero, new(40), new(74), new(112), new(146), new(172), new(200), new(228),
new WAngle(256), new WAngle(284), new WAngle(312), new WAngle(340), new WAngle(370), new WAngle(402), new WAngle(436), new WAngle(472), new(256), new(284), new(312), new(340), new(370), new(402), new(436), new(472),
new WAngle(512), new WAngle(552), new WAngle(588), new WAngle(626), new WAngle(658), new WAngle(684), new WAngle(712), new WAngle(740), new(512), new(552), new(588), new(626), new(658), new(684), new(712), new(740),
new WAngle(768), new WAngle(796), new WAngle(824), new WAngle(852), new WAngle(882), new WAngle(914), new WAngle(948), new WAngle(984) new(768), new(796), new(824), new(852), new(882), new(914), new(948), new(984)
}; };
/// <summary> /// <summary>

32
OpenRA.Mods.Common/HitShapes/Rectangle.cs
View File

@@ -73,34 +73,34 @@ namespace OpenRA.Mods.Common.HitShapes
combatOverlayVertsTop = new WVec[] combatOverlayVertsTop = new WVec[]
{ {
new WVec(TopLeft.X, TopLeft.Y, VerticalTopOffset), new(TopLeft.X, TopLeft.Y, VerticalTopOffset),
new WVec(BottomRight.X, TopLeft.Y, VerticalTopOffset), new(BottomRight.X, TopLeft.Y, VerticalTopOffset),
new WVec(BottomRight.X, BottomRight.Y, VerticalTopOffset), new(BottomRight.X, BottomRight.Y, VerticalTopOffset),
new WVec(TopLeft.X, BottomRight.Y, VerticalTopOffset), new(TopLeft.X, BottomRight.Y, VerticalTopOffset),
}; };
combatOverlayVertsBottom = new WVec[] combatOverlayVertsBottom = new WVec[]
{ {
new WVec(TopLeft.X, TopLeft.Y, VerticalBottomOffset), new(TopLeft.X, TopLeft.Y, VerticalBottomOffset),
new WVec(BottomRight.X, TopLeft.Y, VerticalBottomOffset), new(BottomRight.X, TopLeft.Y, VerticalBottomOffset),
new WVec(BottomRight.X, BottomRight.Y, VerticalBottomOffset), new(BottomRight.X, BottomRight.Y, VerticalBottomOffset),
new WVec(TopLeft.X, BottomRight.Y, VerticalBottomOffset), new(TopLeft.X, BottomRight.Y, VerticalBottomOffset),
}; };
combatOverlayVertsSide1 = new WVec[] combatOverlayVertsSide1 = new WVec[]
{ {
new WVec(TopLeft.X, TopLeft.Y, VerticalBottomOffset), new(TopLeft.X, TopLeft.Y, VerticalBottomOffset),
new WVec(TopLeft.X, TopLeft.Y, VerticalTopOffset), new(TopLeft.X, TopLeft.Y, VerticalTopOffset),
new WVec(TopLeft.X, BottomRight.Y, VerticalTopOffset), new(TopLeft.X, BottomRight.Y, VerticalTopOffset),
new WVec(TopLeft.X, BottomRight.Y, VerticalBottomOffset), new(TopLeft.X, BottomRight.Y, VerticalBottomOffset),
}; };
combatOverlayVertsSide2 = new WVec[] combatOverlayVertsSide2 = new WVec[]
{ {
new WVec(BottomRight.X, TopLeft.Y, VerticalBottomOffset), new(BottomRight.X, TopLeft.Y, VerticalBottomOffset),
new WVec(BottomRight.X, TopLeft.Y, VerticalTopOffset), new(BottomRight.X, TopLeft.Y, VerticalTopOffset),
new WVec(BottomRight.X, BottomRight.Y, VerticalTopOffset), new(BottomRight.X, BottomRight.Y, VerticalTopOffset),
new WVec(BottomRight.X, BottomRight.Y, VerticalBottomOffset), new(BottomRight.X, BottomRight.Y, VerticalBottomOffset),
}; };
} }

2
OpenRA.Mods.Common/Orders/PlaceBuildingOrderGenerator.cs
View File

@@ -107,7 +107,7 @@ namespace OpenRA.Mods.Common.Orders
var variants = new List<VariantWrapper>() var variants = new List<VariantWrapper>()
{ {
new VariantWrapper(worldRenderer, queue, world.Map.Rules.Actors[name]) new(worldRenderer, queue, world.Map.Rules.Actors[name])
}; };
foreach (var v in variants[0].ActorInfo.TraitInfos<PlaceBuildingVariantsInfo>()) foreach (var v in variants[0].ActorInfo.TraitInfos<PlaceBuildingVariantsInfo>())

4
OpenRA.Mods.Common/Projectiles/AreaBeam.cs
View File

@@ -25,7 +25,7 @@ namespace OpenRA.Mods.Common.Projectiles
public class AreaBeamInfo : IProjectileInfo public class AreaBeamInfo : IProjectileInfo
{ {
[Desc("Projectile speed in WDist / tick, two values indicate a randomly picked velocity per beam.")] [Desc("Projectile speed in WDist / tick, two values indicate a randomly picked velocity per beam.")]
public readonly WDist[] Speed = { new WDist(128) }; public readonly WDist[] Speed = { new(128) };
[Desc("The maximum duration (in ticks) of each beam burst.")] [Desc("The maximum duration (in ticks) of each beam burst.")]
public readonly int Duration = 10; public readonly int Duration = 10;
@@ -49,7 +49,7 @@ namespace OpenRA.Mods.Common.Projectiles
public readonly int[] Falloff = { 100, 100 }; public readonly int[] Falloff = { 100, 100 };
[Desc("Ranges at which each Falloff step is defined.")] [Desc("Ranges at which each Falloff step is defined.")]
public readonly WDist[] Range = { WDist.Zero, new WDist(int.MaxValue) }; public readonly WDist[] Range = { WDist.Zero, new(int.MaxValue) };
[Desc("The maximum/constant/incremental inaccuracy used in conjunction with the InaccuracyType property.")] [Desc("The maximum/constant/incremental inaccuracy used in conjunction with the InaccuracyType property.")]
public readonly WDist Inaccuracy = WDist.Zero; public readonly WDist Inaccuracy = WDist.Zero;

2
OpenRA.Mods.Common/Projectiles/Bullet.cs
View File

@@ -25,7 +25,7 @@ namespace OpenRA.Mods.Common.Projectiles
public class BulletInfo : IProjectileInfo public class BulletInfo : IProjectileInfo
{ {
[Desc("Projectile speed in WDist / tick, two values indicate variable velocity.")] [Desc("Projectile speed in WDist / tick, two values indicate variable velocity.")]
public readonly WDist[] Speed = { new WDist(17) }; public readonly WDist[] Speed = { new(17) };
[Desc("The maximum/constant/incremental inaccuracy used in conjunction with the InaccuracyType property.")] [Desc("The maximum/constant/incremental inaccuracy used in conjunction with the InaccuracyType property.")]
public readonly WDist Inaccuracy = WDist.Zero; public readonly WDist Inaccuracy = WDist.Zero;

4
OpenRA.Mods.Common/Traits/BotModules/BaseBuilderBotModule.cs
View File

@@ -320,8 +320,8 @@ namespace OpenRA.Mods.Common.Traits
return new List<MiniYamlNode>() return new List<MiniYamlNode>()
{ {
new MiniYamlNode("InitialBaseCenter", FieldSaver.FormatValue(initialBaseCenter)), new("InitialBaseCenter", FieldSaver.FormatValue(initialBaseCenter)),
new MiniYamlNode("DefenseCenter", FieldSaver.FormatValue(DefenseCenter)) new("DefenseCenter", FieldSaver.FormatValue(DefenseCenter))
}; };
} }

2
OpenRA.Mods.Common/Traits/BotModules/McvManagerBotModule.cs
View File

@@ -208,7 +208,7 @@ namespace OpenRA.Mods.Common.Traits
return new List<MiniYamlNode>() return new List<MiniYamlNode>()
{ {
new MiniYamlNode("InitialBaseCenter", FieldSaver.FormatValue(initialBaseCenter)) new("InitialBaseCenter", FieldSaver.FormatValue(initialBaseCenter))
}; };
} }

16
OpenRA.Mods.Common/Traits/BotModules/SquadManagerBotModule.cs
View File

@@ -508,20 +508,20 @@ namespace OpenRA.Mods.Common.Traits
return new List<MiniYamlNode>() return new List<MiniYamlNode>()
{ {
new MiniYamlNode("Squads", "", Squads.Select(s => new MiniYamlNode("Squad", s.Serialize())).ToList()), new("Squads", "", Squads.Select(s => new MiniYamlNode("Squad", s.Serialize())).ToList()),
new MiniYamlNode("InitialBaseCenter", FieldSaver.FormatValue(initialBaseCenter)), new("InitialBaseCenter", FieldSaver.FormatValue(initialBaseCenter)),
new MiniYamlNode("UnitsHangingAroundTheBase", FieldSaver.FormatValue(unitsHangingAroundTheBase new("UnitsHangingAroundTheBase", FieldSaver.FormatValue(unitsHangingAroundTheBase
.Where(a => !unitCannotBeOrdered(a)) .Where(a => !unitCannotBeOrdered(a))
.Select(a => a.ActorID) .Select(a => a.ActorID)
.ToArray())), .ToArray())),
new MiniYamlNode("ActiveUnits", FieldSaver.FormatValue(activeUnits new("ActiveUnits", FieldSaver.FormatValue(activeUnits
.Where(a => !unitCannotBeOrdered(a)) .Where(a => !unitCannotBeOrdered(a))
.Select(a => a.ActorID) .Select(a => a.ActorID)
.ToArray())), .ToArray())),
new MiniYamlNode("RushTicks", FieldSaver.FormatValue(rushTicks)), new("RushTicks", FieldSaver.FormatValue(rushTicks)),
new MiniYamlNode("AssignRolesTicks", FieldSaver.FormatValue(assignRolesTicks)), new("AssignRolesTicks", FieldSaver.FormatValue(assignRolesTicks)),
new MiniYamlNode("AttackForceTicks", FieldSaver.FormatValue(attackForceTicks)), new("AttackForceTicks", FieldSaver.FormatValue(attackForceTicks)),
new MiniYamlNode("MinAttackForceDelayTicks", FieldSaver.FormatValue(minAttackForceDelayTicks)), new("MinAttackForceDelayTicks", FieldSaver.FormatValue(minAttackForceDelayTicks)),
}; };
} }

4
OpenRA.Mods.Common/Traits/BotModules/Squads/Squad.cs
View File

@@ -137,8 +137,8 @@ namespace OpenRA.Mods.Common.Traits.BotModules.Squads
{ {
var nodes = new List<MiniYamlNode>() var nodes = new List<MiniYamlNode>()
{ {
new MiniYamlNode("Type", FieldSaver.FormatValue(Type)), new("Type", FieldSaver.FormatValue(Type)),
new MiniYamlNode("Units", FieldSaver.FormatValue(Units.Select(a => a.ActorID).ToArray())) new("Units", FieldSaver.FormatValue(Units.Select(a => a.ActorID).ToArray()))
}; };
if (Target != Target.Invalid) if (Target != Target.Invalid)

2
OpenRA.Mods.Common/Traits/BotModules/SupportPowerBotModule.cs
View File

@@ -219,7 +219,7 @@ namespace OpenRA.Mods.Common.Traits
return new List<MiniYamlNode>() return new List<MiniYamlNode>()
{ {
new MiniYamlNode("WaitingPowers", "", waitingPowersNodes) new("WaitingPowers", "", waitingPowersNodes)
}; };
} }

4
OpenRA.Mods.Common/Traits/BotModules/UnitBuilderBotModule.cs
View File

@@ -228,8 +228,8 @@ namespace OpenRA.Mods.Common.Traits
return new List<MiniYamlNode>() return new List<MiniYamlNode>()
{ {
new MiniYamlNode("QueuedBuildRequests", FieldSaver.FormatValue(queuedBuildRequests.ToArray())), new("QueuedBuildRequests", FieldSaver.FormatValue(queuedBuildRequests.ToArray())),
new MiniYamlNode("IdleUnitCount", FieldSaver.FormatValue(idleUnitCount)) new("IdleUnitCount", FieldSaver.FormatValue(idleUnitCount))
}; };
} }

2
OpenRA.Mods.Common/Traits/Player/GameSaveViewportManager.cs
View File

@@ -39,7 +39,7 @@ namespace OpenRA.Mods.Common.Traits
var nodes = new List<MiniYamlNode>() var nodes = new List<MiniYamlNode>()
{ {
new MiniYamlNode("Viewport", FieldSaver.FormatValue(worldRenderer.Viewport.CenterPosition)) new("Viewport", FieldSaver.FormatValue(worldRenderer.Viewport.CenterPosition))
}; };
var renderPlayer = worldRenderer.World.RenderPlayer; var renderPlayer = worldRenderer.World.RenderPlayer;

2
OpenRA.Mods.Common/Traits/World/ControlGroups.cs
View File

@@ -129,7 +129,7 @@ namespace OpenRA.Mods.Common.Traits
return new List<MiniYamlNode>() return new List<MiniYamlNode>()
{ {
new MiniYamlNode("Groups", new MiniYaml("", groups)) new("Groups", new MiniYaml("", groups))
}; };
} }

2
OpenRA.Mods.Common/Traits/World/Selection.cs
View File

@@ -181,7 +181,7 @@ namespace OpenRA.Mods.Common.Traits
{ {
return new List<MiniYamlNode>() return new List<MiniYamlNode>()
{ {
new MiniYamlNode("Selection", FieldSaver.FormatValue(Actors.Select(a => a.ActorID).ToArray())) new("Selection", FieldSaver.FormatValue(Actors.Select(a => a.ActorID).ToArray()))
}; };
} }

26
OpenRA.Mods.Common/UpdateRules/Rules/20230225/ExplicitSequenceFilenames.cs
View File

@@ -103,29 +103,29 @@ namespace OpenRA.Mods.Common.UpdateRules.Rules
fromBackup = true; fromBackup = true;
tilesetExtensionsNode = new List<MiniYamlNodeBuilder>() tilesetExtensionsNode = new List<MiniYamlNodeBuilder>()
{ {
new MiniYamlNodeBuilder("TEMPERAT", ".tem"), new("TEMPERAT", ".tem"),
new MiniYamlNodeBuilder("SNOW", ".sno"), new("SNOW", ".sno"),
new MiniYamlNodeBuilder("INTERIOR", ".int"), new("INTERIOR", ".int"),
new MiniYamlNodeBuilder("DESERT", ".des"), new("DESERT", ".des"),
new MiniYamlNodeBuilder("JUNGLE", ".jun"), new("JUNGLE", ".jun"),
}; };
break; break;
case "ra": case "ra":
fromBackup = true; fromBackup = true;
tilesetExtensionsNode = new List<MiniYamlNodeBuilder>() tilesetExtensionsNode = new List<MiniYamlNodeBuilder>()
{ {
new MiniYamlNodeBuilder("TEMPERAT", ".tem"), new("TEMPERAT", ".tem"),
new MiniYamlNodeBuilder("SNOW", ".sno"), new("SNOW", ".sno"),
new MiniYamlNodeBuilder("INTERIOR", ".int"), new("INTERIOR", ".int"),
new MiniYamlNodeBuilder("DESERT", ".des"), new("DESERT", ".des"),
}; };
break; break;
case "ts": case "ts":
fromBackup = true; fromBackup = true;
tilesetExtensionsNode = new List<MiniYamlNodeBuilder>() tilesetExtensionsNode = new List<MiniYamlNodeBuilder>()
{ {
new MiniYamlNodeBuilder("TEMPERATE", ".tem"), new("TEMPERATE", ".tem"),
new MiniYamlNodeBuilder("SNOW", ".sno"), new("SNOW", ".sno"),
}; };
break; break;
} }
@@ -148,8 +148,8 @@ namespace OpenRA.Mods.Common.UpdateRules.Rules
fromBackup = true; fromBackup = true;
tilesetCodesNode = new List<MiniYamlNodeBuilder>() tilesetCodesNode = new List<MiniYamlNodeBuilder>()
{ {
new MiniYamlNodeBuilder("TEMPERATE", "t"), new("TEMPERATE", "t"),
new MiniYamlNodeBuilder("SNOW", "a"), new("SNOW", "a"),
}; };
} }

6
OpenRA.Mods.Common/UpdateRules/UpdatePath.cs
View File

@@ -31,7 +31,7 @@ namespace OpenRA.Mods.Common.UpdateRules
// release-to-bleed path. // release-to-bleed path.
static readonly UpdatePath[] Paths = static readonly UpdatePath[] Paths =
{ {
new UpdatePath("release-20210321", "release-20230225", new UpdateRule[] new("release-20210321", "release-20230225", new UpdateRule[]
{ {
new RenameMPTraits(), new RenameMPTraits(),
new RemovePlayerHighlightPalette(), new RemovePlayerHighlightPalette(),
@@ -61,7 +61,7 @@ namespace OpenRA.Mods.Common.UpdateRules
new UnhardcodeBaseBuilderBotModule(), new UnhardcodeBaseBuilderBotModule(),
}), }),
new UpdatePath("release-20230225", "release-20231010", new UpdateRule[] new("release-20230225", "release-20231010", new UpdateRule[]
{ {
new TextNotificationsDisplayWidgetRemoveTime(), new TextNotificationsDisplayWidgetRemoveTime(),
new RenameEngineerRepair(), new RenameEngineerRepair(),
@@ -78,7 +78,7 @@ namespace OpenRA.Mods.Common.UpdateRules
new RemoveNegativeSequenceLength(), new RemoveNegativeSequenceLength(),
}), }),
new UpdatePath("release-20231010", new UpdateRule[] new("release-20231010", new UpdateRule[]
{ {
// bleed only changes here. // bleed only changes here.
new RemoveValidRelationsFromCapturable(), new RemoveValidRelationsFromCapturable(),

2
OpenRA.Mods.Common/Widgets/Logic/Ingame/ObserverStatsLogic.cs
View File

@@ -167,7 +167,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var statsDropDownOptions = new StatsDropDownOption[] var statsDropDownOptions = new StatsDropDownOption[]
{ {
new StatsDropDownOption new()
{ {
Title = TranslationProvider.GetString(InformationNone), Title = TranslationProvider.GetString(InformationNone),
IsSelected = () => activePanel == ObserverStatsPanel.None, IsSelected = () => activePanel == ObserverStatsPanel.None,

2
OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyLogic.cs
View File

@@ -280,7 +280,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
{ {
var botOptions = new List<DropDownOption>() var botOptions = new List<DropDownOption>()
{ {
new DropDownOption() new()
{ {
Title = TranslationProvider.GetString(Add), Title = TranslationProvider.GetString(Add),
IsSelected = () => false, IsSelected = () => false,

6
OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyUtils.cs
View File

@@ -63,8 +63,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic
{ {
TranslationProvider.GetString(Slot), new List<SlotDropDownOption> TranslationProvider.GetString(Slot), new List<SlotDropDownOption>
{ {
new SlotDropDownOption(open, "slot_open " + slot.PlayerReference, () => !slot.Closed && client == null), new(open, "slot_open " + slot.PlayerReference, () => !slot.Closed && client == null),
new SlotDropDownOption(closed, "slot_close " + slot.PlayerReference, () => slot.Closed) new(closed, "slot_close " + slot.PlayerReference, () => slot.Closed)
} }
} }
}; };
@@ -113,7 +113,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var options = new List<DropDownOption> var options = new List<DropDownOption>
{ {
new DropDownOption new()
{ {
Title = "Kick", Title = "Kick",
OnClick = onClick OnClick = onClick

2
OpenRA.Server/Program.cs
View File

@@ -89,7 +89,7 @@ namespace OpenRA.Server
// HACK: Related to the above one, initialize the translations so we can load maps with their (translated) lobby options. // HACK: Related to the above one, initialize the translations so we can load maps with their (translated) lobby options.
TranslationProvider.Initialize(modData, modData.DefaultFileSystem); TranslationProvider.Initialize(modData, modData.DefaultFileSystem);
var endpoints = new List<IPEndPoint> { new IPEndPoint(IPAddress.IPv6Any, settings.ListenPort), new IPEndPoint(IPAddress.Any, settings.ListenPort) }; var endpoints = new List<IPEndPoint> { new(IPAddress.IPv6Any, settings.ListenPort), new(IPAddress.Any, settings.ListenPort) };
var server = new Server(endpoints, settings, modData, ServerType.Dedicated); var server = new Server(endpoints, settings, modData, ServerType.Dedicated);
GC.Collect(); GC.Collect();

8
OpenRA.Test/OpenRA.Mods.Common/ShapeTest.cs
View File

@@ -98,7 +98,7 @@ namespace OpenRA.Test
{ {
// Rectangle like above, // Rectangle like above,
// Note: The calculations don't match for all, but do have a tolerance of 1. // Note: The calculations don't match for all, but do have a tolerance of 1.
shape = new PolygonShape(new int2[] { new int2(-123, -456), new int2(100, -456), new int2(100, 100), new int2(-123, 100) }); shape = new PolygonShape(new int2[] { new(-123, -456), new(100, -456), new(100, 100), new(-123, 100) });
shape.Initialize(); shape.Initialize();
Assert.That(shape.DistanceFromEdge(new WVec(10, 10, 0)).Length, Assert.That(shape.DistanceFromEdge(new WVec(10, 10, 0)).Length,
@@ -121,7 +121,7 @@ namespace OpenRA.Test
// Rectangle like above but reverse order // Rectangle like above but reverse order
// Note: The calculations don't match for all, but do have a tolerance of 1. // Note: The calculations don't match for all, but do have a tolerance of 1.
shape = new PolygonShape(new int2[] { new int2(-123, 100), new int2(100, 100), new int2(100, -456), new int2(-123, -456) }); shape = new PolygonShape(new int2[] { new(-123, 100), new(100, 100), new(100, -456), new(-123, -456) });
shape.Initialize(); shape.Initialize();
Assert.That(shape.DistanceFromEdge(new WVec(10, 10, 0)).Length, Assert.That(shape.DistanceFromEdge(new WVec(10, 10, 0)).Length,
@@ -143,7 +143,7 @@ namespace OpenRA.Test
Is.EqualTo(877)); Is.EqualTo(877));
// Right triangle taken from above by removing a point // Right triangle taken from above by removing a point
shape = new PolygonShape(new int2[] { new int2(-123, -456), new int2(100, -456), new int2(100, 100) }); shape = new PolygonShape(new int2[] { new(-123, -456), new(100, -456), new(100, 100) });
shape.Initialize(); shape.Initialize();
Assert.That(shape.DistanceFromEdge(new WVec(10, 10, 0)).Length, Assert.That(shape.DistanceFromEdge(new WVec(10, 10, 0)).Length,
@@ -171,7 +171,7 @@ namespace OpenRA.Test
Is.EqualTo(878)); Is.EqualTo(878));
// Right triangle taken from above but reverse order // Right triangle taken from above but reverse order
shape = new PolygonShape(new int2[] { new int2(100, 100), new int2(100, -456), new int2(-123, -456) }); shape = new PolygonShape(new int2[] { new(100, 100), new(100, -456), new(-123, -456) });
shape.Initialize(); shape.Initialize();
Assert.That(shape.DistanceFromEdge(new WVec(10, 10, 0)).Length, Assert.That(shape.DistanceFromEdge(new WVec(10, 10, 0)).Length,