mirror of
https://github.com/kwsch/PKHeX
synced 2024-12-25 11:53:11 +00:00
02420d3e93
* Handle some nullable cases
Refactor MysteryGift into a second abstract class (backed by a byte array, or fake data)
Make some classes have explicit constructors instead of { } initialization
* Handle bits more obviously without null
* Make SaveFile.BAK explicitly readonly again
* merge constructor methods to have readonly fields
* Inline some properties
* More nullable handling
* Rearrange box actions
define straightforward classes to not have any null properties
* Make extrabyte reference array immutable
* Move tooltip creation to designer
* Rearrange some logic to reduce nesting
* Cache generated fonts
* Split mystery gift album purpose
* Handle more tooltips
* Disallow null setters
* Don't capture RNG object, only type enum
* Unify learnset objects
Now have readonly properties which are never null
don't new() empty learnsets (>800 Learnset objects no longer created,
total of 2400 objects since we also new() a move & level array)
optimize g1/2 reader for early abort case
* Access rewrite
Initialize blocks in a separate object, and get via that object
removes a couple hundred "might be null" warnings since blocks are now readonly getters
some block references have been relocated, but interfaces should expose all that's needed
put HoF6 controls in a groupbox, and disable
* Readonly personal data
* IVs non nullable for mystery gift
* Explicitly initialize forced encounter moves
* Make shadow objects readonly & non-null
Put murkrow fix in binary data resource, instead of on startup
* Assign dex form fetch on constructor
Fixes legality parsing edge cases
also handle cxd parse for valid; exit before exception is thrown in FrameGenerator
* Remove unnecessary null checks
* Keep empty value until init
SetPouch sets the value to an actual one during load, but whatever
* Readonly team lock data
* Readonly locks
Put locked encounters at bottom (favor unlocked)
* Mail readonly data / offset
Rearrange some call flow and pass defaults
Add fake classes for SaveDataEditor mocking
Always party size, no need to check twice in stat editor
use a fake save file as initial data for savedata editor, and for
gamedata (wow i found a usage)
constrain eventwork editor to struct variable types (uint, int, etc),
thus preventing null assignment errors
81 lines
No EOL
2.7 KiB
C#
81 lines
No EOL
2.7 KiB
C#
using System.Collections.Generic;
|
|
|
|
namespace PKHeX.Core
|
|
{
|
|
/// <inheritdoc />
|
|
/// <summary>
|
|
/// <see cref="GameVersion.Gen7"/> encounter area
|
|
/// </summary>
|
|
public sealed class EncounterArea7 : EncounterArea32
|
|
{
|
|
protected override IEnumerable<EncounterSlot> GetFilteredSlots(PKM pkm, IEnumerable<EncounterSlot> slots, int minLevel)
|
|
{
|
|
int species = pkm.Species;
|
|
int form = pkm.AltForm;
|
|
|
|
// Edge Case Handling
|
|
switch (species)
|
|
{
|
|
case 744 when form == 1: // Rockruff Event
|
|
case 745 when form == 2: // Lycanroc Event
|
|
yield break;
|
|
}
|
|
|
|
EncounterSlot? slotMax = null;
|
|
void CachePressureSlot(EncounterSlot s)
|
|
{
|
|
if (slotMax != null && s.LevelMax > slotMax.LevelMax)
|
|
slotMax = s;
|
|
}
|
|
|
|
if (Legal.AlolanVariantEvolutions12.Contains(species)) // match form if same species, else form 0.
|
|
{
|
|
foreach (var slot in slots)
|
|
{
|
|
if (species == slot.Species ? slot.Form == form : slot.Form == 0)
|
|
yield return slot;
|
|
CachePressureSlot(slot);
|
|
}
|
|
}
|
|
else if (ShouldMatchSlotForm()) // match slot form
|
|
{
|
|
foreach (var slot in slots)
|
|
{
|
|
if (slot.Form == form)
|
|
yield return slot;
|
|
CachePressureSlot(slot);
|
|
}
|
|
}
|
|
else
|
|
{
|
|
foreach (var slot in slots)
|
|
{
|
|
yield return slot; // no form checking
|
|
CachePressureSlot(slot);
|
|
}
|
|
}
|
|
|
|
// Filter for Form Specific
|
|
// Pressure Slot
|
|
if (slotMax == null)
|
|
yield break;
|
|
|
|
if (Legal.AlolanVariantEvolutions12.Contains(species)) // match form if same species, else form 0.
|
|
{
|
|
if (species == slotMax.Species ? slotMax.Form == form : slotMax.Form == 0)
|
|
yield return GetPressureSlot(slotMax, pkm);
|
|
}
|
|
else if (ShouldMatchSlotForm()) // match slot form
|
|
{
|
|
if (slotMax.Form == form)
|
|
yield return GetPressureSlot(slotMax, pkm);
|
|
}
|
|
else
|
|
{
|
|
yield return GetPressureSlot(slotMax, pkm);
|
|
}
|
|
|
|
bool ShouldMatchSlotForm() => Legal.WildForms.Contains(species) || Legal.AlolanOriginForms.Contains(species) || FormConverter.IsTotemForm(species, form);
|
|
}
|
|
}
|
|
} |