杂项调整

data/item/functions/shop/buy/101_hint_real.mcfunction

@@ -4,7 +4,7 @@ scoreboard players set $random_max mem 8
 function lib:random
 
 # 显示提示
-execute if score $random mem matches 1 run tellraw @s "“你的手上如果有钓鱼竿的话，可以用它把物品给直接勾过来，哼唧。”"
+execute if score $random mem matches 1 run tellraw @s "“钓鱼竿可以直接把物品勾过来，鞘翅也能让你一飞冲天嗷。哼唧。”"
 execute if score $random mem matches 2 run tellraw @s "“哼唧，你可以用钓鱼竿把人勾下悬崖，或者用来钓……哼哼，‘鱼’？”"
 execute if score $random mem matches 3 run tellraw @s "“继续沿着你来时的那条密道走，指不定能找到我隐居的神秘兄弟……？”"
 execute if score $random mem matches 4 run tellraw @s "“从蛛网密布的密道尽头，沿灰色珊瑚指引，就能窥见创世的秘密。”"

data/item/functions/tick2.mcfunction

@@ -19,4 +19,7 @@ execute as @e[tag=item_blue] at @s run particle minecraft:dragon_breath ~ ~0.3 ~
 execute as @e[tag=item_purple] at @s run particle minecraft:wax_on ~ ~0.3 ~ 0 0 0 6 1 normal
 execute as @e[tag=item_purple] at @s run particle minecraft:wax_on ~ ~0.3 ~ 0.7 0.7 0.7 1 1 normal
 execute as @e[tag=item_purple] at @s run particle minecraft:wax_on ~ ~0.3 ~ 1.5 1.5 1.5 1 2 normal
-execute as @e[tag=item_purple] at @s run particle minecraft:wax_on ~ ~0.3 ~ 2.5 2.5 2.5 1 1 normal
+execute as @e[tag=item_purple] at @s run particle minecraft:wax_on ~ ~0.3 ~ 2.5 2.5 2.5 1 1 normal
+
+# 禁止捡起、在落地 10 秒后清理
+execute as @e[type=arrow,tag=!projectile_checked] run data merge entity @s {pickup:0,life:1000,Tags:["projectile_checked"]}

data/item/loot_tables/item/white.json

@@ -59,7 +59,7 @@
         "functions": [
             {
                 "function": "minecraft:set_nbt",
-                "tag": "{display:{Name:'{\"text\":\"弩\",\"italic\":false,\"color\":\"white\"}'},item_name:'{\"text\":\"弩, 箭 x4\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,bonus_give_items:[{id:\"minecraft:arrow\",Count:4,tag:{is_bonus:1b,bonus_return:1b,bonus_clear_nbt:1b}}]}"
+                "tag": "{display:{Name:'{\"text\":\"<多重射击> 弩\",\"italic\":false,\"color\":\"white\"}'},item_name:'{\"text\":\"<多重射击> 弩, 箭 x3\",\"color\":\"white\"}',is_bonus:1b,Enchantments:[{id:\"multishot\",lvl:1}],bonus_new:1b,bonus_return:1b,bonus_give_items:[{id:\"minecraft:arrow\",Count:3,tag:{is_bonus:1b,bonus_return:1b,bonus_clear_nbt:1b}}]}"
             }
         ]
     },
@@ -192,7 +192,7 @@
         "functions": [
             {
                 "function": "minecraft:set_nbt",
-                "tag": "{item_name:'{\"text\":\"钻石护腿\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b}"
+                "tag": "{item_name:'{\"text\":\"<荆棘 I> 钻石护腿\",\"color\":\"white\"}',Name:'{\"text\":\"<荆棘 I> 钻石护腿\",\"italic\":false,\"color\":\"white\"}',Enchantments:[{id:\"thorns\",lvl:1}],is_bonus:1b,bonus_new:1b,bonus_return:1b}"
             }
         ]
     },
@@ -214,7 +214,7 @@
         "functions": [
             {
                 "function": "minecraft:set_nbt",
-                "tag": "{item_name:'{\"text\":\"破损的全身金甲\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,bonus_give_items:[{id:\"minecraft:golden_helmet\",Count:1,tag:{is_bonus:1b,bonus_return:1b,bonus_clear_nbt:1b,Damage:72}},{id:\"minecraft:golden_chestplate\",Count:1,tag:{is_bonus:1b,bonus_return:1b,bonus_clear_nbt:1b,Damage:104}},{id:\"minecraft:golden_leggings\",Count:1,tag:{is_bonus:1b,bonus_return:1b,bonus_clear_nbt:1b,Damage:98}},{id:\"minecraft:golden_boots\",Count:1,tag:{is_bonus:1b,bonus_return:1b,bonus_clear_nbt:1b,Damage:85}}]}"
+                "tag": "{item_name:'{\"text\":\"破损的全身金甲\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,bonus_give_items:[{id:\"minecraft:golden_helmet\",Count:1,tag:{is_bonus:1b,bonus_return:1b,Damage:72}},{id:\"minecraft:golden_chestplate\",Count:1,tag:{is_bonus:1b,bonus_return:1b,Damage:104}},{id:\"minecraft:golden_leggings\",Count:1,tag:{is_bonus:1b,bonus_return:1b,Damage:98}},{id:\"minecraft:golden_boots\",Count:1,tag:{is_bonus:1b,bonus_return:1b,Damage:85}}]}"
             }
         ]
     },

data/ltw/advancements/blood/ass1.json

@@ -8,7 +8,7 @@
         "text": "爆破学家 · α "
       },
       "description": [
-        {"text": "【核爆刺客】在倒计时结束前获胜\n", "color":"gray"},
+        {"text": "【核爆刺客】在剩余至少 4 颗心时获胜\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
         {"text": "1 绿宝石","color":"white"}
       ],

data/ltw/advancements/blood/ass2.json

@@ -8,7 +8,7 @@
         "text": "爆破学家 · β "
       },
       "description": [
-        {"text": "【核爆刺客】在剩余至少 5 颗心时获胜\n", "color":"gray"},
+        {"text": "【核爆刺客】在倒计时结束前获胜\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
         {"text": "2 绿宝石","color":"white"}
       ],

data/minecraft/loot_tables/gameplay/fishing.json

@@ -11,8 +11,19 @@
           "name": "item:item/white"
         },
         {
-          "type": "minecraft:loot_table",
+          "type": "minecraft:item",
           "weight": 1,
+          "name": "minecraft:nether_star",
+          "functions": [
+              {
+                  "function": "minecraft:set_nbt",
+                  "tag": "{item_name:'{\"text\":\"1 积分\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,bonus_add_score:1}"
+              }
+          ]
+        },
+        {
+          "type": "minecraft:loot_table",
+          "weight": 2,
           "name": "item:item/green"
         },
         {

data/mini/functions/colormatch/game/start_new_round.mcfunction

@@ -4,14 +4,14 @@ function mini:colormatch/game/replace_wall
 execute positioned 1001 10 4000 run clone ~ ~ ~ ~20 ~ ~20 1050 16 4000 filtered #mini:colormatch_floor
 
 # 设置倒计时
-execute if entity @a[tag=color_match_fall] run scoreboard players add $color_match_time mem 6
-execute if score $color_match_time mem matches 12..15 run scoreboard players remove $color_match_time mem 1
-execute if score $color_match_time mem matches 16..19 run scoreboard players remove $color_match_time mem 2
+execute if entity @a[tag=color_match_fall] run scoreboard players add $color_match_time mem 5
+execute if score $color_match_time mem matches 11..14 run scoreboard players remove $color_match_time mem 1
+execute if score $color_match_time mem matches 15..19 run scoreboard players remove $color_match_time mem 2
 execute if score $color_match_time mem matches 20..29 run scoreboard players remove $color_match_time mem 3
 execute if score $color_match_time mem matches 30..39 run scoreboard players remove $color_match_time mem 4
 execute if score $color_match_time mem matches 40.. run scoreboard players remove $color_match_time mem 5
 scoreboard players operation $countdown_fast mem = $color_match_time mem
-execute if score $color_match_time mem matches ..11 if score #max_speed mem matches 0 run function mini:colormatch/game/reach_max_speed
+execute if score $color_match_time mem matches ..10 if score #max_speed mem matches 0 run function mini:colormatch/game/reach_max_speed
 
 # 重置分数
 scoreboard players set $color_match_type mem 0

data/mini/functions/main/game_end.mcfunction

@@ -35,8 +35,8 @@ execute if score $mini_type mem matches 3 run advancement grant @a[tag=mini_rank
 execute if score $mini_type mem matches 3 run advancement grant @a[tag=mini_rank1,scores={mini_heart=5..}] only ltw:vs/potato3
 execute if score $mini_type mem matches 4 if score #max_speed mem matches 1 run advancement grant @a[tag=mini_rank1,scores={mini_heart=2..}] only ltw:vs/colormatch2
 execute if score $mini_type mem matches 4 if score #max_speed mem matches 1 run advancement grant @a[tag=mini_rank1,tag=!colormatch_hurt] only ltw:vs/colormatch3
-execute if score $mini_type mem matches 201 if score $countdown mem matches 1.. run advancement grant @a[tag=mini_rank1] only ltw:blood/ass1
-execute if score $mini_type mem matches 201 run advancement grant @a[tag=mini_rank1,scores={health_disp=10..}] only ltw:blood/ass2
+execute if score $mini_type mem matches 201 run advancement grant @a[tag=mini_rank1,scores={health_disp=8..}] only ltw:blood/ass1
+execute if score $mini_type mem matches 201 if score $countdown mem matches 1.. run advancement grant @a[tag=mini_rank1] only ltw:blood/ass2
 execute if score $mini_type mem matches 201 run advancement grant @a[tag=mini_rank1,scores={health_disp=20..}] only ltw:blood/ass3
 
 # 清理怪东西

data/mini/functions/phantom/game/new_item.mcfunction

@@ -1,5 +1,5 @@
 function item:bonus_item/gameparty/auto/low
-execute as @e[tag=bonus_item,limit=1,sort=nearest] run data merge entity @s {NoGravity:0b,Motion:[0.0,0.7,0.0]}
+execute as @e[tag=bonus_item,limit=1,sort=nearest] run data merge entity @s {NoGravity:0b,Motion:[0.0,0.6,0.0]}
 particle minecraft:explosion_emitter ~ ~ ~ 0 0 0 0 1 normal
 kill @s
 tellraw @a ["\n",{"text": ">> ","color":"gold","bold": true},{"text": "红色幻翼已被击杀！\n","color":"gold"}]

data/mini/functions/phantom/player_death.mcfunction

@@ -1,6 +1,6 @@
 # 玩家死亡时由玩家自己触发
 spreadplayers 1030 6031 3 3 under 18 false @s[team=playing]
-tellraw @s ["",{"text": ">> ","color":"red","bold": true},{"text": "死亡惩罚: 失明 10 秒","color":"red"}]
-effect give @s blindness 10 0
-effect give @s resistance 3 4 true
+tellraw @s ["",{"text": ">> ","color":"red","bold": true},{"text": "死亡惩罚: 失明 6 秒","color":"red"}]
+effect give @s blindness 6 0
+effect give @s resistance 2 4 true
 execute as @a at @s run function lib:sounds/error

data/mini/functions/phantom/tick1.mcfunction

@@ -1,7 +1,7 @@
-# 调整物品：仅在纵向速度 < -0.025 且 y > 21 时，才将 NoGravity 设置为 false
+# 调整物品：仅在纵向速度 < -0.03 且 y > 21 时，才将 NoGravity 设置为 false
 execute as @e[tag=bonus_item] store result score @s temp run data get entity @s Motion[1] 1000
-execute as @e[tag=bonus_item] if entity @s[x=1000,y=21,z=6000,dx=100,dy=100,dz=100,scores={temp=-25..}] run data merge entity @s {NoGravity:0b}
-execute as @e[tag=bonus_item] unless entity @s[x=1000,y=21,z=6000,dx=100,dy=100,dz=100,scores={temp=-25..}] run data merge entity @s {NoGravity:1b}
+execute as @e[tag=bonus_item] if entity @s[x=1000,y=21,z=6000,dx=100,dy=100,dz=100,scores={temp=-30..}] run data merge entity @s {NoGravity:0b}
+execute as @e[tag=bonus_item] unless entity @s[x=1000,y=21,z=6000,dx=100,dy=100,dz=100,scores={temp=-30..}] run data merge entity @s {NoGravity:1b}
 
 # 奖励幻翼特效
 execute as @e[tag=bonus_phantom] at @s run particle dust 1 0 0 2 ~ ~ ~ 0.2 0 0.2 0 1 normal

data/mini/functions/tntrun/tick20.mcfunction

@@ -2,4 +2,4 @@
 # 进度判断
 clone 1008 33 2008 1030 33 2030 1000 4 2000
 execute store result score #tnt mem run fill 1000 4 2000 1022 4 2022 air replace #mini:tntrun_floor
-execute if score #tnt mem matches 1..20 run advancement grant @a[tag=mini_running,scores={layer=4}] only ltw:parkour/tnt3
+execute if score #tnt mem matches 1..25 run advancement grant @a[tag=mini_running,scores={layer=4}] only ltw:parkour/tnt3