Skip to content

Commit

Permalink
Allow disabling level controller mob spawning
Browse files Browse the repository at this point in the history
  • Loading branch information
Frustrated-Programmer committed Jul 14, 2024
1 parent e7008f9 commit 0e83fa6
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 16 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,25 @@ execute as @a[scores={do2.logs.dungeon_setup=3..}] run tellraw @s ["",{"text":"[


#L1
function do2:level_controller/generate_mobs/l1z1
function do2:level_controller/generate_mobs/l1z2
function do2:level_controller/generate_mobs/l1z3
execute if score $dungeon do2.config.mc.level1Zones matches 0 run function do2:level_controller/generate_mobs/l1z4
execute if score $dungeon do2.config.mc.level1Zones matches 0 run function do2:level_controller/generate_mobs/l1z5
execute if score $dungeon do2.config.mc.controlSummons matches 1 run function do2:level_controller/generate_mobs/l1z1
execute if score $dungeon do2.config.mc.controlSummons matches 1 run function do2:level_controller/generate_mobs/l1z2
execute if score $dungeon do2.config.mc.controlSummons matches 1 run function do2:level_controller/generate_mobs/l1z3
execute if score $dungeon do2.config.mc.controlSummons matches 1 if score $dungeon do2.config.mc.level1Zones matches 0 run function do2:level_controller/generate_mobs/l1z4
execute if score $dungeon do2.config.mc.controlSummons matches 1 if score $dungeon do2.config.mc.level1Zones matches 0 run function do2:level_controller/generate_mobs/l1z5
#L2
function do2:level_controller/generate_mobs/l2z1
function do2:level_controller/generate_mobs/l2z2
function do2:level_controller/generate_mobs/l2z3
execute if score $dungeon do2.config.mc.level2Zones matches 0 run function do2:level_controller/generate_mobs/l2z4
execute if score $dungeon do2.config.mc.level2Zones matches 0 run function do2:level_controller/generate_mobs/l2z5
execute if score $dungeon do2.config.mc.controlSummons matches 1 run function do2:level_controller/generate_mobs/l2z1
execute if score $dungeon do2.config.mc.controlSummons matches 1 run function do2:level_controller/generate_mobs/l2z2
execute if score $dungeon do2.config.mc.controlSummons matches 1 run function do2:level_controller/generate_mobs/l2z3
execute if score $dungeon do2.config.mc.controlSummons matches 1 if score $dungeon do2.config.mc.level2Zones matches 0 run function do2:level_controller/generate_mobs/l2z4
execute if score $dungeon do2.config.mc.controlSummons matches 1 if score $dungeon do2.config.mc.level2Zones matches 0 run function do2:level_controller/generate_mobs/l2z5


#L1
#execute if score $dungeon do2.config.mc.level1Zones matches 0 run function do2:dungeon_setup/summon/no_zones/summon_level_1_killers
#execute if score $dungeon do2.config.mc.level1Zones matches 1 run function do2:dungeon_setup/summon/with_zones/summon_level_1_killers
execute if score $dungeon do2.config.mc.controlSummons matches 0 if score $dungeon do2.config.mc.level1Zones matches 0 run function do2:dungeon_setup/summon/no_zones/summon_level_1_killers
execute if score $dungeon do2.config.mc.controlSummons matches 0 if score $dungeon do2.config.mc.level1Zones matches 1 run function do2:dungeon_setup/summon/with_zones/summon_level_1_killers
#L2
#execute if score $dungeon do2.config.mc.level2Zones matches 0 run function do2:dungeon_setup/summon/no_zones/summon_level_2_killers
#execute if score $dungeon do2.config.mc.level2Zones matches 1 run function do2:dungeon_setup/summon/with_zones/summon_level_2_killers
execute if score $dungeon do2.config.mc.controlSummons matches 0 if score $dungeon do2.config.mc.level2Zones matches 0 run function do2:dungeon_setup/summon/no_zones/summon_level_2_killers
execute if score $dungeon do2.config.mc.controlSummons matches 0 if score $dungeon do2.config.mc.level2Zones matches 1 run function do2:dungeon_setup/summon/with_zones/summon_level_2_killers

# Death Gauntlet Ravager
summon minecraft:ravager -632 -48 1990 {PersistenceRequired:1b, Tags: ["L0DEATHROOM"], Invulnerable: 1b, Health: 100f, CustomName: '{"text":"nothing, they survived Decked Out"}', Fire: -1s}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,8 @@ scoreboard objectives add do2.config.refillDungeonType dummy "When to Refill Dun
execute unless score $dungeon do2.config.refillDungeonType matches 0.. run scoreboard players set $dungeon do2.config.refillDungeonType 1

# Dungeon Config: Mob Controller
scoreboard objectives add do2.config.mc.controlSummons dummy "Whether to use the new level controller mobs"
execute unless score $dungeon do2.config.mc.controlSummons matches 0.. run scoreboard players set $dungeon do2.config.mc.controlSummons 0
scoreboard objectives add do2.config.mc.levelEditing dummy "Which level is currently being edited"
execute unless score $dungeon do2.config.mc.levelEditing matches 0.. run scoreboard players set $dungeon do2.config.mc.levelEditing 1
scoreboard objectives add do2.config.mc.level1Zones dummy "Whether level 1 should have zones"
Expand Down
4 changes: 2 additions & 2 deletions Brilliance Datapack/data/do2/functions/version.mcfunction
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@

# DATAPACK VERSION NUMBER: 0.12.15
# DATAPACK VERSION NUMBER: 0.12.16

tellraw @s ["",{"text":"The §o§n§aBrilliance Datapack§r's version is: [§b0.12.15§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.12.16§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":"."}]

0 comments on commit 0e83fa6

Please sign in to comment.