diff options
106 files changed, 886 insertions, 273 deletions
diff --git a/constants/enchants.json b/constants/enchants.json index 61bb68a0..89f75ffb 100644 --- a/constants/enchants.json +++ b/constants/enchants.json @@ -24,7 +24,6 @@ "sharpness", "smite", "syphon", - "telekinesis", "titan_killer", "thunderlord", "thunderbolt", @@ -55,7 +54,6 @@ "power", "punch", "snipe", - "telekinesis", "ultimate_soul_eater", "ultimate_chimera", "ultimate_swarm", @@ -68,7 +66,6 @@ ], "AXE": [ "efficiency", - "telekinesis", "replenish", "silk_touch", "turbo_cactus", @@ -84,8 +81,7 @@ "fortune", "silk_touch", "pristine", - "smelting_touch", - "telekinesis" + "smelting_touch" ], "DRILL": [ "compact", @@ -94,8 +90,7 @@ "fortune", "pristine", "silk_touch", - "smelting_touch", - "telekinesis" + "smelting_touch" ], "FISHING ROD": [ "angler", @@ -108,7 +103,6 @@ "lure", "magnet", "spiked_hook", - "telekinesis", "impaling", "charm", "corruption", @@ -126,7 +120,6 @@ "lure", "magnet", "spiked_hook", - "telekinesis", "bane_of_arthropods", "cleave", "critical", @@ -169,13 +162,11 @@ ], "SHOVEL": [ "efficiency", - "silk_touch", - "telekinesis" + "silk_touch" ], "HOE": [ "replenish", "harvesting", - "telekinesis", "turbo_wheat", "turbo_cane", "turbo_warts", @@ -295,7 +286,6 @@ "sharpness", "smite", "syphon", - "telekinesis", "titan_killer", "thunderlord", "thunderbolt", @@ -337,7 +327,6 @@ "sharpness", "smite", "syphon", - "telekinesis", "titan_killer", "thunderlord", "thunderbolt", @@ -358,7 +347,6 @@ "silk_touch", "pristine", "smelting_touch", - "telekinesis", "smoldering", "ultimate_inferno", "ultimate_fatal_tempo" @@ -592,9 +580,6 @@ 25, 30 ], - "telekinesis": [ - 5 - ], "knockback": [ 15, 30 diff --git a/constants/fairy_souls.json b/constants/fairy_souls.json index 538f7301..e03faa8b 100644 --- a/constants/fairy_souls.json +++ b/constants/fairy_souls.json @@ -64,7 +64,7 @@ "-48,76,49", "26,80,-65", "40,68,-65", - "38,75,-38", + "44,68,-34", "168,60,-36", "154,98,-71", "180,63,-15", @@ -106,6 +106,7 @@ "crimson_isle": [ "-644,125,-689", "-79,139,-779", + "-352,191,-553", "-717,163,-980", "-726,144,-891", "-690,122,-752", diff --git a/constants/parents.json b/constants/parents.json index c576528d..efcb2272 100644 --- a/constants/parents.json +++ b/constants/parents.json @@ -2811,5 +2811,12 @@ ], "HUNTER_RING": [ "HUNTER_TALISMAN" + ], + "OBFUSCATED_FISH_2_GOLD": [ + "OBFUSCATED_FISH_2_SILVER", + "OBFUSCATED_FISH_2_BRONZE" + ], + "OBFUSCATED_FISH_3_SILVER": [ + "OBFUSCATED_FISH_3_BRONZE" ] } diff --git a/constants/reforgestones.json b/constants/reforgestones.json index a73e1cce..cb9a9f04 100644 --- a/constants/reforgestones.json +++ b/constants/reforgestones.json @@ -139,53 +139,57 @@ } } }, - "GOLDEN_BALL": { - "internalName": "GOLDEN_BALL", - "reforgeName": "Bountiful", + "BLAZE_WAX": { + "internalName": "BLAZE_WAX", + "reforgeName": "Waxed", "reforgeType": "blacksmith/reforge_stone", - "itemTypes": "HOE", + "itemTypes": "EQUIPMENT", "requiredRarities": [ "COMMON", "UNCOMMON", "RARE", "EPIC", "LEGENDARY", - "MYTHIC" + "MYTHIC", + "DIVINE" ], "reforgeCosts": { - "COMMON": 20000, - "UNCOMMON": 40000, - "RARE": 80000, - "EPIC": 150000, - "LEGENDARY": 300000, - "MYTHIC": 600000 - }, - "reforgeAbility": { - "COMMON": "§7Grants §a+1 §6☘ Farming §6Fortune§7, which increases your chance for multiple crops. §7Grants §a+0.2 §7Coins on crop break.", - "UNCOMMON": "§7Grants §a+2 §6☘ Farming §6Fortune§7, which increases your chance for multiple crops. §7Grants §a+0.2 §7Coins on crop break.", - "RARE": "§7Grants §a+3 §6☘ Farming §6Fortune§7, which increases your chance for multiple crops. §7Grants §a+0.2 §7Coins on crop break.", - "EPIC": "§7Grants §a+5 §6☘ Farming §6Fortune§7, which increases your chance for multiple crops. §7Grants §a+0.2 §7Coins on crop break.", - "LEGENDARY": "§7Grants §a+7 §6☘ Farming §6Fortune§7, which increases your chance for multiple crops. §7Grants §a+0.2 §7Coins on crop break.", - "MYTHIC": "§7Grants §a+10 §6☘ Farming §6Fortune§7, which increases your chance for multiple crops. §7Grants §a+0.2 §7Coins on crop break." + "COMMON": 7500, + "UNCOMMON": 15000, + "RARE": 30000, + "EPIC": 75000, + "LEGENDARY": 150000, + "MYTHIC": 300000, + "DIVINE": 400000 }, "reforgeStats": { "COMMON": { - "speed": 1 + "health": 5, + "crit_chance": 2 }, "UNCOMMON": { - "speed": 2 + "health": 6, + "crit_chance": 3 }, "RARE": { - "speed": 3 + "health": 8, + "crit_chance": 4 }, "EPIC": { - "speed": 5 + "health": 10, + "crit_chance": 5 }, "LEGENDARY": { - "speed": 8 + "health": 12, + "crit_chance": 6 }, "MYTHIC": { - "speed": 13 + "health": 15, + "crit_chance": 7 + }, + "DIVINE": { + "health": 20, + "crit_chance": 8 } } }, @@ -711,6 +715,56 @@ } } }, + "GOLDEN_BALL": { + "internalName": "GOLDEN_BALL", + "reforgeName": "Bountiful", + "reforgeType": "blacksmith/reforge_stone", + "itemTypes": "HOE", + "requiredRarities": [ + "COMMON", + "UNCOMMON", + "RARE", + "EPIC", + "LEGENDARY", + "MYTHIC" + ], + "reforgeCosts": { + "COMMON": 20000, + "UNCOMMON": 40000, + "RARE": 80000, + "EPIC": 150000, + "LEGENDARY": 300000, + "MYTHIC": 600000 + }, + "reforgeAbility": { + "COMMON": "§7Grants §a+1 §6☘ Farming §6Fortune§7, which increases your chance for multiple crops. §7Grants §a+0.2 §7Coins on crop break.", + "UNCOMMON": "§7Grants §a+2 §6☘ Farming §6Fortune§7, which increases your chance for multiple crops. §7Grants §a+0.2 §7Coins on crop break.", + "RARE": "§7Grants §a+3 §6☘ Farming §6Fortune§7, which increases your chance for multiple crops. §7Grants §a+0.2 §7Coins on crop break.", + "EPIC": "§7Grants §a+5 §6☘ Farming §6Fortune§7, which increases your chance for multiple crops. §7Grants §a+0.2 §7Coins on crop break.", + "LEGENDARY": "§7Grants §a+7 §6☘ Farming §6Fortune§7, which increases your chance for multiple crops. §7Grants §a+0.2 §7Coins on crop break.", + "MYTHIC": "§7Grants §a+10 §6☘ Farming §6Fortune§7, which increases your chance for multiple crops. §7Grants §a+0.2 §7Coins on crop break." + }, + "reforgeStats": { + "COMMON": { + "speed": |