Merge pull request #2 from Moulberry/master

Update

4 files changed, 418 insertions, 3 deletions

diff --git a/constants/disable.json b/constants/disable.json
index 6834ca09..60f398a7 100644
--- a/constants/disable.json
+++ b/constants/disable.json
@@ -1,3 +1,4 @@
 {
-	"auctions": false
+	"auctions": true,
+	"auctions_new": false
 }
\ No newline at end of file
diff --git a/constants/enchants.json b/constants/enchants.json
new file mode 100644
index 00000000..b57ec72f
--- /dev/null
+++ b/constants/enchants.json
@@ -0,0 +1,234 @@
+{
+	"enchants": {
+		"SWORD": [
+			"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",
+			"scavenger",
+			"sharpness",
+			"smite",
+			"telekinesis",
+			"thunderlord",
+			"vampirism",
+			"venomous",
+			"vicious",
+			"ultimate_chimera",
+			"ultimate_combo",
+			"ultimate_swarm",
+			"ultimate_wise"
+		],
+		"BOW": [
+			"aiming",
+			"cubism",
+			"dragon_hunter",
+			"flame",
+			"impaling",
+			"infinite_quiver",
+			"piercing",
+			"overload",
+			"power",
+			"punch",
+			"snipe",
+			"telekinesis",
+			"ultimate_chimera",
+			"ultimate_swarm",
+			"ultimate_wise",
+			"ultimate_rend"
+		],
+		"AXE": [
+			"efficiency",
+			"telekinesis",
+			"replenish",
+			"silk_touch"
+		],
+		"PICKAXE": [
+			"compact",
+			"efficiency",
+			"experience",
+			"fortune",
+			"silk_touch",
+			"smelting_touch",
+			"telekinesis"
+		],
+		"FISHING ROD": [
+			"angler",
+			"blessing",
+			"caster",
+			"expertise",
+			"frail",
+			"looting",
+			"luck_of_the_sea",
+			"lure",
+			"magnet",
+			"spiked_hook",
+			"telekinesis"
+		],
+		"SHOVEL": [
+			"efficiency",
+			"silk_touch",
+			"telekinesis"
+		],
+		"HOE": [
+			"replenish",
+			"harvesting",
+			"telekinesis"
+		],
+		"HELMET": [
+			"protection",
+			"growth",
+			"rejuvenate",
+			"aqua_affinity",
+			"thorns",
+			"ultimate_bank",
+			"ultimate_last_stand",
+			"ultimate_legion",
+			"ultimate_no_pain_no_gain",
+			"ultimate_wisdom"
+		],
+		"CHESTPLATE": [
+			"protection",
+			"growth",
+			"rejuvenate",
+			"thorns",
+			"counter_strike",
+			"true_protection",
+			"ultimate_bank",
+			"ultimate_last_stand",
+			"ultimate_legion",
+			"ultimate_no_pain_no_gain",
+			"ultimate_wisdom"
+		],
+		"LEGGINGS": [
+			"protection",
+			"growth",
+			"rejuvenate",
+			"thorns",
+			"ultimate_bank",
+			"ultimate_last_stand",
+			"ultimate_legion",
+			"ultimate_no_pain_no_gain",
+			"ultimate_wisdom"
+		],
+		"BOOTS": [
+			"protection",
+			"growth",
+			"sugar_rush",
+			"rejuvenate",
+			"feather_falling",
+			"depth_strider",
+			"thorns",
+			"ultimate_bank",
+			"ultimate_last_stand",
+			"ultimate_legion",
+			"ultimate_no_pain_no_gain",
+			"ultimate_wisdom"
+		]
+	},
+	"enchant_pools": [
+		[
+			"sharpness",
+			"bane_of_arthropods",
+			"smite"
+		], [
+			"silk_touch",
+			"smelting_touch",
+			"fortune"
+		], [
+			"ultimate_chimera",
+			"ultimate_combo",
+			"ultimate_swarm",
+			"ultimate_wise",
+			"ultimate_rend",
+			"ultimate_bank",
+			"ultimate_last_stand",
+			"ultimate_legion",
+			"ultimate_no_pain_no_gain",
+			"ultimate_wisdom"
+		]
+	],
+	"enchants_min_level": {
+		"bane_of_arthropods": 5,
+		"cleave": 5,
+		"critical": 5,
+		"ender_slayer": 5,
+		"execute": 5,
+		"fire_aspect": 2,
+		"first_strike": 4,
+		"giant_killer": 5,
+		"knockback": 2,
+		"lethality": 5,
+		"life_steal": 3,
+		"luck": 5,
+		"scavenger": 3,
+		"sharpness": 5,
+		"smite": 5,
+		"thunderlord": 5,
+		"vampirism": 5,
+		"venomous": 5,
+		"vicious": 4,
+		"ultimate_chimera": 5,
+		"ultimate_combo": 5,
+		"ultimate_swarm": 5,
+		"ultimate_wise": 5,
+		"aiming": 5,
+		"cubism": 5,
+		"dragon_hunter": 5,
+		"flame": 1,
+		"impaling": 3,
+		"infinite_quiver": 5,
+		"piercing": 1,
+		"overload": 5,
+		"power": 5,
+		"punch": 2,
+		"snipe": 3,
+		"ultimate_rend": 5,
+		"telekinesis": 1,
+		"silk_touch": 1,
+		"compact": 10,
+		"experience": 4,
+		"fortune": 3,
+		"smelting_touch": 1,
+		"angler": 5,
+		"blessing": 5,
+		"caster": 5,
+		"expertise": 10,
+		"frail": 5,
+		"looting": 3,
+		"luck_of_the_sea": 5,
+		"lure": 5,
+		"magnet": 5,
+		"spiked_hook": 5,
+		"efficiency": 5,
+		"replenish": 1,
+		"harvesting": 5,
+		"aqua_affinity": 1,
+		"counter_strike": 5,
+		"true_protection": 1,
+		"protection": 5,
+		"growth": 5,
+		"sugar_rush": 3,
+		"rejuvenate": 5,
+		"feather_falling": 5,
+		"depth_strider": 3,
+		"thorns": 3,
+		"ultimate_bank": 5,
+		"ultimate_last_stand": 5,
+		"ultimate_legion": 5,
+		"ultimate_no_pain_no_gain": 5,
+		"ultimate_wisdom": 5
+	}
+}
\ No newline at end of file
diff --git a/constants/leveling.json b/constants/leveling.json
index 3af6c5c3..cc62a0db 100644
--- a/constants/leveling.json
+++ b/constants/leveling.json
@@ -118,5 +118,57 @@
     25,
     100,
     500
+  ],
+  "catacombs": [
+	50,
+	75,
+	110,
+	160,
+	230,
+	330,
+	470,
+	670,
+	950,
+	1340,
+	1890,
+	2665,
+	3760,
+	5260,
+	7380,
+	10300,
+	14400,
+	20000,
+	27600,
+	38000,
+	52500,
+	71500,
+	97000,
+	132000,
+	180000,
+	243000,
+	328000,
+	445000,
+	600000,
+	800000,
+	1065000,
+	1410000,
+	1900000,
+	2500000,
+	3300000,
+	4300000,
+	5600000,
+	7200000,
+	9200000,
+	12000000,
+	15000000,
+	19000000,
+	24000000,
+	30000000,
+	38000000,
+	48000000,
+	60000000,
+	75000000,
+	93000000,
+	116250000
   ]
 }
\ No newline at end of file
diff --git a/constants/misc.json b/constants/misc.json
index 5c9ed4f1..1e50b7a7 100644
--- a/constants/misc.json
+++ b/constants/misc.json
@@ -332,7 +332,134 @@
     ],
     "PERSONAL_COMPACTOR_5000": [
       "PERSONAL_COMPACTOR_6000"
-    ]
+    ],
+	"SCARF_STUDIES": [
+	  "SCARF_THESIS",
+	  "SCARF_GRIMOIRE"
+	],
+	"SCARF_THESIS": [
+	  "SCARF_GRIMOIRE"
+	],
+	"CAT_TALISMAN": [
+	  "LYNX_TALISMAN",
+	  "CHEETAH_TALISMAN"
+	],
+	"LYNX_TALISMAN": [
+	  "CHEETAH_TALISMAN"
+	],
+	"SHADY_RING": [
+	  "CROOKED_ARTIFACT",
+	  "SEAL_OF_THE_FAMILY"
+	],
+	"CROOKED_ARTIFACT": [
+	  "SEAL_OF_THE_FAMILY"
+	],
+	"TREASURE_TALISMAN": [
+	  "TREASURE_RING",
+	  "TREASURE_ARTIFACT"
+	],
+	"TREASURE_RING": [
+	  "TREASURE_ARTIFACT"
+	],
+	"BEASTMASTER_CREST_COMMON": [
+	  "BEASTMASTER_CREST_UNCOMMON",
+	  "BEASTMASTER_CREST_RARE",
+	  "BEASTMASTER_CREST_EPIC",
+	  "BEASTMASTER_CREST_LEGENDARY"
+	],
+	"BEASTMASTER_CREST_UNCOMMON": [
+	  "BEASTMASTER_CREST_RARE",
+	  "BEASTMASTER_CREST_EPIC",
+	  "BEASTMASTER_CREST_LEGENDARY"
+	],
+	"BEASTMASTER_CREST_RARE": [
+	  "BEASTMASTER_CREST_EPIC",
+	  "BEASTMASTER_CREST_LEGENDARY"
+	],
+	"BEASTMASTER_CREST_EPIC": [
+	  "BEASTMASTER_CREST_LEGENDARY"
+	],
+	"RAGGEDY_SHARK_TOOTH_NECKLACE": [
+	  "DULL_SHARK_TOOTH_NECKLACE",
+	  "HONED_SHARK_TOOTH_NECKLACE",
+	  "SHARP_SHARK_TOOTH_NECKLACE",
+	  "RAZOR_SHARP_SHARK_TOOTH_NECKLACE"
+	],
+	"DULL_SHARK_TOOTH_NECKLACE": [
+	  "HONED_SHARK_TOOTH_NECKLACE",
+	  "SHARP_SHARK_TOOTH_NECKLACE",
+	  "RAZOR_SHARP_SHARK_TOOTH_NECKLACE"
+	],
+	"HONED_SHARK_TOOTH_NECKLACE": [
+	  "SHARP_SHARK_TOOTH_NECKLACE",
+	  "RAZOR_SHARP_SHARK_TOOTH_NECKLACE"
+	],
+	"SHARP_SHARK_TOOTH_NECKLACE": [
+	  "RAZOR_SHARP_SHARK_TOOTH_NECKLACE"
+	],
+	"WEDDING_RING_0": [
+	  "WEDDING_RING_1",
+	  "WEDDING_RING_2",
+	  "WEDDING_RING_3",
+	  "WEDDING_RING_4",
+	  "WEDDING_RING_5",
+	  "WEDDING_RING_6",
+	  "WEDDING_RING_7",
+	  "WEDDING_RING_8",
+	  "WEDDING_RING_9"
+	],
+	"WEDDING_RING_1": [
+	  "WEDDING_RING_2",
+	  "WEDDING_RING_3",
+	  "WEDDING_RING_4",
+	  "WEDDING_RING_5",
+	  "WEDDING_RING_6",
+	  "WEDDING_RING_7",
+	  "WEDDING_RING_8",
+	  "WEDDING_RING_9"
+	],
+	"WEDDING_RING_2": [
+	  "WEDDING_RING_3",
+	  "WEDDING_RING_4",
+	  "WEDDING_RING_5",
+	  "WEDDING_RING_6",
+	  "WEDDING_RING_7",
+	  "WEDDING_RING_8",
+	  "WEDDING_RING_9"
+	],
+	"WEDDING_RING_3": [
+	  "WEDDING_RING_4",
+	  "WEDDING_RING_5",
+	  "WEDDING_RING_6",
+	  "WEDDING_RING_7",
+	  "WEDDING_RING_8",
+	  "WEDDING_RING_9"
+	],
+	"WEDDING_RING_4": [
+	  "WEDDING_RING_5",
+	  "WEDDING_RING_6",
+	  "WEDDING_RING_7",
+	  "WEDDING_RING_8",
+	  "WEDDING_RING_9"
+	],
+	"WEDDING_RING_5": [
+	  "WEDDING_RING_6",
+	  "WEDDING_RING_7",
+	  "WEDDING_RING_8",
+	  "WEDDING_RING_9"
+	],
+	"WEDDING_RING_6": [
+	  "WEDDING_RING_7",
+	  "WEDDING_RING_8",
+	  "WEDDING_RING_9"
+	],
+	"WEDDING_RING_7": [
+	  "WEDDING_RING_8",
+	  "WEDDING_RING_9"
+	],
+	"WEDDING_RING_8": [
+	  "WEDDING_RING_9"
+	]
   },
   
   "special_bois": [
@@ -345,7 +472,8 @@
 	"2c3f5fc730c14821ae5c2e3f07868b1a",
 	"689ff4bbf61e4e0594e01066892b0bbe",
 	"a5761ff3c7104cabb4f43e7f017a8dbf",
-	"7fd80955792d4206b43ae8f559f20b56"
+	"7fd80955792d4206b43ae8f559f20b56",
+	"4f0e53f2bc1e464fa86af515e22390c7"
   ],
 
   "ranks": {