-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/main'
# Conflicts: # Brilliance Datapack/data/do2/functions/version.mcfunction
- Loading branch information
Showing
782 changed files
with
4,583 additions
and
235 deletions.
There are no files selected for viewing
34 changes: 34 additions & 0 deletions
34
Brilliance Datapack/data/do2/advancements/utility/survive_death_gauntlet.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| { | ||
| "criteria": { | ||
| "reach_top_tnt_depth_charge": { | ||
| "trigger": "minecraft:location", | ||
| "conditions": { | ||
| "player": { | ||
| "team": "do2.players", | ||
| "location": { | ||
| "position": { | ||
| "x": { | ||
| "min": -621, | ||
| "max": -614 | ||
| }, | ||
| "y": { | ||
| "min": -49, | ||
| "max": -44 | ||
| }, | ||
| "z": { | ||
| "min": 1981, | ||
| "max": 1990 | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| }, | ||
|
|
||
| "rewards": { | ||
| "function": "do2:events/dungeon/on_death_gauntlet_survival" | ||
| }, | ||
| "parent": "do2:utility/root" | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
24 changes: 12 additions & 12 deletions
24
Brilliance Datapack/data/do2/functions/cards/play/avalanche.mcfunction
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,12 @@ | ||
| # - Start Log - | ||
| execute as @a[scores={do2.logs.cards=2..}] run tellraw @s ["",{"text":"§f[§9B§r]: Card Played: ("},{"text":"§aAvalanche","hoverEvent":{"action":"show_item","value":"{id:'minecraft:iron_nugget', Count:1, tag:{NameFormat:{color:\"#8932B8\",OriginalName:'{\"color\":\"#8932B8\",\"text\":\"✧ Avalanche ✧\"}',ModifiedName:'{\"color\":\"#8932B8\",\"text\":\"✧ Avalanche ✧\"}'},CustomModelData:139,CustomRoleplayData:1b,display:{Name:'{\"color\":\"#8932B8\",\"text\":\"✧ Avalanche ✧\"}'},tracked:0b}}"}},{"text":")"}] | ||
| # - End Log - | ||
|
|
||
| # Note a card has been played. | ||
| execute as @p[tag=do2.received_shulker] run scoreboard players add @s do2.run.cards.played.AVA 1 | ||
| execute as @p[tag=do2.received_shulker] run scoreboard players add @s do2.cards.played.AVA 1 | ||
| scoreboard players add $dungeon do2.run.cards.played.AVA 1 | ||
| scoreboard players add $dungeon do2.cards.played.AVA 1 | ||
| # Agronet Event Handling | ||
| scoreboard players set $dungeon do2.agronet.card_played 36 | ||
| execute as @p[tag=do2.received_shulker] run function do2:external/agronet/card_played | ||
| # - Start Log - | ||
| execute as @a[scores={do2.logs.cards=2..}] run tellraw @s ["",{"text":"§f[§9B§r]: Card Played: ("},{"text":"§aAvalanche","hoverEvent":{"action":"show_item","value":"{id:'minecraft:iron_nugget', Count:1, tag:{NameFormat:{color:\"#8932B8\",OriginalName:'{\"color\":\"#8932B8\",\"text\":\"✧ Avalanche ✧\"}',ModifiedName:'{\"color\":\"#8932B8\",\"text\":\"✧ Avalanche ✧\"}'},CustomModelData:139,CustomRoleplayData:1b,display:{Name:'{\"color\":\"#8932B8\",\"text\":\"✧ Avalanche ✧\"}'},tracked:0b}}"}},{"text":")"}] | ||
| # - End Log - | ||
|
|
||
| # Note a card has been played. | ||
| execute as @p[tag=do2.received_shulker] run scoreboard players add @s do2.run.cards.played.AVA 1 | ||
| execute as @p[tag=do2.received_shulker] run scoreboard players add @s do2.cards.played.AVA 1 | ||
| scoreboard players add $dungeon do2.run.cards.played.AVA 1 | ||
| scoreboard players add $dungeon do2.cards.played.AVA 1 | ||
| # Agronet Event Handling | ||
| scoreboard players set $dungeon do2.agronet.card_played 36 | ||
| execute as @p[tag=do2.received_shulker] run function do2:external/agronet/card_played |
24 changes: 12 additions & 12 deletions
24
Brilliance Datapack/data/do2/functions/cards/play/beast_master.mcfunction
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,12 @@ | ||
| # - Start Log - | ||
| execute as @a[scores={do2.logs.cards=2..}] run tellraw @s ["",{"text":"§f[§9B§r]: Card Played: ("},{"text":"§aBeast Master","hoverEvent":{"action":"show_item","value":"{id:'minecraft:iron_nugget', Count:1, tag:{NameFormat:{color:\"#8932B8\",OriginalName:'{\"color\":\"#8932B8\",\"text\":\"≡ Beast Master ≡\"}',ModifiedName:'{\"color\":\"#8932B8\",\"text\":\"≡ Beast Master ≡\"}'},CustomModelData:140,CustomRoleplayData:1b,display:{Name:'{\"color\":\"#8932B8\",\"text\":\"≡ Beast Master ≡\"}'},tracked:0b}}"}},{"text":")"}] | ||
| # - End Log - | ||
|
|
||
| # Note a card has been played. | ||
| execute as @p[tag=do2.received_shulker] run scoreboard players add @s do2.run.cards.played.BEM 1 | ||
| execute as @p[tag=do2.received_shulker] run scoreboard players add @s do2.cards.played.BEM 1 | ||
| scoreboard players add $dungeon do2.run.cards.played.BEM 1 | ||
| scoreboard players add $dungeon do2.cards.played.BEM 1 | ||
| # Agronet Event Handling | ||
| scoreboard players set $dungeon do2.agronet.card_played 37 | ||
| execute as @p[tag=do2.received_shulker] run function do2:external/agronet/card_played | ||
| # - Start Log - | ||
| execute as @a[scores={do2.logs.cards=2..}] run tellraw @s ["",{"text":"§f[§9B§r]: Card Played: ("},{"text":"§aBeast Master","hoverEvent":{"action":"show_item","value":"{id:'minecraft:iron_nugget', Count:1, tag:{NameFormat:{color:\"#8932B8\",OriginalName:'{\"color\":\"#8932B8\",\"text\":\"≡ Beast Master ≡\"}',ModifiedName:'{\"color\":\"#8932B8\",\"text\":\"≡ Beast Master ≡\"}'},CustomModelData:140,CustomRoleplayData:1b,display:{Name:'{\"color\":\"#8932B8\",\"text\":\"≡ Beast Master ≡\"}'},tracked:0b}}"}},{"text":")"}] | ||
| # - End Log - | ||
|
|
||
| # Note a card has been played. | ||
| execute as @p[tag=do2.received_shulker] run scoreboard players add @s do2.run.cards.played.BEM 1 | ||
| execute as @p[tag=do2.received_shulker] run scoreboard players add @s do2.cards.played.BEM 1 | ||
| scoreboard players add $dungeon do2.run.cards.played.BEM 1 | ||
| scoreboard players add $dungeon do2.cards.played.BEM 1 | ||
| # Agronet Event Handling | ||
| scoreboard players set $dungeon do2.agronet.card_played 37 | ||
| execute as @p[tag=do2.received_shulker] run function do2:external/agronet/card_played |
24 changes: 12 additions & 12 deletions
24
Brilliance Datapack/data/do2/functions/cards/play/boots_of_swiftness.mcfunction
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,12 @@ | ||
| # - Start Log - | ||
| execute as @a[scores={do2.logs.cards=2..}] run tellraw @s ["",{"text":"§f[§9B§r]: Card Played: ("},{"text":"§aBoots of Swiftness","hoverEvent":{"action":"show_item","value":"{id:'minecraft:iron_nugget', Count:1, tag:{NameFormat:{color:\"#8932b8\",OriginalName:'{\"color\":\"#8932B8\",\"text\":\"≡ Boots of Swiftness ≡\"}',ModifiedName:'{\"color\":\"#8932B8\",\"text\":\"≡ Boots of Swiftness ≡\"}'},CustomModelData:140,CustomRoleplayData:1b,display:{Name:'{\"color\":\"#8932B8\",\"text\":\"≡ Boots of Swiftness ≡\"}'},tracked:0b}}"}},{"text":")"}] | ||
| # - End Log - | ||
|
|
||
| # Note a card has been played. | ||
| execute as @p[tag=do2.received_shulker] run scoreboard players add @s do2.run.cards.played.BOS 1 | ||
| execute as @p[tag=do2.received_shulker] run scoreboard players add @s do2.cards.played.BOS 1 | ||
| scoreboard players add $dungeon do2.run.cards.played.BOS 1 | ||
| scoreboard players add $dungeon do2.cards.played.BOS 1 | ||
| # Agronet Event Handling | ||
| scoreboard players set $dungeon do2.agronet.card_played 38 | ||
| execute as @p[tag=do2.received_shulker] run function do2:external/agronet/card_played | ||
| # - Start Log - | ||
| execute as @a[scores={do2.logs.cards=2..}] run tellraw @s ["",{"text":"§f[§9B§r]: Card Played: ("},{"text":"§aBoots of Swiftness","hoverEvent":{"action":"show_item","value":"{id:'minecraft:iron_nugget', Count:1, tag:{NameFormat:{color:\"#8932b8\",OriginalName:'{\"color\":\"#8932B8\",\"text\":\"≡ Boots of Swiftness ≡\"}',ModifiedName:'{\"color\":\"#8932B8\",\"text\":\"≡ Boots of Swiftness ≡\"}'},CustomModelData:140,CustomRoleplayData:1b,display:{Name:'{\"color\":\"#8932B8\",\"text\":\"≡ Boots of Swiftness ≡\"}'},tracked:0b}}"}},{"text":")"}] | ||
| # - End Log - | ||
|
|
||
| # Note a card has been played. | ||
| execute as @p[tag=do2.received_shulker] run scoreboard players add @s do2.run.cards.played.BOS 1 | ||
| execute as @p[tag=do2.received_shulker] run scoreboard players add @s do2.cards.played.BOS 1 | ||
| scoreboard players add $dungeon do2.run.cards.played.BOS 1 | ||
| scoreboard players add $dungeon do2.cards.played.BOS 1 | ||
| # Agronet Event Handling | ||
| scoreboard players set $dungeon do2.agronet.card_played 38 | ||
| execute as @p[tag=do2.received_shulker] run function do2:external/agronet/card_played |
24 changes: 12 additions & 12 deletions
24
Brilliance Datapack/data/do2/functions/cards/play/cash_cow.mcfunction
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,12 @@ | ||
| # - Start Log - | ||
| execute as @a[scores={do2.logs.cards=2..}] run tellraw @s ["",{"text":"§f[§9B§r]: Card Played: ("},{"text":"§aCash Cow","hoverEvent":{"action":"show_item","value":"{id:'minecraft:iron_nugget', Count:1, tag:{NameFormat:{color:\"#8932B8\",OriginalName:'{\"color\":\"#8932B8\",\"text\":\"✧ Cash Cow ✧\"}',ModifiedName:'{\"color\":\"#8932B8\",\"text\":\"✧ Cash Cow ✧\"}'},CustomModelData:136,CustomRoleplayData:1b,display:{Name:'{\"color\":\"#8932B8\",\"text\":\"✧ Cash Cow ✧\"}'},tracked:0b}}"}},{"text":")"}] | ||
| # - End Log - | ||
|
|
||
| # Note a card has been played. | ||
| execute as @p[tag=do2.received_shulker] run scoreboard players add @s do2.run.cards.played.GLM 1 | ||
| execute as @p[tag=do2.received_shulker] run scoreboard players add @s do2.cards.played.GLM 1 | ||
| scoreboard players add $dungeon do2.run.cards.played.GLM 1 | ||
| scoreboard players add $dungeon do2.cards.played.GLM 1 | ||
| # Agronet Event Handling | ||
| scoreboard players set $dungeon do2.agronet.card_played 40 | ||
| execute as @p[tag=do2.received_shulker] run function do2:external/agronet/card_played | ||
| # - Start Log - | ||
| execute as @a[scores={do2.logs.cards=2..}] run tellraw @s ["",{"text":"§f[§9B§r]: Card Played: ("},{"text":"§aCash Cow","hoverEvent":{"action":"show_item","value":"{id:'minecraft:iron_nugget', Count:1, tag:{NameFormat:{color:\"#8932B8\",OriginalName:'{\"color\":\"#8932B8\",\"text\":\"✧ Cash Cow ✧\"}',ModifiedName:'{\"color\":\"#8932B8\",\"text\":\"✧ Cash Cow ✧\"}'},CustomModelData:136,CustomRoleplayData:1b,display:{Name:'{\"color\":\"#8932B8\",\"text\":\"✧ Cash Cow ✧\"}'},tracked:0b}}"}},{"text":")"}] | ||
| # - End Log - | ||
|
|
||
| # Note a card has been played. | ||
| execute as @p[tag=do2.received_shulker] run scoreboard players add @s do2.run.cards.played.GLM 1 | ||
| execute as @p[tag=do2.received_shulker] run scoreboard players add @s do2.cards.played.GLM 1 | ||
| scoreboard players add $dungeon do2.run.cards.played.GLM 1 | ||
| scoreboard players add $dungeon do2.cards.played.GLM 1 | ||
| # Agronet Event Handling | ||
| scoreboard players set $dungeon do2.agronet.card_played 40 | ||
| execute as @p[tag=do2.received_shulker] run function do2:external/agronet/card_played |
24 changes: 12 additions & 12 deletions
24
Brilliance Datapack/data/do2/functions/cards/play/glorious_moment.mcfunction
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,12 @@ | ||
| # - Start Log - | ||
| execute as @a[scores={do2.logs.cards=2..}] run tellraw @s ["",{"text":"§f[§9B§r]: Card Played: ("},{"text":"§aGlorious Moment","hoverEvent":{"action":"show_item","value":"{id:'minecraft:iron_nugget', Count:1, tag:{NameFormat:{color:\"#8932b8\",OriginalName:'{\"color\":\"#8932B8\",\"text\":\"≡ Glorious Moment ≡\"}',ModifiedName:'{\"color\":\"#8932B8\",\"text\":\"≡ Glorious Moment ≡\"}'},CustomModelData:137,CustomRoleplayData:1b,display:{Name:'{\"color\":\"#8932B8\",\"text\":\"≡ Glorious Moment ≡\"}'},tracked:0b}}"}},{"text":")"}] | ||
| # - End Log - | ||
|
|
||
| # Note a card has been played. | ||
| execute as @p[tag=do2.received_shulker] run scoreboard players add @s do2.run.cards.played.BOS 1 | ||
| execute as @p[tag=do2.received_shulker] run scoreboard players add @s do2.cards.played.BOS 1 | ||
| scoreboard players add $dungeon do2.run.cards.played.BOS 1 | ||
| scoreboard players add $dungeon do2.cards.played.BOS 1 | ||
| # Agronet Event Handling | ||
| scoreboard players set $dungeon do2.agronet.card_played 38 | ||
| execute as @p[tag=do2.received_shulker] run function do2:external/agronet/card_played | ||
| # - Start Log - | ||
| execute as @a[scores={do2.logs.cards=2..}] run tellraw @s ["",{"text":"§f[§9B§r]: Card Played: ("},{"text":"§aGlorious Moment","hoverEvent":{"action":"show_item","value":"{id:'minecraft:iron_nugget', Count:1, tag:{NameFormat:{color:\"#8932b8\",OriginalName:'{\"color\":\"#8932B8\",\"text\":\"≡ Glorious Moment ≡\"}',ModifiedName:'{\"color\":\"#8932B8\",\"text\":\"≡ Glorious Moment ≡\"}'},CustomModelData:137,CustomRoleplayData:1b,display:{Name:'{\"color\":\"#8932B8\",\"text\":\"≡ Glorious Moment ≡\"}'},tracked:0b}}"}},{"text":")"}] | ||
| # - End Log - | ||
|
|
||
| # Note a card has been played. | ||
| execute as @p[tag=do2.received_shulker] run scoreboard players add @s do2.run.cards.played.BOS 1 | ||
| execute as @p[tag=do2.received_shulker] run scoreboard players add @s do2.cards.played.BOS 1 | ||
| scoreboard players add $dungeon do2.run.cards.played.BOS 1 | ||
| scoreboard players add $dungeon do2.cards.played.BOS 1 | ||
| # Agronet Event Handling | ||
| scoreboard players set $dungeon do2.agronet.card_played 38 | ||
| execute as @p[tag=do2.received_shulker] run function do2:external/agronet/card_played |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.