Merge branch 'master' of github.com:LTCatt/LTW3

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

@@ -28,6 +28,17 @@
         }
     ]
 },
+{
+    "type": "minecraft:item",
+    "weight": 1,
+    "name": "minecraft:totem_of_undying",
+    "functions": [
+        {
+            "function": "minecraft:set_nbt",
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"不死图腾\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"display\":{\"Name\":\"{\\\"text\\\":\\\"不死图腾\\\",\\\"italic\\\":0,\\\"color\\\":\\\"green\\\"}\"}}"
+        }
+    ]
+},
 {
     "type": "minecraft:item",
     "weight": 1,

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

@@ -80,7 +80,7 @@
     "functions": [
         {
             "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"飘浮 (0:10)\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"CustomPotionEffects\":[{\"Id\":25,\"Amplifier\":0,\"Duration\":200}],\"CustomPotionColor\":11458519,\"display\":{\"Name\":\"{\\\"text\\\":\\\"喷溅型浮空药水\\\",\\\"italic\\\":false,\\\"color\\\":\\\"white\\\"}\"}}"
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"神龟 (0:20)\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"Potion\":\"turtle_master\",\"display\":{\"Name\":\"{\\\"text\\\":\\\"喷溅型神龟药水\\\",\\\"italic\\\":false,\\\"color\\\":\\\"white\\\"}\"}}"
         }
     ]
 },
@@ -91,7 +91,18 @@
     "functions": [
         {
             "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"失明 (0:20)\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"CustomPotionEffects\":[{\"Id\":15,\"Amplifier\":0,\"Duration\":400}],\"CustomPotionColor\":1644828,\"display\":{\"Name\":\"{\\\"text\\\":\\\"喷溅型致盲药水\\\",\\\"italic\\\":false,\\\"color\\\":\\\"white\\\"}\"}}"
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"飘浮 (0:10)\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"CustomPotionEffects\":[{\"Id\":25,\"Amplifier\":0,\"Duration\":200}],\"CustomPotionColor\":11458519,\"display\":{\"Name\":\"{\\\"text\\\":\\\"喷溅型浮空药水\\\",\\\"italic\\\":false,\\\"color\\\":\\\"white\\\"}\"}}"
+        }
+    ]
+},
+{
+    "type": "minecraft:item",
+    "weight": 1,
+    "name": "minecraft:lingering_potion",
+    "functions": [
+        {
+            "function": "minecraft:set_nbt",
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"失明 (滞留, 0:15)\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"CustomPotionEffects\":[{\"Id\":15,\"Amplifier\":0,\"Duration\":300}],\"CustomPotionColor\":1644828,\"display\":{\"Name\":\"{\\\"text\\\":\\\"滞留型致盲药水\\\",\\\"italic\\\":false,\\\"color\\\":\\\"white\\\"}\"}}"
         }
     ]
 },

data/item/tags/items/bonus.json

@@ -17,6 +17,7 @@
         "minecraft:fishing_rod",
         "minecraft:shield",
         "minecraft:splash_potion",
+        "minecraft:lingering_potion",
         "minecraft:crossbow",
         "minecraft:bow",
         "minecraft:stone_pickaxe",

data/ltw/advancements/vs/diamond0.json

@@ -0,0 +1,50 @@
+{
+    "parent": "ltw:vs/root",
+    "display": {
+      "icon": {
+        "item": "minecraft:cooked_salmon"
+      },
+      "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": {
+        "f1": {
+          "trigger": "minecraft:inventory_changed",
+          "conditions": {
+            "items": [
+              {
+                "item": "minecraft:cooked_salmon"
+              }
+            ]
+          }
+        },
+        "f2": {
+          "trigger": "minecraft:inventory_changed",
+          "conditions": {
+            "items": [
+              {
+                "item": "minecraft:cooked_cod"
+              }
+            ]
+          }
+        }
+    },
+    "requirements": [
+        [
+          "f1", "f2"
+        ]
+    ]
+}

data/ltw/advancements/vs/diamond1.json

@@ -1,5 +1,5 @@
 {
-    "parent": "ltw:vs/root",
+    "parent": "ltw:vs/diamond0",
     "display": {
       "icon": {
         "item": "minecraft:obsidian"

data/ltw/functions/main/player_enter.mcfunction

@@ -28,19 +28,18 @@ bossbar set ltw:notice players @a
 function lib:bossbar/show
 
 
-# FIXME: 可以用钓鱼竿获得两个奖励，在阶段 7 kill 钓鱼竿浮标即可*
 # TODO: {土豆} 按存活回合数记分（两个炸弹同时爆炸把两个人炸死可以并列）
 # FIXME: 关掉 JourneyMap 的生物雷达
 # TODO: 逐个游戏检查中途退出重进是否造成 Bug
 # TODO: 逐个游戏检查是否在开始时清理了实体
 # TODO: {跑酷} 为已获取的宝藏标识新的粒子，并显示提示
-# TODO: {钻石} 为钻石掉落物添加发光效果（包括玩家主动投掷出的钻石）*
 # TODO: {TNTRun} 有多人汇报存在严重卡顿，检查是否是场地的粒子造成，或者是游戏中的光照更新、实体、方块变化
 
 # FIXME: [LTCat] BGM 可能会双响
 # TODO: [LTCat] {幻翼} 在玩家第一次到达半血时显示回血的提示
 # TODO: [LTCat] 增加文本可读性
 # TODO: [HIM] 重新处理主大厅的物品给予，在格子上显示固定的物品
+# TODO: [HIM] 不死图腾的处理
 # TODO: [010] {土豆} 将橙子已经制作好的概念地图实装
 # TODO: [HIM/010] {色彩} 将橙子已经制作好的概念地图实装
 # TODO: [010] {幻翼} 制作幻翼的成品地图

data/ltw/functions/state/6/generate_bonus.mcfunction

@@ -5,7 +5,7 @@ kill @e[type=item]
 kill @e[type=arrow]
 kill @e[type=trident]
 
-# 生成 玩家数+2 个奖励
+# 生成 玩家数+1 个奖励
 execute store result score #bonus_count mem if entity @a[team=playing]
 scoreboard players add #bonus_count mem 1
 execute if score #bonus_count mem matches 1.. positioned 17.5 10.2 1967.5 run function item:bonus_item/gameparty/random

data/minecraft/loot_tables/gameplay/fishing.json

@@ -13,13 +13,13 @@
         {
           "type": "minecraft:loot_table",
           "weight": 27,
-          "quality": 13,
+          "quality": 23,
           "name": "item:gameparty/normal/white"
         },
         {
           "type": "minecraft:loot_table",
           "weight": 70,
-          "quality": -25,
+          "quality": -30,
           "name": "minecraft:gameplay/fishing/fish"
         }
       ]

data/minecraft/loot_tables/gameplay/fishing/fish.json

@@ -16,12 +16,7 @@
         },
         {
           "type": "minecraft:item",
-          "weight": 2,
-          "name": "minecraft:tropical_fish"
-        },
-        {
-          "type": "minecraft:item",
-          "weight": 13,
+          "weight": 15,
           "name": "minecraft:pufferfish"
         }
       ]

data/test/functions/bonus/normal.mcfunction

@@ -0,0 +1,34 @@
+# 生成普通奖励物品
+
+# 设置轮数
+scoreboard players set $round mem 1
+
+# 清理残余实体
+kill @e[type=item]
+kill @e[type=arrow]
+kill @e[type=trident]
+
+# 生成奖励
+execute positioned 17.5 10.2 1967.5 run function item:bonus_item/gameparty/random
+execute positioned 19.5 10.2 1962.5 run function item:bonus_item/gameparty/random
+execute positioned 24.5 10.2 1960.5 run function item:bonus_item/gameparty/random
+execute positioned 29.5 10.2 1962.5 run function item:bonus_item/gameparty/random
+execute positioned 31.5 10.2 1967.5 run function item:bonus_item/gameparty/random
+execute positioned 29.5 10.2 1972.5 run function item:bonus_item/gameparty/random
+execute positioned 24.5 10.2 1974.5 run function item:bonus_item/gameparty/random
+execute positioned 19.5 10.2 1972.5 run function item:bonus_item/gameparty/random
+
+# 生成拾取背景
+execute positioned 17.0 10.0 1967.0 run function ltw:state/6/generate_background
+execute positioned 19.0 10.0 1962.0 run function ltw:state/6/generate_background
+execute positioned 24.0 10.0 1960.0 run function ltw:state/6/generate_background
+execute positioned 29.0 10.0 1962.0 run function ltw:state/6/generate_background
+execute positioned 31.0 10.0 1967.0 run function ltw:state/6/generate_background
+execute positioned 29.0 10.0 1972.0 run function ltw:state/6/generate_background
+execute positioned 24.0 10.0 1974.0 run function ltw:state/6/generate_background
+execute positioned 19.0 10.0 1972.0 run function ltw:state/6/generate_background
+
+# 传送
+tp @a[team=!debugging] 24.5 11.0 1967.5
+
+tellraw @a ["",{"text": ">> ","color": "aqua","bold": true}, {"text": "已生成测试用奖励物品!","color": "aqua"}]

data/test/functions/bonus/score.mcfunction

@@ -0,0 +1,34 @@
+# 生成分数奖励物品
+
+# 设置轮数
+scoreboard players set $round mem 5
+
+# 清理残余实体
+kill @e[type=item]
+kill @e[type=arrow]
+kill @e[type=trident]
+
+# 生成奖励
+execute positioned 17.5 10.2 1967.5 run function item:bonus_item/gameparty/random
+execute positioned 19.5 10.2 1962.5 run function item:bonus_item/gameparty/random
+execute positioned 24.5 10.2 1960.5 run function item:bonus_item/gameparty/random
+execute positioned 29.5 10.2 1962.5 run function item:bonus_item/gameparty/random
+execute positioned 31.5 10.2 1967.5 run function item:bonus_item/gameparty/random
+execute positioned 29.5 10.2 1972.5 run function item:bonus_item/gameparty/random
+execute positioned 24.5 10.2 1974.5 run function item:bonus_item/gameparty/random
+execute positioned 19.5 10.2 1972.5 run function item:bonus_item/gameparty/random
+
+# 生成拾取背景
+execute positioned 17.0 10.0 1967.0 run function ltw:state/6/generate_background
+execute positioned 19.0 10.0 1962.0 run function ltw:state/6/generate_background
+execute positioned 24.0 10.0 1960.0 run function ltw:state/6/generate_background
+execute positioned 29.0 10.0 1962.0 run function ltw:state/6/generate_background
+execute positioned 31.0 10.0 1967.0 run function ltw:state/6/generate_background
+execute positioned 29.0 10.0 1972.0 run function ltw:state/6/generate_background
+execute positioned 24.0 10.0 1974.0 run function ltw:state/6/generate_background
+execute positioned 19.0 10.0 1972.0 run function ltw:state/6/generate_background
+
+# 传送
+tp @a[team=!debugging] 24.5 11.0 1967.5
+
+tellraw @a ["",{"text": ">> ","color": "aqua","bold": true}, {"text": "已生成测试用奖励分数!","color": "aqua"}]