LTCatt 5 лет назад
Родитель
Сommit
25e5aafc9b

+ 1 - 0
data/lib/functions/sounds/music/tick20.mcfunction

@@ -1,5 +1,6 @@
 
 scoreboard players remove @a music_time 1
+stopsound @a[scores={music_time=..0}] music
 
 # lobby (循环)
 execute if score $music_id mem matches 1 run playsound minecraft:music_disc.stal music @a[scores={music_time=..0}] 0 1000000 0 1000000

+ 1 - 1
data/ltw/advancements/story/score1.json

@@ -5,7 +5,7 @@
         "item": "minecraft:paper"
       },
       "title": {
-        "text": "分数猎手      "
+        "text": "两位数的突破  "
       },
       "description": [
         {"text": "在单局游戏中达到 10 分\n", "color":"gray"},

+ 1 - 1
data/ltw/advancements/story/score2.json

@@ -5,7 +5,7 @@
         "item": "minecraft:map"
       },
       "title": {
-        "text": "双六          "
+        "text": "分数猎手      "
       },
       "description": [
         {"text": "在单局游戏中达到 25 分\n", "color":"gray"},

+ 1 - 1
data/ltw/advancements/vs/potato3.json

@@ -5,7 +5,7 @@
         "item": "minecraft:enchanted_golden_apple"
       },
       "title": {
-        "text": "苹果炸弹      "
+        "text": "君临天下      "
       },
       "description": [
         {"text": "在炸弹狂魔中获胜, 且剩余 5 心或更多的生命值\n", "color":"gray"},

+ 0 - 1
data/ltw/functions/main/player_enter.mcfunction

@@ -27,6 +27,5 @@ function lib:bossbar/show
 # FIXME: 旁观者在一轮开始时会被切换为冒险模式又切回去,这会造成游戏模式变更提示,鬼知道为啥
 # FIXME: <! 重要> [010] 如果有人没领取奖励,可以一直站在上面,在奖励领取阶段结束时再拿到一次
 # FIXME: 准备倒计时与 Tooltip 降低不一致
-# FIXME: 修复 钻石风暴 spreadplayers 无效
 # FIXME: [HIM] 死亡复活后可能会捡到已经在地上待了很久的 “老物品”
 # FIXME: [HIM] <! 重要> 锁定格子的物品会被带进生存小游戏

+ 1 - 0
data/ltw/functions/state/0/state_enter.mcfunction

@@ -1,5 +1,6 @@
 # 加载地图
 forceload add -32 -17 31 -80
+kill @e[type=item]
 
 # 要求系统进入状态 0(等待大厅)
 scoreboard players set $state mem 0

+ 4 - 4
data/mini/functions/diamond/game/respawn1.mcfunction

@@ -4,12 +4,12 @@ effect clear @s
 effect give @s saturation 1000000 0 true
 effect give @s night_vision 1000000 0 true
 effect give @s haste 1000000 1 true
-effect give @s levitation 6 253
-effect give @s weakness 7 10 true
-effect give @s resistance 7 10 true
+effect give @s slow_falling 4
+effect give @s weakness 5 10 true
+effect give @s resistance 5 10 true
 gamerule naturalRegeneration false
 
 # 传送玩家
-spreadplayers 1016 5016 6 8 under 255 false @s[team=playing,tag=!rejoining]
+tp @s 1016 280 5016
 tag @s add respawning
 schedule function mini:diamond/game/respawn2 1t append

+ 0 - 1
data/mini/functions/diamond/game/respawn2.mcfunction

@@ -1,4 +1,3 @@
-tp @a[tag=respawning] ~ 265 ~
 execute as @e[type=item,tag=death_drop] run function item:disable_throw
 tag @e[type=item,tag=death_drop] remove death_drop
 tag @a remove respawning

+ 2 - 1
data/mini/functions/diamond/game_init3.mcfunction

@@ -17,4 +17,5 @@ execute if score $random mem matches 2 run setblock 1027 254 5029 redstone_block
 execute if score $random mem matches 3 run setblock 1027 254 5028 redstone_block
 execute if score $random mem matches 4 run setblock 1027 254 5027 redstone_block
 
-schedule function mini:diamond/game_init4 1t
+# 清理区域
+fill 1025 255 5031 1029 251 5025 air

+ 0 - 3
data/mini/functions/diamond/game_init4.mcfunction

@@ -1,3 +0,0 @@
-
-# 清理区域
-fill 1025 255 5031 1029 251 5025 air