gifting (#810)

* gifting

* so true xp bottle = enchant

* Fixed Shortbows

* same thing

10 files changed, 46 insertions, 35 deletions

diff --git a/constants/enchants.json b/constants/enchants.json
index 785b8301..62694586 100644
--- a/constants/enchants.json
+++ b/constants/enchants.json
@@ -787,7 +787,7 @@
       50,
       200
     ],
-    "prosecute": [
+    "PROSECUTE": [
       20,
       25,
       30,
@@ -1329,6 +1329,9 @@
       250
     ],
     "habanero_tactics": [
+      0,
+      0,
+      0,
       250,
       300
     ],
@@ -1366,6 +1369,9 @@
       150,
       200,
       250
+    ],
+    "XP_BOTTLE": [
+      0
     ]
   },
   "max_xp_table_levels": {
@@ -1388,7 +1394,7 @@
     "vampirism": 5,
     "venomous": 5,
     "thunderbolt": 5,
-    "prosecute": 5,
+    "PROSECUTE": 5,
     "titan_killer": 5,
     "luck": 5,
     "protection": 5,
diff --git a/constants/leveling.json b/constants/leveling.json
index b14ba62f..6f8a5250 100644
--- a/constants/leveling.json
+++ b/constants/leveling.json
@@ -321,6 +321,7 @@
       100,
       100,
       100,
+      100,
       100
     ],
     "MOB": [
diff --git a/items/ARTISANAL_SHORTBOW.json b/items/ARTISANAL_SHORTBOW.json
index dbbe89e3..601b5998 100644
--- a/items/ARTISANAL_SHORTBOW.json
+++ b/items/ARTISANAL_SHORTBOW.json
@@ -1,10 +1,11 @@
 {
   "itemid": "minecraft:bow",
   "displayname": "§9Artisanal Shortbow",
-  "nbttag": "{Unbreakable:1b,HideFlags:254,display:{Lore:[0:\"§7Damage: §c+40\",1:\"\",2:\"§6Shortbow: Instantly shoots!\",3:\"\",4:\"§7§8This item can be reforged!\",5:\"§9§lRARE BOW\"],Name:\"§9Artisanal Shortbow\"},ExtraAttributes:{id:\"ARTISANAL_SHORTBOW\"}}",
+  "nbttag": "{Unbreakable:1b,HideFlags:254,display:{Lore:[0:\"§7Damage: §c+40\",1:\"§7Shot Cooldown: §a0.5s\",2:\"\",3:\"§6Shortbow: Instantly shoots!\",4:\"\",5:\"§7§8This item can be reforged!\",6:\"§9§lRARE BOW\"],Name:\"§9Artisanal Shortbow\"},ExtraAttributes:{id:\"ARTISANAL_SHORTBOW\"}}",
   "damage": 0,
   "lore": [
     "§7Damage: §c+40",
+    "§7Shot Cooldown: §a0.5s",
     "",
     "§6Shortbow: Instantly shoots!",
     "",
@@ -14,7 +15,7 @@
   "internalname": "ARTISANAL_SHORTBOW",
   "crafttext": "",
   "clickcommand": "",
-  "modver": "2.0.0-REL",
+  "modver": "2.1.0-REL",
   "infoType": "WIKI_URL",
   "info": [
     "https://hypixel-skyblock.fandom.com/wiki/Artisanal_Shortbow"
diff --git a/items/CORRUPTED_BAIT.json b/items/CORRUPTED_BAIT.json
index d715f00a..de7d0967 100644
--- a/items/CORRUPTED_BAIT.json
+++ b/items/CORRUPTED_BAIT.json
@@ -1,15 +1,16 @@
 {
   "itemid": "minecraft:skull",
   "displayname": "§fCorrupted Bait",
-  "nbttag": "{HideFlags:254,SkullOwner:{Id:\"e4785c0e-3c90-3af3-9ac8-c8c49653af4f\",Properties:{textures:[0:{Value:\"ewogICJ0aW1lc3RhbXAiIDogMTY0MzU5ODg1MjcwNSwKICAicHJvZmlsZUlkIiA6ICI2NDU4Mjc0MjEyNDg0MDY0YTRkMDBlNDdjZWM4ZjcyZSIsCiAgInByb2ZpbGVOYW1lIiA6ICJUaDNtMXMiLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNGJiY2RkZDQ1Y2QzNDc4NjViY2VhYjNlM2RjNWQzODI3MjM0NjM5NjNmODVlY2NlODFjZGQ2MWI1M2RiMTRlNCIsCiAgICAgICJtZXRhZGF0YSIgOiB7CiAgICAgICAgIm1vZGVsIiA6ICJzbGltIgogICAgICB9CiAgICB9CiAgfQp9\"}]}},display:{Lore:[0:\"§7§8Fishing Bait\",1:\"§7§8Consumes on Cast\",2:\"§7\",3:\"§7§c-50% §7Fishing Speed but lures\",4:\"§7a special Trophy Fish in the\",5:\"§7Crimson Isle.\",6:\"\",7:\"§f§lCOMMON BAIT\"],Name:\"§fCorrupted Bait\"},ExtraAttributes:{id:\"CORRUPTED_BAIT\"}}",
+  "nbttag": "{HideFlags:254,SkullOwner:{Id:\"e4785c0e-3c90-3af3-9ac8-c8c49653af4f\",Properties:{textures:[0:{Value:\"ewogICJ0aW1lc3RhbXAiIDogMTY0MzU5ODg1MjcwNSwKICAicHJvZmlsZUlkIiA6ICI2NDU4Mjc0MjEyNDg0MDY0YTRkMDBlNDdjZWM4ZjcyZSIsCiAgInByb2ZpbGVOYW1lIiA6ICJUaDNtMXMiLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNGJiY2RkZDQ1Y2QzNDc4NjViY2VhYjNlM2RjNWQzODI3MjM0NjM5NjNmODVlY2NlODFjZGQ2MWI1M2RiMTRlNCIsCiAgICAgICJtZXRhZGF0YSIgOiB7CiAgICAgICAgIm1vZGVsIiA6ICJzbGltIgogICAgICB9CiAgICB9CiAgfQp9\"}]}},display:{Lore:[0:\"§8Fishing Bait\",1:\"§8Consumes on Cast\",2:\"\",3:\"§7Decreases your §b☂ Fishing Speed\",4:\"§b§7by §c50%§7, but lures a\",5:\"§7special Trophy Fish in the\",6:\"§7§cCrimson Isle§7.\",7:\"\",8:\"§f§lCOMMON BAIT\"],Name:\"§fCorrupted Bait\"},ExtraAttributes:{id:\"CORRUPTED_BAIT\"}}",
   "damage": 3,
   "lore": [
-    "§7§8Fishing Bait",
-    "§7§8Consumes on Cast",
-    "§7",
-    "§7§c-50% §7Fishing Speed but lures",
-    "§7a special Trophy Fish in the",
-    "§7Crimson Isle.",
+    "§8Fishing Bait",
+    "§8Consumes on Cast",
+    "",
+    "§7Decreases your §b☂ Fishing Speed",
+    "§b§7by §c50%§7, but lures a",
+    "§7special Trophy Fish in the",
+    "§7§cCrimson Isle§7.",
     "",
     "§f§lCOMMON BAIT"
   ],
@@ -27,7 +28,7 @@
   "internalname": "CORRUPTED_BAIT",
   "crafttext": "Requires: Magmafish V",
   "clickcommand": "viewrecipe",
-  "modver": "2.0.0-REL",
+  "modver": "2.1.0-REL",
   "infoType": "WIKI_URL",
   "info": [
     "https://hypixel-skyblock.fandom.com/wiki/Fishing_Bait"
diff --git a/items/DIVINE_GIFT;2.json b/items/DIVINE_GIFT;2.json
index 33c29f0b..a5824f90 100644
--- a/items/DIVINE_GIFT;2.json
+++ b/items/DIVINE_GIFT;2.json
@@ -1,11 +1,11 @@
 {
   "itemid": "minecraft:enchanted_book",
   "displayname": "§fEnchanted Book",
-  "nbttag": "{ench:[],HideFlags:254,display:{Lore:[0:\"§9Divine Gift II\",1:\"§7§7Grants §b+8✯ Magic Find.\",2:\"\",3:\"§7Use this on an item in an Anvil\",4:\"§7to apply it!\",5:\"\",6:\"§6Applied To:\",7:\"§7 - §fSword\",8:\"§7 - §fFishing Weapon\",9:\"§7 - §fLongsword\",10:\"§7 - §fBow\",11:\"§7 - §fGauntlet\",12:\"\",13:\"§f§lCOMMON\"],Name:\"§fEnchanted Book\"},ExtraAttributes:{id:\"DIVINE_GIFT;2\",enchantments:{divine_gift:2}}}",
+  "nbttag": "{ench:[],HideFlags:254,display:{Lore:[0:\"§9Divine Gift II\",1:\"§7§7Grants §b+4✯ Magic Find.\",2:\"\",3:\"§7Use this on an item in an Anvil\",4:\"§7to apply it!\",5:\"\",6:\"§6Applied To:\",7:\"§7 - §fSword\",8:\"§7 - §fFishing Weapon\",9:\"§7 - §fLongsword\",10:\"§7 - §fBow\",11:\"§7 - §fGauntlet\",12:\"\",13:\"§f§lCOMMON\"],Name:\"§fEnchanted Book\"},ExtraAttributes:{id:\"DIVINE_GIFT;2\",enchantments:{divine_gift:2}}}",
   "damage": 0,
   "lore": [
     "§9Divine Gift II",
-    "§7§7Grants §b+8✯ Magic Find.",
+    "§7§7Grants §b+4✯ Magic Find.",
     "",
     "§7Use this on an item in an Anvil",
     "§7to apply it!",
diff --git a/items/DIVINE_GIFT;3.json b/items/DIVINE_GIFT;3.json
index c019a007..1dfbdd70 100644
--- a/items/DIVINE_GIFT;3.json
+++ b/items/DIVINE_GIFT;3.json
@@ -1,11 +1,11 @@
 {
   "itemid": "minecraft:enchanted_book",
   "displayname": "§fEnchanted Book",
-  "nbttag": "{ench:[],HideFlags:254,display:{Lore:[0:\"§9Divine Gift III\",1:\"§7§7Grants §b+18✯ Magic Find.\",2:\"\",3:\"§7Use this on an item in an Anvil\",4:\"§7to apply it!\",5:\"\",6:\"§6Applied To:\",7:\"§7 - §fSword\",8:\"§7 - §fFishing Weapon\",9:\"§7 - §fLongsword\",10:\"§7 - §fBow\",11:\"§7 - §fGauntlet\",12:\"\",13:\"§f§lCOMMON\"],Name:\"§fEnchanted Book\"},ExtraAttributes:{id:\"DIVINE_GIFT;3\",enchantments:{divine_gift:3}}}",
+  "nbttag": "{ench:[],HideFlags:254,display:{Lore:[0:\"§9Divine Gift III\",1:\"§7§7Grants §b+6✯ Magic Find.\",2:\"\",3:\"§7Use this on an item in an Anvil\",4:\"§7to apply it!\",5:\"\",6:\"§6Applied To:\",7:\"§7 - §fSword\",8:\"§7 - §fFishing Weapon\",9:\"§7 - §fLongsword\",10:\"§7 - §fBow\",11:\"§7 - §fGauntlet\",12:\"\",13:\"§f§lCOMMON\"],Name:\"§fEnchanted Book\"},ExtraAttributes:{id:\"DIVINE_GIFT;3\",enchantments:{divine_gift:3}}}",
   "damage": 0,
   "lore": [
     "§9Divine Gift III",
-    "§7§7Grants §b+18✯ Magic Find.",
+    "§7§7Grants §b+6✯ Magic Find.",
     "",
     "§7Use this on an item in an Anvil",
     "§7to apply it!",
diff --git a/items/ITEM_SPIRIT_BOW.json b/items/ITEM_SPIRIT_BOW.json
index 0f52ff27..a316129c 100644
--- a/items/ITEM_SPIRIT_BOW.json
+++ b/items/ITEM_SPIRIT_BOW.json
@@ -1,13 +1,15 @@
 {
   "itemid": "minecraft:bow",
   "displayname": "§f§f§6Spirit Bow",
-  "nbttag": "{overrideMeta:1b,HideFlags:254,display:{Lore:[0:\"§7Gear Score: §d350\",1:\"§7Damage: §c+210\",2:\"§7Strength: §c+100\",3:\"\",4:\"§7Deals §a+2% §7damage to §aUndead\",5:\"§amonsters §7for every §a1% §7of\",6:\"§7your missing health.\",7:\"\",8:\"§7§bSpirit Item: §7When turned\",9:\"§7into a ghost, this item becomes\",10:\"§7a Ghost Ability.\",11:\"\",12:\"§6Spirit Ability: Spirit Bomb\",13:\"§7Shoots a spirit that deals\",14:\"§7§c8000 §7damage on impact.\",15:\"\",16:\"§7§8This item can be reforged!\",17:\"§aPerfect 70000 / 70000\",18:\"§7§4❣ §cRequires §aCatacombs Floor IV\",19:\"§aCompletion\",20:\"§6§lLEGENDARY DUNGEON BOW\"],Name:\"§f§f§6Spirit Bow\"},ExtraAttributes:{dungeon_item_level:0,id:\"ITEM_SPIRIT_BOW\"},AttributeModifiers:[]}",
+  "nbttag": "{Unbreakable:1b,HideFlags:254,display:{Lore:[0:\"§7Gear Score: §d350 §8(1296)\",1:\"§7Damage: §c+210 §8(+850.5)\",2:\"§7Strength: §c+100 §8(+405)\",3:\"§7Shot Cooldown: §a0.8s\",4:\"\",5:\"§aShortbow: Instantly shoots!\",6:\"§7Deals §a+2% §7damage to §aUndead\",7:\"§amonsters §7for every §a1% §7of\",8:\"§7your missing health.\",9:\"\",10:\"§7§bSpirit Item: §7When turned\",11:\"§7into a ghost, this item becomes\",12:\"§7a Ghost Ability.\",13:\"\",14:\"§6Spirit Ability: Spirit Bomb\",15:\"§7Shoots a spirit that deals\",16:\"§7§c8000 §7damage on impact.\",17:\"\",18:\"§7§8This item can be reforged!\",19:\"§7§4❣ §cRequires §aCatacombs Floor IV\",20:\"§aCompletion\",21:\"§6§lLEGENDARY DUNGEON BOW\"],Name:\"§f§f§6Spirit Bow\"},ExtraAttributes:{id:\"ITEM_SPIRIT_BOW\"}}",
   "damage": 0,
   "lore": [
-    "§7Gear Score: §d350",
-    "§7Damage: §c+210",
-    "§7Strength: §c+100",
+    "§7Gear Score: §d350 §8(1296)",
+    "§7Damage: §c+210 §8(+850.5)",
+    "§7Strength: §c+100 §8(+405)",
+    "§7Shot Cooldown: §a0.8s",
     "",
+    "§aShortbow: Instantly shoots!",
     "§7Deals §a+2% §7damage to §aUndead",
     "§amonsters §7for every §a1% §7of",
     "§7your missing health.",
@@ -21,7 +23,6 @@
     "§7§c8000 §7damage on impact.",
     "",
     "§7§8This item can be reforged!",
-    "§aPerfect 70000 / 70000",
     "§7§4❣ §cRequires §aCatacombs Floor IV",
     "§aCompletion",
     "§6§lLEGENDARY DUNGEON BOW"
@@ -29,9 +30,9 @@
   "internalname": "ITEM_SPIRIT_BOW",
   "crafttext": "",
   "clickcommand": "",
-  "modver": "2.0.0-REL",
+  "modver": "2.1.0-REL",
   "infoType": "WIKI_URL",
   "info": [
     "https://hypixel-skyblock.fandom.com/wiki/Spirit_Bow"
   ]
-}
+}
\ No newline at end of file
diff --git a/items/JUJU_SHORTBOW.json b/items/JUJU_SHORTBOW.json
index 6b650a1b..7e2efe39 100644
--- a/items/JUJU_SHORTBOW.json
+++ b/items/JUJU_SHORTBOW.json
@@ -1,17 +1,18 @@
 {
   "itemid": "minecraft:bow",
   "displayname": "§5Juju Shortbow",
-  "nbttag": "{HideFlags:254,display:{Lore:[0:\"§7Damage: §c+310\",1:\"§7Strength: §c+40\",2:\"§7Crit Chance: §c+10%\",3:\"§7Crit Damage: §c+110%\",4:\"\",5:\"§5Shortbow: Instantly shoots\",6:\"§7Hits §c3 §7mobs on impact.\",7:\"§7Can damage endermen\",8:\"\",9:\"§7§8This item can be reforged!\",10:\"§7§4☠ §cRequires §5Enderman Slayer 3\",11:\"§5§lEPIC BOW\"],Name:\"§5Juju Shortbow\"},ExtraAttributes:{id:\"JUJU_SHORTBOW\"}}",
+  "nbttag": "{Unbreakable:1b,HideFlags:254,display:{Lore:[0:\"§7Damage: §c+310\",1:\"§7Strength: §c+40\",2:\"§7Crit Chance: §c+10%\",3:\"§7Crit Damage: §c+110%\",4:\"§7Shot Cooldown: §a0.5s\",5:\"\",6:\"§5Shortbow: Instantly shoots!\",7:\"§7Hits §c3 §7mobs on impact.\",8:\"§7Can damage endermen.\",9:\"\",10:\"§7§8This item can be reforged!\",11:\"§7§4☠ §cRequires §5Enderman Slayer 3\",12:\"§5§lEPIC BOW\"],Name:\"§5Juju Shortbow\"},ExtraAttributes:{id:\"JUJU_SHORTBOW\"}}",
   "damage": 0,
   "lore": [
     "§7Damage: §c+310",
     "§7Strength: §c+40",
     "§7Crit Chance: §c+10%",
     "§7Crit Damage: §c+110%",
+    "§7Shot Cooldown: §a0.5s",
     "",
-    "§5Shortbow: Instantly shoots",
+    "§5Shortbow: Instantly shoots!",
     "§7Hits §c3 §7mobs on impact.",
-    "§7Can damage endermen",
+    "§7Can damage endermen.",
     "",
     "§7§8This item can be reforged!",
     "§7§4☠ §cRequires §5Enderman Slayer 3",
@@ -32,9 +33,9 @@
   "internalname": "JUJU_SHORTBOW",
   "crafttext": "",
   "clickcommand": "viewrecipe",
-  "modver": "2.0.0-REL",
+  "modver": "2.1.0-REL",
   "infoType": "WIKI_URL",
   "info": [
     "https://hypixel-skyblock.fandom.com/wiki/Juju_Shortbow"
   ]
-}
+}
\ No newline at end of file
diff --git a/items/MATCH_STICKS.json b/items/MATCH_STICKS.json
index bb55eab9..40b99087 100644
--- a/items/MATCH_STICKS.json
+++ b/items/MATCH_STICKS.json
@@ -1,5 +1,5 @@
 {
-  "itemid": "minecraft:torch",
+  "itemid": "minecraft:redstone_torch",
   "displayname": "§9Match-Sticks",
   "nbttag": "{HideFlags:254,display:{Lore:[0:\"§7Consume to light yourself on\",1:\"§7fire for §a10 §7seconds granting\",2:\"§7you §c+10❁ Strength§7.\",3:\"§7§7§oThe head of Matchos is a\",4:\"§7§ocombination of Sulphur and a\",5:\"§7§ocrystalline substance. With even\",6:\"§7§othe slightest frictions they\",7:\"§7§owill light up.\",8:\"\",9:\"§9§lRARE\"],Name:\"§9Match-Sticks\"},ExtraAttributes:{id:\"MATCH_STICKS\"}}",
   "damage": 0,
diff --git a/items/TERMINATOR.json b/items/TERMINATOR.json
index 6e4e570e..b4e749ae 100644
--- a/items/TERMINATOR.json
+++ b/items/TERMINATOR.json
@@ -1,14 +1,14 @@
 {
   "itemid": "minecraft:bow",
   "displayname": "§6Terminator",
-  "nbttag": "{ench:[],Unbreakable:1b,HideFlags:254,display:{Lore:[0:\"§7Gear Score: §d665\",1:\"§7Damage: §c+310\",2:\"§7Strength: §c+50\",3:\"§7Crit Damage: §c+250% \",4:\"§7Bonus Attack Speed: §c+40%\",5:\"\",6:\"§6Shortbow: Instantly shoots!\",7:\"§7Shoots §b3 §7arrows at once.\",8:\"§7Can damage endermen.\",9:\"\",10:\"§cDivides your §9☣ Crit Chance §cby 4!\",11:\"\",12:\"§6Ability: Salvation §e§lRIGHT CLICK\",13:\"§7Can be casted after landing §63 §7hits.\",14:\"§7§7Shoot a beam, penetrating up\",15:\"§7to §e5 §7foes and dealing §c2x\",16:\"§c§7the damage an arrow would.\",17:\"§7The beam always crits.\",18:\"§8Soulflow Cost: §3§31⸎\",19:\"§8Cooldown: §a2s\",20:\"\",21:\"§7§8This item can be reforged!\",22:\"§7§4☠ §cRequires §5Enderman Slayer 7\",23:\"§6§lLEGENDARY DUNGEON BOW\"],Name:\"§6Terminator\"},ExtraAttributes:{dungeon_item_level:0,id:\"TERMINATOR\"}}",
+  "nbttag": "{ench:[],Unbreakable:1b,HideFlags:254,display:{Lore:[0:\"§7Damage: §c+310\",1:\"§7Strength: §c+50\",2:\"§7Crit Damage: §c+250%\",3:\"§7Bonus Attack Speed: §c+40%\",4:\"§7Shot Cooldown: §a0.5s\",5:\"\",6:\"§6Shortbow: Instantly shoots!\",7:\"§7Shoots §b3 §7arrows at once.\",8:\"§7Can damage endermen.\",9:\"\",10:\"§cDivides your §9☣ Crit Chance §cby 4!\",11:\"\",12:\"§6Ability: Salvation §e§lRIGHT CLICK\",13:\"§7Can be casted after landing §63 §7hits.\",14:\"§7§7Shoot a beam, penetrating up\",15:\"§7to §e5 §7foes and dealing §c2x\",16:\"§c§7the damage an arrow would.\",17:\"§7The beam always crits.\",18:\"§8Soulflow Cost: §3§31⸎\",19:\"§8Cooldown: §a2s\",20:\"\",21:\"§7§8This item can be reforged!\",22:\"§7§4☠ §cRequires §5Enderman Slayer 7\",23:\"§6§lLEGENDARY BOW\"],Name:\"§6Terminator\"},ExtraAttributes:{id:\"TERMINATOR\"}}",
   "damage": 0,
   "lore": [
-    "§7Gear Score: §d665",
     "§7Damage: §c+310",
     "§7Strength: §c+50",
-    "§7Crit Damage: §c+250% ",
+    "§7Crit Damage: §c+250%",
     "§7Bonus Attack Speed: §c+40%",
+    "§7Shot Cooldown: §a0.5s",
     "",
     "§6Shortbow: Instantly shoots!",
     "§7Shoots §b3 §7arrows at once.",
@@ -27,7 +27,7 @@
     "",
     "§7§8This item can be reforged!",
     "§7§4☠ §cRequires §5Enderman Slayer 7",
-    "§6§lLEGENDARY DUNGEON BOW"
+    "§6§lLEGENDARY BOW"
   ],
   "recipe": {
     "A1": "",
@@ -44,9 +44,9 @@
   "internalname": "TERMINATOR",
   "crafttext": "",
   "clickcommand": "viewrecipe",
-  "modver": "2.0.0-REL",
+  "modver": "2.1.0-REL",
   "infoType": "WIKI_URL",
   "info": [
     "https://hypixel-skyblock.fandom.com/wiki/Terminator"
   ]
-}
+}
\ No newline at end of file