Skip to content

Commit

Permalink
(Bav fixed my bugs :D)
Browse files Browse the repository at this point in the history
  • Loading branch information
Frustrated-Programmer committed Jan 7, 2025
1 parent 42a440b commit da507b4
Show file tree
Hide file tree
Showing 21 changed files with 40 additions and 40 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ execute if score $l0z1 do2.config.ec.levelZoneMobCount matches ..0 run scoreboar
# Check for sufficient mob NAMES
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
execute if score $dungeon do2.utility.ec.mobNamesCount < $l0z1 do2.config.ec.levelZoneMobCount run function do2:entity_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
function do2:entity_controller/generate_mobs/kill_extra_mobs
function do2:mob_controller/generate_mobs/generate_enough_mobs
function do2:entity_controller/generate_mobs/generate_enough_mobs

# Finish
execute as @e[tag=newly_generated_mob] run tp @s @e[type=marker,tag=L0Z1,limit=1,sort=random]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ execute if score $l0z2 do2.config.ec.levelZoneMobCount matches ..0 run scoreboar
# Check for sufficient mob NAMES
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
execute if score $dungeon do2.utility.ec.mobNamesCount < $l0z2 do2.config.ec.levelZoneMobCount run function do2:entity_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
function do2:entity_controller/generate_mobs/kill_extra_mobs
function do2:mob_controller/generate_mobs/generate_enough_mobs
function do2:entity_controller/generate_mobs/generate_enough_mobs

# Finish
execute as @e[tag=newly_generated_mob] run tp @s @e[type=marker,tag=L0Z2,limit=1,sort=random]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ execute if score $l1z1 do2.config.ec.levelZoneMobCount matches ..0 run scoreboar
# Check for sufficient mob NAMES
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
execute if score $dungeon do2.utility.ec.mobNamesCount < $l1z1 do2.config.ec.levelZoneMobCount run function do2:entity_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
function do2:entity_controller/generate_mobs/kill_extra_mobs
function do2:mob_controller/generate_mobs/generate_enough_mobs
function do2:entity_controller/generate_mobs/generate_enough_mobs

# Finish
execute as @e[tag=newly_generated_mob] run tp @s @e[type=marker,tag=L1Z1,limit=1,sort=random]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ execute if score $l1z2 do2.config.ec.levelZoneMobCount matches ..0 run scoreboar
# Check for sufficient mob NAMES
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
execute if score $dungeon do2.utility.ec.mobNamesCount < $l1z2 do2.config.ec.levelZoneMobCount run function do2:entity_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
function do2:entity_controller/generate_mobs/kill_extra_mobs
function do2:mob_controller/generate_mobs/generate_enough_mobs
function do2:entity_controller/generate_mobs/generate_enough_mobs

# Finish
execute as @e[tag=newly_generated_mob] run tp @s @e[type=marker,tag=L1Z2,limit=1,sort=random]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ execute if score $l1z3 do2.config.ec.levelZoneMobCount matches ..0 run scoreboar
# Check for sufficient mob NAMES
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
execute if score $dungeon do2.utility.ec.mobNamesCount < $l1z3 do2.config.ec.levelZoneMobCount run function do2:entity_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
function do2:entity_controller/generate_mobs/kill_extra_mobs
function do2:mob_controller/generate_mobs/generate_enough_mobs
function do2:entity_controller/generate_mobs/generate_enough_mobs

# Finish
execute as @e[tag=newly_generated_mob] run tp @s @e[type=marker,tag=L1Z3,limit=1,sort=random]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ execute if score $l1z4 do2.config.ec.levelZoneMobCount matches ..0 run scoreboar
# Check for sufficient mob NAMES
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
execute if score $dungeon do2.utility.ec.mobNamesCount < $l1z4 do2.config.ec.levelZoneMobCount run function do2:entity_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
function do2:entity_controller/generate_mobs/kill_extra_mobs
function do2:mob_controller/generate_mobs/generate_enough_mobs
function do2:entity_controller/generate_mobs/generate_enough_mobs

# Finish
execute as @e[tag=newly_generated_mob] run tp @s @e[type=marker,tag=L1Z4,limit=1,sort=random]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ execute if score $l1z5 do2.config.ec.levelZoneMobCount matches ..0 run scoreboar
# Check for sufficient mob NAMES
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
execute if score $dungeon do2.utility.ec.mobNamesCount < $l1z5 do2.config.ec.levelZoneMobCount run function do2:entity_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
function do2:entity_controller/generate_mobs/kill_extra_mobs
function do2:mob_controller/generate_mobs/generate_enough_mobs
function do2:entity_controller/generate_mobs/generate_enough_mobs

# Finish
execute as @e[tag=newly_generated_mob] run tp @s @e[type=marker,tag=L1Z5,limit=1,sort=random]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ execute if score $l2willie do2.config.ec.levelZoneMobCount matches ..0 run score
# Check for sufficient mob NAMES
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
execute if score $dungeon do2.utility.ec.mobNamesCount < $l2willie do2.config.ec.levelZoneMobCount run function do2:entity_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
function do2:entity_controller/generate_mobs/kill_extra_mobs
function do2:mob_controller/generate_mobs/generate_enough_mobs
function do2:entity_controller/generate_mobs/generate_enough_mobs

# Finish
execute as @e[tag=newly_generated_mob] run tp @s @e[type=marker,tag=L2WILLIE,limit=1,sort=random]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ execute if score $l2z1 do2.config.ec.levelZoneMobCount matches ..0 run scoreboar
# Check for sufficient mob NAMES
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
execute if score $dungeon do2.utility.ec.mobNamesCount < $l2z1 do2.config.ec.levelZoneMobCount run function do2:entity_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
function do2:entity_controller/generate_mobs/kill_extra_mobs
function do2:mob_controller/generate_mobs/generate_enough_mobs
function do2:entity_controller/generate_mobs/generate_enough_mobs

# Finish
execute as @e[tag=newly_generated_mob] run tp @s @e[type=marker,tag=L2Z1,limit=1,sort=random]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ execute if score $l2z2 do2.config.ec.levelZoneMobCount matches ..0 run scoreboar
# Check for sufficient mob NAMES
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
execute if score $dungeon do2.utility.ec.mobNamesCount < $l2z2 do2.config.ec.levelZoneMobCount run function do2:entity_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
function do2:entity_controller/generate_mobs/kill_extra_mobs
function do2:mob_controller/generate_mobs/generate_enough_mobs
function do2:entity_controller/generate_mobs/generate_enough_mobs

# Finish
execute as @e[tag=newly_generated_mob] run tp @s @e[type=marker,tag=L2Z2,limit=1,sort=random]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ execute if score $l2z3 do2.config.ec.levelZoneMobCount matches ..0 run scoreboar
# Check for sufficient mob NAMES
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
execute if score $dungeon do2.utility.ec.mobNamesCount < $l2z3 do2.config.ec.levelZoneMobCount run function do2:entity_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
function do2:entity_controller/generate_mobs/kill_extra_mobs
function do2:mob_controller/generate_mobs/generate_enough_mobs
function do2:entity_controller/generate_mobs/generate_enough_mobs

# Finish
execute as @e[tag=newly_generated_mob] run tp @s @e[type=marker,tag=L2Z3,limit=1,sort=random]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ execute if score $l2z4 do2.config.ec.levelZoneMobCount matches ..0 run scoreboar
# Check for sufficient mob NAMES
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
execute if score $dungeon do2.utility.ec.mobNamesCount < $l2z4 do2.config.ec.levelZoneMobCount run function do2:entity_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
function do2:entity_controller/generate_mobs/kill_extra_mobs
function do2:mob_controller/generate_mobs/generate_enough_mobs
function do2:entity_controller/generate_mobs/generate_enough_mobs

# Finish
execute as @e[tag=newly_generated_mob] run tp @s @e[type=marker,tag=L2Z4,limit=1,sort=random]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ execute if score $l2z5 do2.config.ec.levelZoneMobCount matches ..0 run scoreboar
# Check for sufficient mob NAMES
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
execute if score $dungeon do2.utility.ec.mobNamesCount < $l2z5 do2.config.ec.levelZoneMobCount run function do2:entity_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
function do2:entity_controller/generate_mobs/kill_extra_mobs
function do2:mob_controller/generate_mobs/generate_enough_mobs
function do2:entity_controller/generate_mobs/generate_enough_mobs

# Finish
execute as @e[tag=newly_generated_mob] run tp @s @e[type=marker,tag=L2Z5,limit=1,sort=random]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ execute if score $l3z1 do2.config.ec.levelZoneMobCount matches ..0 run scoreboar
# Check for sufficient mob NAMES
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
execute if score $dungeon do2.utility.ec.mobNamesCount < $l3z1 do2.config.ec.levelZoneMobCount run function do2:entity_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
function do2:entity_controller/generate_mobs/kill_extra_mobs
function do2:mob_controller/generate_mobs/generate_enough_mobs
function do2:entity_controller/generate_mobs/generate_enough_mobs

# Finish
execute as @e[tag=newly_generated_mob] run tp @s @e[type=marker,tag=L3Z1,limit=1,sort=random]
Expand Down
Loading

0 comments on commit da507b4

Please sign in to comment.