Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update mobs sea creatures #1454

Merged
merged 53 commits into from
Nov 21, 2024
Merged

Update mobs sea creatures #1454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
40826e5
add dwarven os block bran
catgirlseraid Nov 17, 2024
5694102
Revert "add dwarven os block bran"
catgirlseraid Nov 17, 2024
0392d6d
Merge remote-tracking branch 'origin/master'
catgirlseraid Nov 19, 2024
9eb69f5
first test
catgirlseraid Nov 19, 2024
5ce2fd1
test if combat xp shows up or if cache
catgirlseraid Nov 19, 2024
db7c226
test if combat xp and farming xp works
catgirlseraid Nov 19, 2024
c2ac326
see if i added multiple levels of mobs correctly
catgirlseraid Nov 19, 2024
c140d7f
see if i added multiple levels of mobs correctly
catgirlseraid Nov 19, 2024
ed8e193
see if i added multiple levels of mobs correctly second time
catgirlseraid Nov 19, 2024
f2d58d4
test if mobs can have different names under the same nest
catgirlseraid Nov 19, 2024
dca3ac1
see if i added silverfish correctly
catgirlseraid Nov 19, 2024
a778f7c
fix background maybe
catgirlseraid Nov 19, 2024
5b0bdc4
check on spider changes
catgirlseraid Nov 19, 2024
590713b
test of adding a new mob what could go wrong
catgirlseraid Nov 19, 2024
294a514
this time
catgirlseraid Nov 19, 2024
7090bac
maybe it's in the correct section now?
catgirlseraid Nov 19, 2024
e46db37
bat update 2
catgirlseraid Nov 19, 2024
5fc60a7
wrong one
catgirlseraid Nov 19, 2024
fb0ec94
idk anymore pls just work
catgirlseraid Nov 19, 2024
9a20cab
3
catgirlseraid Nov 19, 2024
a2fd41b
maybe this?
catgirlseraid Nov 19, 2024
b8f3059
test with another skin
catgirlseraid Nov 19, 2024
216678c
test with another skin with the correct id
catgirlseraid Nov 19, 2024
0bbcec3
idk anymore
catgirlseraid Nov 19, 2024
2323866
3
catgirlseraid Nov 19, 2024
c3a5fbc
4
catgirlseraid Nov 19, 2024
f89134c
5
catgirlseraid Nov 19, 2024
1872bf7
6
catgirlseraid Nov 19, 2024
5dcac87
test this?
catgirlseraid Nov 19, 2024
66a4493
test the same item multiple times
catgirlseraid Nov 19, 2024
e7ed747
test using ranges and key ids
catgirlseraid Nov 19, 2024
d3ee531
test using ranges and key ids
catgirlseraid Nov 19, 2024
c47577c
slime test
catgirlseraid Nov 20, 2024
1c3bce0
test goblins
catgirlseraid Nov 20, 2024
98d4d49
lets find out if i can do this
catgirlseraid Nov 20, 2024
f145520
upload progress
catgirlseraid Nov 20, 2024
8d97418
test of fish
catgirlseraid Nov 20, 2024
42f30ff
a few more sea creatures
catgirlseraid Nov 20, 2024
0a1a47c
Merge remote-tracking branch 'refs/remotes/origin/master' into update…
catgirlseraid Nov 20, 2024
5cefd37
revert dye chances, my fault :(
catgirlseraid Nov 20, 2024
f9b274f
remove unneeded file and fix bat lore
catgirlseraid Nov 20, 2024
e15ff3a
forgot a comma
catgirlseraid Nov 20, 2024
e14695c
fix dye drop chances
catgirlseraid Nov 20, 2024
39eed79
how do i keep missing these omg sorry
catgirlseraid Nov 20, 2024
35cd3ad
:( poor jani
catgirlseraid Nov 20, 2024
2e81078
fix dye chance, fix formatting
catgirlseraid Nov 20, 2024
16cf594
magma cube pet drop changes
catgirlseraid Nov 20, 2024
2298de2
use the right pet this time
catgirlseraid Nov 20, 2024
5a7c07b
test carnival ticket
catgirlseraid Nov 21, 2024
12e9291
test winter sea creatures
catgirlseraid Nov 21, 2024
580f1a3
test winter sea creatures part 2
catgirlseraid Nov 21, 2024
921cd27
Merge branch 'master' into update-mobs-sea-creatures
catgirlseraid Nov 21, 2024
0f5feda
change frozen steve ice essence chance based off wiki instead of in game
catgirlseraid Nov 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions items/BLUE_SHARK_SC.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
{
"name": "§cBlue Shark",
"level": 20,
"coins": 20,
"xp": 80,
"coins": 10,
"xp": 40,
"render": "@neurepo:mobs/blue_shark.json",
"panorama": "hub",
"type": "drops",
Expand All @@ -38,12 +38,16 @@
],
"drops": [
{
"id": "SHARK_FIN",
"id": "SHARK_FIN:4",
"chance": "100%"
},
{
"id": "BLUE_SHARK_TOOTH",
"chance": "10%"
},
{
"id": "CARNIVAL_TICKET",
"chance": "0.15%"
}
]
}
Expand Down
4 changes: 2 additions & 2 deletions items/FLAMING_WORM_SC.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
],
"drops": [
{
"id": "ROUGH_SAPPHIRE_GEM:20",
"chance": "100%"
"id": "ROUGH_SAPPHIRE_GEM",
"chance": "x20-30"
},
{
"id": "ETERNAL_FLAME_RING",
Expand Down
8 changes: 6 additions & 2 deletions items/FROSTY_SC.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"chance": "100%"
},
{
"id": "CARROT_ITEM:2",
"id": "CARROT_ITEM",
"chance": "100%"
},
{
Expand All @@ -59,12 +59,16 @@
},
{
"id": "WHITE_GIFT",
"chance": "40%"
"chance": "100%"
},
{
"id": "ICE_HUNK:2",
"chance": "100%"
},
{
"id": "ESSENCE_ICE",
"chance": "x2"
},
{
"id": "DYE_ICEBERG",
"extra": [],
Expand Down
20 changes: 12 additions & 8 deletions items/FROZEN_STEVE_SC.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,28 +38,28 @@
],
"drops": [
{
"id": "ICE:2",
"chance": "100%"
"id": "ICE",
"chance": "x2-3"
},
{
"id": "WATER_LILY",
"chance": "100%"
},
{
"id": "RAW_FISH-2",
"chance": "50%"
"id": "RAW_FISH:3",
"chance": "100%"
},
{
"id": "RAW_FISH:2",
"id": "RAW_FISH-1:2",
"chance": "100%"
},
{
"id": "RAW_FISH-1:3",
"chance": "100%"
"id": "RAW_FISH-3",
"chance": "50%"
},
{
"id": "WHITE_GIFT",
"chance": "10%"
"chance": "100%"
},
{
"id": "ICE_HUNK",
Expand All @@ -69,6 +69,10 @@
"id": "ICE_ROD",
"chance": "4%"
},
{
"id": "ESSENCE_ICE",
"chance": "25%"
},
{
"id": "DYE_ICEBERG",
"extra": [],
Expand Down
4 changes: 4 additions & 0 deletions items/GREAT_WHITE_SHARK_SC.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@
{
"id": "MEGALODON;4",
"chance": "1%"
},
{
"id": "CARNIVAL_TICKET",
"chance": "0.5%"
}
]
}
Expand Down
14 changes: 9 additions & 5 deletions items/GRIM_REAPER_SC.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,20 +38,24 @@
],
"drops": [
{
"id": "WATER_LILY:32",
"chance": "§fUncommon 25%"
"id": "SPONGE",
"chance": "x2-4"
},
{
"id": "GREEN_CANDY:17",
"id": "WATER_LILY",
"chance": "x32-44"
},
{
"id": "GREEN_CANDY:7",
"chance": "100%"
},
{
"id": "DEEP_SEA_ORB",
"chance": "1%"
},
{
"id": "PURPLE_CANDY:3",
"chance": "100%"
"id": "PURPLE_CANDY",
"chance": "x3-5"
},
{
"id": "SOUL_FRAGMENT",
Expand Down
6 changes: 5 additions & 1 deletion items/GRINCH_SC.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,17 @@
"chance": "100%"
},
{
"id": "GREEN_GIFT",
"id": "GREEN_GIFT:1",
"chance": "100%"
},
{
"id": "RED_GIFT",
"chance": "100%"
},
{
"id": "ESSENCE_ICE:4",
"chance": "100%"
},
{
"id": "DYE_ICEBERG",
"extra": [],
Expand Down
4 changes: 4 additions & 0 deletions items/LAVA_BLAZE_SC.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@
"drops": [
{
"id": "ROUGH_TOPAZ_GEM",
"chance": "x20-30"
},
{
"id": "BLAZE_ROD:5",
"chance": "100%"
},
{
Expand Down
2 changes: 1 addition & 1 deletion items/LAVA_PIGMAN_SC.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"drops": [
{
"id": "ROUGH_TOPAZ_GEM",
"chance": "100%"
"chance": "x20-30"
},
{
"id": "ETERNAL_FLAME_RING",
Expand Down
2 changes: 1 addition & 1 deletion items/LORD_JAWBUS_SC.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"name": "§cLord Jawbus",
"coins": 10000,
"level": 600,
"xp": 20000,
"xp": 10000,
"render": "Eisengolem",
"panorama": "crimson_isle",
"type": "drops",
Expand Down
4 changes: 2 additions & 2 deletions items/MOOGMA_SC.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
"chance": "2%"
},
{
"id": "MOOGMA_PELT:1",
"chance": "100%"
"id": "MOOGMA_PELT",
"chance": "x1-2"
},
{
"id": "DYE_CARMINE",
Expand Down
8 changes: 4 additions & 4 deletions items/NIGHTMARE_SC.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
],
"drops": [
{
"id": "WATER_LILY:6",
"chance": "100%"
"id": "WATER_LILY",
"chance": "x6-9"
},
{
"id": "GREEN_CANDY:2",
Expand All @@ -50,8 +50,8 @@
"chance": "1%"
},
{
"id": "PURPLE_CANDY:32",
"chance": "25%"
"id": "PURPLE_CANDY",
"chance": "20%"
},
{
"id": "ENCHANTED_ROTTEN_FLESH",
Expand Down
4 changes: 4 additions & 0 deletions items/NURSE_SHARK_SC.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@
{
"id": "NURSE_SHARK_TOOTH",
"chance": "10%"
},
{
"id": "CARNIVAL_TICKET",
"chance": "0.1%"
}
]
}
Expand Down
2 changes: 1 addition & 1 deletion items/NUTCRACKER_SC.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"chance": "100%"
},
{
"id": "WATER_LILY:120",
"id": "WATER_LILY",
"chance": "50%"
},
{
Expand Down
8 changes: 4 additions & 4 deletions items/PHANTOM_FISHER_SC.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
],
"drops": [
{
"id": "WATER_LILY:16",
"chance": "100%"
"id": "WATER_LILY",
"chance": "x16-22"
},
{
"id": "GREEN_CANDY:5",
Expand All @@ -50,8 +50,8 @@
"chance": "1%"
},
{
"id": "PURPLE_CANDY:2",
"chance": "100%"
"id": "PURPLE_CANDY",
"chance": "x2-3"
},
{
"id": "PHANTOM_ROD",
Expand Down
2 changes: 1 addition & 1 deletion items/POND_SQUID_SC.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"drops": [
{
"id": "WATER_LILY",
"chance": "x1-2"
"chance": "100%"
},
{
"id": "INK_SACK",
Expand Down
2 changes: 1 addition & 1 deletion items/PYROCLASTIC_WORM_SC.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"recipes": [
{
"level": 240,
"coins": 100,
"coins": 200,
"xp": 400,
"name": "§cPyroclastic Worm",
"render": "@neurepo:mobs/pyroclastic_worm.json",
Expand Down
12 changes: 9 additions & 3 deletions items/REINDRAKE_SC.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
"crafttext": "",
"recipes": [
{
"level": 100,
"name": "§cReindrake",
"panorama": "winter",
"render": "Dragon",
Expand All @@ -35,22 +36,27 @@
"drops": [
{
"id": "WHITE_GIFT",
"chance": "65%"
"chance": "100% + 65% per hit"
},
{
"id": "GREEN_GIFT",
"chance": "25%"
"chance": "100% + 25% per hit"
},
{
"id": "RED_GIFT",
"chance": "10%"
"chance": "10% + 10% per hit"
},
{
"id": "PROSPERITY;1",
"extra": [
"Only drops for the player who spawned the Reindrake"
],
"chance": "100%"
},
{
"id": "DYE_ICEBERG",
"extra": [],
jani270 marked this conversation as resolved.
Show resolved Hide resolved
"chance": "0.002%"
}
]
}
Expand Down
4 changes: 2 additions & 2 deletions items/SCARECROW_SC.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
],
"drops": [
{
"id": "WATER_LILY:3",
"chance": "100%"
"id": "WATER_LILY",
"chance": "x3-5"
},
{
"id": "GREEN_CANDY:1",
Expand Down
14 changes: 7 additions & 7 deletions items/SEA_EMPEROR_SC.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
{
"name": "§cSea Emperor",
"level": 150,
"coins": 13,
"xp": 30,
"coins": 150,
"xp": 120,
"render": "@neurepo:mobs/sea_emperor.json",
"panorama": "hub",
"type": "drops",
Expand All @@ -53,16 +53,16 @@
"chance": "100%"
},
{
"id": "PRISMARINE_CRYSTALS",
"id": "ENCHANTED_PRISMARINE_CRYSTALS",
"chance": "50%"
},
{
"id": "PRISMARINE_SHARD",
"id": "ENCHANTED_PRISMARINE_SHARD",
"chance": "50%"
},
{
"id": "SPONGE:2",
"chance": "75%"
"id": "SPONGE",
"chance": "x2-3"
},
{
"id": "FLYING_FISH;2",
Expand Down Expand Up @@ -95,7 +95,7 @@
{
"id": "DYE_AQUAMARINE",
"extra": [],
"chance": "0.001%"
"chance": "0.002%"
}
]
}
Expand Down
Loading
Loading