feat: New Bal skin/Gem Gauntlet fix/armadillo fix (#1362)

3 files changed, 37 insertions, 15 deletions

diff --git a/constants/petnums.json b/constants/petnums.json
index a92cb09f..b5dc4bea 100644
--- a/constants/petnums.json
+++ b/constants/petnums.json
@@ -166,7 +166,7 @@
       "1": {
         "otherNums": [
           59.6,
-          5.0
+          3
         ],
         "statNums": {
           "DEFENSE": 2.0
@@ -175,7 +175,7 @@
       "100": {
         "otherNums": [
           20.0,
-          500
+          300
         ],
         "statNums": {
           "DEFENSE": 200
diff --git a/items/GEMSTONE_GAUNTLET.json b/items/GEMSTONE_GAUNTLET.json
index 33253564..4e2be442 100644
--- a/items/GEMSTONE_GAUNTLET.json
+++ b/items/GEMSTONE_GAUNTLET.json
@@ -1,7 +1,7 @@
 {
   "itemid": "minecraft:skull",
   "displayname": "§6Gemstone Gauntlet",
-  "nbttag": "{HideFlags:254,SkullOwner:{Id:\"4d32846a-7945-345a-8f48-f107f6c92b15\",Properties:{textures:[0:{Value:\"ewogICJ0aW1lc3RhbXAiIDogMTYyMDIzOTE2MTcwMywKICAicHJvZmlsZUlkIiA6ICI5ZDIyZGRhOTVmZGI0MjFmOGZhNjAzNTI1YThkZmE4ZCIsCiAgInByb2ZpbGVOYW1lIiA6ICJTYWZlRHJpZnQ0OCIsCiAgInNpZ25hdHVyZVJlcXVpcmVkIiA6IHRydWUsCiAgInRleHR1cmVzIiA6IHsKICAgICJTS0lOIiA6IHsKICAgICAgInVybCIgOiAiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS83YmYwMWMxOThmNmUxNjk2NWUyMzAyMzVjZDIyYTVhOWY0YTQwZTQwOTQxMjM0NDc4OTQ4ZmY5YTU2ZTUxNzc1IgogICAgfQogIH0KfQ\"}]}},display:{Lore:[0:\"§8Breaking Power 8\",1:\"\",2:\"§7Damage: §c+300\",3:\"§7Strength: §c+50\",4:\"§7Mining Speed: §a+800\",5:\" §8[§7☘§8] §8[§7⸕§8] §8[§7✧§8] §8[§7✎§8] §8[§7❈§8]\",6:\"\",7:\"§7§6Ability: Reduced To Atoms\",8:\"§7Kill mobs on §bMining Islands §7to charge the\",9:\"§7§cGauntlet Meter§7. Mobs killed drop the same\",10:\"§7§dGemstone §7type as your filled Gemstone Slots.\",11:\"§7\",12:\"§7§6Ability: Kinetic\",13:\"§7Killing a mob on a §bMining Island §7reduces all of\",14:\"§7your §6Forge Timers §7by §a0s§7.\",15:\"§7§8(+0.5s per Perfect Gemstone)\",16:\"§7\",17:\"§7§6Ability: Gemstone Snap  §e§lSNEAK RIGHT CLICK\",18:\"§7§7When the §cGauntlet Meter §7is full, gain\",19:\"§7§7§6+50☘ Mining Fortune §7for §a60m§7.\",20:\"§7§7[§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§7] §e0§7/§a150\",21:\"§7§8(Does not stack)\",22:\"\",23:\"§7§8This item can be reforged!\",24:\"§7§4❣ §cRequires §5Heart of the Mountain Tier 6§c.\",25:\"§6§lLEGENDARY GAUNTLET\"],Name:\"§6Gemstone Gauntlet\"},ExtraAttributes:{id:\"GEMSTONE_GAUNTLET\"}}",
+  "nbttag": "{HideFlags:254,SkullOwner:{Id:\"4d32846a-7945-345a-8f48-f107f6c92b15\",Properties:{textures:[0:{Value:\"ewogICJ0aW1lc3RhbXAiIDogMTYyMDIzOTE2MTcwMywKICAicHJvZmlsZUlkIiA6ICI5ZDIyZGRhOTVmZGI0MjFmOGZhNjAzNTI1YThkZmE4ZCIsCiAgInByb2ZpbGVOYW1lIiA6ICJTYWZlRHJpZnQ0OCIsCiAgInNpZ25hdHVyZVJlcXVpcmVkIiA6IHRydWUsCiAgInRleHR1cmVzIiA6IHsKICAgICJTS0lOIiA6IHsKICAgICAgInVybCIgOiAiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS83YmYwMWMxOThmNmUxNjk2NWUyMzAyMzVjZDIyYTVhOWY0YTQwZTQwOTQxMjM0NDc4OTQ4ZmY5YTU2ZTUxNzc1IgogICAgfQogIH0KfQ\"}]}},display:{Lore:[0:\"§8Breaking Power 8\",1:\"\",2:\"§7Damage: §c+300\",3:\"§7Strength: §c+50\",4:\"§7Mining Speed: §a+800\",5:\" §8[§7☘§8] §8[§7⸕§8] §8[§7✧§8] §8[§7✎§8] §8[§7❈§8]\",6:\"\",7:\"§7§6Ability: Reduced To Atoms\",8:\"§7Mobs killed on §bMining Islands §7drop the same\",9:\"§7§dGemstones §7as your filled Gemstone Slots.\",10:\"§7§8(2s cooldown)\",11:\"§7\",12:\"§7§6Ability: Kinetic\",13:\"§7Killing mobs on §bMining Islands §7reduces your\",14:\"§7§6Forge Timers §7by §a0s§7.\",15:\"§7§8(+0.5s per Perfect Gemstone)\",16:\"\",17:\"§7§8This item can be reforged!\",18:\"§7§4❣ §cRequires §5Heart of the Mountain Tier 6§c.\",19:\"§6§lLEGENDARY GAUNTLET\"],Name:\"§6Gemstone Gauntlet\"},ExtraAttributes:{id:\"GEMSTONE_GAUNTLET\"}}",
   "damage": 3,
   "lore": [
     "§8Breaking Power 8",
@@ -12,20 +12,14 @@
     " §8[§7☘§8] §8[§7⸕§8] §8[§7✧§8] §8[§7✎§8] §8[§7❈§8]",
     "",
     "§7§6Ability: Reduced To Atoms",
-    "§7Kill mobs on §bMining Islands §7to charge the",
-    "§7§cGauntlet Meter§7. Mobs killed drop the same",
-    "§7§dGemstone §7type as your filled Gemstone Slots.",
+    "§7Mobs killed on §bMining Islands §7drop the same",
+    "§7§dGemstones §7as your filled Gemstone Slots.",
+    "§7§8(2s cooldown)",
     "§7",
     "§7§6Ability: Kinetic",
-    "§7Killing a mob on a §bMining Island §7reduces all of",
-    "§7your §6Forge Timers §7by §a0s§7.",
+    "§7Killing mobs on §bMining Islands §7reduces your",
+    "§7§6Forge Timers §7by §a0s§7.",
     "§7§8(+0.5s per Perfect Gemstone)",
-    "§7",
-    "§7§6Ability: Gemstone Snap  §e§lSNEAK RIGHT CLICK",
-    "§7§7When the §cGauntlet Meter §7is full, gain",
-    "§7§7§6+50☘ Mining Fortune §7for §a60m§7.",
-    "§7§7[§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§8|§7] §e0§7/§a150",
-    "§7§8(Does not stack)",
     "",
     "§7§8This item can be reforged!",
     "§7§4❣ §cRequires §5Heart of the Mountain Tier 6§c.",
@@ -45,7 +39,7 @@
   "internalname": "GEMSTONE_GAUNTLET",
   "crafttext": "Requires: Gemstone XI",
   "clickcommand": "viewrecipe",
-  "modver": "",
+  "modver": "2.3.2",
   "infoType": "WIKI_URL",
   "info": [
     "https://hypixel-skyblock.fandom.com/wiki/Gemstone_Gauntlet",
diff --git a/items/PET_SKIN_BAL_BLIZZARD.json b/items/PET_SKIN_BAL_BLIZZARD.json
new file mode 100644
index 00000000..098d85ac
--- /dev/null
+++ b/items/PET_SKIN_BAL_BLIZZARD.json
@@ -0,0 +1,28 @@
+{
+  "itemid": "minecraft:skull",
+  "displayname": "§dBlizzard Bal Skin",
+  "nbttag": "{HideFlags:254,SkullOwner:{Id:\"5be8af63-d489-3c5a-ae64-38c2a0355619\",Properties:{textures:[0:{Value:\"ewogICJ0aW1lc3RhbXAiIDogMTcyNjY0NDkwOTc5MSwKICAicHJvZmlsZUlkIiA6ICI3ZDcxMzY3YzMzNTI0NWY4OWUwNDA4YzdjZWZjNWIwOCIsCiAgInByb2ZpbGVOYW1lIiA6ICJFbGxlbkt5bGUiLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNzI2YzhhN2I1Y2JjNTk4NjRjNGZhNGY2NDA4ZDY4NGUwNThmYzljNjU5Y2EzM2E1ZjZhZWI1YzJmZjc2ODU5ZiIKICAgIH0KICB9Cn0\"}]}},display:{Lore:[0:\"§8Consumed on use\",1:\"\",2:\"§7§7Pet skins change the look and\",3:\"§7particle trail of your pet but only\",4:\"§7one skin can be active at a time!\",5:\"\",6:\"§7§7This skin can only be applied to Bal\",7:\"§7pets.\",8:\"\",9:\"§7§aThis skin is animated!\",10:\"\",11:\"§7§eRight-click on your summoned pet to\",12:\"§eapply this skin!\",13:\"\",14:\"§d§lMYTHIC COSMETIC\"],Name:\"§dBlizzard Bal Skin\"},ExtraAttributes:{id:\"PET_SKIN_BAL_BLIZZARD\"}}",
+  "damage": 3,
+  "lore": [
+    "§8Consumed on use",
+    "",
+    "§7§7Pet skins change the look and",
+    "§7particle trail of your pet but only",
+    "§7one skin can be active at a time!",
+    "",
+    "§7§7This skin can only be applied to Bal",
+    "§7pets.",
+    "",
+    "§7§aThis skin is animated!",
+    "",
+    "§7§eRight-click on your summoned pet to",
+    "§eapply this skin!",
+    "",
+    "§d§lMYTHIC COSMETIC"
+  ],
+  "internalname": "PET_SKIN_BAL_BLIZZARD",
+  "crafttext": "",
+  "clickcommand": "",
+  "modver": "2.3.2",
+  "infoType": ""
+}
\ No newline at end of file