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

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

@@ -50,18 +50,7 @@
 },
 {
     "type": "minecraft:item",
-    "weight": 1,
-    "name": "minecraft:netherite_helmet",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"下界合金头盔、胸甲\\\",\\\"color\\\":\\\"aqua\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"bonus_give_items\":[{\"id\":\"minecraft:netherite_chestplate\",\"Count\":1,\"tag\":{\"bonus_return\":1b,\"is_bonus\":1b}}]}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 1,
+    "weight": 2,
     "name": "minecraft:netherite_chestplate",
     "functions": [
         {
@@ -72,18 +61,7 @@
 },
 {
     "type": "minecraft:item",
-    "weight": 1,
-    "name": "minecraft:netherite_leggings",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"下界合金头盔、护腿\\\",\\\"color\\\":\\\"aqua\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"bonus_give_items\":[{\"id\":\"minecraft:netherite_helmet\",\"Count\":1,\"tag\":{\"bonus_return\":1b,\"is_bonus\":1b}}]}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 1,
+    "weight": 2,
     "name": "minecraft:netherite_boots",
     "functions": [
         {

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

@@ -176,18 +176,7 @@
 },
 {
     "type": "minecraft:item",
-    "weight": 3,
-    "name": "minecraft:netherite_helmet",
-    "functions": [
-        {
-            "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"下界合金头盔\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b}"
-        }
-    ]
-},
-{
-    "type": "minecraft:item",
-    "weight": 3,
+    "weight": 4,
     "name": "minecraft:netherite_chestplate",
     "functions": [
         {
@@ -198,7 +187,7 @@
 },
 {
     "type": "minecraft:item",
-    "weight": 3,
+    "weight": 4,
     "name": "minecraft:netherite_leggings",
     "functions": [
         {
@@ -209,7 +198,7 @@
 },
 {
     "type": "minecraft:item",
-    "weight": 3,
+    "weight": 4,
     "name": "minecraft:netherite_boots",
     "functions": [
         {

data/lib/functions/effect/special_block.mcfunction

@@ -1,14 +1,15 @@
 # 5tick运行一次 计分板单位5tick
+
 # 钻石：起飞
-execute as @a[gamemode=!spectator] if score @s effect_floating matches 1.. run scoreboard players add @s effect_floating 1
-execute as @a[gamemode=!spectator] if score @s effect_floating matches 3.. run effect clear @s levitation
-execute as @a[gamemode=!spectator] if score @s effect_floating matches 3.. run scoreboard players set @s effect_floating 0
-execute as @a[gamemode=!spectator] unless score @s effect_floating matches 1.. at @s if block ~ ~-1 ~ diamond_block run effect give @s levitation 1 12 true
-execute as @a[gamemode=!spectator] unless score @s effect_floating matches 1.. at @s if block ~ ~-1 ~ diamond_block run effect give @s slow_falling 2 0 true
-execute as @a[gamemode=!spectator] unless score @s effect_floating matches 1.. at @s if block ~ ~-1 ~ diamond_block run scoreboard players set @s effect_floating 1
+scoreboard players remove @a[scores={effect_floating=0..}] effect_floating 1
+effect clear @a[scores={effect_floating=0}] levitation
+execute as @a[gamemode=!spectator] at @s if block ~ ~-0.01 ~ diamond_block run effect give @s levitation 1 12
+execute as @a[gamemode=!spectator] at @s if block ~ ~-0.01 ~ diamond_block run effect give @s slow_falling 2 0 true
+execute as @a[gamemode=!spectator] at @s if block ~ ~-0.01 ~ diamond_block run scoreboard players set @s effect_floating 2
+execute as @a[gamemode=!spectator] at @s if block ~ ~-0.01 ~ diamond_block run function lib:sounds/teleport
+
 # 绿宝石：回血
-execute as @a[gamemode=!spectator] if score @s effect_regen matches 1.. run scoreboard players add @s effect_regen 1
-execute as @a[gamemode=!spectator] if score @s effect_regen matches 5.. run effect clear @s regeneration
-execute as @a[gamemode=!spectator] if score @s effect_regen matches 5.. run scoreboard players set @s effect_regen 0
-execute as @a[gamemode=!spectator] unless score @s effect_regen matches 1.. at @s if block ~ ~-1 ~ emerald_block run effect give @s regeneration 2 2 true
-execute as @a[gamemode=!spectator] unless score @s effect_regen matches 1.. at @s if block ~ ~-1 ~ emerald_block run scoreboard players set @s effect_regen 1
+scoreboard players remove @a[scores={effect_regen=0..}] effect_regen 1
+effect clear @a[scores={effect_regen=0}] levitation
+execute as @a[gamemode=!spectator] at @s if block ~ ~-0.01 ~ emerald_block run effect give @s regeneration 2 2
+execute as @a[gamemode=!spectator] at @s if block ~ ~-0.01 ~ emerald_block run scoreboard players set @s effect_regen 4

data/ltw/functions/main/player_enter.mcfunction

@@ -22,5 +22,6 @@ execute if entity @s[tag=!watcher] if score @s game_id = $ game_id run function
 bossbar set ltw:notice players @a
 function lib:bossbar/show
 
-# FIXME: 不再允许偷到 -1 分
-# FIXME: 旁观者在游戏开局的时候似乎会看到 2 然后 ding
+# FIXME: [LTCat] 不再允许偷到 -1 分
+# FIXME: [LTCat] 旁观者在游戏开局的时候似乎会看到 2 然后 ding
+# FIXME: [HIM] init 之后猪灵可能会消失（并且会 ding 两声，疑似执行了两次

data/mini/functions/tntrun/game_init.mcfunction

@@ -28,6 +28,7 @@ setblock 1032 51 2000 minecraft:redstone_block
 ##111
 setblock 1032 52 2032 minecraft:structure_block[mode=load]{metadata:"",mirror:"NONE",ignoreEntities:1b,powered:0b,seed:0L,author:"chengzi_SC",rotation:"NONE",posX:0,mode:"LOAD",posY:-10,sizeX:9,posZ:0,integrity:1.0f,showair:0b,name:"mini:tntrun111",sizeY:10,sizeZ:8,showboundingbox:0b}
 setblock 1032 51 2032 minecraft:redstone_block
+# FIXME: [010] 清理结构方块
 
 # 清理残余实体
 kill @e[type=arrow]

data/mini/functions/tntrun/player_enter.mcfunction

@@ -13,7 +13,7 @@ effect give @s resistance 1000000 4 true
 attribute @s generic.max_health base set 20
 
 # 传送玩家
-spreadplayers 1019.5 2020.5 4 4 false @s[tag=!watcher,tag=!rejoining,tag=!debug]
+spreadplayers 1019.5 2020.5 2 2 false @s[tag=!watcher,tag=!rejoining,tag=!debug]
 # schedule: tp @a ~ ~-3 ~
 
 # 两秒后才开始 TNT 掉落