From b2fb054c6b791d8c52b21c7cc78db4f0c588447f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=AF=E3=81=84=E3=81=84=E3=82=8D?=
 <mrashen.2gou@gmail.com>
Date: Thu, 28 Dec 2023 18:42:19 +0900
Subject: [PATCH] =?UTF-8?q?:balance=5Fscale:=20[=E7=A5=9E=E5=99=A8624-635]?=
 =?UTF-8?q?=20=E3=83=95=E3=83=AC=E3=82=A4=E3=83=A0/=E3=82=A2=E3=82=A4?=
 =?UTF-8?q?=E3=82=B9/=E3=82=A8=E3=83=AC=E3=82=AD=E8=A3=85=E5=82=99?=
 =?UTF-8?q?=E3=81=AB=E5=B1=9E=E6=80=A7=E6=94=BB=E6=92=83=E8=A3=9C=E6=AD=A3?=
 =?UTF-8?q?=E3=82=92=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../0624.flame_helm/give/2.give.mcfunction    |  2 +-
 .../0624.flame_helm/trigger/3.main.mcfunction | 20 ++++++++-------
 .../trigger/dis_equip/main.mcfunction         | 11 +++++---
 .../0625.flame_armor/give/2.give.mcfunction   |  2 +-
 .../trigger/3.main.mcfunction                 | 20 ++++++++-------
 .../trigger/4.fullset.mcfunction              | 25 +++++++++++--------
 .../trigger/5.fullset_dis_equip.mcfunction    | 12 ++++++---
 .../trigger/_index.d.mcfunction               | 10 ++++++++
 .../trigger/dis_equip/main.mcfunction         | 11 +++++---
 .../give/2.give.mcfunction                    |  2 +-
 .../trigger/3.main.mcfunction                 | 20 ++++++++-------
 .../trigger/dis_equip/main.mcfunction         | 11 +++++---
 .../0627.flame_boots/give/2.give.mcfunction   |  2 +-
 .../trigger/3.main.mcfunction                 | 20 ++++++++-------
 .../trigger/dis_equip/main.mcfunction         | 11 +++++---
 .../0628.ice_helm/give/2.give.mcfunction      |  2 +-
 .../0628.ice_helm/trigger/3.main.mcfunction   | 20 ++++++++-------
 .../trigger/dis_equip/main.mcfunction         |  7 ++++--
 .../0629.ice_armor/give/2.give.mcfunction     |  2 +-
 .../0629.ice_armor/trigger/3.main.mcfunction  | 22 ++++++++--------
 .../trigger/4.fullset.mcfunction              | 18 +++++++------
 .../trigger/5.fullset_dis_equip.mcfunction    | 16 +++++++-----
 .../trigger/dis_equip/main.mcfunction         |  7 ++++--
 .../0630.ice_leggings/give/2.give.mcfunction  |  2 +-
 .../trigger/3.main.mcfunction                 | 23 +++++++++--------
 .../trigger/dis_equip/main.mcfunction         |  7 ++++--
 .../0631.ice_boots/give/2.give.mcfunction     |  2 +-
 .../0631.ice_boots/trigger/3.main.mcfunction  | 22 ++++++++--------
 .../trigger/dis_equip/main.mcfunction         |  8 ++++--
 .../0632.elec_helm/give/2.give.mcfunction     |  2 +-
 .../0632.elec_helm/trigger/3.main.mcfunction  | 20 ++++++++-------
 .../trigger/dis_equip/main.mcfunction         |  7 ++++--
 .../0633.elec_armor/give/2.give.mcfunction    |  2 +-
 .../0633.elec_armor/trigger/3.main.mcfunction | 20 ++++++++-------
 .../trigger/4.fullset.mcfunction              | 23 ++++++++++-------
 .../trigger/5.fullset_dis_equip.mcfunction    |  7 ++++--
 .../trigger/dis_equip/main.mcfunction         |  7 ++++--
 .../0634.elec_leggings/give/2.give.mcfunction |  2 +-
 .../trigger/3.main.mcfunction                 | 20 ++++++++-------
 .../trigger/dis_equip/main.mcfunction         | 11 ++++++--
 .../0635.elec_boots/give/2.give.mcfunction    |  2 +-
 .../0635.elec_boots/trigger/3.main.mcfunction | 18 +++++++------
 .../trigger/dis_equip/main.mcfunction         | 10 +++++---
 43 files changed, 293 insertions(+), 195 deletions(-)
 create mode 100644 Asset/data/asset/functions/artifact/0625.flame_armor/trigger/_index.d.mcfunction

diff --git a/Asset/data/asset/functions/artifact/0624.flame_helm/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0624.flame_helm/give/2.give.mcfunction
index b8b14eb2f..9ff2ac195 100644
--- a/Asset/data/asset/functions/artifact/0624.flame_helm/give/2.give.mcfunction
+++ b/Asset/data/asset/functions/artifact/0624.flame_helm/give/2.give.mcfunction
@@ -15,7 +15,7 @@
 # 神器の名前 (TextComponentString)
     data modify storage asset:artifact Name set value '{"text":"フレイムヘルム","color":"red"}'
 # 神器の説明文 (TextComponentString[])
-    data modify storage asset:artifact Lore set value ['{"text":"火耐性+3%","color":"red"}']
+    data modify storage asset:artifact Lore set value ['{"text":"火耐性+3% 火攻撃+3%","color":"red"}']
 # MP以外の消費物 (TextComponentString) (オプション)
     # data modify storage asset:artifact CostText set value
 # 使用回数 (int) (オプション)
diff --git a/Asset/data/asset/functions/artifact/0624.flame_helm/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0624.flame_helm/trigger/3.main.mcfunction
index 3e83191ad..79f06e382 100644
--- a/Asset/data/asset/functions/artifact/0624.flame_helm/trigger/3.main.mcfunction
+++ b/Asset/data/asset/functions/artifact/0624.flame_helm/trigger/3.main.mcfunction
@@ -9,17 +9,19 @@
 
 # ここから先は神器側の効果の処理を書く
 
-# 引数の設定
-    # UUID
-        data modify storage api: Argument.UUID set value [I;1,1,624,6]
-    # 補正値
-        data modify storage api: Argument.Amount set value 0.03
-    # 補正方法
-        data modify storage api: Argument.Operation set value "multiply_base"
-# 補正の追加
+# 火耐性+3%
+    data modify storage api: Argument.UUID set value [I;1,1,624,6]
+    data modify storage api: Argument.Amount set value 0.03
+    data modify storage api: Argument.Operation set value "multiply_base"
     function api:modifier/defense/fire/add
 
-#ちょっとした演出
+# 火攻撃+3%
+    data modify storage api: Argument.UUID set value [I;1,1,624,6]
+    data modify storage api: Argument.Amount set value 0.03
+    data modify storage api: Argument.Operation set value "multiply_base"
+    function api:modifier/attack/fire/add
+
+# 演出
     particle flame ~ ~1.6 ~ 0.4 0.2 0.4 0 10 normal @a
     playsound minecraft:entity.blaze.shoot player @a ~ ~ ~ 0.4 1
 
diff --git a/Asset/data/asset/functions/artifact/0624.flame_helm/trigger/dis_equip/main.mcfunction b/Asset/data/asset/functions/artifact/0624.flame_helm/trigger/dis_equip/main.mcfunction
index 264e14db0..ef27e01d4 100644
--- a/Asset/data/asset/functions/artifact/0624.flame_helm/trigger/dis_equip/main.mcfunction
+++ b/Asset/data/asset/functions/artifact/0624.flame_helm/trigger/dis_equip/main.mcfunction
@@ -4,13 +4,16 @@
 #
 # @within function asset:artifact/0624.flame_helm/trigger/dis_equip/
 
-# UUID
+# 火耐性+3%
     data modify storage api: Argument.UUID set value [I;1,1,624,6]
-# 補正の削除
     function api:modifier/defense/fire/remove
 
+# 火攻撃+3%
+    data modify storage api: Argument.UUID set value [I;1,1,624,6]
+    function api:modifier/attack/fire/remove
+
 # 演出
     playsound entity.generic.burn player @a ~ ~ ~ 0.2 1 0
 
-# フルセットの耐性削除
-    execute if data storage asset:context id.all{head:624,chest:625,legs:626,feet:627} run function asset:artifact/0625.flame_armor/trigger/5.fullset_dis_equip
\ No newline at end of file
+# フルセット効果を削除
+    execute if entity @s[tag=HD.Fullset] run function asset:artifact/0625.flame_armor/trigger/5.fullset_dis_equip
\ No newline at end of file
diff --git a/Asset/data/asset/functions/artifact/0625.flame_armor/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0625.flame_armor/give/2.give.mcfunction
index 1c6dcdb6b..37b74c3e1 100644
--- a/Asset/data/asset/functions/artifact/0625.flame_armor/give/2.give.mcfunction
+++ b/Asset/data/asset/functions/artifact/0625.flame_armor/give/2.give.mcfunction
@@ -15,7 +15,7 @@
 # 神器の名前 (TextComponentString)
     data modify storage asset:artifact Name set value '{"text":"フレイムアーマー","color":"red"}'
 # 神器の説明文 (TextComponentString[])
-    data modify storage asset:artifact Lore set value ['{"text":"火耐性+3%","color":"red"}','{"text":"一式全て揃えた場合、追加で火耐性+3%","color":"red"}']
+    data modify storage asset:artifact Lore set value ['[{"text":"火耐性+3% 火攻撃+3%","color":"red"}]','[{"text":"一式揃えた場合、追加で","color":"white"}]','[{"text":"火耐性+3% 火攻撃+3%","color":"red"}]']
 # MP以外の消費物 (TextComponentString) (オプション)
     # data modify storage asset:artifact CostText set value
 # 使用回数 (int) (オプション)
diff --git a/Asset/data/asset/functions/artifact/0625.flame_armor/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0625.flame_armor/trigger/3.main.mcfunction
index 676bb6e06..62241f31d 100644
--- a/Asset/data/asset/functions/artifact/0625.flame_armor/trigger/3.main.mcfunction
+++ b/Asset/data/asset/functions/artifact/0625.flame_armor/trigger/3.main.mcfunction
@@ -9,17 +9,19 @@
 
 # ここから先は神器側の効果の処理を書く
 
-# 引数の設定
-    # UUID
-        data modify storage api: Argument.UUID set value [I;1,1,625,5]
-    # 補正値
-        data modify storage api: Argument.Amount set value 0.03
-    # 補正方法
-        data modify storage api: Argument.Operation set value "multiply_base"
-# 補正の追加
+# 火耐性+3%
+    data modify storage api: Argument.UUID set value [I;1,1,625,5]
+    data modify storage api: Argument.Amount set value 0.03
+    data modify storage api: Argument.Operation set value "multiply_base"
     function api:modifier/defense/fire/add
 
-#ちょっとした演出
+# 火攻撃+3%
+    data modify storage api: Argument.UUID set value [I;1,1,625,5]
+    data modify storage api: Argument.Amount set value 0.03
+    data modify storage api: Argument.Operation set value "multiply_base"
+    function api:modifier/attack/fire/add
+
+# 演出
     particle flame ~ ~1.3 ~ 0.4 0.3 0.4 0 10 normal @a
     playsound minecraft:entity.blaze.shoot player @a ~ ~ ~ 0.4 1
 
diff --git a/Asset/data/asset/functions/artifact/0625.flame_armor/trigger/4.fullset.mcfunction b/Asset/data/asset/functions/artifact/0625.flame_armor/trigger/4.fullset.mcfunction
index c98525caa..558c1f7d1 100644
--- a/Asset/data/asset/functions/artifact/0625.flame_armor/trigger/4.fullset.mcfunction
+++ b/Asset/data/asset/functions/artifact/0625.flame_armor/trigger/4.fullset.mcfunction
@@ -8,16 +8,21 @@
 #   asset:artifact/0626.flame_leggings/trigger/3.main
 #   asset:artifact/0627.flame_boots/trigger/3.main
 
-# 引数の設定
-    # UUID
-        data modify storage api: Argument.UUID set value [I;1,1,625,0]
-    # 補正値
-        data modify storage api: Argument.Amount set value 0.03
-    # 補正方法
-        data modify storage api: Argument.Operation set value "multiply_base"
-# 補正の追加
+# Tag付与
+    tag @s add HD.Fullset
+
+# 火耐性+3%
+    data modify storage api: Argument.UUID set value [I;1,1,625,0]
+    data modify storage api: Argument.Amount set value 0.03
+    data modify storage api: Argument.Operation set value "multiply_base"
     function api:modifier/defense/fire/add
 
+# 火耐性+3%
+    data modify storage api: Argument.UUID set value [I;1,1,625,0]
+    data modify storage api: Argument.Amount set value 0.03
+    data modify storage api: Argument.Operation set value "multiply_base"
+    function api:modifier/attack/fire/add
+
 # 演出
-     particle flame ~ ~1.2 ~ 0.4 0.5 0.4 0 20 normal @a
-     playsound minecraft:entity.blaze.shoot player @a ~ ~ ~ 1 0.2 0
\ No newline at end of file
+    particle flame ~ ~1.2 ~ 0.4 0.5 0.4 0 20 normal @a
+    playsound minecraft:entity.blaze.shoot player @a ~ ~ ~ 1 0.2 0
\ No newline at end of file
diff --git a/Asset/data/asset/functions/artifact/0625.flame_armor/trigger/5.fullset_dis_equip.mcfunction b/Asset/data/asset/functions/artifact/0625.flame_armor/trigger/5.fullset_dis_equip.mcfunction
index 41008bda0..25371bd5a 100644
--- a/Asset/data/asset/functions/artifact/0625.flame_armor/trigger/5.fullset_dis_equip.mcfunction
+++ b/Asset/data/asset/functions/artifact/0625.flame_armor/trigger/5.fullset_dis_equip.mcfunction
@@ -8,7 +8,13 @@
 #   asset:artifact/0626.flame_leggings/trigger/dis_equip/main
 #   asset:artifact/0627.flame_boots/trigger/dis_equip/main
 
-# UUID
+# Tag削除
+    tag @s remove HD.Fullset
+
+# 火耐性+3%
+    data modify storage api: Argument.UUID set value [I;1,1,625,0]
+    function api:modifier/defense/fire/remove
+
+# 火耐性+3%
     data modify storage api: Argument.UUID set value [I;1,1,625,0]
-# 補正の削除
-    function api:modifier/defense/fire/remove
\ No newline at end of file
+    function api:modifier/attack/fire/remove
\ No newline at end of file
diff --git a/Asset/data/asset/functions/artifact/0625.flame_armor/trigger/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0625.flame_armor/trigger/_index.d.mcfunction
new file mode 100644
index 000000000..b5ad705aa
--- /dev/null
+++ b/Asset/data/asset/functions/artifact/0625.flame_armor/trigger/_index.d.mcfunction
@@ -0,0 +1,10 @@
+#> asset:artifact/0625.flame_armor/trigger/_index.d
+# @private
+#
+#> Tag
+# @within function
+#   asset:artifact/0624.flame_helm/trigger/dis_equip/main
+#   asset:artifact/0625.flame_armor/trigger/**
+#   asset:artifact/0626.flame_leggings/trigger/dis_equip/main
+#   asset:artifact/0627.flame_boots/trigger/dis_equip/main
+    #declare tag HD.Fullset
\ No newline at end of file
diff --git a/Asset/data/asset/functions/artifact/0625.flame_armor/trigger/dis_equip/main.mcfunction b/Asset/data/asset/functions/artifact/0625.flame_armor/trigger/dis_equip/main.mcfunction
index 895f9293d..833e0b967 100644
--- a/Asset/data/asset/functions/artifact/0625.flame_armor/trigger/dis_equip/main.mcfunction
+++ b/Asset/data/asset/functions/artifact/0625.flame_armor/trigger/dis_equip/main.mcfunction
@@ -4,13 +4,16 @@
 #
 # @within function asset:artifact/0625.flame_armor/trigger/dis_equip/
 
-# UUID
+# 火耐性+3%
     data modify storage api: Argument.UUID set value [I;1,1,625,5]
-# 補正の削除
     function api:modifier/defense/fire/remove
 
+# 火攻撃+3%
+    data modify storage api: Argument.UUID set value [I;1,1,625,5]
+    function api:modifier/attack/fire/remove
+
 # 演出
     playsound entity.generic.burn player @a ~ ~ ~ 0.2 1 0
 
-# フルセットの耐性削除
-    execute if data storage asset:context id.all{head:624,chest:625,legs:626,feet:627} run function asset:artifact/0625.flame_armor/trigger/5.fullset_dis_equip
\ No newline at end of file
+# フルセット効果を削除
+    execute if entity @s[tag=HD.Fullset] run function asset:artifact/0625.flame_armor/trigger/5.fullset_dis_equip
\ No newline at end of file
diff --git a/Asset/data/asset/functions/artifact/0626.flame_leggings/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0626.flame_leggings/give/2.give.mcfunction
index 8d65af55f..33c332c6b 100644
--- a/Asset/data/asset/functions/artifact/0626.flame_leggings/give/2.give.mcfunction
+++ b/Asset/data/asset/functions/artifact/0626.flame_leggings/give/2.give.mcfunction
@@ -15,7 +15,7 @@
 # 神器の名前 (TextComponentString)
     data modify storage asset:artifact Name set value '{"text":"フレイムレギンス","color":"red"}'
 # 神器の説明文 (TextComponentString[])
-    data modify storage asset:artifact Lore set value ['{"text":"火耐性+3%","color":"red"}']
+    data modify storage asset:artifact Lore set value ['{"text":"火耐性+3% 火攻撃+3%","color":"red"}']
 # MP以外の消費物 (TextComponentString) (オプション)
     # data modify storage asset:artifact CostText set value
 # 使用回数 (int) (オプション)
diff --git a/Asset/data/asset/functions/artifact/0626.flame_leggings/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0626.flame_leggings/trigger/3.main.mcfunction
index e853cc194..6f7b26d56 100644
--- a/Asset/data/asset/functions/artifact/0626.flame_leggings/trigger/3.main.mcfunction
+++ b/Asset/data/asset/functions/artifact/0626.flame_leggings/trigger/3.main.mcfunction
@@ -9,17 +9,19 @@
 
 # ここから先は神器側の効果の処理を書く
 
-# 引数の設定
-    # UUID
-        data modify storage api: Argument.UUID set value [I;1,1,626,4]
-    # 補正値
-        data modify storage api: Argument.Amount set value 0.03
-    # 補正方法
-        data modify storage api: Argument.Operation set value "multiply_base"
-# 補正の追加
+# 火耐性+3%
+    data modify storage api: Argument.UUID set value [I;1,1,626,4]
+    data modify storage api: Argument.Amount set value 0.03
+    data modify storage api: Argument.Operation set value "multiply_base"
     function api:modifier/defense/fire/add
 
-#ちょっとした演出
+# 火攻撃+3%
+    data modify storage api: Argument.UUID set value [I;1,1,626,4]
+    data modify storage api: Argument.Amount set value 0.03
+    data modify storage api: Argument.Operation set value "multiply_base"
+    function api:modifier/attack/fire/add
+
+# 演出
     particle flame ~ ~0.4 ~ 0.4 0.3 0.4 0 10 normal @a
     playsound minecraft:entity.blaze.shoot player @a ~ ~ ~ 0.4 1
 
diff --git a/Asset/data/asset/functions/artifact/0626.flame_leggings/trigger/dis_equip/main.mcfunction b/Asset/data/asset/functions/artifact/0626.flame_leggings/trigger/dis_equip/main.mcfunction
index fc3180866..c258fb467 100644
--- a/Asset/data/asset/functions/artifact/0626.flame_leggings/trigger/dis_equip/main.mcfunction
+++ b/Asset/data/asset/functions/artifact/0626.flame_leggings/trigger/dis_equip/main.mcfunction
@@ -4,13 +4,16 @@
 #
 # @within function asset:artifact/0626.flame_leggings/trigger/dis_equip/
 
-# UUID
+# 火耐性+3%
     data modify storage api: Argument.UUID set value [I;1,1,626,4]
-# 補正の削除
     function api:modifier/defense/fire/remove
 
+# 火攻撃+3%
+    data modify storage api: Argument.UUID set value [I;1,1,626,4]
+    function api:modifier/attack/fire/remove
+
 # 演出
     playsound entity.generic.burn player @a ~ ~ ~ 0.2 1 0
 
-# フルセットの耐性削除
-    execute if data storage asset:context id.all{head:624,chest:625,legs:626,feet:627} run function asset:artifact/0625.flame_armor/trigger/5.fullset_dis_equip
\ No newline at end of file
+# フルセット効果を削除
+    execute if entity @s[tag=HD.Fullset] run function asset:artifact/0625.flame_armor/trigger/5.fullset_dis_equip
\ No newline at end of file
diff --git a/Asset/data/asset/functions/artifact/0627.flame_boots/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0627.flame_boots/give/2.give.mcfunction
index 50a379f50..2b92a2e92 100644
--- a/Asset/data/asset/functions/artifact/0627.flame_boots/give/2.give.mcfunction
+++ b/Asset/data/asset/functions/artifact/0627.flame_boots/give/2.give.mcfunction
@@ -15,7 +15,7 @@
 # 神器の名前 (TextComponentString)
     data modify storage asset:artifact Name set value '{"text":"フレイムブーツ","color":"red"}'
 # 神器の説明文 (TextComponentString[])
-    data modify storage asset:artifact Lore set value ['{"text":"火耐性+3%","color":"red"}']
+    data modify storage asset:artifact Lore set value ['{"text":"火耐性+3% 火攻撃+3%","color":"red"}']
 # MP以外の消費物 (TextComponentString) (オプション)
     # data modify storage asset:artifact CostText set value
 # 使用回数 (int) (オプション)
diff --git a/Asset/data/asset/functions/artifact/0627.flame_boots/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0627.flame_boots/trigger/3.main.mcfunction
index 88ba72e6e..1e9142d5d 100644
--- a/Asset/data/asset/functions/artifact/0627.flame_boots/trigger/3.main.mcfunction
+++ b/Asset/data/asset/functions/artifact/0627.flame_boots/trigger/3.main.mcfunction
@@ -9,17 +9,19 @@
 
 # ここから先は神器側の効果の処理を書く
 
-# 引数の設定
-    # UUID
-        data modify storage api: Argument.UUID set value [I;1,1,627,3]
-    # 補正値
-        data modify storage api: Argument.Amount set value 0.03
-    # 補正方法
-        data modify storage api: Argument.Operation set value "multiply_base"
-# 補正の追加
+# 火耐性+3%
+    data modify storage api: Argument.UUID set value [I;1,1,627,3]
+    data modify storage api: Argument.Amount set value 0.03
+    data modify storage api: Argument.Operation set value "multiply_base"
     function api:modifier/defense/fire/add
 
-#ちょっとした演出
+# 火攻撃+3%
+    data modify storage api: Argument.UUID set value [I;1,1,627,3]
+    data modify storage api: Argument.Amount set value 0.03
+    data modify storage api: Argument.Operation set value "multiply_base"
+    function api:modifier/attack/fire/add
+
+# 演出
     particle flame ~ ~0.3 ~ 0.4 0.2 0.4 0 10 normal @a
     playsound minecraft:entity.blaze.shoot player @a ~ ~ ~ 0.4 1
 
diff --git a/Asset/data/asset/functions/artifact/0627.flame_boots/trigger/dis_equip/main.mcfunction b/Asset/data/asset/functions/artifact/0627.flame_boots/trigger/dis_equip/main.mcfunction
index 586b8ca14..5a4aa0c24 100644
--- a/Asset/data/asset/functions/artifact/0627.flame_boots/trigger/dis_equip/main.mcfunction
+++ b/Asset/data/asset/functions/artifact/0627.flame_boots/trigger/dis_equip/main.mcfunction
@@ -4,13 +4,16 @@
 #
 # @within function asset:artifact/0627.flame_boots/trigger/dis_equip/
 
-# UUID
+# 火耐性+3%
     data modify storage api: Argument.UUID set value [I;1,1,627,3]
-# 補正の削除
     function api:modifier/defense/fire/remove
 
+# 火攻撃+3%
+    data modify storage api: Argument.UUID set value [I;1,1,627,3]
+    function api:modifier/attack/fire/remove
+
 # 演出
     playsound entity.generic.burn player @a ~ ~ ~ 0.2 1 0
 
-# フルセットの耐性削除
-    execute if data storage asset:context id.all{head:624,chest:625,legs:626,feet:627} run function asset:artifact/0625.flame_armor/trigger/5.fullset_dis_equip
\ No newline at end of file
+# フルセット効果を削除
+    execute if entity @s[tag=HD.Fullset] run function asset:artifact/0625.flame_armor/trigger/5.fullset_dis_equip
\ No newline at end of file
diff --git a/Asset/data/asset/functions/artifact/0628.ice_helm/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0628.ice_helm/give/2.give.mcfunction
index c53f7b36a..6e32373f3 100644
--- a/Asset/data/asset/functions/artifact/0628.ice_helm/give/2.give.mcfunction
+++ b/Asset/data/asset/functions/artifact/0628.ice_helm/give/2.give.mcfunction
@@ -15,7 +15,7 @@
 # 神器の名前 (TextComponentString)
     data modify storage asset:artifact Name set value '{"text":"アイスヘルム","color":"aqua"}'
 # 神器の説明文 (TextComponentString[])
-    data modify storage asset:artifact Lore set value ['[{"text":"水耐性+3%","color":"aqua"}]']
+    data modify storage asset:artifact Lore set value ['[{"text":"水耐性+3% 水攻撃+3%","color":"aqua"}]']
 # MP以外の消費物 (TextComponentString) (オプション)
     # data modify storage asset:artifact CostText set value
 # 使用回数 (int) (オプション)
diff --git a/Asset/data/asset/functions/artifact/0628.ice_helm/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0628.ice_helm/trigger/3.main.mcfunction
index 2c41b39ab..701d7b842 100644
--- a/Asset/data/asset/functions/artifact/0628.ice_helm/trigger/3.main.mcfunction
+++ b/Asset/data/asset/functions/artifact/0628.ice_helm/trigger/3.main.mcfunction
@@ -9,20 +9,22 @@
 
 # ここから先は神器側の効果の処理を書く
 
-# 引数の設定
-    # UUID
-        data modify storage api: Argument.UUID set value [I;1,1,628,6]
-    # 補正値
-        data modify storage api: Argument.Amount set value 0.03
-    # 補正方法
-        data modify storage api: Argument.Operation set value "multiply_base"
-# 補正の追加
+# 水耐性+3%
+    data modify storage api: Argument.UUID set value [I;1,1,628,6]
+    data modify storage api: Argument.Amount set value 0.03
+    data modify storage api: Argument.Operation set value "multiply_base"
     function api:modifier/defense/water/add
 
+# 水攻撃+3%
+    data modify storage api: Argument.UUID set value [I;1,1,628,6]
+    data modify storage api: Argument.Amount set value 0.03
+    data modify storage api: Argument.Operation set value "multiply_base"
+    function api:modifier/attack/water/add
+
 # 演出
     particle falling_dust diamond_block ~ ~1.7 ~ 0.4 0.2 0.4 0 6 normal @a
     particle falling_dust snow_block ~ ~1.7 ~ 0.4 0.2 0.4 0 6 normal @a
     playsound minecraft:block.glass.break player @a ~ ~ ~ 0.4 1.2 0
 
 # フルセット
-execute if data storage asset:context id.all{head:628,chest:629,legs:630,feet:631} run function asset:artifact/0629.ice_armor/trigger/4.fullset
\ No newline at end of file
+    execute if data storage asset:context id.all{head:628,chest:629,legs:630,feet:631} run function asset:artifact/0629.ice_armor/trigger/4.fullset
\ No newline at end of file
diff --git a/Asset/data/asset/functions/artifact/0628.ice_helm/trigger/dis_equip/main.mcfunction b/Asset/data/asset/functions/artifact/0628.ice_helm/trigger/dis_equip/main.mcfunction
index d53d9ab35..c4e7bb8c7 100644
--- a/Asset/data/asset/functions/artifact/0628.ice_helm/trigger/dis_equip/main.mcfunction
+++ b/Asset/data/asset/functions/artifact/0628.ice_helm/trigger/dis_equip/main.mcfunction
@@ -4,11 +4,14 @@
 #
 # @within function asset:artifact/0628.ice_helm/trigger/dis_equip/
 
-# UUID
+# 水耐性+3%
     data modify storage api: Argument.UUID set value [I;1,1,628,6]
-# 補正の削除
     function api:modifier/defense/water/remove
 
+# 水攻撃+3%
+    data modify storage api: Argument.UUID set value [I;1,1,628,6]
+    function api:modifier/attack/water/remove
+
 # 演出
     playsound minecraft:block.glass.break player @a ~ ~ ~ 0.4 0.8 0
 
diff --git a/Asset/data/asset/functions/artifact/0629.ice_armor/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0629.ice_armor/give/2.give.mcfunction
index b5dc61cbe..c4c1e97e4 100644
--- a/Asset/data/asset/functions/artifact/0629.ice_armor/give/2.give.mcfunction
+++ b/Asset/data/asset/functions/artifact/0629.ice_armor/give/2.give.mcfunction
@@ -15,7 +15,7 @@
 # 神器の名前 (TextComponentString)
     data modify storage asset:artifact Name set value '{"text":"アイスアーマー","color":"aqua"}'
 # 神器の説明文 (TextComponentString[])
-    data modify storage asset:artifact Lore set value ['[{"text":"水耐性+3%","color":"aqua"}]','[{"text":"一式全て揃えた場合、追加で水耐性+3%","color":"aqua"}]']
+    data modify storage asset:artifact Lore set value ['[{"text":"水耐性+3% 水攻撃+3%","color":"aqua"}]','[{"text":"一式揃えた場合、追加で","color":"white"}]','[{"text":"水耐性+3% 水攻撃+3%","color":"aqua"}]']
 # MP以外の消費物 (TextComponentString) (オプション)
     # data modify storage asset:artifact CostText set value
 # 使用回数 (int) (オプション)
diff --git a/Asset/data/asset/functions/artifact/0629.ice_armor/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0629.ice_armor/trigger/3.main.mcfunction
index d7eba3af7..028816035 100644
--- a/Asset/data/asset/functions/artifact/0629.ice_armor/trigger/3.main.mcfunction
+++ b/Asset/data/asset/functions/artifact/0629.ice_armor/trigger/3.main.mcfunction
@@ -9,20 +9,22 @@
 
 # ここから先は神器側の効果の処理を書く
 
-# 引数の設定
-    # UUID
-        data modify storage api: Argument.UUID set value [I;1,1,629,5]
-    # 補正値
-        data modify storage api: Argument.Amount set value 0.03
-    # 補正方法
-        data modify storage api: Argument.Operation set value "multiply_base"
-# 補正の追加
+# 水耐性+3%
+    data modify storage api: Argument.UUID set value [I;1,1,629,5]
+    data modify storage api: Argument.Amount set value 0.03
+    data modify storage api: Argument.Operation set value "multiply_base"
     function api:modifier/defense/water/add
 
-#ちょっとした演出
+# 水攻撃+3%
+    data modify storage api: Argument.UUID set value [I;1,1,629,5]
+    data modify storage api: Argument.Amount set value 0.03
+    data modify storage api: Argument.Operation set value "multiply_base"
+    function api:modifier/attack/water/add
+
+# 演出
     particle falling_dust diamond_block ~ ~1.4 ~ 0.4 0.2 0.4 0 7 normal @a
     particle falling_dust snow_block ~ ~1.4 ~ 0.4 0.2 0.4 0 7 normal @a
     playsound block.glass.break player @a ~ ~ ~ 0.4 1.2 0
 
 # フルセット
-execute if data storage asset:context id.all{head:628,chest:629,legs:630,feet:631} run function asset:artifact/0629.ice_armor/trigger/4.fullset
\ No newline at end of file
+    execute if data storage asset:context id.all{head:628,chest:629,legs:630,feet:631} run function asset:artifact/0629.ice_armor/trigger/4.fullset
\ No newline at end of file
diff --git a/Asset/data/asset/functions/artifact/0629.ice_armor/trigger/4.fullset.mcfunction b/Asset/data/asset/functions/artifact/0629.ice_armor/trigger/4.fullset.mcfunction
index bdcf80e48..2b74a839a 100644
--- a/Asset/data/asset/functions/artifact/0629.ice_armor/trigger/4.fullset.mcfunction
+++ b/Asset/data/asset/functions/artifact/0629.ice_armor/trigger/4.fullset.mcfunction
@@ -11,16 +11,18 @@
 # Tag付与
     tag @s add HH.Fullset
 
-# 引数の設定
-    # UUID
-        data modify storage api: Argument.UUID set value [I;1,1,629,0]
-    # 補正値
-        data modify storage api: Argument.Amount set value 0.03
-    # 補正方法
-        data modify storage api: Argument.Operation set value "multiply_base"
-# 補正の追加
+# 水耐性+3%
+    data modify storage api: Argument.UUID set value [I;1,1,629,0]
+    data modify storage api: Argument.Amount set value 0.03
+    data modify storage api: Argument.Operation set value "multiply_base"
     function api:modifier/defense/water/add
 
+# 水攻撃+3%
+    data modify storage api: Argument.UUID set value [I;1,1,629,0]
+    data modify storage api: Argument.Amount set value 0.03
+    data modify storage api: Argument.Operation set value "multiply_base"
+    function api:modifier/attack/water/add
+
 # 演出
     particle falling_dust diamond_block ~ ~1.2 ~ 0.4 0.5 0.4 0 20 normal @a
     particle falling_dust snow_block ~ ~1.2 ~ 0.4 0.5 0.4 0 20 normal @a
diff --git a/Asset/data/asset/functions/artifact/0629.ice_armor/trigger/5.fullset_dis_equip.mcfunction b/Asset/data/asset/functions/artifact/0629.ice_armor/trigger/5.fullset_dis_equip.mcfunction
index d7c77faf2..7bd892ed0 100644
--- a/Asset/data/asset/functions/artifact/0629.ice_armor/trigger/5.fullset_dis_equip.mcfunction
+++ b/Asset/data/asset/functions/artifact/0629.ice_armor/trigger/5.fullset_dis_equip.mcfunction
@@ -2,15 +2,19 @@
 #
 #
 #
-# @within function asset:artifact/0628.ice_helm/trigger/dis_equip/main
-# @within function asset:artifact/0629.ice_armor/trigger/dis_equip/main
-# @within function asset:artifact/0630.ice_leggings/trigger/dis_equip/main
-# @within function asset:artifact/0631.ice_boots/trigger/dis_equip/main
+# @within function
+#   asset:artifact/0628.ice_helm/trigger/dis_equip/main
+#   asset:artifact/0629.ice_armor/trigger/dis_equip/main
+#   asset:artifact/0630.ice_leggings/trigger/dis_equip/main
+#   asset:artifact/0631.ice_boots/trigger/dis_equip/main
 
-# UUID
+# 水耐性+3%
     data modify storage api: Argument.UUID set value [I;1,1,629,0]
-# 補正の削除
     function api:modifier/defense/water/remove
 
+# 水攻撃+3%
+    data modify storage api: Argument.UUID set value [I;1,1,629,0]
+    function api:modifier/attack/water/remove
+
 # Tag削除
     tag @s remove HH.Fullset
\ No newline at end of file
diff --git a/Asset/data/asset/functions/artifact/0629.ice_armor/trigger/dis_equip/main.mcfunction b/Asset/data/asset/functions/artifact/0629.ice_armor/trigger/dis_equip/main.mcfunction
index 51cadaab2..eee452dc5 100644
--- a/Asset/data/asset/functions/artifact/0629.ice_armor/trigger/dis_equip/main.mcfunction
+++ b/Asset/data/asset/functions/artifact/0629.ice_armor/trigger/dis_equip/main.mcfunction
@@ -4,11 +4,14 @@
 #
 # @within function asset:artifact/0629.ice_armor/trigger/dis_equip/
 
-# UUID
+# 水耐性+3%
     data modify storage api: Argument.UUID set value [I;1,1,629,5]
-# 補正の削除
     function api:modifier/defense/water/remove
 
+# 水攻撃+3%
+    data modify storage api: Argument.UUID set value [I;1,1,629,5]
+    function api:modifier/attack/water/remove
+
  # 演出
     playsound block.glass.break player @a ~ ~ ~ 0.4 0.8 0
 
diff --git a/Asset/data/asset/functions/artifact/0630.ice_leggings/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0630.ice_leggings/give/2.give.mcfunction
index 7416abe65..10620bc74 100644
--- a/Asset/data/asset/functions/artifact/0630.ice_leggings/give/2.give.mcfunction
+++ b/Asset/data/asset/functions/artifact/0630.ice_leggings/give/2.give.mcfunction
@@ -15,7 +15,7 @@
 # 神器の名前 (TextComponentString)
     data modify storage asset:artifact Name set value '{"text":"アイスレギンス","color":"aqua"}'
 # 神器の説明文 (TextComponentString[])
-    data modify storage asset:artifact Lore set value ['[{"text":"水耐性+3%","color":"aqua"}]']
+    data modify storage asset:artifact Lore set value ['[{"text":"水耐性+3% 水攻撃+3%","color":"aqua"}]']
 # MP以外の消費物 (TextComponentString) (オプション)
     # data modify storage asset:artifact CostText set value
 # 使用回数 (int) (オプション)
diff --git a/Asset/data/asset/functions/artifact/0630.ice_leggings/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0630.ice_leggings/trigger/3.main.mcfunction
index 120176108..f8eb98cb1 100644
--- a/Asset/data/asset/functions/artifact/0630.ice_leggings/trigger/3.main.mcfunction
+++ b/Asset/data/asset/functions/artifact/0630.ice_leggings/trigger/3.main.mcfunction
@@ -9,21 +9,22 @@
 
 # ここから先は神器側の効果の処理を書く
 
-# 引数の設定
-    # UUID
-        data modify storage api: Argument.UUID set value [I;1,1,630,4]
-    # 補正値
-        data modify storage api: Argument.Amount set value 0.03
-    # 補正方法
-        data modify storage api: Argument.Operation set value "multiply_base"
-# 補正の追加
+# 水耐性+3%
+    data modify storage api: Argument.UUID set value [I;1,1,630,4]
+    data modify storage api: Argument.Amount set value 0.03
+    data modify storage api: Argument.Operation set value "multiply_base"
     function api:modifier/defense/water/add
 
-#ちょっとした演出
+# 水攻撃+3%
+    data modify storage api: Argument.UUID set value [I;1,1,630,4]
+    data modify storage api: Argument.Amount set value 0.03
+    data modify storage api: Argument.Operation set value "multiply_base"
+    function api:modifier/attack/water/add
+
+# 演出
     particle falling_dust diamond_block ~ ~0.4 ~ 0.4 0.3 0.4 0 5 normal @a
     particle falling_dust snow_block ~ ~0.4 ~ 0.4 0.3 0.4 0 5 normal @a
     playsound minecraft:block.glass.break player @a ~ ~ ~ 0.4 1.2 0
 
-
 # フルセット
-execute if data storage asset:context id.all{head:628,chest:629,legs:630,feet:631} run function asset:artifact/0629.ice_armor/trigger/4.fullset
\ No newline at end of file
+    execute if data storage asset:context id.all{head:628,chest:629,legs:630,feet:631} run function asset:artifact/0629.ice_armor/trigger/4.fullset
\ No newline at end of file
diff --git a/Asset/data/asset/functions/artifact/0630.ice_leggings/trigger/dis_equip/main.mcfunction b/Asset/data/asset/functions/artifact/0630.ice_leggings/trigger/dis_equip/main.mcfunction
index 3a1892f64..fc46894ab 100644
--- a/Asset/data/asset/functions/artifact/0630.ice_leggings/trigger/dis_equip/main.mcfunction
+++ b/Asset/data/asset/functions/artifact/0630.ice_leggings/trigger/dis_equip/main.mcfunction
@@ -4,11 +4,14 @@
 #
 # @within function asset:artifact/0630.ice_leggings/trigger/dis_equip/
 
-# UUID
+# 水耐性+3%
     data modify storage api: Argument.UUID set value [I;1,1,630,4]
-# 補正の削除
     function api:modifier/defense/water/remove
 
+# 水攻撃+3%
+    data modify storage api: Argument.UUID set value [I;1,1,630,4]
+    function api:modifier/attack/water/remove
+
 # 演出
     playsound minecraft:block.glass.break player @a ~ ~ ~ 0.4 0.8 0
 
diff --git a/Asset/data/asset/functions/artifact/0631.ice_boots/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0631.ice_boots/give/2.give.mcfunction
index 3bddda223..8721fdaf5 100644
--- a/Asset/data/asset/functions/artifact/0631.ice_boots/give/2.give.mcfunction
+++ b/Asset/data/asset/functions/artifact/0631.ice_boots/give/2.give.mcfunction
@@ -15,7 +15,7 @@
 # 神器の名前 (TextComponentString)
     data modify storage asset:artifact Name set value '{"text":"アイスブーツ","color":"aqua"}'
 # 神器の説明文 (TextComponentString[])
-    data modify storage asset:artifact Lore set value ['[{"text":"水耐性+3%","color":"aqua"}]']
+    data modify storage asset:artifact Lore set value ['[{"text":"水耐性+3% 水攻撃+3%","color":"aqua"}]']
 # MP以外の消費物 (TextComponentString) (オプション)
     # data modify storage asset:artifact CostText set value
 # 使用回数 (int) (オプション)
diff --git a/Asset/data/asset/functions/artifact/0631.ice_boots/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0631.ice_boots/trigger/3.main.mcfunction
index cd01f40a3..e615a471c 100644
--- a/Asset/data/asset/functions/artifact/0631.ice_boots/trigger/3.main.mcfunction
+++ b/Asset/data/asset/functions/artifact/0631.ice_boots/trigger/3.main.mcfunction
@@ -9,20 +9,22 @@
 
 # ここから先は神器側の効果の処理を書く
 
-# 引数の設定
-    # UUID
-        data modify storage api: Argument.UUID set value [I;1,1,631,3]
-    # 補正値
-        data modify storage api: Argument.Amount set value 0.03
-    # 補正方法
-        data modify storage api: Argument.Operation set value "multiply_base"
-# 補正の追加
+# 水耐性+3%
+    data modify storage api: Argument.UUID set value [I;1,1,631,3]
+    data modify storage api: Argument.Amount set value 0.03
+    data modify storage api: Argument.Operation set value "multiply_base"
     function api:modifier/defense/water/add
 
-#ちょっとした演出
+# 水攻撃+3%
+    data modify storage api: Argument.UUID set value [I;1,1,631,3]
+    data modify storage api: Argument.Amount set value 0.03
+    data modify storage api: Argument.Operation set value "multiply_base"
+    function api:modifier/attack/water/add
+
+# 演出
     particle falling_dust diamond_block ~ ~0.3 ~ 0.4 0.1 0.4 0 5 normal @a
     particle falling_dust snow_block ~ ~0.3 ~ 0.4 0.1 0.4 0 5 normal @a
     playsound minecraft:block.glass.break player @a ~ ~ ~ 0.4 1.2 0
 
 # フルセット
-execute if data storage asset:context id.all{head:628,chest:629,legs:630,feet:631} run function asset:artifact/0629.ice_armor/trigger/4.fullset
\ No newline at end of file
+    execute if data storage asset:context id.all{head:628,chest:629,legs:630,feet:631} run function asset:artifact/0629.ice_armor/trigger/4.fullset
\ No newline at end of file
diff --git a/Asset/data/asset/functions/artifact/0631.ice_boots/trigger/dis_equip/main.mcfunction b/Asset/data/asset/functions/artifact/0631.ice_boots/trigger/dis_equip/main.mcfunction
index 2943c87c0..46d9c61d0 100644
--- a/Asset/data/asset/functions/artifact/0631.ice_boots/trigger/dis_equip/main.mcfunction
+++ b/Asset/data/asset/functions/artifact/0631.ice_boots/trigger/dis_equip/main.mcfunction
@@ -4,11 +4,15 @@
 #
 # @within function asset:artifact/0631.ice_boots/trigger/dis_equip/
 
-# UUID
+# 水耐性+3%
     data modify storage api: Argument.UUID set value [I;1,1,631,3]
-# 補正の削除
     function api:modifier/defense/water/remove
 
+# 水攻撃+3%
+    data modify storage api: Argument.UUID set value [I;1,1,631,3]
+    function api:modifier/attack/water/remove
+
+# 演出
     playsound minecraft:block.glass.break player @a ~ ~ ~ 0.4 0.8 0
 
 # フルセット効果削除
diff --git a/Asset/data/asset/functions/artifact/0632.elec_helm/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0632.elec_helm/give/2.give.mcfunction
index b03aa02c0..bae5446d7 100644
--- a/Asset/data/asset/functions/artifact/0632.elec_helm/give/2.give.mcfunction
+++ b/Asset/data/asset/functions/artifact/0632.elec_helm/give/2.give.mcfunction
@@ -15,7 +15,7 @@
 # 神器の名前 (TextComponentString)
     data modify storage asset:artifact Name set value '{"text":"エレキヘルム","color":"yellow"}'
 # 神器の説明文 (TextComponentString[])
-    data modify storage asset:artifact Lore set value ['{"text":"雷耐性+3%","color":"yellow"}']
+    data modify storage asset:artifact Lore set value ['{"text":"雷耐性+3% 雷攻撃+3%","color":"yellow"}']
 # MP以外の消費物 (TextComponentString) (オプション)
     # data modify storage asset:artifact CostText set value
 # 使用回数 (int) (オプション)
diff --git a/Asset/data/asset/functions/artifact/0632.elec_helm/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0632.elec_helm/trigger/3.main.mcfunction
index 51f94e5d3..c981942a2 100644
--- a/Asset/data/asset/functions/artifact/0632.elec_helm/trigger/3.main.mcfunction
+++ b/Asset/data/asset/functions/artifact/0632.elec_helm/trigger/3.main.mcfunction
@@ -9,17 +9,19 @@
 
 # ここから先は神器側の効果の処理を書く
 
-# 引数の設定
-    # UUID
-        data modify storage api: Argument.UUID set value [I;1,1,632,6]
-    # 補正値
-        data modify storage api: Argument.Amount set value 0.03
-    # 補正方法
-        data modify storage api: Argument.Operation set value "multiply_base"
-# 補正の追加
+# 雷耐性+3%
+    data modify storage api: Argument.UUID set value [I;1,1,632,6]
+    data modify storage api: Argument.Amount set value 0.03
+    data modify storage api: Argument.Operation set value "multiply_base"
     function api:modifier/defense/thunder/add
 
-#ちょっとした演出
+# 雷耐性+3%
+    data modify storage api: Argument.UUID set value [I;1,1,632,6]
+    data modify storage api: Argument.Amount set value 0.03
+    data modify storage api: Argument.Operation set value "multiply_base"
+    function api:modifier/attack/thunder/add
+
+# 演出
     particle dust 1 1 0 1 ~ ~1.6 ~ 0.4 0.2 0.4 0 6 normal @a
     particle firework ~ ~1.6 ~ 0.4 0.2 0.4 0 6 normal @a
     playsound minecraft:entity.firework_rocket.twinkle player @a ~ ~ ~ 0.4 1.5 0
diff --git a/Asset/data/asset/functions/artifact/0632.elec_helm/trigger/dis_equip/main.mcfunction b/Asset/data/asset/functions/artifact/0632.elec_helm/trigger/dis_equip/main.mcfunction
index 7dbcc834f..97a33bbf0 100644
--- a/Asset/data/asset/functions/artifact/0632.elec_helm/trigger/dis_equip/main.mcfunction
+++ b/Asset/data/asset/functions/artifact/0632.elec_helm/trigger/dis_equip/main.mcfunction
@@ -4,11 +4,14 @@
 #
 # @within function asset:artifact/0632.elec_helm/trigger/dis_equip/
 
-# UUID
+# 雷耐性+3%
     data modify storage api: Argument.UUID set value [I;1,1,632,6]
-# 補正の削除
     function api:modifier/defense/thunder/remove
 
+# 雷攻撃+3%
+    data modify storage api: Argument.UUID set value [I;1,1,632,6]
+    function api:modifier/attack/thunder/remove
+
 # 演出
     playsound minecraft:entity.firework_rocket.twinkle player @a ~ ~ ~ 0.4 1.1 0
 
diff --git a/Asset/data/asset/functions/artifact/0633.elec_armor/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0633.elec_armor/give/2.give.mcfunction
index 7deee264f..41093ad6e 100644
--- a/Asset/data/asset/functions/artifact/0633.elec_armor/give/2.give.mcfunction
+++ b/Asset/data/asset/functions/artifact/0633.elec_armor/give/2.give.mcfunction
@@ -15,7 +15,7 @@
 # 神器の名前 (TextComponentString)
     data modify storage asset:artifact Name set value '{"text":"エレキアーマー","color":"yellow"}'
 # 神器の説明文 (TextComponentString[])
-    data modify storage asset:artifact Lore set value ['{"text":"雷耐性+3%","color":"yellow"}','{"text":"一式全て揃えた場合、追加で雷耐性+3%","color":"yellow"}']
+    data modify storage asset:artifact Lore set value ['[{"text":"雷耐性+3% 雷攻撃+3%","color":"yellow"}]','[{"text":"一式揃えた場合、追加で","color":"white"}]','[{"text":"雷耐性+3% 雷攻撃+3%","color":"yellow"}]']
 # MP以外の消費物 (TextComponentString) (オプション)
     # data modify storage asset:artifact CostText set value
 # 使用回数 (int) (オプション)
diff --git a/Asset/data/asset/functions/artifact/0633.elec_armor/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0633.elec_armor/trigger/3.main.mcfunction
index 2cf7661e4..cc3745157 100644
--- a/Asset/data/asset/functions/artifact/0633.elec_armor/trigger/3.main.mcfunction
+++ b/Asset/data/asset/functions/artifact/0633.elec_armor/trigger/3.main.mcfunction
@@ -9,17 +9,19 @@
 
 # ここから先は神器側の効果の処理を書く
 
-# 引数の設定
-    # UUID
-        data modify storage api: Argument.UUID set value [I;1,1,633,5]
-    # 補正値
-        data modify storage api: Argument.Amount set value 0.03
-    # 補正方法
-        data modify storage api: Argument.Operation set value "multiply_base"
-# 補正の追加
+# 雷耐性+3%
+    data modify storage api: Argument.UUID set value [I;1,1,633,5]
+    data modify storage api: Argument.Amount set value 0.03
+    data modify storage api: Argument.Operation set value "multiply_base"
     function api:modifier/defense/thunder/add
 
-#ちょっとした演出
+# 雷耐性+3%
+    data modify storage api: Argument.UUID set value [I;1,1,633,5]
+    data modify storage api: Argument.Amount set value 0.03
+    data modify storage api: Argument.Operation set value "multiply_base"
+    function api:modifier/attack/thunder/add
+
+# 演出
     particle dust 1 1 0 1 ~ ~1.3 ~ 0.4 0.3 0.4 0 6 normal @a
     particle firework ~ ~1.3 ~ 0.4 0.3 0.4 0 6 normal @a
     playsound minecraft:entity.firework_rocket.twinkle player @a ~ ~ ~ 0.4 1.5 0
diff --git a/Asset/data/asset/functions/artifact/0633.elec_armor/trigger/4.fullset.mcfunction b/Asset/data/asset/functions/artifact/0633.elec_armor/trigger/4.fullset.mcfunction
index 86a837830..e5d9c9c8a 100644
--- a/Asset/data/asset/functions/artifact/0633.elec_armor/trigger/4.fullset.mcfunction
+++ b/Asset/data/asset/functions/artifact/0633.elec_armor/trigger/4.fullset.mcfunction
@@ -8,17 +8,22 @@
 #   asset:artifact/0634.elec_leggings/trigger/3.main
 #   asset:artifact/0635.elec_boots/trigger/3.main
 
-# 引数の設定
-    # UUID
-        data modify storage api: Argument.UUID set value [I;1,1,633,0]
-    # 補正値
-        data modify storage api: Argument.Amount set value 0.03
-    # 補正方法
-        data modify storage api: Argument.Operation set value "multiply_base"
-# 補正の追加
+# Tag付与
+    tag @s add HL.Fullset
+
+# 雷耐性+3%
+    data modify storage api: Argument.UUID set value [I;1,1,633,0]
+    data modify storage api: Argument.Amount set value 0.03
+    data modify storage api: Argument.Operation set value "multiply_base"
     function api:modifier/defense/thunder/add
 
-#ちょっとした演出
+# 雷耐性+3%
+    data modify storage api: Argument.UUID set value [I;1,1,633,0]
+    data modify storage api: Argument.Amount set value 0.03
+    data modify storage api: Argument.Operation set value "multiply_base"
+    function api:modifier/attack/thunder/add
+
+# 演出
     particle dust 1 1 0 1 ~ ~1.2 ~ 0.4 0.5 0.4 0 25 normal @a
     particle firework ~ ~1.2 ~ 0.4 0.5 0.4 0 15 normal @a
     playsound minecraft:entity.firework_rocket.twinkle player @a ~ ~ ~ 0.4 1.7 0
\ No newline at end of file
diff --git a/Asset/data/asset/functions/artifact/0633.elec_armor/trigger/5.fullset_dis_equip.mcfunction b/Asset/data/asset/functions/artifact/0633.elec_armor/trigger/5.fullset_dis_equip.mcfunction
index 99be95aa3..5ac351e06 100644
--- a/Asset/data/asset/functions/artifact/0633.elec_armor/trigger/5.fullset_dis_equip.mcfunction
+++ b/Asset/data/asset/functions/artifact/0633.elec_armor/trigger/5.fullset_dis_equip.mcfunction
@@ -8,11 +8,14 @@
 #   asset:artifact/0634.elec_leggings/trigger/dis_equip/main
 #   asset:artifact/0635.elec_boots/trigger/dis_equip/main
 
-# UUID
+# 雷耐性+3%
     data modify storage api: Argument.UUID set value [I;1,1,633,0]
-# 補正の削除
     function api:modifier/defense/thunder/remove
 
+# 雷耐性+3%
+    data modify storage api: Argument.UUID set value [I;1,1,633,0]
+    function api:modifier/attack/thunder/remove
+
 # 演出
     playsound minecraft:entity.firework_rocket.twinkle player @a ~ ~ ~ 0.4 1.1 0
 
diff --git a/Asset/data/asset/functions/artifact/0633.elec_armor/trigger/dis_equip/main.mcfunction b/Asset/data/asset/functions/artifact/0633.elec_armor/trigger/dis_equip/main.mcfunction
index 24838ea9b..6295c3cf2 100644
--- a/Asset/data/asset/functions/artifact/0633.elec_armor/trigger/dis_equip/main.mcfunction
+++ b/Asset/data/asset/functions/artifact/0633.elec_armor/trigger/dis_equip/main.mcfunction
@@ -4,11 +4,14 @@
 #
 # @within function asset:artifact/0633.elec_armor/trigger/dis_equip/
 
-# UUID
+# 雷耐性+3%
     data modify storage api: Argument.UUID set value [I;1,1,633,5]
-# 補正の削除
     function api:modifier/defense/thunder/remove
 
+# 雷攻撃+3%
+    data modify storage api: Argument.UUID set value [I;1,1,633,5]
+    function api:modifier/attack/thunder/remove
+
 # 演出
     playsound minecraft:entity.firework_rocket.twinkle player @a ~ ~ ~ 0.4 1.1 0
 
diff --git a/Asset/data/asset/functions/artifact/0634.elec_leggings/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0634.elec_leggings/give/2.give.mcfunction
index 03612f859..d3eb2b13f 100644
--- a/Asset/data/asset/functions/artifact/0634.elec_leggings/give/2.give.mcfunction
+++ b/Asset/data/asset/functions/artifact/0634.elec_leggings/give/2.give.mcfunction
@@ -15,7 +15,7 @@
 # 神器の名前 (TextComponentString)
     data modify storage asset:artifact Name set value '{"text":"エレキレギンス","color":"yellow"}'
 # 神器の説明文 (TextComponentString[])
-    data modify storage asset:artifact Lore set value ['{"text":"雷耐性+3%","color":"yellow"}']
+    data modify storage asset:artifact Lore set value ['{"text":"雷耐性+3% 雷攻撃+3%","color":"yellow"}']
 # MP以外の消費物 (TextComponentString) (オプション)
     # data modify storage asset:artifact CostText set value
 # 使用回数 (int) (オプション)
diff --git a/Asset/data/asset/functions/artifact/0634.elec_leggings/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0634.elec_leggings/trigger/3.main.mcfunction
index f6ae2fb17..7724a5423 100644
--- a/Asset/data/asset/functions/artifact/0634.elec_leggings/trigger/3.main.mcfunction
+++ b/Asset/data/asset/functions/artifact/0634.elec_leggings/trigger/3.main.mcfunction
@@ -9,17 +9,19 @@
 
 # ここから先は神器側の効果の処理を書く
 
-# 引数の設定
-    # UUID
-        data modify storage api: Argument.UUID set value [I;1,1,634,4]
-    # 補正値
-        data modify storage api: Argument.Amount set value 0.03
-    # 補正方法
-        data modify storage api: Argument.Operation set value "multiply_base"
-# 補正の追加
+# 雷耐性+3%
+    data modify storage api: Argument.UUID set value [I;1,1,634,4]
+    data modify storage api: Argument.Amount set value 0.03
+    data modify storage api: Argument.Operation set value "multiply_base"
     function api:modifier/defense/thunder/add
 
-#ちょっとした演出
+# 雷耐性+3%
+    data modify storage api: Argument.UUID set value [I;1,1,634,4]
+    data modify storage api: Argument.Amount set value 0.03
+    data modify storage api: Argument.Operation set value "multiply_base"
+    function api:modifier/attack/thunder/add
+
+# 演出
     particle dust 1 1 0 1 ~ ~0.4 ~ 0.4 0.3 0.4 0 6 normal @a
     particle firework ~ ~0.4 ~ 0.4 0.3 0.4 0 6 normal @a
     playsound minecraft:entity.firework_rocket.twinkle player @a ~ ~ ~ 0.4 1.5 0
diff --git a/Asset/data/asset/functions/artifact/0634.elec_leggings/trigger/dis_equip/main.mcfunction b/Asset/data/asset/functions/artifact/0634.elec_leggings/trigger/dis_equip/main.mcfunction
index 9cfd7c5d5..ee2e14c04 100644
--- a/Asset/data/asset/functions/artifact/0634.elec_leggings/trigger/dis_equip/main.mcfunction
+++ b/Asset/data/asset/functions/artifact/0634.elec_leggings/trigger/dis_equip/main.mcfunction
@@ -4,11 +4,18 @@
 #
 # @within function asset:artifact/0634.elec_leggings/trigger/dis_equip/
 
-# UUID
+# 雷耐性+3%
     data modify storage api: Argument.UUID set value [I;1,1,634,4]
-# 補正の削除
+    data modify storage api: Argument.Amount set value 0.03
+    data modify storage api: Argument.Operation set value "multiply_base"
     function api:modifier/defense/thunder/remove
 
+# 雷攻撃+3%
+    data modify storage api: Argument.UUID set value [I;1,1,634,4]
+    data modify storage api: Argument.Amount set value 0.03
+    data modify storage api: Argument.Operation set value "multiply_base"
+    function api:modifier/attack/thunder/remove
+
 # 演出
     playsound minecraft:entity.firework_rocket.twinkle player @a ~ ~ ~ 0.4 1.1 0
 
diff --git a/Asset/data/asset/functions/artifact/0635.elec_boots/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0635.elec_boots/give/2.give.mcfunction
index 0359229d9..8dd2b7804 100644
--- a/Asset/data/asset/functions/artifact/0635.elec_boots/give/2.give.mcfunction
+++ b/Asset/data/asset/functions/artifact/0635.elec_boots/give/2.give.mcfunction
@@ -15,7 +15,7 @@
 # 神器の名前 (TextComponentString)
     data modify storage asset:artifact Name set value '{"text":"エレキブーツ","color":"yellow"}'
 # 神器の説明文 (TextComponentString[])
-    data modify storage asset:artifact Lore set value ['{"text":"雷耐性+3%","color":"yellow"}']
+    data modify storage asset:artifact Lore set value ['{"text":"雷耐性+3% 雷攻撃+3%","color":"yellow"}']
 # MP以外の消費物 (TextComponentString) (オプション)
     # data modify storage asset:artifact CostText set value
 # 使用回数 (int) (オプション)
diff --git a/Asset/data/asset/functions/artifact/0635.elec_boots/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0635.elec_boots/trigger/3.main.mcfunction
index 5bd2ab3a8..f35b4b546 100644
--- a/Asset/data/asset/functions/artifact/0635.elec_boots/trigger/3.main.mcfunction
+++ b/Asset/data/asset/functions/artifact/0635.elec_boots/trigger/3.main.mcfunction
@@ -9,16 +9,18 @@
 
 # ここから先は神器側の効果の処理を書く
 
-# 引数の設定
-    # UUID
-        data modify storage api: Argument.UUID set value [I;1,1,635,3]
-    # 補正値
-        data modify storage api: Argument.Amount set value 0.03
-    # 補正方法
-        data modify storage api: Argument.Operation set value "multiply_base"
-# 補正の追加
+# 雷耐性+3%
+    data modify storage api: Argument.UUID set value [I;1,1,635,3]
+    data modify storage api: Argument.Amount set value 0.03
+    data modify storage api: Argument.Operation set value "multiply_base"
     function api:modifier/defense/thunder/add
 
+# 雷耐性+3%
+    data modify storage api: Argument.UUID set value [I;1,1,635,3]
+    data modify storage api: Argument.Amount set value 0.03
+    data modify storage api: Argument.Operation set value "multiply_base"
+    function api:modifier/attack/thunder/add
+
 #ちょっとした演出
     particle dust 1 1 0 1 ~ ~0.3 ~ 0.4 0.1 0.4 0 6 normal @a
     particle firework ~ ~0.3 ~ 0.4 0.2 0.4 0 6 normal @a
diff --git a/Asset/data/asset/functions/artifact/0635.elec_boots/trigger/dis_equip/main.mcfunction b/Asset/data/asset/functions/artifact/0635.elec_boots/trigger/dis_equip/main.mcfunction
index a18f9c162..17607c5a3 100644
--- a/Asset/data/asset/functions/artifact/0635.elec_boots/trigger/dis_equip/main.mcfunction
+++ b/Asset/data/asset/functions/artifact/0635.elec_boots/trigger/dis_equip/main.mcfunction
@@ -4,14 +4,16 @@
 #
 # @within function asset:artifact/0635.elec_boots/trigger/dis_equip/
 
-# UUID
+# 雷耐性+3%
     data modify storage api: Argument.UUID set value [I;1,1,635,3]
-
-# 補正の削除
     function api:modifier/defense/thunder/remove
 
+# 雷攻撃    +3%
+    data modify storage api: Argument.UUID set value [I;1,1,635,3]
+    function api:modifier/attack/thunder/remove
+
 # 演出
     playsound minecraft:entity.firework_rocket.twinkle player @a ~ ~ ~ 0.4 1.1 0
 
 # 一式効果削除
-    execute if entity @s[tag=HL.Fullset] run function asset:artifact/0633.elec_armor/trigger/5.fullset_dis_equip
+    execute if entity @s[tag=HL.Fullset] run function asset:artifact/0633.elec_armor/trigger/5.fullset_dis_equip
\ No newline at end of file