From 136f35f79acaa26ab0032034014d5bad9934316c Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Sat, 21 Mar 2026 19:53:34 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=80=E6=8B=AC=E7=BD=AE=E6=8F=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../0001.book_of_all-seeing/trigger/see_player/.mcfunction | 2 +- .../artifact/0566.great_sage_helmet/give/2.give.mcfunction | 2 +- .../0567.great_sage_chestplate/give/2.give.mcfunction | 2 +- .../artifact/0568.great_sage_leggings/give/2.give.mcfunction | 2 +- .../artifact/0569.great_sage_boots/give/2.give.mcfunction | 2 +- .../artifact/0664.soul_fire_armor/give/2.give.mcfunction | 2 +- .../artifact/0665.soul_fire_armor/give/2.give.mcfunction | 2 +- .../artifact/0666.soul_fire_armor/give/2.give.mcfunction | 2 +- .../artifact/0667.soul_fire_armor/give/2.give.mcfunction | 2 +- .../functions/artifact/0707.mage_hat/give/2.give.mcfunction | 2 +- .../artifact/0708.mage_robe_upper/give/2.give.mcfunction | 2 +- .../artifact/0709.mage_robe_lower/give/2.give.mcfunction | 2 +- .../functions/artifact/0710.mage_boots/give/2.give.mcfunction | 2 +- .../artifact/0715.world_tree_crown/give/2.give.mcfunction | 2 +- .../artifact/0716.world_tree_branch/give/2.give.mcfunction | 2 +- .../artifact/0717.world_tree_stem/give/2.give.mcfunction | 2 +- .../artifact/0718.world_tree_root/give/2.give.mcfunction | 2 +- .../functions/artifact/0775.jade_armor/give/2.give.mcfunction | 2 +- .../functions/artifact/0776.jade_armor/give/2.give.mcfunction | 2 +- .../functions/artifact/0777.jade_armor/give/2.give.mcfunction | 2 +- .../functions/artifact/0778.jade_armor/give/2.give.mcfunction | 2 +- .../artifact/0787.aurora_helm/give/2.give.mcfunction | 2 +- .../artifact/0788.aurora_armor/give/2.give.mcfunction | 2 +- .../artifact/0789.aurora_leggings/give/2.give.mcfunction | 2 +- .../artifact/0790.aurora_boots/give/2.give.mcfunction | 2 +- .../artifact/0966.protection/trigger/3.main.mcfunction | 4 ++-- .../artifact/0966.protection/trigger/protect_end.mcfunction | 4 ++-- .../0967.enhanced_protection/trigger/3.main.mcfunction | 4 ++-- .../0967.enhanced_protection/trigger/protect_end.mcfunction | 4 ++-- .../artifact/0986.order_of_healing/give/2.give.mcfunction | 2 +- .../artifact/1038.flame_devil_head/give/2.give.mcfunction | 2 +- .../artifact/1039.flame_devil_chest/give/2.give.mcfunction | 2 +- .../artifact/1040.flame_devil_legs/give/2.give.mcfunction | 2 +- .../artifact/1041.flame_devil_feet/give/2.give.mcfunction | 2 +- .../functions/effect/0203.secret_meat/modifier/add.mcfunction | 2 +- .../effect/0203.secret_meat/modifier/remove.mcfunction | 2 +- .../effect/0232.soul_fire/fullset/dis_equip.mcfunction | 2 +- .../functions/effect/0232.soul_fire/fullset/equip.mcfunction | 2 +- .../effect/0236.solitariness/fullset/modifier/add.mcfunction | 2 +- .../0236.solitariness/fullset/modifier/remove.mcfunction | 2 +- .../effect/0244.aurora_armor/fullset/dis_equip.mcfunction | 2 +- .../effect/0244.aurora_armor/fullset/equip.mcfunction | 2 +- .../functions/effect/0257.sprout/modifier/add.mcfunction | 2 +- .../functions/effect/0257.sprout/modifier/remove.mcfunction | 2 +- .../effect/0265.light_of_firefly/modifier/add.mcfunction | 2 +- .../effect/0265.light_of_firefly/modifier/remove.mcfunction | 2 +- .../effect/0269.pain_and_sweet/modifier/add.mcfunction | 2 +- .../effect/0269.pain_and_sweet/modifier/remove.mcfunction | 2 +- .../effect/0280.awaking_power/modifier/add.mcfunction | 2 +- .../effect/0280.awaking_power/modifier/remove.mcfunction | 2 +- .../effect/0336.self_loathing/modifier/add.mcfunction | 2 +- .../effect/0336.self_loathing/modifier/remove.mcfunction | 2 +- .../functions/effect/0617.twins_sight/modifier/add.mcfunction | 2 +- .../effect/0617.twins_sight/modifier/remove.mcfunction | 2 +- 54 files changed, 58 insertions(+), 58 deletions(-) diff --git a/Asset/data/asset/functions/artifact/0001.book_of_all-seeing/trigger/see_player/.mcfunction b/Asset/data/asset/functions/artifact/0001.book_of_all-seeing/trigger/see_player/.mcfunction index 8c95c58c000..edd8f6eac14 100644 --- a/Asset/data/asset/functions/artifact/0001.book_of_all-seeing/trigger/see_player/.mcfunction +++ b/Asset/data/asset/functions/artifact/0001.book_of_all-seeing/trigger/see_player/.mcfunction @@ -21,7 +21,7 @@ function api:modifier/heal/get function api:modifier/receive_heal/get - function api:modifier/mp_regen/get + function api:modifier/mp_heal/get function api:modifier/fall_resistance/get # 表示用に諸々データ処理 diff --git a/Asset/data/asset/functions/artifact/0566.great_sage_helmet/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0566.great_sage_helmet/give/2.give.mcfunction index a913b1ae421..21159d6c5bd 100644 --- a/Asset/data/asset/functions/artifact/0566.great_sage_helmet/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0566.great_sage_helmet/give/2.give.mcfunction @@ -60,7 +60,7 @@ data modify storage asset:artifact Equipment.Modifiers append value {Type:"defense/magic",Amount:0.065d,Operation:"multiply_base"} data modify storage asset:artifact Equipment.Modifiers append value {Type:"attack/physical",Amount:-0.05d,Operation:"multiply_base"} data modify storage asset:artifact Equipment.Modifiers append value {Type:"defense/physical",Amount:-0.05d,Operation:"multiply_base"} - data modify storage asset:artifact Equipment.Modifiers append value {Type:"mp_regen",Amount:0.05d,Operation:"multiply_base"} + data modify storage asset:artifact Equipment.Modifiers append value {Type:"mp_heal",Amount:0.05d,Operation:"multiply_base"} # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Nyaptov", "Wi-ki", "Rumor"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) diff --git a/Asset/data/asset/functions/artifact/0567.great_sage_chestplate/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0567.great_sage_chestplate/give/2.give.mcfunction index b10a5de5614..1a137ac92bb 100644 --- a/Asset/data/asset/functions/artifact/0567.great_sage_chestplate/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0567.great_sage_chestplate/give/2.give.mcfunction @@ -58,7 +58,7 @@ data modify storage asset:artifact Equipment.Modifiers append value {Type:"defense/magic",Amount:0.065d,Operation:"multiply_base"} data modify storage asset:artifact Equipment.Modifiers append value {Type:"attack/physical",Amount:-0.05d,Operation:"multiply_base"} data modify storage asset:artifact Equipment.Modifiers append value {Type:"defense/physical",Amount:-0.05d,Operation:"multiply_base"} - data modify storage asset:artifact Equipment.Modifiers append value {Type:"mp_regen",Amount:0.05d,Operation:"multiply_base"} + data modify storage asset:artifact Equipment.Modifiers append value {Type:"mp_heal",Amount:0.05d,Operation:"multiply_base"} # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Nyaptov", "Wi-ki", "Rumor"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) diff --git a/Asset/data/asset/functions/artifact/0568.great_sage_leggings/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0568.great_sage_leggings/give/2.give.mcfunction index 6226bc0f296..80b3c7cd6cd 100644 --- a/Asset/data/asset/functions/artifact/0568.great_sage_leggings/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0568.great_sage_leggings/give/2.give.mcfunction @@ -58,7 +58,7 @@ data modify storage asset:artifact Equipment.Modifiers append value {Type:"defense/magic",Amount:0.065d,Operation:"multiply_base"} data modify storage asset:artifact Equipment.Modifiers append value {Type:"attack/physical",Amount:-0.05d,Operation:"multiply_base"} data modify storage asset:artifact Equipment.Modifiers append value {Type:"defense/physical",Amount:-0.05d,Operation:"multiply_base"} - data modify storage asset:artifact Equipment.Modifiers append value {Type:"mp_regen",Amount:0.05d,Operation:"multiply_base"} + data modify storage asset:artifact Equipment.Modifiers append value {Type:"mp_heal",Amount:0.05d,Operation:"multiply_base"} # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Nyaptov", "Wi-ki", "Rumor"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) diff --git a/Asset/data/asset/functions/artifact/0569.great_sage_boots/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0569.great_sage_boots/give/2.give.mcfunction index 4fd11685256..69ec504f67b 100644 --- a/Asset/data/asset/functions/artifact/0569.great_sage_boots/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0569.great_sage_boots/give/2.give.mcfunction @@ -58,7 +58,7 @@ data modify storage asset:artifact Equipment.Modifiers append value {Type:"defense/magic",Amount:0.065d,Operation:"multiply_base"} data modify storage asset:artifact Equipment.Modifiers append value {Type:"attack/physical",Amount:-0.05d,Operation:"multiply_base"} data modify storage asset:artifact Equipment.Modifiers append value {Type:"defense/physical",Amount:-0.05d,Operation:"multiply_base"} - data modify storage asset:artifact Equipment.Modifiers append value {Type:"mp_regen",Amount:0.05d,Operation:"multiply_base"} + data modify storage asset:artifact Equipment.Modifiers append value {Type:"mp_heal",Amount:0.05d,Operation:"multiply_base"} # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Nyaptov", "Wi-ki", "Rumor"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) 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 index 7fbd635d96d..c92176743cb 100644 --- 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 @@ -59,7 +59,7 @@ data modify storage asset:artifact Equipment.Modifiers append value {Type:"attack/fire",Amount:0.05d,Operation:"multiply_base"} data modify storage asset:artifact Equipment.Modifiers append value {Type:"defense/fire",Amount:0.10d,Operation:"multiply_base"} data modify storage asset:artifact Equipment.Modifiers append value {Type:"max_health",Amount:-0.05d,Operation:"multiply_base"} - data modify storage asset:artifact Equipment.Modifiers append value {Type:"mp_regen",Amount:0.02d,Operation:"multiply_base"} + data modify storage asset:artifact Equipment.Modifiers append value {Type:"mp_heal",Amount:0.02d,Operation:"multiply_base"} # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Urban", "Nyaptov", "Rumor"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) 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 index 6578be50a38..8a585b107fc 100644 --- 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 @@ -59,7 +59,7 @@ data modify storage asset:artifact Equipment.Modifiers append value {Type:"attack/fire",Amount:0.05d,Operation:"multiply_base"} data modify storage asset:artifact Equipment.Modifiers append value {Type:"defense/fire",Amount:0.10d,Operation:"multiply_base"} data modify storage asset:artifact Equipment.Modifiers append value {Type:"max_health",Amount:-0.05d,Operation:"multiply_base"} - data modify storage asset:artifact Equipment.Modifiers append value {Type:"mp_regen",Amount:0.02d,Operation:"multiply_base"} + data modify storage asset:artifact Equipment.Modifiers append value {Type:"mp_heal",Amount:0.02d,Operation:"multiply_base"} # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Urban", "Nyaptov", "Rumor"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) 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 index d33aadc97be..f25f00bae18 100644 --- 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 @@ -59,7 +59,7 @@ data modify storage asset:artifact Equipment.Modifiers append value {Type:"attack/fire",Amount:0.05d,Operation:"multiply_base"} data modify storage asset:artifact Equipment.Modifiers append value {Type:"defense/fire",Amount:0.10d,Operation:"multiply_base"} data modify storage asset:artifact Equipment.Modifiers append value {Type:"max_health",Amount:-0.05d,Operation:"multiply_base"} - data modify storage asset:artifact Equipment.Modifiers append value {Type:"mp_regen",Amount:0.02d,Operation:"multiply_base"} + data modify storage asset:artifact Equipment.Modifiers append value {Type:"mp_heal",Amount:0.02d,Operation:"multiply_base"} # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Urban", "Nyaptov", "Rumor"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) 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 index 3db96f64ffa..5bd384fc044 100644 --- 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 @@ -59,7 +59,7 @@ data modify storage asset:artifact Equipment.Modifiers append value {Type:"attack/fire",Amount:0.05d,Operation:"multiply_base"} data modify storage asset:artifact Equipment.Modifiers append value {Type:"defense/fire",Amount:0.10d,Operation:"multiply_base"} data modify storage asset:artifact Equipment.Modifiers append value {Type:"max_health",Amount:-0.05d,Operation:"multiply_base"} - data modify storage asset:artifact Equipment.Modifiers append value {Type:"mp_regen",Amount:0.02d,Operation:"multiply_base"} + data modify storage asset:artifact Equipment.Modifiers append value {Type:"mp_heal",Amount:0.02d,Operation:"multiply_base"} # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Urban", "Nyaptov", "Rumor"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) diff --git a/Asset/data/asset/functions/artifact/0707.mage_hat/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0707.mage_hat/give/2.give.mcfunction index 7aa35199fa4..6c1484b652d 100644 --- a/Asset/data/asset/functions/artifact/0707.mage_hat/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0707.mage_hat/give/2.give.mcfunction @@ -59,7 +59,7 @@ data modify storage asset:artifact Equipment.Modifiers set value [] data modify storage asset:artifact Equipment.Modifiers append value {Type:"attack/magic",Amount:0.035d,Operation:"multiply_base"} data modify storage asset:artifact Equipment.Modifiers append value {Type:"defense/magic",Amount:0.035d,Operation:"multiply_base"} - data modify storage asset:artifact Equipment.Modifiers append value {Type:"mp_regen",Amount:0.025d,Operation:"multiply_base"} + data modify storage asset:artifact Equipment.Modifiers append value {Type:"mp_heal",Amount:0.025d,Operation:"multiply_base"} # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Nyaptov", "Wi-ki"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) diff --git a/Asset/data/asset/functions/artifact/0708.mage_robe_upper/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0708.mage_robe_upper/give/2.give.mcfunction index 797ecaef660..37ef3d9f1fc 100644 --- a/Asset/data/asset/functions/artifact/0708.mage_robe_upper/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0708.mage_robe_upper/give/2.give.mcfunction @@ -59,7 +59,7 @@ data modify storage asset:artifact Equipment.Modifiers set value [] data modify storage asset:artifact Equipment.Modifiers append value {Type:"attack/magic",Amount:0.035d,Operation:"multiply_base"} data modify storage asset:artifact Equipment.Modifiers append value {Type:"defense/magic",Amount:0.035d,Operation:"multiply_base"} - data modify storage asset:artifact Equipment.Modifiers append value {Type:"mp_regen",Amount:0.025d,Operation:"multiply_base"} + data modify storage asset:artifact Equipment.Modifiers append value {Type:"mp_heal",Amount:0.025d,Operation:"multiply_base"} # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Nyaptov", "Wi-ki"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) diff --git a/Asset/data/asset/functions/artifact/0709.mage_robe_lower/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0709.mage_robe_lower/give/2.give.mcfunction index 75f6eee6e66..65ec6469522 100644 --- a/Asset/data/asset/functions/artifact/0709.mage_robe_lower/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0709.mage_robe_lower/give/2.give.mcfunction @@ -59,7 +59,7 @@ data modify storage asset:artifact Equipment.Modifiers set value [] data modify storage asset:artifact Equipment.Modifiers append value {Type:"attack/magic",Amount:0.035d,Operation:"multiply_base"} data modify storage asset:artifact Equipment.Modifiers append value {Type:"defense/magic",Amount:0.035d,Operation:"multiply_base"} - data modify storage asset:artifact Equipment.Modifiers append value {Type:"mp_regen",Amount:0.025d,Operation:"multiply_base"} + data modify storage asset:artifact Equipment.Modifiers append value {Type:"mp_heal",Amount:0.025d,Operation:"multiply_base"} # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Nyaptov", "Wi-ki"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) diff --git a/Asset/data/asset/functions/artifact/0710.mage_boots/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0710.mage_boots/give/2.give.mcfunction index 5f31fa3fad8..76ab0400dfe 100644 --- a/Asset/data/asset/functions/artifact/0710.mage_boots/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0710.mage_boots/give/2.give.mcfunction @@ -59,7 +59,7 @@ data modify storage asset:artifact Equipment.Modifiers set value [] data modify storage asset:artifact Equipment.Modifiers append value {Type:"attack/magic",Amount:0.035d,Operation:"multiply_base"} data modify storage asset:artifact Equipment.Modifiers append value {Type:"defense/magic",Amount:0.035d,Operation:"multiply_base"} - data modify storage asset:artifact Equipment.Modifiers append value {Type:"mp_regen",Amount:0.025d,Operation:"multiply_base"} + data modify storage asset:artifact Equipment.Modifiers append value {Type:"mp_heal",Amount:0.025d,Operation:"multiply_base"} # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Nyaptov", "Wi-ki"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) diff --git a/Asset/data/asset/functions/artifact/0715.world_tree_crown/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0715.world_tree_crown/give/2.give.mcfunction index 8a348e81884..16963ccd322 100644 --- a/Asset/data/asset/functions/artifact/0715.world_tree_crown/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0715.world_tree_crown/give/2.give.mcfunction @@ -58,7 +58,7 @@ # 装備時ステータス補正 ({Type: string, Amount: double, Operation: string, StackReduction?: double}[]) (オプション) data modify storage asset:artifact Equipment.Modifiers set value [] data modify storage asset:artifact Equipment.Modifiers append value {Type:"max_health",Amount:0.05d,Operation:"multiply_base"} - data modify storage asset:artifact Equipment.Modifiers append value {Type:"mp_regen",Amount:0.075d,Operation:"multiply_base"} + data modify storage asset:artifact Equipment.Modifiers append value {Type:"mp_heal",Amount:0.075d,Operation:"multiply_base"} data modify storage asset:artifact Equipment.Modifiers append value {Type:"heal",Amount:0.08d,Operation:"multiply_base"} # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value "ALL" diff --git a/Asset/data/asset/functions/artifact/0716.world_tree_branch/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0716.world_tree_branch/give/2.give.mcfunction index 2f3a7eccdf8..18e6b0d01e3 100644 --- a/Asset/data/asset/functions/artifact/0716.world_tree_branch/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0716.world_tree_branch/give/2.give.mcfunction @@ -58,7 +58,7 @@ # 装備時ステータス補正 ({Type: string, Amount: double, Operation: string, StackReduction?: double}[]) (オプション) data modify storage asset:artifact Equipment.Modifiers set value [] data modify storage asset:artifact Equipment.Modifiers append value {Type:"max_health",Amount:0.05d,Operation:"multiply_base"} - data modify storage asset:artifact Equipment.Modifiers append value {Type:"mp_regen",Amount:0.075d,Operation:"multiply_base"} + data modify storage asset:artifact Equipment.Modifiers append value {Type:"mp_heal",Amount:0.075d,Operation:"multiply_base"} data modify storage asset:artifact Equipment.Modifiers append value {Type:"heal",Amount:0.08d,Operation:"multiply_base"} # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value "ALL" diff --git a/Asset/data/asset/functions/artifact/0717.world_tree_stem/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0717.world_tree_stem/give/2.give.mcfunction index 3856e23d5e8..90e04aebca7 100644 --- a/Asset/data/asset/functions/artifact/0717.world_tree_stem/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0717.world_tree_stem/give/2.give.mcfunction @@ -58,7 +58,7 @@ # 装備時ステータス補正 ({Type: string, Amount: double, Operation: string, StackReduction?: double}[]) (オプション) data modify storage asset:artifact Equipment.Modifiers set value [] data modify storage asset:artifact Equipment.Modifiers append value {Type:"max_health",Amount:0.05d,Operation:"multiply_base"} - data modify storage asset:artifact Equipment.Modifiers append value {Type:"mp_regen",Amount:0.075d,Operation:"multiply_base"} + data modify storage asset:artifact Equipment.Modifiers append value {Type:"mp_heal",Amount:0.075d,Operation:"multiply_base"} data modify storage asset:artifact Equipment.Modifiers append value {Type:"heal",Amount:0.08d,Operation:"multiply_base"} # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value "ALL" diff --git a/Asset/data/asset/functions/artifact/0718.world_tree_root/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0718.world_tree_root/give/2.give.mcfunction index bc789ab1658..4047f2d6d70 100644 --- a/Asset/data/asset/functions/artifact/0718.world_tree_root/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0718.world_tree_root/give/2.give.mcfunction @@ -58,7 +58,7 @@ # 装備時ステータス補正 ({Type: string, Amount: double, Operation: string, StackReduction?: double}[]) (オプション) data modify storage asset:artifact Equipment.Modifiers set value [] data modify storage asset:artifact Equipment.Modifiers append value {Type:"max_health",Amount:0.05d,Operation:"multiply_base"} - data modify storage asset:artifact Equipment.Modifiers append value {Type:"mp_regen",Amount:0.075d,Operation:"multiply_base"} + data modify storage asset:artifact Equipment.Modifiers append value {Type:"mp_heal",Amount:0.075d,Operation:"multiply_base"} data modify storage asset:artifact Equipment.Modifiers append value {Type:"heal",Amount:0.08d,Operation:"multiply_base"} # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value "ALL" diff --git a/Asset/data/asset/functions/artifact/0775.jade_armor/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0775.jade_armor/give/2.give.mcfunction index 701c9512127..2097595d6a6 100644 --- a/Asset/data/asset/functions/artifact/0775.jade_armor/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0775.jade_armor/give/2.give.mcfunction @@ -57,7 +57,7 @@ data modify storage asset:artifact Equipment.Modifiers set value [] data modify storage asset:artifact Equipment.Modifiers append value {Type:"attack/water",Amount:0.04d,Operation:"multiply_base"} data modify storage asset:artifact Equipment.Modifiers append value {Type:"defense/water",Amount:0.05d,Operation:"multiply_base"} - data modify storage asset:artifact Equipment.Modifiers append value {Type:"mp_regen",Amount:0.04d,Operation:"multiply_base"} + data modify storage asset:artifact Equipment.Modifiers append value {Type:"mp_heal",Amount:0.04d,Operation:"multiply_base"} # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Wi-ki", "Rumor"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) diff --git a/Asset/data/asset/functions/artifact/0776.jade_armor/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0776.jade_armor/give/2.give.mcfunction index c9809f49674..96d5c280350 100644 --- a/Asset/data/asset/functions/artifact/0776.jade_armor/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0776.jade_armor/give/2.give.mcfunction @@ -59,7 +59,7 @@ data modify storage asset:artifact Equipment.Modifiers set value [] data modify storage asset:artifact Equipment.Modifiers append value {Type:"attack/water",Amount:0.04d,Operation:"multiply_base"} data modify storage asset:artifact Equipment.Modifiers append value {Type:"defense/water",Amount:0.05d,Operation:"multiply_base"} - data modify storage asset:artifact Equipment.Modifiers append value {Type:"mp_regen",Amount:0.04d,Operation:"multiply_base"} + data modify storage asset:artifact Equipment.Modifiers append value {Type:"mp_heal",Amount:0.04d,Operation:"multiply_base"} # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Wi-ki", "Rumor"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) diff --git a/Asset/data/asset/functions/artifact/0777.jade_armor/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0777.jade_armor/give/2.give.mcfunction index fcfdd45b380..c67cc67989a 100644 --- a/Asset/data/asset/functions/artifact/0777.jade_armor/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0777.jade_armor/give/2.give.mcfunction @@ -59,7 +59,7 @@ data modify storage asset:artifact Equipment.Modifiers set value [] data modify storage asset:artifact Equipment.Modifiers append value {Type:"attack/water",Amount:0.04d,Operation:"multiply_base"} data modify storage asset:artifact Equipment.Modifiers append value {Type:"defense/water",Amount:0.05d,Operation:"multiply_base"} - data modify storage asset:artifact Equipment.Modifiers append value {Type:"mp_regen",Amount:0.04d,Operation:"multiply_base"} + data modify storage asset:artifact Equipment.Modifiers append value {Type:"mp_heal",Amount:0.04d,Operation:"multiply_base"} # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Wi-ki", "Rumor"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) diff --git a/Asset/data/asset/functions/artifact/0778.jade_armor/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0778.jade_armor/give/2.give.mcfunction index 80f58bde6a2..e3f9519fd2f 100644 --- a/Asset/data/asset/functions/artifact/0778.jade_armor/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0778.jade_armor/give/2.give.mcfunction @@ -57,7 +57,7 @@ data modify storage asset:artifact Equipment.Modifiers set value [] data modify storage asset:artifact Equipment.Modifiers append value {Type:"attack/water",Amount:0.04d,Operation:"multiply_base"} data modify storage asset:artifact Equipment.Modifiers append value {Type:"defense/water",Amount:0.05d,Operation:"multiply_base"} - data modify storage asset:artifact Equipment.Modifiers append value {Type:"mp_regen",Amount:0.04d,Operation:"multiply_base"} + data modify storage asset:artifact Equipment.Modifiers append value {Type:"mp_heal",Amount:0.04d,Operation:"multiply_base"} # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Wi-ki", "Rumor"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) diff --git a/Asset/data/asset/functions/artifact/0787.aurora_helm/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0787.aurora_helm/give/2.give.mcfunction index 7000121d0f3..babb1fbe638 100644 --- a/Asset/data/asset/functions/artifact/0787.aurora_helm/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0787.aurora_helm/give/2.give.mcfunction @@ -63,7 +63,7 @@ data modify storage asset:artifact Equipment.Modifiers append value {Type:"defense/magic",Amount:0.05d,Operation:"multiply_base"} data modify storage asset:artifact Equipment.Modifiers append value {Type:"defense/thunder",Amount:0.05d,Operation:"multiply_base"} data modify storage asset:artifact Equipment.Modifiers append value {Type:"defense/physical",Amount:-0.05d,Operation:"multiply_base"} - data modify storage asset:artifact Equipment.Modifiers append value {Type:"mp_regen",Amount:0.05d,Operation:"multiply_base"} + data modify storage asset:artifact Equipment.Modifiers append value {Type:"mp_heal",Amount:0.05d,Operation:"multiply_base"} # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Nyaptov", "Wi-ki"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) diff --git a/Asset/data/asset/functions/artifact/0788.aurora_armor/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0788.aurora_armor/give/2.give.mcfunction index d0e03bd85c2..929da109334 100644 --- a/Asset/data/asset/functions/artifact/0788.aurora_armor/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0788.aurora_armor/give/2.give.mcfunction @@ -63,7 +63,7 @@ data modify storage asset:artifact Equipment.Modifiers append value {Type:"defense/magic",Amount:0.05d,Operation:"multiply_base"} data modify storage asset:artifact Equipment.Modifiers append value {Type:"defense/thunder",Amount:0.05d,Operation:"multiply_base"} data modify storage asset:artifact Equipment.Modifiers append value {Type:"defense/physical",Amount:-0.05d,Operation:"multiply_base"} - data modify storage asset:artifact Equipment.Modifiers append value {Type:"mp_regen",Amount:0.05d,Operation:"multiply_base"} + data modify storage asset:artifact Equipment.Modifiers append value {Type:"mp_heal",Amount:0.05d,Operation:"multiply_base"} # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Nyaptov", "Wi-ki"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) diff --git a/Asset/data/asset/functions/artifact/0789.aurora_leggings/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0789.aurora_leggings/give/2.give.mcfunction index 92cfa8a8809..d2f0254f554 100644 --- a/Asset/data/asset/functions/artifact/0789.aurora_leggings/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0789.aurora_leggings/give/2.give.mcfunction @@ -63,7 +63,7 @@ data modify storage asset:artifact Equipment.Modifiers append value {Type:"defense/magic",Amount:0.05d,Operation:"multiply_base"} data modify storage asset:artifact Equipment.Modifiers append value {Type:"defense/thunder",Amount:0.05d,Operation:"multiply_base"} data modify storage asset:artifact Equipment.Modifiers append value {Type:"defense/physical",Amount:-0.05d,Operation:"multiply_base"} - data modify storage asset:artifact Equipment.Modifiers append value {Type:"mp_regen",Amount:0.05d,Operation:"multiply_base"} + data modify storage asset:artifact Equipment.Modifiers append value {Type:"mp_heal",Amount:0.05d,Operation:"multiply_base"} # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Nyaptov", "Wi-ki"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) diff --git a/Asset/data/asset/functions/artifact/0790.aurora_boots/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0790.aurora_boots/give/2.give.mcfunction index d172e4ac0fc..d27341b2039 100644 --- a/Asset/data/asset/functions/artifact/0790.aurora_boots/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0790.aurora_boots/give/2.give.mcfunction @@ -63,7 +63,7 @@ data modify storage asset:artifact Equipment.Modifiers append value {Type:"defense/magic",Amount:0.05d,Operation:"multiply_base"} data modify storage asset:artifact Equipment.Modifiers append value {Type:"defense/thunder",Amount:0.05d,Operation:"multiply_base"} data modify storage asset:artifact Equipment.Modifiers append value {Type:"defense/physical",Amount:-0.05d,Operation:"multiply_base"} - data modify storage asset:artifact Equipment.Modifiers append value {Type:"mp_regen",Amount:0.05d,Operation:"multiply_base"} + data modify storage asset:artifact Equipment.Modifiers append value {Type:"mp_heal",Amount:0.05d,Operation:"multiply_base"} # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Nyaptov", "Wi-ki"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) diff --git a/Asset/data/asset/functions/artifact/0966.protection/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0966.protection/trigger/3.main.mcfunction index 85ceeb62510..99f702f2c44 100644 --- a/Asset/data/asset/functions/artifact/0966.protection/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0966.protection/trigger/3.main.mcfunction @@ -28,7 +28,7 @@ execute if predicate lib:random_pass_per/30 run function asset:artifact/0966.pro data modify storage api: Argument.UUID set value [I;1,1,966,2] data modify storage api: Argument.Amount set value -1 data modify storage api: Argument.Operation set value "multiply" - execute unless entity @s[scores={QU.Protected=0..}] run function api:modifier/mp_regen/add + execute unless entity @s[scores={QU.Protected=0..}] run function api:modifier/mp_heal/add # 移動速度-50% attribute @s generic.movement_speed modifier add 1-0-1-0-3c600000002 "protection" -0.5 multiply @@ -37,4 +37,4 @@ execute if predicate lib:random_pass_per/30 run function asset:artifact/0966.pro scoreboard players set @s QU.Protected 2 # タグ - schedule function asset:artifact/0966.protection/trigger/schedule_task 1t \ No newline at end of file + schedule function asset:artifact/0966.protection/trigger/schedule_task 1t diff --git a/Asset/data/asset/functions/artifact/0966.protection/trigger/protect_end.mcfunction b/Asset/data/asset/functions/artifact/0966.protection/trigger/protect_end.mcfunction index f0eaf227c7a..9594efcc483 100644 --- a/Asset/data/asset/functions/artifact/0966.protection/trigger/protect_end.mcfunction +++ b/Asset/data/asset/functions/artifact/0966.protection/trigger/protect_end.mcfunction @@ -14,10 +14,10 @@ # MP回復 data modify storage api: Argument.UUID set value [I;1,1,966,2] - function api:modifier/mp_regen/remove + function api:modifier/mp_heal/remove # 移動速度 attribute @s generic.movement_speed modifier remove 1-0-1-0-3c600000002 # 処理時間スコア削除 - scoreboard players reset @s QU.Protected \ No newline at end of file + scoreboard players reset @s QU.Protected diff --git a/Asset/data/asset/functions/artifact/0967.enhanced_protection/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0967.enhanced_protection/trigger/3.main.mcfunction index 798314ca37b..84e3136c4ad 100644 --- a/Asset/data/asset/functions/artifact/0967.enhanced_protection/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0967.enhanced_protection/trigger/3.main.mcfunction @@ -28,7 +28,7 @@ execute if predicate lib:random_pass_per/30 run function asset:artifact/0967.enh data modify storage api: Argument.UUID set value [I;1,1,967,2] data modify storage api: Argument.Amount set value -1 data modify storage api: Argument.Operation set value "multiply" - execute unless entity @s[scores={QV.Protected=0..}] run function api:modifier/mp_regen/add + execute unless entity @s[scores={QV.Protected=0..}] run function api:modifier/mp_heal/add # 移動速度-50% attribute @s generic.movement_speed modifier add 1-0-1-0-3c700000002 "protection" -0.5 multiply @@ -37,4 +37,4 @@ execute if predicate lib:random_pass_per/30 run function asset:artifact/0967.enh scoreboard players set @s QV.Protected 2 # タグ - schedule function asset:artifact/0967.enhanced_protection/trigger/schedule_task 1t \ No newline at end of file + schedule function asset:artifact/0967.enhanced_protection/trigger/schedule_task 1t diff --git a/Asset/data/asset/functions/artifact/0967.enhanced_protection/trigger/protect_end.mcfunction b/Asset/data/asset/functions/artifact/0967.enhanced_protection/trigger/protect_end.mcfunction index 48777b9b3f5..d12f4fdf5c7 100644 --- a/Asset/data/asset/functions/artifact/0967.enhanced_protection/trigger/protect_end.mcfunction +++ b/Asset/data/asset/functions/artifact/0967.enhanced_protection/trigger/protect_end.mcfunction @@ -14,10 +14,10 @@ # MP回復 data modify storage api: Argument.UUID set value [I;1,1,967,2] - function api:modifier/mp_regen/remove + function api:modifier/mp_heal/remove # 移動速度 attribute @s generic.movement_speed modifier remove 1-0-1-0-3c700000002 # 処理時間スコア削除 - scoreboard players reset @s QV.Protected \ No newline at end of file + scoreboard players reset @s QV.Protected diff --git a/Asset/data/asset/functions/artifact/0986.order_of_healing/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0986.order_of_healing/give/2.give.mcfunction index a523f2b4dcc..58f502cc0d8 100644 --- a/Asset/data/asset/functions/artifact/0986.order_of_healing/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0986.order_of_healing/give/2.give.mcfunction @@ -58,7 +58,7 @@ # 装備時ステータス補正 ({Type: string, Amount: double, Operation: string, StackReduction?: double}[]) (オプション) data modify storage asset:artifact Equipment.Modifiers set value [] data modify storage asset:artifact Equipment.Modifiers append value {Type:"heal",Amount:0.20d,Operation:"multiply_base"} - data modify storage asset:artifact Equipment.Modifiers append value {Type:"mp_regen",Amount:0.20d,Operation:"multiply_base"} + data modify storage asset:artifact Equipment.Modifiers append value {Type:"mp_heal",Amount:0.20d,Operation:"multiply_base"} data modify storage asset:artifact Equipment.Modifiers append value {Type:"attack/base",Amount:-0.35d,Operation:"multiply_base"} # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Nyaptov", "Rumor"] diff --git a/Asset/data/asset/functions/artifact/1038.flame_devil_head/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1038.flame_devil_head/give/2.give.mcfunction index 33836f9c929..12f63bae168 100644 --- a/Asset/data/asset/functions/artifact/1038.flame_devil_head/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1038.flame_devil_head/give/2.give.mcfunction @@ -58,7 +58,7 @@ data modify storage asset:artifact Equipment.Modifiers append value {Type:"attack/fire",Amount:0.075d,Operation:"multiply_base"} data modify storage asset:artifact Equipment.Modifiers append value {Type:"attack/water",Amount:-0.025d,Operation:"multiply_base"} data modify storage asset:artifact Equipment.Modifiers append value {Type:"attack/magic",Amount:0.025d,Operation:"multiply_base"} - data modify storage asset:artifact Equipment.Modifiers append value {Type:"mp_regen",Amount:0.05d,Operation:"multiply_base"} + data modify storage asset:artifact Equipment.Modifiers append value {Type:"mp_heal",Amount:0.05d,Operation:"multiply_base"} # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Urban", "Nyaptov"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) diff --git a/Asset/data/asset/functions/artifact/1039.flame_devil_chest/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1039.flame_devil_chest/give/2.give.mcfunction index 0e08b493660..3a5674ca364 100644 --- a/Asset/data/asset/functions/artifact/1039.flame_devil_chest/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1039.flame_devil_chest/give/2.give.mcfunction @@ -58,7 +58,7 @@ data modify storage asset:artifact Equipment.Modifiers append value {Type:"attack/fire",Amount:0.075d,Operation:"multiply_base"} data modify storage asset:artifact Equipment.Modifiers append value {Type:"attack/water",Amount:-0.025d,Operation:"multiply_base"} data modify storage asset:artifact Equipment.Modifiers append value {Type:"attack/magic",Amount:0.025d,Operation:"multiply_base"} - data modify storage asset:artifact Equipment.Modifiers append value {Type:"mp_regen",Amount:0.05d,Operation:"multiply_base"} + data modify storage asset:artifact Equipment.Modifiers append value {Type:"mp_heal",Amount:0.05d,Operation:"multiply_base"} # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Urban", "Nyaptov"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) diff --git a/Asset/data/asset/functions/artifact/1040.flame_devil_legs/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1040.flame_devil_legs/give/2.give.mcfunction index b56693e3f34..b8f36096c27 100644 --- a/Asset/data/asset/functions/artifact/1040.flame_devil_legs/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1040.flame_devil_legs/give/2.give.mcfunction @@ -58,7 +58,7 @@ data modify storage asset:artifact Equipment.Modifiers append value {Type:"attack/fire",Amount:0.075d,Operation:"multiply_base"} data modify storage asset:artifact Equipment.Modifiers append value {Type:"attack/water",Amount:-0.025d,Operation:"multiply_base"} data modify storage asset:artifact Equipment.Modifiers append value {Type:"attack/magic",Amount:0.025d,Operation:"multiply_base"} - data modify storage asset:artifact Equipment.Modifiers append value {Type:"mp_regen",Amount:0.05d,Operation:"multiply_base"} + data modify storage asset:artifact Equipment.Modifiers append value {Type:"mp_heal",Amount:0.05d,Operation:"multiply_base"} # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Urban", "Nyaptov"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) diff --git a/Asset/data/asset/functions/artifact/1041.flame_devil_feet/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1041.flame_devil_feet/give/2.give.mcfunction index b27c4c03af1..9f95e9d8712 100644 --- a/Asset/data/asset/functions/artifact/1041.flame_devil_feet/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1041.flame_devil_feet/give/2.give.mcfunction @@ -58,7 +58,7 @@ data modify storage asset:artifact Equipment.Modifiers append value {Type:"attack/fire",Amount:0.075d,Operation:"multiply_base"} data modify storage asset:artifact Equipment.Modifiers append value {Type:"attack/water",Amount:-0.025d,Operation:"multiply_base"} data modify storage asset:artifact Equipment.Modifiers append value {Type:"attack/magic",Amount:0.025d,Operation:"multiply_base"} - data modify storage asset:artifact Equipment.Modifiers append value {Type:"mp_regen",Amount:0.05d,Operation:"multiply_base"} + data modify storage asset:artifact Equipment.Modifiers append value {Type:"mp_heal",Amount:0.05d,Operation:"multiply_base"} # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Urban", "Nyaptov"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) diff --git a/Asset/data/asset/functions/effect/0203.secret_meat/modifier/add.mcfunction b/Asset/data/asset/functions/effect/0203.secret_meat/modifier/add.mcfunction index 8f93c4bf155..5410582bdd7 100644 --- a/Asset/data/asset/functions/effect/0203.secret_meat/modifier/add.mcfunction +++ b/Asset/data/asset/functions/effect/0203.secret_meat/modifier/add.mcfunction @@ -14,7 +14,7 @@ data modify storage api: Argument.UUID set value [I;1,3,203,0] data modify storage api: Argument.Amount set value 0.5 data modify storage api: Argument.Operation set value "multiply" - function api:modifier/mp_regen/add + function api:modifier/mp_heal/add # 被回復量-100% data modify storage api: Argument.UUID set value [I;1,3,203,0] diff --git a/Asset/data/asset/functions/effect/0203.secret_meat/modifier/remove.mcfunction b/Asset/data/asset/functions/effect/0203.secret_meat/modifier/remove.mcfunction index ba4daab337c..4d307070e45 100644 --- a/Asset/data/asset/functions/effect/0203.secret_meat/modifier/remove.mcfunction +++ b/Asset/data/asset/functions/effect/0203.secret_meat/modifier/remove.mcfunction @@ -12,7 +12,7 @@ # MP回復+50% data modify storage api: Argument.UUID set value [I;1,3,203,0] - function api:modifier/mp_regen/remove + function api:modifier/mp_heal/remove # 被回復量-100% data modify storage api: Argument.UUID set value [I;1,3,203,0] diff --git a/Asset/data/asset/functions/effect/0232.soul_fire/fullset/dis_equip.mcfunction b/Asset/data/asset/functions/effect/0232.soul_fire/fullset/dis_equip.mcfunction index 4cba1b8bf84..cd38a164fac 100644 --- a/Asset/data/asset/functions/effect/0232.soul_fire/fullset/dis_equip.mcfunction +++ b/Asset/data/asset/functions/effect/0232.soul_fire/fullset/dis_equip.mcfunction @@ -10,7 +10,7 @@ # MP回復量+8% data modify storage api: Argument.UUID set value [I;1,3,232,0] - function api:modifier/mp_regen/remove + function api:modifier/mp_heal/remove # 最大体力-10% data modify storage api: Argument.UUID set value [I;1,3,232,0] diff --git a/Asset/data/asset/functions/effect/0232.soul_fire/fullset/equip.mcfunction b/Asset/data/asset/functions/effect/0232.soul_fire/fullset/equip.mcfunction index eeb8ec576bd..a71ccec8748 100644 --- a/Asset/data/asset/functions/effect/0232.soul_fire/fullset/equip.mcfunction +++ b/Asset/data/asset/functions/effect/0232.soul_fire/fullset/equip.mcfunction @@ -12,7 +12,7 @@ data modify storage api: Argument.UUID set value [I;1,3,232,0] data modify storage api: Argument.Amount set value 0.02 data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/mp_regen/add + function api:modifier/mp_heal/add # 最大体力 # data modify storage api: Argument.UUID set value [I;1,3,232,0] diff --git a/Asset/data/asset/functions/effect/0236.solitariness/fullset/modifier/add.mcfunction b/Asset/data/asset/functions/effect/0236.solitariness/fullset/modifier/add.mcfunction index 8f9de8f9423..f2d8023d1c3 100644 --- a/Asset/data/asset/functions/effect/0236.solitariness/fullset/modifier/add.mcfunction +++ b/Asset/data/asset/functions/effect/0236.solitariness/fullset/modifier/add.mcfunction @@ -10,4 +10,4 @@ data modify storage api: Argument.UUID set value [I;1,3,236,0] data modify storage api: Argument.Amount set value 0.35 data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/mp_regen/add + function api:modifier/mp_heal/add diff --git a/Asset/data/asset/functions/effect/0236.solitariness/fullset/modifier/remove.mcfunction b/Asset/data/asset/functions/effect/0236.solitariness/fullset/modifier/remove.mcfunction index c7d55158a9f..f38f92ddf4a 100644 --- a/Asset/data/asset/functions/effect/0236.solitariness/fullset/modifier/remove.mcfunction +++ b/Asset/data/asset/functions/effect/0236.solitariness/fullset/modifier/remove.mcfunction @@ -11,4 +11,4 @@ attribute @s generic.movement_speed modifier remove 00000001-0000-0003-0000-014f00000000 # MP回復 data modify storage api: Argument.UUID set value [I;1,3,236,0] - function api:modifier/mp_regen/remove + function api:modifier/mp_heal/remove diff --git a/Asset/data/asset/functions/effect/0244.aurora_armor/fullset/dis_equip.mcfunction b/Asset/data/asset/functions/effect/0244.aurora_armor/fullset/dis_equip.mcfunction index 7e9451ebbff..a9fb927cbf0 100644 --- a/Asset/data/asset/functions/effect/0244.aurora_armor/fullset/dis_equip.mcfunction +++ b/Asset/data/asset/functions/effect/0244.aurora_armor/fullset/dis_equip.mcfunction @@ -8,4 +8,4 @@ function api:modifier/attack/thunder/remove # MP回復 data modify storage api: Argument.UUID set value [I;1,3,244,0] - function api:modifier/mp_regen/remove + function api:modifier/mp_heal/remove diff --git a/Asset/data/asset/functions/effect/0244.aurora_armor/fullset/equip.mcfunction b/Asset/data/asset/functions/effect/0244.aurora_armor/fullset/equip.mcfunction index 1fc43c12d51..3e30e03c6d7 100644 --- a/Asset/data/asset/functions/effect/0244.aurora_armor/fullset/equip.mcfunction +++ b/Asset/data/asset/functions/effect/0244.aurora_armor/fullset/equip.mcfunction @@ -17,4 +17,4 @@ data modify storage api: Argument.UUID set value [I;1,3,244,0] data modify storage api: Argument.Amount set value 0.05 data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/mp_regen/add + function api:modifier/mp_heal/add diff --git a/Asset/data/asset/functions/effect/0257.sprout/modifier/add.mcfunction b/Asset/data/asset/functions/effect/0257.sprout/modifier/add.mcfunction index 7dd3d3a617f..5dc4e73e244 100644 --- a/Asset/data/asset/functions/effect/0257.sprout/modifier/add.mcfunction +++ b/Asset/data/asset/functions/effect/0257.sprout/modifier/add.mcfunction @@ -8,4 +8,4 @@ data modify storage api: Argument.UUID set value [I;1,3,257,0] data modify storage api: Argument.Amount set value 0.20 data modify storage api: Argument.Operation set value "multiply" - function api:modifier/mp_regen/add + function api:modifier/mp_heal/add diff --git a/Asset/data/asset/functions/effect/0257.sprout/modifier/remove.mcfunction b/Asset/data/asset/functions/effect/0257.sprout/modifier/remove.mcfunction index 0ef2bd9ef1c..6b515a7417d 100644 --- a/Asset/data/asset/functions/effect/0257.sprout/modifier/remove.mcfunction +++ b/Asset/data/asset/functions/effect/0257.sprout/modifier/remove.mcfunction @@ -8,4 +8,4 @@ # MP回復量+12% data modify storage api: Argument.UUID set value [I;1,3,257,0] - function api:modifier/mp_regen/remove + function api:modifier/mp_heal/remove diff --git a/Asset/data/asset/functions/effect/0265.light_of_firefly/modifier/add.mcfunction b/Asset/data/asset/functions/effect/0265.light_of_firefly/modifier/add.mcfunction index d7ee096aee4..dffce4a7ee3 100644 --- a/Asset/data/asset/functions/effect/0265.light_of_firefly/modifier/add.mcfunction +++ b/Asset/data/asset/functions/effect/0265.light_of_firefly/modifier/add.mcfunction @@ -8,4 +8,4 @@ data modify storage api: Argument.UUID set value [I;1,3,265,0] data modify storage api: Argument.Amount set value 0.10 data modify storage api: Argument.Operation set value "multiply" - function api:modifier/mp_regen/add + function api:modifier/mp_heal/add diff --git a/Asset/data/asset/functions/effect/0265.light_of_firefly/modifier/remove.mcfunction b/Asset/data/asset/functions/effect/0265.light_of_firefly/modifier/remove.mcfunction index 52d2de4b03e..957e3a80ab1 100644 --- a/Asset/data/asset/functions/effect/0265.light_of_firefly/modifier/remove.mcfunction +++ b/Asset/data/asset/functions/effect/0265.light_of_firefly/modifier/remove.mcfunction @@ -8,4 +8,4 @@ # MP回復量 data modify storage api: Argument.UUID set value [I;1,3,265,0] - function api:modifier/mp_regen/remove + function api:modifier/mp_heal/remove diff --git a/Asset/data/asset/functions/effect/0269.pain_and_sweet/modifier/add.mcfunction b/Asset/data/asset/functions/effect/0269.pain_and_sweet/modifier/add.mcfunction index 40a04171035..0f0257fd88d 100644 --- a/Asset/data/asset/functions/effect/0269.pain_and_sweet/modifier/add.mcfunction +++ b/Asset/data/asset/functions/effect/0269.pain_and_sweet/modifier/add.mcfunction @@ -8,4 +8,4 @@ data modify storage api: Argument.UUID set from storage asset:context this.UUID data modify storage api: Argument.Amount set from storage asset:context this.MPModifier data modify storage api: Argument.Operation set value "multiply" - function api:modifier/mp_regen/add + function api:modifier/mp_heal/add diff --git a/Asset/data/asset/functions/effect/0269.pain_and_sweet/modifier/remove.mcfunction b/Asset/data/asset/functions/effect/0269.pain_and_sweet/modifier/remove.mcfunction index 4ced4bc6fef..ce1710f028c 100644 --- a/Asset/data/asset/functions/effect/0269.pain_and_sweet/modifier/remove.mcfunction +++ b/Asset/data/asset/functions/effect/0269.pain_and_sweet/modifier/remove.mcfunction @@ -8,4 +8,4 @@ # MP回復 data modify storage api: Argument.UUID set from storage asset:context this.UUID - function api:modifier/mp_regen/remove + function api:modifier/mp_heal/remove diff --git a/Asset/data/asset/functions/effect/0280.awaking_power/modifier/add.mcfunction b/Asset/data/asset/functions/effect/0280.awaking_power/modifier/add.mcfunction index 127b4267e61..0a1b40b0b5a 100644 --- a/Asset/data/asset/functions/effect/0280.awaking_power/modifier/add.mcfunction +++ b/Asset/data/asset/functions/effect/0280.awaking_power/modifier/add.mcfunction @@ -20,4 +20,4 @@ data modify storage api: Argument.UUID set value [I;1,3,280,0] data modify storage api: Argument.Amount set value 0.1 data modify storage api: Argument.Operation set value "multiply" - function api:modifier/mp_regen/add + function api:modifier/mp_heal/add diff --git a/Asset/data/asset/functions/effect/0280.awaking_power/modifier/remove.mcfunction b/Asset/data/asset/functions/effect/0280.awaking_power/modifier/remove.mcfunction index ac85cf5c0ba..80addfb709d 100644 --- a/Asset/data/asset/functions/effect/0280.awaking_power/modifier/remove.mcfunction +++ b/Asset/data/asset/functions/effect/0280.awaking_power/modifier/remove.mcfunction @@ -16,4 +16,4 @@ # MP回復 data modify storage api: Argument.UUID set value [I;1,3,280,0] - function api:modifier/mp_regen/remove + function api:modifier/mp_heal/remove diff --git a/Asset/data/asset/functions/effect/0336.self_loathing/modifier/add.mcfunction b/Asset/data/asset/functions/effect/0336.self_loathing/modifier/add.mcfunction index ce2f3378dd9..ad095b8d584 100644 --- a/Asset/data/asset/functions/effect/0336.self_loathing/modifier/add.mcfunction +++ b/Asset/data/asset/functions/effect/0336.self_loathing/modifier/add.mcfunction @@ -11,7 +11,7 @@ data modify storage api: Argument.UUID set value [I;1,3,336,0] data modify storage api: Argument.Amount set value -2 data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/mp_regen/add + function api:modifier/mp_heal/add # 攻撃力低下 # data modify storage api: Argument.UUID set value [I;1,3,336,0] diff --git a/Asset/data/asset/functions/effect/0336.self_loathing/modifier/remove.mcfunction b/Asset/data/asset/functions/effect/0336.self_loathing/modifier/remove.mcfunction index 5b2a54f59f2..1ab8a607f0f 100644 --- a/Asset/data/asset/functions/effect/0336.self_loathing/modifier/remove.mcfunction +++ b/Asset/data/asset/functions/effect/0336.self_loathing/modifier/remove.mcfunction @@ -9,7 +9,7 @@ # MP回復低下 data modify storage api: Argument.UUID set value [I;1,3,336,0] - function api:modifier/mp_regen/remove + function api:modifier/mp_heal/remove # 攻撃力低下 # data modify storage api: Argument.UUID set value [I;1,3,336,0] diff --git a/Asset/data/asset/functions/effect/0617.twins_sight/modifier/add.mcfunction b/Asset/data/asset/functions/effect/0617.twins_sight/modifier/add.mcfunction index 49ddd47c86b..28baa4ae84b 100644 --- a/Asset/data/asset/functions/effect/0617.twins_sight/modifier/add.mcfunction +++ b/Asset/data/asset/functions/effect/0617.twins_sight/modifier/add.mcfunction @@ -8,4 +8,4 @@ data modify storage api: Argument.UUID set value [I;1,3,617,0] data modify storage api: Argument.Amount set value 0.2 data modify storage api: Argument.Operation set value "multiply" - function api:modifier/mp_regen/add + function api:modifier/mp_heal/add diff --git a/Asset/data/asset/functions/effect/0617.twins_sight/modifier/remove.mcfunction b/Asset/data/asset/functions/effect/0617.twins_sight/modifier/remove.mcfunction index 0bb70e5f88a..e2b306e5f7f 100644 --- a/Asset/data/asset/functions/effect/0617.twins_sight/modifier/remove.mcfunction +++ b/Asset/data/asset/functions/effect/0617.twins_sight/modifier/remove.mcfunction @@ -8,4 +8,4 @@ # MP回復量+12% data modify storage api: Argument.UUID set value [I;1,3,617,0] - function api:modifier/mp_regen/remove + function api:modifier/mp_heal/remove From 5fd3580502b6dfeaabdf4d4100bd7b639ab770a7 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Sat, 21 Mar 2026 19:54:51 +0900 Subject: [PATCH 2/2] =?UTF-8?q?Return=E3=81=AE=E5=A4=89=E6=9B=B4=E6=BC=8F?= =?UTF-8?q?=E3=82=8C=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../0001.book_of_all-seeing/trigger/see_player/.mcfunction | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Asset/data/asset/functions/artifact/0001.book_of_all-seeing/trigger/see_player/.mcfunction b/Asset/data/asset/functions/artifact/0001.book_of_all-seeing/trigger/see_player/.mcfunction index edd8f6eac14..7956ea8b115 100644 --- a/Asset/data/asset/functions/artifact/0001.book_of_all-seeing/trigger/see_player/.mcfunction +++ b/Asset/data/asset/functions/artifact/0001.book_of_all-seeing/trigger/see_player/.mcfunction @@ -45,7 +45,7 @@ function asset:artifact/0001.book_of_all-seeing/trigger/see_player/calc/other_modifier.m {Type:"Heal",IsReverse:false} function asset:artifact/0001.book_of_all-seeing/trigger/see_player/calc/other_modifier.m {Type:"ReceiveHeal",IsReverse:false} - function asset:artifact/0001.book_of_all-seeing/trigger/see_player/calc/other_modifier.m {Type:"MPRegen",IsReverse:false} + function asset:artifact/0001.book_of_all-seeing/trigger/see_player/calc/other_modifier.m {Type:"MPHeal",IsReverse:false} function asset:artifact/0001.book_of_all-seeing/trigger/see_player/calc/other_modifier.m {Type:"FallResistance",IsReverse:true} function asset:artifact/0001.book_of_all-seeing/trigger/common/construct_effect_messages/ @@ -60,6 +60,6 @@ tellraw @p[tag=this] [{"storage":"global","nbt":"Icon.FrameWhite","interpret":true},{"storage":"global","nbt":"Icon.Attack.Magic","interpret":true},{"storage":"global","nbt":"Icon.FrameWhite","interpret":true},{"storage":"global","nbt":"Icon.Attack.None","interpret":true},{"text":"\u0002","font":"space"},{"storage":"asset:temp","nbt":"01.Defense.Magic.None","interpret":true,"font":"default"},{"text":"\u0002","font":"space"},{"text":"|","font":"default"},{"text":"\u0002","font":"space"},{"storage":"global","nbt":"Icon.FrameWhite","interpret":true},{"storage":"global","nbt":"Icon.Attack.Magic","interpret":true},{"storage":"global","nbt":"Icon.FrameWhite","interpret":true},{"storage":"global","nbt":"Icon.Attack.Fire","interpret":true},{"text":"\u0002","font":"space"},{"storage":"asset:temp","nbt":"01.Defense.Magic.Fire","interpret":true,"font":"default"},{"text":"\u0002","font":"space"},{"text":"|","font":"default"},{"text":"\u0002","font":"space"},{"storage":"global","nbt":"Icon.FrameWhite","interpret":true},{"storage":"global","nbt":"Icon.Attack.Magic","interpret":true},{"storage":"global","nbt":"Icon.FrameWhite","interpret":true},{"storage":"global","nbt":"Icon.Attack.Water","interpret":true},{"text":"\u0002","font":"space"},{"storage":"asset:temp","nbt":"01.Defense.Magic.Water","interpret":true,"font":"default"},{"text":"\u0002","font":"space"},{"text":"|","font":"default"},{"text":"\u0002","font":"space"},{"storage":"global","nbt":"Icon.FrameWhite","interpret":true},{"storage":"global","nbt":"Icon.Attack.Magic","interpret":true},{"storage":"global","nbt":"Icon.FrameWhite","interpret":true},{"storage":"global","nbt":"Icon.Attack.Thunder","interpret":true},{"text":"\u0002","font":"space"},{"storage":"asset:temp","nbt":"01.Defense.Magic.Thunder","interpret":true,"font":"default"}] tellraw @p[tag=this] {"text":"","extra":[{"text":"\u0002","font":"space"},{"text":"◆"},{"text":"\u0002","font":"space"},{"text":"その他補正"}]} tellraw @p[tag=this] [{"text":"与回復量"},{"text":"\u0005","font":"space"},{"storage":"asset:temp","nbt":"01.Heal","interpret":true,"font":"default"},{"text":"\u0002","font":"space"},{"text":"|","font":"default"},{"text":"\u0002","font":"space"},{"text":"被回復量"},{"text":"\u0002","font":"space"},{"storage":"asset:temp","nbt":"01.ReceiveHeal","interpret":true,"font":"default"}] - tellraw @p[tag=this] [{"text":"MP回復量\uE004"},{"text":"\u0002","font":"space"},{"storage":"asset:temp","nbt":"01.MPRegen","interpret":true,"font":"default"},{"text":"\u0002","font":"space"},{"text":"|","font":"default"},{"text":"\u0002","font":"space"},{"text":"落下耐性"},{"text":"\u0002","font":"space"},{"storage":"asset:temp","nbt":"01.FallResistance","interpret":true,"font":"default"}] + tellraw @p[tag=this] [{"text":"MP回復量\uE004"},{"text":"\u0002","font":"space"},{"storage":"asset:temp","nbt":"01.MPHeal","interpret":true,"font":"default"},{"text":"\u0002","font":"space"},{"text":"|","font":"default"},{"text":"\u0002","font":"space"},{"text":"落下耐性"},{"text":"\u0002","font":"space"},{"storage":"asset:temp","nbt":"01.FallResistance","interpret":true,"font":"default"}] tellraw @p[tag=this] {"text":"","extra":[{"text":"\u0002","font":"space"},{"text":"◆"},{"text":"\u0002","font":"space"},{"text":"エフェクト"}]} tellraw @p[tag=this] {"storage":"asset:temp","nbt":"01.EffectMessages[]","interpret":true,"separator":"\n"}