reset dungeon to default now *checks* for eggsUnlockDeepfrost before …

…resetting the dungeon
trackedout · Dec 24, 2024 · d214676 · d214676
1 parent ea38bda
commit d214676
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/...apack/data/do2/functions/reset_dungeon/commands/reset/reset_dungeon_to_default.mcfunction b/...apack/data/do2/functions/reset_dungeon/commands/reset/reset_dungeon_to_default.mcfunction
@@ -20,9 +20,12 @@ 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 positioned -549 106 1972 run function do2:reset_dungeon/default_states/compasses/deadly_2
-execute positioned -549 106 1971 run function do2:reset_dungeon/default_states/compasses/deepfrost_1
-execute 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_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 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
 
 # Treasure
 execute positioned -518 35 2002 run function do2:reset_dungeon/default_states/treasure/01

diff --git a/...ance Datapack/data/do2/functions/reset_dungeon/commands/write/write_to_dungeon.mcfunction b/...ance Datapack/data/do2/functions/reset_dungeon/commands/write/write_to_dungeon.mcfunction
@@ -20,9 +20,12 @@ 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
-clone -468 114 1984 -468 114 1984 -549 106 1972 replace
-clone -467 114 1984 -467 114 1984 -549 106 1971 replace
-clone -466 114 1984 -466 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_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 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
 
 # Treasure
 clone -475 114 1959 -475 114 1959 -518 35 2002 replace

diff --git a/Brilliance Datapack/data/do2/functions/version.mcfunction b/Brilliance Datapack/data/do2/functions/version.mcfunction
@@ -1,3 +1,3 @@
-# DATAPACK VERSION NUMBER: 0.13.27
+# DATAPACK VERSION NUMBER: 0.13.28
 
-tellraw @s ["",{"text":"The §o§n§aBrilliance Datapack§r's version is: [§b0.13.27§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.28§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":"."}]