diff --git a/Brilliance Datapack/data/do2/functions/dungeon_setup/all.mcfunction b/Brilliance Datapack/data/do2/functions/dungeon_setup/all.mcfunction index fa5575e6..49b79687 100644 --- a/Brilliance Datapack/data/do2/functions/dungeon_setup/all.mcfunction +++ b/Brilliance Datapack/data/do2/functions/dungeon_setup/all.mcfunction @@ -29,6 +29,10 @@ function do2:dungeon_setup/reset_hopper_minecarts/test_for_tags function do2:dungeon_setup/reset_hopper_minecarts/set_inventories function do2:dungeon_setup/randomize_clank_blockers/randomize_shrieker_groups +# Ensure X amount of cards are always available +fill -624 -17 2014 -624 -17 1998 air replace +schedule function do2:dungeon_setup/make_cards_always_available 1s + # Experimental function do2:scoreboard/config/max_clank_berries/start_suppress_berries diff --git a/Brilliance Datapack/data/do2/functions/dungeon_setup/make_cards_always_available.mcfunction b/Brilliance Datapack/data/do2/functions/dungeon_setup/make_cards_always_available.mcfunction new file mode 100644 index 00000000..65b2e119 --- /dev/null +++ b/Brilliance Datapack/data/do2/functions/dungeon_setup/make_cards_always_available.mcfunction @@ -0,0 +1,33 @@ +execute if score $dungeon do2.config.bc.cardsAlwaysAvailable matches 1.. run setblock -624 -17 1998 minecraft:redstone_block +execute if score $dungeon do2.config.bc.cardsAlwaysAvailable matches 2.. run setblock -624 -17 1999 minecraft:redstone_block +execute if score $dungeon do2.config.bc.cardsAlwaysAvailable matches 3.. run setblock -624 -17 2000 minecraft:redstone_block +execute if score $dungeon do2.config.bc.cardsAlwaysAvailable matches 4.. run setblock -624 -17 2001 minecraft:redstone_block +# 2002 has no card +execute if score $dungeon do2.config.bc.cardsAlwaysAvailable matches 5.. run setblock -624 -17 2003 minecraft:redstone_block +execute if score $dungeon do2.config.bc.cardsAlwaysAvailable matches 6.. run setblock -624 -17 2004 minecraft:redstone_block +execute if score $dungeon do2.config.bc.cardsAlwaysAvailable matches 7.. run setblock -624 -17 2005 minecraft:redstone_block +# 2006 has no card +execute if score $dungeon do2.config.bc.cardsAlwaysAvailable matches 8.. run setblock -624 -17 2007 minecraft:redstone_block +execute if score $dungeon do2.config.bc.cardsAlwaysAvailable matches 9.. run setblock -624 -17 2008 minecraft:redstone_block +# 2009 has no card +execute if score $dungeon do2.config.bc.cardsAlwaysAvailable matches 10.. run setblock -624 -17 2010 minecraft:redstone_block +execute if score $dungeon do2.config.bc.cardsAlwaysAvailable matches 11.. run setblock -624 -17 2011 minecraft:redstone_block +execute if score $dungeon do2.config.bc.cardsAlwaysAvailable matches 12.. run setblock -624 -17 2012 minecraft:redstone_block +execute if score $dungeon do2.config.bc.cardsAlwaysAvailable matches 13.. run setblock -624 -17 2013 minecraft:redstone_block +execute if score $dungeon do2.config.bc.cardsAlwaysAvailable matches 14.. run setblock -624 -17 2014 minecraft:redstone_block +# swap from east side to west side +# 2014 has no card +execute if score $dungeon do2.config.bc.cardsAlwaysAvailable matches 15.. run setblock -650 -17 2013 minecraft:redstone_block +execute if score $dungeon do2.config.bc.cardsAlwaysAvailable matches 16.. run setblock -650 -17 2012 minecraft:redstone_block +execute if score $dungeon do2.config.bc.cardsAlwaysAvailable matches 17.. run setblock -650 -17 2011 minecraft:redstone_block +execute if score $dungeon do2.config.bc.cardsAlwaysAvailable matches 18.. run setblock -650 -17 2010 minecraft:redstone_block +execute if score $dungeon do2.config.bc.cardsAlwaysAvailable matches 19.. run setblock -650 -17 2009 minecraft:redstone_block +execute if score $dungeon do2.config.bc.cardsAlwaysAvailable matches 20.. run setblock -650 -17 2008 minecraft:redstone_block +# 2007 has no card +# 2006 has no card +execute if score $dungeon do2.config.bc.cardsAlwaysAvailable matches 21.. run setblock -650 -17 2005 minecraft:redstone_block +execute if score $dungeon do2.config.bc.cardsAlwaysAvailable matches 22.. run setblock -650 -17 2004 minecraft:redstone_block +execute if score $dungeon do2.config.bc.cardsAlwaysAvailable matches 23.. run setblock -650 -17 2003 minecraft:redstone_block +execute if score $dungeon do2.config.bc.cardsAlwaysAvailable matches 24.. run setblock -650 -17 2002 minecraft:redstone_block +execute if score $dungeon do2.config.bc.cardsAlwaysAvailable matches 25.. run setblock -650 -17 2001 minecraft:redstone_block +execute if score $dungeon do2.config.bc.cardsAlwaysAvailable matches 26.. run setblock -650 -17 2000 minecraft:redstone_block diff --git a/Brilliance Datapack/data/do2/functions/scoreboard/setup/config.mcfunction b/Brilliance Datapack/data/do2/functions/scoreboard/setup/config.mcfunction index 37994a01..4ea323e1 100644 --- a/Brilliance Datapack/data/do2/functions/scoreboard/setup/config.mcfunction +++ b/Brilliance Datapack/data/do2/functions/scoreboard/setup/config.mcfunction @@ -56,6 +56,7 @@ scoreboard objectives add do2.config.bc.balancedTnTDiveLoot dummy "Balanced TnT scoreboard objectives add do2.config.bc.lessLootMaxClank dummy "Less Loot on Max ยง8Clank" scoreboard objectives add do2.config.bc.suitUpRes dummy "Suit Up Resistance" scoreboard objectives add do2.config.bc.staircaseEmbers dummy "Staircase Embers" +scoreboard objectives add do2.config.bc.cardsAlwaysAvailable dummy "Amount of cards always available to purchase" # Dungeon Config: Fresh Runs