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

Fix IDE0042

Browse Source
This commit is contained in:
RoosterDragon
2023-02-19 12:17:36 +00:00
committed by Gustas
parent 5b70d344cc
commit 555aac3f64
12 changed files with 43 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
OpenRA.Mods.Common/UtilityCommands/ExtractEmmyLuaAPI.cs
View File

@@ -226,15 +226,15 @@ namespace OpenRA.Mods.Common.UtilityCommands
return ScriptMemberWrapper.WrappableMembers(t).Select(memberInfo => (memberInfo, required));
});
foreach (var property in properties)
foreach (var (memberInfo, required) in properties)
{
Console.WriteLine();
var isActivity = property.memberInfo.HasAttribute<ScriptActorPropertyActivityAttribute>();
var isActivity = memberInfo.HasAttribute<ScriptActorPropertyActivityAttribute>();
if (property.memberInfo.HasAttribute<DescAttribute>())
if (memberInfo.HasAttribute<DescAttribute>())
{
var lines = property.memberInfo.GetCustomAttributes<DescAttribute>(true).First().Lines;
var lines = memberInfo.GetCustomAttributes<DescAttribute>(true).First().Lines;
foreach (var line in lines)
Console.WriteLine($" --- {line}");
}
@@ -242,10 +242,10 @@ namespace OpenRA.Mods.Common.UtilityCommands
if (isActivity)
Console.WriteLine(" --- *Queued Activity*");
if (property.required.Any())
Console.WriteLine($" --- **Requires {(property.required.Length == 1 ? "Trait" : "Traits")}:** {property.required.Select(GetDocumentationUrl).JoinWith(", ")}");
if (required.Any())
Console.WriteLine($" --- **Requires {(required.Length == 1 ? "Trait" : "Traits")}:** {required.Select(GetDocumentationUrl).JoinWith(", ")}");
if (property.memberInfo is MethodInfo methodInfo)
if (memberInfo is MethodInfo methodInfo)
{
var attributes = methodInfo.GetCustomAttributes(false);
foreach (var obsolete in attributes.OfType<ObsoleteAttribute>())
@@ -264,7 +264,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
Console.WriteLine($" {methodInfo.Name} = function({parameterString}) end;");
}
if (property.memberInfo is PropertyInfo propertyInfo)
if (memberInfo is PropertyInfo propertyInfo)
{
Console.WriteLine($" ---@type {propertyInfo.PropertyType.EmmyLuaString()}");
Console.WriteLine(" " + propertyInfo.Name + " = { };");

10
OpenRA.Mods.Common/UtilityCommands/ImportLegacyMapCommand.cs
View File

@@ -255,13 +255,13 @@ namespace OpenRA.Mods.Common.UtilityCommands
Location: LocationFromMapOffset(Exts.ParseIntegerInvariant(kv.Value), MapSize)));
// Add waypoint actors skipping duplicate entries
foreach (var kv in wps.DistinctBy(location => location.Location))
foreach (var (waypointNumber, location) in wps.DistinctBy(location => location.Location))
{
if (!singlePlayer && kv.WaypointNumber <= 7)
if (!singlePlayer && waypointNumber <= 7)
{
var ar = new ActorReference("mpspawn")
{
new LocationInit((CPos)kv.Location),
new LocationInit((CPos)location),
new OwnerInit("Neutral")
};
@@ -272,11 +272,11 @@ namespace OpenRA.Mods.Common.UtilityCommands
{
var ar = new ActorReference("waypoint")
{
new LocationInit((CPos)kv.Location),
new LocationInit((CPos)location),
new OwnerInit("Neutral")
};
SaveWaypoint(kv.WaypointNumber, ar);
SaveWaypoint(waypointNumber, ar);
}
}
}