Skip to content

Commit 85f2d8c

Browse files
Bentcheeseejani270
andauthored
Adding Crow, Missed Enchants, partial Bestiary, and more (#2223)
* Various Fixes and Lore updates - Fixed Turbo Wheat being outdated - Fixed Ender Slayer 6 having the wrong percentage - Fixed Aqua Affinity still claiming to be obtained from Prismarine Collection - Fixed Chyme, Sewer Fish, and Gift of Learning having outdated lore - Added Smooth Red Sandstone to Jade support for Umber * updating some of bestiary also adding greenhouse blueprint and supplying new cactus green recipe * Adding Turbos, Reforge Stones, and Crow just a few things that seem to have been missed. I'll do a rewrite of the skymart file at some point. * Missed Crop Fever forgot to include Crop Fever * Add Firefly Pest, Crow Update, add parents - Added parents for Crow Pet, Turbo-Rose/Moonflower/Sunflower, and Crop Fever. - Added back in old Enchanted Cactus Green recipe. - Added Firefly Pest bestiary and Loot Table * crow murder * Update PEST_FIREFLY_MONSTER.json * okay hopefully nothing else is messed up I also reverted sacks because you guys didn't like it * again * fix: Crow nbt and reforgestones double space * fix: order for new reforge stones --------- Co-authored-by: jani270 <[email protected]>
1 parent 97b4bc6 commit 85f2d8c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+2084
-25
lines changed

constants/bestiary.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3438,6 +3438,26 @@
34383438
],
34393439
"bracket": 6
34403440
},
3441+
{
3442+
"name": "§aPraying Mantis",
3443+
"skullOwner": "e36704a8-21e6-30f2-a2d7-a197bc679485",
3444+
"texture": "ewogICJ0aW1lc3RhbXAiIDogMTc2MDQ1MDQxOTYxMiwKICAicHJvZmlsZUlkIiA6ICI0OWIzODUyNDdhMWY0NTM3YjBmN2MwZTFmMTVjMTc2NCIsCiAgInByb2ZpbGVOYW1lIiA6ICJiY2QyMDMzYzYzZWM0YmY4IiwKICAic2lnbmF0dXJlUmVxdWlyZWQiIDogdHJ1ZSwKICAidGV4dHVyZXMiIDogewogICAgIlNLSU4iIDogewogICAgICAidXJsIiA6ICJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzFlMDRiYjYzNjdjYWE0ZTg4ZjVmZDBlZTgwZjA3NDVkMTM3YTYwNjAyMjNkYmJjNDJhMTY0NzFmZGY2NGJiODMiLAogICAgICAibWV0YWRhdGEiIDogewogICAgICAgICJtb2RlbCIgOiAic2xpbSIKICAgICAgfQogICAgfQogIH0KfQ",
3445+
"cap": 250,
3446+
"mobs": [
3447+
"pest_praying_mantis_1"
3448+
],
3449+
"bracket": 6
3450+
},
3451+
{
3452+
"name": "§aFirefly",
3453+
"skullOwner": "e36704a8-21e6-30f2-a2d7-a197bc679485",
3454+
"texture": "ewogICJ0aW1lc3RhbXAiIDogMTc2MDQ1MDQyMjEzNiwKICAicHJvZmlsZUlkIiA6ICIzNDY4Y2VjMWFlOTY0YWRmYWQyNjEzMGEwZGQ0NjRkYyIsCiAgInByb2ZpbGVOYW1lIiA6ICJzdXJlZWxta18iLAogICJzaWduYXR1cmVSZXF1aXJlZCIgOiB0cnVlLAogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNGNlNzllOTBhZGYzNDcxOGYzMTNlYzI0ZDZjNjEzNWI2OWIzNzg4YzYxODQ5ODQ0NmNjYzgzY2E2NDBjMGIxNCIsCiAgICAgICJtZXRhZGF0YSIgOiB7CiAgICAgICAgIm1vZGVsIiA6ICJzbGltIgogICAgICB9CiAgICB9CiAgfQp9",
3455+
"cap": 250,
3456+
"mobs": [
3457+
"pest_firefly_1"
3458+
],
3459+
"bracket": 6
3460+
},
34413461
{
34423462
"name": "§aRat",
34433463
"skullOwner": "8842a457-5e25-3ad0-958e-dfbebbb1129c",

constants/enchants.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,9 @@
201201
"turbo_carrot",
202202
"turbo_potato",
203203
"turbo_mushrooms",
204+
"turbo_rose",
205+
"turbo_moonflower",
206+
"turbo_sunflower",
204207
"cultivating",
205208
"delicate",
206209
"dedication"

constants/misc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3417,7 +3417,7 @@
34173417
"MYCELIUM_GENERATOR": 12,
34183418
"INFERNO_GENERATOR": 11,
34193419
"VAMPIRE_GENERATOR": 11,
3420-
"SUNFLOWER_GENERATOR": 11
3420+
"SUNFLOWER_GENERATOR": 12
34213421
},
34223422
"credits": {
34233423
"itemid": "writable_book",

constants/parents.json

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4058,5 +4058,35 @@
40584058
"SUNFLOWER_GENERATOR_10",
40594059
"SUNFLOWER_GENERATOR_11",
40604060
"SUNFLOWER_GENERATOR_12"
4061+
],
4062+
"CROW;0": [
4063+
"CROW;1",
4064+
"CROW;2",
4065+
"CROW;3",
4066+
"CROW;4"
4067+
],
4068+
"TURBO_ROSE;1": [
4069+
"TURBO_ROSE;2",
4070+
"TURBO_ROSE;3",
4071+
"TURBO_ROSE;4",
4072+
"TURBO_ROSE;5"
4073+
],
4074+
"TURBO_MOONFLOWER;1": [
4075+
"TURBO_MOONFLOWER;2",
4076+
"TURBO_MOONFLOWER;3",
4077+
"TURBO_MOONFLOWER;4",
4078+
"TURBO_MOONFLOWER;5"
4079+
],
4080+
"TURBO_SUNFLOWER;1": [
4081+
"TURBO_SUNFLOWER;2",
4082+
"TURBO_SUNFLOWER;3",
4083+
"TURBO_SUNFLOWER;4",
4084+
"TURBO_SUNFLOWER;5"
4085+
],
4086+
"ULTIMATE_CROP_FEVER;1": [
4087+
"ULTIMATE_CROP_FEVER;2",
4088+
"ULTIMATE_CROP_FEVER;3",
4089+
"ULTIMATE_CROP_FEVER;4",
4090+
"ULTIMATE_CROP_FEVER;5"
40614091
]
40624092
}

constants/petnums.json

Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1137,6 +1137,116 @@
11371137
}
11381138
}
11391139
},
1140+
"CROW": {
1141+
"COMMON": {
1142+
"1": {
1143+
"otherNums": [
1144+
3
1145+
],
1146+
"statNums": {
1147+
"INTELLIGENCE": 1.5,
1148+
"ABILITY_DAMAGE": 0.2
1149+
}
1150+
},
1151+
"100": {
1152+
"otherNums": [
1153+
5
1154+
],
1155+
"statNums": {
1156+
"INTELLIGENCE": 150.0,
1157+
"ABILITY_DAMAGE": 20.0
1158+
}
1159+
}
1160+
},
1161+
"UNCOMMON": {
1162+
"1": {
1163+
"otherNums": [
1164+
3.1
1165+
],
1166+
"statNums": {
1167+
"INTELLIGENCE": 1.5,
1168+
"ABILITY_DAMAGE": 0.2
1169+
}
1170+
},
1171+
"100": {
1172+
"otherNums": [
1173+
10
1174+
],
1175+
"statNums": {
1176+
"INTELLIGENCE": 150.0,
1177+
"ABILITY_DAMAGE": 20.0
1178+
}
1179+
}
1180+
},
1181+
"RARE": {
1182+
"1": {
1183+
"otherNums": [
1184+
3.1,
1185+
5.1
1186+
],
1187+
"statNums": {
1188+
"INTELLIGENCE": 1.5,
1189+
"ABILITY_DAMAGE": 0.2
1190+
}
1191+
},
1192+
"100": {
1193+
"otherNums": [
1194+
10,
1195+
15
1196+
],
1197+
"statNums": {
1198+
"INTELLIGENCE": 150.0,
1199+
"ABILITY_DAMAGE": 20.0
1200+
}
1201+
}
1202+
},
1203+
"EPIC": {
1204+
"1": {
1205+
"otherNums": [
1206+
3.1,
1207+
5.2
1208+
],
1209+
"statNums": {
1210+
"INTELLIGENCE": 1.5,
1211+
"ABILITY_DAMAGE": 0.2
1212+
}
1213+
},
1214+
"100": {
1215+
"otherNums": [
1216+
15,
1217+
20
1218+
],
1219+
"statNums": {
1220+
"INTELLIGENCE": 150.0,
1221+
"ABILITY_DAMAGE": 20.0
1222+
}
1223+
}
1224+
},
1225+
"LEGENDARY": {
1226+
"1": {
1227+
"otherNums": [
1228+
3.1,
1229+
5.2,
1230+
3.1
1231+
],
1232+
"statNums": {
1233+
"INTELLIGENCE": 1.5,
1234+
"ABILITY_DAMAGE": 0.2
1235+
}
1236+
},
1237+
"100": {
1238+
"otherNums": [
1239+
15,
1240+
20,
1241+
15
1242+
],
1243+
"statNums": {
1244+
"INTELLIGENCE": 150.0,
1245+
"ABILITY_DAMAGE": 20.0
1246+
}
1247+
}
1248+
}
1249+
},
11401250
"DOLPHIN": {
11411251
"COMMON": {
11421252
"1": {

constants/pets.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,8 @@
423423
"FROG": "FORAGING",
424424
"JADE_DRAGON": "FORAGING",
425425
"MOSQUITO": "FARMING",
426-
"PRECURSOR_DRONE": "COMBAT"
426+
"PRECURSOR_DRONE": "COMBAT",
427+
"CROW": "COMBAT"
427428
},
428429
"id_to_display_name": {
429430
"TYRANNOSAURUS": "T-Rex"

constants/reforgestones.json

Lines changed: 163 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2051,6 +2051,61 @@
20512051
}
20522052
}
20532053
},
2054+
"MANTID_CLAW": {
2055+
"internalName": "MANTID_CLAW",
2056+
"reforgeName": "Mantid",
2057+
"reforgeType": "blacksmith/reforge_stone",
2058+
"itemTypes": "ARMOR",
2059+
"requiredRarities": [
2060+
"COMMON",
2061+
"UNCOMMON",
2062+
"RARE",
2063+
"EPIC",
2064+
"LEGENDARY",
2065+
"MYTHIC",
2066+
"DIVINE"
2067+
],
2068+
"reforgeCosts": {
2069+
"COMMON": 7500,
2070+
"UNCOMMON": 15000,
2071+
"RARE": 30000,
2072+
"EPIC": 75000,
2073+
"LEGENDARY": 150000,
2074+
"MYTHIC": 150000,
2075+
"DIVINE": 150000
2076+
},
2077+
"reforgeAbility": "§7Grants §2+0.25ൠ Bonus Pest Chance §7per §2ൠ Pest §7killed for §a10 minutes§7. Caps at §25ൠ Bonus Pest Chance§7.",
2078+
"reforgeStats": {
2079+
"COMMON": {
2080+
"bonus_pest_chance": 0.5,
2081+
"farming_fortune": 2
2082+
},
2083+
"UNCOMMON": {
2084+
"bonus_pest_chance": 0.5,
2085+
"farming_fortune": 4
2086+
},
2087+
"RARE": {
2088+
"bonus_pest_chance": 1,
2089+
"farming_fortune": 6
2090+
},
2091+
"EPIC": {
2092+
"bonus_pest_chance": 1.5,
2093+
"farming_fortune": 8
2094+
},
2095+
"LEGENDARY": {
2096+
"bonus_pest_chance": 2,
2097+
"farming_fortune": 10
2098+
},
2099+
"MYTHIC": {
2100+
"bonus_pest_chance": 2.5,
2101+
"farming_fortune": 12
2102+
},
2103+
"DIVINE": {
2104+
"bonus_pest_chance": 2.5,
2105+
"farming_fortune": 14
2106+
}
2107+
}
2108+
},
20542109
"MIDAS_JEWEL": {
20552110
"internalName": "MIDAS_JEWEL",
20562111
"reforgeName": "Gilded",
@@ -2285,6 +2340,60 @@
22852340
}
22862341
}
22872342
},
2343+
"MOONSTONE": {
2344+
"internalName": "MOONSTONE",
2345+
"reforgeName": "Lunar",
2346+
"reforgeType": "blacksmith/reforge_stone",
2347+
"itemTypes": "EQUIPMENT",
2348+
"requiredRarities": [
2349+
"COMMON",
2350+
"UNCOMMON",
2351+
"RARE",
2352+
"EPIC",
2353+
"LEGENDARY",
2354+
"MYTHIC",
2355+
"DIVINE"
2356+
],
2357+
"reforgeCosts": {
2358+
"COMMON": 5000,
2359+
"UNCOMMON": 10000,
2360+
"RARE": 20000,
2361+
"EPIC": 50000,
2362+
"LEGENDARY": 100000,
2363+
"MYTHIC": 200000,
2364+
"DIVINE": 200000
2365+
},
2366+
"reforgeStats": {
2367+
"COMMON": {
2368+
"speed": 1,
2369+
"farming_wisdom": 1
2370+
},
2371+
"UNCOMMON": {
2372+
"speed": 1,
2373+
"farming_wisdom": 1
2374+
},
2375+
"RARE": {
2376+
"speed": 2,
2377+
"farming_wisdom": 2
2378+
},
2379+
"EPIC": {
2380+
"speed": 2,
2381+
"farming_wisdom": 2
2382+
},
2383+
"LEGENDARY": {
2384+
"speed": 3,
2385+
"farming_wisdom": 3
2386+
},
2387+
"MYTHIC": {
2388+
"speed": 4,
2389+
"farming_wisdom": 4
2390+
},
2391+
"DIVINE": {
2392+
"speed": 4,
2393+
"farming_wisdom": 4
2394+
}
2395+
}
2396+
},
22882397
"NECROMANCER_BROOCH": {
22892398
"internalName": "NECROMANCER_BROOCH",
22902399
"reforgeName": "Necrotic",
@@ -3582,6 +3691,60 @@
35823691
}
35833692
}
35843693
},
3694+
"SUNSTONE": {
3695+
"internalName": "SUNSTONE",
3696+
"reforgeName": "Sunny",
3697+
"reforgeType": "blacksmith/reforge_stone",
3698+
"itemTypes": "ARMOR",
3699+
"requiredRarities": [
3700+
"COMMON",
3701+
"UNCOMMON",
3702+
"RARE",
3703+
"EPIC",
3704+
"LEGENDARY",
3705+
"MYTHIC",
3706+
"DIVINE"
3707+
],
3708+
"reforgeCosts": {
3709+
"COMMON": 5000,
3710+
"UNCOMMON": 10000,
3711+
"RARE": 20000,
3712+
"EPIC": 50000,
3713+
"LEGENDARY": 100000,
3714+
"MYTHIC": 200000,
3715+
"DIVINE": 200000
3716+
},
3717+
"reforgeStats": {
3718+
"COMMON": {
3719+
"speed": 2,
3720+
"farming_wisdom": 1
3721+
},
3722+
"UNCOMMON": {
3723+
"speed": 3,
3724+
"farming_wisdom": 2
3725+
},
3726+
"RARE": {
3727+
"speed": 4,
3728+
"farming_wisdom": 3
3729+
},
3730+
"EPIC": {
3731+
"speed": 6,
3732+
"farming_wisdom": 4
3733+
},
3734+
"LEGENDARY": {
3735+
"speed": 8,
3736+
"farming_wisdom": 5
3737+
},
3738+
"MYTHIC": {
3739+
"speed": 10,
3740+
"farming_wisdom": 6
3741+
},
3742+
"DIVINE": {
3743+
"speed": 10,
3744+
"farming_wisdom": 6
3745+
}
3746+
}
3747+
},
35853748
"SUSPICIOUS_VIAL": {
35863749
"internalName": "SUSPICIOUS_VIAL",
35873750
"reforgeName": "Suspicious",

0 commit comments

Comments
 (0)