Skip to content

Commit

Permalink
Added in Jaek's L2 markers.
Browse files Browse the repository at this point in the history
  • Loading branch information
@Frustrated-Programmer
Frustrated-Programmer committed Jan 7, 2025
1 parent 0ec554a commit 18b9f2c
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 10 deletions.
24 changes: 21 additions & 3 deletions ...tapack/data/do2/functions/dungeon_setup/summon/no_zones/summon_level_2_markers.mcfunction
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ summon minecraft:marker -481 20 2025 { Duration: 2147483647, Tags: ["no-zones",
summon minecraft:marker -474 29 1997 { Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z3"]}
summon minecraft:marker -462 24 2020 { Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z3"]}

# - Zone 4 - (42 spots) -
# - Zone 4 - (52 spots) -
summon minecraft:marker -523 14 1995 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z4"]}
summon minecraft:marker -524 14 1989 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z4"]}
summon minecraft:marker -525 14 1983 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z4"]}
Expand Down Expand Up @@ -188,8 +188,18 @@ summon minecraft:marker -469 19 1985 {Duration: 2147483647, Tags: ["no-zones", "
summon minecraft:marker -465 20 1984 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z4"]}
summon minecraft:marker -467 20 1989 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z4"]}
summon minecraft:marker -495 12 1953 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z4"]}
summon minecraft:marker -569 11 1955 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z4"]}
summon minecraft:marker -522 14 1942 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z4"]}
summon minecraft:marker -545 16 1958 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z4"]}
summon minecraft:marker -510 14 2007 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z4"]}
summon minecraft:marker -519 14 2023 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z4"]}
summon minecraft:marker -454 20 1974 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z4"]}
summon minecraft:marker -453 23 2006 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z4"]}
summon minecraft:marker -531 14 1975 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z4"]}
summon minecraft:marker -533 12 1962 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z4"]}
summon minecraft:marker -482 16 1952 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z4"]}

# - Zone 5 - (27 spots) -
# - Zone 5 - (35 spots) -
summon minecraft:marker -531 14 1973 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z5"]}
summon minecraft:marker -537 14 1979 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z5"]}
summon minecraft:marker -533 12 1968 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z5"]}
Expand All @@ -214,6 +224,14 @@ summon minecraft:marker -546 15 1956 {Duration: 2147483647, Tags: ["no-zones", "
summon minecraft:marker -541 17 1959 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z5"]}
summon minecraft:marker -537 18 1962 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z5"]}
summon minecraft:marker -549 15 1958 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z5"]}
summon minecraft:marker -553 11 1949 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z5"]}
summon minecraft:marker -550 13 1952 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z5"]}
summon minecraft:marker -539 17 1967 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z5"]}
summon minecraft:marker -539 17 1967 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z5"]}
summon minecraft:marker -512 14 1982 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z5"]}
summon minecraft:marker -509 12 1960 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z5"]}
summon minecraft:marker -560 11 1949 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z5"]}
summon minecraft:marker -561 11 1956 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z5"]}
summon minecraft:marker -572 11 1951 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z5"]}
summon minecraft:marker -577 11 1956 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z5"]}
summon minecraft:marker -569 11 1965 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z5"]}
summon minecraft:marker -578 11 1953 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z5"]}
12 changes: 11 additions & 1 deletion ...functions/entity_controller/generate_entities/markers/individual/l2z4_zoneless.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
kill @e[type=marker,tag=L2Z4]

# - Zone 4 - (42 spots) -
# - Zone 4 - (52 spots) -
summon minecraft:marker -523 14 1995 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z4"]}
summon minecraft:marker -524 14 1989 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z4"]}
summon minecraft:marker -525 14 1983 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z4"]}
Expand Down Expand Up @@ -43,3 +43,13 @@ summon minecraft:marker -469 19 1985 {Duration: 2147483647, Tags: ["no-zones", "
summon minecraft:marker -465 20 1984 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z4"]}
summon minecraft:marker -467 20 1989 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z4"]}
summon minecraft:marker -495 12 1953 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z4"]}
summon minecraft:marker -569 11 1955 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z4"]}
summon minecraft:marker -522 14 1942 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z4"]}
summon minecraft:marker -545 16 1958 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z4"]}
summon minecraft:marker -510 14 2007 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z4"]}
summon minecraft:marker -519 14 2023 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z4"]}
summon minecraft:marker -454 20 1974 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z4"]}
summon minecraft:marker -453 23 2006 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z4"]}
summon minecraft:marker -531 14 1975 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z4"]}
summon minecraft:marker -533 12 1962 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z4"]}
summon minecraft:marker -482 16 1952 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z4"]}
12 changes: 10 additions & 2 deletions ...functions/entity_controller/generate_entities/markers/individual/l2z5_zoneless.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
kill @e[type=marker,tag=L2Z5]

# - Zone 5 - (27 spots) -
# - Zone 5 - (35 spots) -
summon minecraft:marker -531 14 1973 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z5"]}
summon minecraft:marker -537 14 1979 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z5"]}
summon minecraft:marker -533 12 1968 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z5"]}
Expand All @@ -25,6 +25,14 @@ summon minecraft:marker -546 15 1956 {Duration: 2147483647, Tags: ["no-zones", "
summon minecraft:marker -541 17 1959 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z5"]}
summon minecraft:marker -537 18 1962 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z5"]}
summon minecraft:marker -549 15 1958 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z5"]}
summon minecraft:marker -553 11 1949 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z5"]}
summon minecraft:marker -550 13 1952 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z5"]}
summon minecraft:marker -539 17 1967 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z5"]}
summon minecraft:marker -539 17 1967 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z5"]}
summon minecraft:marker -512 14 1982 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z5"]}
summon minecraft:marker -509 12 1960 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z5"]}
summon minecraft:marker -560 11 1949 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z5"]}
summon minecraft:marker -561 11 1956 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z5"]}
summon minecraft:marker -572 11 1951 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z5"]}
summon minecraft:marker -577 11 1956 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z5"]}
summon minecraft:marker -569 11 1965 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z5"]}
summon minecraft:marker -578 11 1953 {Duration: 2147483647, Tags: ["no-zones", "zone_marker", "L2Z5"]}
4 changes: 2 additions & 2 deletions ...ata/do2/functions/entity_controller/generate_entities/markers/test_for_markers.mcfunction
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ scoreboard players set $l2_willie do2.tests.all_markers_alive 112
scoreboard players set $l2z1_zoneless do2.tests.all_markers_alive 49
scoreboard players set $l2z2_zoneless do2.tests.all_markers_alive 42
scoreboard players set $l2z3_zoneless do2.tests.all_markers_alive 41
scoreboard players set $l2z4_zoneless do2.tests.all_markers_alive 42
scoreboard players set $l2z5_zoneless do2.tests.all_markers_alive 27
scoreboard players set $l2z4_zoneless do2.tests.all_markers_alive 52
scoreboard players set $l2z5_zoneless do2.tests.all_markers_alive 35
scoreboard players set $l2z1_zones do2.tests.all_markers_alive 48
scoreboard players set $l2z2_zones do2.tests.all_markers_alive 54
scoreboard players set $l2z3_zones do2.tests.all_markers_alive 21
Expand Down
4 changes: 2 additions & 2 deletions Brilliance Datapack/data/do2/functions/version.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# DATAPACK VERSION NUMBER: 0.14.1
# DATAPACK VERSION NUMBER: 0.14.2

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

0 comments on commit 18b9f2c

Please sign in to comment.