From ca9f21fa490ae72762e3525192ef09c7cb8bfa3c Mon Sep 17 00:00:00 2001
From: Kurt <kaphotics@gmail.com>
Date: Sun, 10 Jun 2018 20:26:59 -0700
Subject: [PATCH] Fix base move count vs inherit check

Closes #1990
Thanks @iiippppk !
---
 PKHeX.Core/Legality/Moves/EggInfoSource.cs        |   9 ++++++---
 .../Legal/General/183 - 알 - AA4E3344817C.pk5     | Bin 0 -> 136 bytes
 .../Legal/General/236 - Œuf - 314CC020CB44.pk4    | Bin 0 -> 136 bytes
 .../Legal/General/236 - 알 - F55CC3F29788.pk5     | Bin 0 -> 136 bytes
 .../Legal/General/300 - Egg - 0673311A3560.pk5    | Bin 0 -> 136 bytes
 .../Legal/General/300 - Uovo - 0C910B68370A.pk4   | Bin 0 -> 136 bytes
 .../Legal/General/343 - 알 - 4569F88A9BCE.pk5     | Bin 0 -> 136 bytes
 .../Legal/General/479 - Ei - B7178C463B60.pk4     | Bin 0 -> 136 bytes
 .../Legal/General/479 ★ - 알 - BE0D0000000A.pk5   | Bin 0 -> 136 bytes
 9 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 Tests/PKHeX.Tests/Legality/Legal/General/183 - 알 - AA4E3344817C.pk5
 create mode 100644 Tests/PKHeX.Tests/Legality/Legal/General/236 - Œuf - 314CC020CB44.pk4
 create mode 100644 Tests/PKHeX.Tests/Legality/Legal/General/236 - 알 - F55CC3F29788.pk5
 create mode 100644 Tests/PKHeX.Tests/Legality/Legal/General/300 - Egg - 0673311A3560.pk5
 create mode 100644 Tests/PKHeX.Tests/Legality/Legal/General/300 - Uovo - 0C910B68370A.pk4
 create mode 100644 Tests/PKHeX.Tests/Legality/Legal/General/343 - 알 - 4569F88A9BCE.pk5
 create mode 100644 Tests/PKHeX.Tests/Legality/Legal/General/479 - Ei - B7178C463B60.pk4
 create mode 100644 Tests/PKHeX.Tests/Legality/Legal/General/479 ★ - 알 - BE0D0000000A.pk5

diff --git a/PKHeX.Core/Legality/Moves/EggInfoSource.cs b/PKHeX.Core/Legality/Moves/EggInfoSource.cs
index 379d7dab3..bc937b648 100644
--- a/PKHeX.Core/Legality/Moves/EggInfoSource.cs
+++ b/PKHeX.Core/Legality/Moves/EggInfoSource.cs
@@ -44,8 +44,11 @@ public EggInfoSource(PKM pkm, IEnumerable<int> specialMoves, EncounterEgg e)
         public IReadOnlyList<int> TMHM { get; }
         public IReadOnlyList<int> LevelUp { get; }
 
-        public bool IsInherited(int m) => !Base.Contains(m) || Special.Contains(m) ||
-                                          Egg.Contains(m) || LevelUp.Contains(m) ||
-                                          TMHM.Contains(m) || Tutor.Contains(m);
+        public bool IsInherited(int m)
+        {
+            if (Base.Contains(m))
+                return false;
+            return Special.Contains(m) || Egg.Contains(m) || LevelUp.Contains(m) || TMHM.Contains(m) || Tutor.Contains(m);
+        }
     }
 }
diff --git a/Tests/PKHeX.Tests/Legality/Legal/General/183 - 알 - AA4E3344817C.pk5 b/Tests/PKHeX.Tests/Legality/Legal/General/183 - 알 - AA4E3344817C.pk5
new file mode 100644
index 0000000000000000000000000000000000000000..4634f0f6021cec19aa46fd816500f71db4478ab4
GIT binary patch
literal 136
zcmb<vbTMXN@LRQ=fq{Vwh(Ul+pMe9yLXe6K6Tuv1If&SQAONwLpqhM+f<!VIa)9vv
s{~{m;0S0l1Y6gZ#hBAhHhCCol1<Eln2(gGWFft~+GA?CcX#^?)0NR2cRR910

literal 0
HcmV?d00001

diff --git a/Tests/PKHeX.Tests/Legality/Legal/General/236 - Œuf - 314CC020CB44.pk4 b/Tests/PKHeX.Tests/Legality/Legal/General/236 - Œuf - 314CC020CB44.pk4
new file mode 100644
index 0000000000000000000000000000000000000000..90f8733c1d185ec4a420fd6c7dd6b019b43a7084
GIT binary patch
literal 136
zcmZ=ct#E*W!N>3o0|NsW5Q6}t9Ro9jg&-9f_!$2%9Ar=y;nDz!^0D7dfXQB9zr;SD
zF_O`X@&A8AMr}q5Mmr$O28bDWU}~HhqZor3gMiQzC~nUv#3IDN$OzKOz|sIz1OTbf
B7uo;-

literal 0
HcmV?d00001

diff --git a/Tests/PKHeX.Tests/Legality/Legal/General/236 - 알 - F55CC3F29788.pk5 b/Tests/PKHeX.Tests/Legality/Legal/General/236 - 알 - F55CC3F29788.pk5
new file mode 100644
index 0000000000000000000000000000000000000000..10de96ff6f567bdf12953535b4350c153840adbc
GIT binary patch
literal 136
zcmeB}{^>9SL(JDV3=9lhKnwzmb_^U47J^h{;A8y5aF9V+gi8Y?Y9A2t3oHxO<a6}@
z|0Ngx|4(N~WXNMEVfg<)6^I$cVJ1W}lriK3W%3xn;tWD8;tY(8Nw17c8CV*DiU3n4
B9cTam

literal 0
HcmV?d00001

diff --git a/Tests/PKHeX.Tests/Legality/Legal/General/300 - Egg - 0673311A3560.pk5 b/Tests/PKHeX.Tests/Legality/Legal/General/300 - Egg - 0673311A3560.pk5
new file mode 100644
index 0000000000000000000000000000000000000000..01e16cb083f63f00b41746d52acf9aa675c64920
GIT binary patch
literal 136
zcmYc=l`>>tC}z`PWMJT8fB;4d1|}#IPW@rfWl(2OWZ=?}Qw9mjd_VgOL^DA(xiX{!
v;s5_743$6<1{g#^YCs^8p^PD)ArA;sf$|ItLM-A8jEqUIj7u3<8iDcvzj_<Q

literal 0
HcmV?d00001

diff --git a/Tests/PKHeX.Tests/Legality/Legal/General/300 - Uovo - 0C910B68370A.pk4 b/Tests/PKHeX.Tests/Legality/Legal/General/300 - Uovo - 0C910B68370A.pk4
new file mode 100644
index 0000000000000000000000000000000000000000..51048b5b074c003e844aa889df0e6e2e4108519c
GIT binary patch
literal 136
zcmd-w&){ZYn8>5U$iTqG00E2^3@lJ4ochC{%b?Dn$iSr`rwkIjw@;}KL^A>L1@=qq
y_Kd-dQ9%6vzcUbnfE|!#-~p)t0cWsm5MvOdCs5p;QHVu|fsqlUlYylHC=URB85!RI

literal 0
HcmV?d00001

diff --git a/Tests/PKHeX.Tests/Legality/Legal/General/343 - 알 - 4569F88A9BCE.pk5 b/Tests/PKHeX.Tests/Legality/Legal/General/343 - 알 - 4569F88A9BCE.pk5
new file mode 100644
index 0000000000000000000000000000000000000000..66e59228a9d4b0288bff8270e56a9680c791aff3
GIT binary patch
literal 136
zcmX>%yXyx7L#AsuBLf2$0|YQiF>pYca4MD|3(S_3g9!Zx0uYM@s>$c*|NjMR|Nk##
wC}GHF`2Rlzh=D4^A*vY|A{okn;(0)r3Y1}B5MtwIU}Q{sWn9X@(g;)p03YQZIRF3v

literal 0
HcmV?d00001

diff --git a/Tests/PKHeX.Tests/Legality/Legal/General/479 - Ei - B7178C463B60.pk4 b/Tests/PKHeX.Tests/Legality/Legal/General/479 - Ei - B7178C463B60.pk4
new file mode 100644
index 0000000000000000000000000000000000000000..cd4444e0e8bdcb7292c7642c4f5354d5706a46a2
GIT binary patch
literal 136
zcmYeWcI#na5Z`{Ek%57W0RkAM7+9f9IAz8d#t_1g%fK%p2Ug~GG9VWu$pXX|*e|i`
xGx{?A|8L1?4kWdK7y=mBVFoxeMll961_7ZbP}ZJNh((BjkrAYmfu#Xx3IIfw8~FeL

literal 0
HcmV?d00001

diff --git a/Tests/PKHeX.Tests/Legality/Legal/General/479 ★ - 알 - BE0D0000000A.pk5 b/Tests/PKHeX.Tests/Legality/Legal/General/479 ★ - 알 - BE0D0000000A.pk5
new file mode 100644
index 0000000000000000000000000000000000000000..871750532826c81d578582930adae70b42428d14
GIT binary patch
literal 136
zcmd;L00G{8_Zb-&xWH@%21Y3c4k!~&nK6bjgfQeX@QcWSmBp8w{RWa`fok$O`v1Sl
w?*IRbfoc*N{zCzSILv@ZhBAhHhCCol1<Eoo2(gGWFft~+GA?CcX#^?)0P>9-kpKVy

literal 0
HcmV?d00001