Skip to content

Commit

Permalink
Added streak trail + removed dead code
Browse files Browse the repository at this point in the history
  • Loading branch information
VForiel committed Oct 11, 2023
1 parent 8bc9d75 commit 13b8ad7
Show file tree
Hide file tree
Showing 20 changed files with 69 additions and 259 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@ scoreboard objectives add player.pick_villager_cooldown dummy {"text":"Pick Vill
scoreboard objectives add player.animated_title.timer dummy {"text":"Animated Title Timer","color": "aqua"}
scoreboard objectives add player.death.animation dummy {"text":"Death Animation","color": "aqua"}

scoreboard objectives add player.win_streak dummy {"text":"Win Streak","color": "aqua"}
scoreboard objectives add player.kill_streak minecraft.killed:minecraft.villager {"text":"Kill Streak","color": "aqua"}
scoreboard objectives add player.secret_cosmetic dummy {"text":"Secret Cosmetic","color": "aqua"}

# Entities data ---------------------------------------------------------------

scoreboard objectives add respawn.timer dummy {"text":"Respawn Timer","color": "blue"}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,19 @@ execute if score #admin.exist options matches 0 run scoreboard players enable @a

kill @e[type=item]
effect give @a minecraft:saturation infinite 1 true
advancement revoke @a everything
advancement revoke @a everything

# Cosmetics -------------------------------------------------------------------

execute as @a[scores={player.win_streak=1..2}] at @s run particle smoke ~ ~0.1 ~ 0.3 0 0.3 0 1 normal
execute as @a[scores={player.win_streak=3..}] at @s run particle flame ~ ~0.1 ~ 0.3 0 0.3 0 1 normal
execute as @a[scores={player.win_streak=5..9}] at @s run particle smoke ~ ~0.1 ~ 0.3 0 0.3 0.01 1 normal
execute as @a[scores={player.win_streak=10..}] at @s run particle flame ~ ~0.2 ~ 0.5 0.2 0.5 0 5 normal
execute as @a[scores={player.win_streak=10..19}] at @s run particle minecraft:campfire_cosy_smoke ~ ~0.1 ~ 0.3 0 0.3 0.01 1 normal
execute as @a[scores={player.win_streak=20..}] at @s run particle large_smoke ~ ~0.2 ~ 0.5 0.2 0.5 0.01 1 normal
execute as @a[scores={player.win_streak=20..}] at @s run particle minecraft:campfire_cosy_smoke ~ ~0.1 ~ 0.3 0 0.3 0.05 1 normal

execute at @a[scores={player.kill_streak=3..4}] run particle flame ~ ~1 ~ 0 0.5 0 0 1 normal
execute at @a[scores={player.kill_streak=5..}] run particle lava ~ ~ ~ 0 0 0 0 1 normal
execute as @a run scoreboard players operation @s player.kill_streak += @s player.killed_villager
scoreboard players set @a player.killed_villager 0
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

tag @a[tag=player.item.can_have_book] remove player.item.can_have_book


# Time counter
scoreboard players add #game.time.tick timer 1

Expand All @@ -24,6 +25,22 @@ execute as @a[nbt=!{SelectedItem: {tag: {sc.item:1}}},gamemode=adventure] run ga
execute as @a[nbt={SelectedItem: {tag: {sc.item:1}}},gamemode=survival] run gamemode adventure


execute if score #villager.invulnerable options matches 1 as @a[team=blue] at @s if block ~ ~0.001 ~ red_concrete run effect give @s wither 1 1 true
execute if score #villager.invulnerable options matches 1 as @a[team=blue] at @s if block ~ ~0.001 ~ green_concrete run effect give @s wither 1 1 true
execute if score #villager.invulnerable options matches 1 as @a[team=blue] at @s if block ~ ~0.001 ~ yellow_concrete run effect give @s wither 1 1 true

execute if score #villager.invulnerable options matches 1 as @a[team=red] at @s if block ~ ~0.001 ~ blue_concrete run effect give @s wither 1 1 true
execute if score #villager.invulnerable options matches 1 as @a[team=red] at @s if block ~ ~0.001 ~ green_concrete run effect give @s wither 1 1 true
execute if score #villager.invulnerable options matches 1 as @a[team=red] at @s if block ~ ~0.001 ~ yellow_concrete run effect give @s wither 1 1 true

execute if score #villager.invulnerable options matches 1 as @a[team=green] at @s if block ~ ~0.001 ~ red_concrete run effect give @s wither 1 1 true
execute if score #villager.invulnerable options matches 1 as @a[team=green] at @s if block ~ ~0.001 ~ blue_concrete run effect give @s wither 1 1 true
execute if score #villager.invulnerable options matches 1 as @a[team=green] at @s if block ~ ~0.001 ~ yellow_concrete run effect give @s wither 1 1 true

execute if score #villager.invulnerable options matches 1 as @a[team=yellow] at @s if block ~ ~0.001 ~ red_concrete run effect give @s wither 1 1 true
execute if score #villager.invulnerable options matches 1 as @a[team=yellow] at @s if block ~ ~0.001 ~ green_concrete run effect give @s wither 1 1 true
execute if score #villager.invulnerable options matches 1 as @a[team=yellow] at @s if block ~ ~0.001 ~ blue_concrete run effect give @s wither 1 1 true

# =====================================
# WorldBorder
# =====================================
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ execute if score TeamWin data matches 2 run function scaffolding_rush:game/finis
execute if score TeamWin data matches 3 run function scaffolding_rush:game/finish_message/3_teams
execute if score TeamWin data matches 4 run function scaffolding_rush:game/finish_message/4_teams

scoreboard players set @a[team=!spectator,tag=TeamEliminated] player.win_streak 0
scoreboard players add @a[team=!spectator,tag=!TeamEliminated] player.win_streak 1

execute as @a[team=!spectator,tag=!TeamEliminated,scores={option_language=0}] \
run function scaffolding_rush:player/animated_title/start {type:"victory"}
execute as @a[team=!spectator,tag=TeamEliminated,scores={option_language=0}] \
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
tp @e[type=marker,name="lava.level",limit=1] ~ 2 ~
scoreboard players set @s player.kill_streak 0

tag @a remove TeamEliminated
tag @a remove player.item.have_egg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ execute unless score #villager.cannot_fall_in_lava options matches 0..1 run scor
scoreboard objectives add option_villager trigger
execute unless score #villager.enabled options matches 0.. run scoreboard players set #villager.enabled options 1
scoreboard objectives add option_movable_villager trigger
execute unless score #village.movable options matches 0..1 run scoreboard players set #village.movable options 1
execute unless score #villager.movable options matches 0..1 run scoreboard players set #villager.movable options 1
scoreboard objectives add option_vil_resp_cd trigger
execute unless score #villager.respawn.seconds options matches 0.. run scoreboard players set #villager.respawn.seconds options 30
scoreboard objectives add option_vil_respawn trigger
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ scoreboard players set #villager.enabled options 1
scoreboard players set #villager.can_respawn options 1
scoreboard players set #villager.respawn.seconds options 60
scoreboard players set #villager.cannot_fall_in_lava options 0
scoreboard players set #village.movable options 1
scoreboard players set #villager.movable options 1

# Flags
scoreboard players set #flag.take_over options 0
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ scoreboard players set #villager.enabled options 1
scoreboard players set #villager.can_respawn options 1
scoreboard players set #villager.respawn.seconds options 30
scoreboard players set #villager.cannot_fall_in_lava options 0
scoreboard players set #village.movable options 1
scoreboard players set #villager.movable options 1

# Flags
scoreboard players set #flag.take_over options 0
Expand All @@ -47,3 +47,6 @@ scoreboard players set VolcanoSummonPeriod options 600
scoreboard players set VolcanoTargetRate options 0

function scaffolding_rush:options/refresh


# tellraw @a ["",{"text":"[BS] ","color":"gold"},{"text":"Options have been refreshed","color":"gray"}]
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ scoreboard players set Rafts options 1
scoreboard players set #villager.enabled options 1
scoreboard players set #villager.can_respawn options 1
scoreboard players set #villager.cannot_fall_in_lava options 1
scoreboard players set #village.movable options 0
scoreboard players set #villager.movable options 0

# Flags
scoreboard players set #flag.take_over options 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ scoreboard players set Rafts options 1
scoreboard players set #villager.enabled options 1
scoreboard players set #villager.can_respawn options 1
scoreboard players set #villager.cannot_fall_in_lava options 1
scoreboard players set #village.movable options 0
scoreboard players set #villager.movable options 0

# Flags
scoreboard players set #flag.take_over options 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ scoreboard players set Rafts options 1
scoreboard players set #villager.enabled options 1
scoreboard players set #villager.can_respawn options 0
scoreboard players set #villager.cannot_fall_in_lava options 0
scoreboard players set #village.movable options 1
scoreboard players set #villager.movable options 1

# Flags
scoreboard players set #flag.take_over options 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ scoreboard players set Rafts options 1
scoreboard players set #villager.enabled options 1
scoreboard players set #villager.can_respawn options 1
scoreboard players set #villager.cannot_fall_in_lava options 1
scoreboard players set #village.movable options 0
scoreboard players set #villager.movable options 0

# Flags
scoreboard players set #flag.take_over options 1
Expand Down

This file was deleted.

Loading

0 comments on commit 13b8ad7

Please sign in to comment.