From 2b392a996b14351ac3933a40721a25a1c10e5ae2 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Sat, 24 Oct 2026 18:00:08 +0200 Subject: [PATCH 01/18] =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E3=81=AEArtifact?= =?UTF-8?q?=E3=81=A8Effect=E3=82=92=E4=BD=9C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_index.d.mcfunction | 8 ++ .../dis_equip/1.trigger.mcfunction | 7 ++ .../dis_equip/2.check_condition.mcfunction | 16 ++++ .../dis_equip/3.main.mcfunction | 23 ++++++ .../give/1.trigger.mcfunction | 7 ++ .../give/2.give.mcfunction | 73 +++++++++++++++++++ .../register.mcfunction | 7 ++ .../trigger/1.trigger.mcfunction | 8 ++ .../trigger/2.check_condition.mcfunction | 28 +++++++ .../trigger/3.main.mcfunction | 29 ++++++++ .../0427.power_of_curse/_/given.mcfunction | 7 ++ .../0427.power_of_curse/_/register.mcfunction | 7 ++ .../0427.power_of_curse/_/remove.mcfunction | 7 ++ .../0427.power_of_curse/_/tick.mcfunction | 7 ++ .../0427.power_of_curse/given/.mcfunction | 18 +++++ .../0427.power_of_curse/register.mcfunction | 39 ++++++++++ .../0427.power_of_curse/remove/.mcfunction | 14 ++++ .../0427.power_of_curse/tick/.mcfunction | 17 +++++ .../tick/remove.mcfunction | 15 ++++ .../0428.curse_of_power/_/end.mcfunction | 7 ++ .../0428.curse_of_power/_/given.mcfunction | 7 ++ .../0428.curse_of_power/_/register.mcfunction | 7 ++ .../0428.curse_of_power/_/remove.mcfunction | 7 ++ .../0428.curse_of_power/end/.mcfunction | 20 +++++ .../0428.curse_of_power/given/.mcfunction | 18 +++++ .../modifier/remove.mcfunction | 14 ++++ .../0428.curse_of_power/register.mcfunction | 39 ++++++++++ .../0428.curse_of_power/remove/.mcfunction | 8 ++ .../tags/functions/artifact/dis_equip.json | 1 + .../asset/tags/functions/artifact/equip.json | 3 +- .../asset/tags/functions/artifact/give.json | 3 +- .../tags/functions/artifact/register.json | 3 +- .../data/asset/tags/functions/effect/end.json | 3 +- .../asset/tags/functions/effect/given.json | 4 +- .../asset/tags/functions/effect/register.json | 4 +- .../asset/tags/functions/effect/remove.json | 4 +- .../asset/tags/functions/effect/tick.json | 1 + 37 files changed, 483 insertions(+), 7 deletions(-) create mode 100644 Asset/data/asset/functions/artifact/1648.cursed_power_stone/_index.d.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1648.cursed_power_stone/dis_equip/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1648.cursed_power_stone/dis_equip/2.check_condition.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1648.cursed_power_stone/dis_equip/3.main.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1648.cursed_power_stone/give/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1648.cursed_power_stone/give/2.give.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1648.cursed_power_stone/register.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1648.cursed_power_stone/trigger/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1648.cursed_power_stone/trigger/2.check_condition.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1648.cursed_power_stone/trigger/3.main.mcfunction create mode 100644 Asset/data/asset/functions/effect/0427.power_of_curse/_/given.mcfunction create mode 100644 Asset/data/asset/functions/effect/0427.power_of_curse/_/register.mcfunction create mode 100644 Asset/data/asset/functions/effect/0427.power_of_curse/_/remove.mcfunction create mode 100644 Asset/data/asset/functions/effect/0427.power_of_curse/_/tick.mcfunction create mode 100644 Asset/data/asset/functions/effect/0427.power_of_curse/given/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0427.power_of_curse/register.mcfunction create mode 100644 Asset/data/asset/functions/effect/0427.power_of_curse/remove/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0427.power_of_curse/tick/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0427.power_of_curse/tick/remove.mcfunction create mode 100644 Asset/data/asset/functions/effect/0428.curse_of_power/_/end.mcfunction create mode 100644 Asset/data/asset/functions/effect/0428.curse_of_power/_/given.mcfunction create mode 100644 Asset/data/asset/functions/effect/0428.curse_of_power/_/register.mcfunction create mode 100644 Asset/data/asset/functions/effect/0428.curse_of_power/_/remove.mcfunction create mode 100644 Asset/data/asset/functions/effect/0428.curse_of_power/end/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0428.curse_of_power/given/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0428.curse_of_power/modifier/remove.mcfunction create mode 100644 Asset/data/asset/functions/effect/0428.curse_of_power/register.mcfunction create mode 100644 Asset/data/asset/functions/effect/0428.curse_of_power/remove/.mcfunction diff --git a/Asset/data/asset/functions/artifact/1648.cursed_power_stone/_index.d.mcfunction b/Asset/data/asset/functions/artifact/1648.cursed_power_stone/_index.d.mcfunction new file mode 100644 index 0000000000..a9e82abb0d --- /dev/null +++ b/Asset/data/asset/functions/artifact/1648.cursed_power_stone/_index.d.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1648.cursed_power_stone/trigger/_index.d +# @private + +#> tag +# @within function asset:artifact/1648.cursed_power_stone/** +# @within function asset:effect/0427.power_of_curse/** +# @within function asset:effect/0428.curse_of_power/** + #declare tag 1648.Equipping diff --git a/Asset/data/asset/functions/artifact/1648.cursed_power_stone/dis_equip/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1648.cursed_power_stone/dis_equip/1.trigger.mcfunction new file mode 100644 index 0000000000..e52da8cc80 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1648.cursed_power_stone/dis_equip/1.trigger.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1648.cursed_power_stone/dis_equip/1.trigger +# +# 装備を外した時に外した部位にのみのidが入った状態でトリガーされる +# +# @within tag/function asset:artifact/dis_equip + +execute if data storage asset:context id{hotbar:[1648]} run function asset:artifact/1648.cursed_power_stone/dis_equip/2.check_condition diff --git a/Asset/data/asset/functions/artifact/1648.cursed_power_stone/dis_equip/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1648.cursed_power_stone/dis_equip/2.check_condition.mcfunction new file mode 100644 index 0000000000..d3421b7a1c --- /dev/null +++ b/Asset/data/asset/functions/artifact/1648.cursed_power_stone/dis_equip/2.check_condition.mcfunction @@ -0,0 +1,16 @@ +#> asset:artifact/1648.cursed_power_stone/dis_equip/2.check_condition +# +# +# +# @within function asset:artifact/1648.cursed_power_stone/dis_equip/1.trigger + +#> private +# @private + #declare score_holder $Count + +# まだホットバーに同神器があるならキャンセル + execute store result score $Count Temporary if data storage asset:context New.Items.hotbar[{tag:{TSB:{ID:1648}}}] + execute if score $Count Temporary matches 0 run function asset:artifact/1648.cursed_power_stone/dis_equip/3.main + +# リセット + scoreboard players reset $Count Temporary diff --git a/Asset/data/asset/functions/artifact/1648.cursed_power_stone/dis_equip/3.main.mcfunction b/Asset/data/asset/functions/artifact/1648.cursed_power_stone/dis_equip/3.main.mcfunction new file mode 100644 index 0000000000..a70f3b1949 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1648.cursed_power_stone/dis_equip/3.main.mcfunction @@ -0,0 +1,23 @@ +#> asset:artifact/1648.cursed_power_stone/dis_equip/3.main +# +# 装備を外した時のメイン処理 +# +# @within function asset:artifact/1648.cursed_power_stone/dis_equip/2.check_condition + +# MPを消費 + data modify storage api: Argument.Fluctuation set value -150 + data modify storage api: Argument.DisableLog set value true + function api:mp/fluctuation + +# Effect427削除 + data modify storage api: Argument.ID set value 427 + function api:entity/mob/effect/remove/from_id + function api:entity/mob/effect/reset + +# Effect428付与 + data modify storage api: Argument.ID set value 428 + function api:entity/mob/effect/give + function api:entity/mob/effect/reset + +# 装備中タグを削除 + tag @s remove 1648.Equipping diff --git a/Asset/data/asset/functions/artifact/1648.cursed_power_stone/give/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1648.cursed_power_stone/give/1.trigger.mcfunction new file mode 100644 index 0000000000..acb490f394 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1648.cursed_power_stone/give/1.trigger.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1648.cursed_power_stone/give/1.trigger +# +# 神器の取得処理の呼び出し時に実行されるfunction +# +# @within tag/function asset:artifact/give + +execute if data storage asset:context {id:1648} run function asset:artifact/1648.cursed_power_stone/give/2.give \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1648.cursed_power_stone/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1648.cursed_power_stone/give/2.give.mcfunction new file mode 100644 index 0000000000..1b66a5b4e4 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1648.cursed_power_stone/give/2.give.mcfunction @@ -0,0 +1,73 @@ +#> asset:artifact/1648.cursed_power_stone/give/2.give +# +# 神器の作成部 ここでID等を定義する +# +# @user +# @within function asset:artifact/1648.cursed_power_stone/give/1.trigger + +# 神器の説明や消費MPなどをここで設定する。 +# 最後にasset:artifact/common/giveを実行することで入手可能。 + +# 神器のID (int) スプレッドシートの値を入れる + data modify storage asset:artifact ID set value 1648 +# 神器のベースアイテム + data modify storage asset:artifact Item set value "minecraft:stick" +# 神器の名前 (TextComponentString) + data modify storage asset:artifact Name set value '{"text": "呪われし力の結晶"}' +# 神器の説明文 (TextComponentString[]) + data modify storage asset:artifact Lore set value [] +# 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション) + # data modify storage asset:artifact ConsumeItem.Item set value '{"translate":"item.minecraft.stick"}' + # data modify storage asset:artifact ConsumeItem.Count set value 1 + # data modify storage asset:artifact ConsumeItem.Extra set value +# 使用回数 (int) (オプション) + # data modify storage asset:artifact RemainingCount set value +# 神器を発動できるスロット (string) Wikiを参照 + data modify storage asset:artifact Slot set value "hotbar" +# 神器のトリガー (string) Wikiを参照 + data modify storage asset:artifact Trigger set value "equipping" +# 効果が重複可能か否か (boolean) (オプション) + # data modify storage asset:artifact EnableDuplication set value +# 神器の発動条件 (TextComponentString) (オプション) + # data modify storage asset:artifact Condition set value +# 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.Damage set value [0,0] +# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.AttackType set value [Physical,Magic] +# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.ElementType set value [Fire,Water,Thunder,None] +# 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.BypassResist set value +# 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.IsRangeAttack set value +# 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.AttackRange set value +# MP消費量 (int) + data modify storage asset:artifact MPCost set value 0 +# MP必要量 (int) (オプション) + # data modify storage asset:artifact MPRequire set value +# MP回復量 (int) + # data modify storage asset:artifact MPHealWhenHit set value +# 神器のクールダウン (int) (オプション) + # data modify storage asset:artifact LocalCooldown set value +# 種別クールダウン ({Type: string, Duration: int}) (オプション) + # data modify storage asset:artifact TypeCooldown.Type set value + # data modify storage asset:artifact TypeCooldown.Duration set value +# 第二種別クールダウン ({Type: string, Duration: int}) (オプション) + # data modify storage asset:artifact SecondaryTypeCooldown.Type set value + # data modify storage asset:artifact SecondaryTypeCooldown.Duration set value +# グローバルクールダウン (int) (オプション) + # data modify storage asset:artifact SpecialCooldown set value +# クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) + # data modify storage asset:artifact DisableCooldownMessage set value +# MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) + # data modify storage asset:artifact DisableMPMessage set value +# 破壊時の音を鳴らさないかどうか (boolean) (オプション) + # data modify storage asset:artifact DisableBreakSound set value +# 扱える神 (string[]) Wikiを参照 + data modify storage asset:artifact CanUsedGod set value ["Flora", "Wi-ki", "Rumor"] +# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) + # data modify storage asset:artifact CustomNBT set value {} + +# 神器の入手用function + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/1648.cursed_power_stone/register.mcfunction b/Asset/data/asset/functions/artifact/1648.cursed_power_stone/register.mcfunction new file mode 100644 index 0000000000..9ad4dcdca7 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1648.cursed_power_stone/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1648.cursed_power_stone/register +# +# 神器プールへの登録処理 +# +# @within tag/function asset:artifact/register + +data modify storage asset:artifact RarityRegistry[1] append value [1648] \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1648.cursed_power_stone/trigger/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1648.cursed_power_stone/trigger/1.trigger.mcfunction new file mode 100644 index 0000000000..112de86727 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1648.cursed_power_stone/trigger/1.trigger.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1648.cursed_power_stone/trigger/1.trigger +# +# 指定したイベントタイミングで実行されるfunction +# +# @within tag/function asset:artifact/** + +# storage asset:idのmainhandに装備している神器のIDが入っているので比較し、~/2.check_condition.mcfunctionを実行する + execute if data storage asset:context id{hotbar:[1648]} run function asset:artifact/1648.cursed_power_stone/trigger/2.check_condition \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1648.cursed_power_stone/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1648.cursed_power_stone/trigger/2.check_condition.mcfunction new file mode 100644 index 0000000000..dab2c858c2 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1648.cursed_power_stone/trigger/2.check_condition.mcfunction @@ -0,0 +1,28 @@ +#> asset:artifact/1648.cursed_power_stone/trigger/2.check_condition +# +# 神器の発動条件をチェックします +# +# @within function asset:artifact/1648.cursed_power_stone/trigger/1.trigger + +#> private +# @private + #declare score_holder $Count + +# ID指定する + data modify storage asset:artifact TargetID set value 1648 +# 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く + function asset:artifact/common/check_condition/hotbar +# 他にアイテム等確認する場合はここに書く +# 既に装備しているならキャンセル + tag @s[tag=1648.Equipping] remove CanUsed + +# Effect428が付与されていてもキャンセル + data modify storage api: Argument.ID set value 428 + function api:entity/mob/effect/get/from_id + execute if data storage api: Return.Effect run tag @s remove CanUsed + +# CanUsedタグをチェックして3.main.mcfunctionを実行する + execute if entity @s[tag=CanUsed] run function asset:artifact/1648.cursed_power_stone/trigger/3.main + +# リセット + scoreboard players reset $Count Temporary diff --git a/Asset/data/asset/functions/artifact/1648.cursed_power_stone/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1648.cursed_power_stone/trigger/3.main.mcfunction new file mode 100644 index 0000000000..7aface4213 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1648.cursed_power_stone/trigger/3.main.mcfunction @@ -0,0 +1,29 @@ +#> asset:artifact/1648.cursed_power_stone/trigger/3.main +# +# 神器のメイン処理部 +# +# @within function asset:artifact/1648.cursed_power_stone/trigger/2.check_condition + +# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う + function asset:artifact/common/use/hotbar + +# ここから先は神器側の効果の処理を書く + +#> private +# @private + #declare score_holder $MP + +# MPが0以上ならEffect427、そうでないならEffect428を付与 + function api:mp/get_current + execute store result score $MP Temporary run data get storage api: Return.CurrentMP + data modify storage api: Argument.ID set value 427 + execute if score $MP Temporary matches 0 run data modify storage api: Argument.ID set value 428 + + function api:entity/mob/effect/give + function api:entity/mob/effect/reset + +# 装備中タグ + tag @s add 1648.Equipping + +# リセット + scoreboard players reset $MP Temporary diff --git a/Asset/data/asset/functions/effect/0427.power_of_curse/_/given.mcfunction b/Asset/data/asset/functions/effect/0427.power_of_curse/_/given.mcfunction new file mode 100644 index 0000000000..2296d0c936 --- /dev/null +++ b/Asset/data/asset/functions/effect/0427.power_of_curse/_/given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0427.power_of_curse/_/given +# +# Effectが付与された時に実行されるfunction +# +# @within tag/function asset:effect/given + +execute if data storage asset:context {id:427} run function asset:effect/0427.power_of_curse/given/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0427.power_of_curse/_/register.mcfunction b/Asset/data/asset/functions/effect/0427.power_of_curse/_/register.mcfunction new file mode 100644 index 0000000000..c84bc5a414 --- /dev/null +++ b/Asset/data/asset/functions/effect/0427.power_of_curse/_/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0427.power_of_curse/_/register +# +# +# +# @within tag/function asset:effect/register + +execute if data storage asset:context {id:427} run function asset:effect/0427.power_of_curse/register \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0427.power_of_curse/_/remove.mcfunction b/Asset/data/asset/functions/effect/0427.power_of_curse/_/remove.mcfunction new file mode 100644 index 0000000000..1162852fa7 --- /dev/null +++ b/Asset/data/asset/functions/effect/0427.power_of_curse/_/remove.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0427.power_of_curse/_/remove +# +# Effectが神器や牛乳によって削除された時に実行されるfunction +# +# @within tag/function asset:effect/remove + +execute if data storage asset:context {id:427} run function asset:effect/0427.power_of_curse/remove/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0427.power_of_curse/_/tick.mcfunction b/Asset/data/asset/functions/effect/0427.power_of_curse/_/tick.mcfunction new file mode 100644 index 0000000000..41e1708d17 --- /dev/null +++ b/Asset/data/asset/functions/effect/0427.power_of_curse/_/tick.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0427.power_of_curse/_/tick +# +# Effectが発動している間毎tick実行されるfunction +# +# @within tag/function asset:effect/tick + +execute if data storage asset:context {id:427} run function asset:effect/0427.power_of_curse/tick/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0427.power_of_curse/given/.mcfunction b/Asset/data/asset/functions/effect/0427.power_of_curse/given/.mcfunction new file mode 100644 index 0000000000..13fbb5398f --- /dev/null +++ b/Asset/data/asset/functions/effect/0427.power_of_curse/given/.mcfunction @@ -0,0 +1,18 @@ +#> asset:effect/0427.power_of_curse/given/ +# +# Effectが付与された時の処理 +# +# @within function asset:effect/0427.power_of_curse/_/given + +## modifier付与 +# 攻撃 + data modify storage api: Argument.UUID set value [I;1,3,427,0] + data modify storage api: Argument.Amount set value 0.1d + data modify storage api: Argument.Operation set value "multiply_base" + function api:modifier/attack/base/add + +# MP回復量 + data modify storage api: Argument.UUID set value [I;1,3,427,0] + data modify storage api: Argument.Amount set value 0.2d + data modify storage api: Argument.Operation set value "multiply_base" + function api:modifier/mp_heal/add diff --git a/Asset/data/asset/functions/effect/0427.power_of_curse/register.mcfunction b/Asset/data/asset/functions/effect/0427.power_of_curse/register.mcfunction new file mode 100644 index 0000000000..4d1ca3d85c --- /dev/null +++ b/Asset/data/asset/functions/effect/0427.power_of_curse/register.mcfunction @@ -0,0 +1,39 @@ +#> asset:effect/0427.power_of_curse/register +# +# Effectのデータを指定 +# +# @within function asset:effect/0427.power_of_curse/_/register + +# ExtendsSafe (boolean) (default = false) + # data modify storage asset:effect ExtendsSafe set value true +# ID (int) + data modify storage asset:effect ID set value 427 +# 名前 (TextComponentString) + data modify storage asset:effect Name set value '{"text": "呪いの力"}' +# 説明文 (TextComponentString[]) + data modify storage asset:effect Description set value [] +# 効果時間 (int) (default = API || error) + data modify storage asset:effect Duration set value 2147483647 +# スタック (int) (default = API || 1) + # data modify storage asset:effect Stack set value +# 効果時間の操作方法 (default = API || "replace") + # data modify storage asset:effect DurationOperation set value +# スタックの操作方法 (default = API || "replace") + # data modify storage asset:effect StackOperation set value +# 最大効果時間 (int) (default = 2147483647) + # data modify storage asset:effect MaxDuration set value +# 最大スタック (int) (default = 2147483647) + # data modify storage asset:effect MaxStack set value +# 悪い効果か否か (boolean) + data modify storage asset:effect IsBadEffect set value false +# 死亡時のエフェクトの処理 (default = "remove") + # data modify storage asset:effect ProcessOnDied set value +# 消すのに必要なレベル (int) (default = 1) + data modify storage asset:effect RequireClearLv set value 3 +# エフェクトをUIに表示するか (boolean) (default = true) + # data modify storage asset:effect Visible set value +# エフェクトのスタックををUIに表示するか (boolean) (default = true) + data modify storage asset:effect StackVisible set value false + +# フィールド + # data modify storage asset:effect Field set value {} diff --git a/Asset/data/asset/functions/effect/0427.power_of_curse/remove/.mcfunction b/Asset/data/asset/functions/effect/0427.power_of_curse/remove/.mcfunction new file mode 100644 index 0000000000..6682dec469 --- /dev/null +++ b/Asset/data/asset/functions/effect/0427.power_of_curse/remove/.mcfunction @@ -0,0 +1,14 @@ +#> asset:effect/0427.power_of_curse/remove/ +# +# Effectが削除された時の処理 +# +# @within function asset:effect/0427.power_of_curse/_/remove + +## modifier削除 +# 攻撃 + data modify storage api: Argument.UUID set value [I;1,3,427,0] + function api:modifier/attack/base/remove + +# MP回復量 + data modify storage api: Argument.UUID set value [I;1,3,427,0] + function api:modifier/mp_heal/remove diff --git a/Asset/data/asset/functions/effect/0427.power_of_curse/tick/.mcfunction b/Asset/data/asset/functions/effect/0427.power_of_curse/tick/.mcfunction new file mode 100644 index 0000000000..bf182d468a --- /dev/null +++ b/Asset/data/asset/functions/effect/0427.power_of_curse/tick/.mcfunction @@ -0,0 +1,17 @@ +#> asset:effect/0427.power_of_curse/tick/ +# +# Effectのtick処理 +# +# @within function asset:effect/0427.power_of_curse/_/tick + +#> private +# @private + #declare score_holder $MP + +# MPが0ならEffect428を付与 + function api:mp/get_current + execute store result score $MP Temporary run data get storage api: Return.CurrentMP + execute if score $MP Temporary matches 0 run function asset:effect/0427.power_of_curse/tick/remove + +# リセット + scoreboard players reset $MP Temporary diff --git a/Asset/data/asset/functions/effect/0427.power_of_curse/tick/remove.mcfunction b/Asset/data/asset/functions/effect/0427.power_of_curse/tick/remove.mcfunction new file mode 100644 index 0000000000..33507a225c --- /dev/null +++ b/Asset/data/asset/functions/effect/0427.power_of_curse/tick/remove.mcfunction @@ -0,0 +1,15 @@ +#> asset:effect/0427.power_of_curse/tick/remove +# +# +# +# @within function asset:effect/0427.power_of_curse/tick/ + +# 自身は削除 + data modify storage api: Argument.ID set value 427 + function api:entity/mob/effect/remove/from_id + function api:entity/mob/effect/reset + +# Effect428を付与 + data modify storage api: Argument.ID set value 428 + function api:entity/mob/effect/give + function api:entity/mob/effect/reset diff --git a/Asset/data/asset/functions/effect/0428.curse_of_power/_/end.mcfunction b/Asset/data/asset/functions/effect/0428.curse_of_power/_/end.mcfunction new file mode 100644 index 0000000000..7efacf73e2 --- /dev/null +++ b/Asset/data/asset/functions/effect/0428.curse_of_power/_/end.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0428.curse_of_power/_/end +# +# Effectの効果の終了時に実行されるfunction +# +# @within tag/function asset:effect/end + +execute if data storage asset:context {id:428} run function asset:effect/0428.curse_of_power/end/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0428.curse_of_power/_/given.mcfunction b/Asset/data/asset/functions/effect/0428.curse_of_power/_/given.mcfunction new file mode 100644 index 0000000000..55b915585d --- /dev/null +++ b/Asset/data/asset/functions/effect/0428.curse_of_power/_/given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0428.curse_of_power/_/given +# +# Effectが付与された時に実行されるfunction +# +# @within tag/function asset:effect/given + +execute if data storage asset:context {id:428} run function asset:effect/0428.curse_of_power/given/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0428.curse_of_power/_/register.mcfunction b/Asset/data/asset/functions/effect/0428.curse_of_power/_/register.mcfunction new file mode 100644 index 0000000000..a2b980629b --- /dev/null +++ b/Asset/data/asset/functions/effect/0428.curse_of_power/_/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0428.curse_of_power/_/register +# +# +# +# @within tag/function asset:effect/register + +execute if data storage asset:context {id:428} run function asset:effect/0428.curse_of_power/register \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0428.curse_of_power/_/remove.mcfunction b/Asset/data/asset/functions/effect/0428.curse_of_power/_/remove.mcfunction new file mode 100644 index 0000000000..d1f5ce6641 --- /dev/null +++ b/Asset/data/asset/functions/effect/0428.curse_of_power/_/remove.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0428.curse_of_power/_/remove +# +# Effectが神器や牛乳によって削除された時に実行されるfunction +# +# @within tag/function asset:effect/remove + +execute if data storage asset:context {id:428} run function asset:effect/0428.curse_of_power/remove/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0428.curse_of_power/end/.mcfunction b/Asset/data/asset/functions/effect/0428.curse_of_power/end/.mcfunction new file mode 100644 index 0000000000..59e5db7613 --- /dev/null +++ b/Asset/data/asset/functions/effect/0428.curse_of_power/end/.mcfunction @@ -0,0 +1,20 @@ +#> asset:effect/0428.curse_of_power/end/ +# +# Effectの効果が切れた時の処理 +# +# @within function asset:effect/0428.curse_of_power/_/end + +#> private +# @private + #declare score_holder $Count + +# modifier削除 + function asset:effect/0428.curse_of_power/modifier/remove + +# まだ装備しているなら、バフを再付与 + data modify storage api: Argument.ID set value 427 + execute if entity @s[tag=1648.Equipping] run function api:entity/mob/effect/give + function api:entity/mob/effect/reset + +# リセット + scoreboard players reset $Count Temporary diff --git a/Asset/data/asset/functions/effect/0428.curse_of_power/given/.mcfunction b/Asset/data/asset/functions/effect/0428.curse_of_power/given/.mcfunction new file mode 100644 index 0000000000..3dccc95129 --- /dev/null +++ b/Asset/data/asset/functions/effect/0428.curse_of_power/given/.mcfunction @@ -0,0 +1,18 @@ +#> asset:effect/0428.curse_of_power/given/ +# +# Effectが付与された時の処理 +# +# @within function asset:effect/0428.curse_of_power/_/given + +## modifier付与 +# 耐性 + data modify storage api: Argument.UUID set value [I;1,3,428,0] + data modify storage api: Argument.Amount set value -0.2d + data modify storage api: Argument.Operation set value "multiply_base" + function api:modifier/defense/base/add + +# MP回復量 + data modify storage api: Argument.UUID set value [I;1,3,428,0] + data modify storage api: Argument.Amount set value -0.2d + data modify storage api: Argument.Operation set value "multiply_base" + function api:modifier/mp_heal/add diff --git a/Asset/data/asset/functions/effect/0428.curse_of_power/modifier/remove.mcfunction b/Asset/data/asset/functions/effect/0428.curse_of_power/modifier/remove.mcfunction new file mode 100644 index 0000000000..ef96be329d --- /dev/null +++ b/Asset/data/asset/functions/effect/0428.curse_of_power/modifier/remove.mcfunction @@ -0,0 +1,14 @@ +#> asset:effect/0428.curse_of_power/modifier/remove +# +# +# +# @within function asset:effect/0428.curse_of_power/** + +## modifier削除 +# 耐性 + data modify storage api: Argument.UUID set value [I;1,3,428,0] + function api:modifier/defense/base/remove + +# MP回復量 + data modify storage api: Argument.UUID set value [I;1,3,428,0] + function api:modifier/mp_heal/remove diff --git a/Asset/data/asset/functions/effect/0428.curse_of_power/register.mcfunction b/Asset/data/asset/functions/effect/0428.curse_of_power/register.mcfunction new file mode 100644 index 0000000000..109662ad83 --- /dev/null +++ b/Asset/data/asset/functions/effect/0428.curse_of_power/register.mcfunction @@ -0,0 +1,39 @@ +#> asset:effect/0428.curse_of_power/register +# +# Effectのデータを指定 +# +# @within function asset:effect/0428.curse_of_power/_/register + +# ExtendsSafe (boolean) (default = false) + # data modify storage asset:effect ExtendsSafe set value true +# ID (int) + data modify storage asset:effect ID set value 428 +# 名前 (TextComponentString) + data modify storage asset:effect Name set value '{"text": "力の呪い"}' +# 説明文 (TextComponentString[]) + data modify storage asset:effect Description set value [] +# 効果時間 (int) (default = API || error) + data modify storage asset:effect Duration set value 100 +# スタック (int) (default = API || 1) + # data modify storage asset:effect Stack set value +# 効果時間の操作方法 (default = API || "replace") + # data modify storage asset:effect DurationOperation set value +# スタックの操作方法 (default = API || "replace") + # data modify storage asset:effect StackOperation set value +# 最大効果時間 (int) (default = 2147483647) + # data modify storage asset:effect MaxDuration set value +# 最大スタック (int) (default = 2147483647) + # data modify storage asset:effect MaxStack set value +# 悪い効果か否か (boolean) + data modify storage asset:effect IsBadEffect set value true +# 死亡時のエフェクトの処理 (default = "remove") + # data modify storage asset:effect ProcessOnDied set value +# 消すのに必要なレベル (int) (default = 1) + data modify storage asset:effect RequireClearLv set value 3 +# エフェクトをUIに表示するか (boolean) (default = true) + # data modify storage asset:effect Visible set value +# エフェクトのスタックををUIに表示するか (boolean) (default = true) + data modify storage asset:effect StackVisible set value false + +# フィールド + # data modify storage asset:effect Field set value {} diff --git a/Asset/data/asset/functions/effect/0428.curse_of_power/remove/.mcfunction b/Asset/data/asset/functions/effect/0428.curse_of_power/remove/.mcfunction new file mode 100644 index 0000000000..e04bd357d7 --- /dev/null +++ b/Asset/data/asset/functions/effect/0428.curse_of_power/remove/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0428.curse_of_power/remove/ +# +# Effectが削除された時の処理 +# +# @within function asset:effect/0428.curse_of_power/_/remove + +# modifier削除 + function asset:effect/0428.curse_of_power/modifier/remove diff --git a/Asset/data/asset/tags/functions/artifact/dis_equip.json b/Asset/data/asset/tags/functions/artifact/dis_equip.json index 5566bef391..fe4b2ccdc2 100644 --- a/Asset/data/asset/tags/functions/artifact/dis_equip.json +++ b/Asset/data/asset/tags/functions/artifact/dis_equip.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1648.cursed_power_stone/dis_equip/1.trigger", "asset:artifact/1269.apocalypse/dis_equip/1.trigger", "asset:artifact/1615.ema_of_abundance/trigger/dis_equip/", "asset:artifact/1606.dimension_knife/dis_equip/1.trigger", diff --git a/Asset/data/asset/tags/functions/artifact/equip.json b/Asset/data/asset/tags/functions/artifact/equip.json index d890cb354e..2ee3e7cb4c 100644 --- a/Asset/data/asset/tags/functions/artifact/equip.json +++ b/Asset/data/asset/tags/functions/artifact/equip.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1648.cursed_power_stone/trigger/1.trigger", "asset:artifact/1466.insulator_helmet/trigger/1.trigger", "asset:artifact/1467.insulator_chestplate/trigger/1.trigger", "asset:artifact/1468.insulator_leggings/trigger/1.trigger", @@ -121,4 +122,4 @@ "asset:artifact/0709.mage_robe_lower/trigger/1.trigger", "asset:artifact/0710.mage_boots/trigger/1.trigger" ] -} +} \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/artifact/give.json b/Asset/data/asset/tags/functions/artifact/give.json index a362a1954c..7062e9cf1e 100644 --- a/Asset/data/asset/tags/functions/artifact/give.json +++ b/Asset/data/asset/tags/functions/artifact/give.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1648.cursed_power_stone/give/1.trigger", "asset:artifact/1661.starlight_circle/give/1.trigger", "asset:artifact/1390.red_refraction_prism/give/1.trigger", "asset:artifact/1662.salmon_canon/give/1.trigger", @@ -568,4 +569,4 @@ "asset:artifact/0735.collision_plate/give/1.trigger", "asset:artifact/0745.blade_of_whirlwind/give/1.trigger" ] -} +} \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/artifact/register.json b/Asset/data/asset/tags/functions/artifact/register.json index 26a2324e12..4f179f3c61 100644 --- a/Asset/data/asset/tags/functions/artifact/register.json +++ b/Asset/data/asset/tags/functions/artifact/register.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1648.cursed_power_stone/register", "asset:artifact/1661.starlight_circle/register", "asset:artifact/1662.salmon_canon/register", "asset:artifact/1626.years_magic_index/register", @@ -337,4 +338,4 @@ "asset:artifact/1027.fire_of_rebirth/register", "asset:artifact/1111.rod_o_redeem/register" ] -} +} \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/effect/end.json b/Asset/data/asset/tags/functions/effect/end.json index eafa855c1f..0f3701c64e 100644 --- a/Asset/data/asset/tags/functions/effect/end.json +++ b/Asset/data/asset/tags/functions/effect/end.json @@ -1,5 +1,6 @@ { "values": [ + "asset:effect/0428.curse_of_power/_/end", "asset:effect/0405.predation_of_tree/_/end", "asset:effect/0359.time_ticker_eclipse/_/end", "asset:effect/0358.time_ticker_night/_/end", @@ -119,4 +120,4 @@ "asset:effect/0258.spirit_melody/_/end", "asset:effect/0406.ocean_grace/_/end" ] -} +} \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/effect/given.json b/Asset/data/asset/tags/functions/effect/given.json index a361969900..420854b389 100644 --- a/Asset/data/asset/tags/functions/effect/given.json +++ b/Asset/data/asset/tags/functions/effect/given.json @@ -1,5 +1,7 @@ { "values": [ + "asset:effect/0428.curse_of_power/_/given", + "asset:effect/0427.power_of_curse/_/given", "asset:effect/0405.predation_of_tree/_/given", "asset:effect/0359.time_ticker_eclipse/_/given", "asset:effect/0358.time_ticker_night/_/given", @@ -114,4 +116,4 @@ "asset:effect/0258.spirit_melody/_/given", "asset:effect/0406.ocean_grace/_/given" ] -} +} \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/effect/register.json b/Asset/data/asset/tags/functions/effect/register.json index 55a4d503dc..720f94f88d 100644 --- a/Asset/data/asset/tags/functions/effect/register.json +++ b/Asset/data/asset/tags/functions/effect/register.json @@ -1,5 +1,7 @@ { "values": [ + "asset:effect/0428.curse_of_power/_/register", + "asset:effect/0427.power_of_curse/_/register", "asset:effect/0405.predation_of_tree/_/register", "asset:effect/0359.time_ticker_eclipse/_/register", "asset:effect/0358.time_ticker_night/_/register", @@ -196,4 +198,4 @@ "asset:effect/0258.spirit_melody/_/register", "asset:effect/0406.ocean_grace/_/register" ] -} +} \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/effect/remove.json b/Asset/data/asset/tags/functions/effect/remove.json index b5663f76b6..326bd19df8 100644 --- a/Asset/data/asset/tags/functions/effect/remove.json +++ b/Asset/data/asset/tags/functions/effect/remove.json @@ -1,5 +1,7 @@ { "values": [ + "asset:effect/0428.curse_of_power/_/remove", + "asset:effect/0427.power_of_curse/_/remove", "asset:effect/0405.predation_of_tree/_/remove", "asset:effect/0359.time_ticker_eclipse/_/remove", "asset:effect/0358.time_ticker_night/_/remove", @@ -127,4 +129,4 @@ "asset:effect/0258.spirit_melody/_/remove", "asset:effect/0406.ocean_grace/_/remove" ] -} +} \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/effect/tick.json b/Asset/data/asset/tags/functions/effect/tick.json index 097fd372db..52d6a86387 100644 --- a/Asset/data/asset/tags/functions/effect/tick.json +++ b/Asset/data/asset/tags/functions/effect/tick.json @@ -1,5 +1,6 @@ { "values": [ + "asset:effect/0427.power_of_curse/_/tick", "asset:effect/0405.predation_of_tree/_/tick", "asset:effect/0359.time_ticker_eclipse/_/tick", "asset:effect/0358.time_ticker_night/_/tick", From 3a0b583ac3c002b6ba2e15da5644c592a7485307 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Sat, 24 Oct 2026 18:08:17 +0200 Subject: [PATCH 02/18] =?UTF-8?q?=E6=BC=94=E5=87=BA=E3=82=92=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1648.cursed_power_stone/trigger/3.main.mcfunction | 6 ++++++ .../functions/effect/0428.curse_of_power/end/.mcfunction | 3 +++ .../functions/effect/0428.curse_of_power/given/.mcfunction | 4 ++++ 3 files changed, 13 insertions(+) diff --git a/Asset/data/asset/functions/artifact/1648.cursed_power_stone/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1648.cursed_power_stone/trigger/3.main.mcfunction index 7aface4213..3b2ad6d7ac 100644 --- a/Asset/data/asset/functions/artifact/1648.cursed_power_stone/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1648.cursed_power_stone/trigger/3.main.mcfunction @@ -25,5 +25,11 @@ # 装備中タグ tag @s add 1648.Equipping +# 演出 + playsound block.trial_spawner.spawn_mob player @a ~ ~ ~ 1.0 0.7 + playsound ogg:ambient.nether.crimson_forest.shine3 player @a ~ ~ ~ 2.0 2.0 + particle dust 0.7 0.2 0.7 0.7 ~ ~1 ~ 0.2 0.5 0.2 0 12 + particle dust 0.8 0.4 0.8 0.7 ~ ~1 ~ 0.2 0.5 0.2 0 12 + # リセット scoreboard players reset $MP Temporary diff --git a/Asset/data/asset/functions/effect/0428.curse_of_power/end/.mcfunction b/Asset/data/asset/functions/effect/0428.curse_of_power/end/.mcfunction index 59e5db7613..2f2691279f 100644 --- a/Asset/data/asset/functions/effect/0428.curse_of_power/end/.mcfunction +++ b/Asset/data/asset/functions/effect/0428.curse_of_power/end/.mcfunction @@ -16,5 +16,8 @@ execute if entity @s[tag=1648.Equipping] run function api:entity/mob/effect/give function api:entity/mob/effect/reset +# 演出(装備している場合のみ) + execute if entity @s[tag=1648.Equipping] run playsound block.respawn_anchor.set_spawn player @a ~ ~ ~ 1.0 2.0 + # リセット scoreboard players reset $Count Temporary diff --git a/Asset/data/asset/functions/effect/0428.curse_of_power/given/.mcfunction b/Asset/data/asset/functions/effect/0428.curse_of_power/given/.mcfunction index 3dccc95129..73529c31b6 100644 --- a/Asset/data/asset/functions/effect/0428.curse_of_power/given/.mcfunction +++ b/Asset/data/asset/functions/effect/0428.curse_of_power/given/.mcfunction @@ -16,3 +16,7 @@ data modify storage api: Argument.Amount set value -0.2d data modify storage api: Argument.Operation set value "multiply_base" function api:modifier/mp_heal/add + +# 演出 + playsound entity.warden.attack_impact player @a ~ ~ ~ 1.5 2.0 + playsound ogg:ambient.cave.cave4 player @a ~ ~ ~ 2.0 2.0 From 91178b933ccc175ae60fea0a3ecbfda111a90d87 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Sat, 24 Oct 2026 18:16:49 +0200 Subject: [PATCH 03/18] =?UTF-8?q?Lore=E9=A1=9E=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifact/1648.cursed_power_stone/give/2.give.mcfunction | 4 ++-- .../functions/effect/0427.power_of_curse/register.mcfunction | 4 ++-- .../functions/effect/0428.curse_of_power/register.mcfunction | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1648.cursed_power_stone/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1648.cursed_power_stone/give/2.give.mcfunction index 1b66a5b4e4..2356b69b81 100644 --- a/Asset/data/asset/functions/artifact/1648.cursed_power_stone/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1648.cursed_power_stone/give/2.give.mcfunction @@ -13,9 +13,9 @@ # 神器のベースアイテム data modify storage asset:artifact Item set value "minecraft:stick" # 神器の名前 (TextComponentString) - data modify storage asset:artifact Name set value '{"text": "呪われし力の結晶"}' + data modify storage asset:artifact Name set value '{"text": "呪われし力の結晶", "color": "#a93aae"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value [] + data modify storage asset:artifact Lore set value ['{"translate": "装備中、攻撃力が%s、MP回復量が%s上昇するが、", "with": [{"text": "10%", "color": "green"}, {"text": "20%", "color": "green"}]}', '{"translate": "MPが0になるか、装備を解除すると5秒の間耐性とMP回復量が%s低下する。", "with": [{"text": "20%", "color": "red"}]}', '{"text": "隙を見せるな。呪われてしまうぞ。", "color": "gray"}'] # 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション) # data modify storage asset:artifact ConsumeItem.Item set value '{"translate":"item.minecraft.stick"}' # data modify storage asset:artifact ConsumeItem.Count set value 1 diff --git a/Asset/data/asset/functions/effect/0427.power_of_curse/register.mcfunction b/Asset/data/asset/functions/effect/0427.power_of_curse/register.mcfunction index 4d1ca3d85c..9d6c97020f 100644 --- a/Asset/data/asset/functions/effect/0427.power_of_curse/register.mcfunction +++ b/Asset/data/asset/functions/effect/0427.power_of_curse/register.mcfunction @@ -9,9 +9,9 @@ # ID (int) data modify storage asset:effect ID set value 427 # 名前 (TextComponentString) - data modify storage asset:effect Name set value '{"text": "呪いの力"}' + data modify storage asset:effect Name set value '{"text": "呪いの力", "color": "#a93aae"}' # 説明文 (TextComponentString[]) - data modify storage asset:effect Description set value [] + data modify storage asset:effect Description set value ['{"text": "与ダメージとMP回復量が上昇する"}'] # 効果時間 (int) (default = API || error) data modify storage asset:effect Duration set value 2147483647 # スタック (int) (default = API || 1) diff --git a/Asset/data/asset/functions/effect/0428.curse_of_power/register.mcfunction b/Asset/data/asset/functions/effect/0428.curse_of_power/register.mcfunction index 109662ad83..ff5efdb4b4 100644 --- a/Asset/data/asset/functions/effect/0428.curse_of_power/register.mcfunction +++ b/Asset/data/asset/functions/effect/0428.curse_of_power/register.mcfunction @@ -9,9 +9,9 @@ # ID (int) data modify storage asset:effect ID set value 428 # 名前 (TextComponentString) - data modify storage asset:effect Name set value '{"text": "力の呪い"}' + data modify storage asset:effect Name set value '{"text": "力の呪い", "color": "#a93aae"}' # 説明文 (TextComponentString[]) - data modify storage asset:effect Description set value [] + data modify storage asset:effect Description set value ['{"text": "被ダメージとMP回復量が大きく低下する"}'] # 効果時間 (int) (default = API || error) data modify storage asset:effect Duration set value 100 # スタック (int) (default = API || 1) From bfc83a2a18faa8a5e207db1cd85f639423b19666 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Sat, 24 Oct 2026 18:24:42 +0200 Subject: [PATCH 04/18] =?UTF-8?q?=E3=83=87=E3=83=90=E3=83=95=E3=83=81?= =?UTF-8?q?=E3=82=A7=E3=83=83=E3=82=AF=E3=82=92=E7=A7=BB=E5=8B=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trigger/2.check_condition.mcfunction | 5 ----- .../1648.cursed_power_stone/trigger/3.main.mcfunction | 9 ++++++++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1648.cursed_power_stone/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1648.cursed_power_stone/trigger/2.check_condition.mcfunction index dab2c858c2..50fea8be52 100644 --- a/Asset/data/asset/functions/artifact/1648.cursed_power_stone/trigger/2.check_condition.mcfunction +++ b/Asset/data/asset/functions/artifact/1648.cursed_power_stone/trigger/2.check_condition.mcfunction @@ -16,11 +16,6 @@ # 既に装備しているならキャンセル tag @s[tag=1648.Equipping] remove CanUsed -# Effect428が付与されていてもキャンセル - data modify storage api: Argument.ID set value 428 - function api:entity/mob/effect/get/from_id - execute if data storage api: Return.Effect run tag @s remove CanUsed - # CanUsedタグをチェックして3.main.mcfunctionを実行する execute if entity @s[tag=CanUsed] run function asset:artifact/1648.cursed_power_stone/trigger/3.main diff --git a/Asset/data/asset/functions/artifact/1648.cursed_power_stone/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1648.cursed_power_stone/trigger/3.main.mcfunction index 3b2ad6d7ac..c718d4757a 100644 --- a/Asset/data/asset/functions/artifact/1648.cursed_power_stone/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1648.cursed_power_stone/trigger/3.main.mcfunction @@ -12,14 +12,20 @@ #> private # @private #declare score_holder $MP + #declare tag 1648.HasDebuff # MPが0以上ならEffect427、そうでないならEffect428を付与 + #Effect428が付与されていたらEffect427は付与しない + data modify storage api: Argument.ID set value 428 + function api:entity/mob/effect/get/from_id + execute if data storage api: Return.Effect run tag @s add 1648.HasDebuff + function api:mp/get_current execute store result score $MP Temporary run data get storage api: Return.CurrentMP data modify storage api: Argument.ID set value 427 execute if score $MP Temporary matches 0 run data modify storage api: Argument.ID set value 428 - function api:entity/mob/effect/give + execute unless entity @s[tag=1648.HasDebuff] run function api:entity/mob/effect/give function api:entity/mob/effect/reset # 装備中タグ @@ -33,3 +39,4 @@ # リセット scoreboard players reset $MP Temporary + tag @s remove 1648.HasDebuff From e09ca8cc70c23bbcaf1f4fe36d040064f76781e5 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Sat, 24 Oct 2026 18:32:26 +0200 Subject: [PATCH 05/18] =?UTF-8?q?=E6=B6=88=E8=B2=BBMP=E3=82=92=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifact/1648.cursed_power_stone/give/2.give.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/artifact/1648.cursed_power_stone/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1648.cursed_power_stone/give/2.give.mcfunction index 2356b69b81..13b3d8d044 100644 --- a/Asset/data/asset/functions/artifact/1648.cursed_power_stone/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1648.cursed_power_stone/give/2.give.mcfunction @@ -43,7 +43,7 @@ # 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) # data modify storage asset:artifact AttackInfo.AttackRange set value # MP消費量 (int) - data modify storage asset:artifact MPCost set value 0 + data modify storage asset:artifact MPCost set value 150 # MP必要量 (int) (オプション) # data modify storage asset:artifact MPRequire set value # MP回復量 (int) From a85564a197b50e07309b580138fe6a0c8582488d Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Sat, 24 Oct 2026 18:35:45 +0200 Subject: [PATCH 06/18] =?UTF-8?q?=E7=9D=80=E8=84=B1=E6=99=82=E3=81=AEMP?= =?UTF-8?q?=E6=B6=88=E8=B2=BB=E3=82=920=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1648.cursed_power_stone/dis_equip/3.main.mcfunction | 5 ----- .../artifact/1648.cursed_power_stone/give/2.give.mcfunction | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1648.cursed_power_stone/dis_equip/3.main.mcfunction b/Asset/data/asset/functions/artifact/1648.cursed_power_stone/dis_equip/3.main.mcfunction index a70f3b1949..dddd860d7d 100644 --- a/Asset/data/asset/functions/artifact/1648.cursed_power_stone/dis_equip/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1648.cursed_power_stone/dis_equip/3.main.mcfunction @@ -4,11 +4,6 @@ # # @within function asset:artifact/1648.cursed_power_stone/dis_equip/2.check_condition -# MPを消費 - data modify storage api: Argument.Fluctuation set value -150 - data modify storage api: Argument.DisableLog set value true - function api:mp/fluctuation - # Effect427削除 data modify storage api: Argument.ID set value 427 function api:entity/mob/effect/remove/from_id diff --git a/Asset/data/asset/functions/artifact/1648.cursed_power_stone/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1648.cursed_power_stone/give/2.give.mcfunction index 13b3d8d044..2356b69b81 100644 --- a/Asset/data/asset/functions/artifact/1648.cursed_power_stone/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1648.cursed_power_stone/give/2.give.mcfunction @@ -43,7 +43,7 @@ # 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) # data modify storage asset:artifact AttackInfo.AttackRange set value # MP消費量 (int) - data modify storage asset:artifact MPCost set value 150 + data modify storage asset:artifact MPCost set value 0 # MP必要量 (int) (オプション) # data modify storage asset:artifact MPRequire set value # MP回復量 (int) From 81a32a2944f418dfdd6fc6262a2541330fca2990 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Sat, 24 Oct 2026 18:37:35 +0200 Subject: [PATCH 07/18] =?UTF-8?q?=E3=83=87=E3=83=90=E3=83=95=E3=81=AE?= =?UTF-8?q?=E5=8A=B9=E6=9E=9C=E6=99=82=E9=96=93=E3=82=92=E9=95=B7=E3=81=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifact/1648.cursed_power_stone/give/2.give.mcfunction | 2 +- .../functions/effect/0428.curse_of_power/register.mcfunction | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1648.cursed_power_stone/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1648.cursed_power_stone/give/2.give.mcfunction index 2356b69b81..703121fd4d 100644 --- a/Asset/data/asset/functions/artifact/1648.cursed_power_stone/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1648.cursed_power_stone/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text": "呪われし力の結晶", "color": "#a93aae"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"translate": "装備中、攻撃力が%s、MP回復量が%s上昇するが、", "with": [{"text": "10%", "color": "green"}, {"text": "20%", "color": "green"}]}', '{"translate": "MPが0になるか、装備を解除すると5秒の間耐性とMP回復量が%s低下する。", "with": [{"text": "20%", "color": "red"}]}', '{"text": "隙を見せるな。呪われてしまうぞ。", "color": "gray"}'] + data modify storage asset:artifact Lore set value ['{"translate": "装備中、攻撃力が%s、MP回復量が%s上昇するが、", "with": [{"text": "10%", "color": "green"}, {"text": "20%", "color": "green"}]}', '{"translate": "MPが0になるか、装備を解除すると15秒の間耐性とMP回復量が%s低下する。", "with": [{"text": "20%", "color": "red"}]}', '{"text": "隙を見せるな。呪われてしまうぞ。", "color": "gray"}'] # 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション) # data modify storage asset:artifact ConsumeItem.Item set value '{"translate":"item.minecraft.stick"}' # data modify storage asset:artifact ConsumeItem.Count set value 1 diff --git a/Asset/data/asset/functions/effect/0428.curse_of_power/register.mcfunction b/Asset/data/asset/functions/effect/0428.curse_of_power/register.mcfunction index ff5efdb4b4..48213c396b 100644 --- a/Asset/data/asset/functions/effect/0428.curse_of_power/register.mcfunction +++ b/Asset/data/asset/functions/effect/0428.curse_of_power/register.mcfunction @@ -13,7 +13,7 @@ # 説明文 (TextComponentString[]) data modify storage asset:effect Description set value ['{"text": "被ダメージとMP回復量が大きく低下する"}'] # 効果時間 (int) (default = API || error) - data modify storage asset:effect Duration set value 100 + data modify storage asset:effect Duration set value 300 # スタック (int) (default = API || 1) # data modify storage asset:effect Stack set value # 効果時間の操作方法 (default = API || "replace") From 07f2100239453890f8e7db699a5c2e0ef1006bdb Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Sat, 24 Oct 2026 18:38:41 +0200 Subject: [PATCH 08/18] =?UTF-8?q?=E3=82=A8=E3=83=95=E3=82=A7=E3=82=AF?= =?UTF-8?q?=E3=83=88=E8=AA=AC=E6=98=8E=E6=96=87=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/effect/0428.curse_of_power/register.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/effect/0428.curse_of_power/register.mcfunction b/Asset/data/asset/functions/effect/0428.curse_of_power/register.mcfunction index 48213c396b..754e714da4 100644 --- a/Asset/data/asset/functions/effect/0428.curse_of_power/register.mcfunction +++ b/Asset/data/asset/functions/effect/0428.curse_of_power/register.mcfunction @@ -11,7 +11,7 @@ # 名前 (TextComponentString) data modify storage asset:effect Name set value '{"text": "力の呪い", "color": "#a93aae"}' # 説明文 (TextComponentString[]) - data modify storage asset:effect Description set value ['{"text": "被ダメージとMP回復量が大きく低下する"}'] + data modify storage asset:effect Description set value ['{"text": "被ダメージが大きく上昇し、MP回復量が大きく低下する"}'] # 効果時間 (int) (default = API || error) data modify storage asset:effect Duration set value 300 # スタック (int) (default = API || 1) From 7fde2663b49a164f15daaa9e7b1c234db2610675 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Sun, 1 Nov 2026 14:31:34 +0100 Subject: [PATCH 09/18] =?UTF-8?q?=E5=A4=89=E6=95=B0=E9=A1=9E=E3=81=AB?= =?UTF-8?q?=E5=91=BD=E5=90=8D=E8=A6=8F=E5=89=87=E3=82=92=E9=81=A9=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_index.d.mcfunction | 2 +- .../dis_equip/2.check_condition.mcfunction | 8 ++++---- .../dis_equip/3.main.mcfunction | 2 +- .../trigger/2.check_condition.mcfunction | 9 +-------- .../trigger/3.main.mcfunction | 18 +++++++++--------- .../0427.power_of_curse/tick/.mcfunction | 8 ++++---- .../effect/0428.curse_of_power/end/.mcfunction | 8 ++++---- 7 files changed, 24 insertions(+), 31 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1648.cursed_power_stone/_index.d.mcfunction b/Asset/data/asset/functions/artifact/1648.cursed_power_stone/_index.d.mcfunction index a9e82abb0d..a3e7beef3a 100644 --- a/Asset/data/asset/functions/artifact/1648.cursed_power_stone/_index.d.mcfunction +++ b/Asset/data/asset/functions/artifact/1648.cursed_power_stone/_index.d.mcfunction @@ -5,4 +5,4 @@ # @within function asset:artifact/1648.cursed_power_stone/** # @within function asset:effect/0427.power_of_curse/** # @within function asset:effect/0428.curse_of_power/** - #declare tag 1648.Equipping + #declare tag A1648.Equipping diff --git a/Asset/data/asset/functions/artifact/1648.cursed_power_stone/dis_equip/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1648.cursed_power_stone/dis_equip/2.check_condition.mcfunction index d3421b7a1c..2440d54ab7 100644 --- a/Asset/data/asset/functions/artifact/1648.cursed_power_stone/dis_equip/2.check_condition.mcfunction +++ b/Asset/data/asset/functions/artifact/1648.cursed_power_stone/dis_equip/2.check_condition.mcfunction @@ -6,11 +6,11 @@ #> private # @private - #declare score_holder $Count + #declare score_holder $A1648.Count # まだホットバーに同神器があるならキャンセル - execute store result score $Count Temporary if data storage asset:context New.Items.hotbar[{tag:{TSB:{ID:1648}}}] - execute if score $Count Temporary matches 0 run function asset:artifact/1648.cursed_power_stone/dis_equip/3.main + execute store result score $A1648.Count Temporary if data storage asset:context New.Items.hotbar[{tag:{TSB:{ID:1648}}}] + execute if score $A1648.Count Temporary matches 0 run function asset:artifact/1648.cursed_power_stone/dis_equip/3.main # リセット - scoreboard players reset $Count Temporary + scoreboard players reset $A1648.Count Temporary diff --git a/Asset/data/asset/functions/artifact/1648.cursed_power_stone/dis_equip/3.main.mcfunction b/Asset/data/asset/functions/artifact/1648.cursed_power_stone/dis_equip/3.main.mcfunction index dddd860d7d..359747c3c2 100644 --- a/Asset/data/asset/functions/artifact/1648.cursed_power_stone/dis_equip/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1648.cursed_power_stone/dis_equip/3.main.mcfunction @@ -15,4 +15,4 @@ function api:entity/mob/effect/reset # 装備中タグを削除 - tag @s remove 1648.Equipping + tag @s remove A1648.Equipping diff --git a/Asset/data/asset/functions/artifact/1648.cursed_power_stone/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1648.cursed_power_stone/trigger/2.check_condition.mcfunction index 50fea8be52..c2591d2293 100644 --- a/Asset/data/asset/functions/artifact/1648.cursed_power_stone/trigger/2.check_condition.mcfunction +++ b/Asset/data/asset/functions/artifact/1648.cursed_power_stone/trigger/2.check_condition.mcfunction @@ -4,20 +4,13 @@ # # @within function asset:artifact/1648.cursed_power_stone/trigger/1.trigger -#> private -# @private - #declare score_holder $Count - # ID指定する data modify storage asset:artifact TargetID set value 1648 # 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く function asset:artifact/common/check_condition/hotbar # 他にアイテム等確認する場合はここに書く # 既に装備しているならキャンセル - tag @s[tag=1648.Equipping] remove CanUsed + tag @s[tag=A1648.Equipping] remove CanUsed # CanUsedタグをチェックして3.main.mcfunctionを実行する execute if entity @s[tag=CanUsed] run function asset:artifact/1648.cursed_power_stone/trigger/3.main - -# リセット - scoreboard players reset $Count Temporary diff --git a/Asset/data/asset/functions/artifact/1648.cursed_power_stone/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1648.cursed_power_stone/trigger/3.main.mcfunction index c718d4757a..8dbff3b417 100644 --- a/Asset/data/asset/functions/artifact/1648.cursed_power_stone/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1648.cursed_power_stone/trigger/3.main.mcfunction @@ -11,25 +11,25 @@ #> private # @private - #declare score_holder $MP - #declare tag 1648.HasDebuff + #declare score_holder $A1648.MP + #declare tag A1648.HasDebuff # MPが0以上ならEffect427、そうでないならEffect428を付与 #Effect428が付与されていたらEffect427は付与しない data modify storage api: Argument.ID set value 428 function api:entity/mob/effect/get/from_id - execute if data storage api: Return.Effect run tag @s add 1648.HasDebuff + execute if data storage api: Return.Effect run tag @s add A1648.HasDebuff function api:mp/get_current - execute store result score $MP Temporary run data get storage api: Return.CurrentMP + execute store result score $A1648.MP Temporary run data get storage api: Return.CurrentMP data modify storage api: Argument.ID set value 427 - execute if score $MP Temporary matches 0 run data modify storage api: Argument.ID set value 428 + execute if score $A1648.MP Temporary matches 0 run data modify storage api: Argument.ID set value 428 - execute unless entity @s[tag=1648.HasDebuff] run function api:entity/mob/effect/give + execute unless entity @s[tag=A1648.HasDebuff] run function api:entity/mob/effect/give function api:entity/mob/effect/reset # 装備中タグ - tag @s add 1648.Equipping + tag @s add A1648.Equipping # 演出 playsound block.trial_spawner.spawn_mob player @a ~ ~ ~ 1.0 0.7 @@ -38,5 +38,5 @@ particle dust 0.8 0.4 0.8 0.7 ~ ~1 ~ 0.2 0.5 0.2 0 12 # リセット - scoreboard players reset $MP Temporary - tag @s remove 1648.HasDebuff + scoreboard players reset $A1648.MP Temporary + tag @s remove A1648.HasDebuff diff --git a/Asset/data/asset/functions/effect/0427.power_of_curse/tick/.mcfunction b/Asset/data/asset/functions/effect/0427.power_of_curse/tick/.mcfunction index bf182d468a..246df9d835 100644 --- a/Asset/data/asset/functions/effect/0427.power_of_curse/tick/.mcfunction +++ b/Asset/data/asset/functions/effect/0427.power_of_curse/tick/.mcfunction @@ -6,12 +6,12 @@ #> private # @private - #declare score_holder $MP + #declare score_holder $E0427.MP # MPが0ならEffect428を付与 function api:mp/get_current - execute store result score $MP Temporary run data get storage api: Return.CurrentMP - execute if score $MP Temporary matches 0 run function asset:effect/0427.power_of_curse/tick/remove + execute store result score $E0427.MP Temporary run data get storage api: Return.CurrentMP + execute if score $E0427.MP Temporary matches 0 run function asset:effect/0427.power_of_curse/tick/remove # リセット - scoreboard players reset $MP Temporary + scoreboard players reset $E0427.MP Temporary diff --git a/Asset/data/asset/functions/effect/0428.curse_of_power/end/.mcfunction b/Asset/data/asset/functions/effect/0428.curse_of_power/end/.mcfunction index 2f2691279f..2186296915 100644 --- a/Asset/data/asset/functions/effect/0428.curse_of_power/end/.mcfunction +++ b/Asset/data/asset/functions/effect/0428.curse_of_power/end/.mcfunction @@ -6,18 +6,18 @@ #> private # @private - #declare score_holder $Count + #declare score_holder $E0428.Count # modifier削除 function asset:effect/0428.curse_of_power/modifier/remove # まだ装備しているなら、バフを再付与 data modify storage api: Argument.ID set value 427 - execute if entity @s[tag=1648.Equipping] run function api:entity/mob/effect/give + execute if entity @s[tag=A1648.Equipping] run function api:entity/mob/effect/give function api:entity/mob/effect/reset # 演出(装備している場合のみ) - execute if entity @s[tag=1648.Equipping] run playsound block.respawn_anchor.set_spawn player @a ~ ~ ~ 1.0 2.0 + execute if entity @s[tag=A1648.Equipping] run playsound block.respawn_anchor.set_spawn player @a ~ ~ ~ 1.0 2.0 # リセット - scoreboard players reset $Count Temporary + scoreboard players reset $E0428.Count Temporary From 6399f8069533ee9040b55eb2deb9b5e9f3d7085e Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Sun, 1 Nov 2026 14:34:15 +0100 Subject: [PATCH 10/18] =?UTF-8?q?=E8=A3=85=E5=82=99=E8=A7=A3=E9=99=A4?= =?UTF-8?q?=E6=99=82=E3=80=81=E7=84=A1=E6=9D=A1=E4=BB=B6=E3=81=A7=E3=83=87?= =?UTF-8?q?=E3=83=90=E3=83=95=E3=81=8C=E4=BB=98=E4=B8=8E=E3=81=95=E3=82=8C?= =?UTF-8?q?=E3=82=8B=E5=95=8F=E9=A1=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 --- .../dis_equip/2.check_condition.mcfunction | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1648.cursed_power_stone/dis_equip/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1648.cursed_power_stone/dis_equip/2.check_condition.mcfunction index 2440d54ab7..c74539eb5b 100644 --- a/Asset/data/asset/functions/artifact/1648.cursed_power_stone/dis_equip/2.check_condition.mcfunction +++ b/Asset/data/asset/functions/artifact/1648.cursed_power_stone/dis_equip/2.check_condition.mcfunction @@ -8,9 +8,9 @@ # @private #declare score_holder $A1648.Count -# まだホットバーに同神器があるならキャンセル +# まだホットバーに同神器があるかつ装備中タグがついているならキャンセル execute store result score $A1648.Count Temporary if data storage asset:context New.Items.hotbar[{tag:{TSB:{ID:1648}}}] - execute if score $A1648.Count Temporary matches 0 run function asset:artifact/1648.cursed_power_stone/dis_equip/3.main + execute if score $A1648.Count Temporary matches 0 if entity @s[tag=A1648.Equipping] run function asset:artifact/1648.cursed_power_stone/dis_equip/3.main # リセット scoreboard players reset $A1648.Count Temporary From 5b367e8bb341c9d0800a26f1387d7ae8df6df3ae Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Mon, 2 Nov 2026 15:30:45 +0100 Subject: [PATCH 11/18] =?UTF-8?q?=E4=BF=A1=E4=BB=B0=E3=82=92=E5=A4=89?= =?UTF-8?q?=E3=81=88=E3=81=9F=E3=81=A8=E3=81=8D=E3=81=AB=E5=8A=B9=E6=9E=9C?= =?UTF-8?q?=E3=81=8C=E5=A4=96=E3=82=8C=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trigger/2.check_condition.mcfunction | 4 ++++ .../trigger/reset.mcfunction | 13 +++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 Asset/data/asset/functions/artifact/1648.cursed_power_stone/trigger/reset.mcfunction diff --git a/Asset/data/asset/functions/artifact/1648.cursed_power_stone/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1648.cursed_power_stone/trigger/2.check_condition.mcfunction index c2591d2293..cf4e45e811 100644 --- a/Asset/data/asset/functions/artifact/1648.cursed_power_stone/trigger/2.check_condition.mcfunction +++ b/Asset/data/asset/functions/artifact/1648.cursed_power_stone/trigger/2.check_condition.mcfunction @@ -8,6 +8,10 @@ data modify storage asset:artifact TargetID set value 1648 # 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く function asset:artifact/common/check_condition/hotbar + +# 信仰変更時に使えなくなっていたらリセット + execute if entity @s[tag=A1648.Equipping,tag=!CanUsed] run function asset:artifact/1648.cursed_power_stone/trigger/reset + # 他にアイテム等確認する場合はここに書く # 既に装備しているならキャンセル tag @s[tag=A1648.Equipping] remove CanUsed diff --git a/Asset/data/asset/functions/artifact/1648.cursed_power_stone/trigger/reset.mcfunction b/Asset/data/asset/functions/artifact/1648.cursed_power_stone/trigger/reset.mcfunction new file mode 100644 index 0000000000..cd1970ae5c --- /dev/null +++ b/Asset/data/asset/functions/artifact/1648.cursed_power_stone/trigger/reset.mcfunction @@ -0,0 +1,13 @@ +#> asset:artifact/1648.cursed_power_stone/trigger/reset +# +# +# +# @within function asset:artifact/1648.cursed_power_stone/trigger/2.check_condition + +# Effect427を削除 + data modify storage api: Argument.ID set value 427 + function api:entity/mob/effect/remove/from_id + function api:entity/mob/effect/reset + +# 装備中タグを削除 + tag @s remove A1648.Equipping From fd545cb71b0adf43eee3dccfdb76fe3999dfedc7 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Mon, 2 Nov 2026 15:31:35 +0100 Subject: [PATCH 12/18] =?UTF-8?q?modifier=E3=81=AE=E8=A8=88=E7=AE=97?= =?UTF-8?q?=E3=82=92multiply=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/effect/0427.power_of_curse/given/.mcfunction | 4 ++-- .../functions/effect/0428.curse_of_power/given/.mcfunction | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Asset/data/asset/functions/effect/0427.power_of_curse/given/.mcfunction b/Asset/data/asset/functions/effect/0427.power_of_curse/given/.mcfunction index 13fbb5398f..5176161e1f 100644 --- a/Asset/data/asset/functions/effect/0427.power_of_curse/given/.mcfunction +++ b/Asset/data/asset/functions/effect/0427.power_of_curse/given/.mcfunction @@ -8,11 +8,11 @@ # 攻撃 data modify storage api: Argument.UUID set value [I;1,3,427,0] data modify storage api: Argument.Amount set value 0.1d - data modify storage api: Argument.Operation set value "multiply_base" + data modify storage api: Argument.Operation set value "multiply" function api:modifier/attack/base/add # MP回復量 data modify storage api: Argument.UUID set value [I;1,3,427,0] data modify storage api: Argument.Amount set value 0.2d - data modify storage api: Argument.Operation set value "multiply_base" + data modify storage api: Argument.Operation set value "multiply" function api:modifier/mp_heal/add diff --git a/Asset/data/asset/functions/effect/0428.curse_of_power/given/.mcfunction b/Asset/data/asset/functions/effect/0428.curse_of_power/given/.mcfunction index 73529c31b6..39daa9f456 100644 --- a/Asset/data/asset/functions/effect/0428.curse_of_power/given/.mcfunction +++ b/Asset/data/asset/functions/effect/0428.curse_of_power/given/.mcfunction @@ -8,13 +8,13 @@ # 耐性 data modify storage api: Argument.UUID set value [I;1,3,428,0] data modify storage api: Argument.Amount set value -0.2d - data modify storage api: Argument.Operation set value "multiply_base" + data modify storage api: Argument.Operation set value "multiply" function api:modifier/defense/base/add # MP回復量 data modify storage api: Argument.UUID set value [I;1,3,428,0] data modify storage api: Argument.Amount set value -0.2d - data modify storage api: Argument.Operation set value "multiply_base" + data modify storage api: Argument.Operation set value "multiply" function api:modifier/mp_heal/add # 演出 From cb5f0132171277415f166f8ca84731adaa640dec Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Mon, 2 Nov 2026 15:32:30 +0100 Subject: [PATCH 13/18] =?UTF-8?q?=E6=AD=BB=E4=BA=A1=E6=99=82=E3=81=ABEffec?= =?UTF-8?q?t=E3=82=92=E4=BF=9D=E6=8C=81=E3=81=99=E3=82=8B=E3=82=88?= =?UTF-8?q?=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/effect/0427.power_of_curse/register.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/effect/0427.power_of_curse/register.mcfunction b/Asset/data/asset/functions/effect/0427.power_of_curse/register.mcfunction index 9d6c97020f..8348ebfb4b 100644 --- a/Asset/data/asset/functions/effect/0427.power_of_curse/register.mcfunction +++ b/Asset/data/asset/functions/effect/0427.power_of_curse/register.mcfunction @@ -27,7 +27,7 @@ # 悪い効果か否か (boolean) data modify storage asset:effect IsBadEffect set value false # 死亡時のエフェクトの処理 (default = "remove") - # data modify storage asset:effect ProcessOnDied set value + data modify storage asset:effect ProcessOnDied set value "keep" # 消すのに必要なレベル (int) (default = 1) data modify storage asset:effect RequireClearLv set value 3 # エフェクトをUIに表示するか (boolean) (default = true) From 4bed623b3531ffcd348cf236407f5e4e6c8d9681 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Mon, 2 Nov 2026 15:36:29 +0100 Subject: [PATCH 14/18] =?UTF-8?q?Lore=E3=81=AB=E6=94=B9=E8=A1=8C=E3=82=92?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifact/1648.cursed_power_stone/give/2.give.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/artifact/1648.cursed_power_stone/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1648.cursed_power_stone/give/2.give.mcfunction index 703121fd4d..8abb2c155b 100644 --- a/Asset/data/asset/functions/artifact/1648.cursed_power_stone/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1648.cursed_power_stone/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text": "呪われし力の結晶", "color": "#a93aae"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"translate": "装備中、攻撃力が%s、MP回復量が%s上昇するが、", "with": [{"text": "10%", "color": "green"}, {"text": "20%", "color": "green"}]}', '{"translate": "MPが0になるか、装備を解除すると15秒の間耐性とMP回復量が%s低下する。", "with": [{"text": "20%", "color": "red"}]}', '{"text": "隙を見せるな。呪われてしまうぞ。", "color": "gray"}'] + data modify storage asset:artifact Lore set value ['{"translate": "装備中、攻撃力が%s、MP回復量が%s上昇するが、", "with": [{"text": "10%", "color": "green"}, {"text": "20%", "color": "green"}]}', '{"text": "MPが0になるか、装備を解除すると"}', '{"translate": "15秒の間耐性とMP回復量が%s低下する。", "with": [{"text": "20%", "color": "red"}]}', '{"text": "隙を見せるな。呪われてしまうぞ。", "color": "gray"}'] # 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション) # data modify storage asset:artifact ConsumeItem.Item set value '{"translate":"item.minecraft.stick"}' # data modify storage asset:artifact ConsumeItem.Count set value 1 From 520746825a6157d2f80e4b5826d9a98bdb35f5e1 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Mon, 2 Nov 2026 16:10:37 +0100 Subject: [PATCH 15/18] =?UTF-8?q?modifier=E3=81=AE=E5=80=A4=E3=82=92?= =?UTF-8?q?=E7=A5=9E=E5=99=A8=E3=81=8B=E3=82=89=E6=8C=87=E5=AE=9A=E3=81=A7?= =?UTF-8?q?=E3=81=8D=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1648.cursed_power_stone/dis_equip/3.main.mcfunction | 8 ++++++++ .../1648.cursed_power_stone/trigger/3.main.mcfunction | 9 ++++++++- .../effect/0427.power_of_curse/given/.mcfunction | 4 ++-- .../effect/0427.power_of_curse/tick/remove.mcfunction | 4 ++++ .../functions/effect/0428.curse_of_power/end/.mcfunction | 4 ++++ .../effect/0428.curse_of_power/given/.mcfunction | 4 ++-- 6 files changed, 28 insertions(+), 5 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1648.cursed_power_stone/dis_equip/3.main.mcfunction b/Asset/data/asset/functions/artifact/1648.cursed_power_stone/dis_equip/3.main.mcfunction index 359747c3c2..e86827f8ab 100644 --- a/Asset/data/asset/functions/artifact/1648.cursed_power_stone/dis_equip/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1648.cursed_power_stone/dis_equip/3.main.mcfunction @@ -4,6 +4,10 @@ # # @within function asset:artifact/1648.cursed_power_stone/dis_equip/2.check_condition +# Fieldを取得しておく + data modify storage api: Argument.ID set value 427 + function api:entity/mob/effect/get/from_id + # Effect427削除 data modify storage api: Argument.ID set value 427 function api:entity/mob/effect/remove/from_id @@ -11,6 +15,10 @@ # Effect428付与 data modify storage api: Argument.ID set value 428 + + # Fieldを引き継ぐ + data modify storage api: Argument.FieldOverride set from storage api: Return.Effect.Field + function api:entity/mob/effect/give function api:entity/mob/effect/reset diff --git a/Asset/data/asset/functions/artifact/1648.cursed_power_stone/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1648.cursed_power_stone/trigger/3.main.mcfunction index 8dbff3b417..e0845947f2 100644 --- a/Asset/data/asset/functions/artifact/1648.cursed_power_stone/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1648.cursed_power_stone/trigger/3.main.mcfunction @@ -25,7 +25,14 @@ data modify storage api: Argument.ID set value 427 execute if score $A1648.MP Temporary matches 0 run data modify storage api: Argument.ID set value 428 - execute unless entity @s[tag=A1648.HasDebuff] run function api:entity/mob/effect/give + # modifierを設定 + data modify storage api: Argument.FieldOverride.Buff.Attack set value 0.1d + data modify storage api: Argument.FieldOverride.Buff.MPHeal set value 0.2d + + data modify storage api: Argument.FieldOverride.Debuff.Defense set value -0.2d + data modify storage api: Argument.FieldOverride.Debuff.MPHeal set value -0.2d + + execute if entity @s[tag=!A1648.HasDebuff] run function api:entity/mob/effect/give function api:entity/mob/effect/reset # 装備中タグ diff --git a/Asset/data/asset/functions/effect/0427.power_of_curse/given/.mcfunction b/Asset/data/asset/functions/effect/0427.power_of_curse/given/.mcfunction index 5176161e1f..ee193d0493 100644 --- a/Asset/data/asset/functions/effect/0427.power_of_curse/given/.mcfunction +++ b/Asset/data/asset/functions/effect/0427.power_of_curse/given/.mcfunction @@ -7,12 +7,12 @@ ## modifier付与 # 攻撃 data modify storage api: Argument.UUID set value [I;1,3,427,0] - data modify storage api: Argument.Amount set value 0.1d + data modify storage api: Argument.Amount set from storage asset:context this.Buff.Attack data modify storage api: Argument.Operation set value "multiply" function api:modifier/attack/base/add # MP回復量 data modify storage api: Argument.UUID set value [I;1,3,427,0] - data modify storage api: Argument.Amount set value 0.2d + data modify storage api: Argument.Amount set from storage asset:context this.Buff.MPHeal data modify storage api: Argument.Operation set value "multiply" function api:modifier/mp_heal/add diff --git a/Asset/data/asset/functions/effect/0427.power_of_curse/tick/remove.mcfunction b/Asset/data/asset/functions/effect/0427.power_of_curse/tick/remove.mcfunction index 33507a225c..c26a7278e8 100644 --- a/Asset/data/asset/functions/effect/0427.power_of_curse/tick/remove.mcfunction +++ b/Asset/data/asset/functions/effect/0427.power_of_curse/tick/remove.mcfunction @@ -11,5 +11,9 @@ # Effect428を付与 data modify storage api: Argument.ID set value 428 + + # Fieldを引き継ぐ + data modify storage api: Argument.FieldOverride set from storage asset:context this + function api:entity/mob/effect/give function api:entity/mob/effect/reset diff --git a/Asset/data/asset/functions/effect/0428.curse_of_power/end/.mcfunction b/Asset/data/asset/functions/effect/0428.curse_of_power/end/.mcfunction index 2186296915..bc9bc0f400 100644 --- a/Asset/data/asset/functions/effect/0428.curse_of_power/end/.mcfunction +++ b/Asset/data/asset/functions/effect/0428.curse_of_power/end/.mcfunction @@ -13,6 +13,10 @@ # まだ装備しているなら、バフを再付与 data modify storage api: Argument.ID set value 427 + + # Fieldを引き継ぐ + data modify storage api: Argument.FieldOverride set from storage asset:context this + execute if entity @s[tag=A1648.Equipping] run function api:entity/mob/effect/give function api:entity/mob/effect/reset diff --git a/Asset/data/asset/functions/effect/0428.curse_of_power/given/.mcfunction b/Asset/data/asset/functions/effect/0428.curse_of_power/given/.mcfunction index 39daa9f456..cbb3f9e9bc 100644 --- a/Asset/data/asset/functions/effect/0428.curse_of_power/given/.mcfunction +++ b/Asset/data/asset/functions/effect/0428.curse_of_power/given/.mcfunction @@ -7,13 +7,13 @@ ## modifier付与 # 耐性 data modify storage api: Argument.UUID set value [I;1,3,428,0] - data modify storage api: Argument.Amount set value -0.2d + data modify storage api: Argument.Amount set from storage asset:context this.Debuff.Defense data modify storage api: Argument.Operation set value "multiply" function api:modifier/defense/base/add # MP回復量 data modify storage api: Argument.UUID set value [I;1,3,428,0] - data modify storage api: Argument.Amount set value -0.2d + data modify storage api: Argument.Amount set from storage asset:context this.Debuff.MPHeal data modify storage api: Argument.Operation set value "multiply" function api:modifier/mp_heal/add From af429579e399db059fbd21a1f82fdb864c669a8f Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Mon, 2 Nov 2026 16:56:56 +0100 Subject: [PATCH 16/18] =?UTF-8?q?Effect=E4=B8=8A=E6=9B=B8=E3=81=8D?= =?UTF-8?q?=E6=99=82=E3=81=ABField=E3=82=92=E5=BC=95=E3=81=8D=E7=B6=99?= =?UTF-8?q?=E3=81=90=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../effect/0428.curse_of_power/_/re-given.mcfunction | 7 +++++++ .../effect/0428.curse_of_power/re-given/.mcfunction | 8 ++++++++ Asset/data/asset/tags/functions/effect/re-given.json | 3 ++- 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 Asset/data/asset/functions/effect/0428.curse_of_power/_/re-given.mcfunction create mode 100644 Asset/data/asset/functions/effect/0428.curse_of_power/re-given/.mcfunction diff --git a/Asset/data/asset/functions/effect/0428.curse_of_power/_/re-given.mcfunction b/Asset/data/asset/functions/effect/0428.curse_of_power/_/re-given.mcfunction new file mode 100644 index 0000000000..ebd25170ff --- /dev/null +++ b/Asset/data/asset/functions/effect/0428.curse_of_power/_/re-given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0428.curse_of_power/_/re-given +# +# Effectが上書きされた時に実行されるfunction +# +# @within tag/function asset:effect/re-given + +execute if data storage asset:context {id:428} run function asset:effect/0428.curse_of_power/re-given/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0428.curse_of_power/re-given/.mcfunction b/Asset/data/asset/functions/effect/0428.curse_of_power/re-given/.mcfunction new file mode 100644 index 0000000000..f79ab061f5 --- /dev/null +++ b/Asset/data/asset/functions/effect/0428.curse_of_power/re-given/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0428.curse_of_power/re-given/ +# +# Effectが上書きされた時の処理 +# +# @within function asset:effect/0428.curse_of_power/_/re-given. + +# Field引き継ぎ + data modify storage asset:context this set from storage asset:context PreviousField diff --git a/Asset/data/asset/tags/functions/effect/re-given.json b/Asset/data/asset/tags/functions/effect/re-given.json index e8154fd9bc..0f1993ec56 100644 --- a/Asset/data/asset/tags/functions/effect/re-given.json +++ b/Asset/data/asset/tags/functions/effect/re-given.json @@ -1,5 +1,6 @@ { "values": [ + "asset:effect/0428.curse_of_power/_/re-given", "asset:effect/0357.time_ticker_day/_/re-given", "asset:effect/0358.time_ticker_night/_/re-given", "asset:effect/0359.time_ticker_eclipse/_/re-given", @@ -71,4 +72,4 @@ "asset:effect/0258.spirit_melody/_/re-given", "asset:effect/0406.ocean_grace/_/re-given" ] -} +} \ No newline at end of file From 4d30ee8cadf9c8f566c31081c2ec028ec32c4bae Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Mon, 2 Nov 2026 17:02:47 +0100 Subject: [PATCH 17/18] =?UTF-8?q?=E3=83=98=E3=83=83=E3=83=80=E3=83=BC?= =?UTF-8?q?=E3=81=AE=E8=AA=A4=E5=AD=97=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/effect/0428.curse_of_power/re-given/.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/effect/0428.curse_of_power/re-given/.mcfunction b/Asset/data/asset/functions/effect/0428.curse_of_power/re-given/.mcfunction index f79ab061f5..b77a880c78 100644 --- a/Asset/data/asset/functions/effect/0428.curse_of_power/re-given/.mcfunction +++ b/Asset/data/asset/functions/effect/0428.curse_of_power/re-given/.mcfunction @@ -2,7 +2,7 @@ # # Effectが上書きされた時の処理 # -# @within function asset:effect/0428.curse_of_power/_/re-given. +# @within function asset:effect/0428.curse_of_power/_/re-given # Field引き継ぎ data modify storage asset:context this set from storage asset:context PreviousField From 328574bebabb214b6a2ca0d4a87f5d375ebfd195 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Sat, 14 Nov 2026 11:54:39 +0100 Subject: [PATCH 18/18] =?UTF-8?q?=E3=83=87=E3=83=90=E3=83=95=E3=81=8C?= =?UTF-8?q?=E6=88=A6=E9=97=98=E4=B8=AD=E3=81=AB=E3=81=AE=E3=81=BF=E4=BB=98?= =?UTF-8?q?=E4=B8=8E=E3=81=95=E3=82=8C=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1648.cursed_power_stone/dis_equip/3.main.mcfunction | 4 ++-- .../artifact/1648.cursed_power_stone/give/2.give.mcfunction | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1648.cursed_power_stone/dis_equip/3.main.mcfunction b/Asset/data/asset/functions/artifact/1648.cursed_power_stone/dis_equip/3.main.mcfunction index e86827f8ab..a7c63dfea5 100644 --- a/Asset/data/asset/functions/artifact/1648.cursed_power_stone/dis_equip/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1648.cursed_power_stone/dis_equip/3.main.mcfunction @@ -13,13 +13,13 @@ function api:entity/mob/effect/remove/from_id function api:entity/mob/effect/reset -# Effect428付与 +# 戦闘中ならEffect428付与 data modify storage api: Argument.ID set value 428 # Fieldを引き継ぐ data modify storage api: Argument.FieldOverride set from storage api: Return.Effect.Field - function api:entity/mob/effect/give + execute if predicate lib:in_battle run function api:entity/mob/effect/give function api:entity/mob/effect/reset # 装備中タグを削除 diff --git a/Asset/data/asset/functions/artifact/1648.cursed_power_stone/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1648.cursed_power_stone/give/2.give.mcfunction index 8abb2c155b..0205ab6539 100644 --- a/Asset/data/asset/functions/artifact/1648.cursed_power_stone/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1648.cursed_power_stone/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text": "呪われし力の結晶", "color": "#a93aae"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"translate": "装備中、攻撃力が%s、MP回復量が%s上昇するが、", "with": [{"text": "10%", "color": "green"}, {"text": "20%", "color": "green"}]}', '{"text": "MPが0になるか、装備を解除すると"}', '{"translate": "15秒の間耐性とMP回復量が%s低下する。", "with": [{"text": "20%", "color": "red"}]}', '{"text": "隙を見せるな。呪われてしまうぞ。", "color": "gray"}'] + data modify storage asset:artifact Lore set value ['{"translate": "装備中、攻撃力が%s、MP回復量が%s上昇するが、", "with": [{"text": "10%", "color": "green"}, {"text": "20%", "color": "green"}]}', '{"text": "MPが0になるか、戦闘中に装備を解除すると"}', '{"translate": "15秒の間耐性とMP回復量が%s低下する。", "with": [{"text": "20%", "color": "red"}]}', '{"text": "隙を見せるな。呪われてしまうぞ。", "color": "gray"}'] # 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション) # data modify storage asset:artifact ConsumeItem.Item set value '{"translate":"item.minecraft.stick"}' # data modify storage asset:artifact ConsumeItem.Count set value 1