完善RNG面板

8CBCA403 · May 28, 2022 · 7e49f3c · 7e49f3c
1 parent 5257417
commit 7e49f3c
Show file tree

Hide file tree

Showing 7 changed files with 272 additions and 34 deletions.
diff --git a/WangPlugin/RNG/Overworld8RNG.cs b/WangPlugin/RNG/Overworld8RNG.cs
@@ -1,5 +1,5 @@
 using PKHeX.Core;
-using System.Windows.Forms;
+using System;
 namespace WangPlugin
 
 {
@@ -25,13 +25,13 @@ public static bool GenPkm(ref PKM pk,uint seed,  bool[] shiny, bool[] IV,uint Xo
             pk.EncryptionConstant = ec;
             // PID
             var pid = (uint)xoro.NextInt(uint.MaxValue);
-            pk.PID = pid;
-            // IVs
-            if (!CheckShiny(pk.PID, pk.TID, pk.SID,shiny,Xor))
+            uint revised_pid = GetRevisedPID(pid, pk.TID,pk.SID,shiny);
+            pk.PID = revised_pid;
+            if(!CheckShiny(pk.PID, pk.TID,pk.SID,shiny))
             {
                 return false;
             }
-
+            // IVs
             var ivs = new int[6] { UNSET, UNSET, UNSET, UNSET, UNSET, UNSET };
 
             const int MAX = 31;
@@ -72,7 +72,24 @@ public static bool GenPkm(ref PKM pk,uint seed,  bool[] shiny, bool[] IV,uint Xo
             pk.RefreshChecksum();
             return true;
         }
-
+        private static uint GetRevisedPID( uint pid, int TID, int SID, bool[] shiny)
+        {
+            uint s = (uint)(TID ^ SID) ^ ((pid >> 16) ^ (pid & 0xFFFF));
+             if (shiny[3]&& s!=0)
+            {
+                pid = (((uint)(TID ^ SID) ^ (pid & 0xFFFF) ^ 0) << 16) | (pid & 0xFFFF);
+                return pid;
+            }
+
+            else if (shiny[0]&&s<16)
+            {
+
+                return pid ^ 0x10000000;
+            }
+
+                return pid;
+
+        }
         private static bool CheckShiny(uint pid, int TID, int SID, bool[] shiny,uint Xor=0)
         {
             var s = (uint)(TID ^ SID) ^ ((pid >> 16) ^ (pid & 0xFFFF));

diff --git a/WangPlugin/RNG/Roaming8bRNG.cs b/WangPlugin/RNG/Roaming8bRNG.cs
@@ -13,6 +13,7 @@ public static bool GenPkm(ref PKM pk, uint seed, int TID, int SID, bool[] shiny,
             var fakeTID = xoro.NextUInt();
             var pid = xoro.NextUInt();
             pid = GetRevisedPID(fakeTID, pid, TID,SID);
+
             var ivs = new int[6] { UNSET, UNSET, UNSET, UNSET, UNSET, UNSET };
             var determined = 0;
             while (determined < FlawlessIVs)
@@ -26,6 +27,7 @@ public static bool GenPkm(ref PKM pk, uint seed, int TID, int SID, bool[] shiny,
             {
                 if (ivs[i] == UNSET)
                 {
+
                     ivs[i] = (int)xoro.NextUInt(32);
                 }
             }
@@ -38,7 +40,7 @@ public static bool GenPkm(ref PKM pk, uint seed, int TID, int SID, bool[] shiny,
                 return false;
             }
             pk.PID = pid;
-            if (!CheckShiny(pk.PID, pk.TID, pk.SID,shiny))
+            if (!CheckShiny(pk.PID, pk.TID, pk.SID, shiny))
             {
                 return false;
             }

diff --git a/WangPlugin/RNG/SeedList.cs b/WangPlugin/RNG/SeedList.cs
@@ -0,0 +1,99 @@
+
+using System.Collections.Generic;
+
+namespace WangPlugin
+{
+    internal class SeedList
+    {
+       public static List<uint>  Roaming8_6V = new List<uint>()   
+        {0x60d489e, 0xf962809, 0x1707a1bc, 0x256512ac,
+        0x2b2e0bc5, 0x3e9e0489, 0x429f7bdd, 0x4fcd2b6c,
+        0x5ce9aa13, 0x65aded09, 0x6707f338, 0x6b72fe4d,
+        0x7171a30b, 0x733dd448, 0x7a928de5, 0x7ef34d82,
+        0x874a8cd4, 0x90383581, 0x9bd65fdb, 0x9f2f499e,
+        0xa01f78d8, 0xafecaffc, 0xb2b8db34, 0xc057809e,
+        0xc21a8fb4, 0xcab3bc4d, 0xd970b3b2, 0xe6da6290,
+        0xebf047c3, 0xf489a30c, 0xf6cf4c3b, 0xff2be493};
+        public static List<uint> Roaming8_0a0s = new List<uint>()
+        {0x21bbd6a, 0x630fbe9f, 0x6a84b6ed, 0x6c6d3a44,
+        0x745e444f, 0xc9080389, 0xc937601d, 0xce11bee0};
+        public static List<uint> Roaming8_0a = new List<uint>()
+       {0xbd5a6b6, 0x1434d7a3, 0x14a4e19d, 0x16356604,
+        0x258ffeb3, 0x2811e041, 0x2fbfee90, 0x4318207a,
+        0x57003093, 0x6ea9022c, 0x7d5b6f50, 0x86e81468,
+        0x8b2bc094, 0x91c150eb, 0x93c2fef8, 0x96e4f3e9,
+        0xa3fde2ad, 0xdc52ec02, 0xdd32dc34, 0xfaea4706};
+        public static List<uint> Roaming8_0s = new List<uint>()
+       {0x6f865f2, 0x1eeb4ab9, 0x22c848cd, 0x2fbdd191,
+        0x3d0b17be, 0x51097301, 0x558e91a4, 0x5f051ba8,
+        0x61afeb5f, 0x6be08d41, 0x6e87f93c, 0x77252c8c,
+        0x86138402, 0x9aeeee9b, 0xac21a413, 0xca9ded5d,
+        0xd013ae00, 0xd6fc7ddd};
+        public static List<uint> OverWorld8_0a = new List<uint>()
+        {0x44E87F35,0x4DD86A64,0x54676DB9,0xE7CF1D3C,
+         0xF7400FB0,0xFE701AE1};
+        public static List<uint> OverWorld8_0s = new List<uint>()
+        {
+           0x857FA070
+        };
+        public static List<uint> OverWorld8_0a0s = new List<uint>()
+        {
+           0xDDF01AC6,0xD2B74A56,0xC44F1D1B,0x7ED778CF,0x200DA840
+        };
+        public static Queue<uint> EnqueueSeed(int SeedFlag)
+        {
+            Queue<uint> SeedQueue = new Queue<uint>();
+            if (SeedFlag == 1)
+            {
+                for (int i = 0; i < 28; i++)
+                {
+                    SeedQueue.Enqueue(Roaming8_6V[i]);
+                }
+            }
+            else if (SeedFlag == 2)
+            {
+                for (int i = 0; i < 8; i++)
+                {
+                    SeedQueue.Enqueue(Roaming8_0a0s[i]);
+                }
+            }
+            else if (SeedFlag == 3)
+            {
+                for (int i = 0; i < 20; i++)
+                {
+                    SeedQueue.Enqueue(Roaming8_0a[i]);
+                }
+            }
+            else if (SeedFlag == 4)
+            {
+                for (int i = 0; i < 18; i++)
+                {
+                    SeedQueue.Enqueue(Roaming8_0s[i]);
+                }
+            }
+            else if(SeedFlag==5)
+            {
+                for(int i=0;i<6;i++)
+                {
+                    SeedQueue.Enqueue(OverWorld8_0a[i]);
+                }
+            }
+            else if (SeedFlag == 6)
+            {
+                for (int i = 0; i < 1; i++)
+                {
+                    SeedQueue.Enqueue(OverWorld8_0s[i]);
+                }
+            }
+            else if (SeedFlag == 7)
+            {
+                for (int i = 0; i < 5; i++)
+                {
+                    SeedQueue.Enqueue(OverWorld8_0a0s[i]);
+                }
+            }
+            return SeedQueue;
+        }
+
+    }
+}