Pārlūkot izejas kodu

移除主大厅进度

LTCatt 5 gadi atpakaļ
vecāks
revīzija
1f1780baee

+ 0 - 33
data/ltw/advancements/parkour/explore1.json

@@ -1,33 +0,0 @@
-{
-    "parent": "ltw:parkour/root",
-    "display": {
-      "icon": {
-        "item": "minecraft:mossy_cobblestone"
-      },
-      "title": {
-        "text": "闲来无事      "
-      },
-      "description": [
-        {"text": "完成大厅中的旅途\n", "color":"gray"},
-        {"text": "奖励: ","color":"green"},
-        {"text": "1 绿宝石","color":"white"}
-      ],
-      "frame": "task",
-      "show_toast": true,
-      "announce_to_chat": true,
-      "hidden": false
-    },
-    "rewards": {
-      "function": "ltw:advancement/bonus_1"
-    },
-    "criteria": {
-      "finish":{
-          "trigger": "minecraft:impossible"
-      }
-    },
-    "requirements": [
-      [
-          "finish"
-      ]
-    ]
-  }

+ 0 - 33
data/ltw/advancements/parkour/explore2.json

@@ -1,33 +0,0 @@
-{
-    "parent": "ltw:parkour/explore1",
-    "display": {
-      "icon": {
-        "item": "minecraft:crimson_hyphae"
-      },
-      "title": {
-        "text": "挑战自我      "
-      },
-      "description": [
-        {"text": "完成大厅中的隐藏跑酷\n", "color":"gray"},
-        {"text": "奖励: ","color":"green"},
-        {"text": "2 绿宝石","color":"white"}
-      ],
-      "frame": "task",
-      "show_toast": true,
-      "announce_to_chat": true,
-      "hidden": false
-    },
-    "rewards": {
-      "function": "ltw:advancement/bonus_2"
-    },
-    "criteria": {
-      "finish":{
-          "trigger": "minecraft:impossible"
-      }
-    },
-    "requirements": [
-      [
-          "finish"
-      ]
-    ]
-  }

+ 0 - 33
data/ltw/advancements/parkour/explore3.json

@@ -1,33 +0,0 @@
-{
-    "parent": "ltw:parkour/explore2",
-    "display": {
-      "icon": {
-        "item": "minecraft:gilded_blackstone"
-      },
-      "title": {
-        "text": "空手而返      "
-      },
-      "description": [
-        {"text": "到达神秘老板的面前\n", "color":"gray"},
-        {"text": "奖励: ","color":"green"},
-        {"text": "3 绿宝石","color":"white"}
-      ],
-      "frame": "challenge",
-      "show_toast": true,
-      "announce_to_chat": true,
-      "hidden": false
-    },
-    "rewards": {
-      "function": "ltw:advancement/bonus_3"
-    },
-    "criteria": {
-      "finish":{
-          "trigger": "minecraft:impossible"
-      }
-    },
-    "requirements": [
-      [
-          "finish"
-      ]
-    ]
-  }

+ 2 - 1
data/ltw/functions/advancement/bonus_3.mcfunction

@@ -1,3 +1,4 @@
 scoreboard players add @s green 3
 scoreboard players add @s green_total 3
-execute if score $state mem matches 0 run function item:shop/refresh_green
+execute if score $state mem matches 0 run function item:shop/refresh_green
+# MC 自己会播放完成音效

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

@@ -27,6 +27,5 @@ function lib:bossbar/show
 # FIXME: 旁观者在一轮开始时会被切换为冒险模式又切回去,这会造成游戏模式变更提示,鬼知道为啥
 # FIXME: <! 重要> [010] 如果有人没领取奖励,可以一直站在上面,在奖励领取阶段结束时再拿到一次
 # FIXME: 准备倒计时与 Tooltip 降低不一致
-# FIXME: [LTCat] 初尝胜果 成就的判断似乎存在 Bug
 # FIXME: 修复 钻石风暴 spreadplayers 无效
 # FIXME: <! 重要> [HIM] 修复死亡判定可能失效

+ 4 - 4
data/ltw/functions/state/0/tick5.mcfunction

@@ -1,10 +1,10 @@
 # 让无状态玩家变为准备状态
 execute as @a[team=!debugging,team=!playing,team=!watching] run function ltw:state/0/state/join_watch
 
-# 给予进度
-execute as @a at @s if entity @s[x=-1,y=22,z=-29,dx=5,dy=3,dz=3] run advancement grant @s only ltw:parkour/explore1
-execute as @a at @s if entity @s[x=6,y=48,z=-32,dx=4,dy=3,dz=9] run advancement grant @s only ltw:parkour/explore2
-execute as @a at @s if entity @s[x=0,y=28,z=-46,distance=..4] run advancement grant @s only ltw:parkour/explore3
+## 给予主大厅进度
+#execute as @a at @s if entity @s[x=-1,y=22,z=-29,dx=5,dy=3,dz=3] run advancement grant @s only ltw:parkour/explore1
+#execute as @a at @s if entity @s[x=6,y=48,z=-32,dx=4,dy=3,dz=9] run advancement grant @s only ltw:parkour/explore2
+#execute as @a at @s if entity @s[x=0,y=28,z=-46,distance=..4] run advancement grant @s only ltw:parkour/explore3
 
 # 隐藏/显示老板的名片
 execute as @e[type=piglin,tag=shop_piglin_11,tag=lobby_entity] at @s if entity @a[distance=..5] run data modify entity @s CustomNameVisible set value true

+ 7 - 2
data/ltw/functions/state/3/state_enter.mcfunction

@@ -21,11 +21,16 @@ scoreboard players set $tempo_enable mem 0
 # 修改队伍颜色
 team modify playing color white
 
-# 小游戏编号
-# 优化下一次游戏的选择:生成一个 1~[最大游戏编号] 的 randomarray,每次从其中取下一个数。
+# 小游戏编号:生成一个 1~[最大游戏编号] 的 randomarray,每次从其中取下一个数。
 execute unless data storage ltw:mini types[0] run function ltw:state/3/newarray
 execute store result score $mini_type mem run data get storage ltw:mini types[0]
 data remove storage ltw:mini types[0]
 
+# 小游戏编号覆盖:如果为第 5 轮,则有一半概率选用钻石风暴
+scoreboard players set $random_max mem 1
+scoreboard players set $random_min mem 0
+function lib:random
+execute if score $round mem matches 5 if score $random mem matches 1 run scoreboard players set $mini_type mem 6
+
 # 初始化小游戏
 function mini:main/game_init

+ 1 - 1
data/mini/loot_tables/diamond.json

@@ -18,7 +18,7 @@
         "functions": [
             {
                 "function": "minecraft:set_nbt",
-                "tag": "{\"item_name\":\"{\\\"text\\\":\\\"得分 +2\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":1,\"display\":{\"Name\":'{\"text\":\"得分 +2\",\"italic\":false,\"color\":\"green\"}'}}"
+                "tag": "{\"item_name\":\"{\\\"text\\\":\\\"得分 +2\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":2,\"display\":{\"Name\":'{\"text\":\"得分 +2\",\"italic\":false,\"color\":\"green\"}'}}"
             }
         ]
     },