From f7ae420559740fd2eae023b310ef71c147603256 Mon Sep 17 00:00:00 2001 From: Y_ALANG <92966060+yalwolf@users.noreply.github.com> Date: Sun, 7 Aug 2022 14:58:42 +0800 Subject: [PATCH] Add files via upload --- data/breed/advancements/bow/getbows.json | 29 +++++++++++++++++++ data/breed/advancements/bow/root.json | 3 -- data/breed/functions/end.mcfunction | 7 +++-- data/breed/functions/remove_runner.mcfunction | 1 + .../functions/rewards/givearrow.mcfunction | 3 +- .../functions/rm_advan_getbows.mcfunction | 1 + data/breed/functions/tick.mcfunction | 2 +- data/breed/loot_tables/breeda.json | 2 +- data/install/functions/install.mcfunction | 2 +- data/install/functions/introduce.mcfunction | 1 + data/install/functions/tab.mcfunction | 3 +- pack.mcmeta | 2 +- 12 files changed, 44 insertions(+), 12 deletions(-) create mode 100644 data/breed/advancements/bow/getbows.json create mode 100644 data/breed/functions/remove_runner.mcfunction create mode 100644 data/breed/functions/rm_advan_getbows.mcfunction diff --git a/data/breed/advancements/bow/getbows.json b/data/breed/advancements/bow/getbows.json new file mode 100644 index 0000000..94cea3f --- /dev/null +++ b/data/breed/advancements/bow/getbows.json @@ -0,0 +1,29 @@ +{ + "parent": "breed:bow/root", + "display": { + "icon": { + "item": "minecraft:bow" + }, + "title": "蓄势待发！", + "description": "获得一把弓", + "frame": "task", + "hidden": true, + "show_toast": false, + "announce_to_chat": false + }, + "criteria": { + "get_bow" : { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "minecraft:bow" + } + ] + } + } + }, + "rewards": { + "function": "breed:rewards/givearrow" + } +} \ No newline at end of file diff --git a/data/breed/advancements/bow/root.json b/data/breed/advancements/bow/root.json index aa79b54..8200643 100644 --- a/data/breed/advancements/bow/root.json +++ b/data/breed/advancements/bow/root.json @@ -22,8 +22,5 @@ ] } } - }, - "rewards": { - "function": "breed:rewards/givearrow" } } \ No newline at end of file diff --git a/data/breed/functions/end.mcfunction b/data/breed/functions/end.mcfunction index aa5452d..8d65fbd 100644 --- a/data/breed/functions/end.mcfunction +++ b/data/breed/functions/end.mcfunction @@ -1,15 +1,18 @@ gamerule doImmediateRespawn true gamemode spectator @a weather clear +clear @a minecraft:compass effect clear @a team empty hunter team empty runner -team remove runner +team empty bystander team remove hunter +team remove runner +team remove bystander tag @a remove hunter tag @a remove runner -clear @a +tag @a remove bystander tag @a remove join_player scoreboard objectives remove playerhp diff --git a/data/breed/functions/remove_runner.mcfunction b/data/breed/functions/remove_runner.mcfunction new file mode 100644 index 0000000..6aed84e --- /dev/null +++ b/data/breed/functions/remove_runner.mcfunction @@ -0,0 +1 @@ +gamemode spectator @s[team=runner] \ No newline at end of file diff --git a/data/breed/functions/rewards/givearrow.mcfunction b/data/breed/functions/rewards/givearrow.mcfunction index 583326d..1471f30 100644 --- a/data/breed/functions/rewards/givearrow.mcfunction +++ b/data/breed/functions/rewards/givearrow.mcfunction @@ -1 +1,2 @@ -give @s minecraft:arrow 1 \ No newline at end of file +give @s minecraft:arrow 1 +function breed:rm_advan_getbows \ No newline at end of file diff --git a/data/breed/functions/rm_advan_getbows.mcfunction b/data/breed/functions/rm_advan_getbows.mcfunction new file mode 100644 index 0000000..9c9a9d0 --- /dev/null +++ b/data/breed/functions/rm_advan_getbows.mcfunction @@ -0,0 +1 @@ +advancement revoke @s only breed:bow/getbows \ No newline at end of file diff --git a/data/breed/functions/tick.mcfunction b/data/breed/functions/tick.mcfunction index 30653e3..fadb0ee 100644 --- a/data/breed/functions/tick.mcfunction +++ b/data/breed/functions/tick.mcfunction @@ -1,4 +1,4 @@ -# execute as @a[team=runner,scores={playerhp=0..0}] run function breed:hunterwin +execute as @a[team=runner,scores={playerhp=0..0}] run function breed:remove_runner # execute as @a[team=hunter,scores={killrunner=1..}] run function breed:hunterwin execute if score @p[team=hunter] killrunner = @p[tag=join_player] runner_player run function breed:hunterwin # execute as @a[team=runner,scores={playerhp=0..0}] at @a[team=hunter,scores={killrunner=1..,runner_player=1..}] run function breed:hunterwin \ No newline at end of file diff --git a/data/breed/loot_tables/breeda.json b/data/breed/loot_tables/breeda.json index cb41a58..dbf2eeb 100644 --- a/data/breed/loot_tables/breeda.json +++ b/data/breed/loot_tables/breeda.json @@ -21,7 +21,7 @@ "functions": [ { "function": "minecraft:set_nbt", - "tag": "{Enchantments:[{id:\"minecraft:sharpness\",lvl:69},{id:\"minecraft:efficiency\",lvl:69},{id:\"minecraft:unbreaking\",lvl:69},{id:\"minecraft:fortune\",lvl:14}]}" + "tag": "{Enchantments:[{id:\"minecraft:sharpness\",lvl:69},{id:\"minecraft:efficiency\",lvl:69},{id:\"minecraft:unbreaking\",lvl:69},{id:\"minecraft:fortune\",lvl:25}]}" } ] }, diff --git a/data/install/functions/install.mcfunction b/data/install/functions/install.mcfunction index b9cfe03..99fd753 100644 --- a/data/install/functions/install.mcfunction +++ b/data/install/functions/install.mcfunction @@ -66,5 +66,5 @@ tellraw @a [{"text":"【选择队伍】","color":"red","bold":true,"italic":fals tellraw @a [{"text":"【开始游戏】","color":"red","bold":true,"italic":false,"underlined":false,"strikethrough":false,"obfuscated":false,"clickEvent":{"action":"run_command","value":"/function install:start_game"}}] tellraw @a [{"text":"【游戏设置】","color":"red","bold":true,"italic":false,"underlined":false,"strikethrough":false,"obfuscated":false,"clickEvent":{"action":"run_command","value":"/function install:setting_game"}}] tellraw @a [{"text":"【关于数据包】","color":"gold","bold":true,"italic":false,"underlined":false,"strikethrough":false,"obfuscated":false,"clickEvent":{"action":"run_command","value":"/function install:introduce"}}] -tellraw @a [{"text":"【更新公告】","color":"gold","bold":true,"italic":false,"underlined":false,"strikethrough":false,"obfuscated":false,"clickEvent":{"action":"run_command","value":"/function install:update_notice"}}] +tellraw @a [{"text":"【更新公告】","color":"gold","bold":true,"italic":false,"underlined":false,"strikethrough":false,"obfuscated":false,"clickEvent":{"action":"open_url","value":"https://website.dbhg.top/website/minecraft/datapack/Breeding_animal_Hunter_Game/"}}] tellraw @a [{"text":"-------------------------------------------"}] \ No newline at end of file diff --git a/data/install/functions/introduce.mcfunction b/data/install/functions/introduce.mcfunction index a0fbf85..35ec69a 100644 --- a/data/install/functions/introduce.mcfunction +++ b/data/install/functions/introduce.mcfunction @@ -4,4 +4,5 @@ tellraw @a [{"text":"本数据包魔改","color":"white","bold":true,"italic":fa tellraw @a [{"text":"原数据包传送门：","color":"yellow","bold":false,"italic":false,"underlined":false,"strikethrough":false,"obfuscated":false},{"text":"点击查看","color":"blue","bold":false,"italic":false,"underlined":false,"strikethrough":false,"obfuscated":false,"clickEvent":{"action":"open_url","value":"https://www.mcbbs.net/thread-1333878-1-1.html"}}] tellraw @a [{"text":"数据包版本：","color":"yellow","bold":false,"italic":false,"underlined":false,"strikethrough":false,"obfuscated":false},{"text":"特供版v1.0","color":"blue","bold":false,"italic":false,"underlined":false,"strikethrough":false,"obfuscated":false}] tellraw @a [{"text":"数据包出品：","color":"yellow","bold":false,"italic":false,"underlined":false,"strikethrough":false,"obfuscated":false},{"text":"蛋白后宫","color":"blue","bold":false,"italic":false,"underlined":false,"strikethrough":false,"obfuscated":false,"clickEvent":{"action":"open_url","value":"https://dbhg.top/"}}] +tellraw @a [{"text":"数据包官网","color":"gold","bold":true,"italic":false,"underlined":false,"strikethrough":false,"obfuscated":false,"clickEvent":{"action":"open_url","value":"https://website.dbhg.top/website/minecraft/datapack/Breeding_animal_Hunter_Game/"}}] tellraw @a [{"text":"-------------------------------------------"}] \ No newline at end of file diff --git a/data/install/functions/tab.mcfunction b/data/install/functions/tab.mcfunction index aaeccf8..19675ae 100644 --- a/data/install/functions/tab.mcfunction +++ b/data/install/functions/tab.mcfunction @@ -5,6 +5,5 @@ tellraw @a [{"text":""}] tellraw @a [{"text":"【选择队伍】","color":"red","bold":true,"italic":false,"underlined":false,"strikethrough":false,"obfuscated":false,"clickEvent":{"action":"run_command","value":"/function install:join_teams"}}] tellraw @a [{"text":"【开始游戏】","color":"red","bold":true,"italic":false,"underlined":false,"strikethrough":false,"obfuscated":false,"clickEvent":{"action":"run_command","value":"/function install:start_game"}}] tellraw @a [{"text":"【游戏设置】","color":"red","bold":true,"italic":false,"underlined":false,"strikethrough":false,"obfuscated":false,"clickEvent":{"action":"run_command","value":"/function install:setting_game"}}] -tellraw @a [{"text":"【关于数据包】","color":"gold","bold":true,"italic":false,"underlined":false,"strikethrough":false,"obfuscated":false,"clickEvent":{"action":"run_command","value":"/function install:introduce"}}] -tellraw @a [{"text":"【更新公告】","color":"gold","bold":true,"italic":false,"underlined":false,"strikethrough":false,"obfuscated":false,"clickEvent":{"action":"run_command","value":"/function install:update_notice"}}] +tellraw @a [{"text":"【更新公告】","color":"gold","bold":true,"italic":false,"underlined":false,"strikethrough":false,"obfuscated":false,"clickEvent":{"action":"open_url","value":"https://website.dbhg.top/website/minecraft/datapack/Breeding_animal_Hunter_Game/"}}] tellraw @a [{"text":"-------------------------------------------"}] \ No newline at end of file diff --git a/pack.mcmeta b/pack.mcmeta index 5f145b7..a5213aa 100644 --- a/pack.mcmeta +++ b/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { "pack_format": 6, - "description": "追猎游戏-特供版-V1.2" + "description": "追猎游戏-特供版-V1.2.2" } } \ No newline at end of file