Skip to content

Commit

Permalink
changed the . with _ for the user triggers
Browse files Browse the repository at this point in the history
  • Loading branch information
L_glandieres authored and L_glandieres committed Oct 11, 2023
1 parent 42278ee commit 8bc9d75
Show file tree
Hide file tree
Showing 142 changed files with 743 additions and 741 deletions.
2 changes: 1 addition & 1 deletion datapacks/Scaffolding Rush/data/scaffolding_rush/functions/__load__.mcfunction
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ scoreboard objectives add const dummy {"text":"Constants","color": "gold"}

scoreboard objectives add game.id dummy {"text":"Game ID","color": "aqua"}
scoreboard objectives add uuid dummy {"text":"UUID","color": "aqua"}
scoreboard objectives add option.language dummy
scoreboard objectives add option_language dummy
scoreboard objectives add tutorial.cell.z dummy {"text":"Tutorial Cell Z","color": "aqua"}
scoreboard objectives add respawn.timer dummy {"text":"Respawn Timer","color": "aqua"}
scoreboard objectives add player.pick_villager_cooldown dummy {"text":"Pick Villager Cooldown","color": "aqua"}
Expand Down
4 changes: 2 additions & 2 deletions datapacks/Scaffolding Rush/data/scaffolding_rush/functions/game/elimination/blue.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tellraw @a[scores={option.language=0}] ["",{"text":"[BS] ","color":"gold"},{"text":"☠ Team ","color":"gray"},{"text":"Blue ","color":"blue"},{"text":"Eliminated ☠","color":"gray"}]
tellraw @a[scores={option.language=1}] ["",{"text":"[BS] ","color":"gold"},{"text":"☠ L'équipe ","color":"gray"},{"text":"Bleue ","color":"blue"},{"text":"est éliminée ☠","color":"gray"}]
tellraw @a[scores={option_language=0}] ["",{"text":"[BS] ","color":"gold"},{"text":"☠ Team ","color":"gray"},{"text":"Blue ","color":"blue"},{"text":"Eliminated ☠","color":"gray"}]
tellraw @a[scores={option_language=1}] ["",{"text":"[BS] ","color":"gold"},{"text":"☠ L'équipe ","color":"gray"},{"text":"Bleue ","color":"blue"},{"text":"est éliminée ☠","color":"gray"}]
tag @a[team=blue] add TeamEliminated
playsound minecraft:entity.iron_golem.death master @a ~ ~ ~ 1000 0.8
4 changes: 2 additions & 2 deletions datapacks/Scaffolding Rush/data/scaffolding_rush/functions/game/elimination/green.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tellraw @a[scores={option.language=0}] ["",{"text":"[BS] ","color":"gold"},{"text":"☠ Team ","color":"gray"},{"text":"Green ","color":"green"},{"text":"Eliminated ☠","color":"gray"}]
tellraw @a[scores={option.language=1}] ["",{"text":"[BS] ","color":"gold"},{"text":"☠ L'équipe ","color":"gray"},{"text":"Verte ","color":"green"},{"text":"est éliminée ☠","color":"gray"}]
tellraw @a[scores={option_language=0}] ["",{"text":"[BS] ","color":"gold"},{"text":"☠ Team ","color":"gray"},{"text":"Green ","color":"green"},{"text":"Eliminated ☠","color":"gray"}]
tellraw @a[scores={option_language=1}] ["",{"text":"[BS] ","color":"gold"},{"text":"☠ L'équipe ","color":"gray"},{"text":"Verte ","color":"green"},{"text":"est éliminée ☠","color":"gray"}]
tag @a[team=green] add TeamEliminated
playsound minecraft:entity.iron_golem.death master @a ~ ~ ~ 1000 0.8
4 changes: 2 additions & 2 deletions datapacks/Scaffolding Rush/data/scaffolding_rush/functions/game/elimination/red.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
tellraw @a[scores={option.language=0}] ["",{"text":"[BS] ","color":"gold"},{"text":"☠ Team ","color":"gray"},{"text":"Red ","color":"red"},{"text":"Eliminated ☠","color":"gray"}]
tellraw @a[scores={option.language=1}] ["",{"text":"[BS] ","color":"gold"},{"text":"☠ L'équipe ","color":"gray"},{"text":"Red ","color":"red"},{"text":"est éliminée ☠","color":"gray"}]
tellraw @a[scores={option_language=0}] ["",{"text":"[BS] ","color":"gold"},{"text":"☠ Team ","color":"gray"},{"text":"Red ","color":"red"},{"text":"Eliminated ☠","color":"gray"}]
tellraw @a[scores={option_language=1}] ["",{"text":"[BS] ","color":"gold"},{"text":"☠ L'équipe ","color":"gray"},{"text":"Red ","color":"red"},{"text":"est éliminée ☠","color":"gray"}]

tag @a[team=red] add TeamEliminated
playsound minecraft:entity.iron_golem.death master @a ~ ~ ~ 1000 0.8
4 changes: 2 additions & 2 deletions ...packs/Scaffolding Rush/data/scaffolding_rush/functions/game/elimination/yellow.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
tellraw @a[scores={option.language=0}] ["",{"text":"[BS] ","color":"gold"},{"text":"☠ Team ","color":"gray"},{"text":"Yellow ","color":"yellow"},{"text":"Eliminated ☠","color":"gray"}]
tellraw @a[scores={option.language=1}] ["",{"text":"[BS] ","color":"gold"},{"text":"☠ L'équipe ","color":"gray"},{"text":"Jaune ","color":"yellow"},{"text":"est éliminée ☠","color":"gray"}]
tellraw @a[scores={option_language=0}] ["",{"text":"[BS] ","color":"gold"},{"text":"☠ Team ","color":"gray"},{"text":"Yellow ","color":"yellow"},{"text":"Eliminated ☠","color":"gray"}]
tellraw @a[scores={option_language=1}] ["",{"text":"[BS] ","color":"gold"},{"text":"☠ L'équipe ","color":"gray"},{"text":"Jaune ","color":"yellow"},{"text":"est éliminée ☠","color":"gray"}]

tag @a[team=yellow] add TeamEliminated
playsound minecraft:entity.iron_golem.death master @a ~ ~ ~ 1000 0.8
12 changes: 6 additions & 6 deletions datapacks/Scaffolding Rush/data/scaffolding_rush/functions/game/finish.mcfunction
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,25 +22,25 @@ 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

execute as @a[team=!spectator,tag=!TeamEliminated,scores={option.language=0}] \
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}] \
execute as @a[team=!spectator,tag=TeamEliminated,scores={option_language=0}] \
run function scaffolding_rush:player/animated_title/start {type:"defeat"}

execute if score TeamWin data matches 0 unless entity @a[tag=!TeamEliminated] \
run title @a[scores={option.language=0}] title ["",{"text":"No team won!"}]
run title @a[scores={option_language=0}] title ["",{"text":"No team won!"}]
execute if score TeamWin data matches 0 unless entity @a[tag=!TeamEliminated] \
run tellraw @a[scores={option.language=0}] [ \
run tellraw @a[scores={option_language=0}] [ \
{"text":"====================================\n\n","color":"dark_gray"}, \
{"text":"[BS] ","color":"gold"}, \
{"text":"No team won!","color":"gray"}, \
{"text":"\n\n====================================","color":"dark_gray"} \
]

execute if score TeamWin data matches 0 unless entity @a[tag=!TeamEliminated] \
run title @a[scores={option.language=1}] title ["",{"text":"Aucune équipe n'a gagnée !"}]
run title @a[scores={option_language=1}] title ["",{"text":"Aucune équipe n'a gagnée !"}]
execute if score TeamWin data matches 0 unless entity @a[tag=!TeamEliminated] \
run tellraw @a[scores={option.language=1}] [ \
run tellraw @a[scores={option_language=1}] [ \
{"text":"====================================\n\n","color":"dark_gray"}, \
{"text":"[BS] ","color":"gold"}, \
{"text":"Aucune équipe n'a gagnée !","color":"gray"}, \
Expand Down
16 changes: 8 additions & 8 deletions ...ks/Scaffolding Rush/data/scaffolding_rush/functions/game/finish_message/1_team.mcfunction
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@


execute if entity @a[team=blue,tag=!TeamEliminated,limit=1] \
run tellraw @a[scores={option.language=0}] [ \
run tellraw @a[scores={option_language=0}] [ \
{"text":"====================================","color":"dark_gray"}, \
{"text":"\n\n"}, \
{"text":"[BS] ","color":"gold"}, \
Expand All @@ -22,7 +22,7 @@ execute if entity @a[team=blue,tag=!TeamEliminated,limit=1] \
# French ----------------------------------------------------------------------

execute if entity @a[team=blue,tag=!TeamEliminated,limit=1] \
run tellraw @a[scores={option.language=1}] [ \
run tellraw @a[scores={option_language=1}] [ \
{"text":"====================================","color":"dark_gray"}, \
{"text":"\n\n"}, \
{"text":"[BS] ","color":"gold"}, \
Expand All @@ -40,7 +40,7 @@ execute if entity @a[team=blue,tag=!TeamEliminated,limit=1] \
# English ---------------------------------------------------------------------

execute if entity @a[team=green,tag=!TeamEliminated,limit=1] \
run tellraw @a[scores={option.language=0}] [ \
run tellraw @a[scores={option_language=0}] [ \
{"text":"====================================","color":"dark_gray"}, \
{"text":"\n\n"}, \
{"text":"[BS] ","color":"gold"}, \
Expand All @@ -54,7 +54,7 @@ execute if entity @a[team=green,tag=!TeamEliminated,limit=1] \
# French ----------------------------------------------------------------------

execute if entity @a[team=green,tag=!TeamEliminated,limit=1] \
run tellraw @a[scores={option.language=1}] [ \
run tellraw @a[scores={option_language=1}] [ \
{"text":"====================================","color":"dark_gray"}, \
{"text":"\n\n"}, \
{"text":"[BS] ","color":"gold"}, \
Expand All @@ -72,7 +72,7 @@ execute if entity @a[team=green,tag=!TeamEliminated,limit=1] \
# English ---------------------------------------------------------------------

execute if entity @a[team=red,tag=!TeamEliminated,limit=1] \
run tellraw @a[scores={option.language=0}] [ \
run tellraw @a[scores={option_language=0}] [ \
{"text":"====================================","color":"dark_gray"}, \
{"text":"\n\n"}, \
{"text":"[BS] ","color":"gold"}, \
Expand All @@ -86,7 +86,7 @@ execute if entity @a[team=red,tag=!TeamEliminated,limit=1] \
# French ----------------------------------------------------------------------

execute if entity @a[team=red,tag=!TeamEliminated,limit=1] \
run tellraw @a[scores={option.language=1}] [ \
run tellraw @a[scores={option_language=1}] [ \
{"text":"====================================","color":"dark_gray"}, \
{"text":"\n\n"}, \
{"text":"[BS] ","color":"gold"}, \
Expand All @@ -104,7 +104,7 @@ execute if entity @a[team=red,tag=!TeamEliminated,limit=1] \
# English ---------------------------------------------------------------------

execute if entity @a[team=yellow,tag=!TeamEliminated,limit=1] \
run tellraw @a[scores={option.language=0}] [ \
run tellraw @a[scores={option_language=0}] [ \
{"text":"====================================","color":"dark_gray"}, \
{"text":"\n\n"}, \
{"text":"[BS] ","color":"gold"}, \
Expand All @@ -118,7 +118,7 @@ execute if entity @a[team=yellow,tag=!TeamEliminated,limit=1] \
# French ----------------------------------------------------------------------

execute if entity @a[team=yellow,tag=!TeamEliminated,limit=1] \
run tellraw @a[scores={option.language=1}] [ \
run tellraw @a[scores={option_language=1}] [ \
{"text":"====================================","color":"dark_gray"}, \
{"text":"\n\n"}, \
{"text":"[BS] ","color":"gold"}, \
Expand Down
24 changes: 12 additions & 12 deletions ...s/Scaffolding Rush/data/scaffolding_rush/functions/game/finish_message/2_teams.mcfunction
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ execute if entity @a[team=blue,tag=!TeamEliminated,limit=1] \
if entity @a[team=green,tag=!TeamEliminated,limit=1] \
unless entity @a[team=red,tag=!TeamEliminated,limit=1] \
unless entity @a[team=yellow,tag=!TeamEliminated,limit=1] \
run title @a[scores={option.language=0}] title [ \
run title @a[scores={option_language=0}] title [ \
{"text":"Team "}, \
{"text":"Blue","color":"blue"}, \
{"text":" and "}, \
Expand All @@ -23,7 +23,7 @@ execute if entity @a[team=blue,tag=!TeamEliminated,limit=1] \
unless entity @a[team=green,tag=!TeamEliminated,limit=1] \
if entity @a[team=red,tag=!TeamEliminated,limit=1] \
unless entity @a[team=yellow,tag=!TeamEliminated,limit=1] \
run title @a[scores={option.language=0}] title [ \
run title @a[scores={option_language=0}] title [ \
{"text":"Team "}, \
{"text":"Blue","color":"blue"}, \
{"text":" and "}, \
Expand All @@ -37,7 +37,7 @@ execute if entity @a[team=blue,tag=!TeamEliminated,limit=1] \
unless entity @a[team=green,tag=!TeamEliminated,limit=1] \
unless entity @a[team=red,tag=!TeamEliminated,limit=1] \
if entity @a[team=yellow,tag=!TeamEliminated,limit=1] \
run title @a[scores={option.language=0}] title [ \
run title @a[scores={option_language=0}] title [ \
{"text":"Team "}, \
{"text":"Blue","color":"blue"}, \
{"text":" and "}, \
Expand All @@ -51,7 +51,7 @@ execute unless entity @a[team=blue,tag=!TeamEliminated,limit=1] \
if entity @a[team=green,tag=!TeamEliminated,limit=1] \
if entity @a[team=red,tag=!TeamEliminated,limit=1] \
unless entity @a[team=yellow,tag=!TeamEliminated,limit=1] \
run title @a[scores={option.language=0}] title [ \
run title @a[scores={option_language=0}] title [ \
{"text":"Team "}, \
{"text":"Green","color":"green"}, \
{"text":" and "}, \
Expand All @@ -65,7 +65,7 @@ execute unless entity @a[team=blue,tag=!TeamEliminated,limit=1] \
if entity @a[team=green,tag=!TeamEliminated,limit=1] \
unless entity @a[team=red,tag=!TeamEliminated,limit=1] \
if entity @a[team=yellow,tag=!TeamEliminated,limit=1] \
run title @a[scores={option.language=0}] title [ \
run title @a[scores={option_language=0}] title [ \
{"text":"Team "}, \
{"text":"Green","color":"green"}, \
{"text":" and "}, \
Expand All @@ -79,7 +79,7 @@ execute unless entity @a[team=blue,tag=!TeamEliminated,limit=1] \
unless entity @a[team=green,tag=!TeamEliminated,limit=1] \
if entity @a[team=red,tag=!TeamEliminated,limit=1] \
if entity @a[team=yellow,tag=!TeamEliminated,limit=1] \
run title @a[scores={option.language=0}] title [ \
run title @a[scores={option_language=0}] title [ \
{"text":"Team "}, \
{"text":"Red","color":"red"}, \
{"text":" and "}, \
Expand All @@ -97,7 +97,7 @@ execute if entity @a[team=blue,tag=!TeamEliminated,limit=1] \
if entity @a[team=green,tag=!TeamEliminated,limit=1] \
unless entity @a[team=red,tag=!TeamEliminated,limit=1] \
unless entity @a[team=yellow,tag=!TeamEliminated,limit=1] \
run title @a[scores={option.language=1}] title [ \
run title @a[scores={option_language=1}] title [ \
{"text":"L'équipe "}, \
{"text":"Bleue","color":"blue"}, \
{"text":" et "}, \
Expand All @@ -111,7 +111,7 @@ execute if entity @a[team=blue,tag=!TeamEliminated,limit=1] \
unless entity @a[team=green,tag=!TeamEliminated,limit=1] \
if entity @a[team=red,tag=!TeamEliminated,limit=1] \
unless entity @a[team=yellow,tag=!TeamEliminated,limit=1] \
run title @a[scores={option.language=1}] title [ \
run title @a[scores={option_language=1}] title [ \
{"text":"L'équipe "}, \
{"text":"Bleue","color":"blue"}, \
{"text":" et "}, \
Expand All @@ -125,7 +125,7 @@ execute if entity @a[team=blue,tag=!TeamEliminated,limit=1] \
unless entity @a[team=green,tag=!TeamEliminated,limit=1] \
unless entity @a[team=red,tag=!TeamEliminated,limit=1] \
if entity @a[team=yellow,tag=!TeamEliminated,limit=1] \
run title @a[scores={option.language=1}] title [ \
run title @a[scores={option_language=1}] title [ \
{"text":"L'équipe "}, \
{"text":"Bleue","color":"blue"}, \
{"text":" et "}, \
Expand All @@ -139,7 +139,7 @@ execute unless entity @a[team=blue,tag=!TeamEliminated,limit=1] \
if entity @a[team=green,tag=!TeamEliminated,limit=1] \
if entity @a[team=red,tag=!TeamEliminated,limit=1] \
unless entity @a[team=yellow,tag=!TeamEliminated,limit=1] \
run title @a[scores={option.language=1}] title [ \
run title @a[scores={option_language=1}] title [ \
{"text":"L'équipe "}, \
{"text":"Verte","color":"green"}, \
{"text":" et "}, \
Expand All @@ -153,7 +153,7 @@ execute unless entity @a[team=blue,tag=!TeamEliminated,limit=1] \
if entity @a[team=green,tag=!TeamEliminated,limit=1] \
unless entity @a[team=red,tag=!TeamEliminated,limit=1] \
if entity @a[team=yellow,tag=!TeamEliminated,limit=1] \
run title @a[scores={option.language=1}] title [ \
run title @a[scores={option_language=1}] title [ \
{"text":"L'équipe "}, \
{"text":"Verte","color":"green"}, \
{"text":" et "}, \
Expand All @@ -167,7 +167,7 @@ execute unless entity @a[team=blue,tag=!TeamEliminated,limit=1] \
unless entity @a[team=green,tag=!TeamEliminated,limit=1] \
if entity @a[team=red,tag=!TeamEliminated,limit=1] \
if entity @a[team=yellow,tag=!TeamEliminated,limit=1] \
run title @a[scores={option.language=1}] title [ \
run title @a[scores={option_language=1}] title [ \
{"text":"L'équipe "}, \
{"text":"Rouge","color":"red"}, \
{"text":" et "}, \
Expand Down
16 changes: 8 additions & 8 deletions ...s/Scaffolding Rush/data/scaffolding_rush/functions/game/finish_message/3_teams.mcfunction
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ execute unless entity @a[team=blue,tag=!TeamEliminated,limit=1] \
if entity @a[team=green,tag=!TeamEliminated,limit=1] \
if entity @a[team=red,tag=!TeamEliminated,limit=1] \
if entity @a[team=yellow,tag=!TeamEliminated,limit=1] \
run title @a[scores={option.language=0}] title [ \
run title @a[scores={option_language=0}] title [ \
{"text":"Team "}, \
{"text":"Green","color":"green"}, \
{"text":", "}, \
Expand All @@ -25,7 +25,7 @@ execute if entity @a[team=blue,tag=!TeamEliminated,limit=1] \
unless entity @a[team=green,tag=!TeamEliminated,limit=1] \
if entity @a[team=red,tag=!TeamEliminated,limit=1] \
if entity @a[team=yellow,tag=!TeamEliminated,limit=1] \
run title @a[scores={option.language=0}] title [ \
run title @a[scores={option_language=0}] title [ \
{"text":"Team "}, \
{"text":"Blue","color":"blue"}, \
{"text":", "}, \
Expand All @@ -41,7 +41,7 @@ execute if entity @a[team=blue,tag=!TeamEliminated,limit=1] \
if entity @a[team=green,tag=!TeamEliminated,limit=1] \
unless entity @a[team=red,tag=!TeamEliminated,limit=1] \
if entity @a[team=yellow,tag=!TeamEliminated,limit=1] \
run title @a[scores={option.language=0}] title [ \
run title @a[scores={option_language=0}] title [ \
{"text":"Team "}, \
{"text":"Blue","color":"blue"}, \
{"text":", "}, \
Expand All @@ -57,7 +57,7 @@ execute if entity @a[team=blue,tag=!TeamEliminated,limit=1] \
if entity @a[team=green,tag=!TeamEliminated,limit=1] \
if entity @a[team=red,tag=!TeamEliminated,limit=1] \
unless entity @a[team=yellow,tag=!TeamEliminated,limit=1] \
run title @a[scores={option.language=0}] title [ \
run title @a[scores={option_language=0}] title [ \
{"text":"Team "}, \
{"text":"Blue","color":"blue"}, \
{"text":", "}, \
Expand All @@ -77,7 +77,7 @@ execute unless entity @a[team=blue,tag=!TeamEliminated,limit=1] \
if entity @a[team=green,tag=!TeamEliminated,limit=1] \
if entity @a[team=red,tag=!TeamEliminated,limit=1] \
if entity @a[team=yellow,tag=!TeamEliminated,limit=1] \
run title @a[scores={option.language=1}] title [ \
run title @a[scores={option_language=1}] title [ \
{"text":"L'équipe"}, \
{"text":"Verte","color":"green"}, \
{"text":", "}, \
Expand All @@ -93,7 +93,7 @@ execute if entity @a[team=blue,tag=!TeamEliminated,limit=1] \
unless entity @a[team=green,tag=!TeamEliminated,limit=1] \
if entity @a[team=red,tag=!TeamEliminated,limit=1] \
if entity @a[team=yellow,tag=!TeamEliminated,limit=1] \
run title @a[scores={option.language=1}] title [ \
run title @a[scores={option_language=1}] title [ \
{"text":"L'équipe"}, \
{"text":"Blue","color":"blue"}, \
{"text":", "}, \
Expand All @@ -109,7 +109,7 @@ execute if entity @a[team=blue,tag=!TeamEliminated,limit=1] \
if entity @a[team=green,tag=!TeamEliminated,limit=1] \
unless entity @a[team=red,tag=!TeamEliminated,limit=1] \
if entity @a[team=yellow,tag=!TeamEliminated,limit=1] \
run title @a[scores={option.language=1}] title [ \
run title @a[scores={option_language=1}] title [ \
{"text":"L'équipe"}, \
{"text":"Blue","color":"blue"}, \
{"text":", "}, \
Expand All @@ -125,7 +125,7 @@ execute if entity @a[team=blue,tag=!TeamEliminated,limit=1] \
if entity @a[team=green,tag=!TeamEliminated,limit=1] \
if entity @a[team=red,tag=!TeamEliminated,limit=1] \
unless entity @a[team=yellow,tag=!TeamEliminated,limit=1] \
run title @a[scores={option.language=1}] title [ \
run title @a[scores={option_language=1}] title [ \
{"text":"L'équipe"}, \
{"text":"Blue","color":"blue"}, \
{"text":", "}, \
Expand Down
4 changes: 2 additions & 2 deletions ...s/Scaffolding Rush/data/scaffolding_rush/functions/game/finish_message/4_teams.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@

# EN
title @a[scores={option.language=0}] title [ \
title @a[scores={option_language=0}] title [ \
{"text":"All teams win!"} \
]

# FR
title @a[scores={option.language=1}] title [ \
title @a[scores={option_language=1}] title [ \
{"text":"Toutes les équipes ont gagné !"} \
]
Loading

0 comments on commit 8bc9d75

Please sign in to comment.