Skip to content

Commit

Permalink
Fix win particles & better start particles
Browse files Browse the repository at this point in the history
New particles for the game start are better on server performance
  • Loading branch information
DBTDerpbox committed Jun 4, 2024
1 parent 498a34f commit 187c29c
Show file tree
Hide file tree
Showing 39 changed files with 76 additions and 71 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ schedule clear lem.base:ui/globalinfo/empty/clear/check
#GlobalInfo hide
schedule clear lem.base:ui/globalinfo/empty/hide
#Start particles
schedule clear lem.base:game/particle/pregame/run
schedule clear lem.base:game/particle/pregame

##Clear Scores
#GlobalInfo clear timer
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
particle entity_effect{color:[1.000,1.000,1.000,1.00]} ~ ~0.3 ~ 0.35 0.8 0.35 1 3 force @a
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
particle entity_effect{color:[0.745,0.945,0.478,1.00]} ~ ~0.3 ~ 0.35 0.8 0.35 1 3 force @a
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
particle entity_effect{color:[0.541,0.071,0.925,1.00]} ~ ~0.3 ~ 0.35 0.8 0.35 1 3 force @a
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
particle entity_effect{color:[1.000,0.714,0.184,1.00]} ~ ~0.3 ~ 0.35 0.8 0.35 1 3 force @a
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
particle entity_effect{color:[0.827,0.208,0.051,1.00]} ~ ~0.3 ~ 0.35 0.8 0.35 1 3 force @a
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
particle entity_effect{color:[0.188,0.514,0.000,1.00]} ~ ~0.3 ~ 0.35 0.8 0.35 1 3 force @a
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
particle entity_effect{color:[0.992,0.518,0.875,1.00]} ~ ~0.3 ~ 0.35 0.8 0.35 1 3 force @a
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
particle entity_effect{color:[0.373,0.176,0.082,1.00]} ~ ~0.3 ~ 0.35 0.8 0.35 1 3 force @a
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
particle entity_effect{color:[0.000,1.000,0.051,1.00]} ~ ~0.3 ~ 0.35 0.8 0.35 1 3 force @a
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
particle entity_effect{color:[1.000,0.165,0.165,1.00]} ~ ~0.3 ~ 0.35 0.8 0.35 1 3 force @a
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
particle entity_effect{color:[0.231,0.455,0.867,1.00]} ~ ~0.3 ~ 0.35 0.8 0.35 1 3 force @a
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
particle entity_effect{color:[0.980,0.200,0.812,1.00]} ~ ~0.3 ~ 0.35 0.8 0.35 1 3 force @a
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
particle entity_effect{color:[0.988,0.506,0.114,1.00]} ~ ~0.3 ~ 0.35 0.8 0.35 1 3 force @a
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
particle entity_effect{color:[0.973,0.918,0.153,1.00]} ~ ~0.3 ~ 0.35 0.8 0.35 1 3 force @a
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
particle entity_effect{color:[0.075,0.988,0.941,1.00]} ~ ~0.3 ~ 0.35 0.8 0.35 1 3 force @a
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
particle entity_effect{color:[0.086,0.212,0.925,1.00]} ~ ~0.3 ~ 0.35 0.8 0.35 1 3 force @a
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
###A better random color system could be made in the future, but this will work for now
##Generate random number
execute store result score #Store lem.temp run random value 1..16

##Display particles
#P1
execute if score #Store lem.temp matches 1 run function lem.base:game/particle/color/1
#P2
execute if score #Store lem.temp matches 2 run function lem.base:game/particle/color/2
#P3
execute if score #Store lem.temp matches 3 run function lem.base:game/particle/color/3
#P4
execute if score #Store lem.temp matches 4 run function lem.base:game/particle/color/4
#P5
execute if score #Store lem.temp matches 5 run function lem.base:game/particle/color/5
#P6
execute if score #Store lem.temp matches 6 run function lem.base:game/particle/color/6
#P7
execute if score #Store lem.temp matches 7 run function lem.base:game/particle/color/7
#P8
execute if score #Store lem.temp matches 8 run function lem.base:game/particle/color/8
#P9
execute if score #Store lem.temp matches 9 run function lem.base:game/particle/color/9
#P10
execute if score #Store lem.temp matches 10 run function lem.base:game/particle/color/10
#P11
execute if score #Store lem.temp matches 11 run function lem.base:game/particle/color/11
#P12
execute if score #Store lem.temp matches 12 run function lem.base:game/particle/color/12
#P13
execute if score #Store lem.temp matches 13 run function lem.base:game/particle/color/13
#P14
execute if score #Store lem.temp matches 14 run function lem.base:game/particle/color/14
#P15
execute if score #Store lem.temp matches 15 run function lem.base:game/particle/color/15
#P16
execute if score #Store lem.temp matches 16 run function lem.base:game/particle/color/16
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
##Display particles
#P1
execute at @a[tag=ingame,scores={lem.pid=1},tag=player] run function lem.base:game/particle/pregame/1
execute at @a[tag=ingame,scores={lem.pid=1},tag=player] run function lem.base:game/particle/color/1
#P2
execute at @a[tag=ingame,scores={lem.pid=2},tag=player] run function lem.base:game/particle/pregame/2
execute at @a[tag=ingame,scores={lem.pid=2},tag=player] run function lem.base:game/particle/color/2
#P3
execute at @a[tag=ingame,scores={lem.pid=3},tag=player] run function lem.base:game/particle/pregame/3
execute at @a[tag=ingame,scores={lem.pid=3},tag=player] run function lem.base:game/particle/color/3
#P4
execute at @a[tag=ingame,scores={lem.pid=4},tag=player] run function lem.base:game/particle/pregame/4
execute at @a[tag=ingame,scores={lem.pid=4},tag=player] run function lem.base:game/particle/color/4
#P5
execute at @a[tag=ingame,scores={lem.pid=5},tag=player] run function lem.base:game/particle/pregame/5
execute at @a[tag=ingame,scores={lem.pid=5},tag=player] run function lem.base:game/particle/color/5
#P6
execute at @a[tag=ingame,scores={lem.pid=6},tag=player] run function lem.base:game/particle/pregame/6
execute at @a[tag=ingame,scores={lem.pid=6},tag=player] run function lem.base:game/particle/color/6
#P7
execute at @a[tag=ingame,scores={lem.pid=7},tag=player] run function lem.base:game/particle/pregame/7
execute at @a[tag=ingame,scores={lem.pid=7},tag=player] run function lem.base:game/particle/color/7
#P8
execute at @a[tag=ingame,scores={lem.pid=8},tag=player] run function lem.base:game/particle/pregame/8
execute at @a[tag=ingame,scores={lem.pid=8},tag=player] run function lem.base:game/particle/color/8
#P9
execute at @a[tag=ingame,scores={lem.pid=9},tag=player] run function lem.base:game/particle/pregame/9
execute at @a[tag=ingame,scores={lem.pid=9},tag=player] run function lem.base:game/particle/color/9
#P10
execute at @a[tag=ingame,scores={lem.pid=10},tag=player] run function lem.base:game/particle/pregame/10
execute at @a[tag=ingame,scores={lem.pid=10},tag=player] run function lem.base:game/particle/color/10
#P11
execute at @a[tag=ingame,scores={lem.pid=11},tag=player] run function lem.base:game/particle/pregame/11
execute at @a[tag=ingame,scores={lem.pid=11},tag=player] run function lem.base:game/particle/color/11
#P12
execute at @a[tag=ingame,scores={lem.pid=12},tag=player] run function lem.base:game/particle/pregame/12
execute at @a[tag=ingame,scores={lem.pid=12},tag=player] run function lem.base:game/particle/color/12
#P13
execute at @a[tag=ingame,scores={lem.pid=13},tag=player] run function lem.base:game/particle/pregame/13
execute at @a[tag=ingame,scores={lem.pid=13},tag=player] run function lem.base:game/particle/color/13
#P14
execute at @a[tag=ingame,scores={lem.pid=14},tag=player] run function lem.base:game/particle/pregame/14
execute at @a[tag=ingame,scores={lem.pid=14},tag=player] run function lem.base:game/particle/color/14
#P15
execute at @a[tag=ingame,scores={lem.pid=15},tag=player] run function lem.base:game/particle/pregame/15
execute at @a[tag=ingame,scores={lem.pid=15},tag=player] run function lem.base:game/particle/color/15
#P16
execute at @a[tag=ingame,scores={lem.pid=16},tag=player] run function lem.base:game/particle/pregame/16
execute at @a[tag=ingame,scores={lem.pid=16},tag=player] run function lem.base:game/particle/color/16

##Loop
schedule function lem.base:game/particle/pregame/run 3t
schedule function lem.base:game/particle/pregame 1t

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
##Display particle // FIXME: Particles are not random color
execute as @a[tag=ingame,tag=Victor] at @s run particle entity_effect{color:[0.1,0.2,0.3,1.0]} ~ ~0.3 ~ 0.35 0.8 0.35 1 3 force @a
##Display particle
execute as @a[tag=ingame,tag=Victor] at @s run function lem.base:game/particle/color/random

##Loop
schedule function lem.base:game/particle/victory 1t
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ execute as @a[tag=ingame] run data merge entity @s {Invulnerable:0}
function lem.base:game/damage/enable

##Remove particles
schedule clear lem.base:game/particle/pregame/run
schedule clear lem.base:game/particle/pregame

##Play sound
execute as @a[tag=ingame] at @s run function lem.base:sound/game/count4
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ function lem.base:ui/globalinfo/empty/clear/check
scoreboard players reset @a[tag=ingame] lem.eliminated

##Display particles
execute unless score #Store lem.game.particle.pregame.override matches 1 run function lem.base:game/particle/pregame/run
execute unless score #Store lem.game.particle.pregame.override matches 1 run function lem.base:game/particle/pregame

##Load custom behavior
execute if score #Store lem.initialgame matches 1 run function #lem.base:game/custom/load
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ execute as @a[tag=ingame] at @s run spawnpoint @s ~ ~ ~
##Refresh time
function lem.base:game/time/refresh

##Load resources for lobby // TODO: Figure out what purpose this served, this function doesn't exist
##Load resources for lobby \\ TODO: Figure out what purpose this served, this function doesn't exist
#schedule function lem.base:game/end/resources/check 10t

0 comments on commit 187c29c

Please sign in to comment.