Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
Frustrated-Programmer committed Feb 17, 2025
2 parents c1957ce + 78ec40d commit ed48260
Show file tree
Hide file tree
Showing 68 changed files with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
execute if score $dungeon do2.config.bc.l2ShipTreasureLine matches 1 run tellraw @s ["",{"text":"\n§f§lShip's Treasure Line: "},{"text":"§n§aLevel 2's"},{"text":" §7§o(Default: Level 2's)"}]
execute if score $dungeon do2.config.bc.l2ShipTreasureLine matches 0 run tellraw @s ["",{"text":"\n§f§lShip's Treasure Line: "},{"text":"§n§cLevel 1's"},{"text":" §7§o(Default: Level 2's)"}]
tellraw @s ["",,{"text":"§f","clickEvent":{"action":"run_command","value":"/trigger do2.trigger.settings set 21"}},{"text":" §f","clickEvent":{"action":"run_command","value":"/trigger do2.trigger.settings set 22"}},{"text":" §f","hoverEvent":{"action":"show_text","contents":"§aLevel 2's§r pirate ship originally dropped treasure §oonly§r while player was on §cLevel 1§r. Changing it to drop on §aLevel 2§r§f, means that treasure drops on the ship §oonly§r while the player is on §aLevel 2§r."}}]
tellraw @s ["",{"text":"§f","clickEvent":{"action":"run_command","value":"/trigger do2.trigger.settings set 21"}},{"text":" §f","clickEvent":{"action":"run_command","value":"/trigger do2.trigger.settings set 22"}},{"text":" §f","hoverEvent":{"action":"show_text","contents":"§aLevel 2's§r pirate ship originally dropped treasure §oonly§r while player was on §cLevel 1§r. Changing it to drop on §aLevel 2§r§f, means that treasure drops on the ship §oonly§r while the player is on §aLevel 2§r."}}]
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ execute if score @s do2.trigger.about matches 184..189 run function do2:scoreboa
execute if score @s do2.trigger.about matches 190 run function do2:scoreboard/config/receive_logs/on_click/dropper_room_0
execute if score @s do2.trigger.about matches 191 run function do2:scoreboard/config/receive_logs/on_click/dropper_room_1
execute if score @s do2.trigger.about matches 192 run function do2:scoreboard/config/receive_logs/on_click/dropper_room_2
execute if score @s do2.trigger.about matches 193..189 run function do2:scoreboard/config/receive_logs/documentation
execute if score @s do2.trigger.about matches 193..199 run function do2:scoreboard/config/receive_logs/documentation

# Player Actions
execute if score @s do2.trigger.about matches 200 run function do2:scoreboard/config/receive_logs/on_click/dropper_room_0
Expand Down
Binary file modified Brilliance Resourcepack/assets/do2/textures/font/do_cards.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Brilliance Resourcepack/assets/do2/textures/gui/gui_water.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Brilliance Resourcepack/assets/do2/textures/item/egg/hotguy.png

0 comments on commit ed48260

Please sign in to comment.