Merge branch 'master' into dangerous

5 files changed, 158 insertions, 72 deletions

diff --git a/constants/enchants.json b/constants/enchants.json
index 71a82c35..f9cf40b8 100644
--- a/constants/enchants.json
+++ b/constants/enchants.json
@@ -101,7 +101,8 @@
       "lure",
       "magnet",
       "spiked_hook",
-      "telekinesis"
+      "telekinesis",
+      "impaling"
     ],
     "FISHING WEAPON": [
       "angler",
@@ -239,6 +240,92 @@
       "ultimate_legion",
       "ultimate_no_pain_no_gain",
       "ultimate_wisdom"
+    ],
+    "LONGSWORD": [
+      "bane_of_arthropods",
+      "cleave",
+      "critical",
+      "cubism",
+      "dragon_hunter",
+      "ender_slayer",
+      "execute",
+      "experience",
+      "fire_aspect",
+      "first_strike",
+      "giant_killer",
+      "impaling",
+      "knockback",
+      "lethality",
+      "life_steal",
+      "looting",
+      "luck",
+      "mana_steal",
+      "PROSECUTE",
+      "scavenger",
+      "sharpness",
+      "smite",
+      "syphon",
+      "telekinesis",
+      "titan_killer",
+      "thunderlord",
+      "thunderbolt",
+      "triple_strike",
+      "vampirism",
+      "venomous",
+      "vicious",
+      "ultimate_one_for_all",
+      "ultimate_soul_eater",
+      "ultimate_chimera",
+      "ultimate_combo",
+      "ultimate_swarm",
+      "ultimate_wise"
+    ],
+    "GAUNTLET": [
+      "bane_of_arthropods",
+      "cleave",
+      "critical",
+      "cubism",
+      "dragon_hunter",
+      "ender_slayer",
+      "execute",
+      "experience",
+      "fire_aspect",
+      "first_strike",
+      "giant_killer",
+      "impaling",
+      "knockback",
+      "lethality",
+      "life_steal",
+      "looting",
+      "luck",
+      "mana_steal",
+      "PROSECUTE",
+      "scavenger",
+      "sharpness",
+      "smite",
+      "syphon",
+      "telekinesis",
+      "titan_killer",
+      "thunderlord",
+      "thunderbolt",
+      "triple_strike",
+      "vampirism",
+      "venomous",
+      "vicious",
+      "ultimate_one_for_all",
+      "ultimate_soul_eater",
+      "ultimate_chimera",
+      "ultimate_combo",
+      "ultimate_swarm",
+      "ultimate_wise",
+      "compact",
+      "efficiency",
+      "experience",
+      "fortune",
+      "silk_touch",
+      "pristine",
+      "smelting_touch",
+      "telekinesis"
     ]
   },
   "enchant_pools": [
diff --git a/constants/essencecosts.json b/constants/essencecosts.json
index ebcc6a6f..09e8d4be 100644
--- a/constants/essencecosts.json
+++ b/constants/essencecosts.json
@@ -585,6 +585,14 @@
     "4": 350,
     "5": 500
   },
+  "DARK_CLAYMORE": {
+    "type": "Wither",
+    "1": 150,
+    "2": 300,
+    "3": 500,
+    "4": 900,
+    "5": 1500
+  },
   "RUNAANS_BOW": {
     "type": "Spider",
     "dungeonize": 500,
diff --git a/constants/misc.json b/constants/misc.json
index 3c86fe24..5a581d4a 100644
--- a/constants/misc.json
+++ b/constants/misc.json
@@ -884,7 +884,7 @@
     "f94771a6e4c4457495e7aa821c370e3d",
     "4f0e53f2bc1e464fa86af515e22390c7",
     "baa6c0a7c3494f7d9257c92dd886b890",
-    "8f26e4e3b26a4c64901f1f85d579dc73",
+    "783f560bff974363b5cfd61c496ba278",
     "d82f5572054f4b7cb3d73e614098bbcb",
     "e40ba3dfb5254b488649969d6d22ab1c",
     "62b17c445d774a669cf6a9032005ae23",
@@ -977,7 +977,7 @@
     "c44ddfef16f544cbaaabb9ce610e4242",
     "6b50d5079be24b09b8bea6bb77a29bc7",
     "044903b7a9d3416d957f929557af6c88",
-    "7a9dc802d4014d7d93c08dd1bc98c70d",
+    "a049a5384dd843f887d503f09d48b4dc",
     "781fa5776ab64a60a93c788ce5284a91",
     "c346498734274398a5d594614515a6b2",
     "f51f722efec648b0a358785a0bbcaa36",
@@ -1044,7 +1044,9 @@
     "f20def955521484ebf30e83dd5cc4670",
     "5cda864898c34f1a8f108239b7f1f6cc",
     "774b6df633484a9bb13183b3314ff1b5",
-    "00fd0f5c28674304915d2c93586c77cb"
+    "00fd0f5c28674304915d2c93586c77cb",
+    "79ab0f237ab74b918c91ed627ff9255b",
+    "34c3d4d9e9af457c99d4e80fd13ebc7e"
   ],
   "ranks": {
     "OWNER": {
@@ -1180,12 +1182,12 @@
       "§f - §aDeDiamondPro§7: Item-repo & Feature Contributor",
       "§f - §anopo§7: Feature Contributor",
       "§f - §aLulonaut§7: Feature Contributor",
-      "§f - §aKeebler408§7: Feature Contributor",
+      "§f - §aCraftyOldMiner§7: Feature Contributor",
       "§f - §aCarelessHippo§7: Feature Contributor",
       "§f - §aMisterCheezeCake§7: Item-repo Contributor",
       "§f - §aMotorGorilla1§7: Asset Contributor",
       "§f - §aSwedengamer100§7: Item-repo Contributor",
-      "§f - §aTomEngMaster§7: Item-repo Contributor",
+      "§f - §alucy§7: Item-repo Contributor",
       "§f - §aTymanWasTaken§7: Item-repo Contributor",
       "§f - §aapotato321§7: Item-repo Contributor",
       "§f - §aSome1sm§7: Item-repo Contributor",
@@ -1197,20 +1199,25 @@
       "§f - §bThatGravyBoat#0001§7: §cAdmin",
       "§f - §bnopo#6969§7: §cAdmin",
       "§f - §bjani270#0119§7: §cAdmin",
-      "§f - §bTomEngMaster#9182§7: §2Sr. Moderator",
+      "§f - §bMadeline#6969§7: §2Sr. Moderator",
+      "§f - §bTyman#5998§7: §2Sr. Moderator",
       "§f - §bapotato#1965§7: §2Moderator",
       "§f - §bBestower#6073§7: §2Moderator",
-      "§f - §bTyman#5998§7: §2Moderator",
       "§f - §bHasnu#4411§7: §2Moderator",
       "§f - §bgeorge.#0550: §2Moderator",
       "§f - §bDoKM#7224: §2Moderator",
-      "§f - §bMisterCheezeCake#1662: §aHelper"
+      "§f - §bMisterCheezeCake#1662: §aHelper",
+      "§f - §bLulonaut#3350: §aHelper"
     ]
   },
   "cosmeticsinfo": {
     "lore": [
-      "§6Hey, because Moulberry is a Pepega he closed his patreon permanently.",
-      "§6If you read this please ping moulberry on discord and tell him to reopen his Patreon."
+      "§6Moulberry has reopened his Patreon only to be able to cover the NEU server costs.",
+      "§c§lHe is not offering capes/other cosmetics if you pledge.",
+      "§7If you still wish to support him §c§lwith no reward§r§7 his §6§lPatreon§r§7 is:",
+      "§7https://www.patreon.com/moulberry",
+      "§7And his §5§lDiscord§r§7 server is:",
+      "§7https://discord.gg/moulberry"
     ]
   },
   "featureslist": "https://gist.github.com/jani270/d33e249d40b0333b87ba5c5e70fca398"
diff --git a/constants/petnums.json b/constants/petnums.json
index 983d100f..ebe59373 100644
--- a/constants/petnums.json
+++ b/constants/petnums.json
@@ -170,7 +170,7 @@
       "100": {
         "otherNums": [
           50,
-          100
+          50
         ],
         "statNums": {
           "INTELLIGENCE": 75.0,
@@ -193,7 +193,7 @@
       "100": {
         "otherNums": [
           50,
-          100,
+          75,
           100
         ],
         "statNums": {
@@ -489,7 +489,7 @@
     "EPIC": {
       "1": {
         "otherNums": [
-          0.2,
+          0.1,
           0.4
         ],
         "statNums": {
@@ -499,7 +499,7 @@
       },
       "100": {
         "otherNums": [
-          20,
+          10,
           40
         ],
         "statNums": {
@@ -511,7 +511,7 @@
     "LEGENDARY": {
       "1": {
         "otherNums": [
-          0.2,
+          0.1,
           0.4
         ],
         "statNums": {
@@ -522,7 +522,7 @@
       },
       "100": {
         "otherNums": [
-          20,
+          10,
           40
         ],
         "statNums": {
@@ -566,7 +566,7 @@
       "100": {
         "otherNums": [
           200,
-          3,
+          1,
           25
         ],
         "statNums": {
@@ -578,9 +578,9 @@
       "1": {
         "otherNums": [
           2.5,
-          0.03000000000000025,
+          0.0,
           20.0,
-          0.1999999999999993
+          0.1
         ],
         "statNums": {
           "DEFENSE": 25.0,
@@ -590,7 +590,7 @@
       "100": {
         "otherNums": [
           250,
-          3,
+          1,
           20,
           20
         ],
@@ -614,7 +614,7 @@
       "100": {
         "otherNums": [
           150,
-          3,
+          1,
           30
         ],
         "statNums": {
@@ -1709,18 +1709,20 @@
         ],
         "statNums": {
           "BONUS_ATTACK_SPEED": 25.0,
-          "STRENGTH": 25.0
+          "STRENGTH": 25.0,
+          "MAGIC_FIND": 0.0
         }
       },
       "100": {
         "otherNums": [
           100,
           40,
-          0.2
+          0.25
         ],
         "statNums": {
           "BONUS_ATTACK_SPEED": 50.0,
-          "STRENGTH": 50.0
+          "STRENGTH": 50.0,
+          "MAGIC_FIND": 10.0
         }
       },
       "stats_levelling_curve":"101:200:1"
@@ -1879,11 +1881,8 @@
       "1": {
         "otherNums": [
           1.0,
-          8.0,
-          10.0,
-          1000.0,
-          10.0,
-          10.0
+          0.5,
+          0.01
         ],
         "statNums": {
           "HEALTH": 2.0
@@ -1892,11 +1891,8 @@
       "100": {
         "otherNums": [
           100,
-          8,
-          10,
-          1000,
-          10,
-          10
+          50,
+          1
         ],
         "statNums": {
           "HEALTH": 200.0
@@ -1907,11 +1903,8 @@
       "1": {
         "otherNums": [
           1.0,
-          8.0,
-          10.0,
-          1000.0,
-          10.0,
-          10.0,
+          0.5,
+          0.01,
           0.5
         ],
         "statNums": {
@@ -1921,11 +1914,8 @@
       "100": {
         "otherNums": [
           100,
-          8,
-          10,
-          1000,
-          10,
-          10,
+          50,
+          1,
           50
         ],
         "statNums": {
@@ -3918,7 +3908,7 @@
     "EPIC": {
       "1": {
         "otherNums": [
-          0.5,
+          0.3,
           0.6,
           10.0
         ],
@@ -3931,7 +3921,7 @@
       },
       "100": {
         "otherNums": [
-          50,
+          30,
           55,
           10
         ],
@@ -3946,7 +3936,7 @@
     "LEGENDARY": {
       "1": {
         "otherNums": [
-          0.5,
+          0.3,
           0.6,
           10.0,
           0.2,
@@ -3961,7 +3951,7 @@
       },
       "100": {
         "otherNums": [
-          50,
+          30,
           55,
           10,
           20,
@@ -3978,7 +3968,7 @@
     "RARE": {
       "1": {
         "otherNums": [
-          0.3,
+          0.2,
           0.3,
           10.0
         ],
@@ -3991,7 +3981,7 @@
       },
       "100": {
         "otherNums": [
-          33,
+          20,
           30,
           10
         ],
@@ -4006,7 +3996,7 @@
     "UNCOMMON": {
       "1": {
         "otherNums": [
-          0.3
+          0.2
         ],
         "statNums": {
           "FEROCITY": 0.0,
@@ -4017,7 +4007,7 @@
       },
       "100": {
         "otherNums": [
-          33
+          20
         ],
         "statNums": {
           "FEROCITY": 25.0,
@@ -4033,8 +4023,7 @@
       "1": {
         "otherNums": [
           3.2,
-          5.3,
-          0.2
+          5.2
         ],
         "statNums": {
           "DEFENSE": 1.0,
@@ -4043,9 +4032,8 @@
       },
       "100": {
         "otherNums": [
-          20,
-          40,
-          20
+          30,
+          30
         ],
         "statNums": {
           "DEFENSE": 100.0,
@@ -4057,8 +4045,7 @@
       "1": {
         "otherNums": [
           3.2,
-          5.5,
-          0.2
+          5.2
         ],
         "statNums": {
           "DEFENSE": 1.0,
@@ -4067,9 +4054,8 @@
       },
       "100": {
         "otherNums": [
-          20,
-          50,
-          25
+          30,
+          30
         ],
         "statNums": {
           "DEFENSE": 100.0,
@@ -4083,7 +4069,7 @@
       "1": {
         "otherNums": [
           0.3,
-          0.5
+          0.2
         ],
         "statNums": {
           "CRIT_CHANCE": 0.0,
@@ -4096,7 +4082,7 @@
       "100": {
         "otherNums": [
           30,
-          50
+          25
         ],
         "statNums": {
           "CRIT_CHANCE": 5.0,
@@ -4111,9 +4097,8 @@
       "1": {
         "otherNums": [
           0.3,
-          0.5,
-          2.0,
-          3.0
+          0.2,
+          2.0
         ],
         "statNums": {
           "CRIT_CHANCE": 0.0,
@@ -4126,9 +4111,8 @@
       "100": {
         "otherNums": [
           30,
-          50,
-          200,
-          3
+          25,
+          200
         ],
         "statNums": {
           "CRIT_CHANCE": 5.0,
diff --git a/constants/reforgestones.json b/constants/reforgestones.json
index dbfff90a..18f9ef0f 100644
--- a/constants/reforgestones.json
+++ b/constants/reforgestones.json
@@ -513,7 +513,7 @@
       "LEGENDARY": 1000000,
       "MYTHIC": 2000000
     },
-    "reforgeAbility": "Critical hits have a chance to deal up to §a20% §7extra damage.",
+    "reforgeAbility": "Critical hits have a chance to deal up to §a15% §7extra damage.",
     "reforgeStats": {
       "COMMON": {
         "strength": 30,