misc fixes

architdate · Oct 24, 2020 · 8a5076e · 8a5076e
1 parent 1908044
commit 8a5076e
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 7 deletions.
diff --git a/AutoLegalityMod/AutoModPlugins.csproj b/AutoLegalityMod/AutoModPlugins.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <Reference Include="System.Windows.Forms" />
-    <PackageReference Include="PKHeX.Core" Version="20.10.10" />
+    <PackageReference Include="PKHeX.Core" Version="20.10.11" />
     <ProjectReference Include="..\PKHeX.Core.AutoMod\PKHeX.Core.AutoMod.csproj" />
     <ProjectReference Include="..\PKHeX.Core.Enhancements\PKHeX.Core.Enhancements.csproj" />
     <ProjectReference Include="..\PKHeX.Core.Injection\PKHeX.Core.Injection.csproj" />

diff --git a/AutoModTests/AutoModTests.csproj b/AutoModTests/AutoModTests.csproj
@@ -11,7 +11,7 @@
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="5.10.3" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
-    <PackageReference Include="PKHeX.Core" Version="20.10.10" />
+    <PackageReference Include="PKHeX.Core" Version="20.10.11" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>

diff --git a/PKHeX.Core.AutoMod/AutoMod/Legalization/SimpleEdits.cs b/PKHeX.Core.AutoMod/AutoMod/Legalization/SimpleEdits.cs
@@ -120,7 +120,7 @@ public static void SetShinyBoolean(this PKM pk, bool isShiny, IEncounterable enc
 
             if (enc is EncounterStatic8N || enc is EncounterStatic8NC || enc is EncounterStatic8ND || enc is EncounterStatic8U)
             {
-                pk.SetRaidShiny(shiny);
+                pk.SetRaidShiny(shiny, enc);
                 return;
             }
 
@@ -181,7 +181,7 @@ bool GetPIDXOR() =>
             pk.SetShinySID(); // no mg = no lock
         }
 
-        public static void SetRaidShiny(this PKM pk, Shiny shiny)
+        public static void SetRaidShiny(this PKM pk, Shiny shiny, IEncounterable enc)
         {
             if (pk.IsShiny)
                 return;
@@ -192,6 +192,8 @@ public static void SetRaidShiny(this PKM pk, Shiny shiny)
                 if (pk.Format <= 7)
                     return;
                 var xor = pk.ShinyXor;
+                if (enc is EncounterStatic8U && xor != 1)
+                    continue;
                 if ((shiny == Shiny.AlwaysStar && xor == 1) || (shiny == Shiny.AlwaysSquare && xor == 0) || ((shiny == Shiny.Always || shiny == Shiny.Random) && xor < 2)) // allow xor1 and xor0 for den shinies
                     return;
             }

diff --git a/PKHeX.Core.AutoMod/PKHeX.Core.AutoMod.csproj b/PKHeX.Core.AutoMod/PKHeX.Core.AutoMod.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="PKHeX.Core" Version="20.10.10" />
+    <PackageReference Include="PKHeX.Core" Version="20.10.11" />
   </ItemGroup>
 
 </Project>
diff --git a/PKHeX.Core.Enhancements/PKHeX.Core.Enhancements.csproj b/PKHeX.Core.Enhancements/PKHeX.Core.Enhancements.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="PKHeX.Core" Version="20.10.10" />
+    <PackageReference Include="PKHeX.Core" Version="20.10.11" />
   </ItemGroup>
 
 </Project>
diff --git a/PKHeX.Core.Injection/PKHeX.Core.Injection.csproj b/PKHeX.Core.Injection/PKHeX.Core.Injection.csproj
@@ -11,7 +11,7 @@
 
   <ItemGroup>
     <PackageReference Include="LibUsbDotNet" Version="2.2.29" />
-    <PackageReference Include="PKHeX.Core" Version="20.10.10" />
+    <PackageReference Include="PKHeX.Core" Version="20.10.11" />
   </ItemGroup>
 
 </Project>