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

data/ltw/functions/main/player_enter.mcfunction

@@ -31,7 +31,6 @@ function lib:bossbar/show
 # 无指定人员
 # FIXME: 关掉 JourneyMap 的生物雷达
 # TODO: {土豆} 按存活回合数记分（两个炸弹同时爆炸把两个人炸死可以并列）
-# TODO: <! 重要> {土豆} 让橙子来改地图！
 # TODO: {TNTRun} 有多人汇报存在严重卡顿，检查是否是场地的粒子造成，或者是游戏中的光照更新、实体、方块变化
 
 # 龙猫

data/mini/functions/hotpm/game_init.mcfunction

@@ -18,23 +18,6 @@ kill @e[type=trident]
 
 # 生成地图
 
-#   101
-setblock 1032 4 3031 minecraft:structure_block[mode=load]{metadata:"",mirror:"NONE",ignoreEntities:1b,powered:0b,seed:0L,author:"?",rotation:"NONE",posX:0,mode:"LOAD",posY:1,sizeX:32,posZ:0,integrity:1.0f,showair:0b,name:"mini:hotpm101",sizeY:32,sizeZ:32,showboundingbox:0b}
-setblock 1032 5 3031 minecraft:redstone_block
-
-#   100
-setblock 1032 4 2999 minecraft:structure_block[mode=load]{metadata:"",mirror:"NONE",ignoreEntities:1b,powered:0b,seed:0L,author:"?",rotation:"NONE",posX:0,mode:"LOAD",posY:1,sizeX:32,posZ:0,integrity:1.0f,showair:0b,name:"mini:hotpm100",sizeY:32,sizeZ:32,showboundingbox:0b}
-setblock 1032 5 2999 minecraft:redstone_block
-
-#   001
-setblock 1000 4 3031 minecraft:structure_block[mode=load]{metadata:"",mirror:"NONE",ignoreEntities:1b,powered:0b,seed:0L,author:"?",rotation:"NONE",posX:0,mode:"LOAD",posY:1,sizeX:32,posZ:0,integrity:1.0f,showair:0b,name:"mini:hotpm001",sizeY:32,sizeZ:32,showboundingbox:0b}
-setblock 1000 5 3031 minecraft:redstone_block
-
-#   000
-setblock 1000 4 2999 minecraft:structure_block[mode=load]{metadata:"",mirror:"NONE",ignoreEntities:1b,powered:0b,seed:0L,author:"?",rotation:"NONE",posX:0,mode:"LOAD",posY:1,sizeX:32,posZ:0,integrity:1.0f,showair:0b,name:"mini:hotpm000",sizeY:32,sizeZ:32,showboundingbox:0b}
-setblock 1000 5 2999 minecraft:redstone_block
-
-# 生成物品
-execute positioned 1022.0 17.0 3009.0 run function item:bonus_item/gameparty/auto/white
-execute positioned 1022.5 32.0 3038.0 run function item:bonus_item/gameparty/auto/white
-# execute positioned 1022.5 43.5 3012.5 run function item:bonus_item/gameparty/auto/white
+setblock 1000 4 3000 air
+setblock 1000 4 3000 minecraft:structure_block[mode=load]{metadata:"",mirror:"NONE",ignoreEntities:1b,powered:0b,seed:0L,rotation:"NONE",posX:0,mode:"LOAD",posY:1,sizeX:32,posZ:0,integrity:1.0f,showair:0b,name:"mini:hp",sizeY:15,sizeZ:30,showboundingbox:0b}
+setblock 1000 5 3000 minecraft:redstone_block

data/mini/functions/hotpm/player_enter.mcfunction

@@ -20,12 +20,8 @@ tag @s remove pm_damage_dealt
 tag @s remove pm_damage_taken
 tag @s remove pm_explode_last
 
-
 # 传送玩家
-tp @s[team=playing,tag=!rejoining] 1023 25 3021
-# spreadplayers 1023 3021 5 5 false @s[team=playing,tag=!rejoining]
-# schedule function mini:hotpm/player_enter2 1t replace
-# execute as @a[team=playing,tag=!rejoining] at @s run tp @s ~ 25 ~
+tp @s[team=playing,tag=!rejoining] 1018.0 8 3015.0
 
 # 调整模式
 gamemode spectator @s[team=!debugging]

data/mini/functions/hotpm/player_intro.mcfunction

@@ -1,5 +1,5 @@
 # 向单个玩家展示小游戏介绍
-tp @s[team=!debugging] 1022 25 3038 180 20
+tp @s[team=!debugging] 1030.06 17.20 3007.77 -290.29 32.65
 tellraw @s ["",{"text":"\n >> 炸弹狂魔 >>\n\n","color":"gold","bold":true}, " 在炸弹爆炸前攻击他人, 将炸弹扔到其他人身上!\n"]
 tellraw @s ["",{"text": " <生命淘汰制> ","color":"red","bold": true}, {"text":"你有 3 条生命, 生命耗尽后即被淘汰。","color":"gray"}]
 tellraw @s ["",{"text": " <PVP> ","color":"light_purple","bold": true}, {"text":"攻击其他玩家可以转移炸弹, 远程伤害同样有效。","color":"gray"}]

data/mini/functions/hotpm/watcher_limit.mcfunction

@@ -1,3 +1,3 @@
 # 观察者限制飞行范围
-execute as @a[gamemode=spectator,x=1022,y=27,z=3022,distance=21..] run spectate
-tp @a[gamemode=spectator,x=1022,y=27,z=3022,distance=21..,team=!debugging] 1022 29 3038 180 0
+execute as @a[gamemode=spectator,x=1001,y=5,z=3001,dx=29,dy=9,dz=27] run spectate
+tp @a[gamemode=spectator,x=1001,y=5,z=3001,dx=29,dy=9,dz=27,team=!debugging] 1030.06 17.20 3007.77 -290.29 32.65

data/mini/loot_tables/diamond.json

@@ -2,7 +2,7 @@
 
     {
         "type": "minecraft:item",
-        "weight": 3,
+        "weight": 1,
         "name": "minecraft:nether_star",
         "functions": [
             {
@@ -13,23 +13,12 @@
     },
     {
         "type": "minecraft:item",
-        "weight": 2,
-        "name": "minecraft:nether_star",
-        "functions": [
-            {
-                "function": "minecraft:set_nbt",
-                "tag": "{\"item_name\":\"{\\\"text\\\":\\\"得分 +2\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":2,\"display\":{\"Name\":'{\"text\":\"得分 +2\",\"italic\":false,\"color\":\"white\"}'}}"
-            }
-        ]
-    },
-    {
-        "type": "minecraft:item",
-        "weight": 4,
+        "weight": 1,
         "name": "minecraft:diamond"
     },
     {
         "type": "minecraft:item",
-        "weight": 3,
+        "weight": 1,
         "name": "minecraft:iron_ingot",
         "functions": [
           {
@@ -44,8 +33,8 @@
     },
     {
         "type": "minecraft:item",
-        "weight": 3,
+        "weight": 1,
         "name": "minecraft:book"
     }
     
-    ]}]}
+]}]}