Merge pull request #329 from ProjectTSB/feature/heal-trigger-move-to-…

…receive-heal
ProjectTSB · Oct 29, 2024 · 181f295 · 181f295
2 parents 31e5b42 + e042ad7
commit 181f295
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 13 deletions.
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
@@ -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
@@ -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
+    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
@@ -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
+    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
@@ -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
@@ -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
@@ -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"
+
     ]
-}
+}
diff --git a/Asset/data/asset/tags/functions/artifact/receive_heal.json 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"
+    ]
+}