Skip to content

Commit

Permalink
Replace all .mc. with .ec.
Browse files Browse the repository at this point in the history
  • Loading branch information
@Frustrated-Programmer
Frustrated-Programmer committed Jan 7, 2025
1 parent 18b9f2c commit 42a440b
Show file tree
Hide file tree
Showing 22 changed files with 217 additions and 217 deletions.
20 changes: 10 additions & 10 deletions ...nce Datapack/data/do2/functions/entity_controller/generate_entities/areas/l0z1.mcfunction
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
execute as @e[tag=premade_generated_mob] run tag @s remove premade_generated_mob
20 changes: 10 additions & 10 deletions ...nce Datapack/data/do2/functions/entity_controller/generate_entities/areas/l0z2.mcfunction
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
execute as @e[tag=premade_generated_mob] run tag @s remove premade_generated_mob
20 changes: 10 additions & 10 deletions ...nce Datapack/data/do2/functions/entity_controller/generate_entities/areas/l1z1.mcfunction
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
execute as @e[tag=premade_generated_mob] run tag @s remove premade_generated_mob
20 changes: 10 additions & 10 deletions ...nce Datapack/data/do2/functions/entity_controller/generate_entities/areas/l1z2.mcfunction
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
execute as @e[tag=premade_generated_mob] run tag @s remove premade_generated_mob
Loading

0 comments on commit 42a440b

Please sign in to comment.