0.20.1 v2 changes (#1175)

55 files changed, 409 insertions, 436 deletions

diff --git a/constants/petnums.json b/constants/petnums.json
index 38495a2f..7b857127 100644
--- a/constants/petnums.json
+++ b/constants/petnums.json
@@ -2003,7 +2003,8 @@
         ],
         "statNums": {
           "SPEED": 0.2,
-          "CRIT_CHANCE": 0.1
+          "CRIT_CHANCE": 0.1,
+          "MAGIC_FIND": 0.07
         }
       },
       "100": {
@@ -2014,7 +2015,8 @@
         ],
         "statNums": {
           "SPEED": 20,
-          "CRIT_CHANCE": 10
+          "CRIT_CHANCE": 10,
+          "MAGIC_FIND": 7
         }
       }
     }
@@ -3046,7 +3048,8 @@
         ],
         "statNums": {
           "MINING_SPEED": 0.75,
-          "INTELLIGENCE": 1
+          "INTELLIGENCE": 1,
+          "MAGIC_FIND": 0.05
         }
       },
       "100": {
@@ -3057,7 +3060,8 @@
         ],
         "statNums": {
           "MINING_SPEED": 75,
-          "INTELLIGENCE": 100
+          "INTELLIGENCE": 100,
+          "MAGIC_FIND": 5
         }
       }
     }
@@ -3469,7 +3473,7 @@
           0.8
         ],
         "statNums": {
-          "SEA_CREATURE_CHANCE": 0.3
+          "SEA_CREATURE_CHANCE": 0.1
         }
       },
       "100": {
@@ -3479,7 +3483,7 @@
           75
         ],
         "statNums": {
-          "SEA_CREATURE_CHANCE": 30
+          "SEA_CREATURE_CHANCE": 10
         }
       }
     }
diff --git a/constants/reforgestones.json b/constants/reforgestones.json
index 2cdf9e57..98c6fc2a 100644
--- a/constants/reforgestones.json
+++ b/constants/reforgestones.json
@@ -123,32 +123,32 @@
       "COMMON": {
         "speed": 5,
         "farming_fortune": 5,
-        "farming_wisdom" : 1
+        "farming_wisdom": 1
       },
       "UNCOMMON": {
         "speed": 7,
         "farming_fortune": 7,
-        "farming_wisdom" : 2
+        "farming_wisdom": 2
       },
       "RARE": {
         "speed": 9,
         "farming_fortune": 9,
-        "farming_wisdom" : 3
+        "farming_wisdom": 3
       },
       "EPIC": {
         "speed": 13,
         "farming_fortune": 13,
-        "farming_wisdom" : 4
+        "farming_wisdom": 4
       },
       "LEGENDARY": {
         "speed": 16,
         "farming_fortune": 16,
-        "farming_wisdom" : 5
+        "farming_wisdom": 5
       },
       "MYTHIC": {
         "speed": 20,
         "farming_fortune": 20,
-        "farming_wisdom" : 6
+        "farming_wisdom": 6
       }
     }
   },
@@ -1136,32 +1136,38 @@
       "COMMON": {
         "strength": 30,
         "bonus_attack_speed": 2,
-        "crit_chance": 3
+        "crit_chance": 3,
+        "vitality": 2
       },
       "UNCOMMON": {
         "strength": 35,
         "bonus_attack_speed": 3,
-        "crit_chance": 4
+        "crit_chance": 4,
+        "vitality": 3
       },
       "RARE": {
         "strength": 40,
         "bonus_attack_speed": 4,
-        "crit_chance": 5
+        "crit_chance": 5,
+        "vitality": 4
       },
       "EPIC": {
         "strength": 50,
         "bonus_attack_speed": 6,
-        "crit_chance": 7
+        "crit_chance": 7,
+        "vitality": 6
       },
       "LEGENDARY": {
         "strength": 60,
         "bonus_attack_speed": 9,
-        "crit_chance": 8
+        "crit_chance": 8,
+        "vitality": 8
       },
       "MYTHIC": {
         "strength": 65,
         "bonus_attack_speed": 10,
-        "crit_chance": 10
+        "crit_chance": 10,
+        "vitality": 10
       }
     }
   },
@@ -1239,27 +1245,27 @@
     "reforgeStats": {
       "COMMON": {
         "speed": 1,
-        "farming_fortune" : 1
+        "farming_fortune": 1
       },
       "UNCOMMON": {
         "speed": 2,
-        "farming_fortune" : 2
+        "farming_fortune": 2
       },
       "RARE": {
         "speed": 3,
-        "farming_fortune" : 3
+        "farming_fortune": 3
       },
       "EPIC": {
         "speed": 5,
-        "farming_fortune" : 5
+        "farming_fortune": 5
       },
       "LEGENDARY": {
         "speed": 8,
-        "farming_fortune" : 7
+        "farming_fortune": 7
       },
       "MYTHIC": {
         "speed": 13,
-        "farming_fortune" : 10
+        "farming_fortune": 10
       }
     }
   },
@@ -1341,7 +1347,7 @@
     "reforgeName": "Jerry's",
     "reforgeType": "blacksmith/reforge_stone",
     "itemTypes": {
-      "internalName" : [
+      "internalName": [
         "ASPECT_OF_THE_JERRY",
         "ASPECT_OF_THE_JERRY_SIGNATURE"
       ]
@@ -1872,32 +1878,32 @@
       "COMMON": {
         "defense": 3,
         "intelligence": 1,
-        "mining_fortune" : 3
+        "mining_fortune": 3
       },
       "UNCOMMON": {
         "defense": 4,
         "intelligence": 1,
-        "mining_fortune" : 3
+        "mining_fortune": 3
       },
       "RARE": {
         "defense": 5,
         "intelligence": 1,
-        "mining_fortune" : 3
+        "mining_fortune": 3
       },
       "EPIC": {
         "defense": 7,
         "intelligence": 1,
-        "mining_fortune" : 3
+        "mining_fortune": 3
       },
       "LEGENDARY": {
         "defense": 9,
         "intelligence": 1,
-        "mining_fortune" : 3
+        "mining_fortune": 3
       },
       "MYTHIC": {
         "defense": 12,
         "intelligence": 1,
-        "mining_fortune" : 3
+        "mining_fortune": 3
       }
     }
   },
@@ -2550,39 +2556,39 @@
     "reforgeStats": {
       "COMMON": {
         "defense": 5,
-        "mining_wisdom" : 1
+        "mining_wisdom": 1
       },
       "UNCOMMON": {
         "defense": 7,
-        "mining_wisdom" : 2
+        "mining_wisdom": 2
       },
       "RARE": {
         "defense": 10,
-        "mining_wisdom" : 3
+        "mining_wisdom": 3
       },
       "EPIC": {
         "defense": 13,
-        "mining_wisdom" : 4
+        "mining_wisdom": 4
       },
       "LEGENDARY": {
         "defense": 16,
-        "mining_wisdom" : 5
+        "mining_wisdom": 5
       },
       "MYTHIC": {
         "defense": 20,
-        "mining_wisdom" : 6
+        "mining_wisdom": 6
       },
       "DIVINE": {
         "defense": 24,
-        "mining_wisdom" : 7
+        "mining_wisdom": 7
       },
       "SPECIAL": {
         "defense": 20,
-        "mining_wisdom" : 8
+        "mining_wisdom": 8
       },
       "VERY SPECIAL": {
         "defense": 20,
-        "mining_wisdom" : 9
+        "mining_wisdom": 9
       }
     }
   },
@@ -2613,31 +2619,31 @@
     "reforgeStats": {
       "COMMON": {
         "mining_speed": 7,
-        "mining_fortune" : 8
+        "mining_fortune": 8
       },
       "UNCOMMON": {
         "mining_speed": 14,
-        "mining_fortune" : 8
+        "mining_fortune": 8
       },
       "RARE": {
         "mining_speed": 23,
-        "mining_fortune" : 8
+        "mining_fortune": 8
       },
       "EPIC": {
         "mining_speed": 34,
-        "mining_fortune" : 8
+        "mining_fortune": 8
       },
       "LEGENDARY": {
         "mining_speed": 45,
-        "mining_fortune" : 8
+        "mining_fortune": 8
       },
       "MYTHIC": {
         "mining_speed": 65,
-        "mining_fortune" : 8
+        "mining_fortune": 8
       },
       "DIVINE": {
         "mining_speed": 75,
-        "mining_fortune" : 8
+        "mining_fortune": 8
       }
     }
   },
@@ -2903,32 +2909,32 @@
       "COMMON": {
         "crit_chance": 1,
         "crit_damage": 30,
-        "damage" : 15
+        "damage": 15
       },
       "UNCOMMON": {
         "crit_chance": 2,
         "crit_damage": 40,
-        "damage" : 15
+        "damage": 15
       },
       "RARE": {
         "crit_chance": 3,
         "crit_damage": 50,
-        "damage" : 15
+        "damage": 15
       },
       "EPIC": {
         "crit_chance": 5,
         "crit_damage": 65,
-        "damage" : 15
+        "damage": 15
       },
       "LEGENDARY": {
         "crit_chance": 7,
         "crit_damage": 85,
-        "damage" : 15
+        "damage": 15
       },
       "MYTHIC": {
         "crit_chance": 10,
         "crit_damage": 110,
-        "damage" : 15
+        "damage": 15
       }
     }
   },
@@ -3011,32 +3017,32 @@
     },
     "reforgeStats": {
       "COMMON": {
-        "intelligence": 2,
-        "mining_fortune": 5
+        "intelligence": 5,
+        "mining_fortune": 2
       },
       "UNCOMMON": {
-        "intelligence": 3,
-        "mining_fortune": 6
+        "intelligence": 6,
+        "mining_fortune": 3
       },
       "RARE": {
-        "intelligence": 4,
-        "mining_fortune": 8
+        "intelligence": 8,
+        "mining_fortune": 4
       },
       "EPIC": {
-        "intelligence": 5,
-        "mining_fortune": 10
+        "intelligence": 10,
+        "mining_fortune": 5
       },
       "LEGENDARY": {
-        "intelligence": 6,
-        "mining_fortune": 12
+        "intelligence": 12,
+        "mining_fortune": 6
       },
       "MYTHIC": {
-        "intelligence": 7,
-        "mining_fortune": 15
+        "intelligence": 15,
+        "mining_fortune": 7
       },
       "DIVINE": {
-        "intelligence": 8,
-        "mining_fortune": 16
+        "intelligence": 16,
+        "mining_fortune": 8
       }
     }
   },
@@ -3121,32 +3127,32 @@
       "COMMON": {
         "strength": 5,
         "crit_damage": 5,
-        "foraging_wisdom" : 1
+        "foraging_wisdom": 1
       },
       "UNCOMMON": {
         "strength": 7,
         "crit_damage": 7,
-        "foraging_wisdom" : 2
+        "foraging_wisdom": 2
       },
       "RARE": {
         "strength": 10,
         "crit_damage": 10,
-        "foraging_wisdom" : 3
+        "foraging_wisdom": 3
       },
       "EPIC": {
         "strength": 13,
         "crit_damage": 13,
-        "foraging_wisdom" : 4
+        "foraging_wisdom": 4
       },
       "LEGENDARY": {
         "strength": 16,
         "crit_damage": 16,
-        "foraging_wisdom" : 5
+        "foraging_wisdom": 5
       },
       "MYTHIC": {
         "strength": 20,
         "crit_damage": 20,
-        "foraging_wisdom" : 6
+        "foraging_wisdom": 6
       }
     }
   },
@@ -3155,7 +3161,7 @@
     "reforgeName": "Warped",
     "reforgeType": "blacksmith/reforge_stone",
     "itemTypes": {
-      "internalName" : [
+      "internalName": [
         "ASPECT_OF_THE_END",
         "ASPECT_OF_THE_VOID"
       ]
@@ -3286,4 +3292,4 @@
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/items/ADAPTIVE_BOOTS.json b/items/ADAPTIVE_BOOTS.json
index 215b3dbb..0f790d28 100644
--- a/items/ADAPTIVE_BOOTS.json
+++ b/items/ADAPTIVE_BOOTS.json
@@ -1,7 +1,7 @@
 {
   "itemid": "minecraft:leather_boots",
-  "displayname": "§f§f§5Adaptive Boots",
-  "nbttag": "{Unbreakable:1b,HideFlags:254,display:{Lore:[0:\"§7Gear Score: §d253\",1:\"§7Strength: §c+15\",2:\"§7Health: §a+90\",3:\"§7Defense: §a+45\",4:\"§7Intelligence: §a+15\",5:\" §8[§7☤§8]\",6:\"\",7:\"§6Full Set Bonus: Efficient training §7(0/4)\",8:\"§7Every §b5 §7Catacombs levels, this armor piece\",9:\"§7gains +§a2% §7stats.\",10:\"\",11:\"§7Grants additional bonuses based on your\",12:\"§7selected dungeon class!\",13:\"\",14:\"§7§bBerserk§7: §7+§c20❁ Strength\",15:\"§7§bHealer§7: §7+§a5☄ Mending§7, +§c40❤ Health\",16:\"§7§bMage§7: §7+§b50✎ Intelligence\",17:\"§7§bTank§7: §7+§a30❈ Defense§7 and reduces damage\",18:\"§7taken by §b5% §7for each piece you have equip if\",19:\"§7you are hit by the same monster within §e10\",20:\"§e§7seconds.\",21:\"§7§bArcher§7: §7+§95☣ Crit Chance§7, +§915☠ Crit Damage\",22:\"\",23:\"§7§8This item can be reforged!\",24:\"§7§4❣ §cRequires §aThe Catacombs Floor\",25:\"§aIII Completion§c.\",26:\"§5§lEPIC DUNGEON BOOTS\"],color:12565682,Name:\"§f§f§5Adaptive Boots\"},ExtraAttributes:{dungeon_item:1b,id:\"ADAPTIVE_BOOTS\"}}",
+  "displayname": "§5Adaptive Boots",
+  "nbttag": "{Unbreakable:1b,HideFlags:254,display:{Lore:[0:\"§7Gear Score: §d253\",1:\"§7Strength: §c+15\",2:\"§7Health: §a+90\",3:\"§7Defense: §a+45\",4:\"§7Intelligence: §a+15\",5:\" §8[§7☤§8]\",6:\"\",7:\"§6Full Set Bonus: Efficient training §7(0/4)\",8:\"§7Every §b5 §7Catacombs levels, this armor piece\",9:\"§7gains +§a2% §7stats.\",10:\"\",11:\"§7Grants additional bonuses based on your\",12:\"§7selected dungeon class!\",13:\"\",14:\"§7§bBerserk§7: §7+§c20❁ Strength\",15:\"§7§bHealer§7: §7+§a5☄ Mending§7, +§c40❤ Health\",16:\"§7§bMage§7: §7+§b50✎ Intelligence\",17:\"§7§bTank§7: §7+§a30❈ Defense§7 and reduces damage\",18:\"§7taken by §b5% §7for each piece you have equipped\",19:\"§7if you are hit by the same monster within §e10\",20:\"§e§7seconds.\",21:\"§7§bArcher§7: §7+§95☣ Crit Chance§7, +§915☠ Crit Damage\",22:\"\",23:\"§7§8This item can be reforged!\",24:\"§7§4❣ §cRequires §aThe Catacombs Floor\",25:\"§aIII Completion§c.\",26:\"§5§lEPIC DUNGEON BOOTS\"],color:12565682,Name:\"§5Adaptive Boots\"},ExtraAttributes:{dungeon_item:1b,id:\"ADAPTIVE_BOOTS\"}}",
   "damage": 0,
   "lore": [
     "§7Gear Score: §d253",
@@ -22,8 +22,8 @@
     "§7§bHealer§7: §7+§a5☄ Mending§7, +§c40❤ Health",
     "§7§bMage§7: §7+§b50✎ Intelligence",
     "§7§bTank§7: §7+§a30❈ Defense§7 and reduces damage",
-    "§7taken by §b5% §7for each piece you have equip if",
-    "§7you are hit by the same monster within §e10",
+    "§7taken by §b5% §7for each piece you have equipped",
+    "§7if you are hit by the same monster within §e10",
     "§e§7seconds.",
     "§7§bArcher§7: §7+§95☣ Crit Chance§7, +§915☠ Crit Damage",
     "",
@@ -35,7 +35,7 @@
   "internalname": "ADAPTIVE_BOOTS",
   "crafttext": "",
   "clickcommand": "",
-  "modver": "2.1.1-PRE",
+  "modver": "",
   "infoType": "WIKI_URL",
   "info": [
     "https://hypixel-skyblock.fandom.com/wiki/Adaptive_Armor",
diff --git a/items/ADAPTIVE_CHESTPLATE.json b/items/ADAPTIVE_CHESTPLATE.json
index d62e4a66..51ecb3b2 100644
--- a/items/ADAPTIVE_CHESTPLATE.json
+++ b/items/ADAPTIVE_CHESTPLATE.json
@@ -1,7 +1,7 @@
 {
   "itemid": "minecraft:leather_chestplate",
-  "displayname": "§f§f§5Adaptive Chestplate",
-  "nbttag": "{Unbreakable:1b,HideFlags:254,display:{Lore:[0:\"§7Gear Score: §d413\",1:\"§7Strength: §c+15\",2:\"§7Health: §a+170\",3:\"§7Defense: §a+85\",4:\"§7Intelligence: §a+15\",5:\" §8[§7☤§8]\",6:\"\",7:\"§6Full Set Bonus: Efficient training §7(0/4)\",8:\"§7Every §b5 §7Catacombs levels, this armor piece\",9:\"§7gains +§a2% §7stats.\",10:\"\",11:\"§7Grants additional bonuses based on your\",12:\"§7selected dungeon class!\",13:\"\",14:\"§7§bBerserk§7: §7+§c20❁ Strength\",15:\"§7§bHealer§7: §7+§a5☄ Mending§7, +§c40❤ Health\",16:\"§7§bMage§7: §7+§b50✎ Intelligence\",17:\"§7§bTank§7: §7+§a30❈ Defense§7 and reduces damage\",18:\"§7taken by §b5% §7for each piece you have equip if\",19:\"§7you are hit by the same monster within §e10\",20:\"§e§7seconds.\",21:\"§7§bArcher§7: §7+§95☣ Crit Chance§7, +§915☠ Crit Damage\",22:\"\",23:\"§7§8This item can be reforged!\",24:\"§7§4❣ §cRequires §aThe Catacombs Floor\",25:\"§aIII Completion§c.\",26:\"§5§lEPIC DUNGEON CHESTPLATE\"],color:12565682,Name:\"§f§f§5Adaptive Chestplate\"},ExtraAttributes:{dungeon_item:1b,id:\"ADAPTIVE_CHESTPLATE\"}}",
+  "displayname": "§5Adaptive Chestplate",
+  "nbttag": "{Unbreakable:1b,HideFlags:254,display:{Lore:[0:\"§7Gear Score: §d413\",1:\"§7Strength: §c+15\",2:\"§7Health: §a+170\",3:\"§7Defense: §a+85\",4:\"§7Intelligence: §a+15\",5:\" §8[§7☤§8]\",6:\"\",7:\"§6Full Set Bonus: Efficient training §7(0/4)\",8:\"§7Every §b5 §7Catacombs levels, this armor piece\",9:\"§7gains +§a2% §7stats.\",10:\"\",11:\"§7Grants additional bonuses based on your\",12:\"§7selected dungeon class!\",13:\"\",14:\"§7§bBerserk§7: §7+§c20❁ Strength\",15:\"§7§bHealer§7: §7+§a5☄ Mending§7, +§c40❤ Health\",16:\"§7§bMage§7: §7+§b50✎ Intelligence\",17:\"§7§bTank§7: §7+§a30❈ Defense§7 and reduces damage\",18:\"§7taken by §b5% §7for each piece you have equip if\",19:\"§7you are hit by the same monster within §e10\",20:\"§e§7seconds.\",21:\"§7§bArcher§7: §7+§95☣ Crit Chance§7, +§915☠ Crit Damage\",22:\"\",23:\"§7§8This item can be reforged!\",24:\"§7§4❣ §cRequires §aThe Catacombs Floor\",25:\"§aIII Completion§c.\",26:\"§5§lEPIC DUNGEON CHESTPLATE\"],color:12565682,Name:\"§5Adaptive Chestplate\"},ExtraAttributes:{dungeon_item:1b,id:\"ADAPTIVE_CHESTPLATE\"}}",
   "damage": 0,
   "lore": [
     "§7Gear Score: §d413",
@@ -35,7 +35,7 @@
   "internalname": "ADAPTIVE_CHESTPLATE",
   "crafttext": "",
   "clickcommand": "",
-  "modver": "2.1.1-PRE",
+  "modver": "",
   "infoType": "WIKI_URL",
   "info": [
     "https://hypixel-skyblock.fandom.com/wiki/Adaptive_Armor",
diff --git a/items/ADAPTIVE_HELMET.json b/items/ADAPTIVE_HELMET.json
index 9ee9de45..287fcee5 100644
--- a/items/ADAPTIVE_HELMET.json
+++ b/items/ADAPTIVE_HELMET.json
@@ -1,7 +1,7 @@
 {
   "itemid": "minecraft:skull",
-  "displayname": "§f§f§5Adaptive Helmet",
-  "nbttag": "{HideFlags:254,SkullOwner:{Id:\"1756e280-9a64-3027-9c50-553d59999221\",Properties:{textures:[0:{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMTZmMGQzNGFhYTcxNDM3Nzk4MzcwMWMxYmJlOWIzZjZlN2IzMGNiMzg1NzFiYzBhMmZkNzU0MWQ3ZWRiMTYzNyJ9fX0K\"}]}},display:{Lore:[0:\"§7Gear Score: §d283\",1:\"§7Strength: §c+15\",2:\"§7Health: §a+110\",3:\"§7Defense: §a+50\",4:\"§7Intelligence: §a+15\",5:\" §8[§7☤§8]\",6:\"\",7:\"§6Full Set Bonus: Efficient training §7(0/4)\",8:\"§7Every §b5 §7Catacombs levels, this armor piece\",9:\"§7gains +§a2% §7stats.\",10:\"\",11:\"§7Grants additional bonuses based on your\",12:\"§7selected dungeon class!\",13:\"\",14:\"§7§bBerserk§7: §7+§c20❁ Strength\",15:\"§7§bHealer§7: §7+§a5☄ Mending§7, +§c40❤ Health\",16:\"§7§bMage§7: §7+§b50✎ Intelligence\",17:\"§7§bTank§7: §7+§a30❈ Defense§7 and reduces damage\",18:\"§7taken by §b5% §7for each piece you have equip if\",19:\"§7you are hit by the same monster within §e10\",20:\"§e§7seconds.\",21:\"§7§bArcher§7: §7+§95☣ Crit Chance§7, +§915☠ Crit Damage\",22:\"\",23:\"§7§8This item can be reforged!\",24:\"§7§4❣ §cRequires §aThe Catacombs Floor\",25:\"§aIII Completion§c.\",26:\"§5§lEPIC DUNGEON HELMET\"],Name:\"§f§f§5Adaptive Helmet\"},ExtraAttributes:{dungeon_item:1b,id:\"ADAPTIVE_HELMET\"}}",
+  "displayname": "§5Adaptive Helmet",
+  "nbttag": "{HideFlags:254,SkullOwner:{Id:\"1756e280-9a64-3027-9c50-553d59999221\",Properties:{textures:[0:{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMTZmMGQzNGFhYTcxNDM3Nzk4MzcwMWMxYmJlOWIzZjZlN2IzMGNiMzg1NzFiYzBhMmZkNzU0MWQ3ZWRiMTYzNyJ9fX0K\"}]}},display:{Lore:[0:\"§7Gear Score: §d283\",1:\"§7Strength: §c+15\",2:\"§7Health: §a+110\",3:\"§7Defense: §a+50\",4:\"§7Intelligence: §a+15\",5:\" §8[§7☤§8]\",6:\"\",7:\"§6Full Set Bonus: Efficient training §7(0/4)\",8:\"§7Every §b5 §7Catacombs levels, this armor piece\",9:\"§7gains +§a2% §7st