👽 [Artifact 934-937] 装備時効果の処理を移行

ProjectTSB · Jan 26, 2025 · 2fe7e79 · 2fe7e79
1 parent 6111b8a
commit 2fe7e79
Show file tree

Hide file tree

Showing 12 changed files with 244 additions and 274 deletions.
diff --git a/Asset/data/asset/functions/artifact/0934.ideal_helmet/equip.mcfunction b/Asset/data/asset/functions/artifact/0934.ideal_helmet/equip.mcfunction
@@ -4,18 +4,6 @@
 #
 # @within function asset:artifact/alias/934/equip
 
-# 魔法攻撃
-    data modify storage api: Argument.UUID set value [I;1,1,934,6]
-    data modify storage api: Argument.Amount set value 0.025
-    data modify storage api: Argument.Operation set value "multiply_base"
-    function api:modifier/attack/magic/add
-
-# 物理攻撃
-    data modify storage api: Argument.UUID set value [I;1,1,934,6]
-    data modify storage api: Argument.Amount set value 0.025
-    data modify storage api: Argument.Operation set value "multiply_base"
-    function api:modifier/attack/physical/add
-
 # 演出
     playsound minecraft:block.beacon.power_select player @a ~ ~ ~ 1 2
-    execute positioned ~ ~1.8 ~ run function asset:artifact/0934.ideal_helmet/trigger/vfx
+    execute positioned ~ ~1.8 ~ run function asset:artifact/0934.ideal_helmet/vfx
diff --git a/Asset/data/asset/functions/artifact/0934.ideal_helmet/register.mcfunction b/Asset/data/asset/functions/artifact/0934.ideal_helmet/register.mcfunction
@@ -4,55 +4,61 @@
 #
 # @within function asset:artifact/alias/934/register
 
-# 神器のID (int) スプレッドシートの値を入れる
-    data modify storage asset:artifact ID set value 934
-# 神器のベースアイテム
-    data modify storage asset:artifact Item set value "minecraft:leather_helmet"
-# 神器の名前 (TextComponentString)
-    data modify storage asset:artifact Name set value '{"text":"アイディアル","color":"#E6FFF4","underlined":true}'
-# 神器の説明文 (TextComponentString[])
-    data modify storage asset:artifact Lore set value ['{"text":"最も理想的な装備","color":"#FF78ED"}','{"text":"全ての耐性を持ちあらゆる状況に","color":"#FF78ED"}','{"text":"対応出来る万能な防具","color":"#FF78ED"}','{"text":"全耐性+5%","color":"white"}','{"text":"物理攻撃+2.5% 魔法攻撃+2.5%","color":"white"}']
-# 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション)
-    # data modify storage asset:artifact ConsumeItem.Item set value
-    # data modify storage asset:artifact ConsumeItem.Count set value
-    # data modify storage asset:artifact ConsumeItem.Extra set value
-# 使用回数 (int) (オプション)
-    # data modify storage asset:artifact RemainingCount set value
-# 神器を発動できるスロット (string) Wikiを参照
-    data modify storage asset:artifact Slot set value "head"
-# 神器のトリガー (string) Wikiを参照
-    data modify storage asset:artifact Trigger set value "equip"
-# 神器の発動条件 (TextComponentString) (オプション)
-    # data modify storage asset:artifact Condition set value
-# 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション)
-    # data modify storage asset:artifact AttackInfo.Damage set value [0,0]
-# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション)
-    # data modify storage asset:artifact AttackInfo.AttackType set value [Physical,Magic]
-# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション)
-    # data modify storage asset:artifact AttackInfo.ElementType set value [Fire,Water,Thunder,None]
-# 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション)
-    # data modify storage asset:artifact AttackInfo.BypassResist set value
-# 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション)
-    # data modify storage asset:artifact AttackInfo.IsRangeAttack set value
-# 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション)
-    # data modify storage asset:artifact AttackInfo.AttackRange set value
-# MP消費量 (int)
-    data modify storage asset:artifact MPCost set value 0
-# MP必要量 (int) (オプション)
-    # data modify storage asset:artifact MPRequire set value
-# 神器のクールダウン (int) (オプション)
-    # data modify storage asset:artifact LocalCooldown set value
-# 種別クールダウン ({Type: string, Duration: int}) (オプション)
-    # data modify storage asset:artifact TypeCooldown.Type set value
-    # data modify storage asset:artifact TypeCooldown.Duration set value
-# グローバルクールダウン (int) (オプション)
-    # data modify storage asset:artifact SpecialCooldown set value
-# クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション)
-    # data modify storage asset:artifact DisableCooldownMessage set value
-# MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション)
-    # data modify storage asset:artifact DisableMPMessage set value
-# 扱える神 (string[]) Wikiを参照
-    data modify storage asset:artifact CanUsedGod set value "ALL"
-# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション)
-    data modify storage asset:artifact CustomNBT set value {display:{color:16777215},HideFlags:69,Unbreakable:1b,Enchantments:[{id:"minecraft:fortune",lvl:1s}],AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:5,Operation:0,UUID:[I;1,1,934,6],Slot:"head"},{AttributeName:"generic.armor_toughness",Name:"generic.armor_toughness",Amount:2.5,Operation:0,UUID:[I;1,1,934,6],Slot:"head"}]}
-
+# 神器のID (int) スプレッドシートの値を入れる
+    data modify storage asset:artifact ID set value 934
+# 神器のベースアイテム
+    data modify storage asset:artifact Item set value "minecraft:leather_helmet"
+# 神器の名前 (TextComponentString)
+    data modify storage asset:artifact Name set value '{"text":"アイディアル","color":"#E6FFF4","underlined":true}'
+# 神器の説明文 (TextComponentString[])
+    data modify storage asset:artifact Lore set value ['{"text":"最も理想的な装備","color":"#FF78ED"}','{"text":"全ての耐性を持ちあらゆる状況に","color":"#FF78ED"}','{"text":"対応出来る万能な防具","color":"#FF78ED"}']
+# 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション)
+    # data modify storage asset:artifact ConsumeItem.Item set value
+    # data modify storage asset:artifact ConsumeItem.Count set value
+    # data modify storage asset:artifact ConsumeItem.Extra set value
+# 使用回数 (int) (オプション)
+    # data modify storage asset:artifact RemainingCount set value
+# 神器を発動できるスロット (string) Wikiを参照
+    data modify storage asset:artifact Slot set value "head"
+# 神器のトリガー (string) Wikiを参照
+    # data modify storage asset:artifact Trigger set value
+# 神器のサブトリガー (string[]) (オプション)
+    data modify storage asset:artifact SubTriggers set value ["equip"]
+# 神器の発動条件 (TextComponentString) (オプション)
+    # data modify storage asset:artifact Condition set value
+# 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション)
+    # data modify storage asset:artifact AttackInfo.Damage set value [0,0]
+# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション)
+    # data modify storage asset:artifact AttackInfo.AttackType set value [Physical,Magic]
+# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション)
+    # data modify storage asset:artifact AttackInfo.ElementType set value [Fire,Water,Thunder,None]
+# 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション)
+    # data modify storage asset:artifact AttackInfo.BypassResist set value
+# 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション)
+    # data modify storage asset:artifact AttackInfo.IsRangeAttack set value
+# 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション)
+    # data modify storage asset:artifact AttackInfo.AttackRange set value
+# MP消費量 (int)
+    data modify storage asset:artifact MPCost set value 0
+# MP必要量 (int) (オプション)
+    # data modify storage asset:artifact MPRequire set value
+# 神器のクールダウン (int) (オプション)
+    # data modify storage asset:artifact LocalCooldown set value
+# 種別クールダウン ({Type: string, Duration: int}) (オプション)
+    # data modify storage asset:artifact TypeCooldown.Type set value
+    # data modify storage asset:artifact TypeCooldown.Duration set value
+# グローバルクールダウン (int) (オプション)
+    # data modify storage asset:artifact SpecialCooldown set value
+# クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション)
+    # data modify storage asset:artifact DisableCooldownMessage set value
+# MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション)
+    # data modify storage asset:artifact DisableMPMessage set value
+# 装備時補正 (Compound[]) (オプション)
+    data modify storage asset:artifact Modifiers set value []
+    data modify storage asset:artifact Modifiers append value {Type:"attack/physical",Amount:0.025d,Operation:"multiply_base"}
+    data modify storage asset:artifact Modifiers append value {Type:"attack/defense",Amount:0.025d,Operation:"multiply_base"}
+    data modify storage asset:artifact Modifiers append value {Type:"defense/base",Amount:0.05d,Operation:"multiply_base"}
+# 扱える神 (string[]) Wikiを参照
+    data modify storage asset:artifact CanUsedGod set value "ALL"
+# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション)
+    data modify storage asset:artifact CustomNBT set value {display:{color:16777215},HideFlags:69,Unbreakable:1b,Enchantments:[{id:"minecraft:fortune",lvl:1s}],AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:5,Operation:0,UUID:[I;1,1,934,6],Slot:"head"},{AttributeName:"generic.armor_toughness",Name:"generic.armor_toughness",Amount:2.5,Operation:0,UUID:[I;1,1,934,6],Slot:"head"}]}
diff --git a/Asset/data/asset/functions/artifact/0934.ideal_helmet/vfx.mcfunction b/Asset/data/asset/functions/artifact/0934.ideal_helmet/vfx.mcfunction
@@ -1,8 +1,8 @@
-#> asset:artifact/0934.ideal_helmet/equip/vfx
+#> asset:artifact/0934.ideal_helmet/vfx
 #
 # vfx
 #
-# @within function asset:artifact/0934.ideal_helmet/equip/
+# @within function asset:artifact/0934.ideal_helmet/equip
 
 # [ImportKey]: NobwRALgngDgpmAXGGB7ANlA5qgdmAGjAFdiBLAEyTAHYAzOgVgGYBOVxgWgCYaBDAAycALHTg1OrZgDYu06XWZ9ujBgEYAHGsJhcfALYJkgLE1AS5GAjfQAE2ojD4AnAwGck4AMapiuCEjWMibnDecPauYABufOjERuAAHkgCRFCJAL6pRI4UZMQuiNxEThAOPohJYHDo6GQwTkZqAuX2qMUQRuUe9rghSNJEAFbE+jBIBWAARnAAXmQ9ZURkTgCiVTV1SwCOxFGYAMp2gVSIdFF1C04AQtOz9pvbVVD7fIdIJ+h16QC6QA_3
 # 多角形 1

diff --git a/Asset/data/asset/functions/artifact/0935.ideal_chestplate/equip.mcfunction b/Asset/data/asset/functions/artifact/0935.ideal_chestplate/equip.mcfunction
@@ -4,18 +4,6 @@
 #
 # @within function asset:artifact/alias/935/equip
 
-# 魔法攻撃
-    data modify storage api: Argument.UUID set value [I;1,1,936,4]
-    data modify storage api: Argument.Amount set value 0.025
-    data modify storage api: Argument.Operation set value "multiply_base"
-    function api:modifier/attack/magic/add
-
-# 物理攻撃
-    data modify storage api: Argument.UUID set value [I;1,1,936,4]
-    data modify storage api: Argument.Amount set value 0.025
-    data modify storage api: Argument.Operation set value "multiply_base"
-    function api:modifier/attack/physical/add
-
 # 演出
     playsound minecraft:block.beacon.power_select player @a ~ ~ ~ 1 2
-    execute positioned ~ ~0.5 ~ run function asset:artifact/0936.ideal_leggings/equip/vfx
+    execute positioned ~ ~1.2 ~ run function asset:artifact/0935.ideal_chestplate/vfx