Update mobs sea creatures (#1454)

* add dwarven os block bran

* Revert "add dwarven os block bran"

This reverts commit 40826e597e65447ad91cc727d664c24896c0cf61.

* first test

* test if combat xp shows up or if cache

* test if combat xp and farming xp works

* see if i added multiple levels of mobs correctly

* see if i added multiple levels of mobs correctly

* see if i added multiple levels of mobs correctly second time

* test if mobs can have different names under the same nest

* see if i added silverfish correctly

* fix background maybe

* check on spider changes

* test of adding a new mob what could go wrong

* this time

* maybe it's in the correct section now?

* bat update 2

* wrong one

* idk anymore pls just work

* 3

* maybe this?

* test with another skin

* test with another skin with the correct id

* idk anymore

* 3

* 4

* 5

* 6

* test this?

* test the same item multiple times

* test using ranges and key ids

* test using ranges and key ids

* slime test

* test goblins

* lets find out if i can do this

* upload progress

* test of fish

* a few more sea creatures

* revert dye chances, my fault :(

* remove unneeded file and fix bat lore

* forgot a comma

* fix dye drop chances

* how do i keep missing these omg sorry

* :( poor jani

* fix dye chance, fix formatting

* magma cube pet drop changes

* use the right pet this time

* test carnival ticket

* test winter sea creatures

* test winter sea creatures part 2

* change frozen steve ice essence chance based off wiki instead of in game

29 files changed, 138 insertions, 88 deletions

diff --git a/items/BLUE_SHARK_SC.json b/items/BLUE_SHARK_SC.json
index 1a4a0bf9..adcd2921 100644
--- a/items/BLUE_SHARK_SC.json
+++ b/items/BLUE_SHARK_SC.json
@@ -25,8 +25,8 @@
     {
       "name": "§cBlue Shark",
       "level": 20,
-      "coins": 20,
-      "xp": 80,
+      "coins": 10,
+      "xp": 40,
       "render": "@neurepo:mobs/blue_shark.json",
       "panorama": "hub",
       "type": "drops",
@@ -38,12 +38,16 @@
       ],
       "drops": [
         {
-          "id": "SHARK_FIN",
+          "id": "SHARK_FIN:4",
           "chance": "100%"
         },
         {
           "id": "BLUE_SHARK_TOOTH",
           "chance": "10%"
+        },
+        {
+          "id": "CARNIVAL_TICKET",
+          "chance": "0.15%"
         }
       ]
     }
diff --git a/items/FLAMING_WORM_SC.json b/items/FLAMING_WORM_SC.json
index 6c74e0e1..b15bbffd 100644
--- a/items/FLAMING_WORM_SC.json
+++ b/items/FLAMING_WORM_SC.json
@@ -35,8 +35,8 @@
       ],
       "drops": [
         {
-          "id": "ROUGH_SAPPHIRE_GEM:20",
-          "chance": "100%"
+          "id": "ROUGH_SAPPHIRE_GEM",
+          "chance": "x20-30"
         },
         {
           "id": "ETERNAL_FLAME_RING",
diff --git a/items/FROSTY_SC.json b/items/FROSTY_SC.json
index 1388a13e..de9df7ee 100644
--- a/items/FROSTY_SC.json
+++ b/items/FROSTY_SC.json
@@ -46,7 +46,7 @@
           "chance": "100%"
         },
         {
-          "id": "CARROT_ITEM:2",
+          "id": "CARROT_ITEM",
           "chance": "100%"
         },
         {
@@ -59,13 +59,17 @@
         },
         {
           "id": "WHITE_GIFT",
-          "chance": "40%"
+          "chance": "100%"
         },
         {
           "id": "ICE_HUNK:2",
           "chance": "100%"
         },
         {
+          "id": "ESSENCE_ICE",
+          "chance": "x2"
+        },
+        {
           "id": "DYE_ICEBERG",
           "extra": [],
           "chance": "0.0001%"
diff --git a/items/FROZEN_STEVE_SC.json b/items/FROZEN_STEVE_SC.json
index eca81e68..a0480852 100644
--- a/items/FROZEN_STEVE_SC.json
+++ b/items/FROZEN_STEVE_SC.json
@@ -38,28 +38,28 @@
       ],
       "drops": [
         {
-          "id": "ICE:2",
-          "chance": "100%"
+          "id": "ICE",
+          "chance": "x2-3"
         },
         {
           "id": "WATER_LILY",
           "chance": "100%"
         },
         {
-          "id": "RAW_FISH-2",
-          "chance": "50%"
+          "id": "RAW_FISH:3",
+          "chance": "100%"
         },
         {
-          "id": "RAW_FISH:2",
+          "id": "RAW_FISH-1:2",
           "chance": "100%"
         },
         {
-          "id": "RAW_FISH-1:3",
-          "chance": "100%"
+          "id": "RAW_FISH-3",
+          "chance": "50%"
         },
         {
           "id": "WHITE_GIFT",
-          "chance": "10%"
+          "chance": "100%"
         },
         {
           "id": "ICE_HUNK",
@@ -70,6 +70,10 @@
           "chance": "4%"
         },
         {
+          "id": "ESSENCE_ICE",
+          "chance": "25%"
+        },
+        {
           "id": "DYE_ICEBERG",
           "extra": [],
           "chance": "0.0001%"
diff --git a/items/GREAT_WHITE_SHARK_SC.json b/items/GREAT_WHITE_SHARK_SC.json
index 549a4151..c59931c4 100644
--- a/items/GREAT_WHITE_SHARK_SC.json
+++ b/items/GREAT_WHITE_SHARK_SC.json
@@ -48,6 +48,10 @@
         {
           "id": "MEGALODON;4",
           "chance": "1%"
+        },
+        {
+          "id": "CARNIVAL_TICKET",
+          "chance": "0.5%"
         }
       ]
     }
diff --git a/items/GRIM_REAPER_SC.json b/items/GRIM_REAPER_SC.json
index a06a98bc..845a7d11 100644
--- a/items/GRIM_REAPER_SC.json
+++ b/items/GRIM_REAPER_SC.json
@@ -38,11 +38,15 @@
       ],
       "drops": [
         {
-          "id": "WATER_LILY:32",
-          "chance": "§fUncommon 25%"
+          "id": "SPONGE",
+          "chance": "x2-4"
         },
         {
-          "id": "GREEN_CANDY:17",
+          "id": "WATER_LILY",
+          "chance": "x32-44"
+        },
+        {
+          "id": "GREEN_CANDY:7",
           "chance": "100%"
         },
         {
@@ -50,8 +54,8 @@
           "chance": "1%"
         },
         {
-          "id": "PURPLE_CANDY:3",
-          "chance": "100%"
+          "id": "PURPLE_CANDY",
+          "chance": "x3-5"
         },
         {
           "id": "SOUL_FRAGMENT",
diff --git a/items/GRINCH_SC.json b/items/GRINCH_SC.json
index f8e02ae4..15b47b3a 100644
--- a/items/GRINCH_SC.json
+++ b/items/GRINCH_SC.json
@@ -42,7 +42,7 @@
           "chance": "100%"
         },
         {
-          "id": "GREEN_GIFT",
+          "id": "GREEN_GIFT:1",
           "chance": "100%"
         },
         {
@@ -50,6 +50,10 @@
           "chance": "100%"
         },
         {
+          "id": "ESSENCE_ICE:4",
+          "chance": "100%"
+        },
+        {
           "id": "DYE_ICEBERG",
           "extra": [],
           "chance": "0.0002%"
diff --git a/items/LAVA_BLAZE_SC.json b/items/LAVA_BLAZE_SC.json
index 232f42f6..eb6a48e1 100644
--- a/items/LAVA_BLAZE_SC.json
+++ b/items/LAVA_BLAZE_SC.json
@@ -35,6 +35,10 @@
       "drops": [
         {
           "id": "ROUGH_TOPAZ_GEM",
+          "chance": "x20-30"
+        },
+        {
+          "id": "BLAZE_ROD:5",
           "chance": "100%"
         },
         {
diff --git a/items/LAVA_PIGMAN_SC.json b/items/LAVA_PIGMAN_SC.json
index 052d5798..f123a3ca 100644
--- a/items/LAVA_PIGMAN_SC.json
+++ b/items/LAVA_PIGMAN_SC.json
@@ -35,7 +35,7 @@
       "drops": [
         {
           "id": "ROUGH_TOPAZ_GEM",
-          "chance": "100%"
+          "chance": "x20-30"
         },
         {
           "id": "ETERNAL_FLAME_RING",
diff --git a/items/LORD_JAWBUS_SC.json b/items/LORD_JAWBUS_SC.json
index dd509ed5..ccc16aa6 100644
--- a/items/LORD_JAWBUS_SC.json
+++ b/items/LORD_JAWBUS_SC.json
@@ -27,7 +27,7 @@
       "name": "§cLord Jawbus",
       "coins": 10000,
       "level": 600,
-      "xp": 20000,
+      "xp": 10000,
       "render": "Eisengolem",
       "panorama": "crimson_isle",
       "type": "drops",
diff --git a/items/MOOGMA_SC.json b/items/MOOGMA_SC.json
index ef66eaa1..d27c44d5 100644
--- a/items/MOOGMA_SC.json
+++ b/items/MOOGMA_SC.json
@@ -40,8 +40,8 @@
           "chance": "2%"
         },
         {
-          "id": "MOOGMA_PELT:1",
-          "chance": "100%"
+          "id": "MOOGMA_PELT",
+          "chance": "x1-2"
         },
         {
           "id": "DYE_CARMINE",
diff --git a/items/NIGHTMARE_SC.json b/items/NIGHTMARE_SC.json
index a204ab19..b6826a16 100644
--- a/items/NIGHTMARE_SC.json
+++ b/items/NIGHTMARE_SC.json
@@ -38,8 +38,8 @@
       ],
       "drops": [
         {
-          "id": "WATER_LILY:6",
-          "chance": "100%"
+          "id": "WATER_LILY",
+          "chance": "x6-9"
         },
         {
           "id": "GREEN_CANDY:2",
@@ -50,8 +50,8 @@
           "chance": "1%"
         },
         {
-          "id": "PURPLE_CANDY:32",
-          "chance": "25%"
+          "id": "PURPLE_CANDY",
+          "chance": "20%"
         },
         {
           "id": "ENCHANTED_ROTTEN_FLESH",
diff --git a/items/NURSE_SHARK_SC.json b/items/NURSE_SHARK_SC.json
index 0ec97c6f..54d77150 100644
--- a/items/NURSE_SHARK_SC.json
+++ b/items/NURSE_SHARK_SC.json
@@ -44,6 +44,10 @@
         {
           "id": "NURSE_SHARK_TOOTH",
           "chance": "10%"
+        },
+        {
+          "id": "CARNIVAL_TICKET",
+          "chance": "0.1%"
         }
       ]
     }
diff --git a/items/NUTCRACKER_SC.json b/items/NUTCRACKER_SC.json
index faf0b70e..43f1d26d 100644
--- a/items/NUTCRACKER_SC.json
+++ b/items/NUTCRACKER_SC.json
@@ -46,7 +46,7 @@
           "chance": "100%"
         },
         {
-          "id": "WATER_LILY:120",
+          "id": "WATER_LILY",
           "chance": "50%"
         },
         {
diff --git a/items/PHANTOM_FISHER_SC.json b/items/PHANTOM_FISHER_SC.json
index 0050eb73..d1dee1a5 100644
--- a/items/PHANTOM_FISHER_SC.json
+++ b/items/PHANTOM_FISHER_SC.json
@@ -38,8 +38,8 @@
       ],
       "drops": [
         {
-          "id": "WATER_LILY:16",
-          "chance": "100%"
+          "id": "WATER_LILY",
+          "chance": "x16-22"
         },
         {
           "id": "GREEN_CANDY:5",
@@ -50,8 +50,8 @@
           "chance": "1%"
         },
         {
-          "id": "PURPLE_CANDY:2",
-          "chance": "100%"
+          "id": "PURPLE_CANDY",
+          "chance": "x2-3"
         },
         {
           "id": "PHANTOM_ROD",
diff --git a/items/POND_SQUID_SC.json b/items/POND_SQUID_SC.json
index df1425e4..b38fd732 100644
--- a/items/POND_SQUID_SC.json
+++ b/items/POND_SQUID_SC.json
@@ -37,7 +37,7 @@
       "drops": [
         {
           "id": "WATER_LILY",
-          "chance": "x1-2"
+          "chance": "100%"
         },
         {
           "id": "INK_SACK",
diff --git a/items/PYROCLASTIC_WORM_SC.json b/items/PYROCLASTIC_WORM_SC.json
index dda4da58..40e52628 100644
--- a/items/PYROCLASTIC_WORM_SC.json
+++ b/items/PYROCLASTIC_WORM_SC.json
@@ -20,7 +20,7 @@
   "recipes": [
     {
       "level": 240,
-      "coins": 100,
+      "coins": 200,
       "xp": 400,
       "name": "§cPyroclastic Worm",
       "render": "@neurepo:mobs/pyroclastic_worm.json",
diff --git a/items/REINDRAKE_SC.json b/items/REINDRAKE_SC.json
index 6198962f..247029b6 100644
--- a/items/REINDRAKE_SC.json
+++ b/items/REINDRAKE_SC.json
@@ -22,6 +22,7 @@
   "crafttext": "",
   "recipes": [
     {
+      "level": 100,
       "name": "§cReindrake",
       "panorama": "winter",
       "render": "Dragon",
@@ -35,15 +36,15 @@
       "drops": [
         {
           "id": "WHITE_GIFT",
-          "chance": "65%"
+          "chance": "100% + 65% per hit"
         },
         {
           "id": "GREEN_GIFT",
-          "chance": "25%"
+          "chance": "100% + 25% per hit"
         },
         {
           "id": "RED_GIFT",
-          "chance": "10%"
+          "chance": "10% + 10% per hit"
         },
         {
           "id": "PROSPERITY;1",
@@ -51,6 +52,11 @@
             "Only drops for the player who spawned the Reindrake"
           ],
           "chance": "100%"
+        },
+        {
+          "id": "DYE_ICEBERG",
+          "extra": [],
+          "chance": "0.002%"
         }
       ]
     }
diff --git a/items/SCARECROW_SC.json b/items/SCARECROW_SC.json
index 8476f459..305d0f6c 100644
--- a/items/SCARECROW_SC.json
+++ b/items/SCARECROW_SC.json
@@ -38,8 +38,8 @@
       ],
       "drops": [
         {
-          "id": "WATER_LILY:3",
-          "chance": "100%"
+          "id": "WATER_LILY",
+          "chance": "x3-5"
         },
         {
           "id": "GREEN_CANDY:1",
diff --git a/items/SEA_EMPEROR_SC.json b/items/SEA_EMPEROR_SC.json
index 97c7afbb..c24d239a 100644
--- a/items/SEA_EMPEROR_SC.json
+++ b/items/SEA_EMPEROR_SC.json
@@ -25,8 +25,8 @@
     {
       "name": "§cSea Emperor",
       "level": 150,
-      "coins": 13,
-      "xp": 30,
+      "coins": 150,
+      "xp": 120,
       "render": "@neurepo:mobs/sea_emperor.json",
       "panorama": "hub",
       "type": "drops",
@@ -53,16 +53,16 @@
           "chance": "100%"
         },
         {
-          "id": "PRISMARINE_CRYSTALS",
+          "id": "ENCHANTED_PRISMARINE_CRYSTALS",
           "chance": "50%"
         },
         {
-          "id": "PRISMARINE_SHARD",
+          "id": "ENCHANTED_PRISMARINE_SHARD",
           "chance": "50%"
         },
         {
-          "id": "SPONGE:2",
-          "chance": "75%"
+          "id": "SPONGE",
+          "chance": "x2-3"
         },
         {
           "id": "FLYING_FISH;2",
@@ -95,7 +95,7 @@
         {
           "id": "DYE_AQUAMARINE",
           "extra": [],
-          "chance": "0.001%"
+          "chance": "0.002%"
         }
       ]
     }
diff --git a/items/SEA_GUARDIAN_SC.json b/items/SEA_GUARDIAN_SC.json
index c24a85b8..eae7ca3b 100644
--- a/items/SEA_GUARDIAN_SC.json
+++ b/items/SEA_GUARDIAN_SC.json
@@ -38,15 +38,15 @@
       "drops": [
         {
           "id": "WATER_LILY",
-          "chance": "100%"
+          "chance": "x1-2"
         },
         {
-          "id": "PRISMARINE_CRYSTALS:2",
-          "chance": "100%"
+          "id": "PRISMARINE_CRYSTALS",
+          "chance": "x2-3"
         },
         {
-          "id": "PRISMARINE_SHARD:2",
-          "chance": "100%"
+          "id": "PRISMARINE_SHARD",
+          "chance": "x2-3"
         },
         {
           "id": "SEA_LANTERN",
diff --git a/items/SEA_LEECH_SC.json b/items/SEA_LEECH_SC.json
index d427fe20..8c1e991e 100644
--- a/items/SEA_LEECH_SC.json
+++ b/items/SEA_LEECH_SC.json
@@ -37,8 +37,8 @@
       ],
       "drops": [
         {
-          "id": "WATER_LILY:3",
-          "chance": "100%"
+          "id": "WATER_LILY",
+          "chance": "x3-4"
         },
         {
           "id": "RAW_FISH:10",
diff --git a/items/SEA_WALKER_SC.json b/items/SEA_WALKER_SC.json
index 1eaa8e58..9c30ec21 100644
--- a/items/SEA_WALKER_SC.json
+++ b/items/SEA_WALKER_SC.json
@@ -38,15 +38,15 @@
       ],
       "drops": [
         {
-          "id": "ROTTEN_FLESH:5",
-          "chance": "100%"
+          "id": "ROTTEN_FLESH",
+          "chance": "x5-9"
         },
         {
           "id": "RAW_FISH:2",
           "chance": "100%"
         },
         {
-          "id": "WATER_LILY:2",
+          "id": "WATER_LILY",
           "chance": "100%"
         },
         {
diff --git a/items/SEA_WITCH_SC.json b/items/SEA_WITCH_SC.json
index 5c8315cb..2a13595a 100644
--- a/items/SEA_WITCH_SC.json
+++ b/items/SEA_WITCH_SC.json
@@ -37,15 +37,15 @@
       "drops": [
         {
           "id": "WATER_LILY",
-          "chance": "100%"
+          "chance": "x1-2"
         },
         {
-          "id": "RAW_FISH-2",
-          "chance": "100%"
+          "id": "RAW_FISH-1",
+          "chance": "x1-3"
         },
         {
-          "id": "RAW_FISH-1",
-          "chance": "100%"
+          "id": "RAW_FISH-2",
+          "chance": "20%"
         },
         {
           "id": "FAIRY_HELMET",
diff --git a/items/TIGER_SHARK_SC.json b/items/TIGER_SHARK_SC.json
index 2a2b61cb..a71a7a1d 100644
--- a/items/TIGER_SHARK_SC.json
+++ b/items/TIGER_SHARK_SC.json
@@ -48,6 +48,10 @@
         {
           "id": "MEGALODON;3",
           "chance": "1%"
+        },
+        {
+          "id": "CARNIVAL_TICKET",
+          "chance": "0.25%"
         }
       ]
     }
diff --git a/items/WATER_HYDRA_SC.json b/items/WATER_HYDRA_SC.json
index 5d96aea0..f202cdff 100644
--- a/items/WATER_HYDRA_SC.json
+++ b/items/WATER_HYDRA_SC.json
@@ -26,8 +26,8 @@
     {
       "name": "§cWater Hydra",
       "level": 100,
-      "coins": 1,
-      "xp": 1,
+      "coins": 200,
+      "xp": 200,
       "render": "@neurepo:mobs/water_hydra.json",
       "panorama": "crystal_hollows",
       "type": "drops",
@@ -38,40 +38,40 @@
       ],
       "drops": [
         {
-          "id": "RAW_FISH:10",
+          "id": "RAW_FISH:20",
           "chance": "100%"
         },
         {
-          "id": "RAW_FISH-2",
+          "id": "RAW_FISH-2:2",
           "chance": "100%"
         },
         {
-          "id": "RAW_FISH-1",
+          "id": "RAW_FISH-1:2",
           "chance": "100%"
         },
         {
-          "id": "RAW_FISH-3",
+          "id": "RAW_FISH-3:2",
           "chance": "100%"
         },
         {
           "id": "SPONGE",
-          "chance": "50%"
+          "chance": "100%"
         },
         {
-          "id": "WATER_LILY:8",
-          "chance": "75%"
+          "id": "WATER_LILY",
+          "chance": "x16-18"
         },
         {
           "id": "FISH_AFFINITY_TALISMAN",
-          "chance": "15%"
+          "chance": "30%"
         },
         {
           "id": "WATER_HYDRA_HEAD",
-          "chance": "7%"
+          "chance": "14%"
         },
         {
           "id": "PET_ITEM_FISHING_SKILL_BOOST_EPIC",
-          "chance": "0.02%"
+          "chance": "0.04%"
         },
         {
           "id": "LUCK_OF_THE_SEA;6",
@@ -80,7 +80,7 @@
         {
           "id": "DYE_AQUAMARINE",
           "extra": [],
-          "chance": "0.001%"
+          "chance": "0.002%"
         }
       ]
     }
diff --git a/items/WATER_WORM_SC.json b/items/WATER_WORM_SC.json
index 9d9720c7..4da79f5d 100644
--- a/items/WATER_WORM_SC.json
+++ b/items/WATER_WORM_SC.json
@@ -35,8 +35,8 @@
       ],
       "drops": [
         {
-          "id": "ROUGH_AMBER_GEM:20",
-          "chance": "100%"
+          "id": "ROUGH_AMBER_GEM",
+          "chance": "x10-17"
         },
         {
           "id": "WORM_MEMBRANE",
diff --git a/items/WEREWOLF_SC.json b/items/WEREWOLF_SC.json
index ce9832bd..64eb59ec 100644
--- a/items/WEREWOLF_SC.json
+++ b/items/WEREWOLF_SC.json
@@ -38,8 +38,8 @@
       ],
       "drops": [
         {
-          "id": "WATER_LILY:8",
-          "chance": "100%"
+          "id": "WATER_LILY",
+          "chance": "x8-11"
         },
         {
           "id": "GREEN_CANDY:2",
@@ -50,12 +50,12 @@
           "chance": "0.1%"
         },
         {
-          "id": "PURPLE_CANDY:1",
-          "chance": "100%"
+          "id": "PURPLE_CANDY",
+          "chance": "x1-2"
         },
         {
           "id": "WEREWOLF_SKIN",
-          "chance": "100%"
+          "chance": "x1-2"
         },
         {
           "id": "DYE_MIDNIGHT",
diff --git a/items/YETI_SC.json b/items/YETI_SC.json
index 74108163..d32863dd 100644
--- a/items/YETI_SC.json
+++ b/items/YETI_SC.json
@@ -43,8 +43,12 @@
           "chance": "100%"
         },
         {
-          "id": "WATER_LILY:32",
-          "chance": "25%"
+          "id": "WATER_LILY",
+          "chance": "x32-44"
+        },
+        {
+          "id": "ENCHANTED_WATER_LILY:1",
+          "chance": "100%"
         },
         {
           "id": "RAW_FISH:20",
@@ -52,11 +56,11 @@
         },
         {
           "id": "SPONGE",
-          "chance": "100%"
+          "chance": "x2-4"
         },
         {
-          "id": "BLUE_ICE_HUNK:2",
-          "chance": "100%"
+          "id": "BLUE_ICE_HUNK",
+          "chance": "x2-5"
         },
         {
           "id": "RED_GIFT",
@@ -87,6 +91,10 @@
           "chance": "1.8%"
         },
         {
+          "id": "ESSENCE_ICE:10",
+          "chance": "100%"
+        },
+        {
           "id": "DYE_ICEBERG",
           "extra": [],
           "chance": "0.002%"