钓鱼竿加入战斗！

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

@@ -6,6 +6,17 @@
         "name": "item:gameparty/score/green"
     },
 
+    {
+        "type": "minecraft:item",
+        "weight": 1,
+        "name": "minecraft:fishing_rod",
+        "functions": [
+            {
+                "function": "minecraft:set_nbt",
+                "tag": "{\"item_name\":\"{\\\"text\\\":\\\"<海之眷顾> 钓鱼竿\\\",\\\"color\\\":\\\"green\\\"}\",\"Enchantments\":[{\"id\":\"luck_of_the_sea\",\"lvl\":1}],\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"display\":{\"Name\":\"{\\\"text\\\":\\\"钓鱼竿\\\",\\\"italic\\\":false,\\\"color\\\":\\\"green\\\"}\"}}"
+            }
+        ]
+    },
 {
     "type": "minecraft:item",
     "weight": 1,

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

@@ -17,6 +17,21 @@
         }
     ]
 },
+{
+    "type": "minecraft:item",
+    "weight": 1,
+    "name": "minecraft:fishing_rod",
+    "functions": [
+        {
+            "function": "minecraft:set_damage",
+            "damage":{"min": 0.04, "max": 0.08}
+        },
+        {
+            "function": "minecraft:set_nbt",
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"破损的钓鱼竿\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"display\":{\"Name\":\"{\\\"text\\\":\\\"钓鱼竿\\\",\\\"italic\\\":false,\\\"color\\\":\\\"white\\\"}\"}}"
+        }
+    ]
+},
 {
     "type": "minecraft:item",
     "weight": 1,
@@ -39,7 +54,7 @@
         },
         {
             "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"<击退 III> 破损的木斧\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"Enchantments\":[{\"id\":\"knockback\",\"lvl\":3}],\"display\":{\"Name\":\"{\\\"text\\\":\\\"<击退 III> 木斧\\\",\\\"italic\\\":false,\\\"color\\\":\\\"white\\\"}\"}}"
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"<击退 II> 破损的木斧\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"Enchantments\":[{\"id\":\"knockback\",\"lvl\":2}],\"display\":{\"Name\":\"{\\\"text\\\":\\\"<击退 II> 木斧\\\",\\\"italic\\\":false,\\\"color\\\":\\\"white\\\"}\"}}"
         }
     ]
 },

data/ltw/functions/main/player_enter.mcfunction

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

data/ltw/functions/state/7/tick2.mcfunction

@@ -1,3 +1,6 @@
 # 观察者限制
 execute as @a[gamemode=spectator] run spectate
 execute as @a[gamemode=spectator] unless entity @s[x=12,y=9,z=1955,dx=24,dy=14,dz=24] run tp @s[team=!debugging] 24.5 12.0 1967.5
+
+# 清理浮漂
+kill @e[type=fishing_bobber]

data/minecraft/loot_tables/gameplay/fishing.json

@@ -6,31 +6,20 @@
       "entries": [
         {
           "type": "minecraft:loot_table",
-          "weight": 10,
-          "quality": -2,
-          "name": "minecraft:gameplay/fishing/junk"
+          "weight": 3,
+          "quality": 7,
+          "name": "item:gameparty/normal/green"
         },
         {
           "type": "minecraft:loot_table",
-          "conditions": [
-            {
-              "condition": "minecraft:entity_properties",
-              "predicate": {
-                "fishing_hook": {
-                  "in_open_water": true
-                }
-              },
-              "entity": "this"
-            }
-          ],
-          "weight": 5,
-          "quality": 2,
-          "name": "minecraft:gameplay/fishing/treasure"
+          "weight": 27,
+          "quality": 13,
+          "name": "item:gameparty/normal/white"
         },
         {
           "type": "minecraft:loot_table",
-          "weight": 85,
-          "quality": -1,
+          "weight": 70,
+          "quality": -25,
           "name": "minecraft:gameplay/fishing/fish"
         }
       ]

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

@@ -1,153 +0,0 @@
-{
-  "type": "minecraft:fishing",
-  "pools": [
-    {
-      "rolls": 1.0,
-      "entries": [
-        {
-          "type": "minecraft:item",
-          "weight": 17,
-          "name": "minecraft:lily_pad"
-        },
-        {
-          "type": "minecraft:item",
-          "weight": 10,
-          "functions": [
-            {
-              "function": "minecraft:set_damage",
-              "damage": {
-                "min": 0.0,
-                "max": 0.9
-              }
-            }
-          ],
-          "name": "minecraft:leather_boots"
-        },
-        {
-          "type": "minecraft:item",
-          "weight": 10,
-          "name": "minecraft:leather"
-        },
-        {
-          "type": "minecraft:item",
-          "weight": 10,
-          "name": "minecraft:bone"
-        },
-        {
-          "type": "minecraft:item",
-          "weight": 10,
-          "functions": [
-            {
-              "function": "minecraft:set_nbt",
-              "tag": "{Potion:\"minecraft:water\"}"
-            }
-          ],
-          "name": "minecraft:potion"
-        },
-        {
-          "type": "minecraft:item",
-          "weight": 5,
-          "name": "minecraft:string"
-        },
-        {
-          "type": "minecraft:item",
-          "weight": 2,
-          "functions": [
-            {
-              "function": "minecraft:set_damage",
-              "damage": {
-                "min": 0.0,
-                "max": 0.9
-              }
-            }
-          ],
-          "name": "minecraft:fishing_rod"
-        },
-        {
-          "type": "minecraft:item",
-          "weight": 10,
-          "name": "minecraft:bowl"
-        },
-        {
-          "type": "minecraft:item",
-          "weight": 5,
-          "name": "minecraft:stick"
-        },
-        {
-          "type": "minecraft:item",
-          "functions": [
-            {
-              "function": "minecraft:set_count",
-              "count": 10
-            }
-          ],
-          "name": "minecraft:ink_sac"
-        },
-        {
-          "type": "minecraft:item",
-          "weight": 10,
-          "name": "minecraft:tripwire_hook"
-        },
-        {
-          "type": "minecraft:item",
-          "weight": 10,
-          "name": "minecraft:rotten_flesh"
-        },
-        {
-          "type": "minecraft:item",
-          "conditions": [
-            {
-              "condition": "minecraft:alternative",
-              "terms": [
-                {
-                  "condition": "minecraft:location_check",
-                  "predicate": {
-                    "biome": "minecraft:jungle"
-                  }
-                },
-                {
-                  "condition": "minecraft:location_check",
-                  "predicate": {
-                    "biome": "minecraft:jungle_hills"
-                  }
-                },
-                {
-                  "condition": "minecraft:location_check",
-                  "predicate": {
-                    "biome": "minecraft:jungle_edge"
-                  }
-                },
-                {
-                  "condition": "minecraft:location_check",
-                  "predicate": {
-                    "biome": "minecraft:bamboo_jungle"
-                  }
-                },
-                {
-                  "condition": "minecraft:location_check",
-                  "predicate": {
-                    "biome": "minecraft:modified_jungle"
-                  }
-                },
-                {
-                  "condition": "minecraft:location_check",
-                  "predicate": {
-                    "biome": "minecraft:modified_jungle_edge"
-                  }
-                },
-                {
-                  "condition": "minecraft:location_check",
-                  "predicate": {
-                    "biome": "minecraft:bamboo_jungle_hills"
-                  }
-                }
-              ]
-            }
-          ],
-          "weight": 10,
-          "name": "minecraft:bamboo"
-        }
-      ]
-    }
-  ]
-}

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

@@ -1,69 +0,0 @@
-{
-  "type": "minecraft:fishing",
-  "pools": [
-    {
-      "rolls": 1.0,
-      "entries": [
-        {
-          "type": "minecraft:item",
-          "name": "minecraft:name_tag"
-        },
-        {
-          "type": "minecraft:item",
-          "name": "minecraft:saddle"
-        },
-        {
-          "type": "minecraft:item",
-          "functions": [
-            {
-              "function": "minecraft:set_damage",
-              "damage": {
-                "min": 0.0,
-                "max": 0.25
-              }
-            },
-            {
-              "function": "minecraft:enchant_with_levels",
-              "levels": 30,
-              "treasure": true
-            }
-          ],
-          "name": "minecraft:bow"
-        },
-        {
-          "type": "minecraft:item",
-          "functions": [
-            {
-              "function": "minecraft:set_damage",
-              "damage": {
-                "min": 0.0,
-                "max": 0.25
-              }
-            },
-            {
-              "function": "minecraft:enchant_with_levels",
-              "levels": 30,
-              "treasure": true
-            }
-          ],
-          "name": "minecraft:fishing_rod"
-        },
-        {
-          "type": "minecraft:item",
-          "functions": [
-            {
-              "function": "minecraft:enchant_with_levels",
-              "levels": 30,
-              "treasure": true
-            }
-          ],
-          "name": "minecraft:book"
-        },
-        {
-          "type": "minecraft:item",
-          "name": "minecraft:nautilus_shell"
-        }
-      ]
-    }
-  ]
-}

data/mini/functions/diamond/tick20.mcfunction

@@ -15,6 +15,7 @@ execute if score $countdown mem matches 90 run function lib:bossbar/show
 execute if score $countdown mem matches 61 as @a run function lib:sounds/music/mini_fast
 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 1
+execute if score $countdown mem matches 60 run scoreboard objectives setdisplay belowName diamond
 execute if score $countdown mem matches 60 run function lib:bossbar/show
 
 # 0s：游戏结束

data/mini/functions/diamond/tick5.mcfunction

@@ -9,3 +9,6 @@ execute as @a[scores={diamond=1..},tag=!diamond_got,x=1000,y=0,z=5000,dx=32,dy=2
 execute as @a[scores={diamond=1..},tag=!diamond_got,x=1000,y=0,z=5000,dx=32,dy=253,dz=32] as @a run function lib:sounds/hit
 tag @a remove diamond_got
 tag @a[scores={diamond=1..}] add diamond_got
+
+# 钻石发光
+execute as @e[type=minecraft:item,nbt={Item:{id:"minecraft:diamond"}}] run data modify entity @s Glowing set value 1b