⚖️ [神器624-635] フレイム/アイス/エレキ装備に属性攻撃補正を追加

haiiro2gou · Dec 28, 2023 · b2fb054 · b2fb054
1 parent f5defad
commit b2fb054
Show file tree

Hide file tree

Showing 43 changed files with 293 additions and 195 deletions.
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
@@ -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
@@ -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
@@ -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
+# フルセット効果を削除
+    execute if entity @s[tag=HD.Fullset] run function asset:artifact/0625.flame_armor/trigger/5.fullset_dis_equip
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
@@ -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
@@ -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
@@ -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
+    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
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
@@ -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
+    function api:modifier/attack/fire/remove
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
@@ -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
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
@@ -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
+# フルセット効果を削除
+    execute if entity @s[tag=HD.Fullset] run function asset:artifact/0625.flame_armor/trigger/5.fullset_dis_equip
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
@@ -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
@@ -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
@@ -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
+# フルセット効果を削除
+    execute if entity @s[tag=HD.Fullset] run function asset:artifact/0625.flame_armor/trigger/5.fullset_dis_equip
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
@@ -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
@@ -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
@@ -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
+# フルセット効果を削除
+    execute if entity @s[tag=HD.Fullset] run function asset:artifact/0625.flame_armor/trigger/5.fullset_dis_equip
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
@@ -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
@@ -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
+    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
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
@@ -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
@@ -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) (オプション)