Fix IDE0004

This commit is contained in:
RoosterDragon
2023-02-19 09:55:33 +00:00
committed by Gustas
parent a4f9ceaf09
commit 71ce515d6d
12 changed files with 16 additions and 13 deletions

View File

@@ -37,8 +37,8 @@ namespace OpenRA.Mods.Common.Activities
var sellValue = self.GetSellValue();
// Cast to long to avoid overflow when multiplying by the health
var hp = health != null ? (long)health.HP : 1L;
var maxHP = health != null ? (long)health.MaxHP : 1L;
var hp = health != null ? health.HP : 1L;
var maxHP = health != null ? health.MaxHP : 1L;
var refund = (int)(sellValue * sellableInfo.RefundPercent * hp / (100 * maxHP));
refund = playerResources.ChangeCash(refund);

View File

@@ -181,7 +181,7 @@ namespace OpenRA.Mods.Common.Traits.BotModules.Squads
return !double.IsNaN(attackChance) && attackChance < 30.0;
}
static float NormalizedHealth(IEnumerable<Actor> actors, float normalizeByValue)
static float NormalizedHealth(IEnumerable<Actor> actors, int normalizeByValue)
{
var sumOfMaxHp = 0;
var sumOfHp = 0;

View File

@@ -109,8 +109,8 @@ namespace OpenRA.Mods.Common.Traits
var sellValue = self.GetSellValue();
// Cast to long to avoid overflow when multiplying by the health
var hp = health != null ? (long)health.Value.HP : 1L;
var maxHP = health != null ? (long)health.Value.MaxHP : 1L;
var hp = health != null ? health.Value.HP : 1L;
var maxHP = health != null ? health.Value.MaxHP : 1L;
var refund = (int)(sellValue * info.RefundPercent * hp / (100 * maxHP));
return "Refund: $" + refund;

View File

@@ -253,7 +253,7 @@ namespace OpenRA.Mods.Common.Traits
var content = resources[cell];
var oldDensity = content.Type == resourceInfo.ResourceIndex ? content.Index : 0;
var density = (byte)Math.Min(resourceInfo.MaxDensity, oldDensity + amount);
Map.Resources[cell] = new ResourceTile((byte)resourceInfo.ResourceIndex, density);
Map.Resources[cell] = new ResourceTile(resourceInfo.ResourceIndex, density);
return density - oldDensity;
}

View File

@@ -126,7 +126,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
{
if (dropdownColumns.Count == 0)
{
row = dropdownRowTemplate.Clone() as Widget;
row = dropdownRowTemplate.Clone();
row.Bounds.Y = optionsContainer.Bounds.Height;
optionsContainer.Bounds.Height += row.Bounds.Height;
foreach (var child in row.Children)

View File

@@ -253,7 +253,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
.ToList();
// 'all game types' extra item
categories.Insert(0, (null as string, tabMaps[tab].Length));
categories.Insert(0, (null, tabMaps[tab].Length));
string ShowItem((string Category, int Count) x) => (x.Category ?? allMaps) + $" ({x.Count})";

View File

@@ -45,7 +45,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
throw new InvalidOperationException($"{group.GetType().Name} does not contain a preference type {pref}");
var ss = parent.Get<SliderWidget>(id);
ss.Value = (float)(int)field.GetValue(group);
ss.Value = (int)field.GetValue(group);
ss.OnChange += x => field.SetValue(group, (int)x);
}