Skip to content

Commit

Permalink
Update 20.11.28
Browse files Browse the repository at this point in the history
  • Loading branch information
kwsch committed Nov 28, 2020
1 parent 3d6bb0e commit 8778d8c
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 5 deletions.
7 changes: 4 additions & 3 deletions PKHeX.Core/Legality/Areas/EncounterArea8g.cs
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,7 @@ public override IEnumerable<EncounterSlot> GetMatchingSlots(PKM pkm, IReadOnlyLi
if (pkm.TSV == 0) // HOME doesn't assign TSV=0 to accounts.
yield break;

var sf = chain.FirstOrDefault(z => z.Species == Species
&& (z.Form == Form || AltFormInfo.IsFormChangeable(Species, Form, z.Form, pkm.Format)));
var sf = chain.FirstOrDefault(z => z.Species == Species && (z.Form == Form || AltFormInfo.IsFormChangeable(Species, Form, z.Form, pkm.Format)));
if (sf == null)
yield break;

Expand Down Expand Up @@ -125,10 +124,12 @@ private static bool IsDeferredSlot(IEncounterable slot, PKM pk)

return slot.Species switch
{
(int) Core.Species.Yamask when pk.Species != slot.Species && pk is IFormArgument f => f.FormArgument == 0,
(int) Core.Species.Yamask when pk.Species != slot.Species && slot.Form == 1 && pk is IFormArgument f => f.FormArgument == 0,
(int) Core.Species.Milcery when pk.Species != slot.Species && pk is IFormArgument f => f.FormArgument == 0,

(int) Core.Species.Runerigus when pk is IFormArgument f && f.FormArgument != 0 => true,
(int) Core.Species.Alcremie when pk is IFormArgument f && f.FormArgument != 0 => true,

_ => false,
};
}
Expand Down
Binary file modified PKHeX.Core/Resources/byte/encounter_go_home.pkl
Binary file not shown.
Binary file modified PKHeX.Core/Resources/byte/encounter_go_lgpe.pkl
Binary file not shown.
Binary file modified PKHeX.Core/Resources/byte/wc8.pkl
Binary file not shown.
2 changes: 1 addition & 1 deletion PKHeX.WinForms/PKHeX.WinForms.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<ApplicationIcon>Resources\Icon.ico</ApplicationIcon>
<StartupObject>PKHeX.WinForms.Program</StartupObject>
<AssemblyName>PKHeX</AssemblyName>
<Version>20.10.31</Version>
<Version>20.11.28</Version>
<LangVersion>8</LangVersion>
<Nullable>enable</Nullable>
</PropertyGroup>
Expand Down
20 changes: 19 additions & 1 deletion PKHeX.WinForms/Resources/text/changelog.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,25 @@
PKHeX - By Kaphotics
http://projectpokemon.org/pkhex/

20/10/31 - New Update:
20/11/28 - New Update:
- Legality:
- - Added: Pokémon GO Legality checks, including date-range legality checks. Thanks @Lusamine & @sora10pls!
- - Added: Nickname checks for Generation 1 in-game trades. Thanks @ShadowMario3!
- - Added: RibbonMasterRank permissions now allow the updated species list. Thanks @Bappsack!
- - Fixed: Ability Patch edge case for changing forms (ex. Landorus) where the current form does not have a Hidden Ability.
- - Fixed: Gen8 Wild encounters with levels above 60 are now required to match the encounter's level.
- - Fixed: Gen8 symbol encounters incorrect location ID hash fixed. Thanks @sora10pls!
- - Fixed: Added Frostpoint Field for dens 175/176.
- Added: Shiny Sprites for Crown Tundra. Thanks @msikma + github.com/msikma/pokesprite!
- Added: Fused Calyrex slot viewing.
- Added: More Gen4 Event Flags. Thanks @zzzzRuby & @ShadyRelapse-PP!
- Changed: KChart now shows the "Native" state for all Armor/Crown natives in addition to the mainland natives.
- Changed: .NET Core 3.1 builds changed to .NET 5; downloads are still .NET Framework ~4.6.
- Fixed: Clearing a box other than the first box on a blank save file now clears the box... as intended. Thanks @Lusamine!
- Fixed: Gen8 Yamask-1 and Runerigus now show all possible FormArgument values. Thanks @sora10pls!
- Fixed: Gen1 Daycare slot is no longer marked as active when exporting a save file with an flagged-empty daycare.

20/10/31 - New Update: (93960) [3235071]
- Legality:
- - Added: Gen8 static encounters now permit more met locations (roamers, strong encounters). Thanks @Lusamine & @ReignOfComputer!
- - Fixed: Gen8 breeds of Gen3 Starters and Porygon now allow the Gen8 wild balls.
Expand Down

0 comments on commit 8778d8c

Please sign in to comment.