Skip to content

Commit

Permalink
Merge branch 'base' into battle-1.20.4
Browse files Browse the repository at this point in the history
  • Loading branch information
DBTDerpbox committed Oct 21, 2024
2 parents 43e3213 + 4dd33f3 commit 6781d88
Show file tree
Hide file tree
Showing 55 changed files with 795 additions and 887 deletions.
Original file line number Diff line number Diff line change
@@ -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

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -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 ~
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
##Preload
execute as @s run tp @s -332 58 -343
execute as @s run tp @s -357 70 -380
Original file line number Diff line number Diff line change
@@ -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]

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Binary file modified world/dimensions/lem.base/lobby_halloween/data/raids.dat
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified world/dimensions/lem.base/lobby_halloween/entities/r.-2.-1.mca
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified world/dimensions/lem.base/lobby_halloween/entities/r.0.0.mca
Binary file not shown.
Binary file modified world/dimensions/lem.base/lobby_halloween/poi/r.-1.-1.mca
Binary file not shown.
Empty file.
Empty file.
Binary file not shown.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Binary file modified world/dimensions/lem.base/lobby_halloween/region/r.-1.-1.mca
Binary file not shown.
Binary file not shown.
Empty file.
Binary file not shown.
Empty file.
Binary file not shown.
Binary file not shown.
Empty file.
Binary file not shown.
Empty file.
Empty file.
Empty file.
Empty file.
Binary file not shown.
Binary file not shown.
Empty file.
Binary file not shown.
Empty file.
Binary file not shown.
Binary file not shown.
Empty file.
Binary file modified world/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 6781d88

Please sign in to comment.