From 105fa1b5659244f5ebfe64b80ad0d1bb09e88cdb Mon Sep 17 00:00:00 2001 From: jani270 <69345714+jani270@users.noreply.github.com> Date: Wed, 20 Nov 2024 13:06:43 +0100 Subject: [PATCH 1/2] fix: Pest Drops, Forge Times and Glacite Golem craft chance (#1447) --- items/GLACITE_GOLEM;3.json | 2 +- items/GLACITE_GOLEM;4.json | 2 +- items/PEST_BEETLE_MONSTER.json | 13 ++++--------- items/PEST_CRICKET_MONSTER.json | 8 ++++---- items/PEST_EARTHWORM_MONSTER.json | 8 ++++---- items/PEST_FLY_MONSTER.json | 8 ++++---- items/PEST_LOCUST_MONSTER.json | 15 +++++---------- items/PEST_MITE_MONSTER.json | 8 ++++---- items/PEST_MOSQUITO_MONSTER.json | 8 ++++---- items/PEST_MOTH_MONSTER.json | 8 ++++---- items/PEST_RAT_MONSTER.json | 8 ++++---- items/THEORETICAL_HOE_WHEAT_2.json | 8 ++++---- items/THEORETICAL_HOE_WHEAT_3.json | 8 ++++---- items/TUNGSTEN_KEY.json | 2 +- items/UMBER_KEY.json | 2 +- 15 files changed, 49 insertions(+), 59 deletions(-) diff --git a/items/GLACITE_GOLEM;3.json b/items/GLACITE_GOLEM;3.json index 43209c918..cd40cfbd7 100644 --- a/items/GLACITE_GOLEM;3.json +++ b/items/GLACITE_GOLEM;3.json @@ -34,7 +34,7 @@ "C3": "FLAWLESS_AQUAMARINE_GEM:1" }, "internalname": "GLACITE_GOLEM;3", - "crafttext": "Requires: Glacite IX, 50% Chance", + "crafttext": "Requires: Glacite IX, 80% Chance", "clickcommand": "viewrecipe", "modver": "", "infoType": "WIKI_URL", diff --git a/items/GLACITE_GOLEM;4.json b/items/GLACITE_GOLEM;4.json index 5e676f2f1..55f91f1c4 100644 --- a/items/GLACITE_GOLEM;4.json +++ b/items/GLACITE_GOLEM;4.json @@ -39,7 +39,7 @@ "C3": "FLAWLESS_AQUAMARINE_GEM:1" }, "internalname": "GLACITE_GOLEM;4", - "crafttext": "Requires: Glacite IX, 50% Chance", + "crafttext": "Requires: Glacite IX, 20% Chance", "clickcommand": "viewrecipe", "modver": "", "infoType": "WIKI_URL", diff --git a/items/PEST_BEETLE_MONSTER.json b/items/PEST_BEETLE_MONSTER.json index e0ca81d6f..a98aff64e 100644 --- a/items/PEST_BEETLE_MONSTER.json +++ b/items/PEST_BEETLE_MONSTER.json @@ -29,12 +29,7 @@ "type": "drops", "drops": [ { - "id": "ENCHANTED_NETHER_STALK:1", - "extra": [], - "chance": "100%" - }, - { - "id": "ENCHANTED_BROWN_MUSHROOM:1", + "id": "ENCHANTED_NETHER_STALK:3", "extra": [], "chance": "100%" }, @@ -74,14 +69,14 @@ "chance": "2%" }, { - "id": "MUTANT_NETHER_STALK:1", + "id": "MUTANT_NETHER_STALK:9", "extra": [], - "chance": "3%" + "chance": "0.5%" }, { "id": "DYE_DUNG:1", "extra": [], - "chance": "0.0002%" + "chance": "0.0004%" } ] } diff --git a/items/PEST_CRICKET_MONSTER.json b/items/PEST_CRICKET_MONSTER.json index 64ce36d9b..210b21cd7 100644 --- a/items/PEST_CRICKET_MONSTER.json +++ b/items/PEST_CRICKET_MONSTER.json @@ -30,7 +30,7 @@ "type": "drops", "drops": [ { - "id": "ENCHANTED_CARROT:1", + "id": "ENCHANTED_CARROT:3", "extra": [], "chance": "100%" }, @@ -60,9 +60,9 @@ "chance": "10%" }, { - "id": "ENCHANTED_GOLDEN_CARROT:1", + "id": "ENCHANTED_GOLDEN_CARROT:12", "extra": [], - "chance": "3%" + "chance": "0.5%" }, { "id": "VINYL_CRICKET_CHOIR:1", @@ -77,7 +77,7 @@ { "id": "DYE_DUNG:1", "extra": [], - "chance": "0.0002%" + "chance": "0.0004%" } ] } diff --git a/items/PEST_EARTHWORM_MONSTER.json b/items/PEST_EARTHWORM_MONSTER.json index 5539cf809..b49cc01e9 100644 --- a/items/PEST_EARTHWORM_MONSTER.json +++ b/items/PEST_EARTHWORM_MONSTER.json @@ -29,7 +29,7 @@ "type": "drops", "drops": [ { - "id": "ENCHANTED_MELON:1", + "id": "ENCHANTED_MELON:5", "extra": [], "chance": "100%" }, @@ -64,9 +64,9 @@ "chance": "2%" }, { - "id": "ENCHANTED_MELON_BLOCK:1", + "id": "ENCHANTED_MELON_BLOCK:15", "extra": [], - "chance": "4%" + "chance": "0.5%" }, { "id": "BOOKWORM_BOOK:1", @@ -76,7 +76,7 @@ { "id": "DYE_DUNG:1", "extra": [], - "chance": "0.0002%" + "chance": "0.0004%" } ] } diff --git a/items/PEST_FLY_MONSTER.json b/items/PEST_FLY_MONSTER.json index 93cce4887..eb6f78490 100644 --- a/items/PEST_FLY_MONSTER.json +++ b/items/PEST_FLY_MONSTER.json @@ -30,7 +30,7 @@ "type": "drops", "drops": [ { - "id": "ENCHANTED_HAY_BLOCK:1", + "id": "ENCHANTED_WHEAT:1", "extra": [], "chance": "100%" }, @@ -70,14 +70,14 @@ "chance": "2%" }, { - "id": "TIGHTLY_TIED_HAY_BALE:1", + "id": "ENCHANTED_HAY_BALE:3", "extra": [], - "chance": "1%" + "chance": "0.5%" }, { "id": "DYE_DUNG:1", "extra": [], - "chance": "0.0002%" + "chance": "0.0004%" } ] } diff --git a/items/PEST_LOCUST_MONSTER.json b/items/PEST_LOCUST_MONSTER.json index 2c64645e4..cff7bcff7 100644 --- a/items/PEST_LOCUST_MONSTER.json +++ b/items/PEST_LOCUST_MONSTER.json @@ -30,15 +30,10 @@ "type": "drops", "drops": [ { - "id": "ENCHANTED_POTATO:1", + "id": "ENCHANTED_POTATO:3", "extra": [], "chance": "100%" }, - { - "id": "ENCHANTED_POISONOUS_POTATO:1", - "extra": [], - "chance": "5%" - }, { "id": "COMPOST:1", "extra": [], @@ -70,19 +65,19 @@ "chance": "2%" }, { - "id": "ENCHANTED_BAKED_POTATO:1", + "id": "ENCHANTED_BAKED_POTATO:10", "extra": [], - "chance": "3%" + "chance": "0.5%" }, { "id": "SUNDER;6:1", "extra": [], - "chance": "1%" + "chance": "0.5%" }, { "id": "DYE_DUNG:1", "extra": [], - "chance": "0.0002%" + "chance": "0.0004%" } ] } diff --git a/items/PEST_MITE_MONSTER.json b/items/PEST_MITE_MONSTER.json index 603e9394e..0f1a0a76b 100644 --- a/items/PEST_MITE_MONSTER.json +++ b/items/PEST_MITE_MONSTER.json @@ -29,7 +29,7 @@ "type": "drops", "drops": [ { - "id": "ENCHANTED_CACTUS_GREEN:1", + "id": "ENCHANTED_CACTUS_GREEN:2", "extra": [], "chance": "100%" }, @@ -64,9 +64,9 @@ "chance": "2%" }, { - "id": "ENCHANTED_CACTUS:1", + "id": "ENCHANTED_CACTUS:6", "extra": [], - "chance": "2%" + "chance": "0.5%" }, { "id": "ATMOSPHERIC_FILTER:1", @@ -76,7 +76,7 @@ { "id": "DYE_DUNG:1", "extra": [], - "chance": "0.0002%" + "chance": "0.0004%" } ] } diff --git a/items/PEST_MOSQUITO_MONSTER.json b/items/PEST_MOSQUITO_MONSTER.json index 085f70c87..dc9e87bf9 100644 --- a/items/PEST_MOSQUITO_MONSTER.json +++ b/items/PEST_MOSQUITO_MONSTER.json @@ -30,7 +30,7 @@ "type": "drops", "drops": [ { - "id": "ENCHANTED_SUGAR:1", + "id": "ENCHANTED_SUGAR:2", "extra": [], "chance": "100%" }, @@ -65,9 +65,9 @@ "chance": "2%" }, { - "id": "ENCHANTED_SUGAR_CANE:1", + "id": "ENCHANTED_SUGAR_CANE:6", "extra": [], - "chance": "2%" + "chance": "0.5%" }, { "id": "CLIPPED_WINGS:1", @@ -77,7 +77,7 @@ { "id": "DYE_DUNG:1", "extra": [], - "chance": "0.0002%" + "chance": "0.0004%" } ] } diff --git a/items/PEST_MOTH_MONSTER.json b/items/PEST_MOTH_MONSTER.json index b1b29de1c..f41993abe 100644 --- a/items/PEST_MOTH_MONSTER.json +++ b/items/PEST_MOTH_MONSTER.json @@ -30,7 +30,7 @@ "type": "drops", "drops": [ { - "id": "ENCHANTED_COCOA:1", + "id": "ENCHANTED_COCOA:3", "extra": [], "chance": "100%" }, @@ -65,9 +65,9 @@ "chance": "2%" }, { - "id": "ENCHANTED_COOKIE:1", + "id": "ENCHANTED_COOKIE:11", "extra": [], - "chance": "3%" + "chance": "0.5%" }, { "id": "WRIGGLING_LARVA:1", @@ -77,7 +77,7 @@ { "id": "DYE_DUNG:1", "extra": [], - "chance": "0.0002%" + "chance": "0.0004%" } ] } diff --git a/items/PEST_RAT_MONSTER.json b/items/PEST_RAT_MONSTER.json index eb63ec2d2..3969cec25 100644 --- a/items/PEST_RAT_MONSTER.json +++ b/items/PEST_RAT_MONSTER.json @@ -16,7 +16,7 @@ "modver": "2.1.1-PRE", "infoType": "WIKI_URL", "info": [ - "https://wiki.hypixel.net/Rat(Pest)" + "https://wiki.hypixel.net/Rat_(Pest)" ], "crafttext": "", "recipes": [ @@ -65,9 +65,9 @@ "chance": "2%" }, { - "id": "POLISHED_PUMPKIN:1", + "id": "POLISHED_PUMPKIN:3", "extra": [], - "chance": "1%" + "chance": "0.5%" }, { "id": "RAT;4:1", @@ -77,7 +77,7 @@ { "id": "DYE_DUNG:1", "extra": [], - "chance": "0.0002%" + "chance": "0.0004%" } ] } diff --git a/items/THEORETICAL_HOE_WHEAT_2.json b/items/THEORETICAL_HOE_WHEAT_2.json index b2447374c..3ede3e1ff 100644 --- a/items/THEORETICAL_HOE_WHEAT_2.json +++ b/items/THEORETICAL_HOE_WHEAT_2.json @@ -29,13 +29,13 @@ ], "recipe": { "A1": "JACOBS_TICKET:16", - "A2": "ENCHANTED_HAY_BLOCK:64", + "A2": "ENCHANTED_WHEAT:16", "A3": "JACOBS_TICKET:16", - "B1": "ENCHANTED_HAY_BLOCK:64", + "B1": "ENCHANTED_WHEAT:16", "B2": "THEORETICAL_HOE_WHEAT_1:1", - "B3": "ENCHANTED_HAY_BLOCK:64", + "B3": "ENCHANTED_WHEAT:16", "C1": "JACOBS_TICKET:16", - "C2": "ENCHANTED_HAY_BLOCK:64", + "C2": "ENCHANTED_WHEAT:16", "C3": "JACOBS_TICKET:16" }, "internalname": "THEORETICAL_HOE_WHEAT_2", diff --git a/items/THEORETICAL_HOE_WHEAT_3.json b/items/THEORETICAL_HOE_WHEAT_3.json index 14b9ad08b..a4bd68e07 100644 --- a/items/THEORETICAL_HOE_WHEAT_3.json +++ b/items/THEORETICAL_HOE_WHEAT_3.json @@ -32,13 +32,13 @@ ], "recipe": { "A1": "JACOBS_TICKET:64", - "A2": "TIGHTLY_TIED_HAY_BALE:16", + "A2": "ENCHANTED_HAY_BALE:16", "A3": "JACOBS_TICKET:64", - "B1": "TIGHTLY_TIED_HAY_BALE:16", + "B1": "ENCHANTED_HAY_BALE:16", "B2": "THEORETICAL_HOE_WHEAT_2:1", - "B3": "TIGHTLY_TIED_HAY_BALE:16", + "B3": "ENCHANTED_HAY_BALE:16", "C1": "JACOBS_TICKET:64", - "C2": "TIGHTLY_TIED_HAY_BALE:16", + "C2": "ENCHANTED_HAY_BALE:16", "C3": "JACOBS_TICKET:64" }, "internalname": "THEORETICAL_HOE_WHEAT_3", diff --git a/items/TUNGSTEN_KEY.json b/items/TUNGSTEN_KEY.json index c6ebab058..71fdff2fb 100644 --- a/items/TUNGSTEN_KEY.json +++ b/items/TUNGSTEN_KEY.json @@ -24,7 +24,7 @@ ], "count": 1.0, "overrideOutputId": "TUNGSTEN_KEY", - "duration": 30 + "duration": 1800 } ], "info": [ diff --git a/items/UMBER_KEY.json b/items/UMBER_KEY.json index a5242e4a1..ff6af735b 100644 --- a/items/UMBER_KEY.json +++ b/items/UMBER_KEY.json @@ -24,7 +24,7 @@ ], "count": 1.0, "overrideOutputId": "UMBER_KEY", - "duration": 30 + "duration": 1800 } ], "info": [ From 6c3867ce1a2f9eb6a77ab6c6d90052157b7c8527 Mon Sep 17 00:00:00 2001 From: jani270 <69345714+jani270@users.noreply.github.com> Date: Wed, 20 Nov 2024 13:10:03 +0100 Subject: [PATCH 2/2] fix: Slug Pest having old info (#1448) --- items/PEST_SLUG_MONSTER.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/items/PEST_SLUG_MONSTER.json b/items/PEST_SLUG_MONSTER.json index 8741a61b6..5ce0f4f0e 100644 --- a/items/PEST_SLUG_MONSTER.json +++ b/items/PEST_SLUG_MONSTER.json @@ -70,14 +70,14 @@ "chance": "2%" }, { - "id": "ENCHANTED_HUGE_MUSHROOM_1:1", + "id": "ENCHANTED_HUGE_MUSHROOM_1:3", "extra": [], - "chance": "0.5%" + "chance": "0.25%" }, { - "id": "ENCHANTED_HUGE_MUSHROOM_2:1", + "id": "ENCHANTED_HUGE_MUSHROOM_2:3", "extra": [], - "chance": "0.5%" + "chance": "0.25%" }, { "id": "SLUG;3:1", @@ -92,7 +92,7 @@ { "id": "DYE_DUNG:1", "extra": [], - "chance": "0.0002%" + "chance": "0.0004%" } ] }