From 2b8f6aff16854071e0c13b105605e7dd2199ee1a Mon Sep 17 00:00:00 2001 From: FrustratedProgrammer Date: Tue, 17 Dec 2024 05:13:57 -0600 Subject: [PATCH] Check full commit msg pls. (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. --- Brilliance Datapack/TODO.md | 1 - .../dev/markers/controller.mcfunction | 88 ------------------ .../{edit_markers => }/spawn_eggs.mcfunction | 0 .../summon_markers.mcfunction | 0 .../dev/markers/turn_invisible/all.mcfunction | 18 ---- .../turn_invisible/fish_marker.mcfunction | 3 - .../markers/turn_invisible/l1z1.mcfunction | 3 - .../markers/turn_invisible/l1z2.mcfunction | 3 - .../markers/turn_invisible/l1z3.mcfunction | 3 - .../markers/turn_invisible/l1z4.mcfunction | 3 - .../markers/turn_invisible/l1z5.mcfunction | 3 - .../turn_invisible/l2willie.mcfunction | 3 - .../markers/turn_invisible/l2z1.mcfunction | 3 - .../markers/turn_invisible/l2z2.mcfunction | 3 - .../markers/turn_invisible/l2z3.mcfunction | 3 - .../markers/turn_invisible/l2z4.mcfunction | 3 - .../markers/turn_invisible/l2z5.mcfunction | 3 - .../markers/turn_invisible/l3z1.mcfunction | 3 - .../markers/turn_invisible/l3z2.mcfunction | 3 - .../markers/turn_invisible/l3z3.mcfunction | 3 - .../markers/turn_invisible/l4z1.mcfunction | 3 - .../markers/turn_invisible/l4z2.mcfunction | 3 - .../markers/turn_invisible/l4z3.mcfunction | 3 - .../functions/dungeon_setup/all.mcfunction | 2 +- .../summon_training_markers.mcfunction | 34 +++++-- .../summon/other_killers.mcfunction | 2 +- .../summon/summon_markers.mcfunction | 2 +- .../summon/summon_other_killers.mcfunction | 4 +- .../test_for_other_killers.mcfunction | 4 +- .../test_for_ravagers.mcfunction | 2 +- .../events/on_datapack_tick.mcfunction | 3 - .../add_mob_names/add_name_to_list.mcfunction | 10 ++ .../add_mob_names/drowned_names.mcfunction | 2 +- .../add_mob_names/ravager_names.mcfunction | 2 +- .../add_mob_names/warden_names.mcfunction | 2 +- .../mob_controller/generate_mobs.mcfunction | 5 +- .../log_mob_name_count_errors.mcfunction | 4 +- .../generate_mobs/zones/l0z1.mcfunction | 4 +- .../generate_mobs/zones/l0z2.mcfunction | 4 +- .../get_mob_count/backrooms.mcfunction | 8 +- .../get_mob_count/count_mobs.mcfunction | 1 + .../get_mob_count/l1.mcfunction | 16 ++-- .../get_mob_count/l2.mcfunction | 16 ++-- .../get_mob_count/l2_other.mcfunction | 6 ++ .../get_mob_count/l3.mcfunction | 6 +- .../get_mob_count/l4.mcfunction | 12 +-- .../get_mob_names/backrooms.mcfunction | 6 +- .../get_mob_names/get_mob_names.mcfunction | 1 + .../get_mob_names/l1.mcfunction | 16 ++-- .../get_mob_names/l2.mcfunction | 16 ++-- .../get_mob_names/l2_other.mcfunction | 6 ++ .../get_mob_names/l3.mcfunction | 6 +- .../get_mob_names/l4.mcfunction | 12 +-- .../turn_invisible/all.mcfunction | 18 ++++ .../turn_invisible/fish_marker.mcfunction | 3 + .../turn_invisible/l0z1.mcfunction | 3 + .../turn_invisible/l0z2.mcfunction | 3 + .../turn_invisible/l1z1.mcfunction | 3 + .../turn_invisible/l1z2.mcfunction | 3 + .../turn_invisible/l1z3.mcfunction | 3 + .../turn_invisible/l1z4.mcfunction | 3 + .../turn_invisible/l1z5.mcfunction | 3 + .../turn_invisible/l2willie.mcfunction | 3 + .../turn_invisible/l2z1.mcfunction | 3 + .../turn_invisible/l2z2.mcfunction | 3 + .../turn_invisible/l2z3.mcfunction | 3 + .../turn_invisible/l2z4.mcfunction | 3 + .../turn_invisible/l2z5.mcfunction | 3 + .../turn_invisible/l3z1.mcfunction | 3 + .../turn_invisible/l3z2.mcfunction | 3 + .../turn_invisible/l3z3.mcfunction | 3 + .../turn_invisible/l4z1.mcfunction | 3 + .../turn_invisible/l4z2.mcfunction | 3 + .../turn_invisible/l4z3.mcfunction | 3 + .../turn_visible/fish_marker.mcfunction | 2 +- .../turn_visible/l0z1.mcfunction | 5 + .../turn_visible/l0z2.mcfunction | 5 + .../turn_visible/l1z1.mcfunction | 2 +- .../turn_visible/l1z2.mcfunction | 2 +- .../turn_visible/l1z3.mcfunction | 2 +- .../turn_visible/l1z4.mcfunction | 2 +- .../turn_visible/l1z5.mcfunction | 2 +- .../turn_visible/l2willie.mcfunction | 2 +- .../turn_visible/l2z1.mcfunction | 2 +- .../turn_visible/l2z2.mcfunction | 2 +- .../turn_visible/l2z3.mcfunction | 2 +- .../turn_visible/l2z4.mcfunction | 2 +- .../turn_visible/l2z5.mcfunction | 2 +- .../turn_visible/l3z1.mcfunction | 2 +- .../turn_visible/l3z2.mcfunction | 2 +- .../turn_visible/l3z3.mcfunction | 2 +- .../turn_visible/l4z1.mcfunction | 2 +- .../turn_visible/l4z2.mcfunction | 2 +- .../turn_visible/l4z3.mcfunction | 2 +- .../per_tick/backrooms.mcfunction | 13 ++- .../mob_controller/per_tick/l1.mcfunction | 32 +++---- .../mob_controller/per_tick/l2.mcfunction | 32 +++---- .../per_tick/l2_other.mcfunction | 8 ++ .../mob_controller/per_tick/l3.mcfunction | 12 +-- .../mob_controller/per_tick/l4.mcfunction | 24 ++--- .../individual/backrooms.mcfunction | 10 +- .../individual/l1_no_zones.mcfunction | 20 ++-- .../individual/l1_zones.mcfunction | 12 +-- .../individual/l2_no_zones.mcfunction | 20 ++-- .../individual/l2_other.mcfunction | 9 ++ .../individual/l2_zones.mcfunction | 12 +-- .../reset_to_default/individual/l3.mcfunction | 12 +-- .../reset_to_default/individual/l4.mcfunction | 12 +-- .../reset_to_default/reset_all.mcfunction | 18 ++-- .../reset_to_default/reset_current.mcfunction | 15 +-- .../mob_controller/run_per_tick.mcfunction | 15 +-- .../mob_controller/save_storages.mcfunction | 23 +++-- .../swap_to/backrooms.mcfunction | 8 +- .../swap_to/change_zones.mcfunction | 24 ++--- .../mob_controller/swap_to/l1.mcfunction | 18 ++-- .../mob_controller/swap_to/l2.mcfunction | 19 ++-- .../swap_to/l2_other.mcfunction | 9 ++ .../mob_controller/swap_to/l3.mcfunction | 14 +-- .../mob_controller/swap_to/l4.mcfunction | 17 ++-- .../mob_controller/swap_to/setup.mcfunction | 12 +++ .../data/do2/functions/version.mcfunction | 4 +- .../do2/structures/config.mc.backrooms.nbt | Bin 0 -> 3419 bytes .../config.mc.backrooms_no_zones.nbt | Bin 3509 -> 0 bytes .../do2/structures/config.mc.l1_has_zones.nbt | Bin 3841 -> 3648 bytes .../do2/structures/config.mc.l1_no_zones.nbt | Bin 3568 -> 3583 bytes .../do2/structures/config.mc.l2_has_zones.nbt | Bin 3721 -> 3703 bytes .../do2/structures/config.mc.l2_no_zones.nbt | Bin 3629 -> 3633 bytes .../do2/structures/config.mc.l2_other.nbt | Bin 0 -> 4056 bytes .../data/do2/structures/config.mc.l3.nbt | Bin 0 -> 3432 bytes .../do2/structures/config.mc.l3_no_zones.nbt | Bin 3449 -> 0 bytes .../do2/structures/config.mc.l4_has_zones.nbt | Bin 3706 -> 3709 bytes .../do2/structures/config.mc.l4_no_zones.nbt | Bin 3623 -> 3624 bytes .../structures/config.mc.storages_default.nbt | Bin 2089 -> 2617 bytes 133 files changed, 467 insertions(+), 456 deletions(-) delete mode 100644 Brilliance Datapack/data/do2/functions/dev/markers/controller.mcfunction rename Brilliance Datapack/data/do2/functions/dev/markers/{edit_markers => }/spawn_eggs.mcfunction (100%) rename Brilliance Datapack/data/do2/functions/dev/markers/{edit_markers => }/summon_markers.mcfunction (100%) delete mode 100644 Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/all.mcfunction delete mode 100644 Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/fish_marker.mcfunction delete mode 100644 Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/l1z1.mcfunction delete mode 100644 Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/l1z2.mcfunction delete mode 100644 Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/l1z3.mcfunction delete mode 100644 Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/l1z4.mcfunction delete mode 100644 Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/l1z5.mcfunction delete mode 100644 Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/l2willie.mcfunction delete mode 100644 Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/l2z1.mcfunction delete mode 100644 Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/l2z2.mcfunction delete mode 100644 Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/l2z3.mcfunction delete mode 100644 Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/l2z4.mcfunction delete mode 100644 Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/l2z5.mcfunction delete mode 100644 Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/l3z1.mcfunction delete mode 100644 Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/l3z2.mcfunction delete mode 100644 Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/l3z3.mcfunction delete mode 100644 Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/l4z1.mcfunction delete mode 100644 Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/l4z2.mcfunction delete mode 100644 Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/l4z3.mcfunction create mode 100644 Brilliance Datapack/data/do2/functions/mob_controller/get_mob_count/l2_other.mcfunction create mode 100644 Brilliance Datapack/data/do2/functions/mob_controller/get_mob_names/l2_other.mcfunction create mode 100644 Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/all.mcfunction create mode 100644 Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/fish_marker.mcfunction create mode 100644 Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l0z1.mcfunction create mode 100644 Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l0z2.mcfunction create mode 100644 Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l1z1.mcfunction create mode 100644 Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l1z2.mcfunction create mode 100644 Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l1z3.mcfunction create mode 100644 Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l1z4.mcfunction create mode 100644 Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l1z5.mcfunction create mode 100644 Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l2willie.mcfunction create mode 100644 Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l2z1.mcfunction create mode 100644 Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l2z2.mcfunction create mode 100644 Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l2z3.mcfunction create mode 100644 Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l2z4.mcfunction create mode 100644 Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l2z5.mcfunction create mode 100644 Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l3z1.mcfunction create mode 100644 Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l3z2.mcfunction create mode 100644 Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l3z3.mcfunction create mode 100644 Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l4z1.mcfunction create mode 100644 Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l4z2.mcfunction create mode 100644 Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l4z3.mcfunction rename Brilliance Datapack/data/do2/functions/{dev/markers => mob_controller/marker_visibility}/turn_visible/fish_marker.mcfunction (94%) create mode 100644 Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_visible/l0z1.mcfunction create mode 100644 Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_visible/l0z2.mcfunction rename Brilliance Datapack/data/do2/functions/{dev/markers => mob_controller/marker_visibility}/turn_visible/l1z1.mcfunction (93%) rename Brilliance Datapack/data/do2/functions/{dev/markers => mob_controller/marker_visibility}/turn_visible/l1z2.mcfunction (93%) rename Brilliance Datapack/data/do2/functions/{dev/markers => mob_controller/marker_visibility}/turn_visible/l1z3.mcfunction (93%) rename Brilliance Datapack/data/do2/functions/{dev/markers => mob_controller/marker_visibility}/turn_visible/l1z4.mcfunction (93%) rename Brilliance Datapack/data/do2/functions/{dev/markers => mob_controller/marker_visibility}/turn_visible/l1z5.mcfunction (93%) rename Brilliance Datapack/data/do2/functions/{dev/markers => mob_controller/marker_visibility}/turn_visible/l2willie.mcfunction (94%) rename Brilliance Datapack/data/do2/functions/{dev/markers => mob_controller/marker_visibility}/turn_visible/l2z1.mcfunction (93%) rename Brilliance Datapack/data/do2/functions/{dev/markers => mob_controller/marker_visibility}/turn_visible/l2z2.mcfunction (93%) rename Brilliance Datapack/data/do2/functions/{dev/markers => mob_controller/marker_visibility}/turn_visible/l2z3.mcfunction (93%) rename Brilliance Datapack/data/do2/functions/{dev/markers => mob_controller/marker_visibility}/turn_visible/l2z4.mcfunction (93%) rename Brilliance Datapack/data/do2/functions/{dev/markers => mob_controller/marker_visibility}/turn_visible/l2z5.mcfunction (93%) rename Brilliance Datapack/data/do2/functions/{dev/markers => mob_controller/marker_visibility}/turn_visible/l3z1.mcfunction (93%) rename Brilliance Datapack/data/do2/functions/{dev/markers => mob_controller/marker_visibility}/turn_visible/l3z2.mcfunction (93%) rename Brilliance Datapack/data/do2/functions/{dev/markers => mob_controller/marker_visibility}/turn_visible/l3z3.mcfunction (93%) rename Brilliance Datapack/data/do2/functions/{dev/markers => mob_controller/marker_visibility}/turn_visible/l4z1.mcfunction (93%) rename Brilliance Datapack/data/do2/functions/{dev/markers => mob_controller/marker_visibility}/turn_visible/l4z2.mcfunction (93%) rename Brilliance Datapack/data/do2/functions/{dev/markers => mob_controller/marker_visibility}/turn_visible/l4z3.mcfunction (93%) create mode 100644 Brilliance Datapack/data/do2/functions/mob_controller/per_tick/l2_other.mcfunction create mode 100644 Brilliance Datapack/data/do2/functions/mob_controller/reset_to_default/individual/l2_other.mcfunction create mode 100644 Brilliance Datapack/data/do2/functions/mob_controller/swap_to/l2_other.mcfunction create mode 100644 Brilliance Datapack/data/do2/functions/mob_controller/swap_to/setup.mcfunction create mode 100644 Brilliance Datapack/data/do2/structures/config.mc.backrooms.nbt delete mode 100644 Brilliance Datapack/data/do2/structures/config.mc.backrooms_no_zones.nbt create mode 100644 Brilliance Datapack/data/do2/structures/config.mc.l2_other.nbt create mode 100644 Brilliance Datapack/data/do2/structures/config.mc.l3.nbt delete mode 100644 Brilliance Datapack/data/do2/structures/config.mc.l3_no_zones.nbt diff --git a/Brilliance Datapack/TODO.md b/Brilliance Datapack/TODO.md index 47ae4f84..8ac5e4a1 100644 --- a/Brilliance Datapack/TODO.md +++ b/Brilliance Datapack/TODO.md @@ -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 diff --git a/Brilliance Datapack/data/do2/functions/dev/markers/controller.mcfunction b/Brilliance Datapack/data/do2/functions/dev/markers/controller.mcfunction deleted file mode 100644 index e786734e..00000000 --- a/Brilliance Datapack/data/do2/functions/dev/markers/controller.mcfunction +++ /dev/null @@ -1,88 +0,0 @@ -# NOTE: no longer used, now Mob Controller level selector has this functionality. -# Leaving this file here JIC, will remove at end. - - -# L1Z1 = red -# L1Z2 = green -# L1Z3 = gold -# L1Z4 = gray -# L1Z5 = light_purple -# -# L2Z1 = dark_aqua -# L2Z2 = yellow -# L2Z3 = dark_blue -# L2Z4 = dark_red -# L2Z5 = black -# -# L3Z1 = dark_green -# L3Z3 = dark_gray -# L3Z3 = blue -# -# L4Z1 = dark_purple -# L4Z3 = white -# L4Z3 = aqua -# -# - -# - LEVEL 1 - -# L1Z1 -execute if block -625 57 2020 minecraft:lever[powered=true] as @e[type=marker,tag=L1Z1] unless entity @s[tag=frustrated_visible] at @s run function do2:dev/markers/turn_visible/l1z1 -execute if block -625 57 2020 minecraft:lever[powered=false] if entity @e[tag=frustrated_visible,tag=L1Z1] run function do2:dev/markers/turn_invisible/l1z1 -# L1Z2 -execute if block -625 57 2019 minecraft:lever[powered=true] as @e[type=marker,tag=L1Z2] unless entity @s[tag=frustrated_visible] at @s run function do2:dev/markers/turn_visible/l1z2 -execute if block -625 57 2019 minecraft:lever[powered=false] if entity @e[tag=frustrated_visible,tag=L1Z2] run function do2:dev/markers/turn_invisible/l1z2 -# L1Z3 -execute if block -625 57 2018 minecraft:lever[powered=true] as @e[type=marker,tag=L1Z3] unless entity @s[tag=frustrated_visible] at @s run function do2:dev/markers/turn_visible/l1z3 -execute if block -625 57 2018 minecraft:lever[powered=false] if entity @e[tag=frustrated_visible,tag=L1Z3] run function do2:dev/markers/turn_invisible/l1z3 -# L1Z4 -execute if block -625 57 2017 minecraft:lever[powered=true] as @e[type=marker,tag=L1Z4] unless entity @s[tag=frustrated_visible] at @s run function do2:dev/markers/turn_visible/l1z4 -execute if block -625 57 2017 minecraft:lever[powered=false] if entity @e[tag=frustrated_visible,tag=L1Z4] run function do2:dev/markers/turn_invisible/l1z4 -# L1Z5 -execute if block -625 57 2016 minecraft:lever[powered=true] as @e[type=marker,tag=L1Z5] unless entity @s[tag=frustrated_visible] at @s run function do2:dev/markers/turn_visible/l1z5 -execute if block -625 57 2016 minecraft:lever[powered=false] if entity @e[tag=frustrated_visible,tag=L1Z5] run function do2:dev/markers/turn_invisible/l1z5 - -# - LEVEL 2 - -# L2Z1 -execute if block -625 57 2014 minecraft:lever[powered=true] as @e[type=marker,tag=L2Z1] unless entity @s[tag=frustrated_visible] at @s run function do2:dev/markers/turn_visible/l2z1 -execute if block -625 57 2014 minecraft:lever[powered=false] if entity @e[tag=frustrated_visible,tag=L2Z1] run function do2:dev/markers/turn_invisible/l2z1 -# L2Z2 -execute if block -625 57 2013 minecraft:lever[powered=true] as @e[type=marker,tag=L2Z2] unless entity @s[tag=frustrated_visible] at @s run function do2:dev/markers/turn_visible/l2z2 -execute if block -625 57 2013 minecraft:lever[powered=false] if entity @e[tag=frustrated_visible,tag=L2Z2] run function do2:dev/markers/turn_invisible/l2z2 -# L2Z3 -execute if block -625 57 2012 minecraft:lever[powered=true] as @e[type=marker,tag=L2Z3] unless entity @s[tag=frustrated_visible] at @s run function do2:dev/markers/turn_visible/l2z3 -execute if block -625 57 2012 minecraft:lever[powered=false] if entity @e[tag=frustrated_visible,tag=L2Z3] run function do2:dev/markers/turn_invisible/l2z3 -# L2Z4 -execute if block -625 57 2011 minecraft:lever[powered=true] as @e[type=marker,tag=L2Z4] unless entity @s[tag=frustrated_visible] at @s run function do2:dev/markers/turn_visible/l2z4 -execute if block -625 57 2011 minecraft:lever[powered=false] if entity @e[tag=frustrated_visible,tag=L2Z4] run function do2:dev/markers/turn_invisible/l2z4 -# L2Z5 -execute if block -625 57 2010 minecraft:lever[powered=true] as @e[type=marker,tag=L2Z5] unless entity @s[tag=frustrated_visible] at @s run function do2:dev/markers/turn_visible/l2z5 -execute if block -625 57 2010 minecraft:lever[powered=false] if entity @e[tag=frustrated_visible,tag=L2Z5] run function do2:dev/markers/turn_invisible/l2z5 -# L2WILLIE -execute if block -625 57 2009 minecraft:lever[powered=true] as @e[type=marker,tag=L2WILLIE] unless entity @s[tag=frustrated_visible] at @s run function do2:dev/markers/turn_visible/l2willie -execute if block -625 57 2009 minecraft:lever[powered=false] if entity @e[tag=frustrated_visible,tag=L2WILLIE] run function do2:dev/markers/turn_invisible/l2willie - -# - LEVEL 3 - -# L3Z1 -execute if block -625 57 2007 minecraft:lever[powered=true] as @e[type=marker,tag=L3Z1] unless entity @s[tag=frustrated_visible] at @s run function do2:dev/markers/turn_visible/l3z1 -execute if block -625 57 2007 minecraft:lever[powered=false] if entity @e[tag=frustrated_visible,tag=L3Z1] run function do2:dev/markers/turn_invisible/l3z1 -# L3Z2 -execute if block -625 57 2006 minecraft:lever[powered=true] as @e[type=marker,tag=L3Z2] unless entity @s[tag=frustrated_visible] at @s run function do2:dev/markers/turn_visible/l3z2 -execute if block -625 57 2006 minecraft:lever[powered=false] if entity @e[tag=frustrated_visible,tag=L3Z2] run function do2:dev/markers/turn_invisible/l3z2 -# L3Z3 -execute if block -625 57 2005 minecraft:lever[powered=true] as @e[type=marker,tag=L3Z3] unless entity @s[tag=frustrated_visible] at @s run function do2:dev/markers/turn_visible/l3z3 -execute if block -625 57 2005 minecraft:lever[powered=false] if entity @e[tag=frustrated_visible,tag=L3Z3] run function do2:dev/markers/turn_invisible/l3z3 - -# - LEVEL 4 - -# L4Z1 -execute if block -625 57 2003 minecraft:lever[powered=true] as @e[type=marker,tag=L4Z1] unless entity @s[tag=frustrated_visible] at @s run function do2:dev/markers/turn_visible/l4z1 -execute if block -625 57 2003 minecraft:lever[powered=false] if entity @e[tag=frustrated_visible,tag=L4Z1] run function do2:dev/markers/turn_invisible/l4z1 -# L4Z2 -execute if block -625 57 2002 minecraft:lever[powered=true] as @e[type=marker,tag=L4Z2] unless entity @s[tag=frustrated_visible] at @s run function do2:dev/markers/turn_visible/l4z2 -execute if block -625 57 2002 minecraft:lever[powered=false] if entity @e[tag=frustrated_visible,tag=L4Z2] run function do2:dev/markers/turn_invisible/l4z2 -# L4Z3 -execute if block -625 57 2001 minecraft:lever[powered=true] as @e[type=marker,tag=L4Z3] unless entity @s[tag=frustrated_visible] at @s run function do2:dev/markers/turn_visible/l4z3 -execute if block -625 57 2001 minecraft:lever[powered=false] if entity @e[tag=frustrated_visible,tag=L4Z3] run function do2:dev/markers/turn_invisible/l4z3 - -# FISH MARKERS -execute if block -625 57 1999 minecraft:lever[powered=true] as @e[type=marker,tag=fish_marker] unless entity @s[tag=frustrated_visible] at @s run function do2:dev/markers/turn_visible/fish_marker -execute if block -625 57 1999 minecraft:lever[powered=false] if entity @e[tag=frustrated_visible,tag=fish_marker] run function do2:dev/markers/turn_invisible/fish_marker diff --git a/Brilliance Datapack/data/do2/functions/dev/markers/edit_markers/spawn_eggs.mcfunction b/Brilliance Datapack/data/do2/functions/dev/markers/spawn_eggs.mcfunction similarity index 100% rename from Brilliance Datapack/data/do2/functions/dev/markers/edit_markers/spawn_eggs.mcfunction rename to Brilliance Datapack/data/do2/functions/dev/markers/spawn_eggs.mcfunction diff --git a/Brilliance Datapack/data/do2/functions/dev/markers/edit_markers/summon_markers.mcfunction b/Brilliance Datapack/data/do2/functions/dev/markers/summon_markers.mcfunction similarity index 100% rename from Brilliance Datapack/data/do2/functions/dev/markers/edit_markers/summon_markers.mcfunction rename to Brilliance Datapack/data/do2/functions/dev/markers/summon_markers.mcfunction diff --git a/Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/all.mcfunction b/Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/all.mcfunction deleted file mode 100644 index 474ffb7e..00000000 --- a/Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/all.mcfunction +++ /dev/null @@ -1,18 +0,0 @@ -function do2:dev/markers/turn_invisible/fish_marker -function do2:dev/markers/turn_invisible/l1z1 -function do2:dev/markers/turn_invisible/l1z2 -function do2:dev/markers/turn_invisible/l1z3 -function do2:dev/markers/turn_invisible/l1z4 -function do2:dev/markers/turn_invisible/l1z5 -function do2:dev/markers/turn_invisible/l2z1 -function do2:dev/markers/turn_invisible/l2z2 -function do2:dev/markers/turn_invisible/l2z3 -function do2:dev/markers/turn_invisible/l2z4 -function do2:dev/markers/turn_invisible/l2z5 -function do2:dev/markers/turn_invisible/l2willie -function do2:dev/markers/turn_invisible/l3z1 -function do2:dev/markers/turn_invisible/l3z2 -function do2:dev/markers/turn_invisible/l3z3 -function do2:dev/markers/turn_invisible/l4z1 -function do2:dev/markers/turn_invisible/l4z2 -function do2:dev/markers/turn_invisible/l4z3 diff --git a/Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/fish_marker.mcfunction b/Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/fish_marker.mcfunction deleted file mode 100644 index a1e14c29..00000000 --- a/Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/fish_marker.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -kill @e[type=minecraft:armor_stand,tag=fish_marker] -execute as @e[type=minecraft:marker,tag=frustrated_visible,tag=fish_marker] run tag @s remove frustrated_visible -team remove fish_marker diff --git a/Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/l1z1.mcfunction b/Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/l1z1.mcfunction deleted file mode 100644 index c88b6828..00000000 --- a/Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/l1z1.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -kill @e[type=minecraft:armor_stand,tag=zone_marker,tag=L1Z1] -execute as @e[type=minecraft:marker,tag=zone_marker,tag=frustrated_visible,tag=L1Z1] run tag @s remove frustrated_visible -team remove L1Z1 diff --git a/Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/l1z2.mcfunction b/Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/l1z2.mcfunction deleted file mode 100644 index 63935640..00000000 --- a/Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/l1z2.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -kill @e[type=minecraft:armor_stand,tag=zone_marker,tag=L1Z2] -execute as @e[type=minecraft:marker,tag=zone_marker,tag=frustrated_visible,tag=L1Z2] run tag @s remove frustrated_visible -team remove L1Z2 diff --git a/Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/l1z3.mcfunction b/Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/l1z3.mcfunction deleted file mode 100644 index 9fe3afaa..00000000 --- a/Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/l1z3.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -kill @e[type=minecraft:armor_stand,tag=zone_marker,tag=L1Z3] -execute as @e[type=minecraft:marker,tag=zone_marker,tag=frustrated_visible,tag=L1Z3] run tag @s remove frustrated_visible -team remove L1Z3 diff --git a/Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/l1z4.mcfunction b/Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/l1z4.mcfunction deleted file mode 100644 index 96327eda..00000000 --- a/Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/l1z4.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -kill @e[type=minecraft:armor_stand,tag=zone_marker,tag=L1Z4] -execute as @e[type=minecraft:marker,tag=zone_marker,tag=frustrated_visible,tag=L1Z4] run tag @s remove frustrated_visible -team remove L1Z4 diff --git a/Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/l1z5.mcfunction b/Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/l1z5.mcfunction deleted file mode 100644 index 543f465a..00000000 --- a/Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/l1z5.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -kill @e[type=minecraft:armor_stand,tag=zone_marker,tag=L1Z5] -execute as @e[type=minecraft:marker,tag=zone_marker,tag=frustrated_visible,tag=L1Z5] run tag @s remove frustrated_visible -team remove L1Z5 diff --git a/Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/l2willie.mcfunction b/Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/l2willie.mcfunction deleted file mode 100644 index c77e1f8e..00000000 --- a/Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/l2willie.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -kill @e[type=minecraft:armor_stand,tag=zone_marker,tag=L2WILLIE] -execute as @e[type=minecraft:marker,tag=zone_marker,tag=frustrated_visible,tag=L2WILLIE] run tag @s remove frustrated_visible -team remove L2WILLIE diff --git a/Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/l2z1.mcfunction b/Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/l2z1.mcfunction deleted file mode 100644 index c61c9a52..00000000 --- a/Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/l2z1.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -kill @e[type=minecraft:armor_stand,tag=zone_marker,tag=L2Z1] -execute as @e[type=minecraft:marker,tag=zone_marker,tag=frustrated_visible,tag=L2Z1] run tag @s remove frustrated_visible -team remove L2Z1 diff --git a/Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/l2z2.mcfunction b/Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/l2z2.mcfunction deleted file mode 100644 index 6a731591..00000000 --- a/Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/l2z2.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -kill @e[type=minecraft:armor_stand,tag=zone_marker,tag=L2Z2] -execute as @e[type=minecraft:marker,tag=zone_marker,tag=frustrated_visible,tag=L2Z2] run tag @s remove frustrated_visible -team remove L2Z2 diff --git a/Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/l2z3.mcfunction b/Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/l2z3.mcfunction deleted file mode 100644 index 4ae17705..00000000 --- a/Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/l2z3.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -kill @e[type=minecraft:armor_stand,tag=zone_marker,tag=L2Z3] -execute as @e[type=minecraft:marker,tag=zone_marker,tag=frustrated_visible,tag=L2Z3] run tag @s remove frustrated_visible -team remove L2Z3 diff --git a/Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/l2z4.mcfunction b/Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/l2z4.mcfunction deleted file mode 100644 index d9ac255e..00000000 --- a/Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/l2z4.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -kill @e[type=minecraft:armor_stand,tag=zone_marker,tag=L2Z4] -execute as @e[type=minecraft:marker,tag=zone_marker,tag=frustrated_visible,tag=L2Z4] run tag @s remove frustrated_visible -team remove L2Z4 diff --git a/Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/l2z5.mcfunction b/Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/l2z5.mcfunction deleted file mode 100644 index 224b8da0..00000000 --- a/Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/l2z5.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -kill @e[type=minecraft:armor_stand,tag=zone_marker,tag=L2Z5] -execute as @e[type=minecraft:marker,tag=zone_marker,tag=frustrated_visible,tag=L2Z5] run tag @s remove frustrated_visible -team remove L2Z5 diff --git a/Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/l3z1.mcfunction b/Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/l3z1.mcfunction deleted file mode 100644 index 1c3a2994..00000000 --- a/Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/l3z1.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -kill @e[type=minecraft:armor_stand,tag=zone_marker,tag=L3Z1] -execute as @e[type=minecraft:marker,tag=zone_marker,tag=frustrated_visible,tag=L3Z1] run tag @s remove frustrated_visible -team remove L3Z1 diff --git a/Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/l3z2.mcfunction b/Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/l3z2.mcfunction deleted file mode 100644 index 290e6afd..00000000 --- a/Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/l3z2.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -kill @e[type=minecraft:armor_stand,tag=zone_marker,tag=L3Z2] -execute as @e[type=minecraft:marker,tag=zone_marker,tag=frustrated_visible,tag=L3Z2] run tag @s remove frustrated_visible -team remove L3Z2 diff --git a/Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/l3z3.mcfunction b/Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/l3z3.mcfunction deleted file mode 100644 index 243a2fe8..00000000 --- a/Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/l3z3.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -kill @e[type=minecraft:armor_stand,tag=zone_marker,tag=L3Z3] -execute as @e[type=minecraft:marker,tag=zone_marker,tag=frustrated_visible,tag=L3Z3] run tag @s remove frustrated_visible -team remove L3Z3 diff --git a/Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/l4z1.mcfunction b/Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/l4z1.mcfunction deleted file mode 100644 index 8d770dfb..00000000 --- a/Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/l4z1.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -kill @e[type=minecraft:armor_stand,tag=zone_marker,tag=L4Z1] -execute as @e[type=minecraft:marker,tag=zone_marker,tag=frustrated_visible,tag=L4Z1] run tag @s remove frustrated_visible -team remove L4Z1 diff --git a/Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/l4z2.mcfunction b/Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/l4z2.mcfunction deleted file mode 100644 index 32366357..00000000 --- a/Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/l4z2.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -kill @e[type=minecraft:armor_stand,tag=zone_marker,tag=L4Z2] -execute as @e[type=minecraft:marker,tag=zone_marker,tag=frustrated_visible,tag=L4Z2] run tag @s remove frustrated_visible -team remove L4Z2 diff --git a/Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/l4z3.mcfunction b/Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/l4z3.mcfunction deleted file mode 100644 index 18f6c2d3..00000000 --- a/Brilliance Datapack/data/do2/functions/dev/markers/turn_invisible/l4z3.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -kill @e[type=minecraft:armor_stand,tag=zone_marker,tag=L4Z3] -execute as @e[type=minecraft:marker,tag=zone_marker,tag=frustrated_visible,tag=L4Z3] run tag @s remove frustrated_visible -team remove L4Z3 diff --git a/Brilliance Datapack/data/do2/functions/dungeon_setup/all.mcfunction b/Brilliance Datapack/data/do2/functions/dungeon_setup/all.mcfunction index 79f8bfac..f3d66797 100644 --- a/Brilliance Datapack/data/do2/functions/dungeon_setup/all.mcfunction +++ b/Brilliance Datapack/data/do2/functions/dungeon_setup/all.mcfunction @@ -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 diff --git a/Brilliance Datapack/data/do2/functions/dungeon_setup/summon/no_zones/summon_training_markers.mcfunction b/Brilliance Datapack/data/do2/functions/dungeon_setup/summon/no_zones/summon_training_markers.mcfunction index b79ee32d..77e25130 100644 --- a/Brilliance Datapack/data/do2/functions/dungeon_setup/summon/no_zones/summon_training_markers.mcfunction +++ b/Brilliance Datapack/data/do2/functions/dungeon_setup/summon/no_zones/summon_training_markers.mcfunction @@ -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"]} diff --git a/Brilliance Datapack/data/do2/functions/dungeon_setup/summon/other_killers.mcfunction b/Brilliance Datapack/data/do2/functions/dungeon_setup/summon/other_killers.mcfunction index eba849d8..61dc03eb 100644 --- a/Brilliance Datapack/data/do2/functions/dungeon_setup/summon/other_killers.mcfunction +++ b/Brilliance Datapack/data/do2/functions/dungeon_setup/summon/other_killers.mcfunction @@ -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 diff --git a/Brilliance Datapack/data/do2/functions/dungeon_setup/summon/summon_markers.mcfunction b/Brilliance Datapack/data/do2/functions/dungeon_setup/summon/summon_markers.mcfunction index d2d3e97c..1e624f2b 100644 --- a/Brilliance Datapack/data/do2/functions/dungeon_setup/summon/summon_markers.mcfunction +++ b/Brilliance Datapack/data/do2/functions/dungeon_setup/summon/summon_markers.mcfunction @@ -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 diff --git a/Brilliance Datapack/data/do2/functions/dungeon_setup/summon/summon_other_killers.mcfunction b/Brilliance Datapack/data/do2/functions/dungeon_setup/summon/summon_other_killers.mcfunction index 29ca45f8..9f40a09b 100644 --- a/Brilliance Datapack/data/do2/functions/dungeon_setup/summon/summon_other_killers.mcfunction +++ b/Brilliance Datapack/data/do2/functions/dungeon_setup/summon/summon_other_killers.mcfunction @@ -1,5 +1,5 @@ # - 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 @@ -7,7 +7,7 @@ execute at @e[type=marker,tag=L2WILLIE,limit=1,sort=random] run summon minecraft # 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 - diff --git a/Brilliance Datapack/data/do2/functions/dungeon_setup/test_for_other_killers.mcfunction b/Brilliance Datapack/data/do2/functions/dungeon_setup/test_for_other_killers.mcfunction index 0665041a..079821ee 100644 --- a/Brilliance Datapack/data/do2/functions/dungeon_setup/test_for_other_killers.mcfunction +++ b/Brilliance Datapack/data/do2/functions/dungeon_setup/test_for_other_killers.mcfunction @@ -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 - @@ -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 diff --git a/Brilliance Datapack/data/do2/functions/dungeon_setup/test_for_ravagers.mcfunction b/Brilliance Datapack/data/do2/functions/dungeon_setup/test_for_ravagers.mcfunction index fad08d5f..5ab1b1f3 100644 --- a/Brilliance Datapack/data/do2/functions/dungeon_setup/test_for_ravagers.mcfunction +++ b/Brilliance Datapack/data/do2/functions/dungeon_setup/test_for_ravagers.mcfunction @@ -3,7 +3,7 @@ execute as @a[scores={do2.logs.dungeon_setup=4..}] run tellraw @s ["",{"text":"[ # - End Log - # Ravager named 'Stumbles' should be tagged with L1Z1 -# Ravager named 'Laser Beams' should be tagged with L1Z2 +# Ravager named 'Laser Beams!' should be tagged with L1Z2 # Ravager named 'Lasagna' should be tagged with L1Z3 # Ravager named 'Hot Breath' should be tagged with L1Z4 # Ravager named 'Mr. Poopy Head' should be tagged with L1Z5 diff --git a/Brilliance Datapack/data/do2/functions/events/on_datapack_tick.mcfunction b/Brilliance Datapack/data/do2/functions/events/on_datapack_tick.mcfunction index de096c8c..af695126 100644 --- a/Brilliance Datapack/data/do2/functions/events/on_datapack_tick.mcfunction +++ b/Brilliance Datapack/data/do2/functions/events/on_datapack_tick.mcfunction @@ -42,8 +42,5 @@ function do2:scoreboard/triggers/checks # Run the mob controller panel function do2:mob_controller/run_per_tick -# Summon Dev Markers -#function do2:dev/markers/edit_markers/summon_markers - # Statistics function do2:statistics_room/on_tick diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/add_mob_names/add_name_to_list.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/add_mob_names/add_name_to_list.mcfunction index d62bbef4..17a51952 100644 --- a/Brilliance Datapack/data/do2/functions/mob_controller/add_mob_names/add_name_to_list.mcfunction +++ b/Brilliance Datapack/data/do2/functions/mob_controller/add_mob_names/add_name_to_list.mcfunction @@ -2,6 +2,11 @@ execute unless data storage do2:mobs preset_names[0] run function do2:mob_controller/add_mob_names/add_numbered_name execute unless data storage do2:mobs preset_names[0] run return 0 +# Copy list_of_names -> preset_names +execute if score $dungeon do2.utility.mc.mobGenerationType matches 1 run data modify storage do2:mobs preset_names set from storage do2:mobs preset_ravager_names +execute if score $dungeon do2.utility.mc.mobGenerationType matches 2 run data modify storage do2:mobs preset_names set from storage do2:mobs preset_warden_names +execute if score $dungeon do2.utility.mc.mobGenerationType matches 3 run data modify storage do2:mobs preset_names set from storage do2:mobs preset_drowned_names + # Generate a random number, Min = 0, Max = Amount of names in the list execute store result score $dungeon do2.utility.randomNumberRange run data get storage do2:mobs preset_names function do2:random_gen/generate_random_number @@ -23,6 +28,11 @@ scoreboard players operation $dungeon do2.tests.arrayIndex = $dungeon do2.utilit function do2:mob_controller/array_manipulation/splice_from_index data modify storage do2:mobs preset_names set from storage do2:tests newArray +# Copy preset_names -> list_of_names +execute if score $dungeon do2.utility.mc.mobGenerationType matches 1 run data modify storage do2:mobs preset_ravager_names set from storage do2:mobs preset_names +execute if score $dungeon do2.utility.mc.mobGenerationType matches 2 run data modify storage do2:mobs preset_warden_names set from storage do2:mobs preset_names +execute if score $dungeon do2.utility.mc.mobGenerationType matches 3 run data modify storage do2:mobs preset_drowned_names set from storage do2:mobs preset_names + # If there STILL isn't enough mobNames for the amount of names needed, loop this function. execute if score $dungeon do2.utility.mc.mobNamesCount < $l1z1 do2.config.mc.levelZoneMobCount run function do2:mob_controller/add_mob_names/ravager_add_name_to_list diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/add_mob_names/drowned_names.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/add_mob_names/drowned_names.mcfunction index a418053f..1c4e34b3 100644 --- a/Brilliance Datapack/data/do2/functions/mob_controller/add_mob_names/drowned_names.mcfunction +++ b/Brilliance Datapack/data/do2/functions/mob_controller/add_mob_names/drowned_names.mcfunction @@ -1 +1 @@ -data modify storage do2:mobs preset_names set value ['{"text":"One Eyed Willie"}'] +data modify storage do2:mobs preset_drowned_names set value ['{"text":"One Eyed Willie"}'] diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/add_mob_names/ravager_names.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/add_mob_names/ravager_names.mcfunction index b7e900f4..2b97a4b9 100644 --- a/Brilliance Datapack/data/do2/functions/mob_controller/add_mob_names/ravager_names.mcfunction +++ b/Brilliance Datapack/data/do2/functions/mob_controller/add_mob_names/ravager_names.mcfunction @@ -1 +1 @@ -data modify storage do2:mobs preset_names set value ['{"text":"Lasagna"}','{"text":"Laser Beams!"}','{"text":"Meatball"}','{"text":"Snausages"}','{"text":"Greed"}','{"text":"MrsTango"}','{"text":"Beast #002"}','{"text":"Skill Issue"}','{"text":"Nugget"}','{"text":"Taco"}','{"text":"Hugs and Kisses"}','{"text":"Bad Luck. No really...it was bad luck"}','{"text":"Beast #007"}','{"text":"Pumpkin"}','{"text":"Poor Life Choices"}','{"text":"Jellie"}','{"text":"Hot Breath"}','{"text":"Tango\\\'s Cough"}','{"text":"Beast #003"}','{"text":"Unknown Ravager"}','{"text":"Stumbles"}','{"text":"Shracker"}','{"text":"Beast #004"}','{"text":"Froomkins"}','{"text":"big butts and I cannot lie"}','{"text":"Commander Drool"}','{"text":"Jimmy Jingles"}','{"text":"Deadly Blueberries"}','{"text":"Tinkers"}','{"text":"Flubsy Skadeedles"}','{"text":"Waffles"}','{"text":"Ladders"}','{"text":"Doughnuts"}','{"text":"Wubsy"}','{"text":"Munchies"}','{"text":"Miss Management"}','{"text":"Beast #025"}','{"text":"Sir Fluffykins of the Dungeon"}','{"text":"Skadoodles"}','{"text":"Beast #029"}','{"text":"Dunga Dunga Dunga"}','{"text":"Captain Snoodle Pants"}','{"text":"Mr. Poopy Head"}','{"text":"Trolly McTrollface"}'] +data modify storage do2:mobs preset_ravager_names set value ['{"text":"Lasagna"}','{"text":"Laser Beams!"}','{"text":"Meatball"}','{"text":"Snausages"}','{"text":"Greed"}','{"text":"MrsTango"}','{"text":"Beast #002"}','{"text":"Skill Issue"}','{"text":"Nugget"}','{"text":"Taco"}','{"text":"Hugs and Kisses"}','{"text":"Bad Luck. No really...it was bad luck"}','{"text":"Beast #007"}','{"text":"Pumpkin"}','{"text":"Poor Life Choices"}','{"text":"Jellie"}','{"text":"Hot Breath"}','{"text":"Tango\\\'s Cough"}','{"text":"Beast #003"}','{"text":"Unknown Ravager"}','{"text":"Stumbles"}','{"text":"Shracker"}','{"text":"Beast #004"}','{"text":"Froomkins"}','{"text":"big butts and I cannot lie"}','{"text":"Commander Drool"}','{"text":"Jimmy Jingles"}','{"text":"Deadly Blueberries"}','{"text":"Tinkers"}','{"text":"Flubsy Skadeedles"}','{"text":"Waffles"}','{"text":"Ladders"}','{"text":"Doughnuts"}','{"text":"Wubsy"}','{"text":"Munchies"}','{"text":"Miss Management"}','{"text":"Beast #025"}','{"text":"Sir Fluffykins of the Dungeon"}','{"text":"Skadoodles"}','{"text":"Beast #029"}','{"text":"Dunga Dunga Dunga"}','{"text":"Captain Snoodle Pants"}','{"text":"Mr. Poopy Head"}','{"text":"Trolly McTrollface"}'] diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/add_mob_names/warden_names.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/add_mob_names/warden_names.mcfunction index c03d317e..d6542a49 100644 --- a/Brilliance Datapack/data/do2/functions/mob_controller/add_mob_names/warden_names.mcfunction +++ b/Brilliance Datapack/data/do2/functions/mob_controller/add_mob_names/warden_names.mcfunction @@ -1 +1 @@ -data modify storage do2:mobs preset_names set value ['{"text":"Pain"}','{"text":"Panic"}','{"text":"Pancakes"}','{"text":"Inky"}','{"text":"Blinky"}','{"text":"Pinky"}'] +data modify storage do2:mobs preset_warden_names set value ['{"text":"Pain"}','{"text":"Panic"}','{"text":"Pancakes"}','{"text":"Inky"}','{"text":"Blinky"}','{"text":"Pinky"}'] diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/generate_mobs.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/generate_mobs.mcfunction index 1f7ddc06..8bc832ff 100644 --- a/Brilliance Datapack/data/do2/functions/mob_controller/generate_mobs.mcfunction +++ b/Brilliance Datapack/data/do2/functions/mob_controller/generate_mobs.mcfunction @@ -3,6 +3,8 @@ function do2:mob_controller/save_storages function do2:mob_controller/get_mob_count/count_mobs function do2:mob_controller/get_mob_names/get_mob_names function do2:mob_controller/add_mob_names/ravager_names +function do2:mob_controller/add_mob_names/warden_names +function do2:mob_controller/add_mob_names/drowned_names scoreboard players set $dungeon do2.utility.mc.collectingLogs 1 data modify storage do2:mobs mobCountErrors set value [] data modify storage do2:mobs mobNameCountErrors set value [] @@ -37,7 +39,6 @@ kill @e[type=drowned,tag=L2WILLY] # L0 function do2:mob_controller/generate_mobs/zones/l0z1 function do2:mob_controller/generate_mobs/zones/l0z2 -function do2:mob_controller/generate_mobs/zones/l2willie # L1 @@ -55,6 +56,8 @@ function do2:mob_controller/generate_mobs/zones/l2z3 execute if score $dungeon do2.config.mc.level2Zones matches 0 run function do2:mob_controller/generate_mobs/zones/l2z4 execute if score $dungeon do2.config.mc.level2Zones matches 0 run function do2:mob_controller/generate_mobs/zones/l2z5 +# L2_other +function do2:mob_controller/generate_mobs/zones/l2willie # L3 function do2:mob_controller/generate_mobs/zones/l3z1 diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/generate_mobs/log_mob_name_count_errors.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/generate_mobs/log_mob_name_count_errors.mcfunction index 448cdbef..aae415d7 100644 --- a/Brilliance Datapack/data/do2/functions/mob_controller/generate_mobs/log_mob_name_count_errors.mcfunction +++ b/Brilliance Datapack/data/do2/functions/mob_controller/generate_mobs/log_mob_name_count_errors.mcfunction @@ -1,8 +1,8 @@ execute store result score $dungeon do2.utility.mc.collectingLogs run data get storage do2:mobs mobNameCountErrors execute if score $dungeon do2.utility.mc.collectingLogs matches ..0 run return 0 -execute if score $dungeon do2.utility.mc.collectingLogs matches 1 as @a[scores={do2.logs.dungeon_setup=3..}] run tellraw @s ["",{"text":"[§9B§r]: "},{"storage": "do2:mobs","nbt": "mobCountErrors[0]"},{"text":"'s mob name count is empty. Mobs' names will be randomly generated in this zone."}] +execute if score $dungeon do2.utility.mc.collectingLogs matches 1 as @a[scores={do2.logs.dungeon_setup=3..}] run tellraw @s ["",{"text":"[§9B§r]: "},{"storage": "do2:mobs","nbt": "mobNameCountErrors[0]"},{"text":"'s mob name count is empty. Mobs' names will be randomly generated in this zone."}] execute if score $dungeon do2.utility.mc.collectingLogs matches 1 run return 0 # Check log_mob_count_errors for comment. -execute as @a[scores={do2.logs.dungeon_setup=3..}] run tellraw @s ["",{"text":"[§9B§r]: Multiple zones' mob names count is empty. Will add randomly generated names in "},{"score":{"name":"$dungeon","objective":"do2.utility.mc.collectingLogs"},"color":"aqua"},{"text":"§r zones. ("},{"text":" ? ","color":"dark_red","hoverEvent":{"action":"show_text","contents":["",{"storage": "do2:mobs","nbt": "mobCountErrors"}]}},{"text":")"}] +execute as @a[scores={do2.logs.dungeon_setup=3..}] run tellraw @s ["",{"text":"[§9B§r]: Multiple zones' mob names count is empty. Will add randomly generated names in "},{"score":{"name":"$dungeon","objective":"do2.utility.mc.collectingLogs"},"color":"aqua"},{"text":"§r zones. ("},{"text":" ? ","color":"dark_red","hoverEvent":{"action":"show_text","contents":["",{"storage": "do2:mobs","nbt": "mobNameCountErrors"}]}},{"text":")"}] diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/generate_mobs/zones/l0z1.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/generate_mobs/zones/l0z1.mcfunction index 3008b92f..695615de 100644 --- a/Brilliance Datapack/data/do2/functions/mob_controller/generate_mobs/zones/l0z1.mcfunction +++ b/Brilliance Datapack/data/do2/functions/mob_controller/generate_mobs/zones/l0z1.mcfunction @@ -12,7 +12,7 @@ execute if score $l0z1 do2.config.mc.levelZoneMobCount matches ..0 run scoreboar # Check for sufficient mob NAMES execute if score $dungeon do2.utility.mc.mobNamesCount < $l0z1 do2.config.mc.levelZoneMobCount if score $dungeon do2.utility.mc.collectingLogs matches 1 run data modify storage do2:mobs mobNameCountErrors append value 'L0Z1' execute if score $dungeon do2.utility.mc.mobNamesCount < $l0z1 do2.config.mc.levelZoneMobCount if score $dungeon do2.utility.mc.collectingLogs matches 0 as @a[scores={do2.logs.dungeon_setup=3..}] run tellraw @s ["",{"text":"[§9B§r]: Not enough L0Z1's mob names for L0Z1's mob count. Adding random names to fix."}] -execute if score $dungeon do2.utility.mc.mobNamesCount < $l0z1 do2.config.mc.levelZoneMobCount run function do2:mob_controller/add_mob_names/ravager_add_name_to_list +execute if score $dungeon do2.utility.mc.mobNamesCount < $l0z1 do2.config.mc.levelZoneMobCount run function do2:mob_controller/add_mob_names/add_name_to_list # Generate enough mobs. function do2:mob_controller/generate_mobs/generate_enough_mobs @@ -20,4 +20,4 @@ function do2:mob_controller/generate_mobs/generate_enough_mobs # Finish execute as @e[tag=newly_generated_mob] run tp @s @e[type=marker,tag=L0Z1,limit=1,sort=random] execute as @e[tag=newly_generated_mob] run tag @s add L0Z1 -execute as @e[tag=newly_generated_mob] run tag @s remove newly_generated_mob +execute as @e[tag=newly_generated_mob] run tag @s remove newly_generated_mob \ No newline at end of file diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/generate_mobs/zones/l0z2.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/generate_mobs/zones/l0z2.mcfunction index 2bcd6e26..1abab2d0 100644 --- a/Brilliance Datapack/data/do2/functions/mob_controller/generate_mobs/zones/l0z2.mcfunction +++ b/Brilliance Datapack/data/do2/functions/mob_controller/generate_mobs/zones/l0z2.mcfunction @@ -12,7 +12,7 @@ execute if score $l0z2 do2.config.mc.levelZoneMobCount matches ..0 run scoreboar # Check for sufficient mob NAMES execute if score $dungeon do2.utility.mc.mobNamesCount < $l0z2 do2.config.mc.levelZoneMobCount if score $dungeon do2.utility.mc.collectingLogs matches 1 run data modify storage do2:mobs mobNameCountErrors append value 'L0Z2' execute if score $dungeon do2.utility.mc.mobNamesCount < $l0z2 do2.config.mc.levelZoneMobCount if score $dungeon do2.utility.mc.collectingLogs matches 0 as @a[scores={do2.logs.dungeon_setup=3..}] run tellraw @s ["",{"text":"[§9B§r]: Not enough L0Z2's mob names for L0Z2's mob count. Adding random names to fix."}] -execute if score $dungeon do2.utility.mc.mobNamesCount < $l0z2 do2.config.mc.levelZoneMobCount run function do2:mob_controller/add_mob_names/drowned_names +execute if score $dungeon do2.utility.mc.mobNamesCount < $l0z2 do2.config.mc.levelZoneMobCount run function do2:mob_controller/add_mob_names/add_name_to_list # Generate enough mobs. function do2:mob_controller/generate_mobs/generate_enough_mobs @@ -20,4 +20,4 @@ function do2:mob_controller/generate_mobs/generate_enough_mobs # Finish execute as @e[tag=newly_generated_mob] run tp @s @e[type=marker,tag=L0Z2,limit=1,sort=random] execute as @e[tag=newly_generated_mob] run tag @s add L0Z2 -execute as @e[tag=newly_generated_mob] run tag @s remove newly_generated_mob +execute as @e[tag=newly_generated_mob] run tag @s remove newly_generated_mob \ No newline at end of file diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/get_mob_count/backrooms.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/get_mob_count/backrooms.mcfunction index 9c9a15fe..aa0d1074 100644 --- a/Brilliance Datapack/data/do2/functions/mob_controller/get_mob_count/backrooms.mcfunction +++ b/Brilliance Datapack/data/do2/functions/mob_controller/get_mob_count/backrooms.mcfunction @@ -1,6 +1,6 @@ -execute positioned -519 122 1946 run function do2:mob_controller/get_mob_count/count_inside_barrel +execute positioned -518 122 1946 run function do2:mob_controller/get_mob_count/count_inside_barrel scoreboard players operation $l0z1 do2.config.mc.levelZoneMobCount = $dungeon do2.utility.mc.mobCountCounterTotal -execute positioned -519 122 1945 run function do2:mob_controller/get_mob_count/count_inside_barrel +execute positioned -518 122 1945 run function do2:mob_controller/get_mob_count/count_inside_barrel scoreboard players operation $l0z2 do2.config.mc.levelZoneMobCount = $dungeon do2.utility.mc.mobCountCounterTotal -execute positioned -519 122 1943 run function do2:mob_controller/get_mob_count/count_inside_barrel -scoreboard players operation $l2willie do2.config.mc.levelZoneMobCount = $dungeon do2.utility.mc.mobCountCounterTotal +execute positioned -518 122 1943 run function do2:mob_controller/get_mob_count/count_inside_barrel +scoreboard players operation $l0fishies do2.config.mc.levelZoneMobCount = $dungeon do2.utility.mc.mobCountCounterTotal diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/get_mob_count/count_mobs.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/get_mob_count/count_mobs.mcfunction index 293d5ba6..e8493a05 100644 --- a/Brilliance Datapack/data/do2/functions/mob_controller/get_mob_count/count_mobs.mcfunction +++ b/Brilliance Datapack/data/do2/functions/mob_controller/get_mob_count/count_mobs.mcfunction @@ -1,5 +1,6 @@ function do2:mob_controller/get_mob_count/l1 function do2:mob_controller/get_mob_count/l2 +function do2:mob_controller/get_mob_count/l2_other function do2:mob_controller/get_mob_count/l3 function do2:mob_controller/get_mob_count/l4 function do2:mob_controller/get_mob_count/backrooms diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/get_mob_count/l1.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/get_mob_count/l1.mcfunction index 8b9ed6a3..b5116ac0 100644 --- a/Brilliance Datapack/data/do2/functions/mob_controller/get_mob_count/l1.mcfunction +++ b/Brilliance Datapack/data/do2/functions/mob_controller/get_mob_count/l1.mcfunction @@ -1,21 +1,21 @@ # - WITH ZONES - -execute if score $dungeon do2.config.mc.level1Zones matches 1 positioned -527 122 1945 run function do2:mob_controller/get_mob_count/count_inside_barrel +execute if score $dungeon do2.config.mc.level1Zones matches 1 positioned -528 122 1945 run function do2:mob_controller/get_mob_count/count_inside_barrel execute if score $dungeon do2.config.mc.level1Zones matches 1 run scoreboard players operation $l1z1 do2.config.mc.levelZoneMobCount = $dungeon do2.utility.mc.mobCountCounterTotal -execute if score $dungeon do2.config.mc.level1Zones matches 1 positioned -527 122 1944 run function do2:mob_controller/get_mob_count/count_inside_barrel +execute if score $dungeon do2.config.mc.level1Zones matches 1 positioned -528 122 1944 run function do2:mob_controller/get_mob_count/count_inside_barrel execute if score $dungeon do2.config.mc.level1Zones matches 1 run scoreboard players operation $l1z2 do2.config.mc.levelZoneMobCount = $dungeon do2.utility.mc.mobCountCounterTotal -execute if score $dungeon do2.config.mc.level1Zones matches 1 positioned -527 122 1943 run function do2:mob_controller/get_mob_count/count_inside_barrel +execute if score $dungeon do2.config.mc.level1Zones matches 1 positioned -528 122 1943 run function do2:mob_controller/get_mob_count/count_inside_barrel execute if score $dungeon do2.config.mc.level1Zones matches 1 run scoreboard players operation $l1z3 do2.config.mc.levelZoneMobCount = $dungeon do2.utility.mc.mobCountCounterTotal execute if score $dungeon do2.config.mc.level1Zones matches 1 run scoreboard players set $l1z4 do2.config.mc.levelZoneMobCount 0 execute if score $dungeon do2.config.mc.level1Zones matches 1 run scoreboard players set $l1z5 do2.config.mc.levelZoneMobCount 0 # - WITHOUT ZONES - -execute if score $dungeon do2.config.mc.level1Zones matches 0 positioned -527 125 1946 run function do2:mob_controller/get_mob_count/count_inside_barrel +execute if score $dungeon do2.config.mc.level1Zones matches 0 positioned -528 125 1946 run function do2:mob_controller/get_mob_count/count_inside_barrel execute if score $dungeon do2.config.mc.level1Zones matches 0 run scoreboard players operation $l1z1 do2.config.mc.levelZoneMobCount = $dungeon do2.utility.mc.mobCountCounterTotal -execute if score $dungeon do2.config.mc.level1Zones matches 0 positioned -527 125 1945 run function do2:mob_controller/get_mob_count/count_inside_barrel +execute if score $dungeon do2.config.mc.level1Zones matches 0 positioned -528 125 1945 run function do2:mob_controller/get_mob_count/count_inside_barrel execute if score $dungeon do2.config.mc.level1Zones matches 0 run scoreboard players operation $l1z2 do2.config.mc.levelZoneMobCount = $dungeon do2.utility.mc.mobCountCounterTotal -execute if score $dungeon do2.config.mc.level1Zones matches 0 positioned -527 125 1944 run function do2:mob_controller/get_mob_count/count_inside_barrel +execute if score $dungeon do2.config.mc.level1Zones matches 0 positioned -528 125 1944 run function do2:mob_controller/get_mob_count/count_inside_barrel execute if score $dungeon do2.config.mc.level1Zones matches 0 run scoreboard players operation $l1z3 do2.config.mc.levelZoneMobCount = $dungeon do2.utility.mc.mobCountCounterTotal -execute if score $dungeon do2.config.mc.level1Zones matches 0 positioned -527 125 1943 run function do2:mob_controller/get_mob_count/count_inside_barrel +execute if score $dungeon do2.config.mc.level1Zones matches 0 positioned -528 125 1943 run function do2:mob_controller/get_mob_count/count_inside_barrel execute if score $dungeon do2.config.mc.level1Zones matches 0 run scoreboard players operation $l1z4 do2.config.mc.levelZoneMobCount = $dungeon do2.utility.mc.mobCountCounterTotal -execute if score $dungeon do2.config.mc.level1Zones matches 0 positioned -527 125 1942 run function do2:mob_controller/get_mob_count/count_inside_barrel +execute if score $dungeon do2.config.mc.level1Zones matches 0 positioned -528 125 1942 run function do2:mob_controller/get_mob_count/count_inside_barrel execute if score $dungeon do2.config.mc.level1Zones matches 0 run scoreboard players operation $l1z5 do2.config.mc.levelZoneMobCount = $dungeon do2.utility.mc.mobCountCounterTotal diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/get_mob_count/l2.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/get_mob_count/l2.mcfunction index 2edb15f2..38574435 100644 --- a/Brilliance Datapack/data/do2/functions/mob_controller/get_mob_count/l2.mcfunction +++ b/Brilliance Datapack/data/do2/functions/mob_controller/get_mob_count/l2.mcfunction @@ -1,21 +1,21 @@ # - WITH ZONES - -execute if score $dungeon do2.config.mc.level2Zones matches 1 positioned -525 122 1945 run function do2:mob_controller/get_mob_count/count_inside_barrel +execute if score $dungeon do2.config.mc.level2Zones matches 1 positioned -526 122 1945 run function do2:mob_controller/get_mob_count/count_inside_barrel execute if score $dungeon do2.config.mc.level2Zones matches 1 run scoreboard players operation $l2z1 do2.config.mc.levelZoneMobCount = $dungeon do2.utility.mc.mobCountCounterTotal -execute if score $dungeon do2.config.mc.level2Zones matches 1 positioned -525 122 1944 run function do2:mob_controller/get_mob_count/count_inside_barrel +execute if score $dungeon do2.config.mc.level2Zones matches 1 positioned -526 122 1944 run function do2:mob_controller/get_mob_count/count_inside_barrel execute if score $dungeon do2.config.mc.level2Zones matches 1 run scoreboard players operation $l2z2 do2.config.mc.levelZoneMobCount = $dungeon do2.utility.mc.mobCountCounterTotal -execute if score $dungeon do2.config.mc.level2Zones matches 1 positioned -525 122 1943 run function do2:mob_controller/get_mob_count/count_inside_barrel +execute if score $dungeon do2.config.mc.level2Zones matches 1 positioned -526 122 1943 run function do2:mob_controller/get_mob_count/count_inside_barrel execute if score $dungeon do2.config.mc.level2Zones matches 1 run scoreboard players operation $l2z3 do2.config.mc.levelZoneMobCount = $dungeon do2.utility.mc.mobCountCounterTotal execute if score $dungeon do2.config.mc.level2Zones matches 1 run scoreboard players set $l2z4 do2.config.mc.levelZoneMobCount 0 execute if score $dungeon do2.config.mc.level2Zones matches 1 run scoreboard players set $l2z5 do2.config.mc.levelZoneMobCount 0 # - WITHOUT ZONES - -execute if score $dungeon do2.config.mc.level2Zones matches 0 positioned -525 125 1946 run function do2:mob_controller/get_mob_count/count_inside_barrel +execute if score $dungeon do2.config.mc.level2Zones matches 0 positioned -526 125 1946 run function do2:mob_controller/get_mob_count/count_inside_barrel execute if score $dungeon do2.config.mc.level2Zones matches 0 run scoreboard players operation $l2z1 do2.config.mc.levelZoneMobCount = $dungeon do2.utility.mc.mobCountCounterTotal -execute if score $dungeon do2.config.mc.level2Zones matches 0 positioned -525 125 1945 run function do2:mob_controller/get_mob_count/count_inside_barrel +execute if score $dungeon do2.config.mc.level2Zones matches 0 positioned -526 125 1945 run function do2:mob_controller/get_mob_count/count_inside_barrel execute if score $dungeon do2.config.mc.level2Zones matches 0 run scoreboard players operation $l2z2 do2.config.mc.levelZoneMobCount = $dungeon do2.utility.mc.mobCountCounterTotal -execute if score $dungeon do2.config.mc.level2Zones matches 0 positioned -525 125 1944 run function do2:mob_controller/get_mob_count/count_inside_barrel +execute if score $dungeon do2.config.mc.level2Zones matches 0 positioned -526 125 1944 run function do2:mob_controller/get_mob_count/count_inside_barrel execute if score $dungeon do2.config.mc.level2Zones matches 0 run scoreboard players operation $l2z3 do2.config.mc.levelZoneMobCount = $dungeon do2.utility.mc.mobCountCounterTotal -execute if score $dungeon do2.config.mc.level2Zones matches 0 positioned -525 125 1943 run function do2:mob_controller/get_mob_count/count_inside_barrel +execute if score $dungeon do2.config.mc.level2Zones matches 0 positioned -526 125 1943 run function do2:mob_controller/get_mob_count/count_inside_barrel execute if score $dungeon do2.config.mc.level2Zones matches 0 run scoreboard players operation $l2z4 do2.config.mc.levelZoneMobCount = $dungeon do2.utility.mc.mobCountCounterTotal -execute if score $dungeon do2.config.mc.level2Zones matches 0 positioned -525 125 1942 run function do2:mob_controller/get_mob_count/count_inside_barrel +execute if score $dungeon do2.config.mc.level2Zones matches 0 positioned -526 125 1942 run function do2:mob_controller/get_mob_count/count_inside_barrel execute if score $dungeon do2.config.mc.level2Zones matches 0 run scoreboard players operation $l2z5 do2.config.mc.levelZoneMobCount = $dungeon do2.utility.mc.mobCountCounterTotal diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/get_mob_count/l2_other.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/get_mob_count/l2_other.mcfunction new file mode 100644 index 00000000..389bea30 --- /dev/null +++ b/Brilliance Datapack/data/do2/functions/mob_controller/get_mob_count/l2_other.mcfunction @@ -0,0 +1,6 @@ +execute positioned -524 122 1945 run function do2:mob_controller/get_mob_count/count_inside_barrel +scoreboard players operation $l2ghost do2.config.mc.levelZoneMobCount = $dungeon do2.utility.mc.mobCountCounterTotal +execute positioned -524 122 1944 run function do2:mob_controller/get_mob_count/count_inside_barrel +scoreboard players operation $l2willie do2.config.mc.levelZoneMobCount = $dungeon do2.utility.mc.mobCountCounterTotal +execute positioned -524 122 1943 run function do2:mob_controller/get_mob_count/count_inside_barrel +scoreboard players operation $l2mites do2.config.mc.levelZoneMobCount = $dungeon do2.utility.mc.mobCountCounterTotal diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/get_mob_count/l3.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/get_mob_count/l3.mcfunction index ef664305..d145574d 100644 --- a/Brilliance Datapack/data/do2/functions/mob_controller/get_mob_count/l3.mcfunction +++ b/Brilliance Datapack/data/do2/functions/mob_controller/get_mob_count/l3.mcfunction @@ -1,6 +1,6 @@ -execute positioned -523 122 1945 run function do2:mob_controller/get_mob_count/count_inside_barrel +execute positioned -522 122 1945 run function do2:mob_controller/get_mob_count/count_inside_barrel scoreboard players operation $l3z1 do2.config.mc.levelZoneMobCount = $dungeon do2.utility.mc.mobCountCounterTotal -execute positioned -523 122 1944 run function do2:mob_controller/get_mob_count/count_inside_barrel +execute positioned -522 122 1944 run function do2:mob_controller/get_mob_count/count_inside_barrel scoreboard players operation $l3z2 do2.config.mc.levelZoneMobCount = $dungeon do2.utility.mc.mobCountCounterTotal -execute positioned -523 122 1943 run function do2:mob_controller/get_mob_count/count_inside_barrel +execute positioned -522 122 1943 run function do2:mob_controller/get_mob_count/count_inside_barrel scoreboard players operation $l3z3 do2.config.mc.levelZoneMobCount = $dungeon do2.utility.mc.mobCountCounterTotal diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/get_mob_count/l4.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/get_mob_count/l4.mcfunction index afed3647..04163082 100644 --- a/Brilliance Datapack/data/do2/functions/mob_controller/get_mob_count/l4.mcfunction +++ b/Brilliance Datapack/data/do2/functions/mob_controller/get_mob_count/l4.mcfunction @@ -1,15 +1,15 @@ # - WITH ZONES - -execute if score $dungeon do2.config.mc.level4Zones matches 1 positioned -521 122 1945 run function do2:mob_controller/get_mob_count/count_inside_barrel +execute if score $dungeon do2.config.mc.level4Zones matches 1 positioned -520 122 1945 run function do2:mob_controller/get_mob_count/count_inside_barrel execute if score $dungeon do2.config.mc.level4Zones matches 1 run scoreboard players operation $l4z1 do2.config.mc.levelZoneMobCount = $dungeon do2.utility.mc.mobCountCounterTotal -execute if score $dungeon do2.config.mc.level4Zones matches 1 positioned -521 122 1944 run function do2:mob_controller/get_mob_count/count_inside_barrel +execute if score $dungeon do2.config.mc.level4Zones matches 1 positioned -520 122 1944 run function do2:mob_controller/get_mob_count/count_inside_barrel execute if score $dungeon do2.config.mc.level4Zones matches 1 run scoreboard players operation $l4z2 do2.config.mc.levelZoneMobCount = $dungeon do2.utility.mc.mobCountCounterTotal -execute if score $dungeon do2.config.mc.level4Zones matches 1 positioned -521 122 1943 run function do2:mob_controller/get_mob_count/count_inside_barrel +execute if score $dungeon do2.config.mc.level4Zones matches 1 positioned -520 122 1943 run function do2:mob_controller/get_mob_count/count_inside_barrel execute if score $dungeon do2.config.mc.level4Zones matches 1 run scoreboard players operation $l4z3 do2.config.mc.levelZoneMobCount = $dungeon do2.utility.mc.mobCountCounterTotal # - WITHOUT ZONES - -execute if score $dungeon do2.config.mc.level4Zones matches 0 positioned -521 125 1945 run function do2:mob_controller/get_mob_count/count_inside_barrel +execute if score $dungeon do2.config.mc.level4Zones matches 0 positioned -520 125 1945 run function do2:mob_controller/get_mob_count/count_inside_barrel execute if score $dungeon do2.config.mc.level4Zones matches 0 run scoreboard players operation $l4z1 do2.config.mc.levelZoneMobCount = $dungeon do2.utility.mc.mobCountCounterTotal -execute if score $dungeon do2.config.mc.level4Zones matches 0 positioned -521 125 1944 run function do2:mob_controller/get_mob_count/count_inside_barrel +execute if score $dungeon do2.config.mc.level4Zones matches 0 positioned -520 125 1944 run function do2:mob_controller/get_mob_count/count_inside_barrel execute if score $dungeon do2.config.mc.level4Zones matches 0 run scoreboard players operation $l4z2 do2.config.mc.levelZoneMobCount = $dungeon do2.utility.mc.mobCountCounterTotal -execute if score $dungeon do2.config.mc.level4Zones matches 0 positioned -521 125 1943 run function do2:mob_controller/get_mob_count/count_inside_barrel +execute if score $dungeon do2.config.mc.level4Zones matches 0 positioned -520 125 1943 run function do2:mob_controller/get_mob_count/count_inside_barrel execute if score $dungeon do2.config.mc.level4Zones matches 0 run scoreboard players operation $l4z3 do2.config.mc.levelZoneMobCount = $dungeon do2.utility.mc.mobCountCounterTotal diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/get_mob_names/backrooms.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/get_mob_names/backrooms.mcfunction index d4822aba..0c42fc0a 100644 --- a/Brilliance Datapack/data/do2/functions/mob_controller/get_mob_names/backrooms.mcfunction +++ b/Brilliance Datapack/data/do2/functions/mob_controller/get_mob_names/backrooms.mcfunction @@ -1,6 +1,4 @@ -execute positioned -519 123 1946 run function do2:mob_controller/get_mob_names/get_names_from_shulker +execute positioned -518 123 1946 run function do2:mob_controller/get_mob_names/get_names_from_shulker data modify storage do2:mobs level0_zone1 set from storage do2:mobs temp -execute positioned -519 123 1945 run function do2:mob_controller/get_mob_names/get_names_from_shulker +execute positioned -518 123 1945 run function do2:mob_controller/get_mob_names/get_names_from_shulker data modify storage do2:mobs level0_zone2 set from storage do2:mobs temp -execute positioned -519 123 1943 run function do2:mob_controller/get_mob_names/get_names_from_shulker -data modify storage do2:mobs level2_willie set from storage do2:mobs temp diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/get_mob_names/get_mob_names.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/get_mob_names/get_mob_names.mcfunction index 50504c70..4d5921d7 100644 --- a/Brilliance Datapack/data/do2/functions/mob_controller/get_mob_names/get_mob_names.mcfunction +++ b/Brilliance Datapack/data/do2/functions/mob_controller/get_mob_names/get_mob_names.mcfunction @@ -1,5 +1,6 @@ function do2:mob_controller/get_mob_names/l1 function do2:mob_controller/get_mob_names/l2 +function do2:mob_controller/get_mob_names/l2_other function do2:mob_controller/get_mob_names/l3 function do2:mob_controller/get_mob_names/l4 function do2:mob_controller/get_mob_names/backrooms diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/get_mob_names/l1.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/get_mob_names/l1.mcfunction index f3091af7..c0fe9cba 100644 --- a/Brilliance Datapack/data/do2/functions/mob_controller/get_mob_names/l1.mcfunction +++ b/Brilliance Datapack/data/do2/functions/mob_controller/get_mob_names/l1.mcfunction @@ -1,21 +1,21 @@ # - WITH ZONES - -execute if score $dungeon do2.config.mc.level1Zones matches 1 positioned -527 123 1945 run function do2:mob_controller/get_mob_names/get_names_from_shulker +execute if score $dungeon do2.config.mc.level1Zones matches 1 positioned -528 123 1945 run function do2:mob_controller/get_mob_names/get_names_from_shulker execute if score $dungeon do2.config.mc.level1Zones matches 1 run data modify storage do2:mobs level1_zone1 set from storage do2:mobs temp -execute if score $dungeon do2.config.mc.level1Zones matches 1 positioned -527 123 1944 run function do2:mob_controller/get_mob_names/get_names_from_shulker +execute if score $dungeon do2.config.mc.level1Zones matches 1 positioned -528 123 1944 run function do2:mob_controller/get_mob_names/get_names_from_shulker execute if score $dungeon do2.config.mc.level1Zones matches 1 run data modify storage do2:mobs level1_zone2 set from storage do2:mobs temp -execute if score $dungeon do2.config.mc.level1Zones matches 1 positioned -527 123 1943 run function do2:mob_controller/get_mob_names/get_names_from_shulker +execute if score $dungeon do2.config.mc.level1Zones matches 1 positioned -528 123 1943 run function do2:mob_controller/get_mob_names/get_names_from_shulker execute if score $dungeon do2.config.mc.level1Zones matches 1 run data modify storage do2:mobs level1_zone3 set from storage do2:mobs temp execute if score $dungeon do2.config.mc.level1Zones matches 1 run data modify storage do2:mobs level1_zone4 set value [] execute if score $dungeon do2.config.mc.level1Zones matches 1 run data modify storage do2:mobs level1_zone5 set value [] # - WITHOUT ZONES - -execute if score $dungeon do2.config.mc.level1Zones matches 0 positioned -527 126 1946 run function do2:mob_controller/get_mob_names/get_names_from_shulker +execute if score $dungeon do2.config.mc.level1Zones matches 0 positioned -528 126 1946 run function do2:mob_controller/get_mob_names/get_names_from_shulker execute if score $dungeon do2.config.mc.level1Zones matches 0 run data modify storage do2:mobs level1_zone1 set from storage do2:mobs temp -execute if score $dungeon do2.config.mc.level1Zones matches 0 positioned -527 126 1945 run function do2:mob_controller/get_mob_names/get_names_from_shulker +execute if score $dungeon do2.config.mc.level1Zones matches 0 positioned -528 126 1945 run function do2:mob_controller/get_mob_names/get_names_from_shulker execute if score $dungeon do2.config.mc.level1Zones matches 0 run data modify storage do2:mobs level1_zone2 set from storage do2:mobs temp -execute if score $dungeon do2.config.mc.level1Zones matches 0 positioned -527 126 1944 run function do2:mob_controller/get_mob_names/get_names_from_shulker +execute if score $dungeon do2.config.mc.level1Zones matches 0 positioned -528 126 1944 run function do2:mob_controller/get_mob_names/get_names_from_shulker execute if score $dungeon do2.config.mc.level1Zones matches 0 run data modify storage do2:mobs level1_zone3 set from storage do2:mobs temp -execute if score $dungeon do2.config.mc.level1Zones matches 0 positioned -527 126 1943 run function do2:mob_controller/get_mob_names/get_names_from_shulker +execute if score $dungeon do2.config.mc.level1Zones matches 0 positioned -528 126 1943 run function do2:mob_controller/get_mob_names/get_names_from_shulker execute if score $dungeon do2.config.mc.level1Zones matches 0 run data modify storage do2:mobs level1_zone4 set from storage do2:mobs temp -execute if score $dungeon do2.config.mc.level1Zones matches 0 positioned -527 126 1942 run function do2:mob_controller/get_mob_names/get_names_from_shulker +execute if score $dungeon do2.config.mc.level1Zones matches 0 positioned -528 126 1942 run function do2:mob_controller/get_mob_names/get_names_from_shulker execute if score $dungeon do2.config.mc.level1Zones matches 0 run data modify storage do2:mobs level1_zone5 set from storage do2:mobs temp diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/get_mob_names/l2.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/get_mob_names/l2.mcfunction index 011b7937..0fac80a0 100644 --- a/Brilliance Datapack/data/do2/functions/mob_controller/get_mob_names/l2.mcfunction +++ b/Brilliance Datapack/data/do2/functions/mob_controller/get_mob_names/l2.mcfunction @@ -1,21 +1,21 @@ # - WITH ZONES - -execute if score $dungeon do2.config.mc.level2Zones matches 1 positioned -525 123 1945 run function do2:mob_controller/get_mob_names/get_names_from_shulker +execute if score $dungeon do2.config.mc.level2Zones matches 1 positioned -526 123 1945 run function do2:mob_controller/get_mob_names/get_names_from_shulker execute if score $dungeon do2.config.mc.level2Zones matches 1 run data modify storage do2:mobs level2_zone1 set from storage do2:mobs temp -execute if score $dungeon do2.config.mc.level2Zones matches 1 positioned -525 123 1944 run function do2:mob_controller/get_mob_names/get_names_from_shulker +execute if score $dungeon do2.config.mc.level2Zones matches 1 positioned -526 123 1944 run function do2:mob_controller/get_mob_names/get_names_from_shulker execute if score $dungeon do2.config.mc.level2Zones matches 1 run data modify storage do2:mobs level2_zone2 set from storage do2:mobs temp -execute if score $dungeon do2.config.mc.level2Zones matches 1 positioned -525 123 1943 run function do2:mob_controller/get_mob_names/get_names_from_shulker +execute if score $dungeon do2.config.mc.level2Zones matches 1 positioned -526 123 1943 run function do2:mob_controller/get_mob_names/get_names_from_shulker execute if score $dungeon do2.config.mc.level2Zones matches 1 run data modify storage do2:mobs level2_zone3 set from storage do2:mobs temp execute if score $dungeon do2.config.mc.level2Zones matches 1 run data modify storage do2:mobs level2_zone4 set value [] execute if score $dungeon do2.config.mc.level2Zones matches 1 run data modify storage do2:mobs level2_zone5 set value [] # - WITHOUT ZONES - -execute if score $dungeon do2.config.mc.level2Zones matches 0 positioned -525 126 1946 run function do2:mob_controller/get_mob_names/get_names_from_shulker +execute if score $dungeon do2.config.mc.level2Zones matches 0 positioned -526 126 1946 run function do2:mob_controller/get_mob_names/get_names_from_shulker execute if score $dungeon do2.config.mc.level2Zones matches 0 run data modify storage do2:mobs level2_zone1 set from storage do2:mobs temp -execute if score $dungeon do2.config.mc.level2Zones matches 0 positioned -525 126 1945 run function do2:mob_controller/get_mob_names/get_names_from_shulker +execute if score $dungeon do2.config.mc.level2Zones matches 0 positioned -526 126 1945 run function do2:mob_controller/get_mob_names/get_names_from_shulker execute if score $dungeon do2.config.mc.level2Zones matches 0 run data modify storage do2:mobs level2_zone2 set from storage do2:mobs temp -execute if score $dungeon do2.config.mc.level2Zones matches 0 positioned -525 126 1944 run function do2:mob_controller/get_mob_names/get_names_from_shulker +execute if score $dungeon do2.config.mc.level2Zones matches 0 positioned -526 126 1944 run function do2:mob_controller/get_mob_names/get_names_from_shulker execute if score $dungeon do2.config.mc.level2Zones matches 0 run data modify storage do2:mobs level2_zone3 set from storage do2:mobs temp -execute if score $dungeon do2.config.mc.level2Zones matches 0 positioned -525 126 1943 run function do2:mob_controller/get_mob_names/get_names_from_shulker +execute if score $dungeon do2.config.mc.level2Zones matches 0 positioned -526 126 1943 run function do2:mob_controller/get_mob_names/get_names_from_shulker execute if score $dungeon do2.config.mc.level2Zones matches 0 run data modify storage do2:mobs level2_zone4 set from storage do2:mobs temp -execute if score $dungeon do2.config.mc.level2Zones matches 0 positioned -525 126 1942 run function do2:mob_controller/get_mob_names/get_names_from_shulker +execute if score $dungeon do2.config.mc.level2Zones matches 0 positioned -526 126 1942 run function do2:mob_controller/get_mob_names/get_names_from_shulker execute if score $dungeon do2.config.mc.level2Zones matches 0 run data modify storage do2:mobs level2_zone5 set from storage do2:mobs temp diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/get_mob_names/l2_other.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/get_mob_names/l2_other.mcfunction new file mode 100644 index 00000000..02db11ef --- /dev/null +++ b/Brilliance Datapack/data/do2/functions/mob_controller/get_mob_names/l2_other.mcfunction @@ -0,0 +1,6 @@ +execute positioned -524 123 1945 run function do2:mob_controller/get_mob_names/get_names_from_shulker +data modify storage do2:mobs level2_ghost set from storage do2:mobs temp +execute positioned -524 123 1944 run function do2:mob_controller/get_mob_names/get_names_from_shulker +data modify storage do2:mobs level2_willie set from storage do2:mobs temp +execute positioned -524 123 1943 run function do2:mob_controller/get_mob_names/get_names_from_shulker +data modify storage do2:mobs level2_mites set from storage do2:mobs temp diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/get_mob_names/l3.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/get_mob_names/l3.mcfunction index fd2f4c75..48f76ee8 100644 --- a/Brilliance Datapack/data/do2/functions/mob_controller/get_mob_names/l3.mcfunction +++ b/Brilliance Datapack/data/do2/functions/mob_controller/get_mob_names/l3.mcfunction @@ -1,6 +1,6 @@ -execute positioned -523 123 1945 run function do2:mob_controller/get_mob_names/get_names_from_shulker +execute positioned -522 123 1945 run function do2:mob_controller/get_mob_names/get_names_from_shulker data modify storage do2:mobs level3_zone1 set from storage do2:mobs temp -execute positioned -523 123 1944 run function do2:mob_controller/get_mob_names/get_names_from_shulker +execute positioned -522 123 1944 run function do2:mob_controller/get_mob_names/get_names_from_shulker data modify storage do2:mobs level3_zone2 set from storage do2:mobs temp -execute positioned -523 123 1943 run function do2:mob_controller/get_mob_names/get_names_from_shulker +execute positioned -522 123 1943 run function do2:mob_controller/get_mob_names/get_names_from_shulker data modify storage do2:mobs level3_zone3 set from storage do2:mobs temp diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/get_mob_names/l4.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/get_mob_names/l4.mcfunction index 23ef4e97..f50ca390 100644 --- a/Brilliance Datapack/data/do2/functions/mob_controller/get_mob_names/l4.mcfunction +++ b/Brilliance Datapack/data/do2/functions/mob_controller/get_mob_names/l4.mcfunction @@ -1,15 +1,15 @@ # - WITH ZONES - -execute if score $dungeon do2.config.mc.level4Zones matches 1 positioned -521 123 1945 run function do2:mob_controller/get_mob_names/get_names_from_shulker +execute if score $dungeon do2.config.mc.level4Zones matches 1 positioned -520 123 1945 run function do2:mob_controller/get_mob_names/get_names_from_shulker execute if score $dungeon do2.config.mc.level4Zones matches 1 run data modify storage do2:mobs level4_zone1 set from storage do2:mobs temp -execute if score $dungeon do2.config.mc.level4Zones matches 1 positioned -521 123 1944 run function do2:mob_controller/get_mob_names/get_names_from_shulker +execute if score $dungeon do2.config.mc.level4Zones matches 1 positioned -520 123 1944 run function do2:mob_controller/get_mob_names/get_names_from_shulker execute if score $dungeon do2.config.mc.level4Zones matches 1 run data modify storage do2:mobs level4_zone2 set from storage do2:mobs temp -execute if score $dungeon do2.config.mc.level4Zones matches 1 positioned -521 123 1943 run function do2:mob_controller/get_mob_names/get_names_from_shulker +execute if score $dungeon do2.config.mc.level4Zones matches 1 positioned -520 123 1943 run function do2:mob_controller/get_mob_names/get_names_from_shulker execute if score $dungeon do2.config.mc.level4Zones matches 1 run data modify storage do2:mobs level4_zone3 set from storage do2:mobs temp # - WITHOUT ZONES - -execute if score $dungeon do2.config.mc.level4Zones matches 0 positioned -521 126 1945 run function do2:mob_controller/get_mob_names/get_names_from_shulker +execute if score $dungeon do2.config.mc.level4Zones matches 0 positioned -520 126 1945 run function do2:mob_controller/get_mob_names/get_names_from_shulker execute if score $dungeon do2.config.mc.level4Zones matches 0 run data modify storage do2:mobs level4_zone1 set from storage do2:mobs temp -execute if score $dungeon do2.config.mc.level4Zones matches 0 positioned -521 126 1944 run function do2:mob_controller/get_mob_names/get_names_from_shulker +execute if score $dungeon do2.config.mc.level4Zones matches 0 positioned -520 126 1944 run function do2:mob_controller/get_mob_names/get_names_from_shulker execute if score $dungeon do2.config.mc.level4Zones matches 0 run data modify storage do2:mobs level4_zone2 set from storage do2:mobs temp -execute if score $dungeon do2.config.mc.level4Zones matches 0 positioned -521 126 1943 run function do2:mob_controller/get_mob_names/get_names_from_shulker +execute if score $dungeon do2.config.mc.level4Zones matches 0 positioned -520 126 1943 run function do2:mob_controller/get_mob_names/get_names_from_shulker execute if score $dungeon do2.config.mc.level4Zones matches 0 run data modify storage do2:mobs level4_zone3 set from storage do2:mobs temp diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/all.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/all.mcfunction new file mode 100644 index 00000000..90f78f17 --- /dev/null +++ b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/all.mcfunction @@ -0,0 +1,18 @@ +function do2:mob_controller/marker_visibility/turn_invisible/fish_marker +function do2:mob_controller/marker_visibility/turn_invisible/l1z1 +function do2:mob_controller/marker_visibility/turn_invisible/l1z2 +function do2:mob_controller/marker_visibility/turn_invisible/l1z3 +function do2:mob_controller/marker_visibility/turn_invisible/l1z4 +function do2:mob_controller/marker_visibility/turn_invisible/l1z5 +function do2:mob_controller/marker_visibility/turn_invisible/l2z1 +function do2:mob_controller/marker_visibility/turn_invisible/l2z2 +function do2:mob_controller/marker_visibility/turn_invisible/l2z3 +function do2:mob_controller/marker_visibility/turn_invisible/l2z4 +function do2:mob_controller/marker_visibility/turn_invisible/l2z5 +function do2:mob_controller/marker_visibility/turn_invisible/l2willie +function do2:mob_controller/marker_visibility/turn_invisible/l3z1 +function do2:mob_controller/marker_visibility/turn_invisible/l3z2 +function do2:mob_controller/marker_visibility/turn_invisible/l3z3 +function do2:mob_controller/marker_visibility/turn_invisible/l4z1 +function do2:mob_controller/marker_visibility/turn_invisible/l4z2 +function do2:mob_controller/marker_visibility/turn_invisible/l4z3 diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/fish_marker.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/fish_marker.mcfunction new file mode 100644 index 00000000..078428f4 --- /dev/null +++ b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/fish_marker.mcfunction @@ -0,0 +1,3 @@ +kill @e[type=minecraft:armor_stand,tag=fish_marker] +execute as @e[type=minecraft:marker,tag=marker_visible,tag=fish_marker] run tag @s remove marker_visible +team remove fish_marker diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l0z1.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l0z1.mcfunction new file mode 100644 index 00000000..3d3508e9 --- /dev/null +++ b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l0z1.mcfunction @@ -0,0 +1,3 @@ +kill @e[type=minecraft:armor_stand,tag=zone_marker,tag=L0Z1] +execute as @e[type=minecraft:marker,tag=zone_marker,tag=marker_visible,tag=L0Z1] run tag @s remove marker_visible +team remove L0Z1 diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l0z2.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l0z2.mcfunction new file mode 100644 index 00000000..ed78ce1e --- /dev/null +++ b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l0z2.mcfunction @@ -0,0 +1,3 @@ +kill @e[type=minecraft:armor_stand,tag=zone_marker,tag=L0Z2] +execute as @e[type=minecraft:marker,tag=zone_marker,tag=marker_visible,tag=L0Z2] run tag @s remove marker_visible +team remove L0Z2 diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l1z1.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l1z1.mcfunction new file mode 100644 index 00000000..fff3f413 --- /dev/null +++ b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l1z1.mcfunction @@ -0,0 +1,3 @@ +kill @e[type=minecraft:armor_stand,tag=zone_marker,tag=L1Z1] +execute as @e[type=minecraft:marker,tag=zone_marker,tag=marker_visible,tag=L1Z1] run tag @s remove marker_visible +team remove L1Z1 diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l1z2.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l1z2.mcfunction new file mode 100644 index 00000000..b5e52f22 --- /dev/null +++ b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l1z2.mcfunction @@ -0,0 +1,3 @@ +kill @e[type=minecraft:armor_stand,tag=zone_marker,tag=L1Z2] +execute as @e[type=minecraft:marker,tag=zone_marker,tag=marker_visible,tag=L1Z2] run tag @s remove marker_visible +team remove L1Z2 diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l1z3.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l1z3.mcfunction new file mode 100644 index 00000000..2f5eba56 --- /dev/null +++ b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l1z3.mcfunction @@ -0,0 +1,3 @@ +kill @e[type=minecraft:armor_stand,tag=zone_marker,tag=L1Z3] +execute as @e[type=minecraft:marker,tag=zone_marker,tag=marker_visible,tag=L1Z3] run tag @s remove marker_visible +team remove L1Z3 diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l1z4.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l1z4.mcfunction new file mode 100644 index 00000000..4394ecdd --- /dev/null +++ b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l1z4.mcfunction @@ -0,0 +1,3 @@ +kill @e[type=minecraft:armor_stand,tag=zone_marker,tag=L1Z4] +execute as @e[type=minecraft:marker,tag=zone_marker,tag=marker_visible,tag=L1Z4] run tag @s remove marker_visible +team remove L1Z4 diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l1z5.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l1z5.mcfunction new file mode 100644 index 00000000..5aa9d964 --- /dev/null +++ b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l1z5.mcfunction @@ -0,0 +1,3 @@ +kill @e[type=minecraft:armor_stand,tag=zone_marker,tag=L1Z5] +execute as @e[type=minecraft:marker,tag=zone_marker,tag=marker_visible,tag=L1Z5] run tag @s remove marker_visible +team remove L1Z5 diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l2willie.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l2willie.mcfunction new file mode 100644 index 00000000..4b28de48 --- /dev/null +++ b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l2willie.mcfunction @@ -0,0 +1,3 @@ +kill @e[type=minecraft:armor_stand,tag=zone_marker,tag=L2WILLIE] +execute as @e[type=minecraft:marker,tag=zone_marker,tag=marker_visible,tag=L2WILLIE] run tag @s remove marker_visible +team remove L2WILLIE diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l2z1.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l2z1.mcfunction new file mode 100644 index 00000000..1d073198 --- /dev/null +++ b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l2z1.mcfunction @@ -0,0 +1,3 @@ +kill @e[type=minecraft:armor_stand,tag=zone_marker,tag=L2Z1] +execute as @e[type=minecraft:marker,tag=zone_marker,tag=marker_visible,tag=L2Z1] run tag @s remove marker_visible +team remove L2Z1 diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l2z2.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l2z2.mcfunction new file mode 100644 index 00000000..3f66c71e --- /dev/null +++ b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l2z2.mcfunction @@ -0,0 +1,3 @@ +kill @e[type=minecraft:armor_stand,tag=zone_marker,tag=L2Z2] +execute as @e[type=minecraft:marker,tag=zone_marker,tag=marker_visible,tag=L2Z2] run tag @s remove marker_visible +team remove L2Z2 diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l2z3.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l2z3.mcfunction new file mode 100644 index 00000000..0bfef766 --- /dev/null +++ b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l2z3.mcfunction @@ -0,0 +1,3 @@ +kill @e[type=minecraft:armor_stand,tag=zone_marker,tag=L2Z3] +execute as @e[type=minecraft:marker,tag=zone_marker,tag=marker_visible,tag=L2Z3] run tag @s remove marker_visible +team remove L2Z3 diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l2z4.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l2z4.mcfunction new file mode 100644 index 00000000..2d667d72 --- /dev/null +++ b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l2z4.mcfunction @@ -0,0 +1,3 @@ +kill @e[type=minecraft:armor_stand,tag=zone_marker,tag=L2Z4] +execute as @e[type=minecraft:marker,tag=zone_marker,tag=marker_visible,tag=L2Z4] run tag @s remove marker_visible +team remove L2Z4 diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l2z5.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l2z5.mcfunction new file mode 100644 index 00000000..1748cba7 --- /dev/null +++ b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l2z5.mcfunction @@ -0,0 +1,3 @@ +kill @e[type=minecraft:armor_stand,tag=zone_marker,tag=L2Z5] +execute as @e[type=minecraft:marker,tag=zone_marker,tag=marker_visible,tag=L2Z5] run tag @s remove marker_visible +team remove L2Z5 diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l3z1.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l3z1.mcfunction new file mode 100644 index 00000000..675cbe78 --- /dev/null +++ b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l3z1.mcfunction @@ -0,0 +1,3 @@ +kill @e[type=minecraft:armor_stand,tag=zone_marker,tag=L3Z1] +execute as @e[type=minecraft:marker,tag=zone_marker,tag=marker_visible,tag=L3Z1] run tag @s remove marker_visible +team remove L3Z1 diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l3z2.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l3z2.mcfunction new file mode 100644 index 00000000..9dc79480 --- /dev/null +++ b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l3z2.mcfunction @@ -0,0 +1,3 @@ +kill @e[type=minecraft:armor_stand,tag=zone_marker,tag=L3Z2] +execute as @e[type=minecraft:marker,tag=zone_marker,tag=marker_visible,tag=L3Z2] run tag @s remove marker_visible +team remove L3Z2 diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l3z3.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l3z3.mcfunction new file mode 100644 index 00000000..c19d47e9 --- /dev/null +++ b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l3z3.mcfunction @@ -0,0 +1,3 @@ +kill @e[type=minecraft:armor_stand,tag=zone_marker,tag=L3Z3] +execute as @e[type=minecraft:marker,tag=zone_marker,tag=marker_visible,tag=L3Z3] run tag @s remove marker_visible +team remove L3Z3 diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l4z1.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l4z1.mcfunction new file mode 100644 index 00000000..a234ec9e --- /dev/null +++ b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l4z1.mcfunction @@ -0,0 +1,3 @@ +kill @e[type=minecraft:armor_stand,tag=zone_marker,tag=L4Z1] +execute as @e[type=minecraft:marker,tag=zone_marker,tag=marker_visible,tag=L4Z1] run tag @s remove marker_visible +team remove L4Z1 diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l4z2.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l4z2.mcfunction new file mode 100644 index 00000000..fe7fd02c --- /dev/null +++ b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l4z2.mcfunction @@ -0,0 +1,3 @@ +kill @e[type=minecraft:armor_stand,tag=zone_marker,tag=L4Z2] +execute as @e[type=minecraft:marker,tag=zone_marker,tag=marker_visible,tag=L4Z2] run tag @s remove marker_visible +team remove L4Z2 diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l4z3.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l4z3.mcfunction new file mode 100644 index 00000000..6ad5df25 --- /dev/null +++ b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_invisible/l4z3.mcfunction @@ -0,0 +1,3 @@ +kill @e[type=minecraft:armor_stand,tag=zone_marker,tag=L4Z3] +execute as @e[type=minecraft:marker,tag=zone_marker,tag=marker_visible,tag=L4Z3] run tag @s remove marker_visible +team remove L4Z3 diff --git a/Brilliance Datapack/data/do2/functions/dev/markers/turn_visible/fish_marker.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_visible/fish_marker.mcfunction similarity index 94% rename from Brilliance Datapack/data/do2/functions/dev/markers/turn_visible/fish_marker.mcfunction rename to Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_visible/fish_marker.mcfunction index 07d42ed9..974d3652 100644 --- a/Brilliance Datapack/data/do2/functions/dev/markers/turn_visible/fish_marker.mcfunction +++ b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_visible/fish_marker.mcfunction @@ -1,5 +1,5 @@ team add fish_marker "Fish Marker" team modify fish_marker color dark_purple summon minecraft:armor_stand ~ ~ ~ {Invisible:1b,Invulnerable:1b,NoBasePlate:1b,NoGravity:1b,Small:1b,CustomName:'{"text":"Fish Marker","color":"dark_purple"}',CustomNameVisible:1b,Tags:["zone_marker","fish_marker"], ActiveEffects: [{Ambient: 0b, ShowIcon: 0b, ShowParticles: 0b, Duration: -1, Id: 24, Amplifier: 0b}]} -tag @s add frustrated_visible +tag @s add marker_visible execute as @e[type=minecraft:armor_stand,tag=fish_marker] run team join fish_marker @s diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_visible/l0z1.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_visible/l0z1.mcfunction new file mode 100644 index 00000000..bb9be7ba --- /dev/null +++ b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_visible/l0z1.mcfunction @@ -0,0 +1,5 @@ +team add L0Z1 "Level 0; Zone 1." +team modify L0Z1 color dark_purple +summon minecraft:armor_stand ~ ~ ~ {Invisible:1b,Invulnerable:1b,NoBasePlate:1b,NoGravity:1b,Small:1b,CustomName:'{"text":"(L0Z1) Teleport Marker","color":"dark_purple"}',CustomNameVisible:1b,Tags:["zone_marker","L0Z1"], ActiveEffects: [{Ambient: 0b, ShowIcon: 0b, ShowParticles: 0b, Duration: -1, Id: 24, Amplifier: 0b}]} +tag @s add marker_visible +execute as @e[type=minecraft:armor_stand,tag=L0Z1] run team join L0Z1 @s diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_visible/l0z2.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_visible/l0z2.mcfunction new file mode 100644 index 00000000..5f093c15 --- /dev/null +++ b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_visible/l0z2.mcfunction @@ -0,0 +1,5 @@ +team add L0Z2 "Level 0; Zone 2." +team modify L0Z2 color light_purple +summon minecraft:armor_stand ~ ~ ~ {Invisible:1b,Invulnerable:1b,NoBasePlate:1b,NoGravity:1b,Small:1b,CustomName:'{"text":"(L0Z2) Teleport Marker","color":"light_purple"}',CustomNameVisible:1b,Tags:["zone_marker","L0Z2"], ActiveEffects: [{Ambient: 0b, ShowIcon: 0b, ShowParticles: 0b, Duration: -1, Id: 24, Amplifier: 0b}]} +tag @s add marker_visible +execute as @e[type=minecraft:armor_stand,tag=L0Z2] run team join L0Z2 @s diff --git a/Brilliance Datapack/data/do2/functions/dev/markers/turn_visible/l1z1.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_visible/l1z1.mcfunction similarity index 93% rename from Brilliance Datapack/data/do2/functions/dev/markers/turn_visible/l1z1.mcfunction rename to Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_visible/l1z1.mcfunction index c180918e..80735b80 100644 --- a/Brilliance Datapack/data/do2/functions/dev/markers/turn_visible/l1z1.mcfunction +++ b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_visible/l1z1.mcfunction @@ -1,5 +1,5 @@ team add L1Z1 "Level 1; Zone 1." team modify L1Z1 color red summon minecraft:armor_stand ~ ~ ~ {Invisible:1b,Invulnerable:1b,NoBasePlate:1b,NoGravity:1b,Small:1b,CustomName:'{"text":"(L1Z1) Teleport Marker","color":"red"}',CustomNameVisible:1b,Tags:["zone_marker","L1Z1"], ActiveEffects: [{Ambient: 0b, ShowIcon: 0b, ShowParticles: 0b, Duration: -1, Id: 24, Amplifier: 0b}]} -tag @s add frustrated_visible +tag @s add marker_visible execute as @e[type=minecraft:armor_stand,tag=L1Z1] run team join L1Z1 @s diff --git a/Brilliance Datapack/data/do2/functions/dev/markers/turn_visible/l1z2.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_visible/l1z2.mcfunction similarity index 93% rename from Brilliance Datapack/data/do2/functions/dev/markers/turn_visible/l1z2.mcfunction rename to Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_visible/l1z2.mcfunction index 481714b5..b91d7339 100644 --- a/Brilliance Datapack/data/do2/functions/dev/markers/turn_visible/l1z2.mcfunction +++ b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_visible/l1z2.mcfunction @@ -1,5 +1,5 @@ team add L1Z2 "Level 1; Zone 2." team modify L1Z2 color green summon minecraft:armor_stand ~ ~ ~ {Invisible:1b,Invulnerable:1b,NoBasePlate:1b,NoGravity:1b,Small:1b,CustomName:'{"text":"(L1Z2) Teleport Marker","color":"green"}',CustomNameVisible:1b,Tags:["zone_marker","L1Z2"], ActiveEffects: [{Ambient: 0b, ShowIcon: 0b, ShowParticles: 0b, Duration: -1, Id: 24, Amplifier: 0b}]} -tag @s add frustrated_visible +tag @s add marker_visible execute as @e[type=minecraft:armor_stand,tag=L1Z2] run team join L1Z2 @s diff --git a/Brilliance Datapack/data/do2/functions/dev/markers/turn_visible/l1z3.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_visible/l1z3.mcfunction similarity index 93% rename from Brilliance Datapack/data/do2/functions/dev/markers/turn_visible/l1z3.mcfunction rename to Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_visible/l1z3.mcfunction index e3248336..61b521ae 100644 --- a/Brilliance Datapack/data/do2/functions/dev/markers/turn_visible/l1z3.mcfunction +++ b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_visible/l1z3.mcfunction @@ -1,5 +1,5 @@ team add L1Z3 "Level 1; Zone 3." team modify L1Z3 color gold summon minecraft:armor_stand ~ ~ ~ {Invisible:1b,Invulnerable:1b,NoBasePlate:1b,NoGravity:1b,Small:1b,CustomName:'{"text":"(L1Z3) Teleport Marker","color":"gold"}',CustomNameVisible:1b,Tags:["zone_marker","L1Z3"], ActiveEffects: [{Ambient: 0b, ShowIcon: 0b, ShowParticles: 0b, Duration: -1, Id: 24, Amplifier: 0b}]} -tag @s add frustrated_visible +tag @s add marker_visible execute as @e[type=minecraft:armor_stand,tag=L1Z3] run team join L1Z3 @s diff --git a/Brilliance Datapack/data/do2/functions/dev/markers/turn_visible/l1z4.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_visible/l1z4.mcfunction similarity index 93% rename from Brilliance Datapack/data/do2/functions/dev/markers/turn_visible/l1z4.mcfunction rename to Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_visible/l1z4.mcfunction index cd62d138..f61920ce 100644 --- a/Brilliance Datapack/data/do2/functions/dev/markers/turn_visible/l1z4.mcfunction +++ b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_visible/l1z4.mcfunction @@ -1,5 +1,5 @@ team add L1Z4 "Level 1; Zone 4." team modify L1Z4 color gray summon minecraft:armor_stand ~ ~ ~ {Invisible:1b,Invulnerable:1b,NoBasePlate:1b,NoGravity:1b,Small:1b,CustomName:'{"text":"(L1Z4) Teleport Marker","color":"gray"}',CustomNameVisible:1b,Tags:["zone_marker","L1Z4"], ActiveEffects: [{Ambient: 0b, ShowIcon: 0b, ShowParticles: 0b, Duration: -1, Id: 24, Amplifier: 0b}]} -tag @s add frustrated_visible +tag @s add marker_visible execute as @e[type=minecraft:armor_stand,tag=L1Z4] run team join L1Z4 @s diff --git a/Brilliance Datapack/data/do2/functions/dev/markers/turn_visible/l1z5.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_visible/l1z5.mcfunction similarity index 93% rename from Brilliance Datapack/data/do2/functions/dev/markers/turn_visible/l1z5.mcfunction rename to Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_visible/l1z5.mcfunction index e2e896fc..d61726f2 100644 --- a/Brilliance Datapack/data/do2/functions/dev/markers/turn_visible/l1z5.mcfunction +++ b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_visible/l1z5.mcfunction @@ -1,5 +1,5 @@ team add L1Z5 "Level 1; Zone 4." team modify L1Z5 color light_purple summon minecraft:armor_stand ~ ~ ~ {Invisible:1b,Invulnerable:1b,NoBasePlate:1b,NoGravity:1b,Small:1b,CustomName:'{"text":"(L1Z5) Teleport Marker","color":"light_purple"}',CustomNameVisible:1b,Tags:["zone_marker","L1Z5"], ActiveEffects: [{Ambient: 0b, ShowIcon: 0b, ShowParticles: 0b, Duration: -1, Id: 24, Amplifier: 0b}]} -tag @s add frustrated_visible +tag @s add marker_visible execute as @e[type=minecraft:armor_stand,tag=L1Z5] run team join L1Z5 @s diff --git a/Brilliance Datapack/data/do2/functions/dev/markers/turn_visible/l2willie.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_visible/l2willie.mcfunction similarity index 94% rename from Brilliance Datapack/data/do2/functions/dev/markers/turn_visible/l2willie.mcfunction rename to Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_visible/l2willie.mcfunction index eec1a1ea..baf35a35 100644 --- a/Brilliance Datapack/data/do2/functions/dev/markers/turn_visible/l2willie.mcfunction +++ b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_visible/l2willie.mcfunction @@ -1,5 +1,5 @@ team add L2WILLIE "Level 2; Willie Lake." team modify L2WILLIE color white summon minecraft:armor_stand ~ ~ ~ {Invisible:1b,Invulnerable:1b,NoBasePlate:1b,NoGravity:1b,Small:1b,CustomName:'{"text":"(L2WILLIE) Teleport Marker","color":"dark_aqua"}',CustomNameVisible:1b,Tags:["zone_marker","L2WILLIE"], ActiveEffects: [{Ambient: 0b, ShowIcon: 0b, ShowParticles: 0b, Duration: -1, Id: 24, Amplifier: 0b}]} -tag @s add frustrated_visible +tag @s add marker_visible execute as @e[type=minecraft:armor_stand,tag=L2WILLIE] run team join L2WILLIE @s diff --git a/Brilliance Datapack/data/do2/functions/dev/markers/turn_visible/l2z1.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_visible/l2z1.mcfunction similarity index 93% rename from Brilliance Datapack/data/do2/functions/dev/markers/turn_visible/l2z1.mcfunction rename to Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_visible/l2z1.mcfunction index e85c7b89..71396b76 100644 --- a/Brilliance Datapack/data/do2/functions/dev/markers/turn_visible/l2z1.mcfunction +++ b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_visible/l2z1.mcfunction @@ -1,5 +1,5 @@ team add L2Z1 "Level 2; Zone 1." team modify L2Z1 color dark_aqua summon minecraft:armor_stand ~ ~ ~ {Invisible:1b,Invulnerable:1b,NoBasePlate:1b,NoGravity:1b,Small:1b,CustomName:'{"text":"(L2Z1) Teleport Marker","color":"dark_aqua"}',CustomNameVisible:1b,Tags:["zone_marker","L2Z1"], ActiveEffects: [{Ambient: 0b, ShowIcon: 0b, ShowParticles: 0b, Duration: -1, Id: 24, Amplifier: 0b}]} -tag @s add frustrated_visible +tag @s add marker_visible execute as @e[type=minecraft:armor_stand,tag=L2Z1] run team join L2Z1 @s diff --git a/Brilliance Datapack/data/do2/functions/dev/markers/turn_visible/l2z2.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_visible/l2z2.mcfunction similarity index 93% rename from Brilliance Datapack/data/do2/functions/dev/markers/turn_visible/l2z2.mcfunction rename to Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_visible/l2z2.mcfunction index 80ee25c3..03ef9caa 100644 --- a/Brilliance Datapack/data/do2/functions/dev/markers/turn_visible/l2z2.mcfunction +++ b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_visible/l2z2.mcfunction @@ -1,5 +1,5 @@ team add L2Z2 "Level 2; Zone 2." team modify L2Z2 color yellow summon minecraft:armor_stand ~ ~ ~ {Invisible:1b,Invulnerable:1b,NoBasePlate:1b,NoGravity:1b,Small:1b,CustomName:'{"text":"(L2Z2) Teleport Marker","color":"yellow"}',CustomNameVisible:1b,Tags:["zone_marker","L2Z2"], ActiveEffects: [{Ambient: 0b, ShowIcon: 0b, ShowParticles: 0b, Duration: -1, Id: 24, Amplifier: 0b}]} -tag @s add frustrated_visible +tag @s add marker_visible execute as @e[type=minecraft:armor_stand,tag=L2Z2] run team join L2Z2 @s diff --git a/Brilliance Datapack/data/do2/functions/dev/markers/turn_visible/l2z3.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_visible/l2z3.mcfunction similarity index 93% rename from Brilliance Datapack/data/do2/functions/dev/markers/turn_visible/l2z3.mcfunction rename to Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_visible/l2z3.mcfunction index 18bbf618..3aba3e2d 100644 --- a/Brilliance Datapack/data/do2/functions/dev/markers/turn_visible/l2z3.mcfunction +++ b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_visible/l2z3.mcfunction @@ -1,5 +1,5 @@ team add L2Z3 "Level 2; Zone 3." team modify L2Z3 color dark_blue summon minecraft:armor_stand ~ ~ ~ {Invisible:1b,Invulnerable:1b,NoBasePlate:1b,NoGravity:1b,Small:1b,CustomName:'{"text":"(L2Z3) Teleport Marker","color":"dark_blue"}',CustomNameVisible:1b,Tags:["zone_marker","L2Z3"], ActiveEffects: [{Ambient: 0b, ShowIcon: 0b, ShowParticles: 0b, Duration: -1, Id: 24, Amplifier: 0b}]} -tag @s add frustrated_visible +tag @s add marker_visible execute as @e[type=minecraft:armor_stand,tag=L2Z3] run team join L2Z3 @s diff --git a/Brilliance Datapack/data/do2/functions/dev/markers/turn_visible/l2z4.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_visible/l2z4.mcfunction similarity index 93% rename from Brilliance Datapack/data/do2/functions/dev/markers/turn_visible/l2z4.mcfunction rename to Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_visible/l2z4.mcfunction index fe4ec78b..b61f8575 100644 --- a/Brilliance Datapack/data/do2/functions/dev/markers/turn_visible/l2z4.mcfunction +++ b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_visible/l2z4.mcfunction @@ -1,5 +1,5 @@ team add L2Z4 "Level 2; Zone 4." team modify L2Z4 color dark_red summon minecraft:armor_stand ~ ~ ~ {Invisible:1b,Invulnerable:1b,NoBasePlate:1b,NoGravity:1b,Small:1b,CustomName:'{"text":"(L2Z4) Teleport Marker","color":"dark_red"}',CustomNameVisible:1b,Tags:["zone_marker","L2Z4"], ActiveEffects: [{Ambient: 0b, ShowIcon: 0b, ShowParticles: 0b, Duration: -1, Id: 24, Amplifier: 0b}]} -tag @s add frustrated_visible +tag @s add marker_visible execute as @e[type=minecraft:armor_stand,tag=L2Z4] run team join L2Z4 @s diff --git a/Brilliance Datapack/data/do2/functions/dev/markers/turn_visible/l2z5.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_visible/l2z5.mcfunction similarity index 93% rename from Brilliance Datapack/data/do2/functions/dev/markers/turn_visible/l2z5.mcfunction rename to Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_visible/l2z5.mcfunction index f31a49b5..9ea7e462 100644 --- a/Brilliance Datapack/data/do2/functions/dev/markers/turn_visible/l2z5.mcfunction +++ b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_visible/l2z5.mcfunction @@ -1,5 +1,5 @@ team add L2Z5 "Level 2; Zone 5." team modify L2Z5 color black summon minecraft:armor_stand ~ ~ ~ {Invisible:1b,Invulnerable:1b,NoBasePlate:1b,NoGravity:1b,Small:1b,CustomName:'{"text":"(L2Z5) Teleport Marker","color":"black"}',CustomNameVisible:1b,Tags:["zone_marker","L2Z5"], ActiveEffects: [{Ambient: 0b, ShowIcon: 0b, ShowParticles: 0b, Duration: -1, Id: 24, Amplifier: 0b}]} -tag @s add frustrated_visible +tag @s add marker_visible execute as @e[type=minecraft:armor_stand,tag=L2Z5] run team join L2Z5 @s diff --git a/Brilliance Datapack/data/do2/functions/dev/markers/turn_visible/l3z1.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_visible/l3z1.mcfunction similarity index 93% rename from Brilliance Datapack/data/do2/functions/dev/markers/turn_visible/l3z1.mcfunction rename to Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_visible/l3z1.mcfunction index 1f3e7049..58f22ba8 100644 --- a/Brilliance Datapack/data/do2/functions/dev/markers/turn_visible/l3z1.mcfunction +++ b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_visible/l3z1.mcfunction @@ -1,5 +1,5 @@ team add L3Z1 "Level 3; Zone 1." team modify L3Z1 color dark_green summon minecraft:armor_stand ~ ~ ~ {Invisible:1b,Invulnerable:1b,NoBasePlate:1b,NoGravity:1b,Small:1b,CustomName:'{"text":"(L3Z1) Teleport Marker","color":"dark_green"}',CustomNameVisible:1b,Tags:["zone_marker","L3Z1"], ActiveEffects: [{Ambient: 0b, ShowIcon: 0b, ShowParticles: 0b, Duration: -1, Id: 24, Amplifier: 0b}]} -tag @s add frustrated_visible +tag @s add marker_visible execute as @e[type=minecraft:armor_stand,tag=L3Z1] run team join L3Z1 @s diff --git a/Brilliance Datapack/data/do2/functions/dev/markers/turn_visible/l3z2.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_visible/l3z2.mcfunction similarity index 93% rename from Brilliance Datapack/data/do2/functions/dev/markers/turn_visible/l3z2.mcfunction rename to Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_visible/l3z2.mcfunction index 0befec68..83b4e571 100644 --- a/Brilliance Datapack/data/do2/functions/dev/markers/turn_visible/l3z2.mcfunction +++ b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_visible/l3z2.mcfunction @@ -1,5 +1,5 @@ team add L3Z2 "Level 3; Zone 2." team modify L3Z2 color dark_gray summon minecraft:armor_stand ~ ~ ~ {Invisible:1b,Invulnerable:1b,NoBasePlate:1b,NoGravity:1b,Small:1b,CustomName:'{"text":"(L3Z2) Teleport Marker","color":"dark_gray"}',CustomNameVisible:1b,Tags:["zone_marker","L3Z2"], ActiveEffects: [{Ambient: 0b, ShowIcon: 0b, ShowParticles: 0b, Duration: -1, Id: 24, Amplifier: 0b}]} -tag @s add frustrated_visible +tag @s add marker_visible execute as @e[type=minecraft:armor_stand,tag=L3Z2] run team join L3Z2 @s diff --git a/Brilliance Datapack/data/do2/functions/dev/markers/turn_visible/l3z3.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_visible/l3z3.mcfunction similarity index 93% rename from Brilliance Datapack/data/do2/functions/dev/markers/turn_visible/l3z3.mcfunction rename to Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_visible/l3z3.mcfunction index 3f12fce3..0fd6f349 100644 --- a/Brilliance Datapack/data/do2/functions/dev/markers/turn_visible/l3z3.mcfunction +++ b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_visible/l3z3.mcfunction @@ -1,5 +1,5 @@ team add L3Z3 "Level 3; Zone 3." team modify L3Z3 color blue summon minecraft:armor_stand ~ ~ ~ {Invisible:1b,Invulnerable:1b,NoBasePlate:1b,NoGravity:1b,Small:1b,CustomName:'{"text":"(L3Z3) Teleport Marker","color":"blue"}',CustomNameVisible:1b,Tags:["zone_marker","L3Z3"], ActiveEffects: [{Ambient: 0b, ShowIcon: 0b, ShowParticles: 0b, Duration: -1, Id: 24, Amplifier: 0b}]} -tag @s add frustrated_visible +tag @s add marker_visible execute as @e[type=minecraft:armor_stand,tag=L3Z3] run team join L3Z3 @s diff --git a/Brilliance Datapack/data/do2/functions/dev/markers/turn_visible/l4z1.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_visible/l4z1.mcfunction similarity index 93% rename from Brilliance Datapack/data/do2/functions/dev/markers/turn_visible/l4z1.mcfunction rename to Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_visible/l4z1.mcfunction index 110e5130..432ad017 100644 --- a/Brilliance Datapack/data/do2/functions/dev/markers/turn_visible/l4z1.mcfunction +++ b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_visible/l4z1.mcfunction @@ -1,5 +1,5 @@ team add L4Z1 "Level 4; Zone 1." team modify L4Z1 color dark_purple summon minecraft:armor_stand ~ ~ ~ {Invisible:1b,Invulnerable:1b,NoBasePlate:1b,NoGravity:1b,Small:1b,CustomName:'{"text":"(L4Z1) Teleport Marker","color":"dark_purple"}',CustomNameVisible:1b,Tags:["zone_marker","L4Z1"], ActiveEffects: [{Ambient: 0b, ShowIcon: 0b, ShowParticles: 0b, Duration: -1, Id: 24, Amplifier: 0b}]} -tag @s add frustrated_visible +tag @s add marker_visible execute as @e[type=minecraft:armor_stand,tag=L4Z1] run team join L4Z1 @s diff --git a/Brilliance Datapack/data/do2/functions/dev/markers/turn_visible/l4z2.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_visible/l4z2.mcfunction similarity index 93% rename from Brilliance Datapack/data/do2/functions/dev/markers/turn_visible/l4z2.mcfunction rename to Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_visible/l4z2.mcfunction index 1dd3b203..f56bed3b 100644 --- a/Brilliance Datapack/data/do2/functions/dev/markers/turn_visible/l4z2.mcfunction +++ b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_visible/l4z2.mcfunction @@ -1,5 +1,5 @@ team add L4Z2 "Level 4; Zone 2." team modify L4Z2 color white summon minecraft:armor_stand ~ ~ ~ {Invisible:1b,Invulnerable:1b,NoBasePlate:1b,NoGravity:1b,Small:1b,CustomName:'{"text":"(L4Z2) Teleport Marker","color":"white"}',CustomNameVisible:1b,Tags:["zone_marker","L4Z2"], ActiveEffects: [{Ambient: 0b, ShowIcon: 0b, ShowParticles: 0b, Duration: -1, Id: 24, Amplifier: 0b}]} -tag @s add frustrated_visible +tag @s add marker_visible execute as @e[type=minecraft:armor_stand,tag=L4Z2] run team join L4Z2 @s diff --git a/Brilliance Datapack/data/do2/functions/dev/markers/turn_visible/l4z3.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_visible/l4z3.mcfunction similarity index 93% rename from Brilliance Datapack/data/do2/functions/dev/markers/turn_visible/l4z3.mcfunction rename to Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_visible/l4z3.mcfunction index 34c434d9..53276716 100644 --- a/Brilliance Datapack/data/do2/functions/dev/markers/turn_visible/l4z3.mcfunction +++ b/Brilliance Datapack/data/do2/functions/mob_controller/marker_visibility/turn_visible/l4z3.mcfunction @@ -1,5 +1,5 @@ team add L4Z3 "Level 4; Zone 3." team modify L4Z3 color aqua summon minecraft:armor_stand ~ ~ ~ {Invisible:1b,Invulnerable:1b,NoBasePlate:1b,NoGravity:1b,Small:1b,CustomName:'{"text":"(L4Z3) Teleport Marker","color":"aqua"}',CustomNameVisible:1b,Tags:["zone_marker","L4Z3"], ActiveEffects: [{Ambient: 0b, ShowIcon: 0b, ShowParticles: 0b, Duration: -1, Id: 24, Amplifier: 0b}]} -tag @s add frustrated_visible +tag @s add marker_visible execute as @e[type=minecraft:armor_stand,tag=L4Z3] run team join L4Z3 @s diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/per_tick/backrooms.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/per_tick/backrooms.mcfunction index f3e87f08..e40bf602 100644 --- a/Brilliance Datapack/data/do2/functions/mob_controller/per_tick/backrooms.mcfunction +++ b/Brilliance Datapack/data/do2/functions/mob_controller/per_tick/backrooms.mcfunction @@ -1,5 +1,8 @@ -execute if block -528 117 1943 minecraft:lever[powered=true] as @e[type=marker,tag=L2WILLIE] unless entity @s[tag=frustrated_visible] at @s run function do2:dev/markers/turn_visible/l2willie -execute if block -528 117 1943 minecraft:lever[powered=false] if entity @e[tag=frustrated_visible,tag=L2WILLIE] run function do2:dev/markers/turn_invisible/l2willie - -execute if block -528 117 1942 minecraft:lever[powered=true] as @e[type=marker,tag=fish_marker] unless entity @s[tag=frustrated_visible] at @s run function do2:dev/markers/turn_visible/fish_marker -execute if block -528 117 1942 minecraft:lever[powered=false] if entity @e[tag=frustrated_visible,tag=fish_marker] run function do2:dev/markers/turn_invisible/fish_marker +# Turn Visible +execute if block -529 117 1946 lever[powered=true] as @e[type=marker,tag=L0Z1] unless entity @s[tag=marker_visible] at @s run function do2:mob_controller/marker_visibility/turn_visible/l0z1 +execute if block -529 117 1945 lever[powered=true] as @e[type=marker,tag=L0Z2] unless entity @s[tag=marker_visible] at @s run function do2:mob_controller/marker_visibility/turn_visible/l0z2 +execute if block -529 117 1943 lever[powered=true] as @e[type=marker,tag=fish_marker] unless entity @s[tag=marker_visible] at @s run function do2:mob_controller/marker_visibility/turn_visible/fish_marker +# Turn Invisible +execute if block -529 117 1946 minecraft:lever[powered=false] if entity @e[tag=marker_visible,tag=L0Z1] run function do2:mob_controller/marker_visibility/turn_invisible/l0z1 +execute if block -529 117 1945 minecraft:lever[powered=false] if entity @e[tag=marker_visible,tag=L0Z2] run function do2:mob_controller/marker_visibility/turn_invisible/l0z2 +execute if block -529 117 1943 minecraft:lever[powered=false] if entity @e[tag=marker_visible,tag=fish_marker] run function do2:mob_controller/marker_visibility/turn_invisible/fish_marker diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/per_tick/l1.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/per_tick/l1.mcfunction index fa141b6c..6b303516 100644 --- a/Brilliance Datapack/data/do2/functions/mob_controller/per_tick/l1.mcfunction +++ b/Brilliance Datapack/data/do2/functions/mob_controller/per_tick/l1.mcfunction @@ -5,28 +5,28 @@ execute if score $dungeon do2.config.mc.level1Zones matches 1 if block -525 115 # - TURN VISIBLE - # No Zones Levers -execute if score $dungeon do2.config.mc.level1Zones matches 0 if block -528 117 1946 lever[powered=true] as @e[type=marker,tag=L1Z1] unless entity @s[tag=frustrated_visible] at @s run function do2:dev/markers/turn_visible/l1z1 -execute if score $dungeon do2.config.mc.level1Zones matches 0 if block -528 117 1945 lever[powered=true] as @e[type=marker,tag=L1Z2] unless entity @s[tag=frustrated_visible] at @s run function do2:dev/markers/turn_visible/l1z2 -execute if score $dungeon do2.config.mc.level1Zones matches 0 if block -528 117 1944 lever[powered=true] as @e[type=marker,tag=L1Z3] unless entity @s[tag=frustrated_visible] at @s run function do2:dev/markers/turn_visible/l1z3 -execute if score $dungeon do2.config.mc.level1Zones matches 0 if block -528 117 1943 lever[powered=true] as @e[type=marker,tag=L1Z4] unless entity @s[tag=frustrated_visible] at @s run function do2:dev/markers/turn_visible/l1z4 -execute if score $dungeon do2.config.mc.level1Zones matches 0 if block -528 117 1942 lever[powered=true] as @e[type=marker,tag=L1Z5] unless entity @s[tag=frustrated_visible] at @s run function do2:dev/markers/turn_visible/l1z5 +execute if score $dungeon do2.config.mc.level1Zones matches 0 if block -529 117 1946 lever[powered=true] as @e[type=marker,tag=L1Z1] unless entity @s[tag=marker_visible] at @s run function do2:mob_controller/marker_visibility/turn_visible/l1z1 +execute if score $dungeon do2.config.mc.level1Zones matches 0 if block -529 117 1945 lever[powered=true] as @e[type=marker,tag=L1Z2] unless entity @s[tag=marker_visible] at @s run function do2:mob_controller/marker_visibility/turn_visible/l1z2 +execute if score $dungeon do2.config.mc.level1Zones matches 0 if block -529 117 1944 lever[powered=true] as @e[type=marker,tag=L1Z3] unless entity @s[tag=marker_visible] at @s run function do2:mob_controller/marker_visibility/turn_visible/l1z3 +execute if score $dungeon do2.config.mc.level1Zones matches 0 if block -529 117 1943 lever[powered=true] as @e[type=marker,tag=L1Z4] unless entity @s[tag=marker_visible] at @s run function do2:mob_controller/marker_visibility/turn_visible/l1z4 +execute if score $dungeon do2.config.mc.level1Zones matches 0 if block -529 117 1942 lever[powered=true] as @e[type=marker,tag=L1Z5] unless entity @s[tag=marker_visible] at @s run function do2:mob_controller/marker_visibility/turn_visible/l1z5 # With Zones Levers -execute if score $dungeon do2.config.mc.level1Zones matches 1 if block -528 117 1945 lever[powered=true] as @e[type=marker,tag=L1Z1] unless entity @s[tag=frustrated_visible] at @s run function do2:dev/markers/turn_visible/l1z1 -execute if score $dungeon do2.config.mc.level1Zones matches 1 if block -528 117 1944 lever[powered=true] as @e[type=marker,tag=L1Z2] unless entity @s[tag=frustrated_visible] at @s run function do2:dev/markers/turn_visible/l1z2 -execute if score $dungeon do2.config.mc.level1Zones matches 1 if block -528 117 1943 lever[powered=true] as @e[type=marker,tag=L1Z3] unless entity @s[tag=frustrated_visible] at @s run function do2:dev/markers/turn_visible/l1z3 +execute if score $dungeon do2.config.mc.level1Zones matches 1 if block -529 117 1945 lever[powered=true] as @e[type=marker,tag=L1Z1] unless entity @s[tag=marker_visible] at @s run function do2:mob_controller/marker_visibility/turn_visible/l1z1 +execute if score $dungeon do2.config.mc.level1Zones matches 1 if block -529 117 1944 lever[powered=true] as @e[type=marker,tag=L1Z2] unless entity @s[tag=marker_visible] at @s run function do2:mob_controller/marker_visibility/turn_visible/l1z2 +execute if score $dungeon do2.config.mc.level1Zones matches 1 if block -529 117 1943 lever[powered=true] as @e[type=marker,tag=L1Z3] unless entity @s[tag=marker_visible] at @s run function do2:mob_controller/marker_visibility/turn_visible/l1z3 # - TURN INVISIBLE - # No Zones Levers -execute if score $dungeon do2.config.mc.level1Zones matches 0 if block -528 117 1946 minecraft:lever[powered=false] if entity @e[tag=frustrated_visible,tag=L1Z1] run function do2:dev/markers/turn_invisible/l1z1 -execute if score $dungeon do2.config.mc.level1Zones matches 0 if block -528 117 1945 minecraft:lever[powered=false] if entity @e[tag=frustrated_visible,tag=L1Z2] run function do2:dev/markers/turn_invisible/l1z2 -execute if score $dungeon do2.config.mc.level1Zones matches 0 if block -528 117 1944 minecraft:lever[powered=false] if entity @e[tag=frustrated_visible,tag=L1Z3] run function do2:dev/markers/turn_invisible/l1z3 -execute if score $dungeon do2.config.mc.level1Zones matches 0 if block -528 117 1943 minecraft:lever[powered=false] if entity @e[tag=frustrated_visible,tag=L1Z4] run function do2:dev/markers/turn_invisible/l1z4 -execute if score $dungeon do2.config.mc.level1Zones matches 0 if block -528 117 1942 minecraft:lever[powered=false] if entity @e[tag=frustrated_visible,tag=L1Z5] run function do2:dev/markers/turn_invisible/l1z5 +execute if score $dungeon do2.config.mc.level1Zones matches 0 if block -529 117 1946 minecraft:lever[powered=false] if entity @e[tag=marker_visible,tag=L1Z1] run function do2:mob_controller/marker_visibility/turn_invisible/l1z1 +execute if score $dungeon do2.config.mc.level1Zones matches 0 if block -529 117 1945 minecraft:lever[powered=false] if entity @e[tag=marker_visible,tag=L1Z2] run function do2:mob_controller/marker_visibility/turn_invisible/l1z2 +execute if score $dungeon do2.config.mc.level1Zones matches 0 if block -529 117 1944 minecraft:lever[powered=false] if entity @e[tag=marker_visible,tag=L1Z3] run function do2:mob_controller/marker_visibility/turn_invisible/l1z3 +execute if score $dungeon do2.config.mc.level1Zones matches 0 if block -529 117 1943 minecraft:lever[powered=false] if entity @e[tag=marker_visible,tag=L1Z4] run function do2:mob_controller/marker_visibility/turn_invisible/l1z4 +execute if score $dungeon do2.config.mc.level1Zones matches 0 if block -529 117 1942 minecraft:lever[powered=false] if entity @e[tag=marker_visible,tag=L1Z5] run function do2:mob_controller/marker_visibility/turn_invisible/l1z5 # With Zones Levers -execute if score $dungeon do2.config.mc.level1Zones matches 1 if block -528 117 1945 minecraft:lever[powered=false] if entity @e[tag=frustrated_visible,tag=L1Z1] run function do2:dev/markers/turn_invisible/l1z1 -execute if score $dungeon do2.config.mc.level1Zones matches 1 if block -528 117 1944 minecraft:lever[powered=false] if entity @e[tag=frustrated_visible,tag=L1Z2] run function do2:dev/markers/turn_invisible/l1z2 -execute if score $dungeon do2.config.mc.level1Zones matches 1 if block -528 117 1943 minecraft:lever[powered=false] if entity @e[tag=frustrated_visible,tag=L1Z3] run function do2:dev/markers/turn_invisible/l1z3 +execute if score $dungeon do2.config.mc.level1Zones matches 1 if block -529 117 1945 minecraft:lever[powered=false] if entity @e[tag=marker_visible,tag=L1Z1] run function do2:mob_controller/marker_visibility/turn_invisible/l1z1 +execute if score $dungeon do2.config.mc.level1Zones matches 1 if block -529 117 1944 minecraft:lever[powered=false] if entity @e[tag=marker_visible,tag=L1Z2] run function do2:mob_controller/marker_visibility/turn_invisible/l1z2 +execute if score $dungeon do2.config.mc.level1Zones matches 1 if block -529 117 1943 minecraft:lever[powered=false] if entity @e[tag=marker_visible,tag=L1Z3] run function do2:mob_controller/marker_visibility/turn_invisible/l1z3 diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/per_tick/l2.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/per_tick/l2.mcfunction index f6287ef5..75c327e1 100644 --- a/Brilliance Datapack/data/do2/functions/mob_controller/per_tick/l2.mcfunction +++ b/Brilliance Datapack/data/do2/functions/mob_controller/per_tick/l2.mcfunction @@ -4,28 +4,28 @@ execute if score $dungeon do2.config.mc.level2Zones matches 1 if block -525 115 # - TURN VISIBLE - # No Zones Levers -execute if score $dungeon do2.config.mc.level2Zones matches 0 if block -528 117 1946 lever[powered=true] as @e[type=marker,tag=L2Z1] unless entity @s[tag=frustrated_visible] at @s run function do2:dev/markers/turn_visible/l2z1 -execute if score $dungeon do2.config.mc.level2Zones matches 0 if block -528 117 1945 lever[powered=true] as @e[type=marker,tag=L2Z2] unless entity @s[tag=frustrated_visible] at @s run function do2:dev/markers/turn_visible/l2z2 -execute if score $dungeon do2.config.mc.level2Zones matches 0 if block -528 117 1944 lever[powered=true] as @e[type=marker,tag=L2Z3] unless entity @s[tag=frustrated_visible] at @s run function do2:dev/markers/turn_visible/l2z3 -execute if score $dungeon do2.config.mc.level2Zones matches 0 if block -528 117 1943 lever[powered=true] as @e[type=marker,tag=L2Z4] unless entity @s[tag=frustrated_visible] at @s run function do2:dev/markers/turn_visible/l2z4 -execute if score $dungeon do2.config.mc.level2Zones matches 0 if block -528 117 1942 lever[powered=true] as @e[type=marker,tag=L2Z5] unless entity @s[tag=frustrated_visible] at @s run function do2:dev/markers/turn_visible/l2z5 +execute if score $dungeon do2.config.mc.level2Zones matches 0 if block -529 117 1946 lever[powered=true] as @e[type=marker,tag=L2Z1] unless entity @s[tag=marker_visible] at @s run function do2:mob_controller/marker_visibility/turn_visible/l2z1 +execute if score $dungeon do2.config.mc.level2Zones matches 0 if block -529 117 1945 lever[powered=true] as @e[type=marker,tag=L2Z2] unless entity @s[tag=marker_visible] at @s run function do2:mob_controller/marker_visibility/turn_visible/l2z2 +execute if score $dungeon do2.config.mc.level2Zones matches 0 if block -529 117 1944 lever[powered=true] as @e[type=marker,tag=L2Z3] unless entity @s[tag=marker_visible] at @s run function do2:mob_controller/marker_visibility/turn_visible/l2z3 +execute if score $dungeon do2.config.mc.level2Zones matches 0 if block -529 117 1943 lever[powered=true] as @e[type=marker,tag=L2Z4] unless entity @s[tag=marker_visible] at @s run function do2:mob_controller/marker_visibility/turn_visible/l2z4 +execute if score $dungeon do2.config.mc.level2Zones matches 0 if block -529 117 1942 lever[powered=true] as @e[type=marker,tag=L2Z5] unless entity @s[tag=marker_visible] at @s run function do2:mob_controller/marker_visibility/turn_visible/l2z5 # With Zones Levers -execute if score $dungeon do2.config.mc.level2Zones matches 1 if block -528 117 1945 lever[powered=true] as @e[type=marker,tag=L2Z1] unless entity @s[tag=frustrated_visible] at @s run function do2:dev/markers/turn_visible/l2z1 -execute if score $dungeon do2.config.mc.level2Zones matches 1 if block -528 117 1944 lever[powered=true] as @e[type=marker,tag=L2Z2] unless entity @s[tag=frustrated_visible] at @s run function do2:dev/markers/turn_visible/l2z2 -execute if score $dungeon do2.config.mc.level2Zones matches 1 if block -528 117 1943 lever[powered=true] as @e[type=marker,tag=L2Z3] unless entity @s[tag=frustrated_visible] at @s run function do2:dev/markers/turn_visible/l2z3 +execute if score $dungeon do2.config.mc.level2Zones matches 1 if block -529 117 1945 lever[powered=true] as @e[type=marker,tag=L2Z1] unless entity @s[tag=marker_visible] at @s run function do2:mob_controller/marker_visibility/turn_visible/l2z1 +execute if score $dungeon do2.config.mc.level2Zones matches 1 if block -529 117 1944 lever[powered=true] as @e[type=marker,tag=L2Z2] unless entity @s[tag=marker_visible] at @s run function do2:mob_controller/marker_visibility/turn_visible/l2z2 +execute if score $dungeon do2.config.mc.level2Zones matches 1 if block -529 117 1943 lever[powered=true] as @e[type=marker,tag=L2Z3] unless entity @s[tag=marker_visible] at @s run function do2:mob_controller/marker_visibility/turn_visible/l2z3 # - TURN INVISIBLE - # No Zones Levers -execute if score $dungeon do2.config.mc.level2Zones matches 0 if block -528 117 1946 minecraft:lever[powered=false] if entity @e[tag=frustrated_visible,tag=L2Z1] run function do2:dev/markers/turn_invisible/l2z1 -execute if score $dungeon do2.config.mc.level2Zones matches 0 if block -528 117 1945 minecraft:lever[powered=false] if entity @e[tag=frustrated_visible,tag=L2Z2] run function do2:dev/markers/turn_invisible/l2z2 -execute if score $dungeon do2.config.mc.level2Zones matches 0 if block -528 117 1944 minecraft:lever[powered=false] if entity @e[tag=frustrated_visible,tag=L2Z3] run function do2:dev/markers/turn_invisible/l2z3 -execute if score $dungeon do2.config.mc.level2Zones matches 0 if block -528 117 1943 minecraft:lever[powered=false] if entity @e[tag=frustrated_visible,tag=L2Z4] run function do2:dev/markers/turn_invisible/l2z4 -execute if score $dungeon do2.config.mc.level2Zones matches 0 if block -528 117 1942 minecraft:lever[powered=false] if entity @e[tag=frustrated_visible,tag=L2Z5] run function do2:dev/markers/turn_invisible/l2z5 +execute if score $dungeon do2.config.mc.level2Zones matches 0 if block -529 117 1946 minecraft:lever[powered=false] if entity @e[tag=marker_visible,tag=L2Z1] run function do2:mob_controller/marker_visibility/turn_invisible/l2z1 +execute if score $dungeon do2.config.mc.level2Zones matches 0 if block -529 117 1945 minecraft:lever[powered=false] if entity @e[tag=marker_visible,tag=L2Z2] run function do2:mob_controller/marker_visibility/turn_invisible/l2z2 +execute if score $dungeon do2.config.mc.level2Zones matches 0 if block -529 117 1944 minecraft:lever[powered=false] if entity @e[tag=marker_visible,tag=L2Z3] run function do2:mob_controller/marker_visibility/turn_invisible/l2z3 +execute if score $dungeon do2.config.mc.level2Zones matches 0 if block -529 117 1943 minecraft:lever[powered=false] if entity @e[tag=marker_visible,tag=L2Z4] run function do2:mob_controller/marker_visibility/turn_invisible/l2z4 +execute if score $dungeon do2.config.mc.level2Zones matches 0 if block -529 117 1942 minecraft:lever[powered=false] if entity @e[tag=marker_visible,tag=L2Z5] run function do2:mob_controller/marker_visibility/turn_invisible/l2z5 # With Zones Levers -execute if score $dungeon do2.config.mc.level2Zones matches 1 if block -528 117 1945 minecraft:lever[powered=false] if entity @e[tag=frustrated_visible,tag=L2Z1] run function do2:dev/markers/turn_invisible/l2z1 -execute if score $dungeon do2.config.mc.level2Zones matches 1 if block -528 117 1944 minecraft:lever[powered=false] if entity @e[tag=frustrated_visible,tag=L2Z2] run function do2:dev/markers/turn_invisible/l2z2 -execute if score $dungeon do2.config.mc.level2Zones matches 1 if block -528 117 1943 minecraft:lever[powered=false] if entity @e[tag=frustrated_visible,tag=L2Z3] run function do2:dev/markers/turn_invisible/l2z3 +execute if score $dungeon do2.config.mc.level2Zones matches 1 if block -529 117 1945 minecraft:lever[powered=false] if entity @e[tag=marker_visible,tag=L2Z1] run function do2:mob_controller/marker_visibility/turn_invisible/l2z1 +execute if score $dungeon do2.config.mc.level2Zones matches 1 if block -529 117 1944 minecraft:lever[powered=false] if entity @e[tag=marker_visible,tag=L2Z2] run function do2:mob_controller/marker_visibility/turn_invisible/l2z2 +execute if score $dungeon do2.config.mc.level2Zones matches 1 if block -529 117 1943 minecraft:lever[powered=false] if entity @e[tag=marker_visible,tag=L2Z3] run function do2:mob_controller/marker_visibility/turn_invisible/l2z3 diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/per_tick/l2_other.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/per_tick/l2_other.mcfunction new file mode 100644 index 00000000..bd419b72 --- /dev/null +++ b/Brilliance Datapack/data/do2/functions/mob_controller/per_tick/l2_other.mcfunction @@ -0,0 +1,8 @@ +# Turn Visible +execute if block -529 117 1945 lever[powered=true] as @e[type=marker,tag=L0GHOST] unless entity @s[tag=marker_visible] at @s run function do2:mob_controller/marker_visibility/turn_visible/l2ghost +execute if block -529 117 1944 lever[powered=true] as @e[type=marker,tag=L2WILLIE] unless entity @s[tag=marker_visible] at @s run function do2:mob_controller/marker_visibility/turn_visible/l2willie +execute if block -529 117 1943 lever[powered=true] as @e[type=marker,tag=L2MITES] unless entity @s[tag=marker_visible] at @s run function do2:mob_controller/marker_visibility/turn_visible/l2mites +# Turn Invisible +execute if block -529 117 1945 minecraft:lever[powered=false] if entity @e[tag=marker_visible,tag=L0GHOST] run function do2:mob_controller/marker_visibility/turn_invisible/l2ghost +execute if block -529 117 1944 minecraft:lever[powered=false] if entity @e[tag=marker_visible,tag=L2WILLIE] run function do2:mob_controller/marker_visibility/turn_invisible/l2willie +execute if block -529 117 1943 minecraft:lever[powered=false] if entity @e[tag=marker_visible,tag=L2MITES] run function do2:mob_controller/marker_visibility/turn_invisible/l2mites diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/per_tick/l3.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/per_tick/l3.mcfunction index df92eb1e..2d717be9 100644 --- a/Brilliance Datapack/data/do2/functions/mob_controller/per_tick/l3.mcfunction +++ b/Brilliance Datapack/data/do2/functions/mob_controller/per_tick/l3.mcfunction @@ -1,8 +1,8 @@ # Turn Visible -execute if block -528 117 1945 lever[powered=true] as @e[type=marker,tag=L3Z1] unless entity @s[tag=frustrated_visible] at @s run function do2:dev/markers/turn_visible/l3z1 -execute if block -528 117 1944 lever[powered=true] as @e[type=marker,tag=L3Z2] unless entity @s[tag=frustrated_visible] at @s run function do2:dev/markers/turn_visible/l3z2 -execute if block -528 117 1943 lever[powered=true] as @e[type=marker,tag=L3Z3] unless entity @s[tag=frustrated_visible] at @s run function do2:dev/markers/turn_visible/l3z3 +execute if block -529 117 1945 lever[powered=true] as @e[type=marker,tag=L3Z1] unless entity @s[tag=marker_visible] at @s run function do2:mob_controller/marker_visibility/turn_visible/l3z1 +execute if block -529 117 1944 lever[powered=true] as @e[type=marker,tag=L3Z2] unless entity @s[tag=marker_visible] at @s run function do2:mob_controller/marker_visibility/turn_visible/l3z2 +execute if block -529 117 1943 lever[powered=true] as @e[type=marker,tag=L3Z3] unless entity @s[tag=marker_visible] at @s run function do2:mob_controller/marker_visibility/turn_visible/l3z3 # Turn Invisible -execute if block -528 117 1945 minecraft:lever[powered=false] if entity @e[tag=frustrated_visible,tag=L3Z1] run function do2:dev/markers/turn_invisible/l3z1 -execute if block -528 117 1944 minecraft:lever[powered=false] if entity @e[tag=frustrated_visible,tag=L3Z2] run function do2:dev/markers/turn_invisible/l3z2 -execute if block -528 117 1943 minecraft:lever[powered=false] if entity @e[tag=frustrated_visible,tag=L3Z3] run function do2:dev/markers/turn_invisible/l3z3 +execute if block -529 117 1945 minecraft:lever[powered=false] if entity @e[tag=marker_visible,tag=L3Z1] run function do2:mob_controller/marker_visibility/turn_invisible/l3z1 +execute if block -529 117 1944 minecraft:lever[powered=false] if entity @e[tag=marker_visible,tag=L3Z2] run function do2:mob_controller/marker_visibility/turn_invisible/l3z2 +execute if block -529 117 1943 minecraft:lever[powered=false] if entity @e[tag=marker_visible,tag=L3Z3] run function do2:mob_controller/marker_visibility/turn_invisible/l3z3 diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/per_tick/l4.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/per_tick/l4.mcfunction index f724681f..d4c578ed 100644 --- a/Brilliance Datapack/data/do2/functions/mob_controller/per_tick/l4.mcfunction +++ b/Brilliance Datapack/data/do2/functions/mob_controller/per_tick/l4.mcfunction @@ -4,24 +4,24 @@ execute if score $dungeon do2.config.mc.level4Zones matches 1 if block -525 115 # - TURN VISIBLE - # With Zones Levers -execute if score $dungeon do2.config.mc.level4Zones matches 1 if block -528 117 1945 lever[powered=true] as @e[type=marker,tag=L4Z1] unless entity @s[tag=frustrated_visible] at @s run function do2:dev/markers/turn_visible/l4z1 -execute if score $dungeon do2.config.mc.level4Zones matches 1 if block -528 117 1944 lever[powered=true] as @e[type=marker,tag=L4Z2] unless entity @s[tag=frustrated_visible] at @s run function do2:dev/markers/turn_visible/l4z2 -execute if score $dungeon do2.config.mc.level4Zones matches 1 if block -528 117 1943 lever[powered=true] as @e[type=marker,tag=L4Z3] unless entity @s[tag=frustrated_visible] at @s run function do2:dev/markers/turn_visible/l4z3 +execute if score $dungeon do2.config.mc.level4Zones matches 1 if block -529 117 1945 lever[powered=true] as @e[type=marker,tag=L4Z1] unless entity @s[tag=marker_visible] at @s run function do2:mob_controller/marker_visibility/turn_visible/l4z1 +execute if score $dungeon do2.config.mc.level4Zones matches 1 if block -529 117 1944 lever[powered=true] as @e[type=marker,tag=L4Z2] unless entity @s[tag=marker_visible] at @s run function do2:mob_controller/marker_visibility/turn_visible/l4z2 +execute if score $dungeon do2.config.mc.level4Zones matches 1 if block -529 117 1943 lever[powered=true] as @e[type=marker,tag=L4Z3] unless entity @s[tag=marker_visible] at @s run function do2:mob_controller/marker_visibility/turn_visible/l4z3 # No Zones Levers -execute if score $dungeon do2.config.mc.level4Zones matches 0 if block -528 117 1945 lever[powered=true] as @e[type=marker,tag=L4Z1] unless entity @s[tag=frustrated_visible] at @s run function do2:dev/markers/turn_visible/l4z1 -execute if score $dungeon do2.config.mc.level4Zones matches 0 if block -528 117 1944 lever[powered=true] as @e[type=marker,tag=L4Z2] unless entity @s[tag=frustrated_visible] at @s run function do2:dev/markers/turn_visible/l4z2 -execute if score $dungeon do2.config.mc.level4Zones matches 0 if block -528 117 1943 lever[powered=true] as @e[type=marker,tag=L4Z3] unless entity @s[tag=frustrated_visible] at @s run function do2:dev/markers/turn_visible/l4z3 +execute if score $dungeon do2.config.mc.level4Zones matches 0 if block -529 117 1945 lever[powered=true] as @e[type=marker,tag=L4Z1] unless entity @s[tag=marker_visible] at @s run function do2:mob_controller/marker_visibility/turn_visible/l4z1 +execute if score $dungeon do2.config.mc.level4Zones matches 0 if block -529 117 1944 lever[powered=true] as @e[type=marker,tag=L4Z2] unless entity @s[tag=marker_visible] at @s run function do2:mob_controller/marker_visibility/turn_visible/l4z2 +execute if score $dungeon do2.config.mc.level4Zones matches 0 if block -529 117 1943 lever[powered=true] as @e[type=marker,tag=L4Z3] unless entity @s[tag=marker_visible] at @s run function do2:mob_controller/marker_visibility/turn_visible/l4z3 # - TURN INVISIBLE - # With Zones Levers -execute if score $dungeon do2.config.mc.level4Zones matches 1 if block -528 117 1945 minecraft:lever[powered=false] if entity @e[tag=frustrated_visible,tag=L4Z1] run function do2:dev/markers/turn_invisible/l4z1 -execute if score $dungeon do2.config.mc.level4Zones matches 1 if block -528 117 1944 minecraft:lever[powered=false] if entity @e[tag=frustrated_visible,tag=L4Z2] run function do2:dev/markers/turn_invisible/l4z2 -execute if score $dungeon do2.config.mc.level4Zones matches 1 if block -528 117 1943 minecraft:lever[powered=false] if entity @e[tag=frustrated_visible,tag=L4Z3] run function do2:dev/markers/turn_invisible/l4z3 +execute if score $dungeon do2.config.mc.level4Zones matches 1 if block -529 117 1945 minecraft:lever[powered=false] if entity @e[tag=marker_visible,tag=L4Z1] run function do2:mob_controller/marker_visibility/turn_invisible/l4z1 +execute if score $dungeon do2.config.mc.level4Zones matches 1 if block -529 117 1944 minecraft:lever[powered=false] if entity @e[tag=marker_visible,tag=L4Z2] run function do2:mob_controller/marker_visibility/turn_invisible/l4z2 +execute if score $dungeon do2.config.mc.level4Zones matches 1 if block -529 117 1943 minecraft:lever[powered=false] if entity @e[tag=marker_visible,tag=L4Z3] run function do2:mob_controller/marker_visibility/turn_invisible/l4z3 # No Zones Levers -execute if score $dungeon do2.config.mc.level4Zones matches 0 if block -528 117 1945 minecraft:lever[powered=false] if entity @e[tag=frustrated_visible,tag=L4Z1] run function do2:dev/markers/turn_invisible/l4z1 -execute if score $dungeon do2.config.mc.level4Zones matches 0 if block -528 117 1944 minecraft:lever[powered=false] if entity @e[tag=frustrated_visible,tag=L4Z2] run function do2:dev/markers/turn_invisible/l4z2 -execute if score $dungeon do2.config.mc.level4Zones matches 0 if block -528 117 1943 minecraft:lever[powered=false] if entity @e[tag=frustrated_visible,tag=L4Z3] run function do2:dev/markers/turn_invisible/l4z3 +execute if score $dungeon do2.config.mc.level4Zones matches 0 if block -529 117 1945 minecraft:lever[powered=false] if entity @e[tag=marker_visible,tag=L4Z1] run function do2:mob_controller/marker_visibility/turn_invisible/l4z1 +execute if score $dungeon do2.config.mc.level4Zones matches 0 if block -529 117 1944 minecraft:lever[powered=false] if entity @e[tag=marker_visible,tag=L4Z2] run function do2:mob_controller/marker_visibility/turn_invisible/l4z2 +execute if score $dungeon do2.config.mc.level4Zones matches 0 if block -529 117 1943 minecraft:lever[powered=false] if entity @e[tag=marker_visible,tag=L4Z3] run function do2:mob_controller/marker_visibility/turn_invisible/l4z3 diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/reset_to_default/individual/backrooms.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/reset_to_default/individual/backrooms.mcfunction index a20cd011..50265f44 100644 --- a/Brilliance Datapack/data/do2/functions/mob_controller/reset_to_default/individual/backrooms.mcfunction +++ b/Brilliance Datapack/data/do2/functions/mob_controller/reset_to_default/individual/backrooms.mcfunction @@ -1,9 +1,7 @@ # Mob Amount -data merge block -529 114 1946 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Ravager","italic":false}'}}}]} -data merge block -529 114 1945 {Items:[{Slot:0b, id: "minecraft:player_head", Count: 1b, tag: {display: {Name: '{"text":"Drowned","italic":false}'}, SkullOwner: {Properties: {textures: [{Value: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYzNmN2NjZjYxZGJjM2Y5ZmU5YTYzMzNjZGUwYzBlMTQzOTllYjJlZWE3MWQzNGNmMjIzYjNhY2UyMjA1MSJ9fX0="}]}, Id: [I; 790009440, 1639859901, -1397417282, -100772047], Name: "Drowned"}}}]} -data merge block -529 114 1943 {Items:[{Slot:0b, id: "minecraft:player_head", Count: 1b, tag: {display: {Name: '{"text":"Drowned","italic":false}'}, SkullOwner: {Properties: {textures: [{Value: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYzNmN2NjZjYxZGJjM2Y5ZmU5YTYzMzNjZGUwYzBlMTQzOTllYjJlZWE3MWQzNGNmMjIzYjNhY2UyMjA1MSJ9fX0="}]}, Id: [I; 790009440, 1639859901, -1397417282, -100772047], Name: "Drowned"}}}]} +data merge block -530 114 1946 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Ravager","italic":false,"color":"white"}'}}}]} +data merge block -530 114 1945 {Items:[{Slot:0b, id: "minecraft:player_head", Count: 1b, tag: {display: {Name: '{"text":"Drowned","italic":false,"color":"white"}'}, SkullOwner: {Properties: {textures: [{Value: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYzNmN2NjZjYxZGJjM2Y5ZmU5YTYzMzNjZGUwYzBlMTQzOTllYjJlZWE3MWQzNGNmMjIzYjNhY2UyMjA1MSJ9fX0="}]}, Id: [I; 790009440, 1639859901, -1397417282, -100772047], Name: "Drowned"}}}]} # Mob Names -data merge block -529 115 1946 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Jellie"}'}}}]} -data merge block -529 115 1945 {Items:[{Slot:0b, id: "minecraft:player_head", Count: 1b, tag: {display: {Name: '{"text":"The Worst!!!"}'}, SkullOwner: {Properties: {textures: [{Value: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYzNmN2NjZjYxZGJjM2Y5ZmU5YTYzMzNjZGUwYzBlMTQzOTllYjJlZWE3MWQzNGNmMjIzYjNhY2UyMjA1MSJ9fX0="}]}, Id: [I; 790009440, 1639859901, -1397417282, -100772047], Name: "Drowned"}}}]} -data merge block -529 115 1943 {Items:[{Slot:0b, id: "minecraft:player_head", Count: 1b, tag: {display: {Name: '{"text":"One Eyed Willie"}'}, SkullOwner: {Properties: {textures: [{Value: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYzNmN2NjZjYxZGJjM2Y5ZmU5YTYzMzNjZGUwYzBlMTQzOTllYjJlZWE3MWQzNGNmMjIzYjNhY2UyMjA1MSJ9fX0="}]}, Id: [I; 790009440, 1639859901, -1397417282, -100772047], Name: "Drowned"}}}]} +data merge block -530 115 1946 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Jellie","color":"white"}'}}}]} +data merge block -530 115 1945 {Items:[{Slot:0b, id: "minecraft:player_head", Count: 1b, tag: {display: {Name: '{"text":"The Worst!!!","color":"white"}'}, SkullOwner: {Properties: {textures: [{Value: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYzNmN2NjZjYxZGJjM2Y5ZmU5YTYzMzNjZGUwYzBlMTQzOTllYjJlZWE3MWQzNGNmMjIzYjNhY2UyMjA1MSJ9fX0="}]}, Id: [I; 790009440, 1639859901, -1397417282, -100772047], Name: "Drowned"}}}]} diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/reset_to_default/individual/l1_no_zones.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/reset_to_default/individual/l1_no_zones.mcfunction index 59f26da7..49bf3dd5 100644 --- a/Brilliance Datapack/data/do2/functions/mob_controller/reset_to_default/individual/l1_no_zones.mcfunction +++ b/Brilliance Datapack/data/do2/functions/mob_controller/reset_to_default/individual/l1_no_zones.mcfunction @@ -1,14 +1,14 @@ # Ravager Amount -data merge block -529 114 1946 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Ravager","italic":false}'}}}]} -data merge block -529 114 1945 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Ravager","italic":false}'}}}]} -data merge block -529 114 1944 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Ravager","italic":false}'}}}]} -data merge block -529 114 1943 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Ravager","italic":false}'}}}]} -data merge block -529 114 1942 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Ravager","italic":false}'}}}]} +data merge block -530 114 1946 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Ravager","italic":false,"color":"white"}'}}}]} +data merge block -530 114 1945 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Ravager","italic":false,"color":"white"}'}}}]} +data merge block -530 114 1944 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Ravager","italic":false,"color":"white"}'}}}]} +data merge block -530 114 1943 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Ravager","italic":false,"color":"white"}'}}}]} +data merge block -530 114 1942 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Ravager","italic":false,"color":"white"}'}}}]} # Ravager Names -data merge block -529 115 1946 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Stumbles"}'}}}]} -data merge block -529 115 1945 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Laser Beams!"}'}}}]} -data merge block -529 115 1944 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Lasagna"}'}}}]} -data merge block -529 115 1943 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Hot Breath"}'}}}]} -data merge block -529 115 1942 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Mr. Poopy Head"}'}}}]} +data merge block -530 115 1946 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Stumbles","color":"white"}'}}}]} +data merge block -530 115 1945 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Laser Beams!","color":"white"}'}}}]} +data merge block -530 115 1944 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Lasagna","color":"white"}'}}}]} +data merge block -530 115 1943 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Hot Breath","color":"white"}'}}}]} +data merge block -530 115 1942 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Mr. Poopy Head","color":"white"}'}}}]} diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/reset_to_default/individual/l1_zones.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/reset_to_default/individual/l1_zones.mcfunction index 0e8c584f..c259ce8e 100644 --- a/Brilliance Datapack/data/do2/functions/mob_controller/reset_to_default/individual/l1_zones.mcfunction +++ b/Brilliance Datapack/data/do2/functions/mob_controller/reset_to_default/individual/l1_zones.mcfunction @@ -1,10 +1,10 @@ # Ravager Amount -data merge block -529 114 1945 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Ravager","italic":false}'}}},{Slot:1b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Ravager","italic":false}'}}}]} -data merge block -529 114 1944 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Ravager","italic":false}'}}},{Slot:1b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Ravager","italic":false}'}}}]} -data merge block -529 114 1943 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Ravager","italic":false}'}}}]} +data merge block -530 114 1945 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Ravager","italic":false,"color":"white"}'}}},{Slot:1b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Ravager","italic":false,"color":"white"}'}}}]} +data merge block -530 114 1944 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Ravager","italic":false,"color":"white"}'}}},{Slot:1b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Ravager","italic":false,"color":"white"}'}}}]} +data merge block -530 114 1943 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Ravager","italic":false,"color":"white"}'}}}]} # Ravager Names -data merge block -529 115 1945 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Stumbles"}'}}},{Slot:1b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Laser Beams!"}'}}}]} -data merge block -529 115 1944 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Lasagna"}'}}},{Slot:1b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Hot Breath"}'}}}]} -data merge block -529 115 1943 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Mr. Poopy Head"}'}}}]} +data merge block -530 115 1945 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Stumbles","color":"white"}'}}},{Slot:1b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Laser Beams!","color":"white"}'}}}]} +data merge block -530 115 1944 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Lasagna","color":"white"}'}}},{Slot:1b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Hot Breath","color":"white"}'}}}]} +data merge block -530 115 1943 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Mr. Poopy Head","color":"white"}'}}}]} diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/reset_to_default/individual/l2_no_zones.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/reset_to_default/individual/l2_no_zones.mcfunction index 5b645ed2..1c14fe95 100644 --- a/Brilliance Datapack/data/do2/functions/mob_controller/reset_to_default/individual/l2_no_zones.mcfunction +++ b/Brilliance Datapack/data/do2/functions/mob_controller/reset_to_default/individual/l2_no_zones.mcfunction @@ -1,13 +1,13 @@ # Ravager Amount -data merge block -529 114 1946 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Ravager","italic":false}'}}}]} -data merge block -529 114 1945 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Ravager","italic":false}'}}}]} -data merge block -529 114 1944 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Ravager","italic":false}'}}}]} -data merge block -529 114 1943 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Ravager","italic":false}'}}}]} -data merge block -529 114 1942 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Ravager","italic":false}'}}}]} +data merge block -530 114 1946 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Ravager","italic":false,"color":"white"}'}}}]} +data merge block -530 114 1945 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Ravager","italic":false,"color":"white"}'}}}]} +data merge block -530 114 1944 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Ravager","italic":false,"color":"white"}'}}}]} +data merge block -530 114 1943 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Ravager","italic":false,"color":"white"}'}}}]} +data merge block -530 114 1942 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Ravager","italic":false,"color":"white"}'}}}]} # Ravager Names -data merge block -529 115 1946 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Skadoodles"}'}}}]} -data merge block -529 115 1945 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Snausages"}'}}}]} -data merge block -529 115 1944 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"big butts and I cannot lie"}'}}}]} -data merge block -529 115 1943 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Sir Fluffykins of the Dungeon"}'}}}]} -data merge block -529 115 1942 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Nugget"}'}}}]} +data merge block -530 115 1946 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Skadoodles","color":"white"}'}}}]} +data merge block -530 115 1945 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Snausages","color":"white"}'}}}]} +data merge block -530 115 1944 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"big butts and I cannot lie","color":"white"}'}}}]} +data merge block -530 115 1943 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Sir Fluffykins of the Dungeon","color":"white"}'}}}]} +data merge block -530 115 1942 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Nugget","color":"white"}'}}}]} diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/reset_to_default/individual/l2_other.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/reset_to_default/individual/l2_other.mcfunction new file mode 100644 index 00000000..820a1b2c --- /dev/null +++ b/Brilliance Datapack/data/do2/functions/mob_controller/reset_to_default/individual/l2_other.mcfunction @@ -0,0 +1,9 @@ +# Mob Amount +data merge block -530 114 1945 {Items:[{Slot:0b, id:"minecraft:player_head", Count: 1b, tag: {display: {Name: '{"text":"Stray","italic":false,"color":"white"}'}, SkullOwner: {Properties: {textures: [{Value: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNzhkZGY3NmU1NTVkZDVjNGFhOGEwYTVmYzU4NDUyMGNkNjNkNDg5YzI1M2RlOTY5ZjdmMjJmODVhOWEyZDU2In19fQ=="}]}, Id: [I; 1682742189,-1786035250,-1657857635,-2051121028], Name: "Stray"}}}]} +data merge block -530 114 1944 {Items:[{Slot:0b, id:"minecraft:player_head", Count: 1b, tag: {display: {Name: '{"text":"Drowned","italic":false,"color":"white"}'}, SkullOwner: {Properties: {textures: [{Value: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYzNmN2NjZjYxZGJjM2Y5ZmU5YTYzMzNjZGUwYzBlMTQzOTllYjJlZWE3MWQzNGNmMjIzYjNhY2UyMjA1MSJ9fX0="}]}, Id: [I; 790009440, 1639859901, -1397417282, -100772047], Name: "Drowned"}}}]} +data merge block -530 114 1943 {Items:[{Slot:0b, id:"minecraft:player_head", Count: 1b, tag: {display: {Name: '{"text":"Endermite","italic":false,"color":"white"}'}, SkullOwner: {Properties: {textures: [{Value: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMTczMDEyN2UzYWM3Njc3MTIyNDIyZGYwMDI4ZDllNzM2OGJkMTU3NzM4YzhjM2NkZGVjYzUwMmU4OTZiZTAxYyJ9fX0="}]}, Id: [I; 1530815666,-1305328669,-1830355387,-499631260], Name: "Endermite"}}},{Slot:1b, id: "minecraft:player_head", Count: 1b, tag: {display: {Name: '{"text":"Endermite","italic":false,"color":"white"}'}, SkullOwner: {Properties: {textures: [{Value: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMTczMDEyN2UzYWM3Njc3MTIyNDIyZGYwMDI4ZDllNzM2OGJkMTU3NzM4YzhjM2NkZGVjYzUwMmU4OTZiZTAxYyJ9fX0="}]}, Id: [I; 1530815666,-1305328669,-1830355387,-499631260], Name: "Endermite"}}}]} + +# Mob Names +data merge block -530 115 1945 {Items:[{Slot:0b, id:"minecraft:player_head", Count: 1b, tag: {display: {Name: '{"text":"Davey Bones","color":"white"}'}, SkullOwner: {Properties: {textures: [{Value: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNzhkZGY3NmU1NTVkZDVjNGFhOGEwYTVmYzU4NDUyMGNkNjNkNDg5YzI1M2RlOTY5ZjdmMjJmODVhOWEyZDU2In19fQ=="}]}, Id: [I; 1682742189,-1786035250,-1657857635,-2051121028], Name: "Stray"}}}]} +data merge block -530 115 1944 {Items:[{Slot:0b, id:"minecraft:player_head", Count: 1b, tag: {display: {Name: '{"text":"One Eyed Willie","color":"white"}'}, SkullOwner: {Properties: {textures: [{Value: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYzNmN2NjZjYxZGJjM2Y5ZmU5YTYzMzNjZGUwYzBlMTQzOTllYjJlZWE3MWQzNGNmMjIzYjNhY2UyMjA1MSJ9fX0="}]}, Id: [I; 790009440, 1639859901, -1397417282, -100772047], Name: "Drowned"}}}]} +data merge block -530 115 1943 {Items:[{Slot:0b, id:"minecraft:player_head", Count: 1b, tag: {display: {Name: '{"text":"Tacticle Tickle","color":"white"}'}, SkullOwner: {Properties: {textures: [{Value: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMTczMDEyN2UzYWM3Njc3MTIyNDIyZGYwMDI4ZDllNzM2OGJkMTU3NzM4YzhjM2NkZGVjYzUwMmU4OTZiZTAxYyJ9fX0="}]}, Id: [I; 1530815666,-1305328669,-1830355387,-499631260], Name: "Endermite"}}},{Slot:1b, id: "minecraft:player_head", Count: 1b, tag: {display: {Name: '{"text":"Frostmite","color":"white"}'}, SkullOwner: {Properties: {textures: [{Value: "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvMTczMDEyN2UzYWM3Njc3MTIyNDIyZGYwMDI4ZDllNzM2OGJkMTU3NzM4YzhjM2NkZGVjYzUwMmU4OTZiZTAxYyJ9fX0="}]}, Id: [I; 1530815666,-1305328669,-1830355387,-499631260], Name: "Endermite"}}}]} diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/reset_to_default/individual/l2_zones.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/reset_to_default/individual/l2_zones.mcfunction index df7f846f..54318c08 100644 --- a/Brilliance Datapack/data/do2/functions/mob_controller/reset_to_default/individual/l2_zones.mcfunction +++ b/Brilliance Datapack/data/do2/functions/mob_controller/reset_to_default/individual/l2_zones.mcfunction @@ -1,9 +1,9 @@ # Ravager Amount -data merge block -529 114 1945 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Ravager","italic":false}'}}},{Slot:1b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Ravager","italic":false}'}}}]} -data merge block -529 114 1944 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Ravager","italic":false}'}}},{Slot:1b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Ravager","italic":false}'}}}]} -data merge block -529 114 1943 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Ravager","italic":false}'}}}]} +data merge block -530 114 1945 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Ravager","italic":false,"color":"white"}'}}},{Slot:1b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Ravager","italic":false}'}}}]} +data merge block -530 114 1944 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Ravager","italic":false,"color":"white"}'}}},{Slot:1b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Ravager","italic":false}'}}}]} +data merge block -530 114 1943 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Ravager","italic":false,"color":"white"}'}}}]} # Ravager Names -data merge block -529 115 1945 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Skadoodles"}'}}},{Slot:1b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Snausages"}'}}}]} -data merge block -529 115 1944 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"big butts and I cannot lie"}'}}},{Slot:1b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Sir Fluffykins of the Dungeon"}'}}}]} -data merge block -529 115 1943 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Nugget"}'}}}]} +data merge block -530 115 1945 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Skadoodles","color":"white"}'}}},{Slot:1b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Snausages","color":"white"}'}}}]} +data merge block -530 115 1944 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"big butts and I cannot lie","color":"white"}'}}},{Slot:1b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Sir Fluffykins of the Dungeon","color":"white"}'}}}]} +data merge block -530 115 1943 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:96,display:{Name:'{"text":"Nugget","color":"white"}'}}}]} diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/reset_to_default/individual/l3.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/reset_to_default/individual/l3.mcfunction index 228ef179..ad089a5a 100644 --- a/Brilliance Datapack/data/do2/functions/mob_controller/reset_to_default/individual/l3.mcfunction +++ b/Brilliance Datapack/data/do2/functions/mob_controller/reset_to_default/individual/l3.mcfunction @@ -1,9 +1,9 @@ # Warden Amount -data merge block -529 114 1945 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:91,display:{Name:'{"text":"Warden","italic":false}'}}}]} -data merge block -529 114 1944 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:91,display:{Name:'{"text":"Warden","italic":false}'}}}]} -data merge block -529 114 1943 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:91,display:{Name:'{"text":"Warden","italic":false}'}}}]} +data merge block -530 114 1945 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:91,display:{Name:'{"text":"Warden","italic":false,"color":"white"}'}}}]} +data merge block -530 114 1944 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:91,display:{Name:'{"text":"Warden","italic":false,"color":"white"}'}}}]} +data merge block -530 114 1943 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:91,display:{Name:'{"text":"Warden","italic":false,"color":"white"}'}}}]} # Warden Names -data merge block -529 115 1945 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:91,display:{Name:'{"text":"Pain"}'}}}]} -data merge block -529 115 1944 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:91,display:{Name:'{"text":"Panic"}'}}}]} -data merge block -529 115 1943 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:91,display:{Name:'{"text":"Pancakes"}'}}}]} +data merge block -530 115 1945 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:91,display:{Name:'{"text":"Pain","color":"white"}'}}}]} +data merge block -530 115 1944 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:91,display:{Name:'{"text":"Panic","color":"white"}'}}}]} +data merge block -530 115 1943 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:91,display:{Name:'{"text":"Pancakes","color":"white"}'}}}]} diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/reset_to_default/individual/l4.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/reset_to_default/individual/l4.mcfunction index 4adc458e..c78d4d20 100644 --- a/Brilliance Datapack/data/do2/functions/mob_controller/reset_to_default/individual/l4.mcfunction +++ b/Brilliance Datapack/data/do2/functions/mob_controller/reset_to_default/individual/l4.mcfunction @@ -1,9 +1,9 @@ # Warden Amount -data merge block -529 114 1945 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:91,display:{Name:'{"text":"Warden","italic":false}'}}}]} -data merge block -529 114 1944 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:91,display:{Name:'{"text":"Warden","italic":false}'}}}]} -data merge block -529 114 1943 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:91,display:{Name:'{"text":"Warden","italic":false}'}}}]} +data merge block -530 114 1945 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:91,display:{Name:'{"text":"Warden","italic":false,"color":"white"}'}}}]} +data merge block -530 114 1944 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:91,display:{Name:'{"text":"Warden","italic":false,"color":"white"}'}}}]} +data merge block -530 114 1943 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:91,display:{Name:'{"text":"Warden","italic":false,"color":"white"}'}}}]} # Warden Names -data merge block -529 115 1945 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:91,display:{Name:'{"text":"Blinky"}'}}}]} -data merge block -529 115 1944 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:91,display:{Name:'{"text":"Inky"}'}}}]} -data merge block -529 115 1943 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:91,display:{Name:'{"text":"Pinky"}'}}}]} +data merge block -530 115 1945 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:91,display:{Name:'{"text":"Blinky","color":"white"}'}}}]} +data merge block -530 115 1944 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:91,display:{Name:'{"text":"Inky","color":"white"}'}}}]} +data merge block -530 115 1943 {Items:[{Slot:0b, id:"minecraft:carved_pumpkin", Count:1b, tag:{CustomModelData:91,display:{Name:'{"text":"Pinky","color":"white"}'}}}]} diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/reset_to_default/reset_all.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/reset_to_default/reset_all.mcfunction index a857a763..5529131a 100644 --- a/Brilliance Datapack/data/do2/functions/mob_controller/reset_to_default/reset_all.mcfunction +++ b/Brilliance Datapack/data/do2/functions/mob_controller/reset_to_default/reset_all.mcfunction @@ -3,22 +3,26 @@ playsound minecraft:block.anvil.place player @a -526 115 1944 0.2 0.1 0 particle minecraft:explosion -528 116 1944 0 1 -2 0 30 force # Reset STORAGES to default, -place template do2:config.mc.storages_default -527 122 1942 none none 1 0 +place template do2:config.mc.storages_default -528 122 1942 none none 1 0 # Reset CURRENT storage # L0 execute if score $dungeon do2.config.mc.levelEditing matches 0 run function do2:mob_controller/reset_to_default/individual/backrooms # L1 -execute if score $dungeon do2.config.mc.levelEditing matches 1 if score $dungeon do2.config.mc.level1Zones matches 0 run function do2:mob_controller/reset_to_default/individual/l1_no_zones -execute if score $dungeon do2.config.mc.levelEditing matches 1 if score $dungeon do2.config.mc.level1Zones matches 1 run function do2:mob_controller/reset_to_default/individual/l1_zones +execute if score $dungeon do2.config.mc.levelEditing matches 10 if score $dungeon do2.config.mc.level1Zones matches 0 run function do2:mob_controller/reset_to_default/individual/l1_no_zones +execute if score $dungeon do2.config.mc.levelEditing matches 10 if score $dungeon do2.config.mc.level1Zones matches 1 run function do2:mob_controller/reset_to_default/individual/l1_zones + # L2 -execute if score $dungeon do2.config.mc.levelEditing matches 2 if score $dungeon do2.config.mc.level2Zones matches 0 run function do2:mob_controller/reset_to_default/individual/l2_no_zones -execute if score $dungeon do2.config.mc.levelEditing matches 2 if score $dungeon do2.config.mc.level2Zones matches 1 run function do2:mob_controller/reset_to_default/individual/l2_zones +execute if score $dungeon do2.config.mc.levelEditing matches 20 if score $dungeon do2.config.mc.level2Zones matches 0 run function do2:mob_controller/reset_to_default/individual/l2_no_zones +execute if score $dungeon do2.config.mc.levelEditing matches 20 if score $dungeon do2.config.mc.level2Zones matches 1 run function do2:mob_controller/reset_to_default/individual/l2_zones + +# L2_other +execute if score $dungeon do2.config.mc.levelEditing matches 21 run function do2:mob_controller/reset_to_default/individual/l2_other # L3 -execute if score $dungeon do2.config.mc.levelEditing matches 3 run function do2:mob_controller/reset_to_default/individual/l3 +execute if score $dungeon do2.config.mc.levelEditing matches 30 run function do2:mob_controller/reset_to_default/individual/l3 # L4 -execute if score $dungeon do2.config.mc.levelEditing matches 4 run function do2:mob_controller/reset_to_default/individual/l4 +execute if score $dungeon do2.config.mc.levelEditing matches 40 run function do2:mob_controller/reset_to_default/individual/l4 diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/reset_to_default/reset_current.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/reset_to_default/reset_current.mcfunction index 805378ac..64629b6c 100644 --- a/Brilliance Datapack/data/do2/functions/mob_controller/reset_to_default/reset_current.mcfunction +++ b/Brilliance Datapack/data/do2/functions/mob_controller/reset_to_default/reset_current.mcfunction @@ -5,14 +5,17 @@ particle minecraft:cloud -528 116 1944 0 1 2 0 1000 force execute if score $dungeon do2.config.mc.levelEditing matches 0 run function do2:mob_controller/reset_to_default/individual/backrooms # L1 -execute if score $dungeon do2.config.mc.levelEditing matches 1 if score $dungeon do2.config.mc.level1Zones matches 0 run function do2:mob_controller/reset_to_default/individual/l1_no_zones -execute if score $dungeon do2.config.mc.levelEditing matches 1 if score $dungeon do2.config.mc.level1Zones matches 1 run function do2:mob_controller/reset_to_default/individual/l1_zones +execute if score $dungeon do2.config.mc.levelEditing matches 10 if score $dungeon do2.config.mc.level1Zones matches 0 run function do2:mob_controller/reset_to_default/individual/l1_no_zones +execute if score $dungeon do2.config.mc.levelEditing matches 10 if score $dungeon do2.config.mc.level1Zones matches 1 run function do2:mob_controller/reset_to_default/individual/l1_zones + # L2 -execute if score $dungeon do2.config.mc.levelEditing matches 2 if score $dungeon do2.config.mc.level2Zones matches 0 run function do2:mob_controller/reset_to_default/individual/l2_no_zones -execute if score $dungeon do2.config.mc.levelEditing matches 2 if score $dungeon do2.config.mc.level2Zones matches 1 run function do2:mob_controller/reset_to_default/individual/l2_zones +execute if score $dungeon do2.config.mc.levelEditing matches 20 if score $dungeon do2.config.mc.level2Zones matches 0 run function do2:mob_controller/reset_to_default/individual/l2_no_zones +execute if score $dungeon do2.config.mc.levelEditing matches 20 if score $dungeon do2.config.mc.level2Zones matches 1 run function do2:mob_controller/reset_to_default/individual/l2_zones +# L2_other +execute if score $dungeon do2.config.mc.levelEditing matches 21 run function do2:mob_controller/reset_to_default/individual/l2_other # L3 -execute if score $dungeon do2.config.mc.levelEditing matches 3 run function do2:mob_controller/reset_to_default/individual/l3 +execute if score $dungeon do2.config.mc.levelEditing matches 30 run function do2:mob_controller/reset_to_default/individual/l3 # L4 -execute if score $dungeon do2.config.mc.levelEditing matches 4 run function do2:mob_controller/reset_to_default/individual/l4 +execute if score $dungeon do2.config.mc.levelEditing matches 40 run function do2:mob_controller/reset_to_default/individual/l4 diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/run_per_tick.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/run_per_tick.mcfunction index d0fafa1d..a403604f 100644 --- a/Brilliance Datapack/data/do2/functions/mob_controller/run_per_tick.mcfunction +++ b/Brilliance Datapack/data/do2/functions/mob_controller/run_per_tick.mcfunction @@ -1,6 +1,7 @@ # Run the level/zone needed. # Check if a swap happening +execute if block -522 115 1940 minecraft:bamboo_button[powered=true] run function do2:mob_controller/save_storages execute if block -521 115 1940 minecraft:bamboo_button[powered=true] run function do2:mob_controller/save_storages execute if block -520 115 1940 minecraft:bamboo_button[powered=true] run function do2:mob_controller/save_storages execute if block -519 115 1940 minecraft:bamboo_button[powered=true] run function do2:mob_controller/save_storages @@ -8,18 +9,20 @@ execute if block -518 115 1940 minecraft:bamboo_button[powered=true] run functio execute if block -517 115 1940 minecraft:bamboo_button[powered=true] run function do2:mob_controller/save_storages # Check for swap level -execute if block -521 115 1940 minecraft:bamboo_button[powered=true] run function do2:mob_controller/swap_to/l1 -execute if block -520 115 1940 minecraft:bamboo_button[powered=true] run function do2:mob_controller/swap_to/l2 +execute if block -522 115 1940 minecraft:bamboo_button[powered=true] run function do2:mob_controller/swap_to/l1 +execute if block -521 115 1940 minecraft:bamboo_button[powered=true] run function do2:mob_controller/swap_to/l2 +execute if block -520 115 1940 minecraft:bamboo_button[powered=true] run function do2:mob_controller/swap_to/l2_other execute if block -519 115 1940 minecraft:bamboo_button[powered=true] run function do2:mob_controller/swap_to/l3 execute if block -518 115 1940 minecraft:bamboo_button[powered=true] run function do2:mob_controller/swap_to/l4 execute if block -517 115 1940 minecraft:bamboo_button[powered=true] run function do2:mob_controller/swap_to/backrooms # Run the per ticks execute if score $dungeon do2.config.mc.levelEditing matches 0 run function do2:mob_controller/per_tick/backrooms -execute if score $dungeon do2.config.mc.levelEditing matches 1 run function do2:mob_controller/per_tick/l1 -execute if score $dungeon do2.config.mc.levelEditing matches 2 run function do2:mob_controller/per_tick/l2 -execute if score $dungeon do2.config.mc.levelEditing matches 3 run function do2:mob_controller/per_tick/l3 -execute if score $dungeon do2.config.mc.levelEditing matches 4 run function do2:mob_controller/per_tick/l4 +execute if score $dungeon do2.config.mc.levelEditing matches 10 run function do2:mob_controller/per_tick/l1 +execute if score $dungeon do2.config.mc.levelEditing matches 20 run function do2:mob_controller/per_tick/l2 +execute if score $dungeon do2.config.mc.levelEditing matches 21 run function do2:mob_controller/per_tick/l2_other +execute if score $dungeon do2.config.mc.levelEditing matches 30 run function do2:mob_controller/per_tick/l3 +execute if score $dungeon do2.config.mc.levelEditing matches 40 run function do2:mob_controller/per_tick/l4 # Make sure all players have at least 1 level, in order to name things at the anvil execute positioned -516 114 1947 as @a[distance=..6] store result score @s do2.utility.playersExperience run experience query @s levels diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/save_storages.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/save_storages.mcfunction index f7b59574..3012287d 100644 --- a/Brilliance Datapack/data/do2/functions/mob_controller/save_storages.mcfunction +++ b/Brilliance Datapack/data/do2/functions/mob_controller/save_storages.mcfunction @@ -1,17 +1,20 @@ -# Level 0 -execute if score $dungeon do2.config.mc.levelEditing matches 0 run clone -529 114 1946 -529 115 1942 -519 122 1942 - # Level 1 -execute if score $dungeon do2.config.mc.levelEditing matches 1 if score $dungeon do2.config.mc.level1Zones matches 1 run clone -529 114 1946 -529 115 1942 -527 122 1942 -execute if score $dungeon do2.config.mc.levelEditing matches 1 if score $dungeon do2.config.mc.level1Zones matches 0 run clone -529 114 1946 -529 115 1942 -527 125 1942 +execute if score $dungeon do2.config.mc.levelEditing matches 10 if score $dungeon do2.config.mc.level1Zones matches 1 run clone -530 114 1946 -530 115 1942 -528 122 1942 +execute if score $dungeon do2.config.mc.levelEditing matches 10 if score $dungeon do2.config.mc.level1Zones matches 0 run clone -530 114 1946 -530 115 1942 -528 125 1942 # Level 2 -execute if score $dungeon do2.config.mc.levelEditing matches 2 if score $dungeon do2.config.mc.level2Zones matches 1 run clone -529 114 1946 -529 115 1942 -525 122 1942 -execute if score $dungeon do2.config.mc.levelEditing matches 2 if score $dungeon do2.config.mc.level2Zones matches 0 run clone -529 114 1946 -529 115 1942 -525 125 1942 +execute if score $dungeon do2.config.mc.levelEditing matches 20 if score $dungeon do2.config.mc.level2Zones matches 1 run clone -530 114 1946 -530 115 1942 -526 122 1942 +execute if score $dungeon do2.config.mc.levelEditing matches 20 if score $dungeon do2.config.mc.level2Zones matches 0 run clone -530 114 1946 -530 115 1942 -526 125 1942 + +# Level 2_other +execute if score $dungeon do2.config.mc.levelEditing matches 21 run clone -530 114 1946 -530 115 1942 -524 122 1942 # Level 3 -execute if score $dungeon do2.config.mc.levelEditing matches 3 run clone -529 114 1946 -529 115 1942 -523 122 1942 +execute if score $dungeon do2.config.mc.levelEditing matches 30 run clone -530 114 1946 -530 115 1942 -522 122 1942 # Level 4 -execute if score $dungeon do2.config.mc.levelEditing matches 4 if score $dungeon do2.config.mc.level4Zones matches 1 run clone -529 114 1946 -529 115 1942 -521 122 1942 -execute if score $dungeon do2.config.mc.levelEditing matches 4 if score $dungeon do2.config.mc.level4Zones matches 0 run clone -529 114 1946 -529 115 1942 -521 125 1942 +execute if score $dungeon do2.config.mc.levelEditing matches 40 if score $dungeon do2.config.mc.level4Zones matches 1 run clone -530 114 1946 -530 115 1942 -520 122 1942 +execute if score $dungeon do2.config.mc.levelEditing matches 40 if score $dungeon do2.config.mc.level4Zones matches 0 run clone -530 114 1946 -530 115 1942 -520 125 1942 + +# Level 0 +execute if score $dungeon do2.config.mc.levelEditing matches 0 run clone -530 114 1946 -530 115 1942 -518 122 1942 diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/swap_to/backrooms.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/swap_to/backrooms.mcfunction index bc58d607..13668913 100644 --- a/Brilliance Datapack/data/do2/functions/mob_controller/swap_to/backrooms.mcfunction +++ b/Brilliance Datapack/data/do2/functions/mob_controller/swap_to/backrooms.mcfunction @@ -5,9 +5,9 @@ setblock -517 116 1939 minecraft:redstone_lamp[lit=true] scoreboard players set $dungeon do2.config.mc.levelEditing 0 fill -525 115 1944 -525 116 1944 air replace -fill -528 118 1946 -528 116 1942 air replace -fill -529 115 1946 -529 114 1942 air replace -place template do2:config.mc.backrooms_no_zones -530 113 1939 none none 1 +fill -529 118 1946 -529 116 1942 air replace +fill -530 115 1946 -530 114 1942 air replace +place template do2:config.mc.backrooms -531 113 1939 none none 1 # Load Storage -clone -519 123 1942 -519 122 1946 -529 114 1942 +clone -518 123 1942 -518 122 1946 -530 114 1942 diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/swap_to/change_zones.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/swap_to/change_zones.mcfunction index 2a29d119..c06b8c02 100644 --- a/Brilliance Datapack/data/do2/functions/mob_controller/swap_to/change_zones.mcfunction +++ b/Brilliance Datapack/data/do2/functions/mob_controller/swap_to/change_zones.mcfunction @@ -2,18 +2,18 @@ function do2:mob_controller/save_storages # Level 1 -execute if score $dungeon do2.config.mc.levelEditing matches 1 if score $dungeon do2.config.mc.level1Zones matches 1 run scoreboard players set $dungeon do2.config.mc.level1Zones 2 -execute if score $dungeon do2.config.mc.levelEditing matches 1 if score $dungeon do2.config.mc.level1Zones matches 0 run scoreboard players set $dungeon do2.config.mc.level1Zones 1 -execute if score $dungeon do2.config.mc.levelEditing matches 1 if score $dungeon do2.config.mc.level1Zones matches 2 run scoreboard players set $dungeon do2.config.mc.level1Zones 0 -execute if score $dungeon do2.config.mc.levelEditing matches 1 run function do2:mob_controller/swap_to/l1 +execute if score $dungeon do2.config.mc.levelEditing matches 10 if score $dungeon do2.config.mc.level1Zones matches 1 run scoreboard players set $dungeon do2.config.mc.level1Zones 2 +execute if score $dungeon do2.config.mc.levelEditing matches 10 if score $dungeon do2.config.mc.level1Zones matches 0 run scoreboard players set $dungeon do2.config.mc.level1Zones 1 +execute if score $dungeon do2.config.mc.levelEditing matches 10 if score $dungeon do2.config.mc.level1Zones matches 2 run scoreboard players set $dungeon do2.config.mc.level1Zones 0 +execute if score $dungeon do2.config.mc.levelEditing matches 10 run function do2:mob_controller/swap_to/l1 # Level 2 -execute if score $dungeon do2.config.mc.levelEditing matches 2 if score $dungeon do2.config.mc.level2Zones matches 1 run scoreboard players set $dungeon do2.config.mc.level2Zones 2 -execute if score $dungeon do2.config.mc.levelEditing matches 2 if score $dungeon do2.config.mc.level2Zones matches 0 run scoreboard players set $dungeon do2.config.mc.level2Zones 1 -execute if score $dungeon do2.config.mc.levelEditing matches 2 if score $dungeon do2.config.mc.level2Zones matches 2 run scoreboard players set $dungeon do2.config.mc.level2Zones 0 -execute if score $dungeon do2.config.mc.levelEditing matches 2 run function do2:mob_controller/swap_to/l2 +execute if score $dungeon do2.config.mc.levelEditing matches 20 if score $dungeon do2.config.mc.level2Zones matches 1 run scoreboard players set $dungeon do2.config.mc.level2Zones 2 +execute if score $dungeon do2.config.mc.levelEditing matches 20 if score $dungeon do2.config.mc.level2Zones matches 0 run scoreboard players set $dungeon do2.config.mc.level2Zones 1 +execute if score $dungeon do2.config.mc.levelEditing matches 20 if score $dungeon do2.config.mc.level2Zones matches 2 run scoreboard players set $dungeon do2.config.mc.level2Zones 0 +execute if score $dungeon do2.config.mc.levelEditing matches 20 run function do2:mob_controller/swap_to/l2 # Level 4 -execute if score $dungeon do2.config.mc.levelEditing matches 4 if score $dungeon do2.config.mc.level4Zones matches 1 run scoreboard players set $dungeon do2.config.mc.level4Zones 2 -execute if score $dungeon do2.config.mc.levelEditing matches 4 if score $dungeon do2.config.mc.level4Zones matches 0 run scoreboard players set $dungeon do2.config.mc.level4Zones 1 -execute if score $dungeon do2.config.mc.levelEditing matches 4 if score $dungeon do2.config.mc.level4Zones matches 2 run scoreboard players set $dungeon do2.config.mc.level4Zones 0 -execute if score $dungeon do2.config.mc.levelEditing matches 4 run function do2:mob_controller/swap_to/l4 +execute if score $dungeon do2.config.mc.levelEditing matches 40 if score $dungeon do2.config.mc.level4Zones matches 1 run scoreboard players set $dungeon do2.config.mc.level4Zones 2 +execute if score $dungeon do2.config.mc.levelEditing matches 40 if score $dungeon do2.config.mc.level4Zones matches 0 run scoreboard players set $dungeon do2.config.mc.level4Zones 1 +execute if score $dungeon do2.config.mc.levelEditing matches 40 if score $dungeon do2.config.mc.level4Zones matches 2 run scoreboard players set $dungeon do2.config.mc.level4Zones 0 +execute if score $dungeon do2.config.mc.levelEditing matches 40 run function do2:mob_controller/swap_to/l4 diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/swap_to/l1.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/swap_to/l1.mcfunction index 4cc783bc..cf24fac5 100644 --- a/Brilliance Datapack/data/do2/functions/mob_controller/swap_to/l1.mcfunction +++ b/Brilliance Datapack/data/do2/functions/mob_controller/swap_to/l1.mcfunction @@ -1,14 +1,12 @@ # Setup lamps -fill -521 115 1940 -517 115 1940 minecraft:bamboo_button[powered=false,facing=south] -fill -521 116 1939 -517 116 1939 minecraft:redstone_lamp[lit=false] -setblock -521 116 1939 minecraft:redstone_lamp[lit=true] -scoreboard players set $dungeon do2.config.mc.levelEditing 1 +function do2:mob_controller/swap_to/setup +setblock -522 116 1939 minecraft:redstone_lamp[lit=true] +scoreboard players set $dungeon do2.config.mc.levelEditing 10 -fill -528 118 1946 -528 116 1942 air replace -fill -529 115 1946 -529 114 1942 air replace -execute if score $dungeon do2.config.mc.level1Zones matches 0 run place template do2:config.mc.l1_no_zones -530 113 1939 none none 1 -execute if score $dungeon do2.config.mc.level1Zones matches 1 run place template do2:config.mc.l1_has_zones -530 113 1939 none none 1 +# Place Template +execute if score $dungeon do2.config.mc.level1Zones matches 0 run place template do2:config.mc.l1_no_zones -531 113 1939 none none 1 +execute if score $dungeon do2.config.mc.level1Zones matches 1 run place template do2:config.mc.l1_has_zones -531 113 1939 none none 1 # Load Storage -execute if score $dungeon do2.config.mc.level1Zones matches 0 run clone -527 126 1942 -527 125 1946 -529 114 1942 -execute if score $dungeon do2.config.mc.level1Zones matches 1 run clone -527 123 1942 -527 122 1946 -529 114 1942 +execute if score $dungeon do2.config.mc.level1Zones matches 0 run clone -528 126 1942 -528 125 1946 -530 114 1942 +execute if score $dungeon do2.config.mc.level1Zones matches 1 run clone -528 123 1942 -528 122 1946 -530 114 1942 diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/swap_to/l2.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/swap_to/l2.mcfunction index c3488d6b..f1eb7dfc 100644 --- a/Brilliance Datapack/data/do2/functions/mob_controller/swap_to/l2.mcfunction +++ b/Brilliance Datapack/data/do2/functions/mob_controller/swap_to/l2.mcfunction @@ -1,14 +1,11 @@ -# Setup lamps -fill -521 115 1940 -517 115 1940 minecraft:bamboo_button[powered=false,facing=south] -fill -521 116 1939 -517 116 1939 minecraft:redstone_lamp[lit=false] -setblock -520 116 1939 minecraft:redstone_lamp[lit=true] -scoreboard players set $dungeon do2.config.mc.levelEditing 2 +function do2:mob_controller/swap_to/setup +setblock -521 116 1939 minecraft:redstone_lamp[lit=true] +scoreboard players set $dungeon do2.config.mc.levelEditing 20 -fill -528 118 1946 -528 116 1942 air replace -fill -529 115 1946 -529 114 1942 air replace -execute if score $dungeon do2.config.mc.level2Zones matches 0 run place template do2:config.mc.l2_no_zones -530 113 1939 none none 1 -execute if score $dungeon do2.config.mc.level2Zones matches 1 run place template do2:config.mc.l2_has_zones -530 113 1939 none none 1 +# Place Template +execute if score $dungeon do2.config.mc.level2Zones matches 0 run place template do2:config.mc.l2_no_zones -531 113 1939 none none 1 +execute if score $dungeon do2.config.mc.level2Zones matches 1 run place template do2:config.mc.l2_has_zones -531 113 1939 none none 1 # Load Storage -execute if score $dungeon do2.config.mc.level2Zones matches 0 run clone -525 126 1942 -525 125 1946 -529 114 1942 -execute if score $dungeon do2.config.mc.level2Zones matches 1 run clone -525 123 1942 -525 122 1946 -529 114 1942 +execute if score $dungeon do2.config.mc.level2Zones matches 0 run clone -526 126 1942 -526 125 1946 -530 114 1942 +execute if score $dungeon do2.config.mc.level2Zones matches 1 run clone -526 123 1942 -526 122 1946 -530 114 1942 diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/swap_to/l2_other.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/swap_to/l2_other.mcfunction new file mode 100644 index 00000000..c084b90d --- /dev/null +++ b/Brilliance Datapack/data/do2/functions/mob_controller/swap_to/l2_other.mcfunction @@ -0,0 +1,9 @@ +function do2:mob_controller/swap_to/setup +setblock -520 116 1939 minecraft:redstone_lamp[lit=true] +scoreboard players set $dungeon do2.config.mc.levelEditing 21 + +# Place Template +place template do2:config.mc.l2_other -531 113 1939 none none 1 + +# Load Storage +clone -524 123 1942 -524 122 1946 -530 114 1942 diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/swap_to/l3.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/swap_to/l3.mcfunction index 6868608e..3bf86105 100644 --- a/Brilliance Datapack/data/do2/functions/mob_controller/swap_to/l3.mcfunction +++ b/Brilliance Datapack/data/do2/functions/mob_controller/swap_to/l3.mcfunction @@ -1,13 +1,9 @@ -# Setup lamps -fill -521 115 1940 -517 115 1940 minecraft:bamboo_button[powered=false,facing=south] -fill -521 116 1939 -517 116 1939 minecraft:redstone_lamp[lit=false] +function do2:mob_controller/swap_to/setup setblock -519 116 1939 minecraft:redstone_lamp[lit=true] -scoreboard players set $dungeon do2.config.mc.levelEditing 3 +scoreboard players set $dungeon do2.config.mc.levelEditing 30 -fill -525 115 1944 -525 116 1944 air replace -fill -528 118 1946 -528 116 1942 air replace -fill -529 115 1946 -529 114 1942 air replace -place template do2:config.mc.l3_no_zones -530 113 1939 none none 1 +# Place Template +place template do2:config.mc.l3 -531 113 1939 none none 1 # Load Storage -clone -523 123 1942 -523 122 1946 -529 114 1942 +clone -522 123 1942 -522 122 1946 -530 114 1942 diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/swap_to/l4.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/swap_to/l4.mcfunction index af4578a8..a967c58d 100644 --- a/Brilliance Datapack/data/do2/functions/mob_controller/swap_to/l4.mcfunction +++ b/Brilliance Datapack/data/do2/functions/mob_controller/swap_to/l4.mcfunction @@ -1,14 +1,11 @@ -# Setup lamps -fill -521 115 1940 -517 115 1940 minecraft:bamboo_button[powered=false,facing=south] -fill -521 116 1939 -517 116 1939 minecraft:redstone_lamp[lit=false] +function do2:mob_controller/swap_to/setup setblock -518 116 1939 minecraft:redstone_lamp[lit=true] -scoreboard players set $dungeon do2.config.mc.levelEditing 4 +scoreboard players set $dungeon do2.config.mc.levelEditing 40 -fill -528 118 1946 -528 116 1942 air replace -fill -529 115 1946 -529 114 1942 air replace -execute if score $dungeon do2.config.mc.level4Zones matches 0 run place template do2:config.mc.l4_no_zones -530 113 1939 none none 1 -execute if score $dungeon do2.config.mc.level4Zones matches 1 run place template do2:config.mc.l4_has_zones -530 113 1939 none none 1 +# Place Template +execute if score $dungeon do2.config.mc.level4Zones matches 0 run place template do2:config.mc.l4_no_zones -531 113 1939 none none 1 +execute if score $dungeon do2.config.mc.level4Zones matches 1 run place template do2:config.mc.l4_has_zones -531 113 1939 none none 1 # Load Storage -execute if score $dungeon do2.config.mc.level4Zones matches 0 run clone -521 126 1942 -521 125 1946 -529 114 1942 -execute if score $dungeon do2.config.mc.level4Zones matches 1 run clone -521 123 1942 -521 122 1946 -529 114 1942 +execute if score $dungeon do2.config.mc.level4Zones matches 0 run clone -520 126 1942 -520 125 1946 -530 114 1942 +execute if score $dungeon do2.config.mc.level4Zones matches 1 run clone -520 123 1942 -520 122 1946 -530 114 1942 diff --git a/Brilliance Datapack/data/do2/functions/mob_controller/swap_to/setup.mcfunction b/Brilliance Datapack/data/do2/functions/mob_controller/swap_to/setup.mcfunction new file mode 100644 index 00000000..9fc9e066 --- /dev/null +++ b/Brilliance Datapack/data/do2/functions/mob_controller/swap_to/setup.mcfunction @@ -0,0 +1,12 @@ +# Turn buttons off +fill -522 115 1940 -517 115 1940 minecraft:bamboo_button[powered=false,facing=south] +# Turn lamps off +fill -522 116 1939 -517 116 1939 minecraft:redstone_lamp[lit=false] +# Remove lever & sign for zone controls +fill -525 115 1944 -525 116 1944 air replace +# Remove signs and levers from zone displays +fill -529 118 1946 -529 116 1942 air replace +# Remove storages +fill -530 115 1946 -530 114 1942 air replace +# Reset marker's visibility +function do2:mob_controller/marker_visibility/turn_invisible/all diff --git a/Brilliance Datapack/data/do2/functions/version.mcfunction b/Brilliance Datapack/data/do2/functions/version.mcfunction index 829ba820..8e1c28d4 100644 --- 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.11 +# DATAPACK VERSION NUMBER: 0.13.12 -tellraw @s ["",{"text":"The §o§n§aBrilliance Datapack§r's version is: [§b0.13.11§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.12§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":"."}] diff --git a/Brilliance Datapack/data/do2/structures/config.mc.backrooms.nbt b/Brilliance Datapack/data/do2/structures/config.mc.backrooms.nbt new file mode 100644 index 0000000000000000000000000000000000000000..771eb1ef25fa7d5488341969307a5c309931e733 GIT binary patch literal 3419 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 PQ`qc!e4A;UtfuxK`)|my diff --git a/Brilliance Datapack/data/do2/structures/config.mc.l1_has_zones.nbt b/Brilliance Datapack/data/do2/structures/config.mc.l1_has_zones.nbt index 4e9db66df6f2fd36ab5fec158b559dc940d54e8d..638516d392792e15e3ffa29c27bc09faf3e37257 100644 GIT binary patch literal 3648 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 UN=<|7rR$oMU*y`8gZTLV3kI<7djJ3c literal 3841 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 diff --git a/Brilliance Datapack/data/do2/structures/config.mc.l1_no_zones.nbt b/Brilliance Datapack/data/do2/structures/config.mc.l1_no_zones.nbt index caecfe19692cc344c323b50eb66da56c2ffa8394..8c6f88c7e6feca42ae3feb7fcdddcc2cd9c3cf8a 100644 GIT binary patch literal 3583 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 Cw=X#W literal 3721 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 SCXCe1Y}9nv^DAPvZTlY+vrnx6 diff --git a/Brilliance Datapack/data/do2/structures/config.mc.l2_no_zones.nbt b/Brilliance Datapack/data/do2/structures/config.mc.l2_no_zones.nbt index 7022ed1b84dd32987a155d2a6711b2b33a9fd3b9..62ac8d14b9e9f5475546aacc27469b35da36633e 100644 GIT binary patch literal 3633 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 diff --git a/Brilliance Datapack/data/do2/structures/config.mc.l2_other.nbt b/Brilliance Datapack/data/do2/structures/config.mc.l2_other.nbt new file mode 100644 index 0000000000000000000000000000000000000000..4e7bec53ddac998b28e269d5e941c247ca62d710 GIT binary patch literal 4056 zcmZ`)2Ut^CuvS4)sz?!OS&GsnRFM)aOOps9Dn)?=WD%qoigZwr&;l402;C(Rq-F(a zN>GRtC3GRuR|26)4K+&gZdiBMZ{K_Q?l-yj&YU^_KmVDzpv1%b_I}L893MXcvQVqd zutWLnOQxb14rnG(7-m^izQ1>`4R2_a;8ZUWBL1O0-nT&Pd6Fu)!MyJ**BU4l-obaGJ~<>ut~0%URPS@$_NjV^O7QuaOkIke^TI102idc(FK z9WEi_?&J;odJumQxnXPF>v9>pX`RMUqkIlaJkd7jq73Rj);4IU407Txa*elc`$N(N zA$~`8io5mrAP8I*c`FugMR{w3NxzGk*JWPfv38h=v?pF8@7UZG8SJje&vWRDt&mPG zjiV?`2Bqmxzpn`)!py~Q;xiGR1P^uUu$cVPG}Oao;di(7s`})I?p$=uQ``$~-Lo_O zTBstJJ?E(_;Icde7iE&xe&D@Ea>&c$W&5+>^;?mjE+l*m%-H!aB)iWWo-j0%Y#4 z0yIe0`0&PzK6EBzyr%0LuM;sGJJYEHD=}c&^H3BpX;DW6q17|pwm?K{a}Dxat8Iff zP@v?_rx*kYvaXDn7a61}C*$M#ufBIzm}K9R)y4NME(#$8fC@XN%AE`9*Q_ZB zHG$nS61U-R12h&ygc*qgr7C2tJR*oVV3bXL^fW{W^{EtA;CN7GLs6vIrpc7RX*_@Z zj_d$0&iS(kFhs*%4aft-#nx07Ueel)A#(b8A6%03-{_7?bzW6ud zA0OZUnV=uf=~shvm&g2vff6P;Dnme|!BQpZpoqKjJ5$|gwErRC%o_I{MHTRgn1LEN zROb4xy+;Tk0Fst_Bmo7DveTq3%=zW6utxHGn&7 z843aq1Z>>mp(tT$qTqf#;;I@J{ZITH#NDAyrY@Yu!(8u7DZIv_f#5zz@PJhh$6vdG zpFm);;qOf8576uTvAsnyv(a0|CwZDoMWfJ~>;OJo$(J3`J&;l&W*5Ovkc}5u76x=H zD~1lB|KR{$t>)JK^;FSg_;-XR(28q&x#GInexwCja4*+h4A6+I8hn}U2(uieo*{Lg z{iH@R(TYdHFex6#!ry^Gt`WbzqoOeoSb-#)%*G)Rcc@rG_NpDfdqZYIb`u!X(kjSJ zv+^8e-D3ao%$1d~kEc*0{? zTRDqH0pae4fpDCZ2o;M#ZjYt|Y*=^ybwiHJ{T%qW`%)=9z=@I3;#0>F8JGM1q|1I} zunM_nr&AOM03!RwLjcQy<=Am@mkscxX+YZA8-zRRi`!3d(@e`w+n}pT+k@%lFbor3 zZAsQRNc^6114NBvL14lGgp63$#vm3#;3Z275)%y2ViGmkiQoBHv<#sa!_qMS#Qe0- z7z+=`Vb;4wy6Hy4CFAF~k-@S!4H2NUT`-J^vu;Wwse5Zsjl{&{N#R{ScW08iACv!n z1oo#tDBi@(4ZYju#O)!Z47{4U)po6IycANQTmX$=6&8(Z7B{l9D4i3afd}*>HVCt5*t68RtHy&s8uk73 z_*2YG;Qu42#LR34f7Zl`#1b|vpQT_}J|D}*etW^s(w+m*zL6OIZ22Cj#kbW?k%}c{ zF8~E4WqW=VrZ z-Y~BIqtNR_C)-U|fYAT;0UgpMb!o4m_F}ndDlBfS1g4^s+_=A5=06Eh1;1 z(*QU(YE=ko-o(y{(_MO70slNCfRn$&lmL6dclQ&!#`YjZ zA!6#;j6+f+QR|}YsC5VgbB@*PaJOVAk5^;NkC_G3bqJ8|uQ>ppDYpgvm>8^X20pbv z281TNhTQw6W$DLz)8ywt^3T$*2UsEvk^Fi9Zl2V$v$_B{nz+9NQ9mn~_jNKnSLGL% z-YcksBKMK$!1%o1#j=|kn%cs!&vr1tVw_xE9!_jDeODAq#O)Qq2Axvc-gbS8qPVsy zxD%8Rrf&qvl?FMXQ}FF=Hd7R(HFt%7uOosx>}g@1-*`LZ{-A2i)J0e4&%MIq<~A>l zrWhwpFg)eN#Pw%&7|#3~d=b@=BkrvRGaC{5af4O&u-pDBM`-zPtopu$eDb%DZog#z z=)){oC~sTcJ|)&FLNz5M;Oz?GwJCw7EYN&pyQJ^!j+E>av**~nEt2FrlCD(CQ>A=K z*}O5BeWlj8uAaaDUc(zRduVf`HkTf>nIOO5Z3M@E*|zD=Io~Uv=kzGcuWNK{F-NwZ zpchxU)|8_xVLUV&Sv;$=C>?V3>+Rn2D>ak}zNb0uJ8rK6Y0X4@&FS^V*BNEYDiOCJ zj`g8Z^@Qy^+uvH6b_vy`i6GU@j)gp@o$bMKIiXEoen?$*S%kme!k0f2bE+A;T(uCo zdOU==HW|Vkrwr^)Gu8^HP540Nkl-K+6^~W$v~T#s+q~pA@F5 zZu;P5Kg?sZJ`g#`hV~&VEsV9KX+|HmWp}`&<7R34(xQsNYhT3NQm3VMj!zavAG1_%dxfzT$5f@EhNa-3k$TX>*bvfmP=Q5>!7jW1KFMst+fNylePf|rbX}q! z&Xl(TJ0|z@lLfemvWf|J)?YIYI6lnFOC7SLh2h`iR-~TBhAl$k#Lv08UBQp4y>YJ_ zQ*mnLtD!0Q((h$2Z5tK`@b2FJ<5!{_Vo5U>nzwPoXexgcgtWrz5iUOQ9%TQVcSy&& z-b?2*sjsbfJGjmJ@4zv^FD3@8eAb+?~d-)Sy? zcrAkSX}Z|rU>ygsvM%$_(6%EHgZVGi24@r(j~Ws66++A2q_r#vQOlAPCVlte+Ap|z zR{Bb(w2pJPapv=|uMAw8UWL7RlZA^XBx+;N^Gh~52Kye{!V-@w<-FCVoB8Yx^m+u` z8<6i%S;SFNA{F(+ou@CytQCH)^Lk_U8FbYww_^X+C+qoZMr#{6w?jj|Onto|;zkX( z_?kw{Ons=`adPwdpzjB0ew)>#rmEws7|Y4dav1@Og#PVcC0Y}k8}2onSGemyY8Y*; zd9WR=nPsqcAKP1%2sZmT=Imz6&>G1|8p{gkbXo#`K=-Dn*87h>;eA5iJb7YwyT)}6 zBji@vF>;uURbSF^215g}WlzjY8|+WtdRpeCm3BaUPTEHasx4k?8e4tRJBH{hrOcI7 z>3z&gFrYSsTqB%}n{B!!rh0D7mx-#v`Wa`m#78Sv_TDidY7S5LiAZ+A)i=9!;-l|> zhj7SBax1f`d+)lHwru4_J0vW7n<|FdJER6IXDwWi$TS+h5}WG)sc%pR+q}m51bGO1 zW|G^{sKMr?+381^^v*j;m(4fI<*q+ClOmes(x&5v$#db*@e!4kYE~;KpQ;x7O@?yD gnjBz(8uxDixdvzRiqA|_ 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 literal 0 HcmV?d00001 diff --git a/Brilliance Datapack/data/do2/structures/config.mc.l3_no_zones.nbt b/Brilliance Datapack/data/do2/structures/config.mc.l3_no_zones.nbt deleted file mode 100644 index 435fb15e272744761d93e5a95b8533fd5e54a246..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3449 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 aMx72@++vxJ^Edi755Ekxzo-!PmtrT! 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 X?zJ2?{nF0gwA2dSxSzAE?LW5*wn;A;&J5M8 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 diff --git a/Brilliance Datapack/data/do2/structures/config.mc.l4_no_zones.nbt b/Brilliance Datapack/data/do2/structures/config.mc.l4_no_zones.nbt index 669cd1ee128e02dd67e38a698ea45cac07d73fa1..0856ca5af2fb8fa3e5c6976b0de150b6336f962e 100644 GIT binary patch literal 3624 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 diff --git a/Brilliance Datapack/data/do2/structures/config.mc.storages_default.nbt b/Brilliance Datapack/data/do2/structures/config.mc.storages_default.nbt index b22e07686a9a56fc43f4cdb0f09c93ee0390fb3c..21d5c54d36015bbdff8aed82a17454a5219459c6 100644 GIT binary patch literal 2617 zcmYk3c{tST8^*um7$cN$k}VyLB}=lea|ksdL$=XaCt_@4NoI^C({aicI&_#Jdr{eU z#YEO(kdS@v46+QeGvg=yu5+FDkNbMA_kFJC^W67)K9(IgK8MR`b_qfs&$M&yu~g1( zipM88_~uM~L_{Ok>|xy_z3}p`AnFH|>PWKUlFTfNXIA#*mvxGd#1jZn>-^G$=q+J! zi^>sL+j+6`7i5?5A39~g8Q)f1NyWu(=iSRv20h(CB%lruLcoPiL=fr&+4Hs7j$O~ zQilXn1+MTx+*yfmuHF_9)r7B21ftLmqWS{?yp2h$tKuNo1T-r;Gn>aiMe&MAUNlI> zp9lxsn@F<&P2;zCAgWpA_5?-q%WWaYp05PV4^@-}M8S>9JKF8qeXGIatD4IwA;-h%HFiK0)CdKFt^x_{Q@2w~ z?W2Gn&Ojsypn?^h3{ZKAC^m&oz)i4G?iZ3P5Wv#-3{a2)s3(p~Rs|`Lzs3LQPSQXE z%al0)GvQ0-1UD7}Bp0a$0>x%ZLHT4!59hHljA#Xb<_D-OL=>P9d(2`XUHf6}CyPbl z2HH&;4%6F5ykp1`ad>V{$uk9{a++NN&;x&znO9z{cBKI#$5Uj zZ9g)22Kb5YFmwZ-a2rO5NiXs?3y%3li}{uXJBwWmagGO{?I>4k@Qk&EIldl3W{*ti!CBI*mr+1bc81qKnJ zUEHG(=$3i<)VC++z|tXI)x~q#l4T1?Qq=<&aN%}H4vBrX5j8>|d!nIMV{lqlj}abU zv{C;K8TPKg=I!w42I00Zq6Z^fB;j^o^h5M2f9)6F$HM^2d#C5ht+6DUu)Ho_- zR(H0&ADQjKXc0ENDb7m`)H5;^d$+m*pQY`X$Tx^8^I__latGC<HlLg7)aI{2w z_1U#kqGj&JE14C>er5SW-yV%zRE;Sy)~-|WXe~-CYp|C4HRO$GSQw_ka%p@p;9))` zRBtdg&Vh2TmO|DJ9kIk)K?gr<#hk2i92=t3gtor~gybiNeAf;Sd*GyduswMg$k;r5 zr)7`Xy>Z7oHvUTBRZj-)eh&G*GXYW<#j9P>VI2}^8`g>#7;>`VgmhWZva(lTg>(37 z?bfCTdIjsrso6%O=4qZ0%sZY(N#K63Su^Q5J1_2T<#87u7fQ>@&>dSzR@xUv1u(kT z`V#*5Sfs-o)n%^dLk@R0Xd#)*>CM>5GA`qg;L|q_*Ca}+g-t_u|A(x;#Zx;5|-ur~vHVeaU8uoJ2xqrd*U~>!k zFsEks`_S>x>F>-+r^iTN*df|aM8d-MYL@$PMes2rY#Cjcby10j(K5X5{dbk^+cBJj zR9u&*R$4K-@40J^*PTUk8&Vq0XO&gMS!d~*wS-E*M$71IrLkpX|E3a; zrOBU8PTbf|e={EwGb^W=sNAUX`jwdZx1A-0^+umZ9V`&%J@-)8sfwRFv-kEv2TVBd-gbE*{MOW5Uc1UD({r&Zsa$pD<6!1^1TGXYemS)LGZYUG!DVB)>||BOWRHIGm4SsK8B=( z=8Jf7YWwtzysC0!fTL%|8eW#au1_H{cGQE^+`6nnou0u7(G)sN`F5FAFFXC@+0F(- zX22JlP%Cvp%y>1l>k4-GyUM}9dO@#U1XfzO*{1X>9Q$`#S;;UqSBNR9i#GB%6&`3) z;D_~J`oJumX09#IW3Scnc-6k3ibcE79|<>mmUccK*->{XP##%Q9dm{+=fy5PX&*+Y zKT`F7C!45z3v;gc?ZY2h0!CrZ$rqn_ZB$umYM-)k$>BS^KS5)sG&jZ->8*d*SFUC4 z43!MsmdnnsU6L(z%PlEtlKd<5v1}^J;KKX(8HYNr_B+EO4z zt8#Sc?X@1y0;#GnWIvtFlV3eS>(*exUgrasyr3DblSo(tzuuLUz2EnVL-B58b_XVO OPj_ewDjeqt0RID@XbOV> literal 2089 zcmY+Ec{J4f8^^z6vet+(sKJ;^$r2{(Fs^j(7;-MMmSv*FsB9VgwM{oQ#GqtLC|M(9 znL81UB}+3Z24j$H#l?`FCj6%Q{q8xx&mXUIKA-cP_w#z5KR$|yBEXNc$IW5*kKkap z$!B{*)6knLS3$03H?;0_oF0dXzBhlE)h*rawXML9erQSg4YDU!tlW? zuT`z+B>y|fzL0JmotgNI*`aFBmejS?FFfzh^5XhWPRFUF&bdTlPl>GONiCG|(S@W2 zY|AW54DXp$*_Tkc)-|%Rw#XuG_%|eYT~VyhM3Gk*i*;8P)oUWlvnP~enuOa~OT3=oGj$)+UHPe~65%lYICxT(ga%2OeZMb>kz52(wmZxDa&uP)4Y z#=8ik=1FKHzJlbyzPn-HDOn3bXU3W4S|}7tej-NM5VLUiJ(LiF^d~?#3`h|hw*#5D zr}fLKe-HEl2oQP&C`%ux72*prjgdCu5@a82g!)Q4_{$*x0j9UO#OndPsFl*R`4T1C=Gxh_}@q|PiGL5 zZ~Y_kf7bu5Rr%>jr6vCAPAdJ3Dy-jgYCQ5wNVc&l#*8{Q z%gFFbdyr_jL)Kr2L9SahvaSWVQRC`5Z8|rO%CvSu1o7dc%TXmx!ExqxD^H)td>#GM>tCodFk^Z}lFF#$nHn4Kg@WgtTHm{<|!IoT7d69iI zm~LpGI{4=sz+%OFyfg)wn}th%2M<}JJQabjPfsH}%+ZXd6MAzlimay?_`avHonAqbPSg(dU13V|E!Exx?-kEB4!$9XP-Ypqk)I{%&><3{fIOMA=ee5C&bW@b z7Rt@rE=jXJxaoPBuCJf9o{uQ+KmHNVmH8X-K}}2BbSO%fr~I3PrB;7rcO-8(U}?G2 zJ9cMxrYB|ZTVo74%y}_kzFMaANg>0@Bdu9^o4Ao$7CLx0-^YRwAsKEsm<cjzYK9F?=ZTxOH{9GPYg9$t$I};l6GP0+g1tt z?9Cu8bhFVCbit5i;IRgM>h&=y6Rg3ADRC-lXFS@eH0LGJKAW^?YWsn4`{VMWjqwLw z-Z!QQEtBh8HpR_Zs+l|JEtP7!dN`qeikFwbZE!*P3{g3%B{JQfm!sswEg1Uwy>CAg zGR;^2@Mf*$v`6(lmur8{G9c=4k{0BQD&!a=v_g8^8DRR1)NTy`@2LQuket%9it^+;J+C9R6bY4!@J;^wYh6`elmjHV9? zgSSjQ%_taMA(}{I!S#Joz01K`kx~=&!Fh-x?E>YwZ=4+0%W<)I!V$kx1yJh=aj(&H$hoL1agMs!2K zC8)JypkHGj=0;p`&QQ5tY3(HrW#{jq=dL}ElN0OIy^IZ-UE4?UqZE9PW{C|QlKyfl z?f|2FVH`ggB5d&1!uK2`2l9_K`}s~=X(7qVuU3pF>WFUnlO0=KdpjT_gGnjsV|i^5 z(3yDcisSnNJ{}m0;cbMjRk7D@hJ{#Y8_T|fhv`wuAL=h|!3{It(~bq56qwwz?GfL< zIGdFj(K$Yw#s1El{OkYWO^r@cGy^+$^?t%*hx)Qlx|RiY zTIkMLNmOoAuASy?M=b5STBOEJ_FIRo_+sXxUx7;-Cu-KGw^Gc6G`qa1?dz`uw_&(~ zvk#;iPzc*i2502Z)Scj$0`k8fyOFu$a4u2i)+r3U!`Ba6KDK-hb!EhiaQ5L4^#;tj ze+pkL-*VB%#K&fu&yzN@d>XygwXUS7El2m&UO#Ht(dAgbnM?HQ3{;)W$5n9kH1i#= zCF6rc_jgOr{3b|sUwf5~0soUjBXA&v(1q;Rr_YMn%B1ijfq7Gex;D;4W?!YL%O-e4@W$2w_S(?DrbSsw%97PF$hU zFi|A8ULdaUI#I)PIHgaKn>4JBqf0l