New Stuff and some fixes (#734)

* New Stuff

* flash

5 files changed, 78 insertions, 95 deletions

diff --git a/constants/enchants.json b/constants/enchants.json
index 89f75ffb..888fbe6b 100644
--- a/constants/enchants.json
+++ b/constants/enchants.json
@@ -107,7 +107,8 @@
       "charm",
       "corruption",
       "ultimate_inferno",
-      "ultimate_fatal_tempo"
+      "ultimate_fatal_tempo",
+      "ultimate_flash"
     ],
     "FISHING WEAPON": [
       "angler",
@@ -158,7 +159,8 @@
       "ultimate_wise",
       "smoldering",
       "ultimate_inferno",
-      "ultimate_fatal_tempo"
+      "ultimate_fatal_tempo",
+      "ultimate_flash"
     ],
     "SHOVEL": [
       "efficiency",
@@ -378,7 +380,8 @@
       "ultimate_soul_eater",
       "ultimate_reiterate",
       "ultimate_inferno",
-      "ultimate_fatal_tempo"
+      "ultimate_fatal_tempo",
+      "ultimate_flash"
     ],
     [
       "protection",
diff --git a/constants/essencecosts.json b/constants/essencecosts.json
index c91c5245..60f8d41f 100644
--- a/constants/essencecosts.json
+++ b/constants/essencecosts.json
@@ -7654,59 +7654,21 @@
   },
   "MAGMA_ROD": {
     "type": "Crimson",
-    "1": 20,
-    "2": 40,
-    "3": 60,
-    "4": 80,
-    "5": 100,
-    "6": 150,
-    "7": 200,
-    "8": 250,
-    "9": 300,
-    "10": 350,
+    "1": 50,
+    "2": 80,
+    "3": 100,
     "items": {
       "1": [
-        "§aLump of Magma §8x1",
-        "§9Magmafish §8x10"
+        "§aLump of Magma §8x20",
+        "§9Silver Magmafish"
       ],
       "2": [
-        "§aLump of Magma §8x2",
-        "§9Magmafish §8x20"
+        "§aMoogma Pelt §8x20",
+        "§9Silver Magmafish §8x2"
       ],
       "3": [
-        "§aMoogma Pelt §8x2",
-        "§9Magmafish §8x30"
-      ],
-      "4": [
-        "§aMoogma Pelt §8x3",
-        "§9Magmafish §8x40"
-      ],
-      "5": [
-        "§aPyroclastic Scale §8x3",
-        "§9Magmafish §8x50"
-      ],
-      "6": [
-        "§aPyroclastic Scale §8x4",
-        "§9Magmafish §8x60"
-      ],
-      "7": [
-        "§9Cup of Blood §8x4",
-        "§9Magmafish §8x70"
-      ],
-      "8": [
-        "§9Cup of Blood §8x5",
-        "§5Silver Magmafish §8x1",
-        "§6Heavy Pearl §8x3"
-      ],
-      "9": [
-        "§9Flaming Heart §8x5",
-        "§5Silver Magmafish §8x1",
-        "§6Heavy Pearl §8x4"
-      ],
-      "10": [
-        "§9Flaming Heart §8x6",
-        "§5Silver Magmafish §8x1",
-        "§6Heavy Pearl §8x5"
+        "§aPyroclastic Scala §8x20",
+        "§9Silver Magmafish §8x3"
       ]
     }
   },
@@ -8522,59 +8484,41 @@
   },
   "INFERNO_ROD": {
     "type": "Crimson",
-    "1": 40,
+    "1": 50,
     "2": 80,
-    "3": 120,
+    "3": 100,
     "4": 160,
     "5": 200,
     "6": 300,
     "7": 400,
-    "8": 500,
-    "9": 600,
-    "10": 800,
     "items": {
       "1": [
-        "§9Flaming Heart §8x5",
-        "§5Silver Magmafish §8x10"
+        "§aLump of Magma §8x20",
+        "§5Silver Magmafish §8x1"
       ],
       "2": [
-        "§9Flaming Heart §8x10",
-        "§5Silver Magmafish §8x20"
+        "§aMoogma Pelt §8x20",
+        "§5Silver Magmafish §8x2"
       ],
       "3": [
-        "§9Flaming Heart §8x20",
-        "§5Silver Magmafish §8x30"
+        "§aPyroclastic Scale §8x20",
+        "§5Silver Magmafish §8x3"
       ],
       "4": [
-        "§9Orb of Energy §8x20",
+        "§9Cup of Blood §8x50",
         "§5Silver Magmafish §8x40"
       ],
       "5": [
-        "§9Orb of Energy §8x30",
+        "§9Flaming Heart §8x70",
         "§5Silver Magmafish §8x50"
       ],
       "6": [
-        "§9Orb of Energy §8x40",
+        "§9Orb of Energy §8x80",
         "§5Silver Magmafish §8x60"
       ],
       "7": [
-        "§5Horn of Taurus §8x20",
+        "§5Horn of Taurus §8x90",
         "§5Silver Magmafish §8x70"
-      ],
-      "8": [
-        "§5Horn of Taurus §8x30",
-        "§6Gold Magmafish §8x1",
-        "§6Heavy Pearl §8x3"
-      ],
-      "9": [
-        "§5Horn of Taurus §8x40",
-        "§6Gold Magmafish §8x1",
-        "§6Heavy Pearl §8x4"
-      ],
-      "10": [
-        "§5Thunder Shards §8x6",
-        "§6Gold Magmafish §8x1",
-        "§6Heavy Pearl §8x5"
       ]
     }
   }
diff --git a/constants/fairy_souls.json b/constants/fairy_souls.json
index e03faa8b..508a268b 100644
--- a/constants/fairy_souls.json
+++ b/constants/fairy_souls.json
@@ -107,7 +107,7 @@
     "-644,125,-689",
     "-79,139,-779",
     "-352,191,-553",
-    "-717,163,-980",
+    "-717,164,-981",
     "-726,144,-891",
     "-690,122,-752",
     "-31,178,-907",
diff --git a/constants/parents.json b/constants/parents.json
index c9999e89..5d731b29 100644
--- a/constants/parents.json
+++ b/constants/parents.json
@@ -1127,7 +1127,8 @@
   "JELLYFISH;4": [
     "JELLYFISH;3"
   ],
-  "FLYING_FISH;4": [
+  "FLYING_FISH;5": [
+    "FLYING_FISH;4",
     "FLYING_FISH;3",
     "FLYING_FISH;2"
   ],
@@ -2819,5 +2820,14 @@
   ],
   "OBFUSCATED_FISH_3_SILVER": [
     "OBFUSCATED_FISH_3_BRONZE"
+  ],
+  "FLAME;1": [
+    "FLAME;2"
+  ],
+  "ULTIMATE_FLASH;1": [
+    "ULTIMATE_FLASH;2",
+    "ULTIMATE_FLASH;3",
+    "ULTIMATE_FLASH;4",
+    "ULTIMATE_FLASH;5"
   ]
 }
diff --git a/constants/petnums.json b/constants/petnums.json
index 8ae96f6e..dc6b3c0e 100644
--- a/constants/petnums.json
+++ b/constants/petnums.json
@@ -1400,11 +1400,33 @@
     }
   },
   "FLYING_FISH": {
+    "RARE": {
+      "1": {
+        "otherNums": [
+          0.4,
+          0.8
+        ],
+        "statNums": {
+          "DEFENSE": 0.0,
+          "STRENGTH": 0.0
+        }
+      },
+      "100": {
+        "otherNums": [
+          40,
+          80
+        ],
+        "statNums": {
+          "DEFENSE": 50.0,
+          "STRENGTH": 50.0
+        }
+      }
+    },
     "EPIC": {
       "1": {
         "otherNums": [
-          0.1,
-          0.5
+          0.5,
+          1.0
         ],
         "statNums": {
           "DEFENSE": 0.0,
@@ -1413,8 +1435,8 @@
       },
       "100": {
         "otherNums": [
-          15,
-          50
+          50,
+          100
         ],
         "statNums": {
           "DEFENSE": 50.0,
@@ -1425,9 +1447,9 @@
     "LEGENDARY": {
       "1": {
         "otherNums": [
-          0.4,
           0.5,
-          0.3
+          1.0,
+          0.2
         ],
         "statNums": {
           "DEFENSE": 0.0,
@@ -1436,9 +1458,9 @@
       },
       "100": {
         "otherNums": [
-          40,
           50,
-          30
+          100,
+          20
         ],
         "statNums": {
           "DEFENSE": 50.0,
@@ -1446,11 +1468,13 @@
         }
       }
     },
-    "RARE": {
+    "MYTHIC": {
       "1": {
         "otherNums": [
-          0.3,
-          0.4
+          0.5,
+          1.0,
+          0.2,
+          0.5
         ],
         "statNums": {
           "DEFENSE": 0.0,
@@ -1459,8 +1483,10 @@
       },
       "100": {
         "otherNums": [
-          30,
-          40
+          50,
+          100,
+          20,
+          50
         ],
         "statNums": {
           "DEFENSE": 50.0,