Deepfrost difficulty locked for players without all eggs found.

trackedout · Dec 23, 2024 · bdbe281 · bdbe281
1 parent 699dc3b
commit bdbe281
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 4 deletions.
diff --git a/Brilliance Datapack/TODO.md b/Brilliance Datapack/TODO.md
@@ -1,4 +1,5 @@
 # Other TODO:
+- Add is_waxed:1b to all non-clickable signs
 - do2.config.fr.teleportKillers isn't used in new system and needs to be updated todo so.
 - Allow ghosts to spectate their allies in shop freely.
 - DavyBones & Mites need to be moved to mob_controller

diff --git a/Brilliance Datapack/data/do2/functions/dungeon_setup/lock_deepfrost.mcfunction b/Brilliance Datapack/data/do2/functions/dungeon_setup/lock_deepfrost.mcfunction
@@ -0,0 +1,6 @@
+setblock -561 115 1984 air
+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[6].Count set value 0
+data modify block -549 106 1972 Items[7].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"}']}}
diff --git a/Brilliance Datapack/data/do2/functions/dungeon_setup/preset_difficulty.mcfunction b/Brilliance Datapack/data/do2/functions/dungeon_setup/preset_difficulty.mcfunction
@@ -20,9 +20,14 @@ data merge block -559 113 1988 {Items:[{Slot:0b,id:"minecraft:stone",Count:1b}]}
 data merge block -560 113 1988 {Items:[{Slot:0b,id:"minecraft:stone",Count:1b}]}
 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
+
 # Default to easy difficulty
-execute if score @s do2.config.dungeonDifficulty matches 0 run data merge block -557 113 1988 {Items:[]}
-execute if score @s do2.config.dungeonDifficulty matches 0 run data merge block -557 113 1987 {Items:[{Slot:0b,id:"minecraft:stone",Count:1b}]}
+execute unless score @s do2.config.dungeonDifficulty matches 0 run data merge block -557 113 1988 {Items:[]}
+execute unless score @s do2.config.dungeonDifficulty matches 0 run data merge block -557 113 1987 {Items:[{Slot:0b,id:"minecraft:stone",Count:1b}]}
 
 execute if score @s do2.config.dungeonDifficulty matches 1 run data merge block -557 113 1988 {Items:[]}
 execute if score @s do2.config.dungeonDifficulty matches 1 run data merge block -557 113 1987 {Items:[{Slot:0b,id:"minecraft:stone",Count:1b}]}

diff --git a/Brilliance Datapack/data/do2/functions/dungeon_setup/unlock_deepfrost.mcfunction b/Brilliance Datapack/data/do2/functions/dungeon_setup/unlock_deepfrost.mcfunction
@@ -0,0 +1,10 @@
+setblock -561 115 1984 minecraft:warped_button[facing=north]
+setblock -561 114 1984 air
+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 unless score $dungeon do2.config.refillDungeonType matches 2 run return 0
+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
diff --git a/Brilliance Datapack/data/do2/functions/scoreboard/setup/config.mcfunction b/Brilliance Datapack/data/do2/functions/scoreboard/setup/config.mcfunction
@@ -46,6 +46,8 @@ scoreboard objectives add do2.config.forceFood dummy "Force player's food"
 scoreboard objectives add do2.config.targetFoodLevel dummy "What to try to set players's food level to"
 scoreboard objectives add do2.config.targetSaturationLevel dummy "What to try to set players's saturation level to"
 
+# Dungeon Config: Whether to force egg findings for deepfrost difficulty.
+scoreboard objectives add do2.config.eggsUnlockDeepfrost dummy "Eggs unlock deepfrost"
 
 # Dungeon Config: Balance Changes
 scoreboard objectives add do2.config.bc.snowHazard dummy "Snow Passage Hazard"

diff --git a/Brilliance Datapack/data/do2/functions/scoreboard/setup/config_defaults.mcfunction b/Brilliance Datapack/data/do2/functions/scoreboard/setup/config_defaults.mcfunction
@@ -15,6 +15,7 @@ execute unless score $dungeon do2.config.useWorldCycle matches 0.. run scoreboar
 execute unless score $dungeon do2.config.forceFood matches 0.. run scoreboard players set $dungeon do2.config.forceFood 1
 execute unless score $dungeon do2.config.targetFoodLevel matches 0.. run scoreboard players set $dungeon do2.config.targetFoodLevel 20
 execute unless score $dungeon do2.config.targetSaturationLevel matches 0.. run scoreboard players set $dungeon do2.config.targetSaturationLevel 13
+execute unless score $dungeon do2.config.eggsUnlockDeepfrost matches 0.. run scoreboard players set $dungeon do2.config.eggsUnlockDeepfrost 0
 execute unless score $dungeon do2.config.bc.snowHazard matches 0.. run scoreboard players set $dungeon do2.config.bc.snowHazard 1
 execute unless score $dungeon do2.config.bc.l2ShipTreasureLine matches 0.. run scoreboard players set $dungeon do2.config.bc.l2ShipTreasureLine 1
 execute unless score $dungeon do2.config.bc.balancedTnTDiveLoot matches 0.. run scoreboard players set $dungeon do2.config.bc.balancedTnTDiveLoot 1

diff --git a/...iance Datapack/data/do2/functions/scoreboard/setup/tracked_out_config_defaults.mcfunction b/...iance Datapack/data/do2/functions/scoreboard/setup/tracked_out_config_defaults.mcfunction
@@ -2,3 +2,4 @@ scoreboard players set $dungeon do2.config.nightTimeChance 50
 scoreboard players set $dungeon do2.config.eggRewards 3
 scoreboard players set $dungeon do2.config.useWorldCycle 0
 scoreboard players set $dungeon do2.config.mc.controlSummons 0
+scoreboard players set $dungeon do2.config.eggsUnlockDeepfrost 1
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.22
+# DATAPACK VERSION NUMBER: 0.13.23
 
-tellraw @s ["",{"text":"The §o§n§aBrilliance Datapack§r's version is: [§b0.13.22§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.23§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":"."}]