diff --git a/Asset/data/asset/functions/artifact/1116.honey_tart/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1116.honey_tart/trigger/3.main.mcfunction index 60b49d9545..e47146e343 100644 --- a/Asset/data/asset/functions/artifact/1116.honey_tart/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1116.honey_tart/trigger/3.main.mcfunction @@ -15,5 +15,7 @@ # エフェクトを付与 data modify storage api: Argument.ID set value 270 + data modify storage api: Argument.Duration set value 200 + data modify storage api: Argument.FieldOverride.Heal set value 1.5 function api:entity/mob/effect/give function api:entity/mob/effect/reset diff --git a/Asset/data/asset/functions/effect/0270.honey_regeneration/register.mcfunction b/Asset/data/asset/functions/effect/0270.honey_regeneration/register.mcfunction index af4337b138..f7ac89ecc8 100644 --- a/Asset/data/asset/functions/effect/0270.honey_regeneration/register.mcfunction +++ b/Asset/data/asset/functions/effect/0270.honey_regeneration/register.mcfunction @@ -11,9 +11,9 @@ # 名前 (TextComponentString) data modify storage asset:effect Name set value '{"text":"ハニーリジェネレーション"}' # 説明文 (TextComponentString[]) - data modify storage asset:effect Description set value ['{"text":"HPを継続的に回復する"}'] + data modify storage asset:effect Description set value ['{"text":"体力を継続的に回復する"}'] # 効果時間 (int) (default = API || error) - data modify storage asset:effect Duration set value 200 + # data modify storage asset:effect Duration set value 200 # スタック (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 200 + # data modify storage asset:effect MaxDuration set value 200 # 最大スタック (int) (default = 2147483647) data modify storage asset:effect MaxStack set value 1 # 悪い効果か否か (boolean) @@ -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.Heal set value 1f diff --git a/Asset/data/asset/functions/effect/0270.honey_regeneration/tick/.mcfunction b/Asset/data/asset/functions/effect/0270.honey_regeneration/tick/.mcfunction index 67db7e2781..d971a741d3 100644 --- a/Asset/data/asset/functions/effect/0270.honey_regeneration/tick/.mcfunction +++ b/Asset/data/asset/functions/effect/0270.honey_regeneration/tick/.mcfunction @@ -9,7 +9,7 @@ #declare score_holder $Interval # 演出 - execute if predicate lib:random_pass_per/40 run particle dust 1.000 0.741 0.141 1 ~ ~1.2 ~ 0.5 0.4 0.5 0 1 normal + # execute if predicate lib:random_pass_per/40 run particle dust 1.000 0.741 0.141 1 ~ ~1.2 ~ 0.5 0.4 0.5 0 1 normal # スコアへDurationを代入する execute store result score $Interval Temporary run data get storage asset:context Duration diff --git a/Asset/data/asset/functions/effect/0270.honey_regeneration/tick/heal.mcfunction b/Asset/data/asset/functions/effect/0270.honey_regeneration/tick/heal.mcfunction index bf9c98a4ba..f68458c566 100644 --- a/Asset/data/asset/functions/effect/0270.honey_regeneration/tick/heal.mcfunction +++ b/Asset/data/asset/functions/effect/0270.honey_regeneration/tick/heal.mcfunction @@ -5,7 +5,7 @@ # @within function asset:effect/0270.honey_regeneration/tick/ # 回復 - data modify storage api: Argument.Heal set value 1.5f + data modify storage api: Argument.Heal set from storage asset:context this.Heal function api:heal/modifier data modify storage api: Argument.ApplyTrigger set value false function api:heal/