Merge branch 'base-modtools2' into battle-modtools2

Legacy-Edition-Minigames · May 9, 2024 · b99f357 · b99f357
2 parents 3ee33b6 + c6951d9
commit b99f357
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 0 deletions.
diff --git a/world/datapacks/lem.base/data/lem.base/functions/config/defaults.mcfunction b/world/datapacks/lem.base/data/lem.base/functions/config/defaults.mcfunction
@@ -41,6 +41,7 @@ userconfig @s test lem.base:heartcosmetic EQUAL _NOTHING_ runCommand userconfig
 ##Achievements
 userconfig @s test lem.base:achievement_ghost EQUAL _NOTHING_ runCommand userconfig @s set lem.base:achievement_ghost false
 userconfig @s test lem.base:achievement_mean EQUAL _NOTHING_ runCommand userconfig @s set lem.base:achievement_mean false
+userconfig @s test lem.base:achievement_walls EQUAL _NOTHING_ runCommand userconfig @s set lem.base:achievement_walls false
 
 ##Run functions for addons
 function #lem.base:config/defaults

diff --git a/world/datapacks/lem.base/data/lem.base/functions/game/end/spectate/roundend.mcfunction b/world/datapacks/lem.base/data/lem.base/functions/game/end/spectate/roundend.mcfunction
@@ -76,3 +76,6 @@ bossbar set globalinfo16 name {"translate":"lem.game.roundend"}
 
 ##Clear all schedules
 schedule function lem.base:game/end/clear/round/run 2t
+
+##Run functions for addons
+function #lem.base:game/end/spectate/roundend
diff --git a/world/datapacks/lem.base/data/lem.base/functions/game/start/invulnerability/count.mcfunction b/world/datapacks/lem.base/data/lem.base/functions/game/start/invulnerability/count.mcfunction
@@ -43,3 +43,6 @@ bossbar set minecraft:globalinfo16 name {"translate":"lem.game.invulnerability.t
 
 ##Play Sound
 execute if score #Store lem.timer matches 1..3 as @a[tag=ingame] at @s run function lem.base:sound/game/count3
+
+##Run functions for addons
+function #lem.base:game/start/invulnerability/count
diff --git a/world/datapacks/lem.base/data/lem.base/functions/lobby/beyondthewalls.txt b/world/datapacks/lem.base/data/lem.base/functions/lobby/beyondthewalls.txt
@@ -0,0 +1,3 @@
+new lobby: /execute in lem.base:the_lobby positioned -332 48 -341 as @a[tag=ingame] if entity @s[distance=62..] run title @s actionbar "OOB"
+
+old lobby: /execute in lem.base:the_lobby positioned -357 62 -380 as @a[tag=ingame] if entity @s[distance=33..] run title @s actionbar "OOB"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		new lobby: /execute in lem.base:the_lobby positioned -332 48 -341 as @a[tag=ingame] if entity @s[distance=62..] run title @s actionbar "OOB"

		old lobby: /execute in lem.base:the_lobby positioned -357 62 -380 as @a[tag=ingame] if entity @s[distance=33..] run title @s actionbar "OOB"