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

data/item/functions/bonus_item/add_score.mcfunction

@@ -18,14 +18,14 @@ execute if score #bonus_add_score mem matches 100 if score $random mem matches 0
 execute if score #bonus_add_score mem matches 100 if score $random mem matches 0 run tellraw @a ["",{"text": ">> ","color":"red","bold": true},{"selector": "@s","color":"red"}," 的硬币投出了反面, 得分减半, 当前共有 ",{"score": {"name": "@s","objective": "total_score"},"color":"red"},{"text": " 分", "color":"red"}]
 
 # 200：偷分
-execute if score #bonus_add_score mem matches 200 run scoreboard players add @s total_score 1
-execute if score #bonus_add_score mem matches 200 run scoreboard players add @s total_score_disp 1
 scoreboard players set #score_max mem -2147483648
 execute as @a run function ltw:main/get_max_score
 tag @a remove highest
 execute as @a if score @s total_score = #score_max mem run tag @s add highest
-execute if score #bonus_add_score mem matches 200 run scoreboard players remove @a[tag=highest,limit=1,sort=furthest] total_score 1
-execute if score #bonus_add_score mem matches 200 run scoreboard players remove @a[tag=highest,limit=1,sort=furthest] total_score_disp 1
 execute if score #bonus_add_score mem matches 200 if entity @s[tag=highest] run tellraw @a ["",{"text": ">> ","color":"aqua","bold": true},{"selector": "@s","color":"aqua"}," 试图偷取自己的分数……"]
 execute if score #bonus_add_score mem matches 200 if entity @s[tag=!highest] run tellraw @a ["",{"text": ">> ","color":"red","bold": true},{"selector": "@a[tag=highest,limit=1,sort=furthest]","color":"red"}," 被偷取了 ",{"text": "1 分","color":"red"},", 当前共有 ",{"score": {"name": "@a[tag=highest,limit=1,sort=furthest]","objective": "total_score"}}, " 分"]
 execute if score #bonus_add_score mem matches 200 if entity @s[tag=!highest] run tellraw @a ["",{"text": ">> ","color":"green","bold": true},{"selector": "@s","color":"green"}," 偷取了 ",{"text": "1 分","color":"green"},", 当前共有 ",{"score": {"name": "@s","objective": "total_score"}}, " 分"]
+execute if score #bonus_add_score mem matches 200 run scoreboard players add @s total_score 1
+execute if score #bonus_add_score mem matches 200 run scoreboard players add @s total_score_disp 1
+execute if score #bonus_add_score mem matches 200 run scoreboard players remove @a[tag=highest,limit=1,sort=furthest] total_score 1
+execute if score #bonus_add_score mem matches 200 run scoreboard players remove @a[tag=highest,limit=1,sort=furthest] total_score_disp 1

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

@@ -40,7 +40,7 @@
     "functions": [
         {
             "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"速度 (0:30)\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"CustomPotionEffects\":[{\"Id\":1,\"Amplifier\":0,\"Duration\":600}],\"CustomPotionColor\":8039610,\"display\":{\"Name\":\"{\\\"text\\\":\\\"喷溅型速度药水\\\",\\\"italic\\\":0,\\\"color\\\":\\\"white\\\"}\"}}"
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"速度 II (0:20)\\\",\\\"color\\\":\\\"white\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"CustomPotionEffects\":[{\"Id\":1,\"Amplifier\":1,\"Duration\":400}],\"CustomPotionColor\":8039610,\"display\":{\"Name\":\"{\\\"text\\\":\\\"喷溅型速度药水\\\",\\\"italic\\\":0,\\\"color\\\":\\\"white\\\"}\"}}"
         }
     ]
 },

data/mini/functions/hotpm/game/pm_init.mcfunction

@@ -4,9 +4,9 @@ function mini:hotpm/game/pm_get
 # 告知玩家
 tellraw @a ["",{"text":">> ","color":"red","bold": true},{"selector":"@s","color":"red"}," 幸运地获得了美味的土豆!"]
 
-# 土豆爆炸时间 = 1.5 * 存活人数 + 5（秒）
-scoreboard players set $countdown_fast mem 50
-execute as @a[tag=mini_running] run scoreboard players add $countdown_fast mem 15
+# 土豆爆炸时间 = 存活人数 + 6（秒）
+scoreboard players set $countdown_fast mem 60
+execute as @a[tag=mini_running] run scoreboard players add $countdown_fast mem 10
 
 # 删除效果云
 kill @s[type=area_effect_cloud,tag=pm_boom]

data/mini/functions/hotpm/player_enter.mcfunction

@@ -17,7 +17,7 @@ tag @s remove pm_damage_taken
 
 # 传送玩家
 spreadplayers 1023 3021 5 5 false @s[tag=!watcher,tag=!rejoining,tag=!debug]
-execute if entity @s[tag=!watcher,tag=!rejoining,tag=!debug] run schedule function mini:hotpm/player_enter2 1t replace
+schedule function mini:hotpm/player_enter2 1t replace
 
 # 调整模式
 gamemode spectator @s[tag=!debug]

data/mini/functions/hotpm/player_enter2.mcfunction

@@ -1,2 +1,2 @@
 # spreadplayer 后不能立即传送，所以延迟 1tick
-execute as @a at @s run tp @s ~ 25 ~
+execute as @a[tag=!watcher,tag=!rejoining,tag=!debug] at @s run tp @s ~ 25 ~

data/mini/functions/phantom/game/summon.mcfunction

@@ -0,0 +1,9 @@
+# 召唤幻翼
+
+summon phantom 1030 255 6030 {Tags:["new_phantom"]}
+spreadplayers 1030 6030 20 20 false @e[tag=new_phantom]
+tp @e[tag=new_phantom] ~ 35 ~
+attribute @e[tag=new_phantom,limit=1] generic.max_health base set 8
+tag @e[tag=new_phantom] remove new_phantom
+
+say generate

data/mini/functions/phantom/game/try_summon.mcfunction

@@ -0,0 +1,11 @@
+# 尝试召唤幻翼
+# 数量要求：已有幻翼 < 玩家人数 * 3
+
+function mini:main/update_player_count
+scoreboard players operation #count mem = $player_alive mem
+scoreboard players operation #count mem += #count mem
+scoreboard players operation #count mem += #count mem
+execute as @e[tag=phantom] run scoreboard players remove #count mem 1
+
+say try generate
+execute if score #count mem matches 1.. run function mini:phantom/game/summon

data/mini/functions/phantom/tick20.mcfunction

@@ -1,4 +1,6 @@
 
+execute if score $countdown mem matches 11.. run function mini:phantom/game/try_summon
+
 # 显示倒计时
 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"}}