Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2025-02-17 13:58:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Apply static/magnet groups by slot type

Browse source 
only apply for emerald (only game in gen3 that supports it)
This commit is contained in:
Kurt 2017-11-30 22:34:57 -08:00
parent de25056275
commit 5d74096243
3 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
PKHeX.Core/Legality/Encounters/Data/EncounterUtil.cs
View file

@ -82,10 +82,11 @@ namespace PKHeX.Core
const int steel = (int)MoveType.Steel; const int steel = (int)MoveType.Steel;
const int electric = (int)MoveType.Electric; const int electric = (int)MoveType.Electric;
foreach (EncounterArea Area in Areas) foreach (EncounterArea Area in Areas)
foreach (var grp in Area.Slots.GroupBy(z => z.Type))
{ {
var s = new List<EncounterSlot>(); // Static var s = new List<EncounterSlot>(); // Static
var m = new List<EncounterSlot>(); // Magnet Pull var m = new List<EncounterSlot>(); // Magnet Pull
foreach (EncounterSlot Slot in Area.Slots) foreach (EncounterSlot Slot in grp)
{ {
var types = t[Slot.Species].Types; var types = t[Slot.Species].Types;
if (types[0] == steel || types[1] == steel) if (types[0] == steel || types[1] == steel)

4
PKHeX.Core/Legality/Encounters/Data/Encounters3.cs
View file

@ -48,11 +48,7 @@ namespace PKHeX.Core
MarkG3SlotsSafariZones(ref FR_Slots, SafariLocation_FRLG); MarkG3SlotsSafariZones(ref FR_Slots, SafariLocation_FRLG);
MarkG3SlotsSafariZones(ref LG_Slots, SafariLocation_FRLG); MarkG3SlotsSafariZones(ref LG_Slots, SafariLocation_FRLG);
MarkEncountersStaticMagnetPull(ref R_Slots, PersonalTable.SM);
MarkEncountersStaticMagnetPull(ref S_Slots, PersonalTable.SM);
MarkEncountersStaticMagnetPull(ref E_Slots, PersonalTable.SM); MarkEncountersStaticMagnetPull(ref E_Slots, PersonalTable.SM);
MarkEncountersStaticMagnetPull(ref FR_Slots, PersonalTable.SM);
MarkEncountersStaticMagnetPull(ref LG_Slots, PersonalTable.SM);
SlotsR = AddExtraTableSlots(R_Slots, SlotsRSEAlt); SlotsR = AddExtraTableSlots(R_Slots, SlotsRSEAlt);
SlotsS = AddExtraTableSlots(S_Slots, SlotsRSEAlt); SlotsS = AddExtraTableSlots(S_Slots, SlotsRSEAlt);

3
PKHeX.Core/Legality/RNG/Frame/Frame.cs
View file

@ -36,8 +36,7 @@
// Check Level Now // Check Level Now
int lvl = SlotRange.GetLevel(slot, Lead, RandLevel); int lvl = SlotRange.GetLevel(slot, Lead, RandLevel);
if (lvl < 0) { } // todo if (pkm.HasOriginalMetLocation)
else if (pkm.HasOriginalMetLocation)
{ {
if (lvl != pkm.Met_Level) if (lvl != pkm.Met_Level)
return false; return false;