From 9ce09c8b1b5592c596eb72f0432eae78c59ddf1c Mon Sep 17 00:00:00 2001 From: Kurt Date: Sun, 30 Aug 2020 16:16:22 -0700 Subject: [PATCH] Minor clean --- .../Legality/Encounters/Data/EncounterUtil.cs | 19 +------------------ .../Legality/Encounters/Data/Encounters6.cs | 1 - .../Legality/Encounters/Data/Encounters7b.cs | 1 - .../EncounterStatic/EncounterStatic7.cs | 1 - PKHeX.Core/Legality/Structures/IGeneration.cs | 7 ------- 5 files changed, 1 insertion(+), 28 deletions(-) delete mode 100644 PKHeX.Core/Legality/Structures/IGeneration.cs diff --git a/PKHeX.Core/Legality/Encounters/Data/EncounterUtil.cs b/PKHeX.Core/Legality/Encounters/Data/EncounterUtil.cs index 140fc94f7..d5b978d7c 100644 --- a/PKHeX.Core/Legality/Encounters/Data/EncounterUtil.cs +++ b/PKHeX.Core/Legality/Encounters/Data/EncounterUtil.cs @@ -19,23 +19,6 @@ internal static class EncounterUtil return source.Where(s => s.Version.Contains(game)).ToArray(); } - /// - /// Sets the value. - /// - /// Generation number to set - /// In-game encounter data - internal static void MarkEncountersGeneration(int generation, params IEnumerable[] encounters) - { - foreach (var table in encounters) - MarkEncountersGeneration(generation, table); - } - - private static void MarkEncountersGeneration(int generation, IEnumerable encounters) - { - foreach (var enc in encounters) - enc.Generation = generation; - } - internal static T[] ConcatAll(params IEnumerable[] arr) => arr.SelectMany(z => z).ToArray(); internal static EncounterStatic Clone(this EncounterStatic s, int location) @@ -61,7 +44,7 @@ internal static IEnumerable DreamRadarClone(this EncounterStat private static EncounterStatic5 DreamRadarClone(this EncounterStatic5 s, int level) { - var result = (EncounterStatic5)(s.Clone(level)); + var result = (EncounterStatic5)s.Clone(level); result.Level = level; result.Location = 30015;// Pokemon Dream Radar result.Gift = true; // Only diff --git a/PKHeX.Core/Legality/Encounters/Data/Encounters6.cs b/PKHeX.Core/Legality/Encounters/Data/Encounters6.cs index 92bee3ef7..eb8c92068 100644 --- a/PKHeX.Core/Legality/Encounters/Data/Encounters6.cs +++ b/PKHeX.Core/Legality/Encounters/Data/Encounters6.cs @@ -16,7 +16,6 @@ internal static class Encounters6 internal static readonly EncounterArea6AO[] SlotsO = EncounterArea6AO.GetAreas(Get("o", "ao"), GameVersion.OR); private static byte[][] Get(string resource, string ident) => BinLinker.Unpack(Util.GetBinaryResource($"encounter_{resource}.pkl"), ident); - static Encounters6() { MarkEncounterTradeStrings(TradeGift_XY, TradeXY); diff --git a/PKHeX.Core/Legality/Encounters/Data/Encounters7b.cs b/PKHeX.Core/Legality/Encounters/Data/Encounters7b.cs index 4525cbecd..d607e7098 100644 --- a/PKHeX.Core/Legality/Encounters/Data/Encounters7b.cs +++ b/PKHeX.Core/Legality/Encounters/Data/Encounters7b.cs @@ -77,7 +77,6 @@ static Encounters7b() new EncounterTrade7b { Species = 074, Level = 16, Form = 1, TrainerNames = T8, TID7 = 551873, OTGender = 0, Shiny = Shiny.Random, IVs = new[] {31,31,-1,-1,-1,-1}, IsNicknamed = false }, // Geodude @ Vermilion City, AV rand [0-5) }; - private class RareSpawn { public readonly int Species; diff --git a/PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic7.cs b/PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic7.cs index 89674af31..51752b6b1 100644 --- a/PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic7.cs +++ b/PKHeX.Core/Legality/Encounters/EncounterStatic/EncounterStatic7.cs @@ -29,6 +29,5 @@ protected override bool IsMatchForm(PKM pkm, DexLevel evo) return Form == evo.Form || Legal.IsFormChangeable(Species, Form, pkm.Format); } - } } \ No newline at end of file diff --git a/PKHeX.Core/Legality/Structures/IGeneration.cs b/PKHeX.Core/Legality/Structures/IGeneration.cs deleted file mode 100644 index 3b0a9e984..000000000 --- a/PKHeX.Core/Legality/Structures/IGeneration.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace PKHeX.Core -{ - internal interface IGenerationSet - { - int Generation { set; } - } -}