Skip to content

Commit

Permalink
Fixing typos in some do2.staff messages (0.12.23)
Browse files Browse the repository at this point in the history
  • Loading branch information
Bavadin authored Sep 24, 2024
1 parent b8c8204 commit 15cca7c
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 18 deletions.
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
log-event exit-button-pressed 1

execute if score $dungeon do2.utility.onServer matches 1 run kick @a[tag=!do2.staff]
execute if score $dungeon do2.utility.onServer matches 1 run tellraw @s ["",{"text":"[§9B§r]: You have the tag [§bdo2.staff§r] and has stopped:\n - §5/kick "},{"selector":"@s","color":"dark_purple"},{"text":"\n§f[§9B§r]: Click "},{"text":"§b[here]","clickEvent":{"action":"run_command","value":"/kick @s"}},{"text":" to run the command anyways."}]
execute if score $dungeon do2.utility.onServer matches 1 run tellraw @s ["",{"text":"[§9B§r]: You have the tag [§bdo2.staff§r], and this has stopped:\n - §5/kick "},{"selector":"@s","color":"dark_purple"},{"text":"\n§f[§9B§r]: Click "},{"text":"§b[here]","clickEvent":{"action":"run_command","value":"/kick @s"}},{"text":" to run the command anyway."}]


execute if score $dungeon do2.utility.onServer matches 1 unless entity @a[tag=do2.staff] run stop
execute if score $dungeon do2.utility.onServer matches 1 as @a[tag=do2.staff] run tellraw @s ["",{"text":"[§9B§r]: You have the tag [§bdo2.staff§r] and has stopped:\n - §5/stop\n§f[§9B§r]: Click "},{"text":"§b[here]","clickEvent":{"action":"run_command","value":"/stop"}},{"text":" to run the command anyways."}]
execute if score $dungeon do2.utility.onServer matches 1 as @a[tag=do2.staff] run tellraw @s ["",{"text":"[§9B§r]: You have the tag [§bdo2.staff§r], and this has stopped:\n - §5/stop\n§f[§9B§r]: Click "},{"text":"§b[here]","clickEvent":{"action":"run_command","value":"/stop"}},{"text":" to run the command anyway."}]
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ scoreboard players operation @s do2.run.seconds = $dungeon do2.run.seconds
# join the ghosts
team join do2.ghosts @s
execute if score $dungeon do2.config.forceGamemode matches 1 unless entity @s[tag=do2.staff] run gamemode spectator
execute if score $dungeon do2.config.forceGamemode matches 1 if entity @s[tag=do2.staff] run tellraw @s ["",{"text":"§f[§9B§r]: You have the tag [§bdo2.staff§r] and has stopped:\n - §5gamemode spectator "},{"selector":"@s","color":"dark_purple"},{"text":"\n§f[§9B§r]: Click "},{"text":"§b[here]","clickEvent":{"action":"run_command","value":"/gamemode spectator @s"}},{"text":" to run the command anyways."}]
execute if score $dungeon do2.config.forceGamemode matches 1 if entity @s[tag=do2.staff] run tellraw @s ["",{"text":"§f[§9B§r]: You have the tag [§bdo2.staff§r], and this has stopped:\n - §5gamemode spectator "},{"selector":"@s","color":"dark_purple"},{"text":"\n§f[§9B§r]: Click "},{"text":"§b[here]","clickEvent":{"action":"run_command","value":"/gamemode spectator @s"}},{"text":" to run the command anyway."}]

# player no longer running
tag @s remove do2.running
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ tag @s remove respawnLogTarget

execute if score $dungeon do2.config.forceGamemode matches 1 if entity @s[tag=do2.respawnSpectatorSpot] unless entity @s[tag=do2.staff] run tp @s -526 114 1980
execute if score $dungeon do2.config.forceGamemode matches 1 if entity @s[tag=do2.respawnPlayerSpot] unless entity @s[tag=do2.staff] unless entity @s[x=-552,dx=8,y=111,dy=4,z=1977,dz=6] run tp @s -550 113 1982
execute if score $dungeon do2.config.forceGamemode matches 1 if entity @s[tag=do2.respawnSpectatorSpot] if entity @s[tag=do2.staff] run tellraw @s ["",{"text":"§f[§9B§r]: You have the tag [§bdo2.staff§r] and has stopped:\n - §5tp "},{"selector":"@s","color":"dark_purple"},{"text":"§5-526 114 1980\n§f[§9B§r]: Click "},{"text":"§b[here]","clickEvent":{"action":"run_command","value":"/tp @s -526 114 1980"}},{"text":" to run the command anyways."}]
execute if score $dungeon do2.config.forceGamemode matches 1 if entity @s[tag=do2.respawnPlayerSpot] if entity @s[tag=do2.staff] unless entity @s[x=-552,dx=8,y=111,dy=4,z=1977,dz=6] run tellraw @s ["",{"text":"§f[§9B§r]: You have the tag [§bdo2.staff§r] and has stopped:\n - §5tp "},{"selector":"@s","color":"dark_purple"},{"text":"§5-550 113 1982\n§f[§9B§r]: Click "},{"text":"§b[here]","clickEvent":{"action":"run_command","value":"/tp @s -550 113 1982"}},{"text":" to run the command anyways."}]
execute if score $dungeon do2.config.forceGamemode matches 1 if entity @s[tag=do2.respawnSpectatorSpot] if entity @s[tag=do2.staff] run tellraw @s ["",{"text":"§f[§9B§r]: You have the tag [§bdo2.staff§r], and this has stopped:\n - §5tp "},{"selector":"@s","color":"dark_purple"},{"text":"§5-526 114 1980\n§f[§9B§r]: Click "},{"text":"§b[here]","clickEvent":{"action":"run_command","value":"/tp @s -526 114 1980"}},{"text":" to run the command anyway."}]
execute if score $dungeon do2.config.forceGamemode matches 1 if entity @s[tag=do2.respawnPlayerSpot] if entity @s[tag=do2.staff] unless entity @s[x=-552,dx=8,y=111,dy=4,z=1977,dz=6] run tellraw @s ["",{"text":"§f[§9B§r]: You have the tag [§bdo2.staff§r], and this has stopped:\n - §5tp "},{"selector":"@s","color":"dark_purple"},{"text":"§5-550 113 1982\n§f[§9B§r]: Click "},{"text":"§b[here]","clickEvent":{"action":"run_command","value":"/tp @s -550 113 1982"}},{"text":" to run the command anyway."}]

# Reset deathCount
scoreboard players set @s do2.utility.deathCount 0
Expand Down
12 changes: 6 additions & 6 deletions Brilliance Datapack/data/do2/functions/reset_player.mcfunction
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ tag @s remove playerResetLogTarget
# If player is alive, teleport them right now.
execute if score $dungeon do2.config.forceGamemode matches 1 if entity @s[team=do2.spectators,scores={do2.utility.deathCount=0}] unless entity @s[tag=do2.staff] run tp @s -526 114 1980
execute if score $dungeon do2.config.forceGamemode matches 1 if entity @s[team=!do2.spectators,scores={do2.utility.deathCount=0}] unless entity @s[tag=do2.staff] unless entity @s[x=-552,dx=8,y=111,dy=4,z=1977,dz=6] run tp @s -550 113 1982
execute if score $dungeon do2.config.forceGamemode matches 1 if entity @s[team=do2.spectators,scores={do2.utility.deathCount=0}] if entity @s[tag=do2.staff] run tellraw @s ["",{"text":"§f[§9B§r]: You have the tag [§bdo2.staff§r] and has stopped:\n - §5tp "},{"selector":"@s","color":"dark_purple"},{"text":"§5-526 114 1980\n§f[§9B§r]: Click "},{"text":"§b[here]","clickEvent":{"action":"run_command","value":"/tp @s -526 114 1980"}},{"text":" to run the command anyways."}]
execute if score $dungeon do2.config.forceGamemode matches 1 if entity @s[team=!do2.spectators,scores={do2.utility.deathCount=0}] if entity @s[tag=do2.staff] unless entity @s[x=-552,dx=8,y=111,dy=4,z=1977,dz=6] run tellraw @s ["",{"text":"§f[§9B§r]: You have the tag [§bdo2.staff§r] and has stopped:\n - §5tp "},{"selector":"@s","color":"dark_purple"},{"text":"§5-550 113 1982\n§f[§9B§r]: Click "},{"text":"§b[here]","clickEvent":{"action":"run_command","value":"/tp @s -550 113 1982"}},{"text":" to run the command anyways."}]
execute if score $dungeon do2.config.forceGamemode matches 1 if entity @s[team=do2.spectators,scores={do2.utility.deathCount=0}] if entity @s[tag=do2.staff] run tellraw @s ["",{"text":"§f[§9B§r]: You have the tag [§bdo2.staff§r], and this has stopped:\n - §5tp "},{"selector":"@s","color":"dark_purple"},{"text":"§5-526 114 1980\n§f[§9B§r]: Click "},{"text":"§b[here]","clickEvent":{"action":"run_command","value":"/tp @s -526 114 1980"}},{"text":" to run the command anyway."}]
execute if score $dungeon do2.config.forceGamemode matches 1 if entity @s[team=!do2.spectators,scores={do2.utility.deathCount=0}] if entity @s[tag=do2.staff] unless entity @s[x=-552,dx=8,y=111,dy=4,z=1977,dz=6] run tellraw @s ["",{"text":"§f[§9B§r]: You have the tag [§bdo2.staff§r], and this has stopped:\n - §5tp "},{"selector":"@s","color":"dark_purple"},{"text":"§5-550 113 1982\n§f[§9B§r]: Click "},{"text":"§b[here]","clickEvent":{"action":"run_command","value":"/tp @s -550 113 1982"}},{"text":" to run the command anyway."}]

# If player is dead, teleport them later.
execute if score $dungeon do2.config.forceGamemode matches 1 if entity @s[scores={do2.utility.deathCount=1..}] if entity @s[team=do2.spectators] run tag @s add do2.respawnSpectatorSpot
Expand All @@ -20,10 +20,10 @@ execute if score $dungeon do2.config.forceGamemode matches 1 unless entity @s[ga
execute if score $dungeon do2.config.forceGamemode matches 1 unless entity @s[gamemode=creative] unless entity @s[tag=do2.staff] if score @s do2.utility.oldGamemode matches 2 run gamemode creative @s
execute if score $dungeon do2.config.forceGamemode matches 1 unless entity @s[gamemode=spectator] unless entity @s[tag=do2.staff] if score @s do2.utility.oldGamemode matches 3 run gamemode spectator @s
# If they are staff
execute if score $dungeon do2.config.forceGamemode matches 1 unless entity @s[gamemode=adventure] if entity @s[tag=do2.staff] if score @s do2.utility.oldGamemode matches 0 run tellraw @s ["",{"text":"§f[§9B§r]: You have the tag [§bdo2.staff§r] and has stopped:\n - §5gamemode adventure "},{"selector":"@s","color":"dark_purple"},{"text":"\n§f[§9B§r]: Click "},{"text":"§b[here]","clickEvent":{"action":"run_command","value":"/gamemode adventure @s"}},{"text":" to run the command anyways."}]
execute if score $dungeon do2.config.forceGamemode matches 1 unless entity @s[gamemode=survival] if entity @s[tag=do2.staff] if score @s do2.utility.oldGamemode matches 1 run tellraw @s ["",{"text":"§f[§9B§r]: You have the tag [§bdo2.staff§r] and has stopped:\n - §5gamemode survival "},{"selector":"@s","color":"dark_purple"},{"text":"\n§f[§9B§r]: Click "},{"text":"§b[here]","clickEvent":{"action":"run_command","value":"/gamemode survival @s"}},{"text":" to run the command anyways."}]
execute if score $dungeon do2.config.forceGamemode matches 1 unless entity @s[gamemode=creative] if entity @s[tag=do2.staff] if score @s do2.utility.oldGamemode matches 2 run tellraw @s ["",{"text":"§f[§9B§r]: You have the tag [§bdo2.staff§r] and has stopped:\n - §5gamemode creative "},{"selector":"@s","color":"dark_purple"},{"text":"\n§f[§9B§r]: Click "},{"text":"§b[here]","clickEvent":{"action":"run_command","value":"/gamemode creative @s"}},{"text":" to run the command anyways."}]
execute if score $dungeon do2.config.forceGamemode matches 1 unless entity @s[gamemode=spectator] if entity @s[tag=do2.staff] if score @s do2.utility.oldGamemode matches 3 run tellraw @s ["",{"text":"§f[§9B§r]: You have the tag [§bdo2.staff§r] and has stopped:\n - §5gamemode spectator "},{"selector":"@s","color":"dark_purple"},{"text":"\n§f[§9B§r]: Click "},{"text":"§b[here]","clickEvent":{"action":"run_command","value":"/gamemode spectator @s"}},{"text":" to run the command anyways."}]
execute if score $dungeon do2.config.forceGamemode matches 1 unless entity @s[gamemode=adventure] if entity @s[tag=do2.staff] if score @s do2.utility.oldGamemode matches 0 run tellraw @s ["",{"text":"§f[§9B§r]: You have the tag [§bdo2.staff§r], and this has stopped:\n - §5gamemode adventure "},{"selector":"@s","color":"dark_purple"},{"text":"\n§f[§9B§r]: Click "},{"text":"§b[here]","clickEvent":{"action":"run_command","value":"/gamemode adventure @s"}},{"text":" to run the command anyway."}]
execute if score $dungeon do2.config.forceGamemode matches 1 unless entity @s[gamemode=survival] if entity @s[tag=do2.staff] if score @s do2.utility.oldGamemode matches 1 run tellraw @s ["",{"text":"§f[§9B§r]: You have the tag [§bdo2.staff§r], and this has stopped:\n - §5gamemode survival "},{"selector":"@s","color":"dark_purple"},{"text":"\n§f[§9B§r]: Click "},{"text":"§b[here]","clickEvent":{"action":"run_command","value":"/gamemode survival @s"}},{"text":" to run the command anyway."}]
execute if score $dungeon do2.config.forceGamemode matches 1 unless entity @s[gamemode=creative] if entity @s[tag=do2.staff] if score @s do2.utility.oldGamemode matches 2 run tellraw @s ["",{"text":"§f[§9B§r]: You have the tag [§bdo2.staff§r], and this has stopped:\n - §5gamemode creative "},{"selector":"@s","color":"dark_purple"},{"text":"\n§f[§9B§r]: Click "},{"text":"§b[here]","clickEvent":{"action":"run_command","value":"/gamemode creative @s"}},{"text":" to run the command anyway."}]
execute if score $dungeon do2.config.forceGamemode matches 1 unless entity @s[gamemode=spectator] if entity @s[tag=do2.staff] if score @s do2.utility.oldGamemode matches 3 run tellraw @s ["",{"text":"§f[§9B§r]: You have the tag [§bdo2.staff§r], and this has stopped:\n - §5gamemode spectator "},{"selector":"@s","color":"dark_purple"},{"text":"\n§f[§9B§r]: Click "},{"text":"§b[here]","clickEvent":{"action":"run_command","value":"/gamemode spectator @s"}},{"text":" to run the command anyway."}]

# If player is spectator AND we're on a server. Leave them on spectator mode.
execute if entity @s[team=do2.spectators] if score $dungeon do2.utility.onServer matches 1 unless entity @s[tag=do2.staff] run gamemode spectator @s
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
execute if score $dungeon do2.config.fr.teleportKillers matches 1 run tellraw @s ["",{"text":"\n§f§lRandomize Killers' Position: "},{"text":"§n§aENABLED"},{"text":" §7§o(Default: ENABLED)\n"},{"text":"§f","clickEvent":{"action":"run_command","value":"/scoreboard players set $dungeon do2.config.fr.teleportKillers 0"}},{"text":" §f","clickEvent":{"action":"run_command","value":"/scoreboard players set $dungeon do2.config.fr.teleportKillers 1"}},{"text":" §f","hoverEvent":{"action":"show_text","contents":"§fRandomize Each §6Ravager §fand §3Warden §fstarting position as if someone else played or the killers had wandered off."}}]
execute if score $dungeon do2.config.fr.teleportKillers matches 0 run tellraw @s ["",{"text":"\n§f§lRandomize Killers' Position: "},{"text":"§n§cDISABLED"},{"text":" §7§o(Default: ENABLED)\n"},{"text":"§f","clickEvent":{"action":"run_command","value":"/scoreboard players set $dungeon do2.config.fr.teleportKillers 0"}},{"text":" §f","clickEvent":{"action":"run_command","value":"/scoreboard players set $dungeon do2.config.fr.teleportKillers 1"}},{"text":" §f","hoverEvent":{"action":"show_text","contents":"§fRandomize Each §6Ravager §fand §3Warden §fstarting position as if someone else played or the killers had wandered off."}}]
execute if score $dungeon do2.config.fr.teleportKillers matches 1 run tellraw @s ["",{"text":"\n§f§lRandomize Killers' Positions: "},{"text":"§n§aENABLED"},{"text":" §7§o(Default: ENABLED)\n"},{"text":"§f","clickEvent":{"action":"run_command","value":"/scoreboard players set $dungeon do2.config.fr.teleportKillers 0"}},{"text":" §f","clickEvent":{"action":"run_command","value":"/scoreboard players set $dungeon do2.config.fr.teleportKillers 1"}},{"text":" §f","hoverEvent":{"action":"show_text","contents":"§fRandomize Each §6Ravager §fand §3Warden §fstarting position as if someone else played or the killers had wandered off."}}]
execute if score $dungeon do2.config.fr.teleportKillers matches 0 run tellraw @s ["",{"text":"\n§f§lRandomize Killers' Positions: "},{"text":"§n§cDISABLED"},{"text":" §7§o(Default: ENABLED)\n"},{"text":"§f","clickEvent":{"action":"run_command","value":"/scoreboard players set $dungeon do2.config.fr.teleportKillers 0"}},{"text":" §f","clickEvent":{"action":"run_command","value":"/scoreboard players set $dungeon do2.config.fr.teleportKillers 1"}},{"text":" §f","hoverEvent":{"action":"show_text","contents":"§fRandomize Each §6Ravager §fand §3Warden §fstarting position as if someone else played or the killers had wandered off."}}]
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ execute if entity @s[gamemode=survival] run scoreboard players set @s do2.utilit
execute if entity @s[gamemode=creative] run scoreboard players set @s do2.utility.oldGamemode 2
execute if entity @s[gamemode=spectator] run scoreboard players set @s do2.utility.oldGamemode 3
execute if score $dungeon do2.config.forceGamemode matches 1 unless entity @s[gamemode=survival] unless entity @s[gamemode=adventure] unless entity @s[tag=do2.staff] run gamemode adventure
execute if score $dungeon do2.config.forceGamemode matches 1 unless entity @s[gamemode=survival] unless entity @s[gamemode=adventure] if entity @s[tag=do2.staff] run tellraw @s ["",{"text":"§f[§9B§r]: You have the tag [§bdo2.staff§r] and has stopped:\n - §5gamemode adventure "},{"selector":"@s","color":"dark_purple"},{"text":"\n§f[§9B§r]: Click "},{"text":"§b[here]","clickEvent":{"action":"run_command","value":"/gamemode adventure @s"}},{"text":" to run the command anyways."}]
execute if score $dungeon do2.config.forceGamemode matches 1 unless entity @s[gamemode=survival] unless entity @s[gamemode=adventure] if entity @s[tag=do2.staff] run tellraw @s ["",{"text":"§f[§9B§r]: You have the tag [§bdo2.staff§r], and this has stopped:\n - §5gamemode adventure "},{"selector":"@s","color":"dark_purple"},{"text":"\n§f[§9B§r]: Click "},{"text":"§b[here]","clickEvent":{"action":"run_command","value":"/gamemode adventure @s"}},{"text":" to run the command anyway."}]

# - RESET GENERAL -
scoreboard players set @s do2.run.foundArtifact 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ execute unless score $dungeon do2.config.bc.staircaseEmbers matches 0.. run scor


# Dungeon Config: Fresh Runs
scoreboard objectives add do2.config.fr.teleportKillers dummy "Randomize Killers's Positions"
scoreboard objectives add do2.config.fr.teleportKillers dummy "Randomize Killers' Positions"
execute unless score $dungeon do2.config.fr.teleportKillers matches 0.. run scoreboard players set $dungeon do2.config.fr.teleportKillers 1
scoreboard objectives add do2.config.fr.refillBerries dummy "Refill Berry Bushes"
execute unless score $dungeon do2.config.fr.refillBerries matches 0.. run scoreboard players set $dungeon do2.config.fr.refillBerries 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ execute if entity @s[gamemode=survival] run scoreboard players set @s do2.utilit
execute if entity @s[gamemode=creative] run scoreboard players set @s do2.utility.oldGamemode 2
execute if entity @s[gamemode=spectator] run scoreboard players set @s do2.utility.oldGamemode 3
execute if score $dungeon do2.config.forceGamemode matches 1 unless entity @s[gamemode=creative] unless entity @s[gamemode=spectator] unless entity @s[tag=do2.staff] run gamemode spectator
execute if score $dungeon do2.config.forceGamemode matches 1 unless entity @s[gamemode=creative] unless entity @s[gamemode=spectator] if entity @s[tag=do2.staff] run tellraw @s ["",{"text":"§f[§9B§r]: You have the tag [§bdo2.staff§r] and has stopped:\n - §5gamemode spectator "},{"selector":"@s","color":"dark_purple"},{"text":"\n§f[§9B§r]: Click "},{"text":"§b[here]","clickEvent":{"action":"run_command","value":"/gamemode spectator @s"}},{"text":" to run the command anyways."}]
execute if score $dungeon do2.config.forceGamemode matches 1 unless entity @s[gamemode=creative] unless entity @s[gamemode=spectator] if entity @s[tag=do2.staff] run tellraw @s ["",{"text":"§f[§9B§r]: You have the tag [§bdo2.staff§r], and this has stopped:\n - §5gamemode spectator "},{"selector":"@s","color":"dark_purple"},{"text":"\n§f[§9B§r]: Click "},{"text":"§b[here]","clickEvent":{"action":"run_command","value":"/gamemode spectator @s"}},{"text":" to run the command anyway."}]


# - RESET GENERAL -
Expand Down
4 changes: 2 additions & 2 deletions Brilliance Datapack/data/do2/functions/version.mcfunction
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@

# DATAPACK VERSION NUMBER: 0.12.22
# DATAPACK VERSION NUMBER: 0.12.23

tellraw @s ["",{"text":"The §o§n§aBrilliance Datapack§r's version is: [§b0.12.22§r] Check latest version "},{"text":"§o§b§nhere§r","clickEvent":{"action":"open_url","value":"https://github.com/trackedout/Brilliance/blob/main/Brilliance%20Datapack/data/do2/functions/version.mcfunction"}},{"text":"."}]
tellraw @s ["",{"text":"The §o§n§aBrilliance Datapack§r's version is: [§b0.12.23§r] Check latest version "},{"text":"§o§b§nhere§r","clickEvent":{"action":"open_url","value":"https://github.com/trackedout/Brilliance/blob/main/Brilliance%20Datapack/data/do2/functions/version.mcfunction"}},{"text":"."}]

0 comments on commit 15cca7c

Please sign in to comment.