Merge branch 'master' of github.com:00ll00/LTW3

data/ltw/functions/init.mcfunction

@@ -100,7 +100,7 @@ scoreboard players set #const_81 mem 81
 scoreboard players set #const_100 mem 100
 
 # 玩家队伍
-team remove debugging
+# team remove debugging
 team add debugging "调试者"
 team modify debugging color red
 team modify debugging collisionRule never

data/ltw/functions/main/player_enter.mcfunction

@@ -33,10 +33,8 @@ function lib:bossbar/show
 # TODO: {土豆} 按存活回合数记分（两个炸弹同时爆炸把两个人炸死可以并列）
 # TODO: {TNTRun} 有多人汇报存在严重卡顿，检查是否是场地的粒子造成，或者是游戏中的光照更新、实体、方块变化
 
-# 龙猫
-# TODO: {幻翼} 在玩家第一次到达半血时显示回血的提示
-
 # HIM
+# FIXME: {色彩} 钻石刷新不出来，变成了洞
 # FIXME: {交易} 在缓慢旋转视角时能观察到村民前后抽搐
 
 # 010

data/ltw/functions/state/0/start_game.mcfunction

@@ -9,7 +9,7 @@ tellraw @a[team=playing,tag=!selected_player] ["",{"text": ">> ","color": "red",
 team join watching @a[team=playing,tag=!selected_player]
 tellraw @a[team=playing,tag=selected_player] ["",{"text": ">> ","color": "green","bold": true},{"text": "游戏开始!","color": "green"}]
 tellraw @a[team=watching] ["",{"text": ">> ","color": "green","bold": true},{"text": "游戏开始, 你将旁观本局游戏!","color": "green"}]
-tellraw @a[team=debugging] ["",{"text": ">> ","color": "blue","bold": true},{"text": "你正处于 Debug 模式中, 将忽略游戏开始!","color": "blue"}]
+tellraw @a[team=debugging] ["",{"text": ">> ","color": "aqua","bold": true},{"text": "你正处于 Debug 模式中, 将忽略游戏开始!","color": "aqua"}]
 
 # 设置数据
 scoreboard players reset * total_score

data/mini/functions/diamond/player_enter.mcfunction

@@ -4,7 +4,7 @@ title @s clear
 title @s actionbar ""
 
 # 解锁配方
-recipe give @s *
+recipe give @s[team=playing] *
 
 # 设置玩家生命
 attribute @s generic.max_health base set 20

data/mini/functions/hotpm/player_intro.mcfunction

@@ -1,5 +1,5 @@
 # 向单个玩家展示小游戏介绍
-tp @s[team=!debugging] 1030.06 17.20 3007.77 -290.29 32.65
+tp @s[team=!debugging] 1029 15 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,team=!debugging] run spectate
-execute as @a[gamemode=spectator,team=!debugging] unless entity @s[x=1001,y=5,z=3001,dx=29,dy=13,dz=27] run tp @s 1029 17.20 3007.77 -290.29 32.65
+execute as @a[gamemode=spectator,team=!debugging] unless entity @s[x=1001,y=5,z=3001,dx=29,dy=11,dz=27] run tp @s 1029 15 3007.77 -290.29 32.65

data/mini/functions/trade/game/remove_trade.mcfunction

@@ -0,0 +1,64 @@
+execute store result score @s temp2 run data get entity @s Offers.Recipes[15].uses
+execute store result score @s temp run data get entity @s Offers.Recipes[15].maxUses
+execute if score @s temp = @s temp2 run data remove entity @s Offers.Recipes[15]
+
+execute store result score @s temp2 run data get entity @s Offers.Recipes[14].uses
+execute store result score @s temp run data get entity @s Offers.Recipes[14].maxUses
+execute if score @s temp = @s temp2 run data remove entity @s Offers.Recipes[14]
+
+execute store result score @s temp2 run data get entity @s Offers.Recipes[13].uses
+execute store result score @s temp run data get entity @s Offers.Recipes[13].maxUses
+execute if score @s temp = @s temp2 run data remove entity @s Offers.Recipes[13]
+
+execute store result score @s temp2 run data get entity @s Offers.Recipes[12].uses
+execute store result score @s temp run data get entity @s Offers.Recipes[12].maxUses
+execute if score @s temp = @s temp2 run data remove entity @s Offers.Recipes[12]
+
+execute store result score @s temp2 run data get entity @s Offers.Recipes[11].uses
+execute store result score @s temp run data get entity @s Offers.Recipes[11].maxUses
+execute if score @s temp = @s temp2 run data remove entity @s Offers.Recipes[11]
+
+execute store result score @s temp2 run data get entity @s Offers.Recipes[10].uses
+execute store result score @s temp run data get entity @s Offers.Recipes[10].maxUses
+execute if score @s temp = @s temp2 run data remove entity @s Offers.Recipes[10]
+
+execute store result score @s temp2 run data get entity @s Offers.Recipes[9].uses
+execute store result score @s temp run data get entity @s Offers.Recipes[9].maxUses
+execute if score @s temp = @s temp2 run data remove entity @s Offers.Recipes[9]
+
+execute store result score @s temp2 run data get entity @s Offers.Recipes[8].uses
+execute store result score @s temp run data get entity @s Offers.Recipes[8].maxUses
+execute if score @s temp = @s temp2 run data remove entity @s Offers.Recipes[8]
+
+execute store result score @s temp2 run data get entity @s Offers.Recipes[7].uses
+execute store result score @s temp run data get entity @s Offers.Recipes[7].maxUses
+execute if score @s temp = @s temp2 run data remove entity @s Offers.Recipes[7]
+
+execute store result score @s temp2 run data get entity @s Offers.Recipes[6].uses
+execute store result score @s temp run data get entity @s Offers.Recipes[6].maxUses
+execute if score @s temp = @s temp2 run data remove entity @s Offers.Recipes[6]
+
+execute store result score @s temp2 run data get entity @s Offers.Recipes[5].uses
+execute store result score @s temp run data get entity @s Offers.Recipes[5].maxUses
+execute if score @s temp = @s temp2 run data remove entity @s Offers.Recipes[5]
+
+execute store result score @s temp2 run data get entity @s Offers.Recipes[4].uses
+execute store result score @s temp run data get entity @s Offers.Recipes[4].maxUses
+execute if score @s temp = @s temp2 run data remove entity @s Offers.Recipes[4]
+
+execute store result score @s temp2 run data get entity @s Offers.Recipes[3].uses
+execute store result score @s temp run data get entity @s Offers.Recipes[3].maxUses
+execute if score @s temp = @s temp2 run data remove entity @s Offers.Recipes[3]
+
+execute store result score @s temp2 run data get entity @s Offers.Recipes[2].uses
+execute store result score @s temp run data get entity @s Offers.Recipes[2].maxUses
+execute if score @s temp = @s temp2 run data remove entity @s Offers.Recipes[2]
+
+execute store result score @s temp2 run data get entity @s Offers.Recipes[1].uses
+execute store result score @s temp run data get entity @s Offers.Recipes[1].maxUses
+execute if score @s temp = @s temp2 run data remove entity @s Offers.Recipes[1]
+
+execute store result score @s temp2 run data get entity @s Offers.Recipes[0].uses
+execute store result score @s temp run data get entity @s Offers.Recipes[0].maxUses
+execute if score @s temp = @s temp2 run data remove entity @s Offers.Recipes[0]
+

data/mini/functions/trade/game/villager_update_trade.mcfunction

@@ -1,7 +1,9 @@
 # 判断村民是否升级
 function mini:trade/game/villager_level_up
 
+# 判断空交易
+function mini:trade/game/remove_trade
+
 # 判断是否增加交易
 execute if entity @s[tag=upgradeVillager] run function mini:trade/game/villager_new_trade
 
-# 判断空交易

data/mini/functions/trade/player_enter.mcfunction

@@ -4,7 +4,7 @@ title @s clear
 title @s actionbar ""
 
 # 解锁配方
-recipe give @s *
+recipe give @s[team=playing] *
 
 # 设置玩家生命
 attribute @s generic.max_health base set 20

data/mini/functions/trade/tick2.mcfunction

@@ -7,5 +7,3 @@ tp @e[type=villager,tag=TradePlayer,tag=!tpPlayer] 1000 5 5000
 execute as @e[tag=tpPlayer] at @s run particle end_rod ~ ~0.1 ~ 0.15 0.1 0.15 0 3 normal @a
 # 往手上塞纸
 execute as @a[team=playing] unless data entity @s Inventory[{Slot:8b,tag:{game_item:1b},Count:1b}] run function mini:trade/game/paper_show
-# 刷新交易
-execute as @e[type=villager,tag=TradePlayer] run function mini:trade/game/villager_update_trade

data/mini/functions/trade/tick20.mcfunction

@@ -2,6 +2,9 @@
 # 更新绿宝石数量
 execute as @a[team=playing] store result score @s emerald run clear @s emerald 0
 
+# 刷新交易
+execute as @e[type=villager,tag=TradePlayer] run function mini:trade/game/villager_update_trade
+
 # 显示倒计时
 execute if score $countdown mem matches ..10 run title @a times 3 14 2
 execute if score $countdown mem matches ..10 run title @a subtitle {"score":{"name":"$countdown","objective":"mem"}}