water, dirt, fire, air (#813)

4 files changed, 262 insertions, 41 deletions

diff --git a/constants/enchants.json b/constants/enchants.json
index 62694586..0854cd12 100644
--- a/constants/enchants.json
+++ b/constants/enchants.json
@@ -115,7 +115,8 @@
       "ultimate_inferno",
       "ultimate_fatal_tempo",
       "ultimate_flash",
-      "tabasco"
+      "tabasco",
+      "piscary"
     ],
     "FISHING WEAPON": [
       "angler",
@@ -170,7 +171,8 @@
       "ultimate_flash",
       "tabasco",
       "champion",
-      "divine_gift"
+      "divine_gift",
+      "piscary"
     ],
     "SHOVEL": [
       "efficiency",
@@ -210,7 +212,8 @@
       "mana_vampire",
       "ferocious_mana",
       "hecatomb",
-      "ultimate_habanero_tactics"
+      "ultimate_habanero_tactics",
+      "ultimate_bobbin_time"
     ],
     "CHESTPLATE": [
       "protection",
@@ -232,7 +235,8 @@
       "strong_mana",
       "mana_vampire",
       "ferocious_mana",
-      "ultimate_habanero_tactics"
+      "ultimate_habanero_tactics",
+      "ultimate_bobbin_time"
     ],
     "LEGGINGS": [
       "protection",
@@ -253,7 +257,8 @@
       "strong_mana",
       "mana_vampire",
       "ferocious_mana",
-      "ultimate_habanero_tactics"
+      "ultimate_habanero_tactics",
+      "ultimate_bobbin_time"
     ],
     "BOOTS": [
       "protection",
@@ -277,7 +282,8 @@
       "strong_mana",
       "mana_vampire",
       "ferocious_mana",
-      "ultimate_habanero_tactics"
+      "ultimate_habanero_tactics",
+      "ultimate_bobbin_time"
     ],
     "LONGSWORD": [
       "bane_of_arthropods",
@@ -418,7 +424,8 @@
       "ultimate_inferno",
       "ultimate_fatal_tempo",
       "ultimate_flash",
-      "ultimate_habanero_tactics"
+      "ultimate_habanero_tactics",
+      "ultimate_bobbin_time"
     ],
     [
       "protection",
@@ -1255,6 +1262,14 @@
     "compact": [
       25
     ],
+    "piscary": [
+      8,
+      16,
+      24,
+      36,
+      48,
+      60
+    ],
     "one_for_all": [
       50
     ],
@@ -1370,6 +1385,13 @@
       200,
       250
     ],
+    "bobbin_time": [
+      0,
+      0,
+      100,
+      120,
+      140
+    ],
     "XP_BOTTLE": [
       0
     ]
@@ -1413,6 +1435,7 @@
     "fortune": 3,
     "experience": 3,
     "efficiency": 5,
-    "harvesting": 5
+    "harvesting": 5,
+    "piscary": 5
   }
 }
\ No newline at end of file
diff --git a/constants/parents.json b/constants/parents.json
index f305cbd6..aef3c05c 100644
--- a/constants/parents.json
+++ b/constants/parents.json
@@ -2665,7 +2665,10 @@
     "MANA_RAY_SILVER",
     "MANA_RAY_BRONZE"
   ],
-  "ABIPHONE_XIII_PRO_GIGA": [
+  "ABIPHONE_XIV_ENORMOUS_BLACK": [
+    "ABIPHONE_XIV_ENORMOUS",
+    "ABIPHONE_XIV_ENORMOUS_PURPLE",
+    "ABIPHONE_XIII_PRO_GIGA",
     "ABIPHONE_XIII_PRO",
     "ABIPHONE_XII_MEGA_COLOR",
     "ABIPHONE_XII_MEGA",
@@ -2822,6 +2825,144 @@
   "HUNTER_RING": [
     "HUNTER_TALISMAN"
   ],
+  "BITE_RUNE;1": [
+    "BITE_RUNE;2",
+    "BITE_RUNE;3"
+  ],
+  "BLOOD_2_RUNE;1": [
+    "BLOOD_2_RUNE;2",
+    "BLOOD_2_RUNE;3"
+  ],
+  "COUTURE_RUNE;1": [
+    "COUTURE_RUNE;2",
+    "COUTURE_RUNE;3"
+  ],
+  "DRAGON_RUNE;1": [
+    "DRAGON_RUNE;2",
+    "DRAGON_RUNE;3"
+  ],
+  "ENCHANT_RUNE;1": [
+    "ENCHANT_RUNE;2",
+    "ENCHANT_RUNE;3"
+  ],
+  "ENDERSNAKE_RUNE;1": [
+    "ENDERSNAKE_RUNE;2",
+    "ENDERSNAKE_RUNE;3"
+  ],
+  "FIRE_SPIRAL_RUNE;1": [
+    "FIRE_SPIRAL_RUNE;2",
+    "FIRE_SPIRAL_RUNE;3"
+  ],
+  "GEM_RUNE;1": [
+    "GEM_RUNE;2",
+    "GEM_RUNE;3"
+  ],
+  "GOLDEN_RUNE;1": [
+    "GOLDEN_RUNE;2",
+    "GOLDEN_RUNE;3"
+  ],
+  "HEARTS_RUNE;1": [
+    "HEARTS_RUNE;2",
+    "HEARTS_RUNE;3"
+  ],
+  "HOT_RUNE;1": [
+    "HOT_RUNE;2",
+    "HOT_RUNE;3"
+  ],
+  "ICE_RUNE;1": [
+    "ICE_RUNE;2",
+    "ICE_RUNE;3"
+  ],
+  "LAVA_RUNE;1": [
+    "LAVA_RUNE;2",
+    "LAVA_RUNE;3"
+  ],
+  "LIGHTNING_RUNE;1": [
+    "LIGHTNING_RUNE;2",
+    "LIGHTNING_RUNE;3"
+  ],
+  "MAGIC_RUNE;1": [
+    "MAGIC_RUNE;2",
+    "MAGIC_RUNE;3"
+  ],
+  "MUSIC_RUNE;1": [
+    "MUSIC_RUNE;2",
+    "MUSIC_RUNE;3"
+  ],
+  "RAINBOW_RUNE;1": [
+    "RAINBOW_RUNE;2",
+    "RAINBOW_RUNE;3"
+  ],
+  "REDSTONE_RUNE;1": [
+    "REDSTONE_RUNE;2",
+    "REDSTONE_RUNE;3"
+  ],
+  "SMOKEY_RUNE;1": [
+    "SMOKEY_RUNE;2",
+    "SMOKEY_RUNE;3"
+  ],
+  "SNAKE_RUNE;1": [
+    "SNAKE_RUNE;2",
+    "SNAKE_RUNE;3"
+  ],
+  "SNOW_RUNE;1": [
+    "SNOW_RUNE;2",
+    "SNOW_RUNE;3"
+  ],
+  "SPARKLING_RUNE;1": [
+    "SPARKLING_RUNE;2",
+    "SPARKLING_RUNE;3"
+  ],
+  "SPIRIT_RUNE;1": [
+    "SPIRIT_RUNE;2",
+    "SPIRIT_RUNE;3"
+  ],
+  "TIDAL_RUNE;1": [
+    "TIDAL_RUNE;2",
+    "TIDAL_RUNE;3"
+  ],
+  "WAKE_RUNE;1": [
+    "WAKE_RUNE;2",
+    "WAKE_RUNE;3"
+  ],
+  "WHITE_SPIRAL_RUNE;1": [
+    "WHITE_SPIRAL_RUNE;2",
+    "WHITE_SPIRAL_RUNE;3"
+  ],
+  "ZAP_RUNE;1": [
+    "ZAP_RUNE;2",
+    "ZAP_RUNE;3"
+  ],
+  "ZOMBIE_SLAYER_RUNE;1": [
+    "ZOMBIE_SLAYER_RUNE;2",
+    "ZOMBIE_SLAYER_RUNE;3"
+  ],
+  "PARTY_HAT_CRAB_AQUA": [
+    "PARTY_HAT_CRAB_BLACK",
+    "PARTY_HAT_CRAB_GREEN",
+    "PARTY_HAT_CRAB_LIME",
+    "PARTY_HAT_CRAB_ORANGE",
+    "PARTY_HAT_CRAB_PINK",
+    "PARTY_HAT_CRAB_PURPLE",
+    "PARTY_HAT_CRAB_RED",
+    "PARTY_HAT_CRAB_YELLOW"
+  ],
+  "AMETHYST_CRYSTAL": [
+    "AMBER_CRYSTAL",
+    "JADE_CRYSTAL",
+    "RUBY_CRYSTAL",
+    "SAPPHIRE_CRYSTAL",
+    "TOPAZ_CRYSTAL",
+    "JASPER_CRYSTAL"
+  ],
+  "LAVATEARS_RUNE;1": [
+    "LAVATEARS_RUNE;2",
+    "LAVATEARS_RUNE;3"
+  ],
+  "FIERY_BURST_RUNE;1": [
+    "FIERY_BURST_RUNE;2",
+    "FIERY_BURST_RUNE;3"
+  ],
   "OBFUSCATED_FISH_2_DIAMOND": [
     "OBFUSCATED_FISH_2_GOLD",
     "OBFUSCATED_FISH_2_SILVER",
@@ -2862,6 +3003,11 @@
     "FLAWED_OPAL_GEM",
     "ROUGH_OPAL_GEM"
   ],
+  "INFERNO_DEMONLORD_1_BOSS": [
+    "INFERNO_DEMONLORD_2_BOSS",
+    "INFERNO_DEMONLORD_3_BOSS",
+    "INFERNO_DEMONLORD_4_BOSS"
+  ],
   "SUBZERO_WISP;4": [
     "GLACIAL_WISP;3",
     "FROST_WISP;2",
@@ -2910,5 +3056,34 @@
   ],
   "RAT;5": [
     "RAT;4"
+  ],
+  "PISCARY;1": [
+    "PISCARY;2",
+    "PISCARY;3",
+    "PISCARY;4",
+    "PISCARY;5",
+    "PISCARY;6"
+  ],
+  "WATER_ORB": [
+    "LAVA_WATER_ORB",
+    "SPOOKY_WATER_ORB",
+    "SHARK_WATER_ORB",
+    "WINTER_WATER_ORB"
+  ],
+  "GILLSPLASH_BELT": [
+    "FINWAVE_BELT",
+    "ICHTHYIC_BELT"
+  ],
+  "GILLSPLASH_CLOAK": [
+    "FINWAVE_CLOAK",
+    "ICHTHYIC_CLOAK"
+  ],
+  "GILLSPLASH_GLOVES": [
+    "FINWAVE_GLOVES",
+    "ICHTHYIC_GLOVES"
+  ],
+  "ULTIMATE_BOBBIN_TIME;3": [
+    "ULTIMATE_BOBBIN_TIME;4",
+    "ULTIMATE_BOBBIN_TIME;5"
   ]
-}
+}
\ No newline at end of file
diff --git a/constants/petnums.json b/constants/petnums.json
index 199b4921..b338b203 100644
--- a/constants/petnums.json
+++ b/constants/petnums.json
@@ -4,9 +4,7 @@
       "1": {
         "otherNums": [
           0,
-          0,
-          0,
-          0
+          1
         ],
         "statNums": {
           "SEA_CREATURE_CHANCE": 0.12
@@ -15,9 +13,7 @@
       "100": {
         "otherNums": [
           1.0,
-          2.0,
-          2.0,
-          0.9
+          100
         ],
         "statNums": {
           "SEA_CREATURE_CHANCE": 12
@@ -849,7 +845,7 @@
     "COMMON": {
       "1": {
         "otherNums": [
-          0.0,
+          0.06,
           10.0,
           15.0
         ],
@@ -860,7 +856,7 @@
       },
       "100": {
         "otherNums": [
-          3,
+          6,
           10,
           15
         ],
@@ -885,7 +881,7 @@
       },
       "100": {
         "otherNums": [
-          5,
+          10,
           10,
           25,
           10
@@ -912,7 +908,7 @@
       },
       "100": {
         "otherNums": [
-          5,
+          10,
           10,
           25,
           10,
@@ -927,7 +923,7 @@
     "RARE": {
       "1": {
         "otherNums": [
-          0.0,
+          0.08,
           10.0,
           20.0,
           0.1
@@ -939,7 +935,7 @@
       },
       "100": {
         "otherNums": [
-          4,
+          8,
           10,
           20,
           7
@@ -953,7 +949,7 @@
     "UNCOMMON": {
       "1": {
         "otherNums": [
-          0.0,
+          0.08,
           10.0,
           20.0
         ],
@@ -964,7 +960,7 @@
       },
       "100": {
         "otherNums": [
-          4,
+          8,
           10,
           20
         ],
@@ -2088,7 +2084,6 @@
     "EPIC": {
       "1": {
         "otherNums": [
-          1.0,
           0.5,
           0.01
         ],
@@ -2098,7 +2093,6 @@
       },
       "100": {
         "otherNums": [
-          100,
           50,
           1
         ],
@@ -2110,7 +2104,6 @@
     "LEGENDARY": {
       "1": {
         "otherNums": [
-          1.0,
           0.5,
           0.01,
           0.5
@@ -2121,7 +2114,6 @@
       },
       "100": {
         "otherNums": [
-          100,
           50,
           1,
           50
@@ -5316,24 +5308,50 @@
     "LEGENDARY": {
       "1": {
         "otherNums": [
-          2.0,
+          2.05,
           20
         ],
         "statNums": {
-          "CRIT_DAMAGE": 0.0,
-          "HEALTH": 0.0,
-          "STRENGTH": 0.0
+          "CRIT_DAMAGE": 0.25,
+          "HEALTH": 1.25,
+          "STRENGTH": 0.6
         }
       },
       "100": {
         "otherNums": [
           7,
-          40
+          60
         ],
         "statNums": {
-          "CRIT_DAMAGE": 10.0,
-          "HEALTH": 100.0,
-          "STRENGTH": 50.0
+          "CRIT_DAMAGE": 25.0,
+          "HEALTH": 125.0,
+          "STRENGTH": 60.0
+        }
+      }
+    },
+    "MYTHIC": {
+      "1": {
+        "otherNums": [
+          2.05,
+          20
+        ],
+        "statNums": {
+          "CRIT_DAMAGE": 0.25,
+          "HEALTH": 2,
+          "STRENGTH": 0.6,
+          "SPEED": 100
+        }
+      },
+      "100": {
+        "otherNums": [
+          7,
+          60
+        ],
+        "statNums": {
+          "CRIT_DAMAGE": 25.0,
+          "HEALTH": 200.0,
+          "STRENGTH": 60.0,
+          "SPEED": 200
         }
       }
     }
diff --git a/constants/reforgestones.json b/constants/reforgestones.json
index fa6efc87..f46470c3 100644
--- a/constants/reforgestones.json
+++ b/constants/reforgestones.json
@@ -270,23 +270,28 @@
       },
       "UNCOMMON": {
         "crit_chance": 4,
-        "sea_creature_chance": 0.6
+        "sea_creature_chance": 0.6,
+        "fishing_speed": 1
       },
       "RARE": {
         "crit_chance": 6,
-        "sea_creature_chance": 0.7
+        "sea_creature_chance": 0.7,
+        "fishing_speed": 2
       },
       "EPIC": {
         "crit_chance": 8,
-        "sea_creature_chance": 0.8
+        "sea_creature_chance": 0.8,
+        "fishing_speed": 3
       },
       "LEGENDARY": {
         "crit_chance": 10,
-        "sea_creature_chance": 0.9
+        "sea_creature_chance": 0.9,
+        "fishing_speed": 4
       },
       "MYTHIC": {
         "crit_chance": 12,
-        "sea_creature_chance": 1
+        "sea_creature_chance": 1,
+        "fishing_speed": 5
       }
     }
   },