Remove redundant jumps and other style nits from the update rules
This commit is contained in:
@@ -53,8 +53,6 @@ namespace OpenRA.Mods.Common.UpdateRules.Rules
|
|||||||
|
|
||||||
nonVTOLs.Add(Tuple.Create(actorNode.Key, actorNode.Location.Filename));
|
nonVTOLs.Add(Tuple.Create(actorNode.Key, actorNode.Location.Filename));
|
||||||
}
|
}
|
||||||
|
|
||||||
yield break;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,12 +26,9 @@ namespace OpenRA.Mods.Common.UpdateRules.Rules
|
|||||||
foreach (var dltt in actorNode.ChildrenMatching("DrawLineToTarget", includeRemovals: false))
|
foreach (var dltt in actorNode.ChildrenMatching("DrawLineToTarget", includeRemovals: false))
|
||||||
{
|
{
|
||||||
var delayNode = dltt.LastChildMatching("Delay", false);
|
var delayNode = dltt.LastChildMatching("Delay", false);
|
||||||
if (delayNode != null)
|
if (delayNode != null && Exts.TryParseIntegerInvariant(delayNode.Value.Value, out var delay))
|
||||||
{
|
|
||||||
if (Exts.TryParseIntegerInvariant(delayNode.Value.Value, out var delay))
|
|
||||||
delayNode.ReplaceValue((delay * 1000 / 25).ToString());
|
delayNode.ReplaceValue((delay * 1000 / 25).ToString());
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
yield break;
|
yield break;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -50,8 +50,6 @@ namespace OpenRA.Mods.Common.UpdateRules.Rules
|
|||||||
|
|
||||||
turningAircraft.Add(Tuple.Create(actorNode.Key, actorNode.Location.Filename));
|
turningAircraft.Add(Tuple.Create(actorNode.Key, actorNode.Location.Filename));
|
||||||
}
|
}
|
||||||
|
|
||||||
yield break;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,8 +28,6 @@ namespace OpenRA.Mods.Common.UpdateRules.Rules
|
|||||||
if (damaged.RemoveNodes("StartOnThreshold") > 0)
|
if (damaged.RemoveNodes("StartOnThreshold") > 0)
|
||||||
yield return $"'StartOnThreshold' was removed from {actorNode.Key} ({actorNode.Location.Filename}) without replacement.\n";
|
yield return $"'StartOnThreshold' was removed from {actorNode.Key} ({actorNode.Location.Filename}) without replacement.\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
yield break;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -35,9 +35,7 @@ namespace OpenRA.Mods.Common.UpdateRules.Rules
|
|||||||
}
|
}
|
||||||
|
|
||||||
foreach (var scNode in actorNode.ChildrenMatching("ScaredyCat"))
|
foreach (var scNode in actorNode.ChildrenMatching("ScaredyCat"))
|
||||||
{
|
|
||||||
scNode.RenameChildrenMatching("PanicLength", "PanicDuration");
|
scNode.RenameChildrenMatching("PanicLength", "PanicDuration");
|
||||||
}
|
|
||||||
|
|
||||||
yield break;
|
yield break;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -315,8 +315,6 @@ namespace OpenRA.Mods.Common.UpdateRules.Rules
|
|||||||
foreach (var sequenceNode in imageNode.Value.Nodes.ToList())
|
foreach (var sequenceNode in imageNode.Value.Nodes.ToList())
|
||||||
if (implicitInheritedSequences.Contains(sequenceNode.Key) && !sequenceNode.Value.Nodes.Any())
|
if (implicitInheritedSequences.Contains(sequenceNode.Key) && !sequenceNode.Value.Nodes.Any())
|
||||||
imageNode.RemoveNode(sequenceNode);
|
imageNode.RemoveNode(sequenceNode);
|
||||||
|
|
||||||
yield break;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void ProcessNode(ModData modData, MiniYamlNode sequenceNode, MiniYamlNode resolvedSequenceNode, string imageName)
|
void ProcessNode(ModData modData, MiniYamlNode sequenceNode, MiniYamlNode resolvedSequenceNode, string imageName)
|
||||||
|
|||||||
@@ -33,11 +33,7 @@ namespace OpenRA.Mods.Common.UpdateRules.Rules
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (buttonCollection != null)
|
if (buttonCollection != null)
|
||||||
{
|
|
||||||
chromeNode.AddNode(new MiniYamlNode("ArrowButton", buttonCollection));
|
chromeNode.AddNode(new MiniYamlNode("ArrowButton", buttonCollection));
|
||||||
}
|
}
|
||||||
|
|
||||||
yield break;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -32,8 +32,6 @@ namespace OpenRA.Mods.Common.UpdateRules.Rules
|
|||||||
var durationMilliseconds = field.NodeValue<int>() * 40;
|
var durationMilliseconds = field.NodeValue<int>() * 40;
|
||||||
field.ReplaceValue(FieldSaver.FormatValue(durationMilliseconds));
|
field.ReplaceValue(FieldSaver.FormatValue(durationMilliseconds));
|
||||||
}
|
}
|
||||||
|
|
||||||
yield break;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user