Fix IDE0042

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

View File

@@ -161,9 +161,7 @@ namespace OpenRA.Mods.Common.Traits
else if (baseBuilder.Info.RefineryTypes.Contains(actorInfo.Name))
type = BuildingType.Refinery;
var pack = ChooseBuildLocation(currentBuilding.Item, true, type);
location = pack.Location;
actorVariant = pack.Variant;
(location, actorVariant) = ChooseBuildLocation(currentBuilding.Item, true, type);
}
if (location == null)

View File

@@ -155,15 +155,15 @@ namespace OpenRA.Mods.Common.Traits
var totalShares = shares.Sum(a => a.Shares);
var n = self.World.SharedRandom.Next(totalShares);
foreach (var s in shares)
foreach (var (action, share) in shares)
{
if (n < s.Shares)
if (n < share)
{
s.Action.Activate(crusher);
action.Activate(crusher);
return;
}
n -= s.Shares;
n -= share;
}
}
}

View File

@@ -90,8 +90,8 @@ namespace OpenRA.Mods.Common.Traits
if (rtl.TryGetTerrainColorPair(uv, out var c))
return (c.Left.ToArgb(), c.Right.ToArgb());
var tc = map.GetTerrainColorPair(uv);
return (tc.Left.ToArgb(), tc.Right.ToArgb());
var (left, right) = map.GetTerrainColorPair(uv);
return (left.ToArgb(), right.ToArgb());
}
}
}