Merge pull request #265 from IRONM00N/master

Some more fixes

10 files changed, 179 insertions, 65 deletions

diff --git a/items/DEATH_BOW.json b/items/DEATH_BOW.json
new file mode 100644
index 00000000..d29a1c7f
--- /dev/null
+++ b/items/DEATH_BOW.json
@@ -0,0 +1,20 @@
+{
+  "itemid": "minecraft:bow",
+  "displayname": "§5Death Bow",
+  "nbttag": "{HideFlags:254,display:{Lore:[0:\"§7Gear Score: §d260 §8(385)\",1:\"§7Damage: §c+220 §8(+345.4)\",2:\"\",3:\"§7§8This item can be reforged!\",4:\"§aPerfect 52500 / 52500\",5:\"§7§4❣ §cRequires §aCatacombs Level 16\",6:\"§5§lEPIC DUNGEON BOW\",7:\"\",8:\"§7Upgrade to §6✪§7: §d20 Undead Essence\",9:\"§7Upgrade to §6✪✪§7: §d40 Undead Essence\",10:\"§7Upgrade to §6✪✪✪§7: §d80 Undead Essence\",11:\"§7Upgrade to §6✪✪✪✪§7: §d150 Undead Essence\",12:\"§7Upgrade to §6✪✪✪✪✪§7: §d300 Undead Essence\"],Name:\"§5Death Bow\"},ExtraAttributes:{dungeon_item_level:0,id:\"DEATH_BOW\"}}",
+  "damage": 0,
+  "lore": [
+    "§7Gear Score: §d260 §8(385)",
+    "§7Damage: §c+220 §8(+345.4)",
+    "",
+    "§7§8This item can be reforged!",
+    "§aPerfect 52500 / 52500",
+    "§7§4❣ §cRequires §aCatacombs Level 16",
+    "§5§lEPIC DUNGEON BOW"
+  ],
+  "internalname": "DEATH_BOW",
+  "crafttext": "",
+  "clickcommand": "",
+  "modver": "1.3-REL",
+  "infoType": ""
+}
\ No newline at end of file
diff --git a/items/NEW_YEAR_CAKE.json b/items/NEW_YEAR_CAKE.json
index b076419a..4517cbcf 100644
--- a/items/NEW_YEAR_CAKE.json
+++ b/items/NEW_YEAR_CAKE.json
@@ -4,7 +4,7 @@
   "displayname": "§cNew Year Cake",
   "clickcommand": "",
   "damage": 0,
-  "nbttag": "{ench:[],HideFlags:254,display:{Lore:[0:\"§7Given to every player as a\",1:\"§7celebration for the 69th\",2:\"§7SkyBlock year!\",3:\"\",4:\"§c§lSPECIAL\"],Name:\"§cNew Year Cake\"},ExtraAttributes:{new_years_cake:76,id:\"NEW_YEAR_CAKE\"}}",
+  "nbttag": "{ench:[],HideFlags:254,display:{Lore:[0:\"§7Given to every player as a\",1:\"§7celebration for the 69th\",2:\"§7SkyBlock year!\",3:\"\",4:\"§c§lSPECIAL\"],Name:\"§cNew Year Cake\"},ExtraAttributes:{new_years_cake:69,id:\"NEW_YEAR_CAKE\"}}",
   "modver": "1.3-REL",
   "lore": [
     "§7Given to every player as a",
diff --git a/items/REFINED_MINERAL.json b/items/REFINED_MINERAL.json
new file mode 100644
index 00000000..32c3d07d
--- /dev/null
+++ b/items/REFINED_MINERAL.json
@@ -0,0 +1,19 @@
+{
+  "itemid": "minecraft:dye",
+  "displayname": "§9Refined Mineral",
+  "nbttag": "{HideFlags:254,display:{Lore:[0:\"§7Rare minerals found during\",1:\"§7National Mining Month.\",2:\"\",3:\"§eRight-click to view recipes!\",4:\"\",5:\"§9§lRARE\"],Name:\"§9Refined Mineral\"},ExtraAttributes:{id:\"REFINED_MINERAL\"}}",
+  "damage": 12,
+  "lore": [
+    "§7Rare minerals found during",
+    "§7National Mining Month.",
+    "",
+    "§eRight-click to view recipes!",
+    "",
+    "§9§lRARE"
+  ],
+  "internalname": "REFINED_MINERAL",
+  "crafttext": "",
+  "clickcommand": "",
+  "modver": "1.3-REL",
+  "infoType": ""
+}
\ No newline at end of file
diff --git a/items/STINGER_BOW.json b/items/STINGER_BOW.json
new file mode 100644
index 00000000..3bdf6daf
--- /dev/null
+++ b/items/STINGER_BOW.json
@@ -0,0 +1,27 @@
+{
+  "itemid": "minecraft:bow",
+  "displayname": "§9Stinger Bow",
+  "nbttag": "{HideFlags:254,display:{Lore:[0:\"§7Gear Score: §d47 \",1:\"§7Damage: §c+47 \",2:\"\",3:\"§6Item Ability: Sting\",4:\"§7While in Dungeons, shooting your\",5:\"§7teammates grants them §f20\",6:\"§f§7speed and §c30 §7strength for\",7:\"§7§e30 §7seconds but deals §c1\",8:\"§c§7damage.\",9:\"§8Mana Cost: §3100\",10:\"\",11:\"§7§8This item can be reforged!\",12:\"§aPerfect 35000 / 35000\",13:\"§9§lRARE DUNGEON BOW\"],Name:\"§9Stinger Bow\"},ExtraAttributes:{dungeon_item_level:0,id:\"STINGER_BOW\"}}",
+  "damage": 0,
+  "lore": [
+    "§7Gear Score: §d47 ",
+    "§7Damage: §c+47 ",
+    "",
+    "§6Item Ability: Sting",
+    "§7While in Dungeons, shooting your",
+    "§7teammates grants them §f20",
+    "§f§7speed and §c30 §7strength for",
+    "§7§e30 §7seconds but deals §c1",
+    "§c§7damage.",
+    "§8Mana Cost: §3100",
+    "",
+    "§7§8This item can be reforged!",
+    "§aPerfect 35000 / 35000",
+    "§9§lRARE DUNGEON BOW"
+  ],
+  "internalname": "STINGER_BOW",
+  "crafttext": "",
+  "clickcommand": "",
+  "modver": "1.3-REL",
+  "infoType": ""
+}
\ No newline at end of file
diff --git a/items/ZOMBIE_LORD_BOOTS.json b/items/ZOMBIE_LORD_BOOTS.json
new file mode 100644
index 00000000..893b12c9
--- /dev/null
+++ b/items/ZOMBIE_LORD_BOOTS.json
@@ -0,0 +1,28 @@
+{
+  "itemid": "minecraft:leather_boots",
+  "displayname": "§5Zombie Lord Boots",
+  "nbttag": "{HideFlags:254,display:{Lore:[0:\"§7Gear Score: §d119 §8(172)\",1:\"§7Strength: §c+7 §8(+10.99)\",2:\"\",3:\"§7Health: §a+45 HP §8(+70.65 HP)\",4:\"§7Defense: §a+19 §8(+29.83)\",5:\"§7Intelligence: §a+7 §8(+10.99)\",6:\"\",7:\"§6Full Set Bonus: Dungeon Lord\",8:\"§7Gains §c+5❁ Strength §7every\",9:\"§7minute spent in the Dungeon.\",10:\"\",11:\"§7§8This item can be reforged!\",12:\"§aPerfect 52500 / 52500\",13:\"§7§4❣ §cRequires §aCatacombs Level 25\",14:\"§5§lEPIC DUNGEON BOOTS\",15:\"\",16:\"§7Upgrade to §6✪§7: §d25 Undead Essence\",17:\"§7Upgrade to §6✪✪§7: §d50 Undead Essence\",18:\"§7Upgrade to §6✪✪✪§7: §d100 Undead Essence\",19:\"§7Upgrade to §6✪✪✪✪§7: §d200 Undead Essence\",20:\"§7Upgrade to §6✪✪✪✪✪§7: §d400 Undead Essence\"],color:10158529,Name:\"§5Zombie Lord Boots\"},ExtraAttributes:{dungeon_item_level:0,id:\"ZOMBIE_LORD_BOOTS\"}}",
+  "damage": 0,
+  "lore": [
+    "§7Gear Score: §d119 §8(172)",
+    "§7Strength: §c+7 §8(+10.99)",
+    "",
+    "§7Health: §a+45 HP §8(+70.65 HP)",
+    "§7Defense: §a+19 §8(+29.83)",
+    "§7Intelligence: §a+7 §8(+10.99)",
+    "",
+    "§6Full Set Bonus: Dungeon Lord",
+    "§7Gains §c+5❁ Strength §7every",
+    "§7minute spent in the Dungeon.",
+    "",
+    "§7§8This item can be reforged!",
+    "§aPerfect 52500 / 52500",
+    "§7§4❣ §cRequires §aCatacombs Level 25",
+    "§5§lEPIC DUNGEON BOOTS"
+  ],
+  "internalname": "ZOMBIE_LORD_BOOTS",
+  "crafttext": "",
+  "clickcommand": "",
+  "modver": "1.3-REL",
+  "infoType": ""
+}
\ No newline at end of file
diff --git a/items/ZOMBIE_LORD_CHESTPLATE.json b/items/ZOMBIE_LORD_CHESTPLATE.json
new file mode 100644
index 00000000..b33d9e84
--- /dev/null
+++ b/items/ZOMBIE_LORD_CHESTPLATE.json
@@ -0,0 +1,28 @@
+{
+  "itemid": "minecraft:leather_chestplate",
+  "displayname": "§5Zombie Lord Chestplate",
+  "nbttag": "{HideFlags:254,display:{Lore:[0:\"§7Gear Score: §d199 §8(297)\",1:\"§7Strength: §c+7 §8(+10.99)\",2:\"\",3:\"§7Health: §a+85 HP §8(+133.45 HP)\",4:\"§7Defense: §a+39 §8(+61.23)\",5:\"§7Intelligence: §a+7 §8(+10.99)\",6:\"\",7:\"§6Full Set Bonus: Dungeon Lord\",8:\"§7Gains §c+5❁ Strength §7every\",9:\"§7minute spent in the Dungeon.\",10:\"\",11:\"§7§8This item can be reforged!\",12:\"§aPerfect 52500 / 52500\",13:\"§7§4❣ §cRequires §aCatacombs Level 25\",14:\"§5§lEPIC DUNGEON CHESTPLATE\",15:\"\",16:\"§7Upgrade to §6✪§7: §d25 Undead Essence\",17:\"§7Upgrade to §6✪✪§7: §d50 Undead Essence\",18:\"§7Upgrade to §6✪✪✪§7: §d100 Undead Essence\",19:\"§7Upgrade to §6✪✪✪✪§7: §d200 Undead Essence\",20:\"§7Upgrade to §6✪✪✪✪✪§7: §d400 Undead Essence\"],color:10158529,Name:\"§5Zombie Lord Chestplate\"},ExtraAttributes:{dungeon_item_level:0,id:\"ZOMBIE_LORD_CHESTPLATE\"}}",
+  "damage": 0,
+  "lore": [
+    "§7Gear Score: §d199 §8(297)",
+    "§7Strength: §c+7 §8(+10.99)",
+    "",
+    "§7Health: §a+85 HP §8(+133.45 HP)",
+    "§7Defense: §a+39 §8(+61.23)",
+    "§7Intelligence: §a+7 §8(+10.99)",
+    "",
+    "§6Full Set Bonus: Dungeon Lord",
+    "§7Gains §c+5❁ Strength §7every",
+    "§7minute spent in the Dungeon.",
+    "",
+    "§7§8This item can be reforged!",
+    "§aPerfect 52500 / 52500",
+    "§7§4❣ §cRequires §aCatacombs Level 25",
+    "§5§lEPIC DUNGEON CHESTPLATE"
+  ],
+  "internalname": "ZOMBIE_LORD_CHESTPLATE",
+  "crafttext": "",
+  "clickcommand": "",
+  "modver": "1.3-REL",
+  "infoType": ""
+}
\ No newline at end of file
diff --git a/items/ZOMBIE_LORD_HELMET.json b/items/ZOMBIE_LORD_HELMET.json
new file mode 100644
index 00000000..096bc2a1
--- /dev/null
+++ b/items/ZOMBIE_LORD_HELMET.json
@@ -0,0 +1,28 @@
+{
+  "itemid": "minecraft:leather_helmet",
+  "displayname": "§5Zombie Lord Helmet",
+  "nbttag": "{HideFlags:254,display:{Lore:[0:\"§7Gear Score: §d142 §8(208)\",1:\"§7Strength: §c+7 §8(+10.99)\",2:\"\",3:\"§7Health: §a+56 HP §8(+87.92 HP)\",4:\"§7Defense: §a+25 §8(+39.25)\",5:\"§7Intelligence: §a+7 §8(+10.99)\",6:\"\",7:\"§6Full Set Bonus: Dungeon Lord\",8:\"§7Gains §c+5❁ Strength §7every\",9:\"§7minute spent in the Dungeon.\",10:\"\",11:\"§7§8This item can be reforged!\",12:\"§aPerfect 52500 / 52500\",13:\"§7§4❣ §cRequires §aCatacombs Level 25\",14:\"§5§lEPIC DUNGEON HELMET\",15:\"\",16:\"§7Upgrade to §6✪§7: §d25 Undead Essence\",17:\"§7Upgrade to §6✪✪§7: §d50 Undead Essence\",18:\"§7Upgrade to §6✪✪✪§7: §d100 Undead Essence\",19:\"§7Upgrade to §6✪✪✪✪§7: §d200 Undead Essence\",20:\"§7Upgrade to §6✪✪✪✪✪§7: §d400 Undead Essence\"],color:10158529,Name:\"§5Zombie Lord Helmet\"},ExtraAttributes:{dungeon_item_level:0,id:\"ZOMBIE_LORD_HELMET\"}}",
+  "damage": 0,
+  "lore": [
+    "§7Gear Score: §d142 §8(208)",
+    "§7Strength: §c+7 §8(+10.99)",
+    "",
+    "§7Health: §a+56 HP §8(+87.92 HP)",
+    "§7Defense: §a+25 §8(+39.25)",
+    "§7Intelligence: §a+7 §8(+10.99)",
+    "",
+    "§6Full Set Bonus: Dungeon Lord",
+    "§7Gains §c+5❁ Strength §7every",
+    "§7minute spent in the Dungeon.",
+    "",
+    "§7§8This item can be reforged!",
+    "§aPerfect 52500 / 52500",
+    "§7§4❣ §cRequires §aCatacombs Level 25",
+    "§5§lEPIC DUNGEON HELMET"
+  ],
+  "internalname": "ZOMBIE_LORD_HELMET",
+  "crafttext": "",
+  "clickcommand": "",
+  "modver": "1.3-REL",
+  "infoType": ""
+}
\ No newline at end of file
diff --git a/items/ZOMBIE_LORD_LEGGINGS.json b/items/ZOMBIE_LORD_LEGGINGS.json
new file mode 100644
index 00000000..0b4f32fd
--- /dev/null
+++ b/items/ZOMBIE_LORD_LEGGINGS.json
@@ -0,0 +1,28 @@
+{
+  "itemid": "minecraft:leather_leggings",
+  "displayname": "§5Zombie Lord Leggings",
+  "nbttag": "{HideFlags:254,display:{Lore:[0:\"§7Gear Score: §d175 §8(260)\",1:\"§7Strength: §c+7 §8(+10.99)\",2:\"\",3:\"§7Health: §a+73 HP §8(+114.61 HP)\",4:\"§7Defense: §a+33 §8(+51.81)\",5:\"§7Intelligence: §a+7 §8(+10.99)\",6:\"\",7:\"§6Full Set Bonus: Dungeon Lord\",8:\"§7Gains §c+5❁ Strength §7every\",9:\"§7minute spent in the Dungeon.\",10:\"\",11:\"§7§8This item can be reforged!\",12:\"§aPerfect 52500 / 52500\",13:\"§7§4❣ §cRequires §aCatacombs Level 25\",14:\"§5§lEPIC DUNGEON LEGGINGS\",15:\"\",16:\"§7Upgrade to §6✪§7: §d25 Undead Essence\",17:\"§7Upgrade to §6✪✪§7: §d50 Undead Essence\",18:\"§7Upgrade to §6✪✪✪§7: §d100 Undead Essence\",19:\"§7Upgrade to §6✪✪✪✪§7: §d200 Undead Essence\",20:\"§7Upgrade to §6✪✪✪✪✪§7: §d400 Undead Essence\"],color:10158529,Name:\"§5Zombie Lord Leggings\"},ExtraAttributes:{dungeon_item_level:0,id:\"ZOMBIE_LORD_LEGGINGS\"}}",
+  "damage": 0,
+  "lore": [
+    "§7Gear Score: §d175 §8(260)",
+    "§7Strength: §c+7 §8(+10.99)",
+    "",
+    "§7Health: §a+73 HP §8(+114.61 HP)",
+    "§7Defense: §a+33 §8(+51.81)",
+    "§7Intelligence: §a+7 §8(+10.99)",
+    "",
+    "§6Full Set Bonus: Dungeon Lord",
+    "§7Gains §c+5❁ Strength §7every",
+    "§7minute spent in the Dungeon.",
+    "",
+    "§7§8This item can be reforged!",
+    "§aPerfect 52500 / 52500",
+    "§7§4❣ §cRequires §aCatacombs Level 25",
+    "§5§lEPIC DUNGEON LEGGINGS"
+  ],
+  "internalname": "ZOMBIE_LORD_LEGGINGS",
+  "crafttext": "",
+  "clickcommand": "",
+  "modver": "1.3-REL",
+  "infoType": ""
+}
\ No newline at end of file
diff --git a/items/lCOLOSSAL_EXP_BOTTLE.json b/items/lCOLOSSAL_EXP_BOTTLE.json
deleted file mode 100644
index f33b2d24..00000000
--- a/items/lCOLOSSAL_EXP_BOTTLE.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "itemid": "minecraft:experience_bottle",
-  "displayname": "§5Colossal Experience Bottle",
-  "nbttag": "{ench:[],HideFlags:254,display:{Lore:[0:\"§7Smash it open to receive\",1:\"§7experience!\",2:\"\",3:\"§5§lEPIC\"],Name:\"§5Colossal Experience Bottle\"},ExtraAttributes:{id:\"COLOSSAL_EXP_BOTTLE\"}}",
-  "damage": 0,
-  "lore": [
-    "§7Smash it open to receive",
-    "§7experience!",
-    "",
-    "§5§lEPIC"
-  ],
-  "recipe": {
-    "A1": "",
-    "A2": "COLOSSAL_EXP_BOTTLE_UPGRADE:1",
-    "A3": "",
-    "B1": "",
-    "B2": "TITANIC_EXP_BOTTLE:1",
-    "B3": "",
-    "C1": "",
-    "C2": "",
-    "C3": ""
-  },
-  "internalname": "lCOLOSSAL_EXP_BOTTLE",
-  "clickcommand": "viewrecipe",
-  "modver": "1.3-REL"
-}
\ No newline at end of file
diff --git a/items/ngeSHARK_SCALE_HELMET.json b/items/ngeSHARK_SCALE_HELMET.json
deleted file mode 100644
index 2d3c5748..00000000
--- a/items/ngeSHARK_SCALE_HELMET.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "itemid": "minecraft:skull",
-  "displayname": "§6Shark Scale Helmet",
-  "nbttag": "{HideFlags:254,SkullOwner:{Id:\"bafabf7d-16e6-32fb-9720-812419bacc73\",Properties:{textures:[0:{Value:\"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMzkwMTE2ZGE1MTRhNzNkZGQ5Mjk1NDkxODUyYWRjNTg4MDA3ZjJhY2Q3ZGUyNjk3ODhhMjEyOGQ4ZTRhNzY0YiJ9fX0\u003d\"}]}},display:{Lore:[0:\"§7Sea Creature Chance: §c+2.5%\",1:\"\",2:\"§7Health: §a+120 HP\",3:\"§7Defense: §a+120\",4:\"\",5:\"§6Full Set Bonus: Absorb\",6:\"§7§9Doubles§7 your §a❈ Defense§7\",7:\"§7while in water.\",8:\"\",9:\"§6Full Set Bonus: Reflect\",10:\"§7§7Your sharp scales reflect\",11:\"§7§915% §7of damage onto the\",12:\"§7attacker.\",13:\"\",14:\"§7§8This item can be reforged!\",15:\"§6§lLEGENDARY HELMET\"],Name:\"§6Shark Scale Helmet\"},ExtraAttributes:{id:\"SHARK_SCALE_HELMET\"}}",
-  "damage": 3,
-  "lore": [
-    "§7Sea Creature Chance: §c+2.5%",
-    "",
-    "§7Health: §a+120 HP",
-    "§7Defense: §a+120",
-    "",
-    "§6Full Set Bonus: Absorb",
-    "§7§9Doubles§7 your §a❈ Defense§7",
-    "§7while in water.",
-    "",
-    "§6Full Set Bonus: Reflect",
-    "§7§7Your sharp scales reflect",
-    "§7§915% §7of damage onto the",
-    "§7attacker.",
-    "",
-    "§7§8This item can be reforged!",
-    "§6§lLEGENDARY HELMET"
-  ],
-  "recipe": {
-    "A1": "ENCHANTED_SHARK_FIN:1",
-    "A2": "SPONGE_HELMET:1",
-    "A3": "ENCHANTED_SHARK_FIN:1",
-    "B1": "",
-    "B2": "",
-    "B3": "",
-    "C1": "",
-    "C2": "",
-    "C3": ""
-  },
-  "internalname": "ngeSHARK_SCALE_HELMET",
-  "clickcommand": "viewrecipe",
-  "modver": "1.3-REL"
-}
\ No newline at end of file