diff --git a/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l0z1.mcfunction b/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l0z1.mcfunction index 49633b88..427e5e9e 100644 --- a/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l0z1.mcfunction +++ b/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l0z1.mcfunction @@ -3,20 +3,20 @@ execute as @a[scores={do2.logs.entity_controller=2..}] run tellraw @s ["",{"text # - End Log - # Setup -execute store result score $dungeon do2.utility.mc.mobNamesCount run data get storage do2:mobs level0_zone1 -scoreboard players operation $dungeon do2.utility.mc.mobGenerationCount = $l0z1 do2.config.mc.levelZoneMobCount +execute store result score $dungeon do2.utility.ec.mobNamesCount run data get storage do2:mobs level0_zone1 +scoreboard players operation $dungeon do2.utility.ec.mobGenerationCount = $l0z1 do2.config.ec.levelZoneMobCount data modify storage do2:mobs mobNames set from storage do2:mobs level0_zone1 -scoreboard players set $dungeon do2.utility.mc.mobGenerationType 1 +scoreboard players set $dungeon do2.utility.ec.mobGenerationType 1 # - Check for issues - # Check for mob AMOUNT count -execute if score $l0z1 do2.config.mc.levelZoneMobCount matches ..0 if score $dungeon do2.utility.mc.collectingLogs matches 1 run data modify storage do2:mobs mobCountErrors append value 'L0Z1' -execute if score $l0z1 do2.config.mc.levelZoneMobCount matches ..0 if score $dungeon do2.utility.mc.collectingLogs matches 0 as @a[scores={do2.logs.dungeon_setup=3..}] run tellraw @s ["",{"text":"[§9B§r]: L0Z1's mob count is empty. No mobs will generate in this zone."}] -execute if score $l0z1 do2.config.mc.levelZoneMobCount matches ..0 run scoreboard players set $l0z1 do2.config.mc.levelZoneMobCount 0 +execute if score $l0z1 do2.config.ec.levelZoneMobCount matches ..0 if score $dungeon do2.utility.ec.collectingLogs matches 1 run data modify storage do2:mobs mobCountErrors append value 'L0Z1' +execute if score $l0z1 do2.config.ec.levelZoneMobCount matches ..0 if score $dungeon do2.utility.ec.collectingLogs matches 0 as @a[scores={do2.logs.dungeon_setup=3..}] run tellraw @s ["",{"text":"[§9B§r]: L0Z1's mob count is empty. No mobs will generate in this zone."}] +execute if score $l0z1 do2.config.ec.levelZoneMobCount matches ..0 run scoreboard players set $l0z1 do2.config.ec.levelZoneMobCount 0 # 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/add_name_to_list +execute if score $dungeon do2.utility.ec.mobNamesCount < $l0z1 do2.config.ec.levelZoneMobCount if score $dungeon do2.utility.ec.collectingLogs matches 1 run data modify storage do2:mobs mobNameCountErrors append value 'L0Z1' +execute if score $dungeon do2.utility.ec.mobNamesCount < $l0z1 do2.config.ec.levelZoneMobCount if score $dungeon do2.utility.ec.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.ec.mobNamesCount < $l0z1 do2.config.ec.levelZoneMobCount run function do2:mob_controller/add_mob_names/add_name_to_list # Generate enough mobs. execute as @e[type=ravager,tag=L0Z1] run tag @s add already_generated_mob @@ -29,4 +29,4 @@ 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 if score $dungeon do2.config.fr.teleportKillers matches 1 as @e[tag=premade_generated_mob] run tp @s @e[type=marker,tag=L0Z1,limit=1,sort=random] execute as @e[tag=premade_generated_mob] run tag @s add L0Z1 -execute as @e[tag=premade_generated_mob] run tag @s remove premade_generated_mob \ No newline at end of file +execute as @e[tag=premade_generated_mob] run tag @s remove premade_generated_mob diff --git a/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l0z2.mcfunction b/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l0z2.mcfunction index 0dfde0df..d7a2eca7 100644 --- a/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l0z2.mcfunction +++ b/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l0z2.mcfunction @@ -3,20 +3,20 @@ execute as @a[scores={do2.logs.entity_controller=2..}] run tellraw @s ["",{"text # - End Log - # Setup -execute store result score $dungeon do2.utility.mc.mobNamesCount run data get storage do2:mobs level0_zone2 -scoreboard players operation $dungeon do2.utility.mc.mobGenerationCount = $l0z2 do2.config.mc.levelZoneMobCount +execute store result score $dungeon do2.utility.ec.mobNamesCount run data get storage do2:mobs level0_zone2 +scoreboard players operation $dungeon do2.utility.ec.mobGenerationCount = $l0z2 do2.config.ec.levelZoneMobCount data modify storage do2:mobs mobNames set from storage do2:mobs level0_zone2 -scoreboard players set $dungeon do2.utility.mc.mobGenerationType 3 +scoreboard players set $dungeon do2.utility.ec.mobGenerationType 3 # - Check for issues - # Check for mob AMOUNT count -execute if score $l0z2 do2.config.mc.levelZoneMobCount matches ..0 if score $dungeon do2.utility.mc.collectingLogs matches 1 run data modify storage do2:mobs mobCountErrors append value 'L0Z2' -execute if score $l0z2 do2.config.mc.levelZoneMobCount matches ..0 if score $dungeon do2.utility.mc.collectingLogs matches 0 as @a[scores={do2.logs.dungeon_setup=3..}] run tellraw @s ["",{"text":"[§9B§r]: L0Z2's mob count is empty. No mobs will generate in this zone."}] -execute if score $l0z2 do2.config.mc.levelZoneMobCount matches ..0 run scoreboard players set $l0z2 do2.config.mc.levelZoneMobCount 0 +execute if score $l0z2 do2.config.ec.levelZoneMobCount matches ..0 if score $dungeon do2.utility.ec.collectingLogs matches 1 run data modify storage do2:mobs mobCountErrors append value 'L0Z2' +execute if score $l0z2 do2.config.ec.levelZoneMobCount matches ..0 if score $dungeon do2.utility.ec.collectingLogs matches 0 as @a[scores={do2.logs.dungeon_setup=3..}] run tellraw @s ["",{"text":"[§9B§r]: L0Z2's mob count is empty. No mobs will generate in this zone."}] +execute if score $l0z2 do2.config.ec.levelZoneMobCount matches ..0 run scoreboard players set $l0z2 do2.config.ec.levelZoneMobCount 0 # 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/add_name_to_list +execute if score $dungeon do2.utility.ec.mobNamesCount < $l0z2 do2.config.ec.levelZoneMobCount if score $dungeon do2.utility.ec.collectingLogs matches 1 run data modify storage do2:mobs mobNameCountErrors append value 'L0Z2' +execute if score $dungeon do2.utility.ec.mobNamesCount < $l0z2 do2.config.ec.levelZoneMobCount if score $dungeon do2.utility.ec.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.ec.mobNamesCount < $l0z2 do2.config.ec.levelZoneMobCount run function do2:mob_controller/add_mob_names/add_name_to_list # Generate enough mobs. execute as @e[type=drowned,tag=L0Z2] run tag @s add already_generated_mob @@ -29,4 +29,4 @@ 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 if score $dungeon do2.config.fr.teleportKillers matches 1 as @e[tag=premade_generated_mob] run tp @s @e[type=marker,tag=L0Z2,limit=1,sort=random] execute as @e[tag=premade_generated_mob] run tag @s add L0Z2 -execute as @e[tag=premade_generated_mob] run tag @s remove premade_generated_mob \ No newline at end of file +execute as @e[tag=premade_generated_mob] run tag @s remove premade_generated_mob diff --git a/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l1z1.mcfunction b/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l1z1.mcfunction index decb4b28..fd911d72 100644 --- a/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l1z1.mcfunction +++ b/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l1z1.mcfunction @@ -3,20 +3,20 @@ execute as @a[scores={do2.logs.entity_controller=2..}] run tellraw @s ["",{"text # - End Log - # Setup -execute store result score $dungeon do2.utility.mc.mobNamesCount run data get storage do2:mobs level1_zone1 -scoreboard players operation $dungeon do2.utility.mc.mobGenerationCount = $l1z1 do2.config.mc.levelZoneMobCount +execute store result score $dungeon do2.utility.ec.mobNamesCount run data get storage do2:mobs level1_zone1 +scoreboard players operation $dungeon do2.utility.ec.mobGenerationCount = $l1z1 do2.config.ec.levelZoneMobCount data modify storage do2:mobs mobNames set from storage do2:mobs level1_zone1 -scoreboard players set $dungeon do2.utility.mc.mobGenerationType 1 +scoreboard players set $dungeon do2.utility.ec.mobGenerationType 1 # - Check for issues - # Check for mob AMOUNT count -execute if score $l1z1 do2.config.mc.levelZoneMobCount matches ..0 if score $dungeon do2.utility.mc.collectingLogs matches 1 run data modify storage do2:mobs mobCountErrors append value 'L1Z1' -execute if score $l1z1 do2.config.mc.levelZoneMobCount matches ..0 if score $dungeon do2.utility.mc.collectingLogs matches 0 as @a[scores={do2.logs.dungeon_setup=3..}] run tellraw @s ["",{"text":"[§9B§r]: L1Z1's mob count is empty. No mobs will generate in this zone."}] -execute if score $l1z1 do2.config.mc.levelZoneMobCount matches ..0 run scoreboard players set $l1z1 do2.config.mc.levelZoneMobCount 0 +execute if score $l1z1 do2.config.ec.levelZoneMobCount matches ..0 if score $dungeon do2.utility.ec.collectingLogs matches 1 run data modify storage do2:mobs mobCountErrors append value 'L1Z1' +execute if score $l1z1 do2.config.ec.levelZoneMobCount matches ..0 if score $dungeon do2.utility.ec.collectingLogs matches 0 as @a[scores={do2.logs.dungeon_setup=3..}] run tellraw @s ["",{"text":"[§9B§r]: L1Z1's mob count is empty. No mobs will generate in this zone."}] +execute if score $l1z1 do2.config.ec.levelZoneMobCount matches ..0 run scoreboard players set $l1z1 do2.config.ec.levelZoneMobCount 0 # Check for sufficient mob NAMES -execute if score $dungeon do2.utility.mc.mobNamesCount < $l1z1 do2.config.mc.levelZoneMobCount if score $dungeon do2.utility.mc.collectingLogs matches 1 run data modify storage do2:mobs mobNameCountErrors append value 'L1Z1' -execute if score $dungeon do2.utility.mc.mobNamesCount < $l1z1 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 L1Z1's mob names for L1Z1's mob count. Adding random names to fix."}] -execute if score $dungeon do2.utility.mc.mobNamesCount < $l1z1 do2.config.mc.levelZoneMobCount run function do2:mob_controller/add_mob_names/add_name_to_list +execute if score $dungeon do2.utility.ec.mobNamesCount < $l1z1 do2.config.ec.levelZoneMobCount if score $dungeon do2.utility.ec.collectingLogs matches 1 run data modify storage do2:mobs mobNameCountErrors append value 'L1Z1' +execute if score $dungeon do2.utility.ec.mobNamesCount < $l1z1 do2.config.ec.levelZoneMobCount if score $dungeon do2.utility.ec.collectingLogs matches 0 as @a[scores={do2.logs.dungeon_setup=3..}] run tellraw @s ["",{"text":"[§9B§r]: Not enough L1Z1's mob names for L1Z1's mob count. Adding random names to fix."}] +execute if score $dungeon do2.utility.ec.mobNamesCount < $l1z1 do2.config.ec.levelZoneMobCount run function do2:mob_controller/add_mob_names/add_name_to_list # Generate enough mobs. execute as @e[type=ravager,tag=L1Z1] run tag @s add already_generated_mob @@ -29,4 +29,4 @@ execute as @e[tag=newly_generated_mob] run tag @s add L1Z1 execute as @e[tag=newly_generated_mob] run tag @s remove newly_generated_mob execute if score $dungeon do2.config.fr.teleportKillers matches 1 as @e[tag=premade_generated_mob] run tp @s @e[type=marker,tag=L1Z1,limit=1,sort=random] execute as @e[tag=premade_generated_mob] run tag @s add L1Z1 -execute as @e[tag=premade_generated_mob] run tag @s remove premade_generated_mob \ No newline at end of file +execute as @e[tag=premade_generated_mob] run tag @s remove premade_generated_mob diff --git a/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l1z2.mcfunction b/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l1z2.mcfunction index 73d4ce05..b262b78d 100644 --- a/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l1z2.mcfunction +++ b/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l1z2.mcfunction @@ -3,20 +3,20 @@ execute as @a[scores={do2.logs.entity_controller=2..}] run tellraw @s ["",{"text # - End Log - # Setup -execute store result score $dungeon do2.utility.mc.mobNamesCount run data get storage do2:mobs level1_zone2 -scoreboard players operation $dungeon do2.utility.mc.mobGenerationCount = $l1z2 do2.config.mc.levelZoneMobCount +execute store result score $dungeon do2.utility.ec.mobNamesCount run data get storage do2:mobs level1_zone2 +scoreboard players operation $dungeon do2.utility.ec.mobGenerationCount = $l1z2 do2.config.ec.levelZoneMobCount data modify storage do2:mobs mobNames set from storage do2:mobs level1_zone2 -scoreboard players set $dungeon do2.utility.mc.mobGenerationType 1 +scoreboard players set $dungeon do2.utility.ec.mobGenerationType 1 # - Check for issues - # Check for mob AMOUNT count -execute if score $l1z2 do2.config.mc.levelZoneMobCount matches ..0 if score $dungeon do2.utility.mc.collectingLogs matches 1 run data modify storage do2:mobs mobCountErrors append value 'L1Z2' -execute if score $l1z2 do2.config.mc.levelZoneMobCount matches ..0 if score $dungeon do2.utility.mc.collectingLogs matches 0 as @a[scores={do2.logs.dungeon_setup=3..}] run tellraw @s ["",{"text":"[§9B§r]: L1Z2's mob count is empty. No mobs will generate in this zone."}] -execute if score $l1z2 do2.config.mc.levelZoneMobCount matches ..0 run scoreboard players set $l1z2 do2.config.mc.levelZoneMobCount 0 +execute if score $l1z2 do2.config.ec.levelZoneMobCount matches ..0 if score $dungeon do2.utility.ec.collectingLogs matches 1 run data modify storage do2:mobs mobCountErrors append value 'L1Z2' +execute if score $l1z2 do2.config.ec.levelZoneMobCount matches ..0 if score $dungeon do2.utility.ec.collectingLogs matches 0 as @a[scores={do2.logs.dungeon_setup=3..}] run tellraw @s ["",{"text":"[§9B§r]: L1Z2's mob count is empty. No mobs will generate in this zone."}] +execute if score $l1z2 do2.config.ec.levelZoneMobCount matches ..0 run scoreboard players set $l1z2 do2.config.ec.levelZoneMobCount 0 # Check for sufficient mob NAMES -execute if score $dungeon do2.utility.mc.mobNamesCount < $l1z2 do2.config.mc.levelZoneMobCount if score $dungeon do2.utility.mc.collectingLogs matches 1 run data modify storage do2:mobs mobNameCountErrors append value 'L1Z2' -execute if score $dungeon do2.utility.mc.mobNamesCount < $l1z2 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 L1Z2's mob names for L1Z2's mob count. Adding random names to fix."}] -execute if score $dungeon do2.utility.mc.mobNamesCount < $l1z2 do2.config.mc.levelZoneMobCount run function do2:mob_controller/add_mob_names/add_name_to_list +execute if score $dungeon do2.utility.ec.mobNamesCount < $l1z2 do2.config.ec.levelZoneMobCount if score $dungeon do2.utility.ec.collectingLogs matches 1 run data modify storage do2:mobs mobNameCountErrors append value 'L1Z2' +execute if score $dungeon do2.utility.ec.mobNamesCount < $l1z2 do2.config.ec.levelZoneMobCount if score $dungeon do2.utility.ec.collectingLogs matches 0 as @a[scores={do2.logs.dungeon_setup=3..}] run tellraw @s ["",{"text":"[§9B§r]: Not enough L1Z2's mob names for L1Z2's mob count. Adding random names to fix."}] +execute if score $dungeon do2.utility.ec.mobNamesCount < $l1z2 do2.config.ec.levelZoneMobCount run function do2:mob_controller/add_mob_names/add_name_to_list # Generate enough mobs. execute as @e[type=ravager,tag=L1Z2] run tag @s add already_generated_mob @@ -29,4 +29,4 @@ execute as @e[tag=newly_generated_mob] run tag @s add L1Z2 execute as @e[tag=newly_generated_mob] run tag @s remove newly_generated_mob execute if score $dungeon do2.config.fr.teleportKillers matches 1 as @e[tag=premade_generated_mob] run tp @s @e[type=marker,tag=L1Z2,limit=1,sort=random] execute as @e[tag=premade_generated_mob] run tag @s add L1Z2 -execute as @e[tag=premade_generated_mob] run tag @s remove premade_generated_mob \ No newline at end of file +execute as @e[tag=premade_generated_mob] run tag @s remove premade_generated_mob diff --git a/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l1z3.mcfunction b/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l1z3.mcfunction index 9cb8919a..e01ec963 100644 --- a/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l1z3.mcfunction +++ b/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l1z3.mcfunction @@ -3,20 +3,20 @@ execute as @a[scores={do2.logs.entity_controller=2..}] run tellraw @s ["",{"text # - End Log - # Setup -execute store result score $dungeon do2.utility.mc.mobNamesCount run data get storage do2:mobs level1_zone3 -scoreboard players operation $dungeon do2.utility.mc.mobGenerationCount = $l1z3 do2.config.mc.levelZoneMobCount +execute store result score $dungeon do2.utility.ec.mobNamesCount run data get storage do2:mobs level1_zone3 +scoreboard players operation $dungeon do2.utility.ec.mobGenerationCount = $l1z3 do2.config.ec.levelZoneMobCount data modify storage do2:mobs mobNames set from storage do2:mobs level1_zone3 -scoreboard players set $dungeon do2.utility.mc.mobGenerationType 1 +scoreboard players set $dungeon do2.utility.ec.mobGenerationType 1 # - Check for issues - # Check for mob AMOUNT count -execute if score $l1z3 do2.config.mc.levelZoneMobCount matches ..0 if score $dungeon do2.utility.mc.collectingLogs matches 1 run data modify storage do2:mobs mobCountErrors append value 'L1Z3' -execute if score $l1z3 do2.config.mc.levelZoneMobCount matches ..0 if score $dungeon do2.utility.mc.collectingLogs matches 0 as @a[scores={do2.logs.dungeon_setup=3..}] run tellraw @s ["",{"text":"[§9B§r]: L1Z3's mob count is empty. No mobs will generate in this zone."}] -execute if score $l1z3 do2.config.mc.levelZoneMobCount matches ..0 run scoreboard players set $l1z3 do2.config.mc.levelZoneMobCount 0 +execute if score $l1z3 do2.config.ec.levelZoneMobCount matches ..0 if score $dungeon do2.utility.ec.collectingLogs matches 1 run data modify storage do2:mobs mobCountErrors append value 'L1Z3' +execute if score $l1z3 do2.config.ec.levelZoneMobCount matches ..0 if score $dungeon do2.utility.ec.collectingLogs matches 0 as @a[scores={do2.logs.dungeon_setup=3..}] run tellraw @s ["",{"text":"[§9B§r]: L1Z3's mob count is empty. No mobs will generate in this zone."}] +execute if score $l1z3 do2.config.ec.levelZoneMobCount matches ..0 run scoreboard players set $l1z3 do2.config.ec.levelZoneMobCount 0 # Check for sufficient mob NAMES -execute if score $dungeon do2.utility.mc.mobNamesCount < $l1z3 do2.config.mc.levelZoneMobCount if score $dungeon do2.utility.mc.collectingLogs matches 1 run data modify storage do2:mobs mobNameCountErrors append value 'L1Z3' -execute if score $dungeon do2.utility.mc.mobNamesCount < $l1z3 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 L1Z3's mob names for L1Z3's mob count. Adding random names to fix."}] -execute if score $dungeon do2.utility.mc.mobNamesCount < $l1z3 do2.config.mc.levelZoneMobCount run function do2:mob_controller/add_mob_names/add_name_to_list +execute if score $dungeon do2.utility.ec.mobNamesCount < $l1z3 do2.config.ec.levelZoneMobCount if score $dungeon do2.utility.ec.collectingLogs matches 1 run data modify storage do2:mobs mobNameCountErrors append value 'L1Z3' +execute if score $dungeon do2.utility.ec.mobNamesCount < $l1z3 do2.config.ec.levelZoneMobCount if score $dungeon do2.utility.ec.collectingLogs matches 0 as @a[scores={do2.logs.dungeon_setup=3..}] run tellraw @s ["",{"text":"[§9B§r]: Not enough L1Z3's mob names for L1Z3's mob count. Adding random names to fix."}] +execute if score $dungeon do2.utility.ec.mobNamesCount < $l1z3 do2.config.ec.levelZoneMobCount run function do2:mob_controller/add_mob_names/add_name_to_list # Generate enough mobs. execute as @e[type=ravager,tag=L1Z3] run tag @s add already_generated_mob @@ -29,4 +29,4 @@ execute as @e[tag=newly_generated_mob] run tag @s add L1Z3 execute as @e[tag=newly_generated_mob] run tag @s remove newly_generated_mob execute if score $dungeon do2.config.fr.teleportKillers matches 1 as @e[tag=premade_generated_mob] run tp @s @e[type=marker,tag=L1Z3,limit=1,sort=random] execute as @e[tag=premade_generated_mob] run tag @s add L1Z3 -execute as @e[tag=premade_generated_mob] run tag @s remove premade_generated_mob \ No newline at end of file +execute as @e[tag=premade_generated_mob] run tag @s remove premade_generated_mob diff --git a/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l1z4.mcfunction b/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l1z4.mcfunction index 9c458c82..837b9a07 100644 --- a/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l1z4.mcfunction +++ b/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l1z4.mcfunction @@ -3,20 +3,20 @@ execute as @a[scores={do2.logs.entity_controller=2..}] run tellraw @s ["",{"text # - End Log - # Setup -execute store result score $dungeon do2.utility.mc.mobNamesCount run data get storage do2:mobs level1_zone4 -scoreboard players operation $dungeon do2.utility.mc.mobGenerationCount = $l1z4 do2.config.mc.levelZoneMobCount +execute store result score $dungeon do2.utility.ec.mobNamesCount run data get storage do2:mobs level1_zone4 +scoreboard players operation $dungeon do2.utility.ec.mobGenerationCount = $l1z4 do2.config.ec.levelZoneMobCount data modify storage do2:mobs mobNames set from storage do2:mobs level1_zone4 -scoreboard players set $dungeon do2.utility.mc.mobGenerationType 1 +scoreboard players set $dungeon do2.utility.ec.mobGenerationType 1 # - Check for issues - # Check for mob AMOUNT count -execute if score $l1z4 do2.config.mc.levelZoneMobCount matches ..0 if score $dungeon do2.utility.mc.collectingLogs matches 1 run data modify storage do2:mobs mobCountErrors append value 'L1Z4' -execute if score $l1z4 do2.config.mc.levelZoneMobCount matches ..0 if score $dungeon do2.utility.mc.collectingLogs matches 0 as @a[scores={do2.logs.dungeon_setup=3..}] run tellraw @s ["",{"text":"[§9B§r]: L1Z4's mob count is empty. No mobs will generate in this zone."}] -execute if score $l1z4 do2.config.mc.levelZoneMobCount matches ..0 run scoreboard players set $l1z4 do2.config.mc.levelZoneMobCount 0 +execute if score $l1z4 do2.config.ec.levelZoneMobCount matches ..0 if score $dungeon do2.utility.ec.collectingLogs matches 1 run data modify storage do2:mobs mobCountErrors append value 'L1Z4' +execute if score $l1z4 do2.config.ec.levelZoneMobCount matches ..0 if score $dungeon do2.utility.ec.collectingLogs matches 0 as @a[scores={do2.logs.dungeon_setup=3..}] run tellraw @s ["",{"text":"[§9B§r]: L1Z4's mob count is empty. No mobs will generate in this zone."}] +execute if score $l1z4 do2.config.ec.levelZoneMobCount matches ..0 run scoreboard players set $l1z4 do2.config.ec.levelZoneMobCount 0 # Check for sufficient mob NAMES -execute if score $dungeon do2.utility.mc.mobNamesCount < $l1z4 do2.config.mc.levelZoneMobCount if score $dungeon do2.utility.mc.collectingLogs matches 1 run data modify storage do2:mobs mobNameCountErrors append value 'L1Z4' -execute if score $dungeon do2.utility.mc.mobNamesCount < $l1z4 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 L1Z4's mob names for L1Z4's mob count. Adding random names to fix."}] -execute if score $dungeon do2.utility.mc.mobNamesCount < $l1z4 do2.config.mc.levelZoneMobCount run function do2:mob_controller/add_mob_names/add_name_to_list +execute if score $dungeon do2.utility.ec.mobNamesCount < $l1z4 do2.config.ec.levelZoneMobCount if score $dungeon do2.utility.ec.collectingLogs matches 1 run data modify storage do2:mobs mobNameCountErrors append value 'L1Z4' +execute if score $dungeon do2.utility.ec.mobNamesCount < $l1z4 do2.config.ec.levelZoneMobCount if score $dungeon do2.utility.ec.collectingLogs matches 0 as @a[scores={do2.logs.dungeon_setup=3..}] run tellraw @s ["",{"text":"[§9B§r]: Not enough L1Z4's mob names for L1Z4's mob count. Adding random names to fix."}] +execute if score $dungeon do2.utility.ec.mobNamesCount < $l1z4 do2.config.ec.levelZoneMobCount run function do2:mob_controller/add_mob_names/add_name_to_list # Generate enough mobs. execute as @e[type=ravager,tag=L1Z4] run tag @s add already_generated_mob @@ -29,4 +29,4 @@ execute as @e[tag=newly_generated_mob] run tag @s add L1Z4 execute as @e[tag=newly_generated_mob] run tag @s remove newly_generated_mob execute if score $dungeon do2.config.fr.teleportKillers matches 1 as @e[tag=premade_generated_mob] run tp @s @e[type=marker,tag=L1Z4,limit=1,sort=random] execute as @e[tag=premade_generated_mob] run tag @s add L1Z4 -execute as @e[tag=premade_generated_mob] run tag @s remove premade_generated_mob \ No newline at end of file +execute as @e[tag=premade_generated_mob] run tag @s remove premade_generated_mob diff --git a/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l1z5.mcfunction b/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l1z5.mcfunction index 659de74b..786d6150 100644 --- a/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l1z5.mcfunction +++ b/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l1z5.mcfunction @@ -3,20 +3,20 @@ execute as @a[scores={do2.logs.entity_controller=2..}] run tellraw @s ["",{"text # - End Log - # Setup -execute store result score $dungeon do2.utility.mc.mobNamesCount run data get storage do2:mobs level1_zone5 -scoreboard players operation $dungeon do2.utility.mc.mobGenerationCount = $l1z5 do2.config.mc.levelZoneMobCount +execute store result score $dungeon do2.utility.ec.mobNamesCount run data get storage do2:mobs level1_zone5 +scoreboard players operation $dungeon do2.utility.ec.mobGenerationCount = $l1z5 do2.config.ec.levelZoneMobCount data modify storage do2:mobs mobNames set from storage do2:mobs level1_zone5 -scoreboard players set $dungeon do2.utility.mc.mobGenerationType 1 +scoreboard players set $dungeon do2.utility.ec.mobGenerationType 1 # - Check for issues - # Check for mob AMOUNT count -execute if score $l1z5 do2.config.mc.levelZoneMobCount matches ..0 if score $dungeon do2.utility.mc.collectingLogs matches 1 run data modify storage do2:mobs mobCountErrors append value 'L1Z5' -execute if score $l1z5 do2.config.mc.levelZoneMobCount matches ..0 if score $dungeon do2.utility.mc.collectingLogs matches 0 as @a[scores={do2.logs.dungeon_setup=3..}] run tellraw @s ["",{"text":"[§9B§r]: L1Z5's mob count is empty. No mobs will generate in this zone."}] -execute if score $l1z5 do2.config.mc.levelZoneMobCount matches ..0 run scoreboard players set $l1z5 do2.config.mc.levelZoneMobCount 0 +execute if score $l1z5 do2.config.ec.levelZoneMobCount matches ..0 if score $dungeon do2.utility.ec.collectingLogs matches 1 run data modify storage do2:mobs mobCountErrors append value 'L1Z5' +execute if score $l1z5 do2.config.ec.levelZoneMobCount matches ..0 if score $dungeon do2.utility.ec.collectingLogs matches 0 as @a[scores={do2.logs.dungeon_setup=3..}] run tellraw @s ["",{"text":"[§9B§r]: L1Z5's mob count is empty. No mobs will generate in this zone."}] +execute if score $l1z5 do2.config.ec.levelZoneMobCount matches ..0 run scoreboard players set $l1z5 do2.config.ec.levelZoneMobCount 0 # Check for sufficient mob NAMES -execute if score $dungeon do2.utility.mc.mobNamesCount < $l1z5 do2.config.mc.levelZoneMobCount if score $dungeon do2.utility.mc.collectingLogs matches 1 run data modify storage do2:mobs mobNameCountErrors append value 'L1Z5' -execute if score $dungeon do2.utility.mc.mobNamesCount < $l1z5 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 L1Z5's mob names for L1Z5's mob count. Adding random names to fix."}] -execute if score $dungeon do2.utility.mc.mobNamesCount < $l1z5 do2.config.mc.levelZoneMobCount run function do2:mob_controller/add_mob_names/add_name_to_list +execute if score $dungeon do2.utility.ec.mobNamesCount < $l1z5 do2.config.ec.levelZoneMobCount if score $dungeon do2.utility.ec.collectingLogs matches 1 run data modify storage do2:mobs mobNameCountErrors append value 'L1Z5' +execute if score $dungeon do2.utility.ec.mobNamesCount < $l1z5 do2.config.ec.levelZoneMobCount if score $dungeon do2.utility.ec.collectingLogs matches 0 as @a[scores={do2.logs.dungeon_setup=3..}] run tellraw @s ["",{"text":"[§9B§r]: Not enough L1Z5's mob names for L1Z5's mob count. Adding random names to fix."}] +execute if score $dungeon do2.utility.ec.mobNamesCount < $l1z5 do2.config.ec.levelZoneMobCount run function do2:mob_controller/add_mob_names/add_name_to_list # Generate enough mobs. execute as @e[type=ravager,tag=L1Z5] run tag @s add already_generated_mob @@ -29,4 +29,4 @@ execute as @e[tag=newly_generated_mob] run tag @s add L1Z5 execute as @e[tag=newly_generated_mob] run tag @s remove newly_generated_mob execute if score $dungeon do2.config.fr.teleportKillers matches 1 as @e[tag=premade_generated_mob] run tp @s @e[type=marker,tag=L1Z5,limit=1,sort=random] execute as @e[tag=premade_generated_mob] run tag @s add L1Z5 -execute as @e[tag=premade_generated_mob] run tag @s remove premade_generated_mob \ No newline at end of file +execute as @e[tag=premade_generated_mob] run tag @s remove premade_generated_mob diff --git a/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l2willie.mcfunction b/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l2willie.mcfunction index 3815f430..200ceb80 100644 --- a/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l2willie.mcfunction +++ b/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l2willie.mcfunction @@ -3,20 +3,20 @@ execute as @a[scores={do2.logs.entity_controller=2..}] run tellraw @s ["",{"text # - End Log - # Setup -execute store result score $dungeon do2.utility.mc.mobNamesCount run data get storage do2:mobs level2_willie -scoreboard players operation $dungeon do2.utility.mc.mobGenerationCount = $l2willie do2.config.mc.levelZoneMobCount +execute store result score $dungeon do2.utility.ec.mobNamesCount run data get storage do2:mobs level2_willie +scoreboard players operation $dungeon do2.utility.ec.mobGenerationCount = $l2willie do2.config.ec.levelZoneMobCount data modify storage do2:mobs mobNames set from storage do2:mobs level2_willie -scoreboard players set $dungeon do2.utility.mc.mobGenerationType 3 +scoreboard players set $dungeon do2.utility.ec.mobGenerationType 3 # - Check for issues - # Check for mob AMOUNT count -execute if score $l2willie do2.config.mc.levelZoneMobCount matches ..0 if score $dungeon do2.utility.mc.collectingLogs matches 1 run data modify storage do2:mobs mobCountErrors append value 'L2WILLIE' -execute if score $l2willie do2.config.mc.levelZoneMobCount matches ..0 if score $dungeon do2.utility.mc.collectingLogs matches 0 as @a[scores={do2.logs.dungeon_setup=3..}] run tellraw @s ["",{"text":"[§9B§r]: L2WILLIE's mob count is empty. No mobs will generate in this zone."}] -execute if score $l2willie do2.config.mc.levelZoneMobCount matches ..0 run scoreboard players set $l2willie do2.config.mc.levelZoneMobCount 0 +execute if score $l2willie do2.config.ec.levelZoneMobCount matches ..0 if score $dungeon do2.utility.ec.collectingLogs matches 1 run data modify storage do2:mobs mobCountErrors append value 'L2WILLIE' +execute if score $l2willie do2.config.ec.levelZoneMobCount matches ..0 if score $dungeon do2.utility.ec.collectingLogs matches 0 as @a[scores={do2.logs.dungeon_setup=3..}] run tellraw @s ["",{"text":"[§9B§r]: L2WILLIE's mob count is empty. No mobs will generate in this zone."}] +execute if score $l2willie do2.config.ec.levelZoneMobCount matches ..0 run scoreboard players set $l2willie do2.config.ec.levelZoneMobCount 0 # Check for sufficient mob NAMES -execute if score $dungeon do2.utility.mc.mobNamesCount < $l2willie do2.config.mc.levelZoneMobCount if score $dungeon do2.utility.mc.collectingLogs matches 1 run data modify storage do2:mobs mobNameCountErrors append value 'L2WILLIE' -execute if score $dungeon do2.utility.mc.mobNamesCount < $l2willie 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 L2WILLIE's mob names for L2WILLIE's mob count. Adding random names to fix."}] -execute if score $dungeon do2.utility.mc.mobNamesCount < $l2willie do2.config.mc.levelZoneMobCount run function do2:mob_controller/add_mob_names/add_name_to_list +execute if score $dungeon do2.utility.ec.mobNamesCount < $l2willie do2.config.ec.levelZoneMobCount if score $dungeon do2.utility.ec.collectingLogs matches 1 run data modify storage do2:mobs mobNameCountErrors append value 'L2WILLIE' +execute if score $dungeon do2.utility.ec.mobNamesCount < $l2willie do2.config.ec.levelZoneMobCount if score $dungeon do2.utility.ec.collectingLogs matches 0 as @a[scores={do2.logs.dungeon_setup=3..}] run tellraw @s ["",{"text":"[§9B§r]: Not enough L2WILLIE's mob names for L2WILLIE's mob count. Adding random names to fix."}] +execute if score $dungeon do2.utility.ec.mobNamesCount < $l2willie do2.config.ec.levelZoneMobCount run function do2:mob_controller/add_mob_names/add_name_to_list # Generate enough mobs. execute as @e[type=drowned,tag=L2WILLIE] run tag @s add already_generated_mob @@ -29,4 +29,4 @@ execute as @e[tag=newly_generated_mob] run tag @s add L2WILLIE execute as @e[tag=newly_generated_mob] run tag @s remove newly_generated_mob execute if score $dungeon do2.config.fr.teleportKillers matches 1 as @e[tag=premade_generated_mob] run tp @s @e[type=marker,tag=L2WILLIE,limit=1,sort=random] execute as @e[tag=premade_generated_mob] run tag @s add L2WILLIE -execute as @e[tag=premade_generated_mob] run tag @s remove premade_generated_mob \ No newline at end of file +execute as @e[tag=premade_generated_mob] run tag @s remove premade_generated_mob diff --git a/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l2z1.mcfunction b/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l2z1.mcfunction index 293db3d8..1e86b833 100644 --- a/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l2z1.mcfunction +++ b/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l2z1.mcfunction @@ -3,20 +3,20 @@ execute as @a[scores={do2.logs.entity_controller=2..}] run tellraw @s ["",{"text # - End Log - # Setup -execute store result score $dungeon do2.utility.mc.mobNamesCount run data get storage do2:mobs level2_zone1 -scoreboard players operation $dungeon do2.utility.mc.mobGenerationCount = $l2z1 do2.config.mc.levelZoneMobCount +execute store result score $dungeon do2.utility.ec.mobNamesCount run data get storage do2:mobs level2_zone1 +scoreboard players operation $dungeon do2.utility.ec.mobGenerationCount = $l2z1 do2.config.ec.levelZoneMobCount data modify storage do2:mobs mobNames set from storage do2:mobs level2_zone1 -scoreboard players set $dungeon do2.utility.mc.mobGenerationType 1 +scoreboard players set $dungeon do2.utility.ec.mobGenerationType 1 # - Check for issues - # Check for mob AMOUNT count -execute if score $l2z1 do2.config.mc.levelZoneMobCount matches ..0 if score $dungeon do2.utility.mc.collectingLogs matches 1 run data modify storage do2:mobs mobCountErrors append value 'L2Z1' -execute if score $l2z1 do2.config.mc.levelZoneMobCount matches ..0 if score $dungeon do2.utility.mc.collectingLogs matches 0 as @a[scores={do2.logs.dungeon_setup=3..}] run tellraw @s ["",{"text":"[§9B§r]: L2Z1's mob count is empty. No mobs will generate in this zone."}] -execute if score $l2z1 do2.config.mc.levelZoneMobCount matches ..0 run scoreboard players set $l2z1 do2.config.mc.levelZoneMobCount 0 +execute if score $l2z1 do2.config.ec.levelZoneMobCount matches ..0 if score $dungeon do2.utility.ec.collectingLogs matches 1 run data modify storage do2:mobs mobCountErrors append value 'L2Z1' +execute if score $l2z1 do2.config.ec.levelZoneMobCount matches ..0 if score $dungeon do2.utility.ec.collectingLogs matches 0 as @a[scores={do2.logs.dungeon_setup=3..}] run tellraw @s ["",{"text":"[§9B§r]: L2Z1's mob count is empty. No mobs will generate in this zone."}] +execute if score $l2z1 do2.config.ec.levelZoneMobCount matches ..0 run scoreboard players set $l2z1 do2.config.ec.levelZoneMobCount 0 # Check for sufficient mob NAMES -execute if score $dungeon do2.utility.mc.mobNamesCount < $l2z1 do2.config.mc.levelZoneMobCount if score $dungeon do2.utility.mc.collectingLogs matches 1 run data modify storage do2:mobs mobNameCountErrors append value 'L2Z1' -execute if score $dungeon do2.utility.mc.mobNamesCount < $l2z1 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 L2Z1's mob names for L2Z1's mob count. Adding random names to fix."}] -execute if score $dungeon do2.utility.mc.mobNamesCount < $l2z1 do2.config.mc.levelZoneMobCount run function do2:mob_controller/add_mob_names/add_name_to_list +execute if score $dungeon do2.utility.ec.mobNamesCount < $l2z1 do2.config.ec.levelZoneMobCount if score $dungeon do2.utility.ec.collectingLogs matches 1 run data modify storage do2:mobs mobNameCountErrors append value 'L2Z1' +execute if score $dungeon do2.utility.ec.mobNamesCount < $l2z1 do2.config.ec.levelZoneMobCount if score $dungeon do2.utility.ec.collectingLogs matches 0 as @a[scores={do2.logs.dungeon_setup=3..}] run tellraw @s ["",{"text":"[§9B§r]: Not enough L2Z1's mob names for L2Z1's mob count. Adding random names to fix."}] +execute if score $dungeon do2.utility.ec.mobNamesCount < $l2z1 do2.config.ec.levelZoneMobCount run function do2:mob_controller/add_mob_names/add_name_to_list # Generate enough mobs. execute as @e[type=ravager,tag=L2Z1] run tag @s add already_generated_mob @@ -29,4 +29,4 @@ execute as @e[tag=newly_generated_mob] run tag @s add L2Z1 execute as @e[tag=newly_generated_mob] run tag @s remove newly_generated_mob execute if score $dungeon do2.config.fr.teleportKillers matches 1 as @e[tag=premade_generated_mob] run tp @s @e[type=marker,tag=L2Z1,limit=1,sort=random] execute as @e[tag=premade_generated_mob] run tag @s add L2Z1 -execute as @e[tag=premade_generated_mob] run tag @s remove premade_generated_mob \ No newline at end of file +execute as @e[tag=premade_generated_mob] run tag @s remove premade_generated_mob diff --git a/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l2z2.mcfunction b/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l2z2.mcfunction index 60216c49..205c9960 100644 --- a/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l2z2.mcfunction +++ b/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l2z2.mcfunction @@ -3,20 +3,20 @@ execute as @a[scores={do2.logs.entity_controller=2..}] run tellraw @s ["",{"text # - End Log - # Setup -execute store result score $dungeon do2.utility.mc.mobNamesCount run data get storage do2:mobs level2_zone2 -scoreboard players operation $dungeon do2.utility.mc.mobGenerationCount = $l2z2 do2.config.mc.levelZoneMobCount +execute store result score $dungeon do2.utility.ec.mobNamesCount run data get storage do2:mobs level2_zone2 +scoreboard players operation $dungeon do2.utility.ec.mobGenerationCount = $l2z2 do2.config.ec.levelZoneMobCount data modify storage do2:mobs mobNames set from storage do2:mobs level2_zone2 -scoreboard players set $dungeon do2.utility.mc.mobGenerationType 1 +scoreboard players set $dungeon do2.utility.ec.mobGenerationType 1 # - Check for issues - # Check for mob AMOUNT count -execute if score $l2z2 do2.config.mc.levelZoneMobCount matches ..0 if score $dungeon do2.utility.mc.collectingLogs matches 1 run data modify storage do2:mobs mobCountErrors append value 'L2Z2' -execute if score $l2z2 do2.config.mc.levelZoneMobCount matches ..0 if score $dungeon do2.utility.mc.collectingLogs matches 0 as @a[scores={do2.logs.dungeon_setup=3..}] run tellraw @s ["",{"text":"[§9B§r]: L2Z2's mob count is empty. No mobs will generate in this zone."}] -execute if score $l2z2 do2.config.mc.levelZoneMobCount matches ..0 run scoreboard players set $l2z2 do2.config.mc.levelZoneMobCount 0 +execute if score $l2z2 do2.config.ec.levelZoneMobCount matches ..0 if score $dungeon do2.utility.ec.collectingLogs matches 1 run data modify storage do2:mobs mobCountErrors append value 'L2Z2' +execute if score $l2z2 do2.config.ec.levelZoneMobCount matches ..0 if score $dungeon do2.utility.ec.collectingLogs matches 0 as @a[scores={do2.logs.dungeon_setup=3..}] run tellraw @s ["",{"text":"[§9B§r]: L2Z2's mob count is empty. No mobs will generate in this zone."}] +execute if score $l2z2 do2.config.ec.levelZoneMobCount matches ..0 run scoreboard players set $l2z2 do2.config.ec.levelZoneMobCount 0 # Check for sufficient mob NAMES -execute if score $dungeon do2.utility.mc.mobNamesCount < $l2z2 do2.config.mc.levelZoneMobCount if score $dungeon do2.utility.mc.collectingLogs matches 1 run data modify storage do2:mobs mobNameCountErrors append value 'L2Z2' -execute if score $dungeon do2.utility.mc.mobNamesCount < $l2z2 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 L2Z2's mob names for L2Z2's mob count. Adding random names to fix."}] -execute if score $dungeon do2.utility.mc.mobNamesCount < $l2z2 do2.config.mc.levelZoneMobCount run function do2:mob_controller/add_mob_names/add_name_to_list +execute if score $dungeon do2.utility.ec.mobNamesCount < $l2z2 do2.config.ec.levelZoneMobCount if score $dungeon do2.utility.ec.collectingLogs matches 1 run data modify storage do2:mobs mobNameCountErrors append value 'L2Z2' +execute if score $dungeon do2.utility.ec.mobNamesCount < $l2z2 do2.config.ec.levelZoneMobCount if score $dungeon do2.utility.ec.collectingLogs matches 0 as @a[scores={do2.logs.dungeon_setup=3..}] run tellraw @s ["",{"text":"[§9B§r]: Not enough L2Z2's mob names for L2Z2's mob count. Adding random names to fix."}] +execute if score $dungeon do2.utility.ec.mobNamesCount < $l2z2 do2.config.ec.levelZoneMobCount run function do2:mob_controller/add_mob_names/add_name_to_list # Generate enough mobs. execute as @e[type=ravager,tag=L2Z2] run tag @s add already_generated_mob @@ -29,4 +29,4 @@ execute as @e[tag=newly_generated_mob] run tag @s add L2Z2 execute as @e[tag=newly_generated_mob] run tag @s remove newly_generated_mob execute if score $dungeon do2.config.fr.teleportKillers matches 1 as @e[tag=premade_generated_mob] run tp @s @e[type=marker,tag=L2Z2,limit=1,sort=random] execute as @e[tag=premade_generated_mob] run tag @s add L2Z2 -execute as @e[tag=premade_generated_mob] run tag @s remove premade_generated_mob \ No newline at end of file +execute as @e[tag=premade_generated_mob] run tag @s remove premade_generated_mob diff --git a/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l2z3.mcfunction b/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l2z3.mcfunction index b1c1a767..184f5e66 100644 --- a/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l2z3.mcfunction +++ b/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l2z3.mcfunction @@ -3,20 +3,20 @@ execute as @a[scores={do2.logs.entity_controller=2..}] run tellraw @s ["",{"text # - End Log - # Setup -execute store result score $dungeon do2.utility.mc.mobNamesCount run data get storage do2:mobs level2_zone3 -scoreboard players operation $dungeon do2.utility.mc.mobGenerationCount = $l2z3 do2.config.mc.levelZoneMobCount +execute store result score $dungeon do2.utility.ec.mobNamesCount run data get storage do2:mobs level2_zone3 +scoreboard players operation $dungeon do2.utility.ec.mobGenerationCount = $l2z3 do2.config.ec.levelZoneMobCount data modify storage do2:mobs mobNames set from storage do2:mobs level2_zone3 -scoreboard players set $dungeon do2.utility.mc.mobGenerationType 1 +scoreboard players set $dungeon do2.utility.ec.mobGenerationType 1 # - Check for issues - # Check for mob AMOUNT count -execute if score $l2z3 do2.config.mc.levelZoneMobCount matches ..0 if score $dungeon do2.utility.mc.collectingLogs matches 1 run data modify storage do2:mobs mobCountErrors append value 'L2Z3' -execute if score $l2z3 do2.config.mc.levelZoneMobCount matches ..0 if score $dungeon do2.utility.mc.collectingLogs matches 0 as @a[scores={do2.logs.dungeon_setup=3..}] run tellraw @s ["",{"text":"[§9B§r]: L2Z3's mob count is empty. No mobs will generate in this zone."}] -execute if score $l2z3 do2.config.mc.levelZoneMobCount matches ..0 run scoreboard players set $l2z3 do2.config.mc.levelZoneMobCount 0 +execute if score $l2z3 do2.config.ec.levelZoneMobCount matches ..0 if score $dungeon do2.utility.ec.collectingLogs matches 1 run data modify storage do2:mobs mobCountErrors append value 'L2Z3' +execute if score $l2z3 do2.config.ec.levelZoneMobCount matches ..0 if score $dungeon do2.utility.ec.collectingLogs matches 0 as @a[scores={do2.logs.dungeon_setup=3..}] run tellraw @s ["",{"text":"[§9B§r]: L2Z3's mob count is empty. No mobs will generate in this zone."}] +execute if score $l2z3 do2.config.ec.levelZoneMobCount matches ..0 run scoreboard players set $l2z3 do2.config.ec.levelZoneMobCount 0 # Check for sufficient mob NAMES -execute if score $dungeon do2.utility.mc.mobNamesCount < $l2z3 do2.config.mc.levelZoneMobCount if score $dungeon do2.utility.mc.collectingLogs matches 1 run data modify storage do2:mobs mobNameCountErrors append value 'L2Z3' -execute if score $dungeon do2.utility.mc.mobNamesCount < $l2z3 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 L2Z3's mob names for L2Z3's mob count. Adding random names to fix."}] -execute if score $dungeon do2.utility.mc.mobNamesCount < $l2z3 do2.config.mc.levelZoneMobCount run function do2:mob_controller/add_mob_names/add_name_to_list +execute if score $dungeon do2.utility.ec.mobNamesCount < $l2z3 do2.config.ec.levelZoneMobCount if score $dungeon do2.utility.ec.collectingLogs matches 1 run data modify storage do2:mobs mobNameCountErrors append value 'L2Z3' +execute if score $dungeon do2.utility.ec.mobNamesCount < $l2z3 do2.config.ec.levelZoneMobCount if score $dungeon do2.utility.ec.collectingLogs matches 0 as @a[scores={do2.logs.dungeon_setup=3..}] run tellraw @s ["",{"text":"[§9B§r]: Not enough L2Z3's mob names for L2Z3's mob count. Adding random names to fix."}] +execute if score $dungeon do2.utility.ec.mobNamesCount < $l2z3 do2.config.ec.levelZoneMobCount run function do2:mob_controller/add_mob_names/add_name_to_list # Generate enough mobs. execute as @e[type=ravager,tag=L2Z3] run tag @s add already_generated_mob @@ -29,4 +29,4 @@ execute as @e[tag=newly_generated_mob] run tag @s add L2Z3 execute as @e[tag=newly_generated_mob] run tag @s remove newly_generated_mob execute if score $dungeon do2.config.fr.teleportKillers matches 1 as @e[tag=premade_generated_mob] run tp @s @e[type=marker,tag=L2Z3,limit=1,sort=random] execute as @e[tag=premade_generated_mob] run tag @s add L2Z3 -execute as @e[tag=premade_generated_mob] run tag @s remove premade_generated_mob \ No newline at end of file +execute as @e[tag=premade_generated_mob] run tag @s remove premade_generated_mob diff --git a/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l2z4.mcfunction b/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l2z4.mcfunction index e297633a..2af68865 100644 --- a/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l2z4.mcfunction +++ b/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l2z4.mcfunction @@ -3,20 +3,20 @@ execute as @a[scores={do2.logs.entity_controller=2..}] run tellraw @s ["",{"text # - End Log - # Setup -execute store result score $dungeon do2.utility.mc.mobNamesCount run data get storage do2:mobs level2_zone4 -scoreboard players operation $dungeon do2.utility.mc.mobGenerationCount = $l2z4 do2.config.mc.levelZoneMobCount +execute store result score $dungeon do2.utility.ec.mobNamesCount run data get storage do2:mobs level2_zone4 +scoreboard players operation $dungeon do2.utility.ec.mobGenerationCount = $l2z4 do2.config.ec.levelZoneMobCount data modify storage do2:mobs mobNames set from storage do2:mobs level2_zone4 -scoreboard players set $dungeon do2.utility.mc.mobGenerationType 1 +scoreboard players set $dungeon do2.utility.ec.mobGenerationType 1 # - Check for issues - # Check for mob AMOUNT count -execute if score $l2z4 do2.config.mc.levelZoneMobCount matches ..0 if score $dungeon do2.utility.mc.collectingLogs matches 1 run data modify storage do2:mobs mobCountErrors append value 'L2Z4' -execute if score $l2z4 do2.config.mc.levelZoneMobCount matches ..0 if score $dungeon do2.utility.mc.collectingLogs matches 0 as @a[scores={do2.logs.dungeon_setup=3..}] run tellraw @s ["",{"text":"[§9B§r]: L2Z4's mob count is empty. No mobs will generate in this zone."}] -execute if score $l2z4 do2.config.mc.levelZoneMobCount matches ..0 run scoreboard players set $l2z4 do2.config.mc.levelZoneMobCount 0 +execute if score $l2z4 do2.config.ec.levelZoneMobCount matches ..0 if score $dungeon do2.utility.ec.collectingLogs matches 1 run data modify storage do2:mobs mobCountErrors append value 'L2Z4' +execute if score $l2z4 do2.config.ec.levelZoneMobCount matches ..0 if score $dungeon do2.utility.ec.collectingLogs matches 0 as @a[scores={do2.logs.dungeon_setup=3..}] run tellraw @s ["",{"text":"[§9B§r]: L2Z4's mob count is empty. No mobs will generate in this zone."}] +execute if score $l2z4 do2.config.ec.levelZoneMobCount matches ..0 run scoreboard players set $l2z4 do2.config.ec.levelZoneMobCount 0 # Check for sufficient mob NAMES -execute if score $dungeon do2.utility.mc.mobNamesCount < $l2z4 do2.config.mc.levelZoneMobCount if score $dungeon do2.utility.mc.collectingLogs matches 1 run data modify storage do2:mobs mobNameCountErrors append value 'L2Z4' -execute if score $dungeon do2.utility.mc.mobNamesCount < $l2z4 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 L2Z4's mob names for L2Z4's mob count. Adding random names to fix."}] -execute if score $dungeon do2.utility.mc.mobNamesCount < $l2z4 do2.config.mc.levelZoneMobCount run function do2:mob_controller/add_mob_names/add_name_to_list +execute if score $dungeon do2.utility.ec.mobNamesCount < $l2z4 do2.config.ec.levelZoneMobCount if score $dungeon do2.utility.ec.collectingLogs matches 1 run data modify storage do2:mobs mobNameCountErrors append value 'L2Z4' +execute if score $dungeon do2.utility.ec.mobNamesCount < $l2z4 do2.config.ec.levelZoneMobCount if score $dungeon do2.utility.ec.collectingLogs matches 0 as @a[scores={do2.logs.dungeon_setup=3..}] run tellraw @s ["",{"text":"[§9B§r]: Not enough L2Z4's mob names for L2Z4's mob count. Adding random names to fix."}] +execute if score $dungeon do2.utility.ec.mobNamesCount < $l2z4 do2.config.ec.levelZoneMobCount run function do2:mob_controller/add_mob_names/add_name_to_list # Generate enough mobs. execute as @e[type=ravager,tag=L2Z4] run tag @s add already_generated_mob @@ -29,4 +29,4 @@ execute as @e[tag=newly_generated_mob] run tag @s add L2Z4 execute as @e[tag=newly_generated_mob] run tag @s remove newly_generated_mob execute if score $dungeon do2.config.fr.teleportKillers matches 1 as @e[tag=premade_generated_mob] run tp @s @e[type=marker,tag=L2Z4,limit=1,sort=random] execute as @e[tag=premade_generated_mob] run tag @s add L2Z4 -execute as @e[tag=premade_generated_mob] run tag @s remove premade_generated_mob \ No newline at end of file +execute as @e[tag=premade_generated_mob] run tag @s remove premade_generated_mob diff --git a/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l2z5.mcfunction b/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l2z5.mcfunction index c76f91bc..c8e51fff 100644 --- a/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l2z5.mcfunction +++ b/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l2z5.mcfunction @@ -3,20 +3,20 @@ execute as @a[scores={do2.logs.entity_controller=2..}] run tellraw @s ["",{"text # - End Log - # Setup -execute store result score $dungeon do2.utility.mc.mobNamesCount run data get storage do2:mobs level2_zone5 -scoreboard players operation $dungeon do2.utility.mc.mobGenerationCount = $l2z5 do2.config.mc.levelZoneMobCount +execute store result score $dungeon do2.utility.ec.mobNamesCount run data get storage do2:mobs level2_zone5 +scoreboard players operation $dungeon do2.utility.ec.mobGenerationCount = $l2z5 do2.config.ec.levelZoneMobCount data modify storage do2:mobs mobNames set from storage do2:mobs level2_zone5 -scoreboard players set $dungeon do2.utility.mc.mobGenerationType 1 +scoreboard players set $dungeon do2.utility.ec.mobGenerationType 1 # - Check for issues - # Check for mob AMOUNT count -execute if score $l2z5 do2.config.mc.levelZoneMobCount matches ..0 if score $dungeon do2.utility.mc.collectingLogs matches 1 run data modify storage do2:mobs mobCountErrors append value 'L2Z5' -execute if score $l2z5 do2.config.mc.levelZoneMobCount matches ..0 if score $dungeon do2.utility.mc.collectingLogs matches 0 as @a[scores={do2.logs.dungeon_setup=3..}] run tellraw @s ["",{"text":"[§9B§r]: L2Z5's mob count is empty. No mobs will generate in this zone."}] -execute if score $l2z5 do2.config.mc.levelZoneMobCount matches ..0 run scoreboard players set $l2z5 do2.config.mc.levelZoneMobCount 0 +execute if score $l2z5 do2.config.ec.levelZoneMobCount matches ..0 if score $dungeon do2.utility.ec.collectingLogs matches 1 run data modify storage do2:mobs mobCountErrors append value 'L2Z5' +execute if score $l2z5 do2.config.ec.levelZoneMobCount matches ..0 if score $dungeon do2.utility.ec.collectingLogs matches 0 as @a[scores={do2.logs.dungeon_setup=3..}] run tellraw @s ["",{"text":"[§9B§r]: L2Z5's mob count is empty. No mobs will generate in this zone."}] +execute if score $l2z5 do2.config.ec.levelZoneMobCount matches ..0 run scoreboard players set $l2z5 do2.config.ec.levelZoneMobCount 0 # Check for sufficient mob NAMES -execute if score $dungeon do2.utility.mc.mobNamesCount < $l2z5 do2.config.mc.levelZoneMobCount if score $dungeon do2.utility.mc.collectingLogs matches 1 run data modify storage do2:mobs mobNameCountErrors append value 'L2Z5' -execute if score $dungeon do2.utility.mc.mobNamesCount < $l2z5 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 L2Z5's mob names for L2Z5's mob count. Adding random names to fix."}] -execute if score $dungeon do2.utility.mc.mobNamesCount < $l2z5 do2.config.mc.levelZoneMobCount run function do2:mob_controller/add_mob_names/add_name_to_list +execute if score $dungeon do2.utility.ec.mobNamesCount < $l2z5 do2.config.ec.levelZoneMobCount if score $dungeon do2.utility.ec.collectingLogs matches 1 run data modify storage do2:mobs mobNameCountErrors append value 'L2Z5' +execute if score $dungeon do2.utility.ec.mobNamesCount < $l2z5 do2.config.ec.levelZoneMobCount if score $dungeon do2.utility.ec.collectingLogs matches 0 as @a[scores={do2.logs.dungeon_setup=3..}] run tellraw @s ["",{"text":"[§9B§r]: Not enough L2Z5's mob names for L2Z5's mob count. Adding random names to fix."}] +execute if score $dungeon do2.utility.ec.mobNamesCount < $l2z5 do2.config.ec.levelZoneMobCount run function do2:mob_controller/add_mob_names/add_name_to_list # Generate enough mobs. execute as @e[type=ravager,tag=L2Z5] run tag @s add already_generated_mob @@ -29,4 +29,4 @@ execute as @e[tag=newly_generated_mob] run tag @s add L2Z5 execute as @e[tag=newly_generated_mob] run tag @s remove newly_generated_mob execute if score $dungeon do2.config.fr.teleportKillers matches 1 as @e[tag=premade_generated_mob] run tp @s @e[type=marker,tag=L2Z5,limit=1,sort=random] execute as @e[tag=premade_generated_mob] run tag @s add L2Z5 -execute as @e[tag=premade_generated_mob] run tag @s remove premade_generated_mob \ No newline at end of file +execute as @e[tag=premade_generated_mob] run tag @s remove premade_generated_mob diff --git a/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l3z1.mcfunction b/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l3z1.mcfunction index 9c67226a..40b28d90 100644 --- a/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l3z1.mcfunction +++ b/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l3z1.mcfunction @@ -3,20 +3,20 @@ execute as @a[scores={do2.logs.entity_controller=2..}] run tellraw @s ["",{"text # - End Log - # Setup -execute store result score $dungeon do2.utility.mc.mobNamesCount run data get storage do2:mobs level3_zone1 -scoreboard players operation $dungeon do2.utility.mc.mobGenerationCount = $l3z1 do2.config.mc.levelZoneMobCount +execute store result score $dungeon do2.utility.ec.mobNamesCount run data get storage do2:mobs level3_zone1 +scoreboard players operation $dungeon do2.utility.ec.mobGenerationCount = $l3z1 do2.config.ec.levelZoneMobCount data modify storage do2:mobs mobNames set from storage do2:mobs level3_zone1 -scoreboard players set $dungeon do2.utility.mc.mobGenerationType 2 +scoreboard players set $dungeon do2.utility.ec.mobGenerationType 2 # - Check for issues - # Check for mob AMOUNT count -execute if score $l3z1 do2.config.mc.levelZoneMobCount matches ..0 if score $dungeon do2.utility.mc.collectingLogs matches 1 run data modify storage do2:mobs mobCountErrors append value 'L3Z1' -execute if score $l3z1 do2.config.mc.levelZoneMobCount matches ..0 if score $dungeon do2.utility.mc.collectingLogs matches 0 as @a[scores={do2.logs.dungeon_setup=3..}] run tellraw @s ["",{"text":"[§9B§r]: L3Z1's mob count is empty. No mobs will generate in this zone."}] -execute if score $l3z1 do2.config.mc.levelZoneMobCount matches ..0 run scoreboard players set $l3z1 do2.config.mc.levelZoneMobCount 0 +execute if score $l3z1 do2.config.ec.levelZoneMobCount matches ..0 if score $dungeon do2.utility.ec.collectingLogs matches 1 run data modify storage do2:mobs mobCountErrors append value 'L3Z1' +execute if score $l3z1 do2.config.ec.levelZoneMobCount matches ..0 if score $dungeon do2.utility.ec.collectingLogs matches 0 as @a[scores={do2.logs.dungeon_setup=3..}] run tellraw @s ["",{"text":"[§9B§r]: L3Z1's mob count is empty. No mobs will generate in this zone."}] +execute if score $l3z1 do2.config.ec.levelZoneMobCount matches ..0 run scoreboard players set $l3z1 do2.config.ec.levelZoneMobCount 0 # Check for sufficient mob NAMES -execute if score $dungeon do2.utility.mc.mobNamesCount < $l3z1 do2.config.mc.levelZoneMobCount if score $dungeon do2.utility.mc.collectingLogs matches 1 run data modify storage do2:mobs mobNameCountErrors append value 'L3Z1' -execute if score $dungeon do2.utility.mc.mobNamesCount < $l3z1 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 L3Z1's mob names for L3Z1's mob count. Adding random names to fix."}] -execute if score $dungeon do2.utility.mc.mobNamesCount < $l3z1 do2.config.mc.levelZoneMobCount run function do2:mob_controller/add_mob_names/add_name_to_list +execute if score $dungeon do2.utility.ec.mobNamesCount < $l3z1 do2.config.ec.levelZoneMobCount if score $dungeon do2.utility.ec.collectingLogs matches 1 run data modify storage do2:mobs mobNameCountErrors append value 'L3Z1' +execute if score $dungeon do2.utility.ec.mobNamesCount < $l3z1 do2.config.ec.levelZoneMobCount if score $dungeon do2.utility.ec.collectingLogs matches 0 as @a[scores={do2.logs.dungeon_setup=3..}] run tellraw @s ["",{"text":"[§9B§r]: Not enough L3Z1's mob names for L3Z1's mob count. Adding random names to fix."}] +execute if score $dungeon do2.utility.ec.mobNamesCount < $l3z1 do2.config.ec.levelZoneMobCount run function do2:mob_controller/add_mob_names/add_name_to_list # Generate enough mobs. execute as @e[type=warden,tag=L3Z1] run tag @s add already_generated_mob @@ -29,4 +29,4 @@ execute as @e[tag=newly_generated_mob] run tag @s add L3Z1 execute as @e[tag=newly_generated_mob] run tag @s remove newly_generated_mob execute if score $dungeon do2.config.fr.teleportKillers matches 1 as @e[tag=premade_generated_mob] run tp @s @e[type=marker,tag=L3Z1,limit=1,sort=random] execute as @e[tag=premade_generated_mob] run tag @s add L3Z1 -execute as @e[tag=premade_generated_mob] run tag @s remove premade_generated_mob \ No newline at end of file +execute as @e[tag=premade_generated_mob] run tag @s remove premade_generated_mob diff --git a/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l3z2.mcfunction b/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l3z2.mcfunction index 1ca94cee..f7355eb0 100644 --- a/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l3z2.mcfunction +++ b/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l3z2.mcfunction @@ -3,20 +3,20 @@ execute as @a[scores={do2.logs.entity_controller=2..}] run tellraw @s ["",{"text # - End Log - # Setup -execute store result score $dungeon do2.utility.mc.mobNamesCount run data get storage do2:mobs level3_zone2 -scoreboard players operation $dungeon do2.utility.mc.mobGenerationCount = $l3z2 do2.config.mc.levelZoneMobCount +execute store result score $dungeon do2.utility.ec.mobNamesCount run data get storage do2:mobs level3_zone2 +scoreboard players operation $dungeon do2.utility.ec.mobGenerationCount = $l3z2 do2.config.ec.levelZoneMobCount data modify storage do2:mobs mobNames set from storage do2:mobs level3_zone2 -scoreboard players set $dungeon do2.utility.mc.mobGenerationType 2 +scoreboard players set $dungeon do2.utility.ec.mobGenerationType 2 # - Check for issues - # Check for mob AMOUNT count -execute if score $l3z2 do2.config.mc.levelZoneMobCount matches ..0 if score $dungeon do2.utility.mc.collectingLogs matches 1 run data modify storage do2:mobs mobCountErrors append value 'L3Z2' -execute if score $l3z2 do2.config.mc.levelZoneMobCount matches ..0 if score $dungeon do2.utility.mc.collectingLogs matches 0 as @a[scores={do2.logs.dungeon_setup=3..}] run tellraw @s ["",{"text":"[§9B§r]: L3Z2's mob count is empty. No mobs will generate in this zone."}] -execute if score $l3z2 do2.config.mc.levelZoneMobCount matches ..0 run scoreboard players set $l3z2 do2.config.mc.levelZoneMobCount 0 +execute if score $l3z2 do2.config.ec.levelZoneMobCount matches ..0 if score $dungeon do2.utility.ec.collectingLogs matches 1 run data modify storage do2:mobs mobCountErrors append value 'L3Z2' +execute if score $l3z2 do2.config.ec.levelZoneMobCount matches ..0 if score $dungeon do2.utility.ec.collectingLogs matches 0 as @a[scores={do2.logs.dungeon_setup=3..}] run tellraw @s ["",{"text":"[§9B§r]: L3Z2's mob count is empty. No mobs will generate in this zone."}] +execute if score $l3z2 do2.config.ec.levelZoneMobCount matches ..0 run scoreboard players set $l3z2 do2.config.ec.levelZoneMobCount 0 # Check for sufficient mob NAMES -execute if score $dungeon do2.utility.mc.mobNamesCount < $l3z2 do2.config.mc.levelZoneMobCount if score $dungeon do2.utility.mc.collectingLogs matches 1 run data modify storage do2:mobs mobNameCountErrors append value 'L3Z2' -execute if score $dungeon do2.utility.mc.mobNamesCount < $l3z2 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 L3Z2's mob names for L3Z2's mob count. Adding random names to fix."}] -execute if score $dungeon do2.utility.mc.mobNamesCount < $l3z2 do2.config.mc.levelZoneMobCount run function do2:mob_controller/add_mob_names/add_name_to_list +execute if score $dungeon do2.utility.ec.mobNamesCount < $l3z2 do2.config.ec.levelZoneMobCount if score $dungeon do2.utility.ec.collectingLogs matches 1 run data modify storage do2:mobs mobNameCountErrors append value 'L3Z2' +execute if score $dungeon do2.utility.ec.mobNamesCount < $l3z2 do2.config.ec.levelZoneMobCount if score $dungeon do2.utility.ec.collectingLogs matches 0 as @a[scores={do2.logs.dungeon_setup=3..}] run tellraw @s ["",{"text":"[§9B§r]: Not enough L3Z2's mob names for L3Z2's mob count. Adding random names to fix."}] +execute if score $dungeon do2.utility.ec.mobNamesCount < $l3z2 do2.config.ec.levelZoneMobCount run function do2:mob_controller/add_mob_names/add_name_to_list # Generate enough mobs. execute as @e[type=warden,tag=L3Z2] run tag @s add already_generated_mob @@ -29,4 +29,4 @@ execute as @e[tag=newly_generated_mob] run tag @s add L3Z2 execute as @e[tag=newly_generated_mob] run tag @s remove newly_generated_mob execute if score $dungeon do2.config.fr.teleportKillers matches 1 as @e[tag=premade_generated_mob] run tp @s @e[type=marker,tag=L3Z2,limit=1,sort=random] execute as @e[tag=premade_generated_mob] run tag @s add L3Z2 -execute as @e[tag=premade_generated_mob] run tag @s remove premade_generated_mob \ No newline at end of file +execute as @e[tag=premade_generated_mob] run tag @s remove premade_generated_mob diff --git a/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l3z3.mcfunction b/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l3z3.mcfunction index 59707382..e5bff627 100644 --- a/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l3z3.mcfunction +++ b/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l3z3.mcfunction @@ -3,20 +3,20 @@ execute as @a[scores={do2.logs.entity_controller=2..}] run tellraw @s ["",{"text # - End Log - # Setup -execute store result score $dungeon do2.utility.mc.mobNamesCount run data get storage do2:mobs level3_zone3 -scoreboard players operation $dungeon do2.utility.mc.mobGenerationCount = $l3z3 do2.config.mc.levelZoneMobCount +execute store result score $dungeon do2.utility.ec.mobNamesCount run data get storage do2:mobs level3_zone3 +scoreboard players operation $dungeon do2.utility.ec.mobGenerationCount = $l3z3 do2.config.ec.levelZoneMobCount data modify storage do2:mobs mobNames set from storage do2:mobs level3_zone3 -scoreboard players set $dungeon do2.utility.mc.mobGenerationType 2 +scoreboard players set $dungeon do2.utility.ec.mobGenerationType 2 # - Check for issues - # Check for mob AMOUNT count -execute if score $l3z3 do2.config.mc.levelZoneMobCount matches ..0 if score $dungeon do2.utility.mc.collectingLogs matches 1 run data modify storage do2:mobs mobCountErrors append value 'L3Z3' -execute if score $l3z3 do2.config.mc.levelZoneMobCount matches ..0 if score $dungeon do2.utility.mc.collectingLogs matches 0 as @a[scores={do2.logs.dungeon_setup=3..}] run tellraw @s ["",{"text":"[§9B§r]: L3Z3's mob count is empty. No mobs will generate in this zone."}] -execute if score $l3z3 do2.config.mc.levelZoneMobCount matches ..0 run scoreboard players set $l3z3 do2.config.mc.levelZoneMobCount 0 +execute if score $l3z3 do2.config.ec.levelZoneMobCount matches ..0 if score $dungeon do2.utility.ec.collectingLogs matches 1 run data modify storage do2:mobs mobCountErrors append value 'L3Z3' +execute if score $l3z3 do2.config.ec.levelZoneMobCount matches ..0 if score $dungeon do2.utility.ec.collectingLogs matches 0 as @a[scores={do2.logs.dungeon_setup=3..}] run tellraw @s ["",{"text":"[§9B§r]: L3Z3's mob count is empty. No mobs will generate in this zone."}] +execute if score $l3z3 do2.config.ec.levelZoneMobCount matches ..0 run scoreboard players set $l3z3 do2.config.ec.levelZoneMobCount 0 # Check for sufficient mob NAMES -execute if score $dungeon do2.utility.mc.mobNamesCount < $l3z3 do2.config.mc.levelZoneMobCount if score $dungeon do2.utility.mc.collectingLogs matches 1 run data modify storage do2:mobs mobNameCountErrors append value 'L3Z3' -execute if score $dungeon do2.utility.mc.mobNamesCount < $l3z3 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 L3Z3's mob names for L3Z3's mob count. Adding random names to fix."}] -execute if score $dungeon do2.utility.mc.mobNamesCount < $l3z3 do2.config.mc.levelZoneMobCount run function do2:mob_controller/add_mob_names/add_name_to_list +execute if score $dungeon do2.utility.ec.mobNamesCount < $l3z3 do2.config.ec.levelZoneMobCount if score $dungeon do2.utility.ec.collectingLogs matches 1 run data modify storage do2:mobs mobNameCountErrors append value 'L3Z3' +execute if score $dungeon do2.utility.ec.mobNamesCount < $l3z3 do2.config.ec.levelZoneMobCount if score $dungeon do2.utility.ec.collectingLogs matches 0 as @a[scores={do2.logs.dungeon_setup=3..}] run tellraw @s ["",{"text":"[§9B§r]: Not enough L3Z3's mob names for L3Z3's mob count. Adding random names to fix."}] +execute if score $dungeon do2.utility.ec.mobNamesCount < $l3z3 do2.config.ec.levelZoneMobCount run function do2:mob_controller/add_mob_names/add_name_to_list # Generate enough mobs. execute as @e[type=warden,tag=L3Z3] run tag @s add already_generated_mob @@ -29,4 +29,4 @@ execute as @e[tag=newly_generated_mob] run tag @s add L3Z3 execute as @e[tag=newly_generated_mob] run tag @s remove newly_generated_mob execute if score $dungeon do2.config.fr.teleportKillers matches 1 as @e[tag=premade_generated_mob] run tp @s @e[type=marker,tag=L3Z3,limit=1,sort=random] execute as @e[tag=premade_generated_mob] run tag @s add L3Z3 -execute as @e[tag=premade_generated_mob] run tag @s remove premade_generated_mob \ No newline at end of file +execute as @e[tag=premade_generated_mob] run tag @s remove premade_generated_mob diff --git a/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l4z1.mcfunction b/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l4z1.mcfunction index 85427f92..18f04516 100644 --- a/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l4z1.mcfunction +++ b/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l4z1.mcfunction @@ -3,20 +3,20 @@ execute as @a[scores={do2.logs.entity_controller=2..}] run tellraw @s ["",{"text # - End Log - # Setup -execute store result score $dungeon do2.utility.mc.mobNamesCount run data get storage do2:mobs level4_zone1 -scoreboard players operation $dungeon do2.utility.mc.mobGenerationCount = $l4z1 do2.config.mc.levelZoneMobCount +execute store result score $dungeon do2.utility.ec.mobNamesCount run data get storage do2:mobs level4_zone1 +scoreboard players operation $dungeon do2.utility.ec.mobGenerationCount = $l4z1 do2.config.ec.levelZoneMobCount data modify storage do2:mobs mobNames set from storage do2:mobs level4_zone1 -scoreboard players set $dungeon do2.utility.mc.mobGenerationType 2 +scoreboard players set $dungeon do2.utility.ec.mobGenerationType 2 # - Check for issues - # Check for mob AMOUNT count -execute if score $l4z1 do2.config.mc.levelZoneMobCount matches ..0 if score $dungeon do2.utility.mc.collectingLogs matches 1 run data modify storage do2:mobs mobCountErrors append value 'L4Z1' -execute if score $l4z1 do2.config.mc.levelZoneMobCount matches ..0 if score $dungeon do2.utility.mc.collectingLogs matches 0 as @a[scores={do2.logs.dungeon_setup=3..}] run tellraw @s ["",{"text":"[§9B§r]: L4Z1's mob count is empty. No mobs will generate in this zone."}] -execute if score $l4z1 do2.config.mc.levelZoneMobCount matches ..0 run scoreboard players set $l4z1 do2.config.mc.levelZoneMobCount 0 +execute if score $l4z1 do2.config.ec.levelZoneMobCount matches ..0 if score $dungeon do2.utility.ec.collectingLogs matches 1 run data modify storage do2:mobs mobCountErrors append value 'L4Z1' +execute if score $l4z1 do2.config.ec.levelZoneMobCount matches ..0 if score $dungeon do2.utility.ec.collectingLogs matches 0 as @a[scores={do2.logs.dungeon_setup=3..}] run tellraw @s ["",{"text":"[§9B§r]: L4Z1's mob count is empty. No mobs will generate in this zone."}] +execute if score $l4z1 do2.config.ec.levelZoneMobCount matches ..0 run scoreboard players set $l4z1 do2.config.ec.levelZoneMobCount 0 # Check for sufficient mob NAMES -execute if score $dungeon do2.utility.mc.mobNamesCount < $l4z1 do2.config.mc.levelZoneMobCount if score $dungeon do2.utility.mc.collectingLogs matches 1 run data modify storage do2:mobs mobNameCountErrors append value 'L4Z1' -execute if score $dungeon do2.utility.mc.mobNamesCount < $l4z1 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 L4Z1's mob names for L4Z1's mob count. Adding random names to fix."}] -execute if score $dungeon do2.utility.mc.mobNamesCount < $l4z1 do2.config.mc.levelZoneMobCount run function do2:mob_controller/add_mob_names/add_name_to_list +execute if score $dungeon do2.utility.ec.mobNamesCount < $l4z1 do2.config.ec.levelZoneMobCount if score $dungeon do2.utility.ec.collectingLogs matches 1 run data modify storage do2:mobs mobNameCountErrors append value 'L4Z1' +execute if score $dungeon do2.utility.ec.mobNamesCount < $l4z1 do2.config.ec.levelZoneMobCount if score $dungeon do2.utility.ec.collectingLogs matches 0 as @a[scores={do2.logs.dungeon_setup=3..}] run tellraw @s ["",{"text":"[§9B§r]: Not enough L4Z1's mob names for L4Z1's mob count. Adding random names to fix."}] +execute if score $dungeon do2.utility.ec.mobNamesCount < $l4z1 do2.config.ec.levelZoneMobCount run function do2:mob_controller/add_mob_names/add_name_to_list # Generate enough mobs. execute as @e[type=warden,tag=L4Z1] run tag @s add already_generated_mob @@ -29,4 +29,4 @@ execute as @e[tag=newly_generated_mob] run tag @s add L4Z1 execute as @e[tag=newly_generated_mob] run tag @s remove newly_generated_mob execute if score $dungeon do2.config.fr.teleportKillers matches 1 as @e[tag=premade_generated_mob] run tp @s @e[type=marker,tag=L4Z1,limit=1,sort=random] execute as @e[tag=premade_generated_mob] run tag @s add L4Z1 -execute as @e[tag=premade_generated_mob] run tag @s remove premade_generated_mob \ No newline at end of file +execute as @e[tag=premade_generated_mob] run tag @s remove premade_generated_mob diff --git a/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l4z2.mcfunction b/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l4z2.mcfunction index 49f6a4b2..1b248810 100644 --- a/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l4z2.mcfunction +++ b/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l4z2.mcfunction @@ -3,20 +3,20 @@ execute as @a[scores={do2.logs.entity_controller=2..}] run tellraw @s ["",{"text # - End Log - # Setup -execute store result score $dungeon do2.utility.mc.mobNamesCount run data get storage do2:mobs level4_zone2 -scoreboard players operation $dungeon do2.utility.mc.mobGenerationCount = $l4z2 do2.config.mc.levelZoneMobCount +execute store result score $dungeon do2.utility.ec.mobNamesCount run data get storage do2:mobs level4_zone2 +scoreboard players operation $dungeon do2.utility.ec.mobGenerationCount = $l4z2 do2.config.ec.levelZoneMobCount data modify storage do2:mobs mobNames set from storage do2:mobs level4_zone2 -scoreboard players set $dungeon do2.utility.mc.mobGenerationType 2 +scoreboard players set $dungeon do2.utility.ec.mobGenerationType 2 # - Check for issues - # Check for mob AMOUNT count -execute if score $l4z2 do2.config.mc.levelZoneMobCount matches ..0 if score $dungeon do2.utility.mc.collectingLogs matches 1 run data modify storage do2:mobs mobCountErrors append value 'L4Z2' -execute if score $l4z2 do2.config.mc.levelZoneMobCount matches ..0 if score $dungeon do2.utility.mc.collectingLogs matches 0 as @a[scores={do2.logs.dungeon_setup=3..}] run tellraw @s ["",{"text":"[§9B§r]: L4Z2's mob count is empty. No mobs will generate in this zone."}] -execute if score $l4z2 do2.config.mc.levelZoneMobCount matches ..0 run scoreboard players set $l4z2 do2.config.mc.levelZoneMobCount 0 +execute if score $l4z2 do2.config.ec.levelZoneMobCount matches ..0 if score $dungeon do2.utility.ec.collectingLogs matches 1 run data modify storage do2:mobs mobCountErrors append value 'L4Z2' +execute if score $l4z2 do2.config.ec.levelZoneMobCount matches ..0 if score $dungeon do2.utility.ec.collectingLogs matches 0 as @a[scores={do2.logs.dungeon_setup=3..}] run tellraw @s ["",{"text":"[§9B§r]: L4Z2's mob count is empty. No mobs will generate in this zone."}] +execute if score $l4z2 do2.config.ec.levelZoneMobCount matches ..0 run scoreboard players set $l4z2 do2.config.ec.levelZoneMobCount 0 # Check for sufficient mob NAMES -execute if score $dungeon do2.utility.mc.mobNamesCount < $l4z2 do2.config.mc.levelZoneMobCount if score $dungeon do2.utility.mc.collectingLogs matches 1 run data modify storage do2:mobs mobNameCountErrors append value 'L4Z2' -execute if score $dungeon do2.utility.mc.mobNamesCount < $l4z2 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 L4Z2's mob names for L4Z2's mob count. Adding random names to fix."}] -execute if score $dungeon do2.utility.mc.mobNamesCount < $l4z2 do2.config.mc.levelZoneMobCount run function do2:mob_controller/add_mob_names/add_name_to_list +execute if score $dungeon do2.utility.ec.mobNamesCount < $l4z2 do2.config.ec.levelZoneMobCount if score $dungeon do2.utility.ec.collectingLogs matches 1 run data modify storage do2:mobs mobNameCountErrors append value 'L4Z2' +execute if score $dungeon do2.utility.ec.mobNamesCount < $l4z2 do2.config.ec.levelZoneMobCount if score $dungeon do2.utility.ec.collectingLogs matches 0 as @a[scores={do2.logs.dungeon_setup=3..}] run tellraw @s ["",{"text":"[§9B§r]: Not enough L4Z2's mob names for L4Z2's mob count. Adding random names to fix."}] +execute if score $dungeon do2.utility.ec.mobNamesCount < $l4z2 do2.config.ec.levelZoneMobCount run function do2:mob_controller/add_mob_names/add_name_to_list # Generate enough mobs. execute as @e[type=warden,tag=L4Z2] run tag @s add already_generated_mob @@ -29,4 +29,4 @@ execute as @e[tag=newly_generated_mob] run tag @s add L4Z2 execute as @e[tag=newly_generated_mob] run tag @s remove newly_generated_mob execute if score $dungeon do2.config.fr.teleportKillers matches 1 as @e[tag=premade_generated_mob] run tp @s @e[type=marker,tag=L4Z2,limit=1,sort=random] execute as @e[tag=premade_generated_mob] run tag @s add L4Z2 -execute as @e[tag=premade_generated_mob] run tag @s remove premade_generated_mob \ No newline at end of file +execute as @e[tag=premade_generated_mob] run tag @s remove premade_generated_mob diff --git a/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l4z3.mcfunction b/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l4z3.mcfunction index 7ac25af2..8bc8440b 100644 --- a/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l4z3.mcfunction +++ b/Brilliance Datapack/data/do2/functions/entity_controller/generate_entities/areas/l4z3.mcfunction @@ -3,20 +3,20 @@ execute as @a[scores={do2.logs.entity_controller=2..}] run tellraw @s ["",{"text # - End Log - # Setup -execute store result score $dungeon do2.utility.mc.mobNamesCount run data get storage do2:mobs level4_zone3 -scoreboard players operation $dungeon do2.utility.mc.mobGenerationCount = $l4z3 do2.config.mc.levelZoneMobCount +execute store result score $dungeon do2.utility.ec.mobNamesCount run data get storage do2:mobs level4_zone3 +scoreboard players operation $dungeon do2.utility.ec.mobGenerationCount = $l4z3 do2.config.ec.levelZoneMobCount data modify storage do2:mobs mobNames set from storage do2:mobs level4_zone3 -scoreboard players set $dungeon do2.utility.mc.mobGenerationType 2 +scoreboard players set $dungeon do2.utility.ec.mobGenerationType 2 # - Check for issues - # Check for mob AMOUNT count -execute if score $l4z3 do2.config.mc.levelZoneMobCount matches ..0 if score $dungeon do2.utility.mc.collectingLogs matches 1 run data modify storage do2:mobs mobCountErrors append value 'L4Z3' -execute if score $l4z3 do2.config.mc.levelZoneMobCount matches ..0 if score $dungeon do2.utility.mc.collectingLogs matches 0 as @a[scores={do2.logs.dungeon_setup=3..}] run tellraw @s ["",{"text":"[§9B§r]: L4Z3's mob count is empty. No mobs will generate in this zone."}] -execute if score $l4z3 do2.config.mc.levelZoneMobCount matches ..0 run scoreboard players set $l4z3 do2.config.mc.levelZoneMobCount 0 +execute if score $l4z3 do2.config.ec.levelZoneMobCount matches ..0 if score $dungeon do2.utility.ec.collectingLogs matches 1 run data modify storage do2:mobs mobCountErrors append value 'L4Z3' +execute if score $l4z3 do2.config.ec.levelZoneMobCount matches ..0 if score $dungeon do2.utility.ec.collectingLogs matches 0 as @a[scores={do2.logs.dungeon_setup=3..}] run tellraw @s ["",{"text":"[§9B§r]: L4Z3's mob count is empty. No mobs will generate in this zone."}] +execute if score $l4z3 do2.config.ec.levelZoneMobCount matches ..0 run scoreboard players set $l4z3 do2.config.ec.levelZoneMobCount 0 # Check for sufficient mob NAMES -execute if score $dungeon do2.utility.mc.mobNamesCount < $l4z3 do2.config.mc.levelZoneMobCount if score $dungeon do2.utility.mc.collectingLogs matches 1 run data modify storage do2:mobs mobNameCountErrors append value 'L4Z3' -execute if score $dungeon do2.utility.mc.mobNamesCount < $l4z3 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 L4Z3's mob names for L4Z3's mob count. Adding random names to fix."}] -execute if score $dungeon do2.utility.mc.mobNamesCount < $l4z3 do2.config.mc.levelZoneMobCount run function do2:mob_controller/add_mob_names/add_name_to_list +execute if score $dungeon do2.utility.ec.mobNamesCount < $l4z3 do2.config.ec.levelZoneMobCount if score $dungeon do2.utility.ec.collectingLogs matches 1 run data modify storage do2:mobs mobNameCountErrors append value 'L4Z3' +execute if score $dungeon do2.utility.ec.mobNamesCount < $l4z3 do2.config.ec.levelZoneMobCount if score $dungeon do2.utility.ec.collectingLogs matches 0 as @a[scores={do2.logs.dungeon_setup=3..}] run tellraw @s ["",{"text":"[§9B§r]: Not enough L4Z3's mob names for L4Z3's mob count. Adding random names to fix."}] +execute if score $dungeon do2.utility.ec.mobNamesCount < $l4z3 do2.config.ec.levelZoneMobCount run function do2:mob_controller/add_mob_names/add_name_to_list # Generate enough mobs. execute as @e[type=warden,tag=L4Z3] run tag @s add already_generated_mob @@ -29,4 +29,4 @@ execute as @e[tag=newly_generated_mob] run tag @s add L4Z3 execute as @e[tag=newly_generated_mob] run tag @s remove newly_generated_mob execute if score $dungeon do2.config.fr.teleportKillers matches 1 as @e[tag=premade_generated_mob] run tp @s @e[type=marker,tag=L4Z3,limit=1,sort=random] execute as @e[tag=premade_generated_mob] run tag @s add L4Z3 -execute as @e[tag=premade_generated_mob] run tag @s remove premade_generated_mob \ No newline at end of file +execute as @e[tag=premade_generated_mob] run tag @s remove premade_generated_mob diff --git a/Brilliance Datapack/data/do2/functions/version.mcfunction b/Brilliance Datapack/data/do2/functions/version.mcfunction index 4ae2ce18..f05d36c2 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.14.2 +# DATAPACK VERSION NUMBER: 0.14.3 -tellraw @s ["",{"text":"The §o§n§aBrilliance Datapack§r's version is: [§b0.14.2§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.14.3§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/JSON/scoreboards.json b/JSON/scoreboards.json index 09398d5d..3678783d 100644 --- a/JSON/scoreboards.json +++ b/JSON/scoreboards.json @@ -916,13 +916,13 @@ "category": "config", "description": "The type decides how should the dungeon be refilled." }, - "do2.config.mc.levelEditing": { + "do2.config.ec.levelEditing": { "auto": 2, "target": "$dungeon", "category": "config", "description": "What level the interface is displaying to be edited." }, - "do2.config.mc.level1Zones": { + "do2.config.ec.level1Zones": { "auto": 2, "target": "$dungeon", "category": "config", @@ -936,7 +936,7 @@ } } }, - "do2.config.mc.level2Zones": { + "do2.config.ec.level2Zones": { "auto": 2, "target": "$dungeon", "category": "config", @@ -950,7 +950,7 @@ } } }, - "do2.config.mc.level4Zones": { + "do2.config.ec.level4Zones": { "auto": 2, "target": "$dungeon", "category": "config", @@ -964,7 +964,7 @@ } } }, - "do2.config.mc.controlSummons": { + "do2.config.ec.controlSummons": { "auto": 2, "target": "$dungeon", "category": "config", @@ -3628,7 +3628,7 @@ "category": "utility", "description": "Used to ensure player stays in lobby at while game isn't in progress" }, - "do2.config.mc.levelZoneMobCount": { + "do2.config.ec.levelZoneMobCount": { "auto": 1, "target": "$dungeon", "category": "config", @@ -3700,37 +3700,37 @@ "category": "utility", "description": "Used to check player's exp in order to give them 1 level if they dont have one." }, - "do2.utility.mc.mobCountCounterTest": { + "do2.utility.ec.mobCountCounterTest": { "auto": 1, "target": "$dungeon", "category": "utility", "description": "Used to add to the total count of how many mobs are wanted in a zone." }, - "do2.utility.mc.mobCountCounterTotal": { + "do2.utility.ec.mobCountCounterTotal": { "auto": 1, "target": "$dungeon", "category": "utility", "description": "Used to total up the count of how many mobs are wanted in a zone." }, - "do2.utility.mc.mobGenerationCount": { + "do2.utility.ec.mobGenerationCount": { "auto": 1, "target": "$dungeon", "category": "utility", "description": "Count of how many mobs the Mob Controller needs to generate in it's zone." }, - "do2.utility.mc.mobGenerationType": { + "do2.utility.ec.mobGenerationType": { "auto": 1, "target": "$dungeon", "category": "utility", "description": "What kind of mob is being worked on in the Mob Controller's zone." }, - "do2.utility.mc.mobNamesCount": { + "do2.utility.ec.mobNamesCount": { "auto": 1, "target": "$dungeon", "category": "utility", "description": "How many mob names are in the zone the Mob Controller is working on." }, - "do2.utility.mc.collectingLogs": { + "do2.utility.ec.collectingLogs": { "auto": 1, "target": "$dungeon", "category": "utility", diff --git a/docs/scoreboard.md b/docs/scoreboard.md index f56df0f2..a9c335a2 100644 --- a/docs/scoreboard.md +++ b/docs/scoreboard.md @@ -23,7 +23,7 @@ The name immediately after the `do2.` will generally be describing it's category | config | Used to store settings on how the game is played. | `do2.config.forceGamemode` | | config.bc | Used to store Balance Changes settings on how the game is balanced. | `do2.config.bc.snowHazard` | | config.fr | Used to store Fresh Changes settings on how fresh the game should be. | `do2.config.fr.teleportKillers` | -| config.mc | Used to store Mob Controlling settings on how the mobs exist inside the game. | `do2.config.mc.level1Zones` | +| config.mc | Used to store Mob Controlling settings on how the mobs exist inside the game. | `do2.config.ec.level1Zones` | | eggs | Used to store what eggs are found and what rewards have been given to whom. | `do2.eggs.grian` | | logs | Used to store debug logs players might want to receive. | `do2.logs.pickups` | | utility | Used to store small utility scores that are used for checks in other parts of the datapack. | `do2.utility.deathCount` | @@ -82,12 +82,12 @@ The name immediately after the `do2.` will generally be describing it's category | ⛔ | 🔴 | do2.config.fr.resetComposters | config | Whether to empty out all composters each run. | | ⛔ | 🔴 | do2.config.fr.teleportKillers | config | Whether the killers should be spread out for each run. | | ⛔ | 🔴 | do2.config.maxClankTreasure | config | Whether treasure can drop after max clank is reached. | -| ⛔ | 🔴 | do2.config.mc.controlSummons | config | Whether to use legacy system or the new level controller. | -| ⛔ | 🔴 | do2.config.mc.level1Zones | config | Whether zones should be used on L1. | -| ⛔ | 🔴 | do2.config.mc.level2Zones | config | Whether zones should be used on L2. | -| ⛔ | 🔴 | do2.config.mc.level4Zones | config | Whether zones should be used on L4. | -| ⛔ | 🔴 | do2.config.mc.levelEditing | config | What level the interface is displaying to be edited. | -| ✅ | 🔴 | do2.config.mc.levelZoneMobCount | config | Used to control how many mobs are in each zone. | +| ⛔ | 🔴 | do2.config.ec.controlSummons | config | Whether to use legacy system or the new level controller. | +| ⛔ | 🔴 | do2.config.ec.level1Zones | config | Whether zones should be used on L1. | +| ⛔ | 🔴 | do2.config.ec.level2Zones | config | Whether zones should be used on L2. | +| ⛔ | 🔴 | do2.config.ec.level4Zones | config | Whether zones should be used on L4. | +| ⛔ | 🔴 | do2.config.ec.levelEditing | config | What level the interface is displaying to be edited. | +| ✅ | 🔴 | do2.config.ec.levelZoneMobCount | config | Used to control how many mobs are in each zone. | | ⛔ | 🔴 | do2.config.nightTimeChance | config | The chance for the dungeon to set the time to night. | | ⛔ | 🔴 | do2.config.refillDungeonType | config | The type decides how should the dungeon be refilled. | | ❌ | 🔴 | do2.config.targetFoodLevel | config | How many food bars the player's food should be. | @@ -564,12 +564,12 @@ The name immediately after the `do2.` will generally be describing it's category | ✅ | 🔵 | do2.utility.key_3ToGive | utility | How many tracked L3 Keys need to be given back. | | ✅ | 🔵 | do2.utility.key_4ToGive | utility | How many tracked L4 Keys need to be given back. | | ✅ | 🔵 | do2.utility.kitsToGive | utility | How many tracked Rusty Repair Kits need to be given back. | -| ✅ | 🔴 | do2.utility.mc.collectingLogs | utility | Whether the Mob Controller is collecting logs to bundle up. | -| ✅ | 🔴 | do2.utility.mc.mobCountCounterTest | utility | Used to add to the total count of how many mobs are wanted in a zone. | -| ✅ | 🔴 | do2.utility.mc.mobCountCounterTotal | utility | Used to total up the count of how many mobs are wanted in a zone. | -| ✅ | 🔴 | do2.utility.mc.mobGenerationCount | utility | Count of how many mobs the Mob Controller needs to generate in it's zone. | -| ✅ | 🔴 | do2.utility.mc.mobGenerationType | utility | What kind of mob is being worked on in the Mob Controller's zone. | -| ✅ | 🔴 | do2.utility.mc.mobNamesCount | utility | How many mob names are in the zone the Mob Controller is working on. | +| ✅ | 🔴 | do2.utility.ec.collectingLogs | utility | Whether the Mob Controller is collecting logs to bundle up. | +| ✅ | 🔴 | do2.utility.ec.mobCountCounterTest | utility | Used to add to the total count of how many mobs are wanted in a zone. | +| ✅ | 🔴 | do2.utility.ec.mobCountCounterTotal | utility | Used to total up the count of how many mobs are wanted in a zone. | +| ✅ | 🔴 | do2.utility.ec.mobGenerationCount | utility | Count of how many mobs the Mob Controller needs to generate in it's zone. | +| ✅ | 🔴 | do2.utility.ec.mobGenerationType | utility | What kind of mob is being worked on in the Mob Controller's zone. | +| ✅ | 🔴 | do2.utility.ec.mobNamesCount | utility | How many mob names are in the zone the Mob Controller is working on. | | ✅ | 🟢 | do2.utility.oldGamemode | utility | Used to store player's gamemode before game forced their gamemode | | ✅ | 🟢 | do2.utility.old_position.temp | utility | Used to modify player's old location before teleporting them. | | ✅ | 🟢 | do2.utility.old_position.x | utility | Used to store player's old X location before teleporting them. |