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

Fix IDE0039

Browse Source
This commit is contained in:
RoosterDragon
2023-02-19 11:56:54 +00:00
committed by abcdefg30
parent 4b3f7034b2
commit d4135d608e
67 changed files with 498 additions and 505 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
OpenRA.Mods.Common/Scripting/Global/TriggerGlobal.cs
View File

@@ -36,7 +36,7 @@ namespace OpenRA.Mods.Common.Scripting
public void AfterDelay(int delay, LuaFunction func)
{
var f = (LuaFunction)func.CopyReference();
Action doCall = () =>
void DoCall()
{
try
{
@@ -47,9 +47,9 @@ namespace OpenRA.Mods.Common.Scripting
{
Context.FatalError(e.Message);
}
};
}
Context.World.AddFrameEndTask(w => w.Add(new DelayedAction(delay, doCall)));
Context.World.AddFrameEndTask(w => w.Add(new DelayedAction(delay, DoCall)));
}
[Desc("Call a function for each passenger when it enters a transport. " +
@@ -93,7 +93,7 @@ namespace OpenRA.Mods.Common.Scripting
{
var group = actors.ToList();
var f = (LuaFunction)func.CopyReference();
Action<Actor> onMemberKilled = m =>
void OnMemberKilled(Actor m)
{
try
{
@@ -106,10 +106,10 @@ namespace OpenRA.Mods.Common.Scripting
{
Context.FatalError(e.Message);
}
};
}
foreach (var a in group)
GetScriptTriggers(a).OnKilledInternal += onMemberKilled;
GetScriptTriggers(a).OnKilledInternal += OnMemberKilled;
}
[Desc("Call a function when one of the actors in a group is killed. The callback " +
@@ -118,7 +118,7 @@ namespace OpenRA.Mods.Common.Scripting
{
var called = false;
var f = (LuaFunction)func.CopyReference();
Action<Actor> onMemberKilled = m =>
void OnMemberKilled(Actor m)
{
try
{
@@ -135,10 +135,10 @@ namespace OpenRA.Mods.Common.Scripting
{
Context.FatalError(e.Message);
}
};
}
foreach (var a in actors)
GetScriptTriggers(a).OnKilledInternal += onMemberKilled;
GetScriptTriggers(a).OnKilledInternal += OnMemberKilled;
}
[Desc("Call a function when this actor produces another actor. " +
@@ -211,7 +211,7 @@ namespace OpenRA.Mods.Common.Scripting
var group = actors.ToList();
var f = (LuaFunction)func.CopyReference();
Action<Actor> onMemberRemoved = m =>
void OnMemberRemoved(Actor m)
{
try
{
@@ -230,9 +230,9 @@ namespace OpenRA.Mods.Common.Scripting
{
Context.FatalError(e.Message);
}
};
}
Action<Actor> onMemberAdded = m =>
void OnMemberAdded(Actor m)
{
try
{
@@ -245,12 +245,12 @@ namespace OpenRA.Mods.Common.Scripting
{
Context.FatalError(e.Message);
}
};
}
foreach (var a in group)
{
GetScriptTriggers(a).OnRemovedInternal += onMemberRemoved;
GetScriptTriggers(a).OnAddedInternal += onMemberAdded;
GetScriptTriggers(a).OnRemovedInternal += OnMemberRemoved;
GetScriptTriggers(a).OnAddedInternal += OnMemberAdded;
}
}
@@ -268,7 +268,7 @@ namespace OpenRA.Mods.Common.Scripting
var called = false;
var f = (LuaFunction)func.CopyReference();
Action<Actor> onKilledOrCaptured = m =>
void OnKilledOrCaptured(Actor m)
{
try
{
@@ -284,10 +284,10 @@ namespace OpenRA.Mods.Common.Scripting
{
Context.FatalError(e.Message);
}
};
}
GetScriptTriggers(a).OnCapturedInternal += onKilledOrCaptured;
GetScriptTriggers(a).OnKilledInternal += onKilledOrCaptured;
GetScriptTriggers(a).OnCapturedInternal += OnKilledOrCaptured;
GetScriptTriggers(a).OnKilledInternal += OnKilledOrCaptured;
}
[Desc("Call a function when all of the actors in a group have been killed or captured. " +
@@ -297,7 +297,7 @@ namespace OpenRA.Mods.Common.Scripting
var group = actors.ToList();
var f = (LuaFunction)func.CopyReference();
Action<Actor> onMemberKilledOrCaptured = m =>
void OnMemberKilledOrCaptured(Actor m)
{
try
{
@@ -312,12 +312,12 @@ namespace OpenRA.Mods.Common.Scripting
{
Context.FatalError(e.Message);
}
};
}
foreach (var a in group)
{
GetScriptTriggers(a).OnCapturedInternal += onMemberKilledOrCaptured;
GetScriptTriggers(a).OnKilledInternal += onMemberKilledOrCaptured;
GetScriptTriggers(a).OnCapturedInternal += OnMemberKilledOrCaptured;
GetScriptTriggers(a).OnKilledInternal += OnMemberKilledOrCaptured;
}
}
@@ -329,7 +329,7 @@ namespace OpenRA.Mods.Common.Scripting
// We can't easily dispose onEntry, so we'll have to rely on finalization for it.
var onEntry = (LuaFunction)func.CopyReference();
var triggerId = 0;
Action<Actor> invokeEntry = a =>
void InvokeEntry(Actor a)
{
try
{
@@ -341,9 +341,9 @@ namespace OpenRA.Mods.Common.Scripting
{
Context.FatalError(e.Message);
}
};
}
triggerId = Context.World.ActorMap.AddCellTrigger(cells, invokeEntry, null);
triggerId = Context.World.ActorMap.AddCellTrigger(cells, InvokeEntry, null);
return triggerId;
}
@@ -356,7 +356,7 @@ namespace OpenRA.Mods.Common.Scripting
// We can't easily dispose onExit, so we'll have to rely on finalization for it.
var onExit = (LuaFunction)func.CopyReference();
var triggerId = 0;
Action<Actor> invokeExit = a =>
void InvokeExit(Actor a)
{
try
{
@@ -368,9 +368,9 @@ namespace OpenRA.Mods.Common.Scripting
{
Context.FatalError(e.Message);
}
};
}
triggerId = Context.World.ActorMap.AddCellTrigger(cells, null, invokeExit);
triggerId = Context.World.ActorMap.AddCellTrigger(cells, null, InvokeExit);
return triggerId;
}
@@ -389,7 +389,7 @@ namespace OpenRA.Mods.Common.Scripting
// We can't easily dispose onEntry, so we'll have to rely on finalization for it.
var onEntry = (LuaFunction)func.CopyReference();
var triggerId = 0;
Action<Actor> invokeEntry = a =>
void InvokeEntry(Actor a)
{
try
{
@@ -401,9 +401,9 @@ namespace OpenRA.Mods.Common.Scripting
{
Context.FatalError(e.Message);
}
};
}
triggerId = Context.World.ActorMap.AddProximityTrigger(pos, range, WDist.Zero, invokeEntry, null);
triggerId = Context.World.ActorMap.AddProximityTrigger(pos, range, WDist.Zero, InvokeEntry, null);
return triggerId;
}
@@ -416,7 +416,7 @@ namespace OpenRA.Mods.Common.Scripting
// We can't easily dispose onExit, so we'll have to rely on finalization for it.
var onExit = (LuaFunction)func.CopyReference();
var triggerId = 0;
Action<Actor> invokeExit = a =>
void InvokeExit(Actor a)
{
try
{
@@ -428,9 +428,9 @@ namespace OpenRA.Mods.Common.Scripting
{
Context.FatalError(e.Message);
}
};
}
triggerId = Context.World.ActorMap.AddProximityTrigger(pos, range, WDist.Zero, null, invokeExit);
triggerId = Context.World.ActorMap.AddProximityTrigger(pos, range, WDist.Zero, null, InvokeExit);
return triggerId;
}

12
OpenRA.Mods.Common/Scripting/Properties/ProductionProperties.cs
View File

@@ -218,7 +218,7 @@ namespace OpenRA.Mods.Common.Scripting
foreach (var q in player.PlayerActor.TraitsImplementing<ClassicProductionQueue>().Where(q => q.Enabled))
queues.Add(q.Info.Type, q);
Action<Actor, Actor> globalProductionHandler = (factory, unit) =>
void GlobalProductionHandler(Actor factory, Actor unit)
{
if (factory.Owner != player)
return;
@@ -227,10 +227,10 @@ namespace OpenRA.Mods.Common.Scripting
if (productionHandlers.ContainsKey(queue))
productionHandlers[queue](factory, unit);
};
}
var triggers = TriggerGlobal.GetScriptTriggers(player.PlayerActor);
triggers.OnOtherProducedInternal += globalProductionHandler;
triggers.OnOtherProducedInternal += GlobalProductionHandler;
}
[Desc("Build the specified set of actors using classic (RA-style) production queues. " +
@@ -259,7 +259,7 @@ namespace OpenRA.Mods.Common.Scripting
var squad = new List<Actor>();
var func = actionFunc.CopyReference() as LuaFunction;
Action<Actor, Actor> productionHandler = (factory, unit) =>
void ProductionHandler(Actor factory, Actor unit)
{
squad.Add(unit);
if (squad.Count >= squadSize)
@@ -271,10 +271,10 @@ namespace OpenRA.Mods.Common.Scripting
foreach (var q in queueTypes)
productionHandlers.Remove(q);
}
};
}
foreach (var q in queueTypes)
productionHandlers.Add(q, productionHandler);
productionHandlers.Add(q, ProductionHandler);
}
foreach (var actorType in actorTypes)