Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history
# Conflicts:
#	Brilliance Datapack/data/do2/functions/dungeon_setup/source_flag_setup.mcfunction
#	Brilliance Datapack/data/do2/functions/scoreboard/config/max_clank_berries/end_suppress_berries.mcfunction
#	Brilliance Datapack/data/do2/functions/scoreboard/config/max_clank_berries/once_suppress_berries.mcfunction
#	Brilliance Datapack/data/do2/functions/scoreboard/config/max_clank_berries/start_suppress_berries.mcfunction
#	Brilliance Datapack/data/do2/functions/scoreboard/config/max_clank_berries/tick_suppress_berries.mcfunction
#	Brilliance Datapack/data/do2/functions/version.mcfunction
  • Loading branch information
Frustrated-Programmer committed Jan 6, 2025
2 parents d479ef2 + 0bee346 commit 3917fe1
Show file tree
Hide file tree
Showing 11 changed files with 68 additions and 88 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,15 @@ schedule function do2:dungeon_setup/teleport_killers/all 3t append
function do2:egg_hunt/spawn_egg_hitboxes
function do2:scoreboard/config/balance_changes/actions

# Other Setup:
# Experimental
function do2:scoreboard/config/max_clank_berries/start_suppress_berries

# Other Setup
function do2:scoreboard/config/config_setup

# Whether Max Clank Disables Treasure
execute if score $dungeon do2.config.maxClankTreasure matches 1 run setblock -624 25 1990 minecraft:redstone_wire
execute unless score $dungeon do2.config.maxClankTreasure matches 1 run setblock -624 25 1990 minecraft:glass

# Reset Current Tick.
# Reset Current Tick
scoreboard players set $dungeon do2.utility.currentTick 0
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ setblock -589 4 1895 minecraft:sweet_berry_bush[age=3]
setblock -645 3 1905 minecraft:sweet_berry_bush[age=3]
setblock -654 4 1919 minecraft:sweet_berry_bush[age=3]
setblock -600 -11 1910 minecraft:sweet_berry_bush[age=3]
setblock -654 4 1919 minecraft:sweet_berry_bush[age=3]

# Deep Frost (Level 4)
setblock -602 -47 1893 miencraft:sweet_berry_bush[age=3]
setblock -616 -48 1876 minecraft:sweet_berry_bush[age=3]
setblock -599 -41 1878 minecraft:sweet_berry_bush[age=3]
setblock -603 -41 1841 minecraft:sweet_berry_bush[age=3]
Expand All @@ -48,3 +48,4 @@ setblock -608 -39 1910 minecraft:sweet_berry_bush[age=3]
setblock -569 -38 1906 minecraft:sweet_berry_bush[age=3]
setblock -567 -45 1911 minecraft:sweet_berry_bush[age=3]
setblock -567 -45 1912 minecraft:sweet_berry_bush[age=3]
setblock -657 -52 1848 minecraft:sweet_berry_bush[age=3]
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,20 @@ summon minecraft:minecart -459 20 1978 {PersistenceRequired:1b, Invulnerable:1b,
summon minecraft:minecart -464 20 1961 {PersistenceRequired:1b, Invulnerable:1b, Passengers:[{Tags: ["evoker_spot","L2E9"], id: "minecraft:evoker", Invulnerable: 1b, Health: 24.0f, Silent: 1b, CustomName: '{"text":"Vexificator"}', CanPickUpLoot: 0b}]}
summon minecraft:minecart -566 11 2021 {PersistenceRequired:1b, Invulnerable:1b, Passengers:[{Tags: ["evoker_spot","L2E10"], id: "minecraft:evoker", Invulnerable: 1b, Health: 24.0f, Silent: 1b, CustomName: '{"text":"Vexificator"}', CanPickUpLoot: 0b}]}

# New
# Level 1
summon minecraft:minecart -527 52 2008 {PersistenceRequired:1b, Invulnerable:1b, Passengers:[{Tags: ["evoker_spot","L1E13"], id: "minecraft:evoker", Invulnerable: 1b, Health: 24.0f, Silent: 1b, CustomName: '{"text":"Vexificator"}', CanPickUpLoot: 0b}]}
summon minecraft:minecart -520 52 1973 {PersistenceRequired:1b, Invulnerable:1b, Passengers:[{Tags: ["evoker_spot","L1E14"], id: "minecraft:evoker", Invulnerable: 1b, Health: 24.0f, Silent: 1b, CustomName: '{"text":"Vexificator"}', CanPickUpLoot: 0b}]}
summon minecraft:evoker -536 56 1967 {PersistenceRequired:1b, Tags: ["evoker_spot","L1E15"], Invulnerable: 1b, Health: 24.0f, Silent: 1b, CustomName: '{"text":"Vexificator"}', CanPickUpLoot: 0b}
summon minecraft:evoker -543 53 1979 {PersistenceRequired:1b, Tags: ["evoker_spot","L1E16"], Invulnerable: 1b, Health: 24.0f, Silent: 1b, CustomName: '{"text":"Vexificator"}', CanPickUpLoot: 0b}
summon minecraft:evoker -587 46 2006 {PersistenceRequired:1b, Tags: ["evoker_spot","L1E17"], Invulnerable: 1b, Health: 24.0f, Silent: 1b, CustomName: '{"text":"Vexificator"}', CanPickUpLoot: 0b}
summon minecraft:evoker -599 44 2037 {PersistenceRequired:1b, Tags: ["evoker_spot","L1E18"], Invulnerable: 1b, Health: 24.0f, Silent: 1b, CustomName: '{"text":"Vexificator"}', CanPickUpLoot: 0b}

# Level 2
summon minecraft:minecart -597 13 1955 {PersistenceRequired:1b, Invulnerable:1b, Passengers:[{Tags: ["evoker_spot","L2E11"], id: "minecraft:evoker", Invulnerable: 1b, Health: 24.0f, Silent: 1b, CustomName: '{"text":"Vexificator"}', CanPickUpLoot: 0b}]}
summon minecraft:evoker -589 14 1985 {PersistenceRequired:1b, Tags: ["evoker_spot","L2E12"], Invulnerable: 1b, Health: 24.0f, Silent: 1b, CustomName: '{"text":"Vexificator"}', CanPickUpLoot: 0b}
summon minecraft:minecart -528 13 1970 {PersistenceRequired:1b, Invulnerable:1b, Passengers:[{Tags: ["evoker_spot","L2E13"], id: "minecraft:evoker", Invulnerable: 1b, Health: 24.0f, Silent: 1b, CustomName: '{"text":"Vexificator"}', CanPickUpLoot: 0b}]}
summon minecraft:evoker -502 26 1967 {PersistenceRequired:1b, Tags: ["evoker_spot","L2E14"], Invulnerable: 1b, Health: 24.0f, Silent: 1b, CustomName: '{"text":"Vexificator"}', CanPickUpLoot: 0b}
summon minecraft:evoker -510 25 1958 {PersistenceRequired:1b, Tags: ["evoker_spot","L2E15"], Invulnerable: 1b, Health: 24.0f, Silent: 1b, CustomName: '{"text":"Vexificator"}', CanPickUpLoot: 0b}
summon minecraft:evoker -463 26 2008 {PersistenceRequired:1b, Tags: ["evoker_spot","L2E16"], Invulnerable: 1b, Health: 24.0f, Silent: 1b, CustomName: '{"text":"Vexificator"}', CanPickUpLoot: 0b}
summon minecraft:minecart -451 19 1957 {PersistenceRequired:1b, Invulnerable:1b, Passengers:[{Tags: ["evoker_spot","L2E17"], id: "minecraft:evoker", Invulnerable: 1b, Health: 24.0f, Silent: 1b, CustomName: '{"text":"Vexificator"}', CanPickUpLoot: 0b}]}
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,23 @@ execute unless entity @e[type=minecraft:stray,tag=L2DAVY] run scoreboard players
# Check for Evokers
function do2:entity_controller/generate_entities/evokers/test_for_all_evokers

# New
execute unless entity @e[type=minecraft:evoker,tag=L1E13] run scoreboard players set $dungeon do2.tests.all_killers_alive 26
execute unless entity @e[type=minecraft:evoker,tag=L1E14] run scoreboard players set $dungeon do2.tests.all_killers_alive 27
execute unless entity @e[type=minecraft:evoker,tag=L1E15] run scoreboard players set $dungeon do2.tests.all_killers_alive 28
execute unless entity @e[type=minecraft:evoker,tag=L1E16] run scoreboard players set $dungeon do2.tests.all_killers_alive 29
execute unless entity @e[type=minecraft:evoker,tag=L1E17] run scoreboard players set $dungeon do2.tests.all_killers_alive 30
execute unless entity @e[type=minecraft:evoker,tag=L1E18] run scoreboard players set $dungeon do2.tests.all_killers_alive 31

execute unless entity @e[type=minecraft:evoker,tag=L2E11] run scoreboard players set $dungeon do2.tests.all_killers_alive 32
execute unless entity @e[type=minecraft:evoker,tag=L2E12] run scoreboard players set $dungeon do2.tests.all_killers_alive 33
execute unless entity @e[type=minecraft:evoker,tag=L2E13] run scoreboard players set $dungeon do2.tests.all_killers_alive 34
execute unless entity @e[type=minecraft:evoker,tag=L2E14] run scoreboard players set $dungeon do2.tests.all_killers_alive 35
execute unless entity @e[type=minecraft:evoker,tag=L2E15] run scoreboard players set $dungeon do2.tests.all_killers_alive 36
execute unless entity @e[type=minecraft:evoker,tag=L2E16] run scoreboard players set $dungeon do2.tests.all_killers_alive 37
execute unless entity @e[type=minecraft:evoker,tag=L2E17] run scoreboard players set $dungeon do2.tests.all_killers_alive 38


execute unless score $dungeon do2.tests.all_killers_alive matches 0 as @a[scores={do2.logs.dungeon_setup=3..}] run tellraw @s ["",{"text":"§f[§9B§r]: Missing 'Other' Killer §b#"},{"color":"aqua","score":{"name":"$dungeon","objective":"do2.tests.all_killers_alive"}}]
execute unless score $dungeon do2.tests.all_killers_alive matches 0 run function do2:dungeon_setup/summon/other_killers
scoreboard objectives remove do2.tests.all_killers_alive
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ execute as @a[scores={do2.logs.datapack_setup=1..}] run tellraw @s "§f[§9B§r]

# Check where I'm running.
scoreboard objectives add do2.utility.onServer dummy "Checking if this Brilliance is loaded on the server"
execute unless score $dungeon do2.utility.onServer matches 0.. run scoreboard players set $dungeon do2.utility.onServer 0
function do2:agronet/test_for_agronet
scoreboard players set $dungeon do2.utility.onServer 0
schedule function do2:agronet/test_for_agronet 1t append
scoreboard objectives add do2.utility.onInstance dummy "Checking if this Brilliance is loaded on an instance"
execute unless score $dungeon do2.utility.onInstance matches 0.. run scoreboard players set $dungeon do2.utility.onInstance 0
function do2:agronet/test_for_instance
scoreboard players set $dungeon do2.utility.onInstance 0
schedule function do2:agronet/test_for_instance 1t append

# Setup scoreboard
function do2:scoreboard/setup/all
Expand Down Expand Up @@ -39,82 +39,8 @@ time set noon
weather clear


# If server has is-dungeon-instance, than set worldspawn to be the deck area.
# Otherwise set worldspawn to be the portal
execute if score $dungeon do2.utility.onInstance matches 0 run setworldspawn -524 103 2167
execute if score $dungeon do2.utility.onInstance matches 1 run setworldspawn -547 115 1980

# If server has is-dungeon-instance, unlock the iron door. NOTE: If it's on the server, only one use
execute if score $dungeon do2.utility.onInstance matches 1 run setblock -551 119 1977 minecraft:redstone_block
execute if score $dungeon do2.utility.onInstance matches 0 run setblock -551 119 1977 air

# If server has is-dungeon-instance, create fall chamber.
execute if score $dungeon do2.utility.onInstance matches 1 run setblock -548 70 1979 minecraft:glass
execute if score $dungeon do2.utility.onInstance matches 1 run setblock -548 70 1981 minecraft:glass
execute if score $dungeon do2.utility.onInstance matches 1 run setblock -548 71 1978 minecraft:glass
execute if score $dungeon do2.utility.onInstance matches 1 run setblock -548 71 1982 minecraft:glass
execute if score $dungeon do2.utility.onInstance matches 1 run setblock -549 71 1979 minecraft:glass
execute if score $dungeon do2.utility.onInstance matches 1 run setblock -549 71 1981 minecraft:glass
execute if score $dungeon do2.utility.onInstance matches 1 run setblock -548 72 1979 minecraft:glass
execute if score $dungeon do2.utility.onInstance matches 1 run setblock -548 72 1981 minecraft:glass
execute if score $dungeon do2.utility.onInstance matches 1 run setblock -548 71 1981 minecraft:command_block[conditional=false,facing=west]{Command:"log-event spawnpoint-recovery-button 1"}
execute if score $dungeon do2.utility.onInstance matches 1 run setblock -548 71 1979 minecraft:command_block[conditional=false,facing=west]{Command:"/tp @p -547 114 1980"}
execute if score $dungeon do2.utility.onInstance matches 1 run fill -546 72 1980 -546 70 1980 minecraft:bamboo_mosaic
execute if score $dungeon do2.utility.onInstance matches 1 run fill -547 72 1979 -547 70 1979 minecraft:bamboo_mosaic
execute if score $dungeon do2.utility.onInstance matches 1 run fill -548 72 1980 -548 70 1980 minecraft:bamboo_mosaic
execute if score $dungeon do2.utility.onInstance matches 1 run fill -547 72 1981 -547 70 1981 minecraft:bamboo_mosaic
execute if score $dungeon do2.utility.onInstance matches 1 run setblock -547 70 1980 minecraft:bamboo_mosaic_slab[type=bottom,waterlogged=true]
execute if score $dungeon do2.utility.onInstance matches 1 run setblock -547 71 1980 minecraft:stone_button[face=wall,facing=east]
execute if score $dungeon do2.utility.onInstance matches 1 run setblock -547 72 1980 minecraft:bamboo_wall_sign[facing=east]{front_text:{color:"black",has_glowing_text:0b,messages:['{"text":"If you need to"}','{"text":"use this button"}','{"text":"please tell one"}','{"text":"of the staff"}']},is_waxed:0b}
execute if score $dungeon do2.utility.onInstance matches 1 run fill -546 109 1980 -546 73 1980 minecraft:glass
execute if score $dungeon do2.utility.onInstance matches 1 run fill -547 109 1979 -547 73 1979 minecraft:glass
execute if score $dungeon do2.utility.onInstance matches 1 run fill -548 109 1980 -548 73 1980 minecraft:glass
execute if score $dungeon do2.utility.onInstance matches 1 run fill -547 109 1981 -547 73 1981 minecraft:glass
execute if score $dungeon do2.utility.onInstance matches 1 run fill -547 111 1981 -547 110 1979 minecraft:bamboo_mosaic
execute if score $dungeon do2.utility.onInstance matches 1 run fill -548 111 1980 -548 110 1980 minecraft:bamboo_mosaic
execute if score $dungeon do2.utility.onInstance matches 0 run fill -548 111 1980 -548 73 1980 air
execute if score $dungeon do2.utility.onInstance matches 0 run fill -547 111 1981 -547 73 1981 air
execute if score $dungeon do2.utility.onInstance matches 0 run fill -546 109 1980 -546 73 1980 air
execute if score $dungeon do2.utility.onInstance matches 0 run fill -547 111 1979 -547 73 1979 air
execute if score $dungeon do2.utility.onInstance matches 0 run fill -547 111 1980 -547 110 1980 air
execute if score $dungeon do2.utility.onInstance matches 0 run fill -549 72 1978 -546 70 1982 air

# If server has is-dungeon-instance, create card selection station.
execute if score $dungeon do2.utility.onInstance matches 1 run setblock -551 115 1982 minecraft:warped_wall_sign[facing=north,waterlogged=false]{back_text:{color:"black",has_glowing_text:0b,messages:['{"text":""}','{"text":""}','{"text":""}','{"text":""}']},front_text:{color:"light_gray",has_glowing_text:1b,messages:['{"text":"Card selection"}','{"text":"station. Push"}','{"text":"button to get"}','{"text":"the shulker back."}']},is_waxed:0b}
execute if score $dungeon do2.utility.onInstance matches 1 run setblock -551 114 1982 minecraft:warped_button[face=wall,facing=north,powered=false]
execute if score $dungeon do2.utility.onInstance matches 1 run setblock -551 112 1982 minecraft:tinted_glass
execute if score $dungeon do2.utility.onInstance matches 1 run setblock -551 111 1982 minecraft:redstone_lamp[lit=true]
execute if score $dungeon do2.utility.onInstance matches 1 run setblock -551 111 1981 minecraft:redstone_block
execute if score $dungeon do2.utility.onInstance matches 1 run setblock -552 112 1982 minecraft:deepslate_tiles
execute if score $dungeon do2.utility.onInstance matches 1 run setblock -551 112 1983 minecraft:deepslate_tiles
execute if score $dungeon do2.utility.onInstance matches 1 run setblock -551 112 1984 minecraft:deepslate_tiles
execute if score $dungeon do2.utility.onInstance matches 1 run setblock -552 113 1983 minecraft:deepslate_tiles
execute if score $dungeon do2.utility.onInstance matches 1 run setblock -552 113 1984 minecraft:deepslate_tiles
execute if score $dungeon do2.utility.onInstance matches 1 run setblock -551 115 1984 minecraft:deepslate_tiles
execute if score $dungeon do2.utility.onInstance matches 1 run setblock -551 114 1984 minecraft:note_block[instrument=harp,note=0,powered=false]
execute if score $dungeon do2.utility.onInstance matches 1 run setblock -551 113 1984 minecraft:sticky_piston[extended=false,facing=north]
execute if score $dungeon do2.utility.onInstance matches 0 run setblock -551 115 1982 air
execute if score $dungeon do2.utility.onInstance matches 0 run setblock -551 114 1982 air
execute if score $dungeon do2.utility.onInstance matches 0 run setblock -551 112 1982 minecraft:polished_basalt[axis=x]
execute if score $dungeon do2.utility.onInstance matches 0 run setblock -551 111 1982 air
execute if score $dungeon do2.utility.onInstance matches 0 run setblock -551 111 1981 air
execute if score $dungeon do2.utility.onInstance matches 0 run setblock -552 112 1982 air
execute if score $dungeon do2.utility.onInstance matches 0 run setblock -551 112 1983 air
execute if score $dungeon do2.utility.onInstance matches 0 run setblock -551 112 1984 air
execute if score $dungeon do2.utility.onInstance matches 0 run setblock -552 113 1983 air
execute if score $dungeon do2.utility.onInstance matches 0 run setblock -552 113 1984 air
execute if score $dungeon do2.utility.onInstance matches 0 run setblock -551 115 1984 air
execute if score $dungeon do2.utility.onInstance matches 0 run setblock -551 114 1984 air
execute if score $dungeon do2.utility.onInstance matches 0 run setblock -551 113 1984 air

# If server has is-dungeon-instance, create manual shulker breaker.
execute if score $dungeon do2.utility.onServer matches 1 run setblock -562 116 1982 minecraft:warped_wall_sign[facing=east,waterlogged=false]{back_text:{color:"black",has_glowing_text:0b,messages:['{"text":""}','{"text":""}','{"text":""}','{"text":""}']},front_text:{color:"white",has_glowing_text:1b,messages:['{"text":"<-- Press button"}','{"text":"if in adventure"}','{"text":"mode and can\'t"}','{"text":"break shulker"}']},is_waxed:0b}
execute if score $dungeon do2.utility.onServer matches 1 run setblock -562 116 1983 minecraft:warped_button[face=wall,facing=east,powered=false]
execute if score $dungeon do2.utility.onServer matches 1 run setblock -564 116 1983 minecraft:redstone_wire[east=side,north=none,power=0,south=none,west=side]
execute if score $dungeon do2.utility.onServer matches 0 run setblock -562 116 1982 air
execute if score $dungeon do2.utility.onServer matches 0 run setblock -562 116 1983 air
execute if score $dungeon do2.utility.onServer matches 0 run setblock -564 116 1983 air

# Run dungeon setup associated with the onServer / onInstance flag, delayed by 2 ticks
schedule function do2:dungeon_setup/source_flag_setup 2t append


# Setup GUI storage
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ execute if score $dungeon do2.run.active matches 2.. if score $dungeon do2.run.p
# if no players running do2 but game active for 5 minutes, end game.
execute if score $dungeon do2.run.active matches 2.. if score $dungeon do2.run.timeWithNoPlayers matches 300 run function do2:events/on_game_end

# Tango mentioned this and I think we removed it on accident.
# Remove glowing effect from Evokers.
execute if score $dungeon do2.run.active matches 2.. as @e[type=minecraft:evoker] if entity @s[nbt={ActiveEffects:[{Id:24}]}] run effect clear @s minecraft:glowing
# Remove glowing effect from Witches.
Expand All @@ -32,6 +31,9 @@ execute if score $dungeon do2.config.forceGamemode matches 1 run function do2:sp
# Force player's food.
execute if score $dungeon do2.config.forceFood matches 1 as @a[scores={do2.utility.shouldForceFood=1}] run function do2:dungeon_setup/control_player_saturation

# Suppress berry growth if config is enabled and max clank has been reached
execute if score $dungeon do2.config.maxClankBerries matches 0 if score $dungeon do2.run.systems.maxclank.released matches 1.. if score $dungeon do2.run.active matches 1.. run function do2:scoreboard/config/max_clank_berries/tick_suppress_berries

# Check for triggers.
function do2:scoreboard/triggers/checks

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ execute as @a[scores={do2.logs.gamestate=1..}] if score $dungeon do2.run.active
execute if score $dungeon do2.config.fastReset matches 1 run setblock -542 122 1966 minecraft:redstone_block
execute if score $dungeon do2.config.fastReset matches 0 run setblock -542 122 1966 minecraft:glass

# Reset berry suspension mechanisms if config is enabled
execute if score $dungeon do2.config.maxClankBerries matches 0 run function do2:scoreboard/config/max_clank_berries/end_suppress_berries

# Set Game to NOT be active.
scoreboard players set $dungeon do2.run.active 0

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ execute as @a if score @s do2.utility.advancementOrdering matches 0 run function
# track ticks/seconds in the dungeon. Also handles if dungeon is empty.
execute if score $dungeon do2.run.active matches 2 run function do2:dungeon_timer


# For every UNTRACKED item, (item entities not tagged)
# Mark the item as UNTRACKED
execute as @e[type=item,tag=!tracked] run function do2:as_item_entity
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@
execute as @a[scores={do2.logs.clank=1..}] run tellraw @s ["",{"text":"[§9B§r]: Reached Max §8Clank§r."}]
# - End Log -

# update scoreboard
# Update scoreboard
scoreboard players add @a[tag=do2.received_shulker] do2.run.systems.maxclank.released 1
scoreboard players add @a[tag=do2.received_shulker] do2.systems.maxclank.released 1
scoreboard players add $dungeon do2.run.systems.maxclank.released 1
scoreboard players add $dungeon do2.systems.maxclank.released 1

execute as @e[type=minecraft:warden] if score warden anger < max_clank_min anger run data modify entity @s anger.suspects[0].anger set value 79
# Apply maxClankBerries config block placements
execute if score $dungeon do2.config.maxClankBerries matches 0 run function do2:scoreboard/config/max_clank_berries/once_suppress_berries
Loading

0 comments on commit 3917fe1

Please sign in to comment.