Gen 5 and conversion interface added

evinjaff · Jul 9, 2024 · 989c2dc · 989c2dc
1 parent 01c42b4
commit 989c2dc
Show file tree

Hide file tree

Showing 10 changed files with 284 additions and 143 deletions.
diff --git a/pkhex/pkhex-egglocke-tests/pkhex-egglocke-tests/SaveWriterTest.cs b/pkhex/pkhex-egglocke-tests/pkhex-egglocke-tests/SaveWriterTest.cs
@@ -113,8 +113,31 @@ public void TestShinyCorrect()
 
             Assert.IsTrue(isShiny);
 
+
         }
 
+        [TestMethod]
+        public void TestNotShinyCorrect()
+        {
+            SaveWriter sw = new SaveWriter(testConstants.JOHTO_PLUS_SOUL_SILVER_SAVE);
+
+            EggCreator ec = EggCreator.decodeJSON(testConstants.BLANK_GEN4_MAREEP_VALID, true);
+
+            sw.addEgg(ec, 1);
+
+            // get egg at box index 1
+            IList<PKM> boxData = sw.getBox();
+
+            bool isShiny = boxData[1].IsShiny;
+
+            Assert.IsFalse(isShiny);
+
+
+        }
+
+
+
+
 
     }
 }
diff --git a/pkhex/pkhex-egglocke-tests/pkhex-egglocke-tests/testSources/LegendaryTrio.json b/pkhex/pkhex-egglocke-tests/pkhex-egglocke-tests/testSources/LegendaryTrio.json
@@ -13,7 +13,8 @@
         "EV": [ 252, 252, 0, 0, 0, 0 ],
         "moves": [ 425, 262 ],
         "movespp": [ 30, 40 ],
-        "isShiny": true
+        "isShiny": true,
+        "generation":  4
     },
     {
         "dexNumber": 484,
@@ -29,7 +30,8 @@
         "EV": [ 252, 252, 0, 0, 0, 0 ],
         "moves": [ 425, 262 ],
         "movespp": [ 30, 40 ],
-        "isShiny": true
+        "isShiny": true,
+        "generation":  4
     },
     {
         "dexNumber": 487,
@@ -45,6 +47,7 @@
         "EV": [ 252, 252, 0, 0, 0, 0 ],
         "moves": [ 425, 262 ],
         "movespp": [ 30, 40 ],
-        "isShiny": true
+        "isShiny": true,
+        "generation":  4
     }
 ]
diff --git a/pkhex/pkhex-egglocke-tests/pkhex-egglocke-tests/testSources/Mareep.json b/pkhex/pkhex-egglocke-tests/pkhex-egglocke-tests/testSources/Mareep.json
@@ -12,5 +12,6 @@
     "moves": [ 344, 1, 124, 26 ],
     "movespp": [ 0, 0, 0, 0 ],
     "heldItem": 135,
-    "isShiny": false
+    "isShiny": false,
+    "generation": 4
 }
diff --git a/pkhex/pkhex-egglocke-tests/pkhex-egglocke-tests/testSources/MareepShiny.json b/pkhex/pkhex-egglocke-tests/pkhex-egglocke-tests/testSources/MareepShiny.json
@@ -12,5 +12,6 @@
     "moves": [ 344, 1, 124, 26 ],
     "movespp": [ 0, 0, 0, 0 ],
     "heldItem": 135,
-    "isShiny": true
+    "isShiny": true,
+    "generation": 4
 }