LTCatt 5 lat temu
rodzic
commit
9395289aea

+ 2 - 2
data/item/functions/bonus_item/add_score.mcfunction

@@ -28,5 +28,5 @@ execute if score #bonus_add_score mem matches 300 run tellraw @a ["",{"text": ">
 
 # 给予进度
 execute if entity @s[scores={total_score=10..}] run advancement grant @s only ltw:story/score1
-execute if entity @s[scores={total_score=25..}] run advancement grant @s only ltw:story/score2
-execute if entity @s[scores={total_score=40..}] run advancement grant @s only ltw:story/score3
+execute if entity @s[scores={total_score=18..}] run advancement grant @s only ltw:story/score2
+execute if entity @s[scores={total_score=26..}] run advancement grant @s only ltw:story/score3

+ 2 - 2
data/item/loot_tables/gameparty/score/blue.json

@@ -32,7 +32,7 @@
 },
 {
     "type": "minecraft:item",
-    "weight": 3,
+    "weight": 2,
     "name": "minecraft:ender_eye",
     "functions": [
         {
@@ -43,7 +43,7 @@
 },
 {
     "type": "minecraft:item",
-    "weight": 3,
+    "weight": 4,
     "name": "minecraft:emerald",
     "functions": [
         {

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

@@ -8,7 +8,7 @@
         "text": "分数猎手      "
       },
       "description": [
-        {"text": "在单局游戏中达到 25 分\n", "color":"gray"},
+        {"text": "在单局游戏中达到 18 分\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
         {"text": "2 绿宝石","color":"white"}
       ],

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

@@ -8,7 +8,7 @@
         "text": "分数满屋      "
       },
       "description": [
-        {"text": "在单局游戏中达到 40 分\n", "color":"gray"},
+        {"text": "在单局游戏中达到 26 分\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
         {"text": "3 绿宝石","color":"white"}
       ],

+ 19 - 3
data/ltw/functions/main/player_enter.mcfunction

@@ -28,8 +28,24 @@ bossbar set ltw:notice players @a
 function lib:bossbar/show
 
 # TODO: https://shimo.im/docs/8dQtWhYp8rJhRRWG
-# FIXME: <! 重要> 可以用钓鱼竿获得两个奖励
-# TODO: [LTCat/HIM] 土豆的两个炸弹同时爆炸把两个人炸死,让他们俩并列第三(按存活回合数记分)
+# FIXME: 可以用钓鱼竿获得两个奖励,在阶段 7 kill 钓鱼竿浮标即可
+# TODO: 土豆 按存活回合数记分(两个炸弹同时爆炸把两个人炸死可以并列)
 # FIXME: [LTCat] BGM 可能会双响
 # FIXME: 关掉 JourneyMap 的生物雷达
-# FIXME: <! 重要> 在未知情况下会跳过第二轮直接进入第三轮
+# FIXME: <! 重要> 在未知情况下会跳过第二轮直接进入第三轮
+# TODO: 逐个游戏检查中途退出重进是否造成 Bug
+# TODO: 逐个游戏检查是否在开始时清理了实体
+# TODO: [LTCat] 幻翼 在玩家第一次到达半血时显示回血的提示
+# TODO: [LTCat] 开始游戏倒计时音效似乎有 1/4s 误差?
+# TODO: [HIM] 重新处理主大厅的物品给予,在格子上显示固定的物品
+# TODO: 跑酷 为已获取的宝藏标识新的粒子,并显示提示
+# TODO: TNTRun 检查场地是否造成了太多的粒子效果,并在特定电脑造成了卡顿
+# TODO: [LTCat] 钻石 重新考虑是否显示玩家的钻石数——现在这样似乎降低了玩家在最终阶段的攻击欲望
+# FIXME: [HIM] 在游戏中也可以通过打开物品栏丢出奇怪的游戏内物品,得想个办法进行限制
+# TODO: [LTCat] 增加文本可读性
+# FIXME: [LTCat] 玩家层数记分板可能会闪烁
+# TODO: 幻翼 用钻石块代替地图上的梯子
+# TODO: [LTCat] 优化转场黑屏动画
+# TODO: 钻石 为钻石掉落物添加发光效果
+# TODO: [LTCat] 跑酷 修改地图:活塞的新路太过简单了
+# TODO: [LTCat] 跑酷 为密室增加一个奖励物品

+ 2 - 1
data/mini/functions/diamond/game/respawn1.mcfunction

@@ -10,4 +10,5 @@ effect give @s resistance 5 10 true
 gamerule naturalRegeneration false
 
 # 传送玩家
-tp @s 1016 280 5016
+tp @s[team=playing] 1016 280 5016
+tp @s[team=watching] 1016 255 5016

+ 30 - 30
data/mini/functions/parkour/game/test_treasure.mcfunction

@@ -1,44 +1,44 @@
 tag @a remove get_treasure
 
-execute positioned 1009.50 14.50 1007.50 as @a[tag=!treasure1,team=playing,distance=..2] unless entity @a[tag=treasure1] run tellraw @a ["",{"text": ">> ","color":"gold","bold": true},{"selector": "@s","color":"gold"} , " 第一个获得了 ",{"text": "营地屋顶","color":"gold"}," 的宝藏!"]
-execute positioned 1009.50 14.50 1007.50 as @a[tag=!treasure1,team=playing,distance=..2] run tag @s add get_treasure
-execute positioned 1009.50 14.50 1007.50 as @a[tag=!treasure1,team=playing,distance=..2] run tag @s add treasure1
+execute positioned 1009.50 14.50 1007.50 as @a[tag=!treasure1,team=playing,gamemode=!spectator,distance=..2] unless entity @a[tag=treasure1] run tellraw @a ["",{"text": ">> ","color":"gold","bold": true},{"selector": "@s","color":"gold"} , " 第一个获得了 ",{"text": "营地屋顶","color":"gold"}," 的宝藏!"]
+execute positioned 1009.50 14.50 1007.50 as @a[tag=!treasure1,team=playing,gamemode=!spectator,distance=..2] run tag @s add get_treasure
+execute positioned 1009.50 14.50 1007.50 as @a[tag=!treasure1,team=playing,gamemode=!spectator,distance=..2] run tag @s add treasure1
 
-execute positioned 1020.50 15.50 1016.50 as @a[tag=!treasure2,team=playing,distance=..2] unless entity @a[tag=treasure2] run tellraw @a ["",{"text": ">> ","color":"gold","bold": true},{"selector": "@s","color":"gold"} , " 第一个获得了 ",{"text": "沙漠骨骸","color":"gold"}," 的宝藏!"]
-execute positioned 1020.50 15.50 1016.50 as @a[tag=!treasure2,team=playing,distance=..2] run tag @s add get_treasure
-execute positioned 1020.50 15.50 1016.50 as @a[tag=!treasure2,team=playing,distance=..2] run tag @s add treasure2
+execute positioned 1020.50 15.50 1016.50 as @a[tag=!treasure2,team=playing,gamemode=!spectator,distance=..2] unless entity @a[tag=treasure2] run tellraw @a ["",{"text": ">> ","color":"gold","bold": true},{"selector": "@s","color":"gold"} , " 第一个获得了 ",{"text": "沙漠骨骸","color":"gold"}," 的宝藏!"]
+execute positioned 1020.50 15.50 1016.50 as @a[tag=!treasure2,team=playing,gamemode=!spectator,distance=..2] run tag @s add get_treasure
+execute positioned 1020.50 15.50 1016.50 as @a[tag=!treasure2,team=playing,gamemode=!spectator,distance=..2] run tag @s add treasure2
 
-execute positioned 1008.50 30.50 1020.50 as @a[tag=!treasure3,team=playing,distance=..2] unless entity @a[tag=treasure3] run tellraw @a ["",{"text": ">> ","color":"gold","bold": true},{"selector": "@s","color":"gold"} , " 第一个获得了 ",{"text": "神庙立柱","color":"gold"}," 的宝藏!"]
-execute positioned 1008.50 30.50 1020.50 as @a[tag=!treasure3,team=playing,distance=..2] run tag @s add get_treasure
-execute positioned 1008.50 30.50 1020.50 as @a[tag=!treasure3,team=playing,distance=..2] run tag @s add treasure3
+execute positioned 1008.50 30.50 1020.50 as @a[tag=!treasure3,team=playing,gamemode=!spectator,distance=..2] unless entity @a[tag=treasure3] run tellraw @a ["",{"text": ">> ","color":"gold","bold": true},{"selector": "@s","color":"gold"} , " 第一个获得了 ",{"text": "神庙立柱","color":"gold"}," 的宝藏!"]
+execute positioned 1008.50 30.50 1020.50 as @a[tag=!treasure3,team=playing,gamemode=!spectator,distance=..2] run tag @s add get_treasure
+execute positioned 1008.50 30.50 1020.50 as @a[tag=!treasure3,team=playing,gamemode=!spectator,distance=..2] run tag @s add treasure3
 
-execute positioned 1011.50 19.50 1058.50 as @a[tag=!treasure4,team=playing,distance=..2] unless entity @a[tag=treasure4] run tellraw @a ["",{"text": ">> ","color":"gold","bold": true},{"selector": "@s","color":"gold"} , " 第一个获得了 ",{"text": "下界之门","color":"gold"}," 的宝藏!"]
-execute positioned 1011.50 19.50 1058.50 as @a[tag=!treasure4,team=playing,distance=..2] run tag @s add get_treasure
-execute positioned 1011.50 19.50 1058.50 as @a[tag=!treasure4,team=playing,distance=..2] run tag @s add treasure4
+execute positioned 1011.50 19.50 1058.50 as @a[tag=!treasure4,team=playing,gamemode=!spectator,distance=..2] unless entity @a[tag=treasure4] run tellraw @a ["",{"text": ">> ","color":"gold","bold": true},{"selector": "@s","color":"gold"} , " 第一个获得了 ",{"text": "下界之门","color":"gold"}," 的宝藏!"]
+execute positioned 1011.50 19.50 1058.50 as @a[tag=!treasure4,team=playing,gamemode=!spectator,distance=..2] run tag @s add get_treasure
+execute positioned 1011.50 19.50 1058.50 as @a[tag=!treasure4,team=playing,gamemode=!spectator,distance=..2] run tag @s add treasure4
 
-execute positioned 1026.50 18.50 1047.00 as @a[tag=!treasure5,team=playing,distance=..2] unless entity @a[tag=treasure5] run tellraw @a ["",{"text": ">> ","color":"gold","bold": true},{"selector": "@s","color":"gold"} , " 第一个获得了 ",{"text": "落日森林","color":"gold"}," 的宝藏!"]
-execute positioned 1026.50 18.50 1047.00 as @a[tag=!treasure5,team=playing,distance=..2] run tag @s add get_treasure
-execute positioned 1026.50 18.50 1047.00 as @a[tag=!treasure5,team=playing,distance=..2] run tag @s add treasure5
+execute positioned 1026.50 18.50 1047.00 as @a[tag=!treasure5,team=playing,gamemode=!spectator,distance=..2] unless entity @a[tag=treasure5] run tellraw @a ["",{"text": ">> ","color":"gold","bold": true},{"selector": "@s","color":"gold"} , " 第一个获得了 ",{"text": "落日森林","color":"gold"}," 的宝藏!"]
+execute positioned 1026.50 18.50 1047.00 as @a[tag=!treasure5,team=playing,gamemode=!spectator,distance=..2] run tag @s add get_treasure
+execute positioned 1026.50 18.50 1047.00 as @a[tag=!treasure5,team=playing,gamemode=!spectator,distance=..2] run tag @s add treasure5
 
-execute positioned 1004.50 18.50 1043.50 as @a[tag=!treasure6,team=playing,distance=..2] unless entity @a[tag=treasure6] run tellraw @a ["",{"text": ">> ","color":"gold","bold": true},{"selector": "@s","color":"gold"} , " 第一个获得了 ",{"text": "地狱之顶","color":"gold"}," 的宝藏!"]
-execute positioned 1004.50 18.50 1043.50 as @a[tag=!treasure6,team=playing,distance=..2] run tag @s add get_treasure
-execute positioned 1004.50 18.50 1043.50 as @a[tag=!treasure6,team=playing,distance=..2] run tag @s add treasure6
+execute positioned 1004.50 18.50 1043.50 as @a[tag=!treasure6,team=playing,gamemode=!spectator,distance=..2] unless entity @a[tag=treasure6] run tellraw @a ["",{"text": ">> ","color":"gold","bold": true},{"selector": "@s","color":"gold"} , " 第一个获得了 ",{"text": "地狱之顶","color":"gold"}," 的宝藏!"]
+execute positioned 1004.50 18.50 1043.50 as @a[tag=!treasure6,team=playing,gamemode=!spectator,distance=..2] run tag @s add get_treasure
+execute positioned 1004.50 18.50 1043.50 as @a[tag=!treasure6,team=playing,gamemode=!spectator,distance=..2] run tag @s add treasure6
 
-execute positioned 1013.00 08.50 1041.00 as @a[tag=!treasure7,team=playing,distance=..2] unless entity @a[tag=treasure7] run tellraw @a ["",{"text": ">> ","color":"gold","bold": true},{"selector": "@s","color":"gold"} , " 第一个获得了 ",{"text": "节奏舞厅","color":"gold"}," 的宝藏!"]
-execute positioned 1013.00 08.50 1041.00 as @a[tag=!treasure7,team=playing,distance=..2] run tag @s add get_treasure
-execute positioned 1013.00 08.50 1041.00 as @a[tag=!treasure7,team=playing,distance=..2] run tag @s add treasure7
+execute positioned 1013.00 08.50 1041.00 as @a[tag=!treasure7,team=playing,gamemode=!spectator,distance=..2] unless entity @a[tag=treasure7] run tellraw @a ["",{"text": ">> ","color":"gold","bold": true},{"selector": "@s","color":"gold"} , " 第一个获得了 ",{"text": "节奏舞厅","color":"gold"}," 的宝藏!"]
+execute positioned 1013.00 08.50 1041.00 as @a[tag=!treasure7,team=playing,gamemode=!spectator,distance=..2] run tag @s add get_treasure
+execute positioned 1013.00 08.50 1041.00 as @a[tag=!treasure7,team=playing,gamemode=!spectator,distance=..2] run tag @s add treasure7
 
-execute positioned 1007.50 13.50 1025.50 as @a[tag=!treasure8,team=playing,distance=..2] unless entity @a[tag=treasure8] run tellraw @a ["",{"text": ">> ","color":"gold","bold": true},{"selector": "@s","color":"gold"} , " 第一个获得了 ",{"text": "末路营火","color":"gold"}," 的宝藏!"]
-execute positioned 1007.50 13.50 1025.50 as @a[tag=!treasure8,team=playing,distance=..2] run tag @s add get_treasure
-execute positioned 1007.50 13.50 1025.50 as @a[tag=!treasure8,team=playing,distance=..2] run tag @s add treasure8
+execute positioned 1007.50 13.50 1025.50 as @a[tag=!treasure8,team=playing,gamemode=!spectator,distance=..2] unless entity @a[tag=treasure8] run tellraw @a ["",{"text": ">> ","color":"gold","bold": true},{"selector": "@s","color":"gold"} , " 第一个获得了 ",{"text": "末路营火","color":"gold"}," 的宝藏!"]
+execute positioned 1007.50 13.50 1025.50 as @a[tag=!treasure8,team=playing,gamemode=!spectator,distance=..2] run tag @s add get_treasure
+execute positioned 1007.50 13.50 1025.50 as @a[tag=!treasure8,team=playing,gamemode=!spectator,distance=..2] run tag @s add treasure8
 
-execute positioned 1024.50 29.50 1038.50 as @a[tag=!treasure9,team=playing,distance=..2] unless entity @a[tag=treasure9] run tellraw @a ["",{"text": ">> ","color":"gold","bold": true},{"selector": "@s","color":"gold"} , " 第一个获得了 ",{"text": "活塞平台","color":"gold"}," 的宝藏!"]
-execute positioned 1024.50 29.50 1038.50 as @a[tag=!treasure9,team=playing,distance=..2] run tag @s add get_treasure
-execute positioned 1024.50 29.50 1038.50 as @a[tag=!treasure9,team=playing,distance=..2] run tag @s add treasure9
+execute positioned 1024.50 29.50 1038.50 as @a[tag=!treasure9,team=playing,gamemode=!spectator,distance=..2] unless entity @a[tag=treasure9] run tellraw @a ["",{"text": ">> ","color":"gold","bold": true},{"selector": "@s","color":"gold"} , " 第一个获得了 ",{"text": "活塞平台","color":"gold"}," 的宝藏!"]
+execute positioned 1024.50 29.50 1038.50 as @a[tag=!treasure9,team=playing,gamemode=!spectator,distance=..2] run tag @s add get_treasure
+execute positioned 1024.50 29.50 1038.50 as @a[tag=!treasure9,team=playing,gamemode=!spectator,distance=..2] run tag @s add treasure9
 
-execute positioned 1014.50 19.50 1024.50 as @a[tag=!treasure10,team=playing,distance=..2] unless entity @a[tag=treasure10] run tellraw @a ["",{"text": ">> ","color":"gold","bold": true},{"selector": "@s","color":"gold"} , " 第一个获得了 ",{"text": "沙漠密室","color":"gold"}," 的宝藏!"]
-execute positioned 1014.50 19.50 1024.50 as @a[tag=!treasure10,team=playing,distance=..2] run tag @s add get_treasure
-execute positioned 1014.50 19.50 1024.50 as @a[tag=!treasure10,team=playing,distance=..2] run tag @s add treasure10
+execute positioned 1014.50 19.50 1024.50 as @a[tag=!treasure10,team=playing,gamemode=!spectator,distance=..2] unless entity @a[tag=treasure10] run tellraw @a ["",{"text": ">> ","color":"gold","bold": true},{"selector": "@s","color":"gold"} , " 第一个获得了 ",{"text": "沙漠密室","color":"gold"}," 的宝藏!"]
+execute positioned 1014.50 19.50 1024.50 as @a[tag=!treasure10,team=playing,gamemode=!spectator,distance=..2] run tag @s add get_treasure
+execute positioned 1014.50 19.50 1024.50 as @a[tag=!treasure10,team=playing,gamemode=!spectator,distance=..2] run tag @s add treasure10
 
 scoreboard players add @a[tag=get_treasure] treasure 1
 tellraw @a[tag=get_treasure,scores={treasure=..9}] ["",{"text":">> ","color":"green","bold": true},"你已获得 ",{"score": {"objective": "treasure","name": "*"},"color":"green"},{"text": " 份 ","color":"green"},"宝藏!"]