Merge branch 'base' into battle

Legacy-Edition-Minigames · Oct 21, 2024 · 3661d75 · 3661d75
2 parents 229ed9f + 4dd33f3
commit 3661d75
Show file tree

Hide file tree

Showing 55 changed files with 795 additions and 887 deletions.
diff --git a/world/datapacks/lem.base/data/lem.base/functions/lobby/custom/halloween/backrooms.mcfunction b/world/datapacks/lem.base/data/lem.base/functions/lobby/custom/halloween/backrooms.mcfunction
@@ -1,8 +1,5 @@
 ##Give backrooms tag
 tag @s add backrooms
 
-##Remove elytra
-clear @s elytra
-
 ##TP to backrooms
-tp @s -344 6 -325
+tp @s -310 5 -337
diff --git a/world/datapacks/lem.base/data/lem.base/functions/lobby/custom/halloween/circle.mcfunction b/world/datapacks/lem.base/data/lem.base/functions/lobby/custom/halloween/circle.mcfunction
diff --git a/world/datapacks/lem.base/data/lem.base/functions/lobby/custom/halloween/run.mcfunction b/world/datapacks/lem.base/data/lem.base/functions/lobby/custom/halloween/run.mcfunction
@@ -1,20 +1,20 @@
 ##Display circle particles
 #Display particles at center
-execute as @e[tag=circle,type=minecraft:armor_stand] at @s run function lem.base:lobby/custom/halloween/circle
+execute in lem.base:the_lobby if block -328 64 -386 minecraft:jukebox{IsPlaying:1b} as @e[tag=circle,type=minecraft:armor_stand] at @s run function lem.base:lobby/custom/halloween/circle
 #Rotate
 execute as @e[tag=circle,type=minecraft:armor_stand] at @s run tp @s ~ ~ ~ ~1.5 ~
 
 ##Teleport to backrooms
 #Get Y position
 execute as @a[tag=ingame] at @s store result score @s lem.yvalue run data get entity @s Pos[1]
 #TP out to backrooms
-execute at @e[type=area_effect_cloud,tag=LobbyCenter] as @a[tag=ingame,distance=1..,tag=!backrooms,scores={lem.yvalue=..26}] run function lem.base:lobby/custom/halloween/backrooms
+execute at @e[type=area_effect_cloud,tag=LobbyCenter] as @a[tag=ingame,distance=1..,tag=!backrooms,scores={lem.yvalue=..52}] run function lem.base:lobby/custom/halloween/backrooms
 
 ##Backrooms effects
 #Give darkness effect
 effect give @a[tag=backrooms,tag=ingame] darkness 1 0 true
 #Stop music
-stopsound @s music
+stopsound @a[tag=backrooms,tag=ingame] music
 
 ##Rotate the xof
 execute as @e[tag=xof] at @s run tp @s ~ ~ ~ ~20 ~

diff --git a/world/datapacks/lem.base/data/lem.base/functions/lobby/reset/halloween.mcfunction b/world/datapacks/lem.base/data/lem.base/functions/lobby/reset/halloween.mcfunction
diff --git a/world/datapacks/lem.base/data/lem.base/functions/lobby/spawn/preload/halloween.mcfunction b/world/datapacks/lem.base/data/lem.base/functions/lobby/spawn/preload/halloween.mcfunction
@@ -1,2 +1,2 @@
 ##Preload
-execute as @s run tp @s -332 58 -343
+execute as @s run tp @s -357 70 -380
diff --git a/world/datapacks/lem.base/data/lem.base/functions/lobby/spawn/teleport/halloween.mcfunction b/world/datapacks/lem.base/data/lem.base/functions/lobby/spawn/teleport/halloween.mcfunction
@@ -1,5 +1,2 @@
 ##Teleport
-#Standard
-execute as @s[tag=!Winner] run tp @s @e[type=area_effect_cloud,tag=LobbyTP,limit=1,sort=random]
-#Winner
-execute as @s[tag=Winner] run tp @s -357 70 -341 -90 0
+execute as @s run tp @s @e[type=area_effect_cloud,tag=LobbyTP,limit=1,sort=random]
diff --git a/world/datapacks/lem.base/data/lem.base/functions/menu/load/host/lobby/run.mcfunction b/world/datapacks/lem.base/data/lem.base/functions/menu/load/host/lobby/run.mcfunction
diff --git a/world/datapacks/lem.base/data/lem.base/functions/relog/setup/patreon.mcfunction b/world/datapacks/lem.base/data/lem.base/functions/relog/setup/patreon.mcfunction
diff --git a/world/datapacks/lem.base/data/lem.base/functions/start.mcfunction b/world/datapacks/lem.base/data/lem.base/functions/start.mcfunction
@@ -4,6 +4,9 @@ execute unless entity @a run function lem.base:install
 ##Set relog score to 1 if there are no players online
 execute unless entity @a run scoreboard players set * lem.relog 1
 
+##Enable halloween mode
+scoreboard players set #Store lem.event.halloween 1
+
 ##Check for relog
 function lem.base:relog/check
 

diff --git a/world/dimensions/lem.base/lobby_halloween/data/raids.dat b/world/dimensions/lem.base/lobby_halloween/data/raids.dat
diff --git a/world/dimensions/lem.base/lobby_halloween/data/random_sequences.dat b/world/dimensions/lem.base/lobby_halloween/data/random_sequences.dat
diff --git a/world/dimensions/lem.base/lobby_halloween/data/scoreboard.dat b/world/dimensions/lem.base/lobby_halloween/data/scoreboard.dat
diff --git a/world/dimensions/lem.base/lobby_halloween/data/scoreboardsuffix.dat b/world/dimensions/lem.base/lobby_halloween/data/scoreboardsuffix.dat
diff --git a/world/dimensions/lem.base/lobby_halloween/entities/r.-1.-1.mca b/world/dimensions/lem.base/lobby_halloween/entities/r.-1.-1.mca
diff --git a/world/dimensions/lem.base/lobby_halloween/entities/r.-1.-2.mca b/world/dimensions/lem.base/lobby_halloween/entities/r.-1.-2.mca
diff --git a/world/dimensions/lem.base/lobby_halloween/entities/r.-1.0.mca b/world/dimensions/lem.base/lobby_halloween/entities/r.-1.0.mca
diff --git a/world/dimensions/lem.base/lobby_halloween/entities/r.-1.2.mca b/world/dimensions/lem.base/lobby_halloween/entities/r.-1.2.mca
diff --git a/world/dimensions/lem.base/lobby_halloween/entities/r.-1.3.mca b/world/dimensions/lem.base/lobby_halloween/entities/r.-1.3.mca
diff --git a/world/dimensions/lem.base/lobby_halloween/entities/r.-2.-1.mca b/world/dimensions/lem.base/lobby_halloween/entities/r.-2.-1.mca
diff --git a/world/dimensions/lem.base/lobby_halloween/entities/r.-2.-2.mca b/world/dimensions/lem.base/lobby_halloween/entities/r.-2.-2.mca
diff --git a/world/dimensions/lem.base/lobby_halloween/entities/r.0.-1.mca b/world/dimensions/lem.base/lobby_halloween/entities/r.0.-1.mca
diff --git a/world/dimensions/lem.base/lobby_halloween/entities/r.0.0.mca b/world/dimensions/lem.base/lobby_halloween/entities/r.0.0.mca
diff --git a/world/dimensions/lem.base/lobby_halloween/poi/r.-1.-1.mca b/world/dimensions/lem.base/lobby_halloween/poi/r.-1.-1.mca
diff --git a/world/dimensions/lem.base/lobby_halloween/poi/r.-1.-2.mca b/world/dimensions/lem.base/lobby_halloween/poi/r.-1.-2.mca
diff --git a/world/dimensions/lem.base/lobby_halloween/poi/r.-1.0.mca b/world/dimensions/lem.base/lobby_halloween/poi/r.-1.0.mca
diff --git a/world/dimensions/lem.base/lobby_halloween/poi/r.-2.-1.mca b/world/dimensions/lem.base/lobby_halloween/poi/r.-2.-1.mca
diff --git a/world/dimensions/lem.base/lobby_halloween/poi/r.-2.-2.mca b/world/dimensions/lem.base/lobby_halloween/poi/r.-2.-2.mca
diff --git a/world/dimensions/lem.base/lobby_halloween/poi/r.-2.0.mca b/world/dimensions/lem.base/lobby_halloween/poi/r.-2.0.mca
diff --git a/world/dimensions/lem.base/lobby_halloween/poi/r.0.-1.mca b/world/dimensions/lem.base/lobby_halloween/poi/r.0.-1.mca
diff --git a/world/dimensions/lem.base/lobby_halloween/poi/r.0.-2.mca b/world/dimensions/lem.base/lobby_halloween/poi/r.0.-2.mca
diff --git a/world/dimensions/lem.base/lobby_halloween/poi/r.0.0.mca b/world/dimensions/lem.base/lobby_halloween/poi/r.0.0.mca
diff --git a/world/dimensions/lem.base/lobby_halloween/poi/r.1.-1.mca b/world/dimensions/lem.base/lobby_halloween/poi/r.1.-1.mca
diff --git a/world/dimensions/lem.base/lobby_halloween/poi/r.1.0.mca b/world/dimensions/lem.base/lobby_halloween/poi/r.1.0.mca
diff --git a/world/dimensions/lem.base/lobby_halloween/region/r.-1.-1.mca b/world/dimensions/lem.base/lobby_halloween/region/r.-1.-1.mca
diff --git a/world/dimensions/lem.base/lobby_halloween/region/r.-1.-2.mca b/world/dimensions/lem.base/lobby_halloween/region/r.-1.-2.mca
diff --git a/world/dimensions/lem.base/lobby_halloween/region/r.-1.-3.mca b/world/dimensions/lem.base/lobby_halloween/region/r.-1.-3.mca
diff --git a/world/dimensions/lem.base/lobby_halloween/region/r.-1.0.mca b/world/dimensions/lem.base/lobby_halloween/region/r.-1.0.mca
diff --git a/world/dimensions/lem.base/lobby_halloween/region/r.-1.1.mca b/world/dimensions/lem.base/lobby_halloween/region/r.-1.1.mca
diff --git a/world/dimensions/lem.base/lobby_halloween/region/r.-2.-1.mca b/world/dimensions/lem.base/lobby_halloween/region/r.-2.-1.mca
diff --git a/world/dimensions/lem.base/lobby_halloween/region/r.-2.-2.mca b/world/dimensions/lem.base/lobby_halloween/region/r.-2.-2.mca
diff --git a/world/dimensions/lem.base/lobby_halloween/region/r.-2.-3.mca b/world/dimensions/lem.base/lobby_halloween/region/r.-2.-3.mca
diff --git a/world/dimensions/lem.base/lobby_halloween/region/r.-2.0.mca b/world/dimensions/lem.base/lobby_halloween/region/r.-2.0.mca
diff --git a/world/dimensions/lem.base/lobby_halloween/region/r.-3.-1.mca b/world/dimensions/lem.base/lobby_halloween/region/r.-3.-1.mca
diff --git a/world/dimensions/lem.base/lobby_halloween/region/r.-3.-2.mca b/world/dimensions/lem.base/lobby_halloween/region/r.-3.-2.mca
diff --git a/world/dimensions/lem.base/lobby_halloween/region/r.-3.-3.mca b/world/dimensions/lem.base/lobby_halloween/region/r.-3.-3.mca
diff --git a/world/dimensions/lem.base/lobby_halloween/region/r.-3.0.mca b/world/dimensions/lem.base/lobby_halloween/region/r.-3.0.mca
diff --git a/world/dimensions/lem.base/lobby_halloween/region/r.0.-1.mca b/world/dimensions/lem.base/lobby_halloween/region/r.0.-1.mca
diff --git a/world/dimensions/lem.base/lobby_halloween/region/r.0.-2.mca b/world/dimensions/lem.base/lobby_halloween/region/r.0.-2.mca
diff --git a/world/dimensions/lem.base/lobby_halloween/region/r.0.-3.mca b/world/dimensions/lem.base/lobby_halloween/region/r.0.-3.mca
diff --git a/world/dimensions/lem.base/lobby_halloween/region/r.0.0.mca b/world/dimensions/lem.base/lobby_halloween/region/r.0.0.mca
diff --git a/world/dimensions/lem.base/lobby_halloween/region/r.0.1.mca b/world/dimensions/lem.base/lobby_halloween/region/r.0.1.mca
diff --git a/world/dimensions/lem.base/lobby_halloween/region/r.1.-1.mca b/world/dimensions/lem.base/lobby_halloween/region/r.1.-1.mca
diff --git a/world/dimensions/lem.base/lobby_halloween/region/r.1.0.mca b/world/dimensions/lem.base/lobby_halloween/region/r.1.0.mca
diff --git a/world/dimensions/lem.base/lobby_halloween/region/r.1.1.mca b/world/dimensions/lem.base/lobby_halloween/region/r.1.1.mca
diff --git a/world/icon.png b/world/icon.png