Skip to content

Commit

Permalink
Check full commit msg pls.
Browse files Browse the repository at this point in the history
(0.13.12)
Populate Backroom's markers
Added new level to be controlled.
Fixed warden's & drowned using ravager names.
Davy -> Davey
Fixed mob name errors not logging properly
Marker visibility no longer only for devs.
  • Loading branch information
Frustrated-Programmer committed Dec 17, 2024
1 parent 5092c7e commit 2b8f6af
Show file tree
Hide file tree
Showing 133 changed files with 467 additions and 456 deletions.
1 change: 0 additions & 1 deletion Brilliance Datapack/TODO.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
- Have dropper config book have LINKS to each of the dropper categories.
- DM each person on the list of players in the credits tab ask them for a short description/saying/quote for their advancement.
- Check credit list to add ALL players to the credits tab.
- Remove file at "dev/markers/controller.mcfunction" eventually.
- Maybe track card vs natural stats:
- Hazard
- Clank
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ execute if score $dungeon do2.config.fr.cakeGauntlet matches 1 run setblock -618

# - Start Log -
function do2:dungeon_setup/test_for_markers
execute if score $dungeon do2.config.mc.controlSummons matches 0 as @a[scores={do2.logs.dungeon_setup=3..}] run tellraw @s ["",{"text":"[§9B§r]: Testing for required entities. ("},{"text":" ? ","color":"dark_red","hoverEvent":{"action":"show_text","contents":["",{"text":"§rIncludes:\n - Teleport Markers\n - Ravagers\n - Wardens\n - §oOne Eyed Willie§r\n - §oDavy Bones§r\n - §oEndermites§r\n - §oEvokers§r"}]}},{"text":")"}]
execute if score $dungeon do2.config.mc.controlSummons matches 0 as @a[scores={do2.logs.dungeon_setup=3..}] run tellraw @s ["",{"text":"[§9B§r]: Testing for required entities. ("},{"text":" ? ","color":"dark_red","hoverEvent":{"action":"show_text","contents":["",{"text":"§rIncludes:\n - Teleport Markers\n - Ravagers\n - Wardens\n - §oOne Eyed Willie§r\n - §oDavey Bones§r\n - §oEndermites§r\n - §oEvokers§r"}]}},{"text":")"}]
execute if score $dungeon do2.config.mc.controlSummons matches 0 run function do2:dungeon_setup/test_for_ravagers
execute if score $dungeon do2.config.mc.controlSummons matches 0 run function do2:dungeon_setup/test_for_wardens
execute if score $dungeon do2.config.mc.controlSummons matches 0 run function do2:dungeon_setup/test_for_other_killers
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,31 @@
kill @e[type=marker,tag=L0Z1]
kill @e[type=marker,tag=L0Z2]

#TODO: populate with more markers.
# - Zone 1 - (1 spots)
summon minecraft:marker -483 132 2006 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L0Z1"]}
# - Zone 2 - (1 spots)
summon minecraft:marker -516 132 2028 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L0Z2"]}

# - Zone 1 - (17 spots)
summon minecraft:marker -478 130 1991 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L0Z1"]}
summon minecraft:marker -476 130 1999 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L0Z1"]}
summon minecraft:marker -480 130 2001 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L0Z1"]}
summon minecraft:marker -487 130 2002 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L0Z1"]}
summon minecraft:marker -489 131 2007 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L0Z1"]}
summon minecraft:marker -482 131 2011 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L0Z1"]}
summon minecraft:marker -490 131 2011 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L0Z1"]}
summon minecraft:marker -498 131 2010 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L0Z1"]}
summon minecraft:marker -500 131 2007 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L0Z1"]}
summon minecraft:marker -504 131 2007 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L0Z1"]}
summon minecraft:marker -503 131 2011 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L0Z1"]}
summon minecraft:marker -509 131 2011 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L0Z1"]}
summon minecraft:marker -511 131 2009 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L0Z1"]}
summon minecraft:marker -510 131 2006 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L0Z1"]}
summon minecraft:marker -515 131 2007 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L0Z1"]}
summon minecraft:marker -519 137 2011 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L0Z1"]}
summon minecraft:marker -522 137 2004 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L0Z1"]}
# - Zone 2 - (9 spots)
summon minecraft:marker -502 132 2019 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L0Z2"]}
summon minecraft:marker -515 132 2031 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L0Z2"]}
summon minecraft:marker -515 132 2019 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L0Z2"]}
summon minecraft:marker -508 132 2021 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L0Z2"]}
summon minecraft:marker -515 132 2026 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L0Z2"]}
summon minecraft:marker -516 132 2023 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L0Z2"]}
summon minecraft:marker -515 132 2029 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L0Z2"]}
summon minecraft:marker -502 132 2022 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L0Z2"]}
summon minecraft:marker -501 132 2032 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L0Z2"]}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# - Make sure we don't have duplicates -
# One Eyed Willie
kill @e[type=minecraft:drowned]
# Davy Bones
# Davey Bones
execute positioned -575.00 14.52 1984.51 run kill @e[type=minecart,distance=..2]
kill @e[type=minecraft:stray]
# Evokers
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ function do2:dungeon_setup/summon/no_zones/summon_willie_markers
function do2:dungeon_setup/summon/no_zones/summon_training_markers

# Turn invisible *all* markers.
function do2:dev/markers/turn_invisible/all
function do2:mob_controller/marker_visibility/turn_invisible/all
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# - Start Log -
execute as @a[scores={do2.logs.dungeon_setup=3..}] run tellraw @s ["",{"text":"§f[§9B§r]: Summoning 'other' killers ("},{"text":" ? ","color":"dark_red","hoverEvent":{"action":"show_text","contents":["",{"text":"§rIncludes:\n - §oOne Eyed Willie§r\n - §oDavy Bones§r\n - §oEndermites§r\n - §oEvokers§r"}]}},{"text":")"}]
execute as @a[scores={do2.logs.dungeon_setup=3..}] run tellraw @s ["",{"text":"§f[§9B§r]: Summoning 'other' killers ("},{"text":" ? ","color":"dark_red","hoverEvent":{"action":"show_text","contents":["",{"text":"§rIncludes:\n - §oOne Eyed Willie§r\n - §oDavey Bones§r\n - §oEndermites§r\n - §oEvokers§r"}]}},{"text":")"}]
# - End Log -

# One Eyed Willie
execute at @e[type=marker,tag=L2WILLIE,limit=1,sort=random] run summon minecraft:drowned ~ ~ ~ {PersistenceRequired:1b, Invulnerable: 1b, Tags: ["L2WILLIE"], HandDropChances: [0.0f, 0.0f], Health: 20.0f, HandItems: [{id: "minecraft:trident", Count: 1b}, {}], CustomName: '{"text":"One Eyed Willie"}'}
# Training Room Drowned
summon minecraft:drowned -516 132 2028 {PersistenceRequired:1b, Invulnerable: 1b, Tags: ["L0Z2"], HandDropChances: [0.0f, 0.0f], Health: 20.0f, HandItems: [{id: "minecraft:trident", Count: 1b}, {}], CustomName: '{"text":"The Worst!!!"}'}

# Davy Bones
# Davey Bones
summon minecraft:minecart -576 13 1984 {PersistenceRequired:1b, Invulnerable:1b, Passengers:[{Invulnerable:1b, Tags: ["L2DAVY"], id: "minecraft:stray", Health: 20.0f, Silent: 1b, CustomName: '{"text":"Davey Bones"}',HandItems:[{id: "minecraft:bow", Count: 1b, tag:{Damage: 0, Enchantments:[{lvl: 1s, id: "minecraft:unbreaking"},{lvl: 1s, id: "minecraft:power"}]}}]}]}

# - Evokers -
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# - Start Log -
execute as @a[scores={do2.logs.dungeon_setup=4..}] run tellraw @s ["",{"text":"§f[§9B§r]: Testing for 'other' killers ("},{"text":" ? ","color":"dark_red","hoverEvent":{"action":"show_text","contents":["",{"text":"§rIncludes:\n - §oOne Eyed Willie§r\n - §oDavy Bones§r\n - §oEndermites§r\n - §oEvokers§r"}]}},{"text":")"}]
execute as @a[scores={do2.logs.dungeon_setup=4..}] run tellraw @s ["",{"text":"§f[§9B§r]: Testing for 'other' killers ("},{"text":" ? ","color":"dark_red","hoverEvent":{"action":"show_text","contents":["",{"text":"§rIncludes:\n - §oOne Eyed Willie§r\n - §oDavey Bones§r\n - §oEndermites§r\n - §oEvokers§r"}]}},{"text":")"}]
# - End Log -


Expand Down Expand Up @@ -27,7 +27,7 @@ scoreboard players set $dungeon do2.tests.all_killers_alive 0
execute unless entity @e[type=minecraft:drowned,tag=L2WILLIE] run scoreboard players set $dungeon do2.tests.all_killers_alive 1
# Check for Training Room Drowned
execute unless entity @e[type=minecraft:drowned,tag=L0Z2] run scoreboard players set $dungeon do2.tests.all_killers_alive 2
# Check for Davy Bones
# Check for Davey Bones
execute unless entity @e[type=minecraft:stray,tag=L2DAVY] run scoreboard players set $dungeon do2.tests.all_killers_alive 3
# Check for Evokers
execute unless entity @e[type=minecraft:evoker,tag=L1E1] run scoreboard players set $dungeon do2.tests.all_killers_alive 4
Expand Down
Loading

0 comments on commit 2b8f6af

Please sign in to comment.