Skip to content

Commit

Permalink
reset dungeon to default now *checks* for
Browse files Browse the repository at this point in the history
  • Loading branch information
Frustrated-Programmer committed Dec 27, 2024
1 parent 4a8e627 commit 6f728c8
Show file tree
Hide file tree
Showing 8 changed files with 334 additions and 10 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"display": {
"icon": {
"item": "minecraft:carved_pumpkin",
"nbt": "{CustomModelData:103}"
},
"title": "§bLevel Four Unlocked",
"description": "§7Discover at least 17 Hermit eggs hidden in §o§3Decked Out 2§r§7.",
"frame": "challenge",
"show_toast": true,
"announce_to_chat": true,
"hidden": false
},
"criteria": {
"find_17_eggs": {
"trigger": "minecraft:location",
"conditions": {
"player": [
{
"condition": "minecraft:entity_scores",
"entity": "this",
"team": "do2.players",
"scores": {
"do2.eggs.total": {
"min": 17
}
}
}
]
}
}
},
"parent": "do2:hidden/adventuring/find_a_egg"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,289 @@
{
"display": {
"icon": {
"item": "minecraft:carved_pumpkin",
"nbt": "{CustomModelData:103}"
},
"title": "§bLevel Four Unlocked",
"description": "§7Discover at least 17 Hermit eggs hidden in §o§3Decked Out 2§r§7.",
"frame": "challenge",
"show_toast": false,
"announce_to_chat": false,
"hidden": false
},
"criteria": {
"one": {
"trigger": "minecraft:location",
"conditions": {
"player": [
{
"condition": "minecraft:entity_scores",
"entity": "this",
"scores": {
"do2.eggs.total": {
"min": 1
}
}
}
]
}
},
"two": {
"trigger": "minecraft:location",
"conditions": {
"player": [
{
"condition": "minecraft:entity_scores",
"entity": "this",
"scores": {
"do2.eggs.total": {
"min": 2
}
}
}
]
}
},
"three": {
"trigger": "minecraft:location",
"conditions": {
"player": [
{
"condition": "minecraft:entity_scores",
"entity": "this",
"scores": {
"do2.eggs.total": {
"min": 3
}
}
}
]
}
},
"four": {
"trigger": "minecraft:location",
"conditions": {
"player": [
{
"condition": "minecraft:entity_scores",
"entity": "this",
"scores": {
"do2.eggs.total": {
"min": 4
}
}
}
]
}
},
"five": {
"trigger": "minecraft:location",
"conditions": {
"player": [
{
"condition": "minecraft:entity_scores",
"entity": "this",
"scores": {
"do2.eggs.total": {
"min": 5
}
}
}
]
}
},
"six": {
"trigger": "minecraft:location",
"conditions": {
"player": [
{
"condition": "minecraft:entity_scores",
"entity": "this",
"scores": {
"do2.eggs.total": {
"min": 6
}
}
}
]
}
},
"seven": {
"trigger": "minecraft:location",
"conditions": {
"player": [
{
"condition": "minecraft:entity_scores",
"entity": "this",
"scores": {
"do2.eggs.total": {
"min": 7
}
}
}
]
}
},
"eight": {
"trigger": "minecraft:location",
"conditions": {
"player": [
{
"condition": "minecraft:entity_scores",
"entity": "this",
"scores": {
"do2.eggs.total": {
"min": 8
}
}
}
]
}
},
"nine": {
"trigger": "minecraft:location",
"conditions": {
"player": [
{
"condition": "minecraft:entity_scores",
"entity": "this",
"scores": {
"do2.eggs.total": {
"min": 9
}
}
}
]
}
},
"ten": {
"trigger": "minecraft:location",
"conditions": {
"player": [
{
"condition": "minecraft:entity_scores",
"entity": "this",
"scores": {
"do2.eggs.total": {
"min": 10
}
}
}
]
}
},
"eleven": {
"trigger": "minecraft:location",
"conditions": {
"player": [
{
"condition": "minecraft:entity_scores",
"entity": "this",
"scores": {
"do2.eggs.total": {
"min": 11
}
}
}
]
}
},
"twelve": {
"trigger": "minecraft:location",
"conditions": {
"player": [
{
"condition": "minecraft:entity_scores",
"entity": "this",
"scores": {
"do2.eggs.total": {
"min": 12
}
}
}
]
}
},
"thirteen": {
"trigger": "minecraft:location",
"conditions": {
"player": [
{
"condition": "minecraft:entity_scores",
"entity": "this",
"scores": {
"do2.eggs.total": {
"min": 13
}
}
}
]
}
},
"fourteen": {
"trigger": "minecraft:location",
"conditions": {
"player": [
{
"condition": "minecraft:entity_scores",
"entity": "this",
"scores": {
"do2.eggs.total": {
"min": 14
}
}
}
]
}
},
"fifteen": {
"trigger": "minecraft:location",
"conditions": {
"player": [
{
"condition": "minecraft:entity_scores",
"entity": "this",
"scores": {
"do2.eggs.total": {
"min": 15
}
}
}
]
}
},
"sixteen": {
"trigger": "minecraft:location",
"conditions": {
"player": [
{
"condition": "minecraft:entity_scores",
"entity": "this",
"scores": {
"do2.eggs.total": {
"min": 16
}
}
}
]
}
},
"seventeen": {
"trigger": "minecraft:location",
"conditions": {
"player": [
{
"condition": "minecraft:entity_scores",
"entity": "this",
"scores": {
"do2.eggs.total": {
"min": 17
}
}
}
]
}
}
},
"parent": "do2:visible/adventuring/find_a_egg"
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ execute as @s[advancements={do2:visible/adventuring/eat_glow_berries=false,do2:h
execute as @s[advancements={do2:visible/adventuring/eat_three_uniques=false,do2:hidden/adventuring/eat_three_uniques=true}] run advancement grant @s only do2:visible/adventuring/eat_three_uniques
execute as @s[advancements={do2:visible/adventuring/enter_with_1_unique_keys=false,do2:hidden/adventuring/enter_with_1_unique_keys=true}] run advancement grant @s only do2:visible/adventuring/enter_with_1_unique_keys
execute as @s[advancements={do2:visible/adventuring/enter_with_3_unique_keys=false,do2:hidden/adventuring/enter_with_3_unique_keys=true}] run advancement grant @s only do2:visible/adventuring/enter_with_3_unique_keys
execute as @s[advancements={do2:visible/adventuring/find_17_eggs=false,do2:hidden/adventuring/find_17_eggs=true}] run advancement grant @s only do2:visible/adventuring/find_17_eggs
execute as @s[advancements={do2:visible/adventuring/find_a_egg=false,do2:hidden/adventuring/find_a_egg=true}] run advancement grant @s only do2:visible/adventuring/find_a_egg
execute as @s[advancements={do2:visible/adventuring/find_all_eggs=false,do2:hidden/adventuring/find_all_eggs=true}] run advancement grant @s only do2:visible/adventuring/find_all_eggs
execute as @s[advancements={do2:visible/adventuring/have_4_unique_keys=false,do2:hidden/adventuring/have_4_unique_keys=true}] run advancement grant @s only do2:visible/adventuring/have_4_unique_keys
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ setblock -561 114 1984 minecraft:warped_wall_sign
fill -549 106 1970 -549 106 1971 minecraft:cyan_concrete replace
data modify block -549 106 1972 Items[7].Count set value 0
data modify block -549 106 1972 Items[6].Count set value 0
data merge block -561 114 1984 {front_text:{has_glowing_text:1b,color:"cyan",is_waxed:1b,messages:['{"text":"§fFind all §b20"}','{"text":"§f§oEaster Eggs"}','{"text":"§fto unlock"}','{"text":"§fDeepfrost"}']}}
data merge block -561 114 1984 {front_text:{has_glowing_text:1b,color:"cyan",is_waxed:1b,messages:['{"text":"§fFind §b17"}','{"text":"§f§oEaster Eggs"}','{"text":"§fto unlock"}','{"text":"§fDeepfrost"}']}}
execute if score @s[tag=do2.received_shulker] do2.config.dungeonDifficulty matches 5 run scoreboard players set @s[tag=do2.received_shulker] do2.config.dungeonDifficulty 4
setblock -637 -18 1898 air
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ data merge block -561 113 1988 {Items:[{Slot:0b,id:"minecraft:stone",Count:1b}]}
# Check for Deepfrost_allowed
execute unless score $dungeon do2.config.eggsUnlockDeepfrost matches 1 run function do2:dungeon_setup/unlock_deepfrost
execute if score $dungeon do2.config.eggsUnlockDeepfrost matches 1 run function do2:dungeon_setup/lock_deepfrost
execute if score $dungeon do2.config.eggsUnlockDeepfrost matches 1 if entity @s[advancements={do2:hidden/adventuring/find_all_eggs=true}] run function do2:dungeon_setup/unlock_deepfrost
execute if score $dungeon do2.config.eggsUnlockDeepfrost matches 1 if entity @s[advancements={do2:hidden/adventuring/find_17_eggs=true}] run function do2:dungeon_setup/unlock_deepfrost

# Default to easy difficulty
execute unless score @s do2.config.dungeonDifficulty matches 1..5 run data merge block -557 113 1988 {Items:[]}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ execute positioned -549 106 1976 run function do2:reset_dungeon/default_states/c
execute positioned -549 106 1975 run function do2:reset_dungeon/default_states/compasses/hard_1
execute positioned -549 106 1974 run function do2:reset_dungeon/default_states/compasses/hard_2
execute positioned -549 106 1973 run function do2:reset_dungeon/default_states/compasses/deadly_1
execute if score $dungeon do2.config.eggsUnlockDeepfrost matches 1 if entity @p[tag=do2.received_shulker,advancements={do2:hidden/adventuring/find_all_eggs=true}] positioned -549 106 1972 run function do2:reset_dungeon/default_states/compasses/deadly_2
execute if score $dungeon do2.config.eggsUnlockDeepfrost matches 1 if entity @p[tag=do2.received_shulker,advancements={do2:hidden/adventuring/find_all_eggs=true}] positioned -549 106 1971 run function do2:reset_dungeon/default_states/compasses/deepfrost_1
execute if score $dungeon do2.config.eggsUnlockDeepfrost matches 1 if entity @p[tag=do2.received_shulker,advancements={do2:hidden/adventuring/find_all_eggs=true}] positioned -549 106 1970 run function do2:reset_dungeon/default_states/compasses/deepfrost_2
execute if score $dungeon do2.config.eggsUnlockDeepfrost matches 1 if entity @p[tag=do2.received_shulker,advancements={do2:hidden/adventuring/find_17_eggs=true}] positioned -549 106 1972 run function do2:reset_dungeon/default_states/compasses/deadly_2
execute if score $dungeon do2.config.eggsUnlockDeepfrost matches 1 if entity @p[tag=do2.received_shulker,advancements={do2:hidden/adventuring/find_17_eggs=true}] positioned -549 106 1971 run function do2:reset_dungeon/default_states/compasses/deepfrost_1
execute if score $dungeon do2.config.eggsUnlockDeepfrost matches 1 if entity @p[tag=do2.received_shulker,advancements={do2:hidden/adventuring/find_17_eggs=true}] positioned -549 106 1970 run function do2:reset_dungeon/default_states/compasses/deepfrost_2
execute if score $dungeon do2.config.eggsUnlockDeepfrost matches 0 positioned -549 106 1972 run function do2:reset_dungeon/default_states/compasses/deadly_2
execute if score $dungeon do2.config.eggsUnlockDeepfrost matches 0 positioned -549 106 1971 run function do2:reset_dungeon/default_states/compasses/deepfrost_1
execute if score $dungeon do2.config.eggsUnlockDeepfrost matches 0 positioned -549 106 1970 run function do2:reset_dungeon/default_states/compasses/deepfrost_2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ clone -472 114 1984 -472 114 1984 -549 106 1976 replace
clone -471 114 1984 -471 114 1984 -549 106 1975 replace
clone -470 114 1984 -470 114 1984 -549 106 1974 replace
clone -469 114 1984 -469 114 1984 -549 106 1973 replace
execute if score $dungeon do2.config.eggsUnlockDeepfrost matches 1 if entity @p[tag=do2.received_shulker,advancements={do2:hidden/adventuring/find_all_eggs=true}] run clone -468 114 1984 -468 114 1984 -549 106 1972 replace
execute if score $dungeon do2.config.eggsUnlockDeepfrost matches 1 if entity @p[tag=do2.received_shulker,advancements={do2:hidden/adventuring/find_all_eggs=true}] run clone -468 114 1984 -468 114 1984 -549 106 1971 replace
execute if score $dungeon do2.config.eggsUnlockDeepfrost matches 1 if entity @p[tag=do2.received_shulker,advancements={do2:hidden/adventuring/find_all_eggs=true}] run clone -467 114 1984 -467 114 1984 -549 106 1970 replace
execute if score $dungeon do2.config.eggsUnlockDeepfrost matches 1 if entity @p[tag=do2.received_shulker,advancements={do2:hidden/adventuring/find_17_eggs=true}] run clone -468 114 1984 -468 114 1984 -549 106 1972 replace
execute if score $dungeon do2.config.eggsUnlockDeepfrost matches 1 if entity @p[tag=do2.received_shulker,advancements={do2:hidden/adventuring/find_17_eggs=true}] run clone -468 114 1984 -468 114 1984 -549 106 1971 replace
execute if score $dungeon do2.config.eggsUnlockDeepfrost matches 1 if entity @p[tag=do2.received_shulker,advancements={do2:hidden/adventuring/find_17_eggs=true}] run clone -467 114 1984 -467 114 1984 -549 106 1970 replace
execute if score $dungeon do2.config.eggsUnlockDeepfrost matches 0 run clone -468 114 1984 -468 114 1984 -549 106 1972 replace
execute if score $dungeon do2.config.eggsUnlockDeepfrost matches 0 run clone -468 114 1984 -468 114 1984 -549 106 1971 replace
execute if score $dungeon do2.config.eggsUnlockDeepfrost matches 0 run clone -466 114 1984 -466 114 1984 -549 106 1970 replace
Expand Down
4 changes: 2 additions & 2 deletions Brilliance Datapack/data/do2/functions/version.mcfunction
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# DATAPACK VERSION NUMBER: 0.13.29
# DATAPACK VERSION NUMBER: 0.13.30

tellraw @s ["",{"text":"The §o§n§aBrilliance Datapack§r's version is: [§b0.13.29§r] Check latest version "},{"text":"§o§b§nhere§r","clickEvent":{"action":"open_url","value":"https://github.com/trackedout/Brilliance/blob/main/Brilliance%20Datapack/data/do2/functions/version.mcfunction"}},{"text":"."}]
tellraw @s ["",{"text":"The §o§n§aBrilliance Datapack§r's version is: [§b0.13.30§r] Check latest version "},{"text":"§o§b§nhere§r","clickEvent":{"action":"open_url","value":"https://github.com/trackedout/Brilliance/blob/main/Brilliance%20Datapack/data/do2/functions/version.mcfunction"}},{"text":"."}]

0 comments on commit 6f728c8

Please sign in to comment.