From 75e01e19f9b6b19615070220344e7711a0dbb5b9 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Sat, 3 Jan 2026 23:09:40 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=E8=AA=AC=E6=98=8E=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 --- .../artifact/1114.fairy_macaron/give/2.give.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/artifact/1114.fairy_macaron/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1114.fairy_macaron/give/2.give.mcfunction index 0b70db295a..7742797949 100644 --- a/Asset/data/asset/functions/artifact/1114.fairy_macaron/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1114.fairy_macaron/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"妖精マカロン","color":"#F6BFFF"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text":"HPを5回復し、バリアを5得る。","color":"white"}','{"text":"夜明けの森から届いた","color":"gray"}','{"text":"甘く儚い妖精からの贈り物。","color":"gray"}'] + data modify storage asset:artifact Lore set value ['{"text":"体力を5回復し、バリアを5得る。","color":"white"}','{"text":"夜明けの森から届いた","color":"gray"}','{"text":"甘く儚い妖精からの贈り物。","color":"gray"}'] # MP以外の消費物 (TextComponentString) (オプション) # data modify storage asset:artifact CostText set value # 使用回数 (int) (オプション) From 9d321af2fbc4f063325d97ef6db95d07f36b90bc Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Sat, 3 Jan 2026 23:13:08 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=E5=8A=B9=E6=9E=9C=E6=99=82=E9=96=93?= =?UTF-8?q?=E3=81=A8=E3=83=90=E3=83=AA=E3=82=A2=E9=87=8F=E3=82=92=E7=A5=9E?= =?UTF-8?q?=E5=99=A8=E5=81=B4=E3=81=A7=E8=A8=AD=E5=AE=9A=E3=81=99=E3=82=8B?= =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifact/1114.fairy_macaron/trigger/3.main.mcfunction | 2 ++ .../effect/0268.macaron_barrier/barrier/add.mcfunction | 2 +- .../functions/effect/0268.macaron_barrier/register.mcfunction | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1114.fairy_macaron/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1114.fairy_macaron/trigger/3.main.mcfunction index fdd54da838..42226ac07c 100644 --- a/Asset/data/asset/functions/artifact/1114.fairy_macaron/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1114.fairy_macaron/trigger/3.main.mcfunction @@ -23,5 +23,7 @@ # バリアを得る data modify storage api: Argument.ID set value 268 + data modify storage api: Argument.Duration set value 600 + data modify storage api: Argument.FieldOverride.Barrier set value 5 function api:entity/mob/effect/give function api:entity/mob/effect/reset diff --git a/Asset/data/asset/functions/effect/0268.macaron_barrier/barrier/add.mcfunction b/Asset/data/asset/functions/effect/0268.macaron_barrier/barrier/add.mcfunction index bdbdd17212..2effdc86a4 100644 --- a/Asset/data/asset/functions/effect/0268.macaron_barrier/barrier/add.mcfunction +++ b/Asset/data/asset/functions/effect/0268.macaron_barrier/barrier/add.mcfunction @@ -5,7 +5,7 @@ # @within function asset:effect/0268.macaron_barrier/given/ # バリア設定 - data modify storage api: Argument.Amount set value 5 + data modify storage api: Argument.Amount set from storage asset:context this.Barrier data modify storage api: Argument.UUID set value [I;1,3,268,0] data modify storage api: Argument.Priority set value 1 data modify storage api: Argument.WipedCallback set value "asset:effect/0268.macaron_barrier/barrier/break" diff --git a/Asset/data/asset/functions/effect/0268.macaron_barrier/register.mcfunction b/Asset/data/asset/functions/effect/0268.macaron_barrier/register.mcfunction index b99425e8d2..679a8e3706 100644 --- a/Asset/data/asset/functions/effect/0268.macaron_barrier/register.mcfunction +++ b/Asset/data/asset/functions/effect/0268.macaron_barrier/register.mcfunction @@ -13,7 +13,7 @@ # 説明文 (TextComponentString[]) data modify storage asset:effect Description set value ['{"text":"ダメージを吸収する","color":"white"}'] # 効果時間 (int) (default = API || error) - data modify storage asset:effect Duration set value 600 + # data modify storage asset:effect Duration set value 600 # スタック (int) (default = API || 1) # data modify storage asset:effect Stack set value # 効果時間の操作方法 (default = API || "replace") @@ -21,7 +21,7 @@ # スタックの操作方法 (default = API || "replace") # data modify storage asset:effect StackOperation set value # 最大効果時間 (int) (default = 2147483647) - data modify storage asset:effect MaxDuration set value 600 + # data modify storage asset:effect MaxDuration set value 600 # 最大スタック (int) (default = 2147483647) # data modify storage asset:effect MaxStack set value # 悪い効果か否か (boolean) From a7b2b83ab623063ac45f943d00db9da05480474c Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Sat, 3 Jan 2026 23:15:03 +0900 Subject: [PATCH 3/3] =?UTF-8?q?UUID=E3=82=92=E3=83=95=E3=82=A3=E3=83=BC?= =?UTF-8?q?=E3=83=AB=E3=83=89=E3=81=A7=E5=AE=9A=E7=BE=A9=E3=81=99=E3=82=8B?= =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../effect/0268.macaron_barrier/barrier/add.mcfunction | 2 +- .../effect/0268.macaron_barrier/barrier/remove.mcfunction | 2 +- .../functions/effect/0268.macaron_barrier/register.mcfunction | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Asset/data/asset/functions/effect/0268.macaron_barrier/barrier/add.mcfunction b/Asset/data/asset/functions/effect/0268.macaron_barrier/barrier/add.mcfunction index 2effdc86a4..0b5f3680dc 100644 --- a/Asset/data/asset/functions/effect/0268.macaron_barrier/barrier/add.mcfunction +++ b/Asset/data/asset/functions/effect/0268.macaron_barrier/barrier/add.mcfunction @@ -6,7 +6,7 @@ # バリア設定 data modify storage api: Argument.Amount set from storage asset:context this.Barrier - data modify storage api: Argument.UUID set value [I;1,3,268,0] + data modify storage api: Argument.UUID set from storage asset:context this.UUID data modify storage api: Argument.Priority set value 1 data modify storage api: Argument.WipedCallback set value "asset:effect/0268.macaron_barrier/barrier/break" function api:entity/player/absorption/add diff --git a/Asset/data/asset/functions/effect/0268.macaron_barrier/barrier/remove.mcfunction b/Asset/data/asset/functions/effect/0268.macaron_barrier/barrier/remove.mcfunction index 97bfab90b6..735209db16 100644 --- a/Asset/data/asset/functions/effect/0268.macaron_barrier/barrier/remove.mcfunction +++ b/Asset/data/asset/functions/effect/0268.macaron_barrier/barrier/remove.mcfunction @@ -7,5 +7,5 @@ # asset:effect/0268.macaron_barrier/remove/ # バリアを削除する - data modify storage api: Argument.UUID set value [I;1,3,268,0] + data modify storage api: Argument.UUID set from storage asset:context this.UUID function api:entity/player/absorption/remove diff --git a/Asset/data/asset/functions/effect/0268.macaron_barrier/register.mcfunction b/Asset/data/asset/functions/effect/0268.macaron_barrier/register.mcfunction index 679a8e3706..d6d89acd35 100644 --- a/Asset/data/asset/functions/effect/0268.macaron_barrier/register.mcfunction +++ b/Asset/data/asset/functions/effect/0268.macaron_barrier/register.mcfunction @@ -36,4 +36,4 @@ data modify storage asset:effect StackVisible set value false # フィールド - # data modify storage asset:effect Field set value {} + data modify storage asset:effect Field.UUID set value [I;1,3,268,0]