diff --git a/Asset/data/asset/functions/artifact/1069.sprout_of_dappled_sunlight/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1069.sprout_of_dappled_sunlight/give/2.give.mcfunction index af11a26f3c..0abf99a235 100644 --- a/Asset/data/asset/functions/artifact/1069.sprout_of_dappled_sunlight/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1069.sprout_of_dappled_sunlight/give/2.give.mcfunction @@ -23,7 +23,7 @@ # 神器を発動できるスロット (string) Wikiを参照 data modify storage asset:artifact Slot set value "hotbar" # 神器のトリガー (string) Wikiを参照 - data modify storage asset:artifact Trigger set value "onHeal" + data modify storage asset:artifact Trigger set value "onReceiveHeal" # 効果が重複可能か否か (boolean) (オプション) # data modify storage asset:artifact EnableDuplication set value # 神器の発動条件 (TextComponentString) (オプション) diff --git a/Asset/data/asset/functions/artifact/1075.fairy_vial/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1075.fairy_vial/give/2.give.mcfunction index 25dcd25840..33bbab683d 100644 --- a/Asset/data/asset/functions/artifact/1075.fairy_vial/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1075.fairy_vial/give/2.give.mcfunction @@ -23,7 +23,7 @@ # 神器を発動できるスロット (string) Wikiを参照 data modify storage asset:artifact Slot set value "hotbar" # 神器のトリガー (string) Wikiを参照 - data modify storage asset:artifact Trigger set value "onHeal" + data modify storage asset:artifact Trigger set value "onReceiveHeal" # 神器の発動条件 (TextComponentString) (オプション) # data modify storage asset:artifact Condition set value # 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) @@ -56,4 +56,4 @@ # data modify storage asset:artifact CustomNBT set value {} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/1081.wandering_piece_of_dream/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1081.wandering_piece_of_dream/give/2.give.mcfunction index 3eefb08a4c..6fe90113d8 100644 --- a/Asset/data/asset/functions/artifact/1081.wandering_piece_of_dream/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1081.wandering_piece_of_dream/give/2.give.mcfunction @@ -23,7 +23,7 @@ # 神器を発動できるスロット (string) Wikiを参照 data modify storage asset:artifact Slot set value "hotbar" # 神器のトリガー (string) Wikiを参照 - data modify storage asset:artifact Trigger set value "onHeal" + data modify storage asset:artifact Trigger set value "onReceiveHeal" # 神器の発動条件 (TextComponentString) (オプション) # data modify storage asset:artifact Condition set value # 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) @@ -56,4 +56,4 @@ # data modify storage asset:artifact CustomNBT set value {} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/1088.purifying_hydrangea/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1088.purifying_hydrangea/give/2.give.mcfunction index 5ddba7af1c..5a2c00ace9 100644 --- a/Asset/data/asset/functions/artifact/1088.purifying_hydrangea/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1088.purifying_hydrangea/give/2.give.mcfunction @@ -23,7 +23,7 @@ # 神器を発動できるスロット (string) Wikiを参照 data modify storage asset:artifact Slot set value "hotbar" # 神器のトリガー (string) Wikiを参照 - data modify storage asset:artifact Trigger set value "onHeal" + data modify storage asset:artifact Trigger set value "onReceiveHeal" # 神器の発動条件 (TextComponentString) (オプション) data modify storage asset:artifact Condition set value '{"text":"雨","color":"white"}' # 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) diff --git a/Asset/data/asset/functions/artifact/1108.white_lily_of_priestess/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1108.white_lily_of_priestess/give/2.give.mcfunction index 3106c58e9d..802358ef43 100644 --- a/Asset/data/asset/functions/artifact/1108.white_lily_of_priestess/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1108.white_lily_of_priestess/give/2.give.mcfunction @@ -23,7 +23,7 @@ # 神器を発動できるスロット (string) Wikiを参照 data modify storage asset:artifact Slot set value "hotbar" # 神器のトリガー (string) Wikiを参照 - data modify storage asset:artifact Trigger set value "onHeal" + data modify storage asset:artifact Trigger set value "onReceiveHeal" # 効果が重複可能か否か (boolean) (オプション) # data modify storage asset:artifact EnableDuplication set value # 神器の発動条件 (TextComponentString) (オプション) diff --git a/Asset/data/asset/tags/functions/artifact/heal.json b/Asset/data/asset/tags/functions/artifact/heal.json index e0a5c15199..5c922d2bbf 100644 --- a/Asset/data/asset/tags/functions/artifact/heal.json +++ b/Asset/data/asset/tags/functions/artifact/heal.json @@ -1,9 +1,5 @@ { "values": [ - "asset:artifact/1108.white_lily_of_priestess/trigger/1.trigger", - "asset:artifact/1069.sprout_of_dappled_sunlight/trigger/1.trigger", - "asset:artifact/1088.purifying_hydrangea/trigger/1.trigger", - "asset:artifact/1081.wandering_piece_of_dream/trigger/1.trigger", - "asset:artifact/1075.fairy_vial/trigger/1.trigger" + ] -} \ No newline at end of file +} diff --git a/Asset/data/asset/tags/functions/artifact/receive_heal.json b/Asset/data/asset/tags/functions/artifact/receive_heal.json new file mode 100644 index 0000000000..e0a5c15199 --- /dev/null +++ b/Asset/data/asset/tags/functions/artifact/receive_heal.json @@ -0,0 +1,9 @@ +{ + "values": [ + "asset:artifact/1108.white_lily_of_priestess/trigger/1.trigger", + "asset:artifact/1069.sprout_of_dappled_sunlight/trigger/1.trigger", + "asset:artifact/1088.purifying_hydrangea/trigger/1.trigger", + "asset:artifact/1081.wandering_piece_of_dream/trigger/1.trigger", + "asset:artifact/1075.fairy_vial/trigger/1.trigger" + ] +} \ No newline at end of file