PKHeX/PKHeX.Core/Legality/Areas/EncounterArea7b.cs

using System.Collections.Generic;
using System.Linq;

namespace PKHeX.Core
{
    /// <inheritdoc />
    /// <summary>
    /// <see cref="GameVersion.GG"/> encounter area
    /// </summary>
    public sealed class EncounterArea7b : EncounterArea32
    {
        private const int CatchComboBonus = 1;

        protected override IEnumerable<EncounterSlot> GetMatchFromEvoLevel(PKM pkm, IEnumerable<EvoCriteria> vs, int minLevel)
        {
            var slots = Slots.Where(slot => vs.Any(evo => evo.Species == slot.Species && evo.Form == slot.Form && evo.Level >= (slot.LevelMin - CatchComboBonus)));

            // Get slots where pokemon can exist with respect to level constraints
            return slots.Where(s => s.IsLevelWithinRange(minLevel, minLevel, 0, CatchComboBonus));
        }

        protected override IEnumerable<EncounterSlot> GetFilteredSlots(PKM pkm, IEnumerable<EncounterSlot> slots, int minLevel)
        {
            return slots;
        }
    }
}
-												Split encounter areas, relocate slot finding to obj

Now logic is reasonably split, and each format of area has its own way
of yielding slots

Too much junk with checking flute boosts or catch combo applicability;
just let the area dictate how slots match.

											
										
										
											2019-09-13 06:20:52 +00:00
+								using System.Collections.Generic;
 								using System.Linq;
 								namespace PKHeX.Core
 								{
 								    /// <inheritdoc />
 								    /// <summary>
 								    /// <see cref="GameVersion.GG"/> encounter area
 								    /// </summary>
 								    public sealed class EncounterArea7b : EncounterArea32
 								    {
 								        private const int CatchComboBonus = 1;
-												Sword/Shield Update

											
										
										
											2019-11-16 01:34:18 +00:00
+								        protected override IEnumerable<EncounterSlot> GetMatchFromEvoLevel(PKM pkm, IEnumerable<EvoCriteria> vs, int minLevel)
-												Split encounter areas, relocate slot finding to obj

Now logic is reasonably split, and each format of area has its own way
of yielding slots

Too much junk with checking flute boosts or catch combo applicability;
just let the area dictate how slots match.

											
										
										
											2019-09-13 06:20:52 +00:00
+								        {
-												Require exact form matching

											
										
										
											2020-04-13 02:41:03 +00:00
+								            var slots = Slots.Where(slot => vs.Any(evo => evo.Species == slot.Species && evo.Form == slot.Form && evo.Level >= (slot.LevelMin - CatchComboBonus)));
-												Split encounter areas, relocate slot finding to obj

Now logic is reasonably split, and each format of area has its own way
of yielding slots

Too much junk with checking flute boosts or catch combo applicability;
just let the area dictate how slots match.

											
										
										
											2019-09-13 06:20:52 +00:00
 								            // Get slots where pokemon can exist with respect to level constraints
-												Use less efficient IsLevelWithinRange, for clarity

See previous commit for discussion; it's easier to read and maintain
this rather than have the precomputed min/max comparisons.

LevelMin - minDecrease <= min && max <= LevelMax + maxIncrease;
See EncounterArea7b:
Since we know min and minDecrease (0) before doing the linq filter we
can precompute the lowbound, same for highbound; but this isn't
immediately obvious to the reader. The perf cost is pretty much
negligible in the big picture, so leave it in the more readable state.

Thanks @fattard & @ammako !

#2389

											
										
										
											2019-09-20 05:54:53 +00:00
+								            return slots.Where(s => s.IsLevelWithinRange(minLevel, minLevel, 0, CatchComboBonus));
-												Split encounter areas, relocate slot finding to obj

Now logic is reasonably split, and each format of area has its own way
of yielding slots

Too much junk with checking flute boosts or catch combo applicability;
just let the area dictate how slots match.

											
										
										
											2019-09-13 06:20:52 +00:00
+								        }
 								        protected override IEnumerable<EncounterSlot> GetFilteredSlots(PKM pkm, IEnumerable<EncounterSlot> slots, int minLevel)
 								        {
-												Require exact form matching

											
										
										
											2020-04-13 02:41:03 +00:00
+								            return slots;
-												Split encounter areas, relocate slot finding to obj

Now logic is reasonably split, and each format of area has its own way
of yielding slots

Too much junk with checking flute boosts or catch combo applicability;
just let the area dictate how slots match.

											
										
										
											2019-09-13 06:20:52 +00:00
+								        }
 								    }
-												Require exact form matching

											
										
										
											2020-04-13 02:41:03 +00:00
+								}