diff --git a/data/.DS_Store b/data/.DS_Store index a6e194f..acd0a7f 100644 Binary files a/data/.DS_Store and b/data/.DS_Store differ diff --git a/data/manhunt/.DS_Store b/data/manhunt/.DS_Store index 8789bd9..4e95d4f 100644 Binary files a/data/manhunt/.DS_Store and b/data/manhunt/.DS_Store differ diff --git a/data/manhunt/functions/load/hw.mcfunction b/data/manhunt/functions/load/hw.mcfunction index ebd48d2..84d5e94 100755 --- a/data/manhunt/functions/load/hw.mcfunction +++ b/data/manhunt/functions/load/hw.mcfunction @@ -1 +1 @@ -tellraw @a ["\n",{"text":"Compass Tracker loaded!","bold":true,"color":"aqua"},"\n",{"text":"Stonley890/BogTheMudWing - Version 1.1.0","color":"gold"},"\n","\n",{"text":"Use /function manhunt:start to get started. Use /trigger manhunt-options to change options.","color":"gray"},"\n",{"text":"Put all runners on the runner team","italic":true,"color":"dark_gray"},"\n"] \ No newline at end of file +tellraw @a ["\n",{"text":"Compass Tracker loaded!","bold":true,"color":"aqua"},"\n",{"text":"Stonley890/BogTheMudWing - Version 1.1.1","color":"gold"},"\n","\n",{"text":"Use /function manhunt:start to get started. Use /trigger manhunt-options to change options.","color":"gray"},"\n",{"text":"Put all runners on the runner team","italic":true,"color":"dark_gray"},"\n"] \ No newline at end of file diff --git a/data/manhunt/functions/loop-core.mcfunction b/data/manhunt/functions/loop-core.mcfunction index d439469..5a824fb 100755 --- a/data/manhunt/functions/loop-core.mcfunction +++ b/data/manhunt/functions/loop-core.mcfunction @@ -15,18 +15,23 @@ execute as @a[team=Runner,scores={Deaths=1..,RemainingLives=0}] run tellraw @a [ execute as @a[team=Runner,scores={Deaths=1..,RemainingLives=0}] run gamemode spectator @s execute as @a[team=Runner,scores={Deaths=1..}] run scoreboard players set @s Deaths 0 +# Remove compasses from runners +clear @a[team=Runner] compass{display:{Name:'{"text":"Tracker Compass","color": "aqua","italic": false}'}} + # Options +## Change countdown execute as @a[scores={Countdown=0..}] store result score .countdown manhunt-options run scoreboard players get @s Countdown execute as @a[scores={Countdown=0..}] run scoreboard players enable @s Countdown execute as @a[scores={Countdown=0..}] run scoreboard players set @s Countdown -1 - +## Change lives execute as @a[scores={Lives=0..}] store result score .lives manhunt-options run scoreboard players get @s Lives execute as @a[scores={Lives=0..}] run scoreboard players enable @s Lives execute as @a[scores={Lives=0..}] run scoreboard players set @s Lives -1 - +## Menu tellraw execute as @a[scores={manhunt-options=1}] run tellraw @s [{"text":"\n"},{"text":"- Manhunt Settings -\n","color":"red","bold":true},{"text":"\n> Countdown Timer\n","color":"white","bold":false},{"text":"Set the number of ticks (1/20th of a second) to wait before hunters can begin.\n","color":"gray","bold":false},{"text":"[","color":"dark_gray"},{"score":{"name":".countdown","objective":"manhunt-options"},"color":"gray","underlined":true,"clickEvent":{"action":"suggest_command","value":"/trigger Countdown set "},"bold":false},{"text":" ticks","color":"gray"},{"text":"]\n","color":"dark_gray"},{"text":"\n> Runner Lives\n","color":"white","bold":false},{"text":"Set the number of lives runners are granted. Set to 0 for infinite.\n","color":"gray","bold":false},{"text":"[","color":"dark_gray"},{"score":{"name":".lives","objective":"manhunt-options"},"color":"gray","underlined":true,"clickEvent":{"action":"suggest_command","value":"/trigger Lives set "},"bold":false},{"text":" lives","color":"gray"},{"text":"]","color":"dark_gray"}] - +## Reset trigger execute as @a[scores={manhunt-options=1..}] run scoreboard players enable @s manhunt-options execute as @a[scores={manhunt-options=1..}] run scoreboard players set @s manhunt-options 0 +# Loop schedule function manhunt:loop-core 1 diff --git a/data/minecraft/.DS_Store b/data/minecraft/.DS_Store index d2204e9..856882a 100644 Binary files a/data/minecraft/.DS_Store and b/data/minecraft/.DS_Store differ diff --git a/pack.mcmeta b/pack.mcmeta index 6327278..6fcd888 100644 --- a/pack.mcmeta +++ b/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { - "pack_format": 7, - "description": "Track runners in any dimension" + "pack_format": 10, + "description": "v1.1.1 - BogTheMudWing/Stonley890" } } \ No newline at end of file