diff --git a/Asset/data/asset/functions/artifact/0073.suzuran_charm/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0073.suzuran_charm/give/2.give.mcfunction index 96c8cdc823..171da6e653 100644 --- a/Asset/data/asset/functions/artifact/0073.suzuran_charm/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0073.suzuran_charm/give/2.give.mcfunction @@ -29,7 +29,7 @@ # 神器の発動条件 (TextComponentString) (オプション) data modify storage asset:artifact Condition set value '[{"translate":"block.minecraft.lily_of_the_valley"},{"text":"を所持している"}]' # 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) - data modify storage asset:artifact AttackInfo.Damage set value [200] + data modify storage asset:artifact AttackInfo.Damage set value "50+25x8" # 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) data modify storage asset:artifact AttackInfo.AttackType set value [Physical] # 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) diff --git a/Asset/data/asset/functions/artifact/0073.suzuran_charm/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0073.suzuran_charm/trigger/3.main.mcfunction index 17fb9c8acd..933b908b5b 100644 --- a/Asset/data/asset/functions/artifact/0073.suzuran_charm/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0073.suzuran_charm/trigger/3.main.mcfunction @@ -20,6 +20,7 @@ # 敵にコンバラトキシンを付与 data modify storage api: Argument.ID set value 205 + data modify storage api: Argument.FieldOverride.Damage set value 25 execute store result storage api: Argument.FieldOverride.AppliedFrom int 1 run scoreboard players get @s UserID execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] run function api:entity/mob/effect/give function api:entity/mob/effect/reset diff --git a/Asset/data/asset/functions/effect/0205.convallatoxin/tick/deal_damage.mcfunction b/Asset/data/asset/functions/effect/0205.convallatoxin/tick/deal_damage.mcfunction index 3a347ce2e1..7cd18014db 100644 --- a/Asset/data/asset/functions/effect/0205.convallatoxin/tick/deal_damage.mcfunction +++ b/Asset/data/asset/functions/effect/0205.convallatoxin/tick/deal_damage.mcfunction @@ -10,7 +10,7 @@ # ダメージを与える execute store result score $AppliedFrom Temporary run data get storage asset:context this.AppliedFrom - data modify storage api: Argument.Damage set value 25.0f + data modify storage api: Argument.Damage set from storage asset:context this.Damage data modify storage api: Argument.AttackType set value "Physical" execute as @a if score @s UserID = $AppliedFrom Temporary run function api:damage/modifier function api:damage/