各种各样的更改

data/item/loot_tables/gameparty/item/green.json

@@ -44,17 +44,6 @@
         }
     ]
 },
-{
-    "type": "minecraft:item",
-    "weight": 3,
-    "name": "minecraft:splash_potion",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"跳跃提升 VII (0:04)\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"CustomPotionEffects\":[{\"Id\":8,\"Amplifier\":6,\"Duration\":80}],\"CustomPotionColor\":2292811,\"display\":{\"Name\":\"{\\\"text\\\":\\\"喷溅型跳跃药水\\\",\\\"italic\\\":0,\\\"color\\\":\\\"green\\\"}\"}}"
-        }
-    ]
-},
 {
     "type": "minecraft:item",
     "weight": 3,

data/item/loot_tables/gameparty/item/white.json

@@ -111,6 +111,17 @@
         }
     ]
 },
+{
+    "type": "minecraft:item",
+    "weight": 1,
+    "name": "minecraft:splash_potion",
+    "functions": [
+        {
+            "function": "minecraft:set_nbt",
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"隐身 (3:00)\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"Potion\":\"invisibility\",\"display\":{\"Name\":\"{\\\"text\\\":\\\"隐身药水\\\",\\\"italic\\\":0,\\\"color\\\":\\\"white\\\"}\"}}"
+        }
+    ]
+},
 {
     "type": "minecraft:item",
     "weight": 2,

data/ltw/advancements/vs/emerald1.json

@@ -0,0 +1,33 @@
+{
+    "parent": "ltw:vs/root",
+    "display": {
+      "icon": {
+        "item": "minecraft:villager_spawn_egg"
+      },
+      "title": {
+        "text": "商业新星        "
+      },
+      "description": [
+        {"text": "在贸易专家中获得 40 个绿宝石\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": {
+      "get_score":{
+          "trigger": "minecraft:impossible"
+      }
+    },
+    "requirements": [
+      [
+          "get_score"
+      ]
+    ]
+  }

data/ltw/advancements/vs/emerald2.json

@@ -0,0 +1,33 @@
+{
+    "parent": "ltw:vs/emerald2",
+    "display": {
+      "icon": {
+        "item": "minecraft:emerald"
+      },
+      "title": {
+        "text": "商业鬼才        "
+      },
+      "description": [
+        {"text": "在贸易专家中获得 70 个绿宝石\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": {
+      "get_score":{
+          "trigger": "minecraft:impossible"
+      }
+    },
+    "requirements": [
+      [
+          "get_score"
+      ]
+    ]
+  }

data/ltw/advancements/vs/emerald3.json

@@ -0,0 +1,33 @@
+{
+    "parent": "ltw:vs/emerald3",
+    "display": {
+      "icon": {
+        "item": "minecraft:emerald_block"
+      },
+      "title": {
+        "text": "商业奇迹        "
+      },
+      "description": [
+        {"text": "在贸易专家中获得 100 个绿宝石\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": {
+      "get_score":{
+          "trigger": "minecraft:impossible"
+      }
+    },
+    "requirements": [
+      [
+          "get_score"
+      ]
+    ]
+  }

data/ltw/functions/main/player_enter.mcfunction

@@ -30,7 +30,14 @@ function lib:bossbar/show
 
 # 无指定人员
 # FIXME: 关掉 JourneyMap 的生物雷达
-# TODO: {TNTRun} 有多人汇报存在严重卡顿，检查是否是场地的粒子造成，或者是游戏中的光照更新、实体、方块变化
+# TODO: {TNTRun} 哭泣的黑曜石的光照更新导致了严重的卡顿
+
+# LTCat
+# FIXME: 尝试偷 3 分时只会偷到 0 分
+# FIXME: 继续尝试修改过场动画
+
+# HIM
+# TODO: {贸易} 让每条出售交易都有 30% 的概率打 7 折
 
 # 010
 # TODO: 升级 1.16.5（不过得先等 OptiFine 更新）

data/mini/functions/trade/tick20.mcfunction

@@ -29,4 +29,9 @@ clear @a[team=playing] nether_star
 # 60s 提示
 execute if score $countdown mem matches 60 run tellraw @a ["",{"text": ">> ","color": "gold","bold": true},{"text":"游戏将在 ","color": "gold"}, "60 秒 ",{"text": "后结束","color": "gold"}]
 execute if score $countdown mem matches 60 run scoreboard players set $bossbar_color mem 2
-execute if score $countdown mem matches 60 run function lib:bossbar/show
+execute if score $countdown mem matches 60 run function lib:bossbar/show
+
+# 给予进度
+execute as @a[team=playing] if score @s emerald matches 40.. run advancement grant @s only ltw:vs/emerald1
+execute as @a[team=playing] if score @s emerald matches 70.. run advancement grant @s only ltw:vs/emerald2
+execute as @a[team=playing] if score @s emerald matches 100.. run advancement grant @s only ltw:vs/emerald3

data/mini/loot_tables/trade_b.json

@@ -141,11 +141,11 @@
                     "functions": [
                         {
                             "function": "set_nbt",
-                            "tag": "{buy:{id:\"yellow_stained_glass\",Count:1}}"
+                            "tag": "{buy:{id:\"yellow_stained_glass\",Count:2}}"
                         },
                         {
                             "function": "set_nbt",
-                            "tag":"{sell:{id:\"emerald\",Count:4}}"
+                            "tag":"{sell:{id:\"emerald\",Count:9}}"
                         },
                         {
                             "function": "set_nbt",
@@ -175,7 +175,7 @@
                         },
                         {
                             "function": "set_nbt",
-                            "tag":"{sell:{id:\"emerald\",Count:3}}"
+                            "tag":"{sell:{id:\"emerald\",Count:4}}"
                         },
                         {
                             "function": "set_nbt",

data/mini/loot_tables/trade_c.json

@@ -115,7 +115,7 @@
                         },
                         {
                             "function": "set_nbt",
-                            "tag":"{sell:{id:\"emerald\",Count:8}}"
+                            "tag":"{sell:{id:\"emerald\",Count:10}}"
                         },
                         {
                             "function": "set_nbt",

data/mini/loot_tables/trade_d.json

@@ -83,7 +83,7 @@
                                 },
                                 {
                                     "function": "set_nbt",
-                                    "tag":"{sell:{id:\"emerald\",Count:8}}"
+                                    "tag":"{sell:{id:\"emerald\",Count:9}}"
                                 },
                                 {
                                     "function": "set_nbt",
@@ -212,7 +212,7 @@
                         },
                         {
                             "function": "set_nbt",
-                            "tag":"{sell:{id:\"emerald\",Count:9}}"
+                            "tag":"{sell:{id:\"emerald\",Count:10}}"
                         },
                         {
                             "function": "set_nbt",

data/mini/loot_tables/trade_e.json

@@ -23,7 +23,7 @@
                                 },
                                 {
                                     "function": "set_nbt",
-                                    "tag":"{sell:{id:\"emerald\",Count:12}}"
+                                    "tag":"{sell:{id:\"emerald\",Count:14}}"
                                 },
                                 {
                                     "function": "set_nbt",
@@ -83,7 +83,7 @@
                                 },
                                 {
                                     "function": "set_nbt",
-                                    "tag":"{sell:{id:\"emerald\",Count:13}}"
+                                    "tag":"{sell:{id:\"emerald\",Count:14}}"
                                 },
                                 {
                                     "function": "set_nbt",
@@ -115,7 +115,7 @@
                         },
                         {
                             "function": "set_nbt",
-                            "tag":"{sell:{id:\"emerald\",Count:9}}"
+                            "tag":"{sell:{id:\"emerald\",Count:13}}"
                         },
                         {
                             "function": "set_nbt",
@@ -189,7 +189,7 @@
                         },
                         {
                             "function": "set_nbt",
-                            "tag":"{sell:{id:\"emerald\",Count:13}}"
+                            "tag":"{sell:{id:\"emerald\",Count:15}}"
                         },
                         {
                             "function": "set_nbt",
@@ -215,43 +215,6 @@
                             }
                         }
                     ]
-                },
-                {
-                    "type": "item",
-                    "name": "stone",
-                    "functions": [
-                        {
-                            "function": "set_nbt",
-                            "tag": "{buy:{id:\"white_wool\",Count:1}}"
-                        },
-                        {
-                            "function": "set_nbt",
-                            "tag":"{sell:{id:\"nether_star\",Count:1,tag:{display:{Name:'{\"text\":\"得分 +1\",\"color\":\"white\",\"italic\":false}'}}}}"
-                        },
-                        {
-                            "function": "set_nbt",
-                            "tag":"{maxUses:2}"
-                        }
-                    ],
-                    "conditions": [
-                        {
-                            "condition": "inverted",
-                            "term": {
-                                "condition": "minecraft:entity_properties",
-                                "entity": "this",
-                                "predicate": {
-                                    "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:white_wool\"},sell:{id:\"minecraft:nether_star\"}}]}}"
-                                }
-                            }
-                        },
-                        {
-                            "condition": "minecraft:entity_properties",
-                            "entity": "this",
-                            "predicate": {
-                                "nbt": "{Offers:{Recipes:[{sell:{id:\"minecraft:spider_spawn_egg\"}}]}}"
-                            }
-                        }
-                    ]
                 }
             ]
         }

data/mini/loot_tables/trade_s.json

@@ -19,7 +19,7 @@
                             "functions": [
                                 {
                                     "function": "set_nbt",
-                                    "tag": "{buy:{id:\"emerald\",Count:4}}"
+                                    "tag": "{buy:{id:\"emerald\",Count:3}}"
                                 },
                                 {
                                     "function": "set_nbt",
@@ -49,7 +49,7 @@
                             "functions": [
                                 {
                                     "function": "set_nbt",
-                                    "tag": "{buy:{id:\"emerald\",Count:5}}"
+                                    "tag": "{buy:{id:\"emerald\",Count:4}}"
                                 },
                                 {
                                     "function": "set_nbt",