⚖️ [神器664-667] 魂炎纏のフルセット効果の発動条件を修正

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

Hide file tree

Showing 9 changed files with 18 additions and 18 deletions.
diff --git a/Asset/data/asset/functions/artifact/0664.soul_fire_armor/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0664.soul_fire_armor/give/2.give.mcfunction
@@ -15,7 +15,7 @@
 # 神器の名前 (TextComponentString)
     data modify storage asset:artifact Name set value '{"text":"魂炎纏","color":"#01A7AC","bold":true}'
 # 神器の説明文 (TextComponentString[])
-    data modify storage asset:artifact Lore set value ['{"text":"魂炎を纏う者に代償を。","color":"aqua"}','{"text":"代償背負いし者へ力を。","color":"aqua"}','[{"text":"物理攻撃+5% ","color":"dark_green"},{"text":"火耐性+10% 火攻撃+10% ","color":"red"}]','[{"text":"MP回復量+8% ","color":"green"},{"text":"最大体力-10%","color":"dark_red"}]']
+    data modify storage asset:artifact Lore set value ['[{"text":"物理攻撃+5% ","color":"dark_green"},{"text":"火耐性+10% 火攻撃+10% ","color":"red"}]','[{"text":"MP回復量+8% ","color":"green"},{"text":"最大体力-10%","color":"dark_red"}]','{"text":"魂炎を纏う者に代償を。","color":"#017C80","italic":"true"}','{"text":"代償背負いし者へ力を。","color":"#017C80","italic":"true"}']
 # MP以外の消費物 (TextComponentString) (オプション)
     # data modify storage asset:artifact CostText set value
 # 使用回数 (int) (オプション)

diff --git a/...re_armor/trigger/fullset/melee.mcfunction → ...e_armor/trigger/fullset/attack.mcfunction b/...re_armor/trigger/fullset/melee.mcfunction → ...e_armor/trigger/fullset/attack.mcfunction
@@ -1,23 +1,23 @@
-#> asset:artifact/0664.soul_fire_armor/trigger/fullset/melee
+#> asset:artifact/0664.soul_fire_armor/trigger/fullset/attack
 #
 # フルセット時の近接攻撃
 #
-# @within function asset:artifact/0664.soul_fire_armor/trigger/fullset/melee_trigger
+# @within function asset:artifact/0664.soul_fire_armor/trigger/fullset/attack_trigger
 
 # 演出
-    execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..6] at @s run function asset:artifact/0664.soul_fire_armor/trigger/fullset/particle
-    execute at @e[type=#lib:living,type=!player,tag=Victim,distance=..6] run playsound block.fire.ambient player @a ~ ~ ~ 2 0.8 0
-    execute at @e[type=#lib:living,type=!player,tag=Victim,distance=..6] run playsound particle.soul_escape player @a ~ ~ ~ 2 0 0
-    execute at @e[type=#lib:living,type=!player,tag=Victim,distance=..6] run playsound minecraft:block.sculk_sensor.clicking player @a ~ ~ ~ 0.6 0.4 0
+    execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..64] at @s run function asset:artifact/0664.soul_fire_armor/trigger/fullset/particle
+    execute at @e[type=#lib:living,type=!player,tag=Victim,distance=..64] run playsound block.fire.ambient player @a ~ ~ ~ 2 0.8 0
+    execute at @e[type=#lib:living,type=!player,tag=Victim,distance=..64] run playsound particle.soul_escape player @a ~ ~ ~ 2 0 0
+    execute at @e[type=#lib:living,type=!player,tag=Victim,distance=..64] run playsound minecraft:block.sculk_sensor.clicking player @a ~ ~ ~ 0.6 0.4 0
 
 # ダメージ設定
         data modify storage lib: Argument.Damage set value 80.0f
         data modify storage lib: Argument.AttackType set value "Physical"
         data modify storage lib: Argument.ElementType set value "Fire"
         function lib:damage/modifier
-        execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..6] run function lib:damage/
+        execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..64] run function lib:damage/
 # リセット
     function lib:damage/reset
 
 # クールタイム設定
-    scoreboard players set @s IG.AttackCT 40
+    scoreboard players set @s IG.AttackCT 20
diff --git a/.../trigger/fullset/melee_trigger.mcfunction → ...trigger/fullset/attack_trigger.mcfunction b/.../trigger/fullset/melee_trigger.mcfunction → ...trigger/fullset/attack_trigger.mcfunction
@@ -1,8 +1,8 @@
-#> asset:artifact/0664.soul_fire_armor/trigger/fullset/melee_trigger
+#> asset:artifact/0664.soul_fire_armor/trigger/fullset/attack_trigger
 #
 # フルセット検知して近接攻撃するよ
 #
-# @within tag/function asset:artifact/attack/melee
+# @within tag/function asset:artifact/attack
 
 # 攻撃
-    execute if entity @s[tag=IG.Fullset] unless entity @s[scores={IG.AttackCT=0..}] run function asset:artifact/0664.soul_fire_armor/trigger/fullset/melee
+    execute if entity @s[tag=IG.Fullset] unless entity @s[scores={IG.AttackCT=0..}] run function asset:artifact/0664.soul_fire_armor/trigger/fullset/attack
diff --git a/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/fullset/particle.mcfunction b/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/fullset/particle.mcfunction
@@ -4,7 +4,7 @@
 #
 # @within function
 #   asset:artifact/0664.soul_fire_armor/trigger/fullset/
-#   asset:artifact/0664.soul_fire_armor/trigger/fullset/melee
+#   asset:artifact/0664.soul_fire_armor/trigger/fullset/attack
 
 # 1つ目の円
     execute rotated ~0 0 positioned ^ ^0.2 ^0.8 facing entity @s feet rotated ~ ~-5 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a

diff --git a/Asset/data/asset/functions/artifact/0665.soul_fire_armor/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0665.soul_fire_armor/give/2.give.mcfunction
@@ -15,7 +15,7 @@
 # 神器の名前 (TextComponentString)
     data modify storage asset:artifact Name set value '{"text":"魂炎纏","color":"#01A7AC","bold":true}'
 # 神器の説明文 (TextComponentString[])
-    data modify storage asset:artifact Lore set value ['[{"text":"魂炎を纏う者に代償を。","color":"aqua"}]','[{"text":"代償背負いし者へ力を。","color":"aqua"}]','[{"text":"物理攻撃+5% ","color":"dark_green"},{"text":"火耐性+10% 火攻撃+10% ","color":"red"}]','[{"text":"MP回復量+8% ","color":"green"},{"text":"最大体力-10%","color":"dark_red"}]','[{"text":"魂炎を完全に纏いし時","color":"#01A7AC"}]','[{"text":"火攻撃+10% ","color":"red"},{"text":"MP回復量+8% ","color":"green"},{"text":"最大体力-10%","color":"dark_red"}]','[{"text":"の効果を追加で得て","color":"#01A7AC"}]','[{"text":"近接攻撃時に魂炎で対象を攻撃する。","color":"#01A7AC"}]']
+    data modify storage asset:artifact Lore set value ['[{"text":"物理攻撃+5% ","color":"dark_green"},{"text":"火耐性+10% 火攻撃+10% ","color":"red"}]','[{"text":"MP回復量+8% ","color":"green"},{"text":"最大体力-10%","color":"dark_red"}]','[{"text":"魂炎を完全に纏いし時","color":"#01A7AC"}]','[{"text":"火攻撃+10% ","color":"red"},{"text":"MP回復量+8% ","color":"green"},{"text":"最大体力-10%","color":"dark_red"}]','[{"text":"魂炎を纏う者に代償を。","color":"#017C80","italic":"true"}]','[{"text":"代償背負いし者へ力を。","color":"#017C80","italic":"true"}]']
 # MP以外の消費物 (TextComponentString) (オプション)
     # data modify storage asset:artifact CostText set value
 # 使用回数 (int) (オプション)

diff --git a/Asset/data/asset/functions/artifact/0666.soul_fire_armor/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0666.soul_fire_armor/give/2.give.mcfunction
@@ -15,7 +15,7 @@
 # 神器の名前 (TextComponentString)
     data modify storage asset:artifact Name set value '{"text":"魂炎纏","color":"#01A7AC","bold":true}'
 # 神器の説明文 (TextComponentString[])
-    data modify storage asset:artifact Lore set value ['{"text":"魂炎を纏う者に代償を。","color":"aqua"}','{"text":"代償背負いし者へ力を。","color":"aqua"}','[{"text":"物理攻撃+5% ","color":"dark_green"},{"text":"火耐性+10% 火攻撃+10% ","color":"red"}]','[{"text":"MP回復量+8% ","color":"green"},{"text":"最大体力-10%","color":"dark_red"}]']
+    data modify storage asset:artifact Lore set value ['[{"text":"物理攻撃+5% ","color":"dark_green"},{"text":"火耐性+10% 火攻撃+10% ","color":"red"}]','[{"text":"MP回復量+8% ","color":"green"},{"text":"最大体力-10%","color":"dark_red"}]','{"text":"魂炎を纏う者に代償を。","color":"#017C80","italic":"true"}','{"text":"代償背負いし者へ力を。","color":"#017C80","italic":"true"}']
 # MP以外の消費物 (TextComponentString) (オプション)
     # data modify storage asset:artifact CostText set value
 # 使用回数 (int) (オプション)

diff --git a/Asset/data/asset/functions/artifact/0667.soul_fire_armor/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0667.soul_fire_armor/give/2.give.mcfunction
@@ -15,7 +15,7 @@
 # 神器の名前 (TextComponentString)
     data modify storage asset:artifact Name set value '{"text":"魂炎纏","color":"#01A7AC","bold":true}'
 # 神器の説明文 (TextComponentString[])
-    data modify storage asset:artifact Lore set value ['{"text":"魂炎を纏う者に代償を。","color":"aqua"}','{"text":"代償背負いし者へ力を。","color":"aqua"}','[{"text":"物理攻撃+5% ","color":"dark_green"},{"text":"火耐性+10% 火攻撃+10% ","color":"red"}]','[{"text":"MP回復量+8% ","color":"green"},{"text":"最大体力-10%","color":"dark_red"}]']
+    data modify storage asset:artifact Lore set value ['[{"text":"物理攻撃+5% ","color":"dark_green"},{"text":"火耐性+10% 火攻撃+10% ","color":"red"}]','[{"text":"MP回復量+8% ","color":"green"},{"text":"最大体力-10%","color":"dark_red"}]','{"text":"魂炎を纏う者に代償を。","color":"#017C80","italic":"true"}','{"text":"代償背負いし者へ力を。","color":"#017C80","italic":"true"}']
 # MP以外の消費物 (TextComponentString) (オプション)
     # data modify storage asset:artifact CostText set value
 # 使用回数 (int) (オプション)

diff --git a/Asset/data/asset/tags/functions/artifact/attack.json b/Asset/data/asset/tags/functions/artifact/attack.json
@@ -1,5 +1,6 @@
 {
     "values": [
+        "asset:artifact/0664.soul_fire_armor/trigger/fullset/attack_trigger",
         "asset:artifact/example/trigger/1.trigger"
     ]
 }
diff --git a/Asset/data/asset/tags/functions/artifact/attack/melee.json b/Asset/data/asset/tags/functions/artifact/attack/melee.json
@@ -47,7 +47,6 @@
         "asset:artifact/0643.raimei_chestplate/trigger/1.1.attacktrigger",
         "asset:artifact/0733.percentage_sword/trigger/1.trigger",
         "asset:artifact/0672.aurora_blade/trigger/1.trigger",
-        "asset:artifact/0745.blade_of_whirlwind/trigger/1.trigger",
-        "asset:artifact/0664.soul_fire_armor/trigger/fullset/melee_trigger"
+        "asset:artifact/0745.blade_of_whirlwind/trigger/1.trigger"
     ]
 }