From a7561305ced0c564042f30e675557e5de07fbad0 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Sun, 24 May 2026 11:34:39 +0900 Subject: [PATCH 1/6] =?UTF-8?q?[Effect=20302]=20=E5=AE=89=E5=85=A8?= =?UTF-8?q?=E7=A2=BA=E8=AA=8D=E3=80=81=E3=82=88=E3=81=97=EF=BC=81=E3=82=92?= =?UTF-8?q?=E4=BD=9C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_/end.mcfunction | 7 ++++ .../_/given.mcfunction | 7 ++++ .../_/register.mcfunction | 7 ++++ .../_/remove.mcfunction | 7 ++++ .../end/.mcfunction | 8 ++++ .../given/.mcfunction | 8 ++++ .../modifier/add.mcfunction | 11 +++++ .../modifier/remove.mcfunction | 11 +++++ .../register.mcfunction | 40 +++++++++++++++++++ .../remove/.mcfunction | 8 ++++ .../data/asset/tags/functions/effect/end.json | 3 +- .../asset/tags/functions/effect/given.json | 3 +- .../asset/tags/functions/effect/register.json | 3 +- .../asset/tags/functions/effect/remove.json | 3 +- 14 files changed, 122 insertions(+), 4 deletions(-) create mode 100644 Asset/data/asset/functions/effect/0302.safety_check_complete/_/end.mcfunction create mode 100644 Asset/data/asset/functions/effect/0302.safety_check_complete/_/given.mcfunction create mode 100644 Asset/data/asset/functions/effect/0302.safety_check_complete/_/register.mcfunction create mode 100644 Asset/data/asset/functions/effect/0302.safety_check_complete/_/remove.mcfunction create mode 100644 Asset/data/asset/functions/effect/0302.safety_check_complete/end/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0302.safety_check_complete/given/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0302.safety_check_complete/modifier/add.mcfunction create mode 100644 Asset/data/asset/functions/effect/0302.safety_check_complete/modifier/remove.mcfunction create mode 100644 Asset/data/asset/functions/effect/0302.safety_check_complete/register.mcfunction create mode 100644 Asset/data/asset/functions/effect/0302.safety_check_complete/remove/.mcfunction diff --git a/Asset/data/asset/functions/effect/0302.safety_check_complete/_/end.mcfunction b/Asset/data/asset/functions/effect/0302.safety_check_complete/_/end.mcfunction new file mode 100644 index 0000000000..78644071c0 --- /dev/null +++ b/Asset/data/asset/functions/effect/0302.safety_check_complete/_/end.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0302.safety_check_complete/_/end +# +# Effectの効果の終了時に実行されるfunction +# +# @within tag/function asset:effect/end + +execute if data storage asset:context {id:302} run function asset:effect/0302.safety_check_complete/end/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0302.safety_check_complete/_/given.mcfunction b/Asset/data/asset/functions/effect/0302.safety_check_complete/_/given.mcfunction new file mode 100644 index 0000000000..1160a75998 --- /dev/null +++ b/Asset/data/asset/functions/effect/0302.safety_check_complete/_/given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0302.safety_check_complete/_/given +# +# Effectが付与された時に実行されるfunction +# +# @within tag/function asset:effect/given + +execute if data storage asset:context {id:302} run function asset:effect/0302.safety_check_complete/given/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0302.safety_check_complete/_/register.mcfunction b/Asset/data/asset/functions/effect/0302.safety_check_complete/_/register.mcfunction new file mode 100644 index 0000000000..62da05d958 --- /dev/null +++ b/Asset/data/asset/functions/effect/0302.safety_check_complete/_/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0302.safety_check_complete/_/register +# +# +# +# @within tag/function asset:effect/register + +execute if data storage asset:context {id:302} run function asset:effect/0302.safety_check_complete/register \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0302.safety_check_complete/_/remove.mcfunction b/Asset/data/asset/functions/effect/0302.safety_check_complete/_/remove.mcfunction new file mode 100644 index 0000000000..f5070c0a32 --- /dev/null +++ b/Asset/data/asset/functions/effect/0302.safety_check_complete/_/remove.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0302.safety_check_complete/_/remove +# +# Effectが神器や牛乳によって削除された時に実行されるfunction +# +# @within tag/function asset:effect/remove + +execute if data storage asset:context {id:302} run function asset:effect/0302.safety_check_complete/remove/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0302.safety_check_complete/end/.mcfunction b/Asset/data/asset/functions/effect/0302.safety_check_complete/end/.mcfunction new file mode 100644 index 0000000000..1904ffc8d1 --- /dev/null +++ b/Asset/data/asset/functions/effect/0302.safety_check_complete/end/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0302.safety_check_complete/end/ +# +# Effectの効果が切れた時の処理 +# +# @within function asset:effect/0302.safety_check_complete/_/end + +# 削除 + function asset:effect/0302.safety_check_complete/modifier/remove diff --git a/Asset/data/asset/functions/effect/0302.safety_check_complete/given/.mcfunction b/Asset/data/asset/functions/effect/0302.safety_check_complete/given/.mcfunction new file mode 100644 index 0000000000..c80b4117d4 --- /dev/null +++ b/Asset/data/asset/functions/effect/0302.safety_check_complete/given/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0302.safety_check_complete/given/ +# +# Effectが付与された時の処理 +# +# @within function asset:effect/0302.safety_check_complete/_/given + +# 付与 + function asset:effect/0302.safety_check_complete/modifier/add diff --git a/Asset/data/asset/functions/effect/0302.safety_check_complete/modifier/add.mcfunction b/Asset/data/asset/functions/effect/0302.safety_check_complete/modifier/add.mcfunction new file mode 100644 index 0000000000..e56b3666f4 --- /dev/null +++ b/Asset/data/asset/functions/effect/0302.safety_check_complete/modifier/add.mcfunction @@ -0,0 +1,11 @@ +#> asset:effect/0302.safety_check_complete/modifier/add +# +# +# +# @within function asset:effect/0302.safety_check_complete/given/ + +# 耐性 + data modify storage api: Argument.UUID set from storage asset:context this.UUID + data modify storage api: Argument.Amount set from storage asset:context this.Amount + data modify storage api: Argument.Operation set value "multiply" + function api:modifier/defense/base/add diff --git a/Asset/data/asset/functions/effect/0302.safety_check_complete/modifier/remove.mcfunction b/Asset/data/asset/functions/effect/0302.safety_check_complete/modifier/remove.mcfunction new file mode 100644 index 0000000000..df16296278 --- /dev/null +++ b/Asset/data/asset/functions/effect/0302.safety_check_complete/modifier/remove.mcfunction @@ -0,0 +1,11 @@ +#> asset:effect/0302.safety_check_complete/modifier/remove +# +# +# +# @within function +# asset:effect/0302.safety_check_complete/end/ +# asset:effect/0302.safety_check_complete/remove/ + +# 耐性 + data modify storage api: Argument.UUID set from storage asset:context this.UUID + function api:modifier/defense/base/remove diff --git a/Asset/data/asset/functions/effect/0302.safety_check_complete/register.mcfunction b/Asset/data/asset/functions/effect/0302.safety_check_complete/register.mcfunction new file mode 100644 index 0000000000..66d8a734fd --- /dev/null +++ b/Asset/data/asset/functions/effect/0302.safety_check_complete/register.mcfunction @@ -0,0 +1,40 @@ +#> asset:effect/0302.safety_check_complete/register +# +# Effectのデータを指定 +# +# @within function asset:effect/0302.safety_check_complete/_/register + +# ExtendsSafe (boolean) (default = false) + # data modify storage asset:effect ExtendsSafe set value true +# ID (int) + data modify storage asset:effect ID set value 302 +# 名前 (TextComponentString) + data modify storage asset:effect Name set value '{"text":"安全確認、よし！","color":"yellow"}' +# 説明文 (TextComponentString[]) + data modify storage asset:effect Description set value ['{"text":"被ダメージが大きく低下する","color":"white"}'] +# 効果時間 (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 1 +# 悪い効果か否か (boolean) + data modify storage asset:effect IsBadEffect set value false +# 死亡時のエフェクトの処理 (default = "remove") + # data modify storage asset:effect ProcessOnDied set value +# 消すのに必要なレベル (int) (default = 1) + data modify storage asset:effect RequireClearLv set value 3 +# エフェクトをUIに表示するか (boolean) (default = true) + # data modify storage asset:effect Visible set value +# エフェクトのスタックををUIに表示するか (boolean) (default = true) + data modify storage asset:effect StackVisible set value false + +# フィールド + data modify storage asset:effect Field.UUID set value [I;1,3,302,0] + data modify storage asset:effect Field.Amount set value 0.2 diff --git a/Asset/data/asset/functions/effect/0302.safety_check_complete/remove/.mcfunction b/Asset/data/asset/functions/effect/0302.safety_check_complete/remove/.mcfunction new file mode 100644 index 0000000000..a4d3083a9f --- /dev/null +++ b/Asset/data/asset/functions/effect/0302.safety_check_complete/remove/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0302.safety_check_complete/remove/ +# +# Effectが削除された時の処理 +# +# @within function asset:effect/0302.safety_check_complete/_/remove + +# 削除 + function asset:effect/0302.safety_check_complete/modifier/remove diff --git a/Asset/data/asset/tags/functions/effect/end.json b/Asset/data/asset/tags/functions/effect/end.json index ec0622ef77..3aa1440527 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/0302.safety_check_complete/_/end", "asset:effect/0342.prayer_amidst_blight/_/end", "asset:effect/0340.endless_thirst/_/end", "asset:effect/0350.yuzu/_/end", @@ -105,4 +106,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 767f196e38..c03dc12c58 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/0302.safety_check_complete/_/given", "asset:effect/0342.prayer_amidst_blight/_/given", "asset:effect/0340.endless_thirst/_/given", "asset:effect/0350.yuzu/_/given", @@ -99,4 +100,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/register.json b/Asset/data/asset/tags/functions/effect/register.json index 8cf7418f59..a6a9d9efe3 100644 --- a/Asset/data/asset/tags/functions/effect/register.json +++ b/Asset/data/asset/tags/functions/effect/register.json @@ -1,5 +1,6 @@ { "values": [ + "asset:effect/0302.safety_check_complete/_/register", "asset:effect/0339.will_o_wisp/_/register", "asset:effect/0342.prayer_amidst_blight/_/register", "asset:effect/0340.endless_thirst/_/register", @@ -170,4 +171,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 1a797796bf..fee80aeb28 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/0302.safety_check_complete/_/remove", "asset:effect/0342.prayer_amidst_blight/_/remove", "asset:effect/0340.endless_thirst/_/remove", "asset:effect/0350.yuzu/_/remove", @@ -113,4 +114,4 @@ "asset:effect/0007.defense_base_debuff/_/remove", "asset:effect/0258.spirit_melody/_/remove" ] -} +} \ No newline at end of file From e062ccbe8fa8eaf5a140cb057da36a49bc2fbcde Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Sun, 24 May 2026 11:42:01 +0900 Subject: [PATCH 2/6] =?UTF-8?q?=E3=83=90=E3=83=8B=E3=83=A9=E3=82=A8?= =?UTF-8?q?=E3=83=95=E3=82=A7=E3=82=AF=E3=83=88=E3=81=AB=E3=81=95=E3=82=88?= =?UTF-8?q?=E3=81=86=E3=81=AA=E3=82=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifact/0529.safety_helmet/trigger/3.main.mcfunction | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Asset/data/asset/functions/artifact/0529.safety_helmet/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0529.safety_helmet/trigger/3.main.mcfunction index 266b66e37a..34e0b4a5bd 100644 --- a/Asset/data/asset/functions/artifact/0529.safety_helmet/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0529.safety_helmet/trigger/3.main.mcfunction @@ -12,5 +12,9 @@ # 演出 playsound entity.ender_eye.death player @p ~ ~ ~ 1.0 1.0 -# 耐性付与 - effect give @s resistance 3 1 \ No newline at end of file +# 耐性バフ付与 + data modify storage api: Argument.ID set value 302 + data modify storage api: Argument.Duration set value 60 + data modify storage api: Argument.FieldOverride.Amount set value 0.2 + function api:entity/mob/effect/give + function api:entity/mob/effect/reset From 5fed48e93e0d0246851b95f5815f4ff5ceecdb19 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Sun, 24 May 2026 11:49:35 +0900 Subject: [PATCH 3/6] =?UTF-8?q?=E5=8A=B9=E6=9E=9C=E9=87=8F=E3=82=92?= =?UTF-8?q?=E6=98=8E=E8=A8=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifact/0529.safety_helmet/give/2.give.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/artifact/0529.safety_helmet/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0529.safety_helmet/give/2.give.mcfunction index bec9459f47..fa52ec72c1 100644 --- a/Asset/data/asset/functions/artifact/0529.safety_helmet/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0529.safety_helmet/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"保護帽","color":"yellow"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['[{"text":"被ダメ時","color":"red"},{"text":"に少しの間","color":"white"},{"text":"耐性","color":"dark_gray"},{"text":"が付与される","color":"white"}]','{"text":""}','{"text":"安全確認よし！","color":"yellow"}'] + data modify storage asset:artifact Lore set value ['[{"text":"被ダメージ時","color":"red"},{"text":"に2秒間","color":"white"},{"text":"耐性+20%","color":"dark_gray"},{"text":"が付与される","color":"white"}]','{"text":""}','{"text":"安全確認よし！","color":"yellow"}'] # 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション) # data modify storage asset:artifact ConsumeItem.Item set value # data modify storage asset:artifact ConsumeItem.Count set value From 6dc873d2d24076c994486bb052356c9906179ad6 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Sun, 24 May 2026 11:53:45 +0900 Subject: [PATCH 4/6] =?UTF-8?q?=E7=A5=9E=E5=99=A8=E3=81=AE=E3=83=95?= =?UTF-8?q?=E3=83=AC=E3=83=BC=E3=83=90=E3=83=BC=E3=83=86=E3=82=AD=E3=82=B9?= =?UTF-8?q?=E3=83=88=E3=81=AB=E5=90=88=E3=82=8F=E3=81=9B=E3=81=A6=E5=90=8D?= =?UTF-8?q?=E5=89=8D=E3=82=92=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../effect/0302.safety_check_complete/register.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/effect/0302.safety_check_complete/register.mcfunction b/Asset/data/asset/functions/effect/0302.safety_check_complete/register.mcfunction index 66d8a734fd..d05819d5b0 100644 --- a/Asset/data/asset/functions/effect/0302.safety_check_complete/register.mcfunction +++ b/Asset/data/asset/functions/effect/0302.safety_check_complete/register.mcfunction @@ -9,7 +9,7 @@ # ID (int) data modify storage asset:effect ID set value 302 # 名前 (TextComponentString) - data modify storage asset:effect Name set value '{"text":"安全確認、よし！","color":"yellow"}' + data modify storage asset:effect Name set value '{"text":"安全確認よし！","color":"yellow"}' # 説明文 (TextComponentString[]) data modify storage asset:effect Description set value ['{"text":"被ダメージが大きく低下する","color":"white"}'] # 効果時間 (int) (default = API || error) From ee3bf477eb82087ea1a15e4db9fea1d91aca516a Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Sun, 24 May 2026 12:21:08 +0900 Subject: [PATCH 5/6] =?UTF-8?q?Lore=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifact/0529.safety_helmet/give/2.give.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/artifact/0529.safety_helmet/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0529.safety_helmet/give/2.give.mcfunction index fa52ec72c1..7a091ec262 100644 --- a/Asset/data/asset/functions/artifact/0529.safety_helmet/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0529.safety_helmet/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"保護帽","color":"yellow"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['[{"text":"被ダメージ時","color":"red"},{"text":"に2秒間","color":"white"},{"text":"耐性+20%","color":"dark_gray"},{"text":"が付与される","color":"white"}]','{"text":""}','{"text":"安全確認よし！","color":"yellow"}'] + data modify storage asset:artifact Lore set value ['[{"translate":"被ダメージ時に2秒間%1$sが付与される","color":"white","with":[{"text":"耐性+20%","color":"green"}]}]','{"text":""}','{"text":"安全確認よし！","color":"yellow"}'] # 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション) # data modify storage asset:artifact ConsumeItem.Item set value # data modify storage asset:artifact ConsumeItem.Count set value From 69de871903363b24f7c80befcc5b08c8ab9135d0 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Mon, 25 May 2026 04:08:37 +0900 Subject: [PATCH 6/6] =?UTF-8?q?Lore=E3=82=92=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifact/0529.safety_helmet/give/2.give.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/artifact/0529.safety_helmet/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0529.safety_helmet/give/2.give.mcfunction index 7a091ec262..2b924f851f 100644 --- a/Asset/data/asset/functions/artifact/0529.safety_helmet/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0529.safety_helmet/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"保護帽","color":"yellow"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['[{"translate":"被ダメージ時に2秒間%1$sが付与される","color":"white","with":[{"text":"耐性+20%","color":"green"}]}]','{"text":""}','{"text":"安全確認よし！","color":"yellow"}'] + data modify storage asset:artifact Lore set value ['[{"translate":"被ダメージ時に2秒間%1$sを得る","color":"white","with":[{"text":"耐性+20%","color":"green"}]}]','{"text":""}','{"text":"安全確認よし！","color":"yellow"}'] # 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション) # data modify storage asset:artifact ConsumeItem.Item set value # data modify storage asset:artifact ConsumeItem.Count set value