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

data/item/functions/bonus_item/random_bonus_rename.mcfunction

@@ -0,0 +1,2 @@
+data modify block 0 1 0 Text1 set value '[{"text":"随机道具：","color":"#FFE9A1"},{"nbt": "item_buff[0].tag.item_name","storage":"item:bonus","interpret": true}]'
+data modify storage item:bonus item_buff[0].tag.item_name set from block 0 1 0 Text1

data/item/functions/bonus_item/random_item.mcfunction

@@ -5,4 +5,5 @@ execute if data storage item:bonus random_bonus{"level":"green"} run loot replac
 execute if data storage item:bonus random_bonus{"level":"blue"} run loot replace block 0 0 1 container.0 loot item:gameparty/item/blue
 execute if data storage item:bonus random_bonus{"level":"purple"} run loot replace block 0 0 1 container.0 loot item:gameparty/item/purple
 data modify storage item:bonus item_buff prepend from block 0 0 1 Items[{"Slot":0b}]
+function item:bonus_item/random_bonus_rename
 execute if score $item.random.count mem matches 1.. run function item:bonus_item/random_item

data/item/functions/bonus_item/random_mixed.mcfunction

@@ -5,4 +5,5 @@ execute if data storage item:bonus random_bonus{"level":"green"} run loot replac
 execute if data storage item:bonus random_bonus{"level":"blue"} run loot replace block 0 0 1 container.0 loot item:gameparty/mixed/blue
 execute if data storage item:bonus random_bonus{"level":"purple"} run loot replace block 0 0 1 container.0 loot item:gameparty/mixed/purple
 data modify storage item:bonus item_buff prepend from block 0 0 1 Items[{"Slot":0b}]
+function item:bonus_item/random_bonus_rename
 execute if score $item.random.count mem matches 1.. run function item:bonus_item/random_mixed

data/item/functions/bonus_item/random_score.mcfunction

@@ -5,4 +5,5 @@ execute if data storage item:bonus random_bonus{"level":"green"} run loot replac
 execute if data storage item:bonus random_bonus{"level":"blue"} run loot replace block 0 0 1 container.0 loot item:gameparty/score/blue
 execute if data storage item:bonus random_bonus{"level":"purple"} run loot replace block 0 0 1 container.0 loot item:gameparty/score/purple
 data modify storage item:bonus item_buff prepend from block 0 0 1 Items[{"Slot":0b}]
+function item:bonus_item/random_bonus_rename
 execute if score $item.random.count mem matches 1.. run function item:bonus_item/random_score

data/ltw/functions/init.mcfunction

@@ -23,10 +23,12 @@ gamerule doLimitedCrafting true
 gamerule announceAdvancements true
 
 # 主寄存区块：将所有需要不卸载的都放里面
-#   已占用：(0,0,0) (0,0,1)
+#   已占用：(0,0,0) (0,0,1) (0,1,0) (0,1,1)
 forceload add 0 0
 setblock 0 0 0 jukebox
 setblock 0 0 1 shulker_box
+setblock 0 1 0 minecraft:acacia_wall_sign[facing=north]
+setblock 0 1 1 stone
 
 # 记分板
 scoreboard objectives remove temp

data/mini/functions/hotpm/game_end.mcfunction

@@ -1,3 +1,4 @@
+scoreboard players add @a[tag=mini_running] surviveRound 1
 execute as @a[team=playing] run scoreboard players operation @s mini_score = @s surviveRound
 # 结束热土豆
 forceload remove 1000 3000 1100 3100