From 298a84632e96fdca5d7cff632b67c03148507417 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=AF=E3=81=84=E3=81=84=E3=82=8D?= Date: Sun, 10 Aug 2025 20:14:39 +0900 Subject: [PATCH 1/9] =?UTF-8?q?:balance=5Fscale:=20[Mob=20151]=20=E7=B5=84?= =?UTF-8?q?=E6=8F=9B=E3=81=AE=E3=83=87=E3=83=90=E3=83=95=E3=81=AE=E5=80=8D?= =?UTF-8?q?=E7=8E=87=E3=82=92=E5=A2=97=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/asset/functions/mob/0151.recombined/attack/.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/mob/0151.recombined/attack/.mcfunction b/Asset/data/asset/functions/mob/0151.recombined/attack/.mcfunction index f127cde1fc..d2331c1d8a 100644 --- a/Asset/data/asset/functions/mob/0151.recombined/attack/.mcfunction +++ b/Asset/data/asset/functions/mob/0151.recombined/attack/.mcfunction @@ -22,7 +22,7 @@ # デバフを付与 function api:global_vars/get_difficulty data modify storage api: Argument.ID set value 57 - execute store result storage api: Argument.Stack int 2 run data get storage api: Return.Difficulty 1 + execute store result storage api: Argument.Stack int 4 run data get storage api: Return.Difficulty 1 data modify storage api: Argument.Duration set value 60 execute as @p[tag=Victim] run function api:entity/mob/effect/give function api:entity/mob/effect/reset From 7a6044ae9b763b077bfc5c52cfd17afad7ae5e96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=AF=E3=81=84=E3=81=84=E3=82=8D?= Date: Sun, 10 Aug 2025 20:15:14 +0900 Subject: [PATCH 2/9] =?UTF-8?q?:balance=5Fscale:=20[Mob=20154]=20=E7=A0=B4?= =?UTF-8?q?=E6=BB=85=E3=81=AE=E7=99=BA=E7=8B=82=E6=94=BB=E6=92=83=E6=99=82?= =?UTF-8?q?=E3=81=AB=E3=80=81=E5=91=A8=E5=9B=B2=E3=81=AE=E3=83=97=E3=83=AC?= =?UTF-8?q?=E3=82=A4=E3=83=A4=E3=83=BC=E3=82=92=E5=B7=BB=E3=81=8D=E8=BE=BC?= =?UTF-8?q?=E3=82=80=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mob/0154.ruin/attack/.mcfunction | 39 +++++++++++-------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/Asset/data/asset/functions/mob/0154.ruin/attack/.mcfunction b/Asset/data/asset/functions/mob/0154.ruin/attack/.mcfunction index c26df7ea5d..349eaf172d 100644 --- a/Asset/data/asset/functions/mob/0154.ruin/attack/.mcfunction +++ b/Asset/data/asset/functions/mob/0154.ruin/attack/.mcfunction @@ -9,16 +9,18 @@ #> Private # @private - #declare score_holder $DamageValue + #declare tag 4A.Target -# 腕振るやつ(タグなし) +# 腕を振る execute unless entity @s[tag=4A.Madness] run item replace entity @s weapon.mainhand with stick{CustomModelData:20064} - -# 腕振るやつ(タグあり) execute if entity @s[tag=4A.Madness] run item replace entity @s weapon.mainhand with stick{CustomModelData:20065} +# ターゲット選択 +# 理論上は１人しか存在しないはずだが念のため + execute as @a[tag=Victim,distance=..6,sort=random,limit=1] run tag @s add 4A.Target + # 演出 - execute at @p[tag=Victim] run particle block redstone_block ~ ~1 ~ 0.1 0 0.1 4.2 80 + execute at @p[tag=4A.Target] run particle block redstone_block ~ ~1 ~ 0.1 0 0.1 4.2 80 playsound minecraft:entity.zombie.break_wooden_door hostile @a ~ ~ ~ 2 2 playsound minecraft:item.trident.thunder hostile @a ~ ~ ~ 2 2 @@ -26,14 +28,19 @@ execute unless entity @s[tag=4A.Madness] run data modify storage api: Argument.Damage set from storage asset:context this.Damage.Normal execute if entity @s[tag=4A.Madness] run data modify storage api: Argument.Damage set from storage asset:context this.Damage.Madness -# ダメージ - data modify storage api: Argument.AttackType set value "Physical" - data modify storage api: Argument.ElementType set value "None" - data modify storage api: Argument.DeathMessage append value '{"translate": "%1$sは%2$sによって存在が崩壊した","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"lib:","interpret":true}]}' - data modify storage api: Argument.DeathMessage append value '{"translate": "%1$sは%2$sにより跡形もなく破壊された","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"lib:","interpret":true}]}' - function api:damage/modifier - execute as @p[tag=Victim,distance=..6] run function api:damage/ - function api:damage/reset - -# スコアリセット - scoreboard players reset $DamageValue Temporary +# ダメージ処理 + # 通常攻撃 + data modify storage api: Argument.AttackType set value "Physical" + data modify storage api: Argument.ElementType set value "None" + data modify storage api: Argument.DeathMessage append value '{"translate": "%1$sは%2$sによって存在が崩壊した","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"lib:","interpret":true}]}' + data modify storage api: Argument.DeathMessage append value '{"translate": "%1$sは%2$sにより跡形もなく破壊された","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"lib:","interpret":true}]}' + function api:damage/modifier + execute as @a[tag=4A.Target,distance=..6,limit=1] run function api:damage/ + # 破滅時は周囲のプレイヤーも巻き込む + execute if entity @s[tag=4A.Madness] store result storage api: Argument.Damage double 0.0050 run data get storage api: Argument.Damage 100 + execute if entity @s[tag=4A.Madness] as @a[tag=4A.Target,distance=..6,limit=1] at @s as @a[tag=!4A.Target,distance=..4] run function api:damage/ + # リセット + function api:damage/reset + +# リセット + tag @a[tag=4A.Target,distance=..6,limit=1] remove 4A.Target From e658123af7b3b47f3690a1d6208203827489421d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=AF=E3=81=84=E3=81=84=E3=82=8D?= Date: Mon, 11 Aug 2025 06:44:41 +0900 Subject: [PATCH 3/9] =?UTF-8?q?:bento:=20[Effect=2021=20&=2071]=20MP?= =?UTF-8?q?=E5=9B=9E=E5=BE=A9=E9=87=8F=E4=BD=8E=E4=B8=8B=E3=81=AE=E3=83=87?= =?UTF-8?q?=E3=83=90=E3=83=95=E3=82=92=E4=BD=9C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../0021.mp_regen_debuff/_/end.mcfunction | 7 ++++ .../0021.mp_regen_debuff/_/given.mcfunction | 7 ++++ .../_/re-given.mcfunction | 7 ++++ .../_/register.mcfunction | 7 ++++ .../0021.mp_regen_debuff/_/remove.mcfunction | 7 ++++ .../0021.mp_regen_debuff/end/.mcfunction | 7 ++++ .../0021.mp_regen_debuff/given/.mcfunction | 7 ++++ .../modifier/add.mcfunction | 8 ++++ .../modifier/remove.mcfunction | 6 +++ .../0021.mp_regen_debuff/re-given/.mcfunction | 8 ++++ .../0021.mp_regen_debuff/register.mcfunction | 39 +++++++++++++++++++ .../0021.mp_regen_debuff/remove/.mcfunction | 7 ++++ .../_/register.mcfunction | 7 ++++ .../0071.mp_regen_debuff/register.mcfunction | 13 +++++++ .../data/asset/tags/functions/effect/end.json | 3 +- .../asset/tags/functions/effect/given.json | 3 +- .../asset/tags/functions/effect/re-given.json | 3 +- .../asset/tags/functions/effect/register.json | 4 +- .../asset/tags/functions/effect/remove.json | 3 +- 19 files changed, 148 insertions(+), 5 deletions(-) create mode 100644 Asset/data/asset/functions/effect/0021.mp_regen_debuff/_/end.mcfunction create mode 100644 Asset/data/asset/functions/effect/0021.mp_regen_debuff/_/given.mcfunction create mode 100644 Asset/data/asset/functions/effect/0021.mp_regen_debuff/_/re-given.mcfunction create mode 100644 Asset/data/asset/functions/effect/0021.mp_regen_debuff/_/register.mcfunction create mode 100644 Asset/data/asset/functions/effect/0021.mp_regen_debuff/_/remove.mcfunction create mode 100644 Asset/data/asset/functions/effect/0021.mp_regen_debuff/end/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0021.mp_regen_debuff/given/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0021.mp_regen_debuff/modifier/add.mcfunction create mode 100644 Asset/data/asset/functions/effect/0021.mp_regen_debuff/modifier/remove.mcfunction create mode 100644 Asset/data/asset/functions/effect/0021.mp_regen_debuff/re-given/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0021.mp_regen_debuff/register.mcfunction create mode 100644 Asset/data/asset/functions/effect/0021.mp_regen_debuff/remove/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0071.mp_regen_debuff/_/register.mcfunction create mode 100644 Asset/data/asset/functions/effect/0071.mp_regen_debuff/register.mcfunction diff --git a/Asset/data/asset/functions/effect/0021.mp_regen_debuff/_/end.mcfunction b/Asset/data/asset/functions/effect/0021.mp_regen_debuff/_/end.mcfunction new file mode 100644 index 0000000000..79518f9c99 --- /dev/null +++ b/Asset/data/asset/functions/effect/0021.mp_regen_debuff/_/end.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0021.mp_regen_debuff/_/end +# +# Effectの効果の終了時に実行されるfunction +# +# @within tag/function asset:effect/end + +execute if data storage asset:context {id:21} run function asset:effect/0021.mp_regen_debuff/end/ diff --git a/Asset/data/asset/functions/effect/0021.mp_regen_debuff/_/given.mcfunction b/Asset/data/asset/functions/effect/0021.mp_regen_debuff/_/given.mcfunction new file mode 100644 index 0000000000..63203c56ad --- /dev/null +++ b/Asset/data/asset/functions/effect/0021.mp_regen_debuff/_/given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0021.mp_regen_debuff/_/given +# +# Effectが付与された時に実行されるfunction +# +# @within tag/function asset:effect/given + +execute if data storage asset:context {id:21} run function asset:effect/0021.mp_regen_debuff/given/ diff --git a/Asset/data/asset/functions/effect/0021.mp_regen_debuff/_/re-given.mcfunction b/Asset/data/asset/functions/effect/0021.mp_regen_debuff/_/re-given.mcfunction new file mode 100644 index 0000000000..9d8803e988 --- /dev/null +++ b/Asset/data/asset/functions/effect/0021.mp_regen_debuff/_/re-given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0021.mp_regen_debuff/_/re-given +# +# Effectが上書きされた時に実行されるfunction +# +# @within tag/function asset:effect/re-given + +execute if data storage asset:context {id:21} run function asset:effect/0021.mp_regen_debuff/re-given/ diff --git a/Asset/data/asset/functions/effect/0021.mp_regen_debuff/_/register.mcfunction b/Asset/data/asset/functions/effect/0021.mp_regen_debuff/_/register.mcfunction new file mode 100644 index 0000000000..f83824491e --- /dev/null +++ b/Asset/data/asset/functions/effect/0021.mp_regen_debuff/_/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0021.mp_regen_debuff/_/register +# +# +# +# @within tag/function asset:effect/register + +execute if data storage asset:context {id:21} run function asset:effect/0021.mp_regen_debuff/register diff --git a/Asset/data/asset/functions/effect/0021.mp_regen_debuff/_/remove.mcfunction b/Asset/data/asset/functions/effect/0021.mp_regen_debuff/_/remove.mcfunction new file mode 100644 index 0000000000..6ea223445f --- /dev/null +++ b/Asset/data/asset/functions/effect/0021.mp_regen_debuff/_/remove.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0021.mp_regen_debuff/_/remove +# +# Effectが神器や牛乳によって削除された時に実行されるfunction +# +# @within tag/function asset:effect/remove + +execute if data storage asset:context {id:21} run function asset:effect/0021.mp_regen_debuff/remove/ diff --git a/Asset/data/asset/functions/effect/0021.mp_regen_debuff/end/.mcfunction b/Asset/data/asset/functions/effect/0021.mp_regen_debuff/end/.mcfunction new file mode 100644 index 0000000000..20f0940205 --- /dev/null +++ b/Asset/data/asset/functions/effect/0021.mp_regen_debuff/end/.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0021.mp_regen_debuff/end/ +# +# Effectの効果が切れた時の処理 +# +# @within function asset:effect/0021.mp_regen_debuff/_/end + +function asset:effect/0021.mp_regen_debuff/modifier/remove diff --git a/Asset/data/asset/functions/effect/0021.mp_regen_debuff/given/.mcfunction b/Asset/data/asset/functions/effect/0021.mp_regen_debuff/given/.mcfunction new file mode 100644 index 0000000000..3b5ab97ac1 --- /dev/null +++ b/Asset/data/asset/functions/effect/0021.mp_regen_debuff/given/.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0021.mp_regen_debuff/given/ +# +# Effectが付与された時の処理 +# +# @within function asset:effect/0021.mp_regen_debuff/_/given + +function asset:effect/0021.mp_regen_debuff/modifier/add diff --git a/Asset/data/asset/functions/effect/0021.mp_regen_debuff/modifier/add.mcfunction b/Asset/data/asset/functions/effect/0021.mp_regen_debuff/modifier/add.mcfunction new file mode 100644 index 0000000000..55bce8f0b9 --- /dev/null +++ b/Asset/data/asset/functions/effect/0021.mp_regen_debuff/modifier/add.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0021.mp_regen_debuff/modifier/add +# @within function asset:effect/0021.mp_regen_debuff/*/ + +data modify storage api: Argument.UUID set value [I;1,3,-1,0] +data modify storage api: Argument.UUID[2] set from storage asset:context id +execute store result storage api: Argument.Amount double 0.05 run data get storage asset:context Stack +data modify storage api: Argument.Operation set value "multiply" +function api:modifier/mp_regen/add diff --git a/Asset/data/asset/functions/effect/0021.mp_regen_debuff/modifier/remove.mcfunction b/Asset/data/asset/functions/effect/0021.mp_regen_debuff/modifier/remove.mcfunction new file mode 100644 index 0000000000..aa3b336596 --- /dev/null +++ b/Asset/data/asset/functions/effect/0021.mp_regen_debuff/modifier/remove.mcfunction @@ -0,0 +1,6 @@ +#> asset:effect/0021.mp_regen_debuff/modifier/remove +# @within function asset:effect/0021.mp_regen_debuff/*/ + +data modify storage api: Argument.UUID set value [I;1,3,-1,0] +data modify storage api: Argument.UUID[2] set from storage asset:context id +function api:modifier/mp_regen/remove diff --git a/Asset/data/asset/functions/effect/0021.mp_regen_debuff/re-given/.mcfunction b/Asset/data/asset/functions/effect/0021.mp_regen_debuff/re-given/.mcfunction new file mode 100644 index 0000000000..dce2ed589c --- /dev/null +++ b/Asset/data/asset/functions/effect/0021.mp_regen_debuff/re-given/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0021.mp_regen_debuff/re-given/ +# +# Effectが上書きされた時の処理 +# +# @within function asset:effect/0021.mp_regen_debuff/_/re-given + +function asset:effect/0021.mp_regen_debuff/modifier/remove +function asset:effect/0021.mp_regen_debuff/modifier/add diff --git a/Asset/data/asset/functions/effect/0021.mp_regen_debuff/register.mcfunction b/Asset/data/asset/functions/effect/0021.mp_regen_debuff/register.mcfunction new file mode 100644 index 0000000000..7fb55ac6eb --- /dev/null +++ b/Asset/data/asset/functions/effect/0021.mp_regen_debuff/register.mcfunction @@ -0,0 +1,39 @@ +#> asset:effect/0021.mp_regen_debuff/register +# +# Effectのデータを指定 +# +# @within function asset:effect/0021.mp_regen_debuff/_/register + +# ExtendsSafe (boolean) (default = false) + # data modify storage asset:effect ExtendsSafe set value true +# ID (int) + data modify storage asset:effect ID set value 21 +# 名前 (TextComponentString) + data modify storage asset:effect Name set value '{"text":"MP回復量低下"}' +# 説明文 (TextComponentString[]) + data modify storage asset:effect Description set value ['{"text":"MPが回復しにくくなる"}'] +# 効果時間 (int) (default = API || error) + # data modify storage asset:effect Duration set value +# スタック (int) (default = API || 1) + # data modify storage asset:effect Stack set value +# 効果時間の操作方法 (default = API || "replace") + # data modify storage asset:effect DurationOperation set value +# スタックの操作方法 (default = API || "replace") + # data modify storage asset:effect StackOperation set value +# 最大効果時間 (int) (default = 2147483647) + # data modify storage asset:effect MaxDuration set value +# 最大スタック (int) (default = 2147483647) + data modify storage asset:effect MaxStack set value 100 +# 悪い効果か否か (boolean) + data modify storage asset:effect IsBadEffect set value true +# 死亡時のエフェクトの処理 (default = "remove") + # data modify storage asset:effect ProcessOnDied set value +# 消すのに必要なレベル (int) (default = 1) + data modify storage asset:effect RequireClearLv set value 1 +# エフェクトをUIに表示するか (boolean) (default = true) + # data modify storage asset:effect Visible set value +# エフェクトのスタックををUIに表示するか (boolean) (default = true) + # data modify storage asset:effect StackVisible set value + +# フィールド + # data modify storage asset:effect Field set value {} diff --git a/Asset/data/asset/functions/effect/0021.mp_regen_debuff/remove/.mcfunction b/Asset/data/asset/functions/effect/0021.mp_regen_debuff/remove/.mcfunction new file mode 100644 index 0000000000..ac529775c7 --- /dev/null +++ b/Asset/data/asset/functions/effect/0021.mp_regen_debuff/remove/.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0021.mp_regen_debuff/remove/ +# +# Effectが削除された時の処理 +# +# @within function asset:effect/0021.mp_regen_debuff/_/remove + +function asset:effect/0021.mp_regen_debuff/modifier/remove diff --git a/Asset/data/asset/functions/effect/0071.mp_regen_debuff/_/register.mcfunction b/Asset/data/asset/functions/effect/0071.mp_regen_debuff/_/register.mcfunction new file mode 100644 index 0000000000..7cf26490d2 --- /dev/null +++ b/Asset/data/asset/functions/effect/0071.mp_regen_debuff/_/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0071.mp_regen_debuff/_/register +# +# +# +# @within tag/function asset:effect/register + +execute if data storage asset:context {id:71} run function asset:effect/0071.mp_regen_debuff/register diff --git a/Asset/data/asset/functions/effect/0071.mp_regen_debuff/register.mcfunction b/Asset/data/asset/functions/effect/0071.mp_regen_debuff/register.mcfunction new file mode 100644 index 0000000000..0cdd519b64 --- /dev/null +++ b/Asset/data/asset/functions/effect/0071.mp_regen_debuff/register.mcfunction @@ -0,0 +1,13 @@ +#> asset:effect/0071.mp_regen_debuff/register +# +# Effectのデータを指定 +# +# @within function asset:effect/0071.mp_regen_debuff/_/register + +# 継承 (int) + data modify storage asset:effect Extends append value 21 + function asset:effect/extends +# ID (int) + data modify storage asset:effect ID set value 71 +# 消すのに必要なレベル (int) (default = 1) + data modify storage asset:effect RequireClearLv set value 2 diff --git a/Asset/data/asset/tags/functions/effect/end.json b/Asset/data/asset/tags/functions/effect/end.json index 81710cbe5a..c9d978b7b9 100644 --- a/Asset/data/asset/tags/functions/effect/end.json +++ b/Asset/data/asset/tags/functions/effect/end.json @@ -1,5 +1,6 @@ { "values": [ + "asset:effect/0021.mp_regen_debuff/_/end", "asset:effect/0025.levitation/_/end", "asset:effect/0621.loyalty_shield/_/end", "asset:effect/0653.absolute_drive/_/end", @@ -103,4 +104,4 @@ "asset:effect/0007.defense_base_debuff/_/end", "asset:effect/0258.spirit_melody/_/end" ] -} \ No newline at end of file +} diff --git a/Asset/data/asset/tags/functions/effect/given.json b/Asset/data/asset/tags/functions/effect/given.json index c20c6c5587..c9fbcc0860 100644 --- a/Asset/data/asset/tags/functions/effect/given.json +++ b/Asset/data/asset/tags/functions/effect/given.json @@ -1,5 +1,6 @@ { "values": [ + "asset:effect/0021.mp_regen_debuff/_/given", "asset:effect/0315.charge_of_aurora_scythe/_/given", "asset:effect/0621.loyalty_shield/_/given", "asset:effect/0653.absolute_drive/_/given", @@ -97,4 +98,4 @@ "asset:effect/0007.defense_base_debuff/_/given", "asset:effect/0258.spirit_melody/_/given" ] -} \ No newline at end of file +} diff --git a/Asset/data/asset/tags/functions/effect/re-given.json b/Asset/data/asset/tags/functions/effect/re-given.json index baf0379fc2..ed5df98931 100644 --- a/Asset/data/asset/tags/functions/effect/re-given.json +++ b/Asset/data/asset/tags/functions/effect/re-given.json @@ -1,5 +1,6 @@ { "values": [ + "asset:effect/0021.mp_regen_debuff/_/re-given", "asset:effect/0029.poison/_/re-given", "asset:effect/0030.wither/_/re-given", "asset:effect/0621.loyalty_shield/_/re-given", @@ -59,4 +60,4 @@ "asset:effect/0007.defense_base_debuff/_/re-given", "asset:effect/0258.spirit_melody/_/re-given" ] -} \ No newline at end of file +} diff --git a/Asset/data/asset/tags/functions/effect/register.json b/Asset/data/asset/tags/functions/effect/register.json index 70807fbb5f..8def14f649 100644 --- a/Asset/data/asset/tags/functions/effect/register.json +++ b/Asset/data/asset/tags/functions/effect/register.json @@ -1,5 +1,7 @@ { "values": [ + "asset:effect/0071.mp_regen_debuff/_/register", + "asset:effect/0021.mp_regen_debuff/_/register", "asset:effect/0025.levitation/_/register", "asset:effect/0247.great_demon_armor/_/register", "asset:effect/0246.flame_devil_armor/_/register", @@ -167,4 +169,4 @@ "asset:effect/0007.defense_base_debuff/_/register", "asset:effect/0258.spirit_melody/_/register" ] -} \ No newline at end of file +} diff --git a/Asset/data/asset/tags/functions/effect/remove.json b/Asset/data/asset/tags/functions/effect/remove.json index 3e8ceea4eb..de2cfad567 100644 --- a/Asset/data/asset/tags/functions/effect/remove.json +++ b/Asset/data/asset/tags/functions/effect/remove.json @@ -1,5 +1,6 @@ { "values": [ + "asset:effect/0021.mp_regen_debuff/_/remove", "asset:effect/0025.levitation/_/remove", "asset:effect/0245.flame_hunter_attire/_/remove", "asset:effect/0255.kaguya_s_difficulties/_/remove", @@ -111,4 +112,4 @@ "asset:effect/0007.defense_base_debuff/_/remove", "asset:effect/0258.spirit_melody/_/remove" ] -} \ No newline at end of file +} From 2ba305837e36943a6f3c5b1ac0bff61169f4145f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=AF=E3=81=84=E3=81=84=E3=82=8D?= Date: Mon, 11 Aug 2025 06:46:07 +0900 Subject: [PATCH 4/9] =?UTF-8?q?:balance=5Fscale:=20[Mob=20152]=20=E6=AC=B2?= =?UTF-8?q?=E6=9C=9B=E3=81=AEMP=E5=90=B8=E5=8F=8E=E5=BE=8C=E3=81=AE?= =?UTF-8?q?=E6=94=BB=E6=92=83=E3=82=92MP=E5=9B=9E=E5=BE=A9=E9=87=8F?= =?UTF-8?q?=E4=BD=8E=E4=B8=8B=E3=83=87=E3=83=90=E3=83=95=E3=82=92=E4=B8=8E?= =?UTF-8?q?=E3=81=88=E3=82=8B=E3=82=82=E3=81=AE=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mob/0152.desire/attack/release.mcfunction | 14 +++++++++++--- .../functions/mob/0152.desire/register.mcfunction | 2 +- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Asset/data/asset/functions/mob/0152.desire/attack/release.mcfunction b/Asset/data/asset/functions/mob/0152.desire/attack/release.mcfunction index 2635b95cb5..8b494e1408 100644 --- a/Asset/data/asset/functions/mob/0152.desire/attack/release.mcfunction +++ b/Asset/data/asset/functions/mob/0152.desire/attack/release.mcfunction @@ -5,20 +5,28 @@ # @within function asset:mob/0152.desire/attack/ # 演出 - execute at @p[tag=Victim,distance=..10] run particle minecraft:dragon_breath ~ ~1 ~ 0.5 0.5 0.5 0.03 200 + execute at @a[tag=Victim,distance=..6,limit=1] run particle minecraft:dragon_breath ~ ~1 ~ 0.5 0.5 0.5 0.03 200 playsound minecraft:entity.evoker.prepare_summon hostile @a ~ ~ ~ 1 2 playsound minecraft:entity.wither.hurt hostile @a ~ ~ ~ 1 1 # ダメージ - data modify storage api: Argument.Damage set value 55f + data modify storage api: Argument.Damage set value 41f data modify storage api: Argument.AttackType set value "Magic" data modify storage api: Argument.ElementType set value "None" data modify storage api: Argument.DeathMessage append value '{"translate": "%1$sは%2$sにあらゆる欲を押し付けられた","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"lib:","interpret":true}]}' data modify storage api: Argument.DeathMessage append value '{"translate": "%1$sは%2$sに命までも吸い取られた","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"lib:","interpret":true}]}' function api:damage/modifier - execute as @p[tag=Victim,distance=..32] run function api:damage/ + execute as @p[tag=Victim,distance=..6,limit=1] run function api:damage/ function api:damage/reset +# MP回復量減少 + function api:global_vars/get_difficulty + data modify storage api: Argument.ID set value 72 + execute store result storage api: Argument.Stack int 4 run data get storage api: Return.Difficulty 1 + data modify storage api: Argument.Duration set value 100 + execute as @a[tag=Victim,distance=..6,limit=1] run function api:entity/mob/effect/give + function api:entity/mob/effect/reset + # タグリセット tag @s remove RunOnce tag @s remove 48.HasMP diff --git a/Asset/data/asset/functions/mob/0152.desire/register.mcfunction b/Asset/data/asset/functions/mob/0152.desire/register.mcfunction index cf0eebfeb5..d4fc40c1ce 100644 --- a/Asset/data/asset/functions/mob/0152.desire/register.mcfunction +++ b/Asset/data/asset/functions/mob/0152.desire/register.mcfunction @@ -10,7 +10,7 @@ # 名前 (TextComponentString) (オプション) data modify storage asset:mob Name set value '{"text":"欲望","color":"#FF14F7"}' # Mobの説明文 (TextComponentString[]) (オプション) - data modify storage asset:mob Lore set value ['{"text":"これは罪だ。","color":"white"}','{"text":"MPを吸い取り、そのMPで威力を増加させる。","color":"white"}'] + data modify storage asset:mob Lore set value ['{"text":"これは罪だ。","color":"white"}','{"text":"MPを吸い取り利用して、敵性存在の魔力を乱す。","color":"white"}'] # 武器 # メインハンド (Compound(Item)) (オプション) # data modify storage asset:mob Weapon.Mainhand set value From f4424ae48068b6f15e390c80fba784a20c05e310 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=AF=E3=81=84=E3=81=84=E3=82=8D?= Date: Mon, 11 Aug 2025 06:54:01 +0900 Subject: [PATCH 5/9] =?UTF-8?q?:adhesive=5Fbandage:=20[Object=202072]=20?= =?UTF-8?q?=E3=83=95=E3=82=A9=E3=83=AB=E3=83=80=E5=90=8D=E3=81=AE=E3=83=9F?= =?UTF-8?q?=E3=82=B9=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../register.mcfunction | 10 +++++----- .../summon/.mcfunction | 2 +- .../summon/debug.mcfunction | 4 ++-- .../tick/.mcfunction | 4 ++-- .../tick/debuff.mcfunction | 4 ++-- .../functions/object/alias/2072/register.mcfunction | 2 +- .../functions/object/alias/2072/summon.mcfunction | 2 +- .../asset/functions/object/alias/2072/tick.mcfunction | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) rename Asset/data/asset/functions/object/{2072.contamination_gus => 2072.contamination_gas}/register.mcfunction (64%) rename Asset/data/asset/functions/object/{2072.contamination_gus => 2072.contamination_gas}/summon/.mcfunction (80%) rename Asset/data/asset/functions/object/{2072.contamination_gus => 2072.contamination_gas}/summon/debug.mcfunction (67%) rename Asset/data/asset/functions/object/{2072.contamination_gus => 2072.contamination_gas}/tick/.mcfunction (70%) rename Asset/data/asset/functions/object/{2072.contamination_gus => 2072.contamination_gas}/tick/debuff.mcfunction (93%) diff --git a/Asset/data/asset/functions/object/2072.contamination_gus/register.mcfunction b/Asset/data/asset/functions/object/2072.contamination_gas/register.mcfunction similarity index 64% rename from Asset/data/asset/functions/object/2072.contamination_gus/register.mcfunction rename to Asset/data/asset/functions/object/2072.contamination_gas/register.mcfunction index cb147fd8fe..5350b49f07 100644 --- a/Asset/data/asset/functions/object/2072.contamination_gus/register.mcfunction +++ b/Asset/data/asset/functions/object/2072.contamination_gas/register.mcfunction @@ -1,20 +1,20 @@ -#> asset:object/2072.contamination_gus/register +#> asset:object/2072.contamination_gas/register # # Objectのデータを指定 # # @within function asset:object/alias/2072/register # 継承(オプション) - # data modify storage asset:object Extends append value + # data modify storage asset:object Extends append value # function asset:object/extends # 他のObjectに継承されることを許可するか (boolean) (オプション) - # data modify storage asset:object ExtendsSafe set value + # data modify storage asset:object ExtendsSafe set value # 継承されることを前提とした、抽象的なObjectであるかどうか(boolean) data modify storage asset:object IsAbstract set value false # Tickするかどうか(boolean) (オプション) - # data modify storage asset:object IsTicking set value + # data modify storage asset:object IsTicking set value # ID (int) data modify storage asset:object ID set value 2072 # フィールド(オプション) - # data modify storage asset:object Field.myValue set value \ No newline at end of file + # data modify storage asset:object Field.myValue set value diff --git a/Asset/data/asset/functions/object/2072.contamination_gus/summon/.mcfunction b/Asset/data/asset/functions/object/2072.contamination_gas/summon/.mcfunction similarity index 80% rename from Asset/data/asset/functions/object/2072.contamination_gus/summon/.mcfunction rename to Asset/data/asset/functions/object/2072.contamination_gas/summon/.mcfunction index eb6b610140..91e21ee3f8 100644 --- a/Asset/data/asset/functions/object/2072.contamination_gus/summon/.mcfunction +++ b/Asset/data/asset/functions/object/2072.contamination_gas/summon/.mcfunction @@ -1,4 +1,4 @@ -#> asset:object/2072.contamination_gus/summon/ +#> asset:object/2072.contamination_gas/summon/ # # Object召喚処理の呼び出し時に実行されるfunction # diff --git a/Asset/data/asset/functions/object/2072.contamination_gus/summon/debug.mcfunction b/Asset/data/asset/functions/object/2072.contamination_gas/summon/debug.mcfunction similarity index 67% rename from Asset/data/asset/functions/object/2072.contamination_gus/summon/debug.mcfunction rename to Asset/data/asset/functions/object/2072.contamination_gas/summon/debug.mcfunction index 1e2f43dfcb..2d1f832d8c 100644 --- a/Asset/data/asset/functions/object/2072.contamination_gus/summon/debug.mcfunction +++ b/Asset/data/asset/functions/object/2072.contamination_gas/summon/debug.mcfunction @@ -1,4 +1,4 @@ -#> asset:object/2072.contamination_gus/summon/debug +#> asset:object/2072.contamination_gas/summon/debug # # 動作チェック用の召喚処理 使い終わったら消してもいいかも # @@ -7,4 +7,4 @@ # 召喚 data modify storage api: Argument.ID set value 2072 - function api:object/summon \ No newline at end of file + function api:object/summon diff --git a/Asset/data/asset/functions/object/2072.contamination_gus/tick/.mcfunction b/Asset/data/asset/functions/object/2072.contamination_gas/tick/.mcfunction similarity index 70% rename from Asset/data/asset/functions/object/2072.contamination_gus/tick/.mcfunction rename to Asset/data/asset/functions/object/2072.contamination_gas/tick/.mcfunction index 5dabd30373..c001f37ba6 100644 --- a/Asset/data/asset/functions/object/2072.contamination_gus/tick/.mcfunction +++ b/Asset/data/asset/functions/object/2072.contamination_gas/tick/.mcfunction @@ -1,4 +1,4 @@ -#> asset:object/2072.contamination_gus/tick/ +#> asset:object/2072.contamination_gas/tick/ # # Objectのtick時の処理 # @@ -13,7 +13,7 @@ # 効果 # デバフの種類が多く実行数が多いためif entityで条件をつけておく - execute if entity @a[gamemode=!spectator,distance=..3] run function asset:object/2072.contamination_gus/tick/debuff + execute if entity @a[gamemode=!spectator,distance=..3,limit=1] run function asset:object/2072.contamination_gas/tick/debuff # 消滅処理 kill @s[scores={General.Object.Tick=20..}] diff --git a/Asset/data/asset/functions/object/2072.contamination_gus/tick/debuff.mcfunction b/Asset/data/asset/functions/object/2072.contamination_gas/tick/debuff.mcfunction similarity index 93% rename from Asset/data/asset/functions/object/2072.contamination_gus/tick/debuff.mcfunction rename to Asset/data/asset/functions/object/2072.contamination_gas/tick/debuff.mcfunction index 01ae6c31e8..acf63b4eb4 100644 --- a/Asset/data/asset/functions/object/2072.contamination_gus/tick/debuff.mcfunction +++ b/Asset/data/asset/functions/object/2072.contamination_gas/tick/debuff.mcfunction @@ -1,8 +1,8 @@ -#> asset:object/2072.contamination_gus/tick/debuff +#> asset:object/2072.contamination_gas/tick/debuff # # # -# @within function asset:object/2072.contamination_gus/tick/ +# @within function asset:object/2072.contamination_gas/tick/ # 移動速度低下、暗闇、採掘速度低下、吐き気 diff --git a/Asset/data/asset/functions/object/alias/2072/register.mcfunction b/Asset/data/asset/functions/object/alias/2072/register.mcfunction index a6b32402f4..6492853280 100644 --- a/Asset/data/asset/functions/object/alias/2072/register.mcfunction +++ b/Asset/data/asset/functions/object/alias/2072/register.mcfunction @@ -5,4 +5,4 @@ # @within asset_manager:object/summon/register.m # 元の登録処理を呼び出す - function asset:object/2072.contamination_gus/register \ No newline at end of file + function asset:object/2072.contamination_gas/register diff --git a/Asset/data/asset/functions/object/alias/2072/summon.mcfunction b/Asset/data/asset/functions/object/alias/2072/summon.mcfunction index f0eb740a6a..e8c016bbf4 100644 --- a/Asset/data/asset/functions/object/alias/2072/summon.mcfunction +++ b/Asset/data/asset/functions/object/alias/2072/summon.mcfunction @@ -5,4 +5,4 @@ # @within asset_manager:object/summon/summon.m # 元の召喚処理を呼び出す - function asset:object/2072.contamination_gus/summon/ \ No newline at end of file + function asset:object/2072.contamination_gas/summon/ diff --git a/Asset/data/asset/functions/object/alias/2072/tick.mcfunction b/Asset/data/asset/functions/object/alias/2072/tick.mcfunction index 67c92c227d..6456e06d7c 100644 --- a/Asset/data/asset/functions/object/alias/2072/tick.mcfunction +++ b/Asset/data/asset/functions/object/alias/2072/tick.mcfunction @@ -5,4 +5,4 @@ # @within asset_manager:object/tick/tick.m # 元のTick処理を呼び出す - function asset:object/2072.contamination_gus/tick/ \ No newline at end of file + function asset:object/2072.contamination_gas/tick/ From ce79bac3efcafe0166a5fde0cfd4075290587a24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=AF=E3=81=84=E3=81=84=E3=82=8D?= Date: Mon, 11 Aug 2025 06:55:20 +0900 Subject: [PATCH 6/9] =?UTF-8?q?:bug:=20[Mob=20150]=20=E6=B1=9A=E6=9F=93?= =?UTF-8?q?=E3=81=AE=E8=A2=AB=E3=83=80=E3=83=A1=E3=83=BC=E3=82=B8=E6=99=82?= =?UTF-8?q?=E3=81=AB=E3=81=8A=E3=81=91=E3=82=8B=E3=82=AC=E3=82=B9=E3=81=AE?= =?UTF-8?q?=E5=8F=AC=E5=96=9A=E6=9D=A1=E4=BB=B6=E3=81=8C=E6=AD=A3=E3=81=97?= =?UTF-8?q?=E3=81=8F=E3=81=AA=E3=81=84=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../asset/functions/mob/0150.contamination/hurt/.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/mob/0150.contamination/hurt/.mcfunction b/Asset/data/asset/functions/mob/0150.contamination/hurt/.mcfunction index 6f8a1fbf28..c71180de7d 100644 --- a/Asset/data/asset/functions/mob/0150.contamination/hurt/.mcfunction +++ b/Asset/data/asset/functions/mob/0150.contamination/hurt/.mcfunction @@ -8,4 +8,4 @@ execute if data storage asset:context Hurt{IsDoT:true} run return fail # 確率で召喚 - execute if predicate lib:random_pass_per/20 unless entity @e[type=area_effect_cloud,scores={MobID=158},distance=..3] run function asset:mob/0150.contamination/gus_summon + execute if predicate lib:random_pass_per/20 unless entity @e[type=marker,scores={ObjectID=2072},distance=..3,limit=1] run function asset:mob/0150.contamination/gus_summon From 1eb35c522dc06664462fbd5d409d70c2c48d628f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=AF=E3=81=84=E3=81=84=E3=82=8D?= Date: Mon, 11 Aug 2025 06:55:58 +0900 Subject: [PATCH 7/9] =?UTF-8?q?:adhesive=5Fbandage:=20[Mob=20150]=20?= =?UTF-8?q?=E4=B8=80=E9=83=A8=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E5=90=8D?= =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mob/0150.contamination/attack/.mcfunction | 2 +- .../mob/0150.contamination/hurt/.mcfunction | 2 +- .../{gus_summon.mcfunction => summon_gas.mcfunction} | 12 +++++++----- 3 files changed, 9 insertions(+), 7 deletions(-) rename Asset/data/asset/functions/mob/0150.contamination/{gus_summon.mcfunction => summon_gas.mcfunction} (71%) diff --git a/Asset/data/asset/functions/mob/0150.contamination/attack/.mcfunction b/Asset/data/asset/functions/mob/0150.contamination/attack/.mcfunction index 8cf44042b4..6d771a1e34 100644 --- a/Asset/data/asset/functions/mob/0150.contamination/attack/.mcfunction +++ b/Asset/data/asset/functions/mob/0150.contamination/attack/.mcfunction @@ -8,7 +8,7 @@ execute unless data storage asset:context Attack{IsVanilla:true} run return fail # ガス召喚 - execute at @p[tag=Victim,distance=..32] run function asset:mob/0150.contamination/gus_summon + execute at @p[tag=Victim,distance=..32] run function asset:mob/0150.contamination/summon_gas # ダメージ data modify storage api: Argument.Damage set value 41f diff --git a/Asset/data/asset/functions/mob/0150.contamination/hurt/.mcfunction b/Asset/data/asset/functions/mob/0150.contamination/hurt/.mcfunction index c71180de7d..0e7c92a3cd 100644 --- a/Asset/data/asset/functions/mob/0150.contamination/hurt/.mcfunction +++ b/Asset/data/asset/functions/mob/0150.contamination/hurt/.mcfunction @@ -8,4 +8,4 @@ execute if data storage asset:context Hurt{IsDoT:true} run return fail # 確率で召喚 - execute if predicate lib:random_pass_per/20 unless entity @e[type=marker,scores={ObjectID=2072},distance=..3,limit=1] run function asset:mob/0150.contamination/gus_summon + execute if predicate lib:random_pass_per/20 unless entity @e[type=marker,scores={ObjectID=2072},distance=..3,limit=1] run function asset:mob/0150.contamination/summon_gas diff --git a/Asset/data/asset/functions/mob/0150.contamination/gus_summon.mcfunction b/Asset/data/asset/functions/mob/0150.contamination/summon_gas.mcfunction similarity index 71% rename from Asset/data/asset/functions/mob/0150.contamination/gus_summon.mcfunction rename to Asset/data/asset/functions/mob/0150.contamination/summon_gas.mcfunction index 84d8f3ef52..bd3f05ca21 100644 --- a/Asset/data/asset/functions/mob/0150.contamination/gus_summon.mcfunction +++ b/Asset/data/asset/functions/mob/0150.contamination/summon_gas.mcfunction @@ -1,13 +1,15 @@ -#> asset:mob/0150.contamination/gus_summon +#> asset:mob/0150.contamination/summon_gas # # # -# @within function asset:mob/0150.contamination/**/** +# @within function +# asset:mob/0150.contamination/attack/ +# asset:mob/0150.contamination/hurt/ -# ガスを召喚する - data modify storage api: Argument.ID set value 2072 - function api:object/summon # 演出 playsound minecraft:entity.generic.extinguish_fire hostile @a ~ ~ ~ 1 0.7 playsound minecraft:entity.generic.extinguish_fire hostile @a ~ ~ ~ 1 1 playsound minecraft:entity.generic.extinguish_fire hostile @a ~ ~ ~ 1 1.7 +# ガスを召喚する + data modify storage api: Argument.ID set value 2072 + function api:object/summon From 88f20a977b0c403f0dafb183661c8790182f044f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=AF=E3=81=84=E3=81=84=E3=82=8D?= Date: Mon, 11 Aug 2025 07:00:27 +0900 Subject: [PATCH 8/9] =?UTF-8?q?:balance=5Fscale:=20[Mob=20150]=20=E6=B1=9A?= =?UTF-8?q?=E6=9F=93=E3=81=AE=E3=82=AC=E3=82=B9=E3=81=AB=E8=A2=AB=E5=9B=9E?= =?UTF-8?q?=E5=BE=A9=E9=87=8F=E4=BD=8E=E4=B8=8B=E3=81=AE=E3=83=87=E3=83=90?= =?UTF-8?q?=E3=83=95=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../2072.contamination_gas/tick/debuff.mcfunction | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Asset/data/asset/functions/object/2072.contamination_gas/tick/debuff.mcfunction b/Asset/data/asset/functions/object/2072.contamination_gas/tick/debuff.mcfunction index acf63b4eb4..540ff1c493 100644 --- a/Asset/data/asset/functions/object/2072.contamination_gas/tick/debuff.mcfunction +++ b/Asset/data/asset/functions/object/2072.contamination_gas/tick/debuff.mcfunction @@ -4,7 +4,7 @@ # # @within function asset:object/2072.contamination_gas/tick/ -# 移動速度低下、暗闇、採掘速度低下、吐き気 +# 移動速度低下、暗闇、採掘速度低下、吐き気、非回復量低下 # スタックのあるものは難易度比例でスタックが増える # スタックのないものは難易度比例で効果時間が増える @@ -12,8 +12,14 @@ # 難易度値取得 function api:global_vars/get_difficulty +# 被回復量低下 + data modify storage api: Argument set value {ID:64,Duration:60} + execute store result storage api: Argument.Stack int 4 run data get storage api: Return.Difficulty + execute as @a[gamemode=!spectator,distance=..3] run function api:entity/mob/effect/give + function api:entity/mob/effect/reset + # 移動速度低下 - data modify storage api: Argument set value {ID:67,Duration:60} + data modify storage api: Argument.ID set value {ID:67,Duration:60} execute store result storage api: Argument.Stack int 3 run data get storage api: Return.Difficulty execute as @a[gamemode=!spectator,distance=..3] run function api:entity/mob/effect/give function api:entity/mob/effect/reset From d60424456bde65abfa187e45875514c79e9dc948 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=AF=E3=81=84=E3=81=84=E3=82=8D?= Date: Mon, 11 Aug 2025 07:09:13 +0900 Subject: [PATCH 9/9] =?UTF-8?q?:balance=5Fscale:=20[Mob=20156]=20=E4=BE=B5?= =?UTF-8?q?=E5=AE=B3=E3=81=AE=E8=87=AA=E7=88=86=E3=83=80=E3=83=A1=E3=83=BC?= =?UTF-8?q?=E3=82=B8=E3=82=92=E5=A2=97=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/mob/0156.infringement/tick/explode.mcfunction | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Asset/data/asset/functions/mob/0156.infringement/tick/explode.mcfunction b/Asset/data/asset/functions/mob/0156.infringement/tick/explode.mcfunction index 32ec7128aa..8f4f3e0ff6 100644 --- a/Asset/data/asset/functions/mob/0156.infringement/tick/explode.mcfunction +++ b/Asset/data/asset/functions/mob/0156.infringement/tick/explode.mcfunction @@ -15,8 +15,8 @@ playsound entity.generic.explode hostile @a ~ ~ ~ # ダメージ - data modify storage api: Argument.Damage set value 35f - execute if predicate api:global_vars/difficulty/min/3_blessless run data modify storage api: Argument.Damage set value 45f + data modify storage api: Argument.Damage set value 50f + execute if predicate api:global_vars/difficulty/min/3_blessless run data modify storage api: Argument.Damage set value 65f data modify storage api: Argument.AttackType set value "Physical" data modify storage api: Argument.ElementType set value "Water" data modify storage api: Argument.DeathMessage append value '{"translate": "%1$sは%2$sに存在を侵害された","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"lib:","interpret":true}]}'