Просмотр исходного кода

迁移 item:lobby_state 到 ltw:state/0/state

LTCatt 6 лет назад
Родитель
Сommit
2e2bf99a2f

+ 1 - 1
data/item/functions/tick2.mcfunction

@@ -6,7 +6,7 @@ execute as @a if data entity @s Inventory[{"tag":{"bonus_new":1b}}] run function
 
 # 检测玩家格子锁定
 execute if score $state mem matches 1.. as @a[tag=!debug] run function item:disable_slot/check_slot
-execute if score $state mem matches 0 as @a run function item:lobby_state/check_slot
+execute if score $state mem matches 0 as @a run function ltw:state/0/state/check_slot
 execute if score $state mem matches 0.. run kill @e[type=item,tag=LockTempItem]
 
 # 检查购买物品

+ 1 - 1
data/ltw/functions/state/0/player_enter.mcfunction

@@ -32,4 +32,4 @@ execute as @s[tag=!debug] run function item:shop/refresh_gold
 execute as @s[tag=!debug] run function item:shop/refresh_green
 
 # 默认进入待机状态
-function item:lobby_state/join_watch
+function ltw:state/0/state/join_watch

+ 4 - 4
data/item/functions/lobby_state/check_slot.mcfunction → data/ltw/functions/state/0/state/check_slot.mcfunction

@@ -1,9 +1,9 @@
 # 第八格
-execute unless data entity @s[tag=lobby_watch] Inventory[{Slot:8b,tag:{lobby_item:1b,lobby_watch:1b}}] run function item:lobby_state/join_game
-execute if data entity @s[tag=lobby_watch] Inventory[{Slot:8b,tag:{lobby_item:1b,lobby_watch:1b}}] unless data entity @s[tag=lobby_watch] Inventory[{Count:1b,Slot:8b,tag:{lobby_item:1b,lobby_watch:1b}}] run function item:lobby_state/join_watch
+execute unless data entity @s[tag=lobby_watch] Inventory[{Slot:8b,tag:{lobby_item:1b,lobby_watch:1b}}] run function ltw:state/0/state/join_game
+execute if data entity @s[tag=lobby_watch] Inventory[{Slot:8b,tag:{lobby_item:1b,lobby_watch:1b}}] unless data entity @s[tag=lobby_watch] Inventory[{Count:1b,Slot:8b,tag:{lobby_item:1b,lobby_watch:1b}}] run function ltw:state/0/state/join_watch
 execute if data entity @s[tag=lobby_watch] Inventory[{tag:{lobby_item:1b,lobby_ready:1b}}] run clear @s lime_dye{lobby_item:1b,lobby_ready:1b} 
-execute unless data entity @s[tag=lobby_ready] Inventory[{Slot:8b,tag:{lobby_item:1b,lobby_ready:1b}}] run function item:lobby_state/join_watch
-execute if data entity @s[tag=lobby_ready] Inventory[{Slot:8b,tag:{lobby_item:1b,lobby_ready:1b}}] unless data entity @s[tag=lobby_ready] Inventory[{Count:1b,Slot:8b,tag:{lobby_item:1b,lobby_ready:1b}}] run function item:lobby_state/join_game
+execute unless data entity @s[tag=lobby_ready] Inventory[{Slot:8b,tag:{lobby_item:1b,lobby_ready:1b}}] run function ltw:state/0/state/join_watch
+execute if data entity @s[tag=lobby_ready] Inventory[{Slot:8b,tag:{lobby_item:1b,lobby_ready:1b}}] unless data entity @s[tag=lobby_ready] Inventory[{Count:1b,Slot:8b,tag:{lobby_item:1b,lobby_ready:1b}}] run function ltw:state/0/state/join_game
 execute if data entity @s[tag=lobby_ready] Inventory[{tag:{lobby_item:1b,lobby_watch:1b}}] run clear @s gray_dye{lobby_item:1b,lobby_watch:1b}
 
 # 清除临时物品

+ 0 - 0
data/item/functions/lobby_state/join_game.mcfunction → data/ltw/functions/state/0/state/join_game.mcfunction


+ 0 - 0
data/item/functions/lobby_state/join_watch.mcfunction → data/ltw/functions/state/0/state/join_watch.mcfunction


+ 1 - 1
data/ltw/functions/state/0/tick5.mcfunction

@@ -1,5 +1,5 @@
 # 让无状态玩家变为准备状态
-execute as @a[tag=!lobby_ready,tag=!lobby_watch] run function item:lobby_state/join_watch
+execute as @a[tag=!lobby_ready,tag=!lobby_watch] run function ltw:state/0/state/join_watch
 
 # 给予进度
 execute as @a at @s if entity @s[x=-1,y=22,z=-29,dx=5,dy=3,dz=3] run advancement grant @s only ltw:parkour/explore1