diff --git a/Yafc.Model/Model/ProductionTableContent.cs b/Yafc.Model/Model/ProductionTableContent.cs index f7c026e8..65e7fd94 100644 --- a/Yafc.Model/Model/ProductionTableContent.cs +++ b/Yafc.Model/Model/ProductionTableContent.cs @@ -139,7 +139,7 @@ internal void GetModulesInfo(RecipeRow row, EntityCrafter entity, ref ModuleEffe } if (beacon != null) { - int beaconCount = CalcBeaconCount(); + int beaconCount = CalculateBeaconCount(); if (beaconCount > 0) { float beaconEfficiency = beacon.GetBeaconEfficiency() * beacon.target.GetProfile(beaconCount); foreach (var module in beaconList) { @@ -159,9 +159,9 @@ internal void GetModulesInfo(RecipeRow row, EntityCrafter entity, ref ModuleEffe used.modules = [.. buffer]; } - public int CalcBeaconCount() { + public int CalculateBeaconCount() { if (beacon is null) { - throw new InvalidOperationException($"Must not call {nameof(CalcBeaconCount)} when {nameof(beacon)} is null."); + throw new InvalidOperationException($"Must not call {nameof(CalculateBeaconCount)} when {nameof(beacon)} is null."); } int moduleCount = 0; diff --git a/Yafc.Parser/Data/FactorioDataDeserializer_Entity.cs b/Yafc.Parser/Data/FactorioDataDeserializer_Entity.cs index 93cdd751..9bb363e9 100644 --- a/Yafc.Parser/Data/FactorioDataDeserializer_Entity.cs +++ b/Yafc.Parser/Data/FactorioDataDeserializer_Entity.cs @@ -605,8 +605,8 @@ void parseEffect(LuaTable effect) { else if (generation.Get("coverage", out float coverage)) { float richBase = generation.Get("richness_base", 0f); float richMultiplier = generation.Get("richness_multiplier", 0f); - float richMultiplierDist = generation.Get("richness_multiplier_distance_bonus", 0f); - float estimatedAmount = coverage * (richBase + richMultiplier + (richMultiplierDist * EstimationDistanceFromCenter)); + float richMultiplierDistance = generation.Get("richness_multiplier_distance_bonus", 0f); + float estimatedAmount = coverage * (richBase + richMultiplier + (richMultiplierDistance * EstimationDistanceFromCenter)); entity.mapGenDensity = estimatedAmount; } if (generation.Get("control", out string? control)) { diff --git a/Yafc.Parser/LuaContext.cs b/Yafc.Parser/LuaContext.cs index f6491150..a662e8ca 100644 --- a/Yafc.Parser/LuaContext.cs +++ b/Yafc.Parser/LuaContext.cs @@ -408,7 +408,7 @@ private int Require(IntPtr lua) { } file = file.Replace('\\', '/'); - string origFile = file; + string originalFile = file; file = file.Replace('.', '/'); string fileExt = file + ".lua"; Pop(1); @@ -430,7 +430,7 @@ private int Require(IntPtr lua) { (string mod, string path) requiredFile = (mod, fileExt); if (file.StartsWith("__")) { - requiredFile = FactorioDataSource.ResolveModPath(mod, origFile, true); + requiredFile = FactorioDataSource.ResolveModPath(mod, originalFile, true); } else if (mod == "*") { byte[] localFile = File.ReadAllBytes("Data/" + fileExt); diff --git a/Yafc.UI/Rendering/RenderingUtils.cs b/Yafc.UI/Rendering/RenderingUtils.cs index 6ce099e9..852f8f66 100644 --- a/Yafc.UI/Rendering/RenderingUtils.cs +++ b/Yafc.UI/Rendering/RenderingUtils.cs @@ -94,8 +94,8 @@ static unsafe RenderingUtils() { for (int y = 0; y < 32; y++) { float dx = (center - x) / center; float dy = (center - y) / center; - float dist = MathF.Sqrt((dx * dx) + (dy * dy)); - *pixels++ = 0xFFFFFF00 | (dist >= 1f ? 0 : (uint)MathUtils.Round(38 * (1f - dist))); + float distance = MathF.Sqrt((dx * dx) + (dy * dy)); + *pixels++ = 0xFFFFFF00 | (distance >= 1f ? 0 : (uint)MathUtils.Round(38 * (1f - distance))); } } diff --git a/Yafc/Workspace/ProductionTable/ProductionTableView.cs b/Yafc/Workspace/ProductionTable/ProductionTableView.cs index 2600629f..95de51c7 100644 --- a/Yafc/Workspace/ProductionTable/ProductionTableView.cs +++ b/Yafc/Workspace/ProductionTable/ProductionTableView.cs @@ -736,7 +736,7 @@ private void ShowModuleTemplateTooltip(ImGui gui, ModuleTemplate template) => gu if (template.beacon != null) { grid.Next(); - _ = imGui.BuildFactorioObjectWithAmount(template.beacon, template.CalcBeaconCount(), ButtonDisplayStyle.ProductionTableUnscaled); + _ = imGui.BuildFactorioObjectWithAmount(template.beacon, template.CalculateBeaconCount(), ButtonDisplayStyle.ProductionTableUnscaled); foreach (var module in template.beaconList) { grid.Next(); _ = imGui.BuildFactorioObjectWithAmount(module.module, module.fixedCount, ButtonDisplayStyle.ProductionTableUnscaled); diff --git a/exclusion.dic b/exclusion.dic index fb6645cc..4c76b8ac 100644 --- a/exclusion.dic +++ b/exclusion.dic @@ -1,9 +1,14 @@ +autoplace +Awaitable +Awaiter +blit Deserialize deserialized Deserializer Deserializing dylib Factorio +Factorio's Floodfill foreach Fulgoran @@ -11,13 +16,17 @@ imgui Kovarex liblua localised +modded naive Nauvis +placeable renderable Serializer shaders +shpaass spawner spawners unbarreling +Unlockers Utils Yafc