diff --git a/Asset/data/asset/functions/mob/0421.silver_turret/attack/.mcfunction b/Asset/data/asset/functions/mob/0421.silver_turret/attack/.mcfunction index bbf738a98c..ed85de8458 100644 --- a/Asset/data/asset/functions/mob/0421.silver_turret/attack/.mcfunction +++ b/Asset/data/asset/functions/mob/0421.silver_turret/attack/.mcfunction @@ -19,7 +19,7 @@ # 第二属性 data modify storage lib: Argument.ElementType set value "None" # デスログ - data modify storage lib: Argument.DeathMessage append value '[{"translate": "%1$sは%2$sに群がれて倒れてしまった","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"lib:","interpret":true}]}]' + data modify storage lib: Argument.DeathMessage append value '[{"translate": "%1$sは%2$sに群がられて倒れてしまった","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"lib:","interpret":true}]}]' # 補正functionを実行 function lib:damage/modifier # ダメージを与える diff --git a/Asset/data/asset/functions/mob/0421.silver_turret/tick/.mcfunction b/Asset/data/asset/functions/mob/0421.silver_turret/tick/.mcfunction index 7da6723f43..d1304d4a3b 100644 --- a/Asset/data/asset/functions/mob/0421.silver_turret/tick/.mcfunction +++ b/Asset/data/asset/functions/mob/0421.silver_turret/tick/.mcfunction @@ -7,9 +7,11 @@ # タレットの位置調整 execute at @s on passengers run tp @s ^ ^ ^ ~ 0 +# シミが一定以上ならreturn + execute if score @s BP.SummonCount matches 20.. run return fail + # スコア上昇 scoreboard players add @s General.Mob.Tick 1 # プレイヤーが近くにいる場合シミシミバレット発射! - execute if score @s General.Mob.Tick matches 150.. if score @s BP.SummonCount matches 20.. run scoreboard players set @s General.Mob.Tick 0 execute if score @s General.Mob.Tick matches 150.. if entity @a[tag=!PlayerShouldInvulnerable,distance=..16] run function asset:mob/0421.silver_turret/tick/fire diff --git a/Asset/data/asset/functions/mob/0422.silver_bullet/attack/.mcfunction b/Asset/data/asset/functions/mob/0422.silver_bullet/attack/.mcfunction index 2c64447f89..5c05c36cb3 100644 --- a/Asset/data/asset/functions/mob/0422.silver_bullet/attack/.mcfunction +++ b/Asset/data/asset/functions/mob/0422.silver_bullet/attack/.mcfunction @@ -19,7 +19,7 @@ # 第二属性 data modify storage lib: Argument.ElementType set value "None" # デスログ - data modify storage lib: Argument.DeathMessage append value '[{"translate": "%1$sは%2$sに群がれて倒れてしまった","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"lib:","interpret":true}]}]' + data modify storage lib: Argument.DeathMessage append value '[{"translate": "%1$sは%2$sに群がられて倒れてしまった","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"lib:","interpret":true}]}]' # 補正functionを実行 function lib:damage/modifier # ダメージを与える