From 1c5a255ce849cdd3f1a62be8400cf1dd9cf370a5 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Sun, 9 Nov 2025 22:51:40 +0900 Subject: [PATCH 1/7] =?UTF-8?q?=E9=80=94=E4=B8=AD=E7=B5=8C=E9=81=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../give/1.trigger.mcfunction | 7 ++ .../give/2.give.mcfunction | 73 +++++++++++++++++++ .../register.mcfunction | 7 ++ .../trigger/1.trigger.mcfunction | 8 ++ .../trigger/2.check_condition.mcfunction | 22 ++++++ .../trigger/3.main.mcfunction | 36 +++++++++ .../trigger/_index.d.mcfunction | 6 ++ .../asset/tags/functions/artifact/give.json | 3 +- .../asset/tags/functions/artifact/killed.json | 3 +- .../tags/functions/artifact/register.json | 3 +- 10 files changed, 165 insertions(+), 3 deletions(-) create mode 100644 Asset/data/asset/functions/artifact/1109.black_lily_of_priestess/give/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1109.black_lily_of_priestess/give/2.give.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1109.black_lily_of_priestess/register.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1109.black_lily_of_priestess/trigger/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1109.black_lily_of_priestess/trigger/2.check_condition.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1109.black_lily_of_priestess/trigger/3.main.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1109.black_lily_of_priestess/trigger/_index.d.mcfunction diff --git a/Asset/data/asset/functions/artifact/1109.black_lily_of_priestess/give/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1109.black_lily_of_priestess/give/1.trigger.mcfunction new file mode 100644 index 00000000000..3aff628270e --- /dev/null +++ b/Asset/data/asset/functions/artifact/1109.black_lily_of_priestess/give/1.trigger.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1109.black_lily_of_priestess/give/1.trigger +# +# 神器の取得処理の呼び出し時に実行されるfunction +# +# @within tag/function asset:artifact/give + +execute if data storage asset:context {id:1109} run function asset:artifact/1109.black_lily_of_priestess/give/2.give \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1109.black_lily_of_priestess/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1109.black_lily_of_priestess/give/2.give.mcfunction new file mode 100644 index 00000000000..b0c8900dc7e --- /dev/null +++ b/Asset/data/asset/functions/artifact/1109.black_lily_of_priestess/give/2.give.mcfunction @@ -0,0 +1,73 @@ +#> asset:artifact/1109.black_lily_of_priestess/give/2.give +# +# 神器の作成部 ここでID等を定義する +# +# @user +# @within function asset:artifact/1109.black_lily_of_priestess/give/1.trigger + +# 神器の説明や消費MPなどをここで設定する。 +# 最後にasset:artifact/common/giveを実行することで入手可能。 + +# 神器のID (int) スプレッドシートの値を入れる + data modify storage asset:artifact ID set value 1109 +# 神器のベースアイテム + data modify storage asset:artifact Item set value "minecraft:stick" +# 神器の名前 (TextComponentString) + data modify storage asset:artifact Name set value '{"text":"巫女の黒百合","color":"#8e2c30"}' +# 神器の説明文 (TextComponentString[]) + data modify storage asset:artifact Lore set value ['{"text":"自身に付与されたデバフ1つにつき"}','[{"text":"攻撃+2.5%","color":"green"},{"text":"、","color":"white"},{"text":"被回復量-5%","color":"red"},{"text":"を10秒間得る","color":"white"}]','{"text":"(それぞれ最大10%、20%)"}','{"text":"穢れに染まってしまった黒い花","color":"gray"}','{"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 + # 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 "onKilled" +# 効果が重複可能か否か (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 20 +# 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", "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/1109.black_lily_of_priestess/register.mcfunction b/Asset/data/asset/functions/artifact/1109.black_lily_of_priestess/register.mcfunction new file mode 100644 index 00000000000..1e275b255de --- /dev/null +++ b/Asset/data/asset/functions/artifact/1109.black_lily_of_priestess/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1109.black_lily_of_priestess/register +# +# 神器プールへの登録処理 +# +# @within tag/function asset:artifact/register + +data modify storage asset:artifact RarityRegistry[3] append value [1109] \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1109.black_lily_of_priestess/trigger/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1109.black_lily_of_priestess/trigger/1.trigger.mcfunction new file mode 100644 index 00000000000..32d1c5742d8 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1109.black_lily_of_priestess/trigger/1.trigger.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1109.black_lily_of_priestess/trigger/1.trigger +# +# 指定したイベントタイミングで実行されるfunction +# +# @within tag/function asset:artifact/** + +# storage asset:idの%slot%に装備している神器のIDが入っているので比較し、~/2.check_condition.mcfunctionを実行する + execute if data storage asset:context id{hotbar:[1109]} run function asset:artifact/1109.black_lily_of_priestess/trigger/2.check_condition \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1109.black_lily_of_priestess/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1109.black_lily_of_priestess/trigger/2.check_condition.mcfunction new file mode 100644 index 00000000000..d2e1eacad8b --- /dev/null +++ b/Asset/data/asset/functions/artifact/1109.black_lily_of_priestess/trigger/2.check_condition.mcfunction @@ -0,0 +1,22 @@ +#> asset:artifact/1109.black_lily_of_priestess/trigger/2.check_condition +# +# 神器の発動条件をチェックします +# +# @within function asset:artifact/1109.black_lily_of_priestess/trigger/1.trigger + +# ID指定する + data modify storage asset:artifact TargetID set value 1109 +# 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く + function asset:artifact/common/check_condition/hotbar +# 他にアイテム等確認する場合はここに書く + +# 自身にデバフがあるかをチェック + execute if entity @s[tag=CanUsed] run function api:entity/mob/effect/get/size/bad + execute if entity @s[tag=CanUsed] store result score $UT.DebuffCount Temporary run data get storage api: Return.EffectSize.Bad + execute if entity @s[tag=CanUsed] unless score $UT.DebuffCount Temporary matches 1.. run tag @s remove CanUsed + +# CanUsedタグをチェックして3.main.mcfunctionを実行する + execute if entity @s[tag=CanUsed] run function asset:artifact/1109.black_lily_of_priestess/trigger/3.main + +# リセット + scoreboard players reset $UT.DebuffCount Temporary diff --git a/Asset/data/asset/functions/artifact/1109.black_lily_of_priestess/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1109.black_lily_of_priestess/trigger/3.main.mcfunction new file mode 100644 index 00000000000..c4387314165 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1109.black_lily_of_priestess/trigger/3.main.mcfunction @@ -0,0 +1,36 @@ +#> asset:artifact/1109.black_lily_of_priestess/trigger/3.main +# +# 神器のメイン処理部 +# +# @within function asset:artifact/1109.black_lily_of_priestess/trigger/2.check_condition + +# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う + function asset:artifact/common/use/hotbar + +# ここから先は神器側の効果の処理を書く + +#> Private +# @private + #declare score_holder $MaxStack 調整班用にここで設定しておく + +# スタック最大値 + scoreboard players set $MaxStack Temporary 4 + +# 調整班用効果量設定 + # 効果時間 + data modify storage api: Argument.Duration set value 200 + # 攻撃補正 + data modify storage api: Argument.FieldOverride.Modifier.Attack set value 0.025 + # 被回復補正 + data modify storage api: Argument.FieldOverride.Modifier.ReceiveHeal set value -0.05 + +# Stackをデバフ数にしておく + execute store result storage api: Argument.Stack int 1 run scoreboard players operation $UT.DebuffCount Temporary < $MaxStack Temporary + +# 付与 + data modify storage api: Argument.ID set value 342 + function api:entity/mob/effect/give + function api:entity/mob/effect/reset + +# リセット + scoreboard players reset $MaxStack Temporary diff --git a/Asset/data/asset/functions/artifact/1109.black_lily_of_priestess/trigger/_index.d.mcfunction b/Asset/data/asset/functions/artifact/1109.black_lily_of_priestess/trigger/_index.d.mcfunction new file mode 100644 index 00000000000..f0f71ca27a9 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1109.black_lily_of_priestess/trigger/_index.d.mcfunction @@ -0,0 +1,6 @@ +#> asset:artifact/1109.black_lily_of_priestess/trigger/_index.d +# @private + +#> tag +# @within function asset:artifact/1109.black_lily_of_priestess/trigger/** + #declare score_holder $UT.DebuffCount diff --git a/Asset/data/asset/tags/functions/artifact/give.json b/Asset/data/asset/tags/functions/artifact/give.json index f3eb0088574..7598a5e683c 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/1109.black_lily_of_priestess/give/1.trigger", "asset:artifact/1140.over_pulse_booster/give/1.trigger", "asset:artifact/1139.over_pulse_legframe/give/1.trigger", "asset:artifact/1138.over_pulse_bodyarmor/give/1.trigger", @@ -517,4 +518,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/killed.json b/Asset/data/asset/tags/functions/artifact/killed.json index f5af5fd44f7..9bedf3f753f 100644 --- a/Asset/data/asset/tags/functions/artifact/killed.json +++ b/Asset/data/asset/tags/functions/artifact/killed.json @@ -1,9 +1,10 @@ { "values": [ + "asset:artifact/1109.black_lily_of_priestess/trigger/1.trigger", "asset:artifact/0292.craving_sword/kill/1.trigger", "asset:artifact/0728.magatama_of_soul_eating/trigger/1.trigger", "asset:artifact/0566.great_sage_helmet/kill/1.trigger", "asset:artifact/0950.residue_of_pumpkin/trigger/1.trigger", "asset:artifact/1083.tablet_of_oracle/trigger/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 deba1661508..c7ab6fc70cc 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/1109.black_lily_of_priestess/register", "asset:artifact/1137.over_pulse_headgear/register", "asset:artifact/1228.fatalerror/register", "asset:artifact/1273.maidchan_plush/register", @@ -295,4 +296,4 @@ "asset:artifact/1027.fire_of_rebirth/register", "asset:artifact/1111.rod_o_redeem/register" ] -} +} \ No newline at end of file From 4ec4bd5774d6a0977719132981f0606facda8bf2 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Tue, 11 Nov 2025 23:09:15 +0900 Subject: [PATCH 2/7] =?UTF-8?q?=E3=83=95=E3=83=AC=E3=83=BC=E3=83=90?= =?UTF-8?q?=E3=83=BC=E3=83=86=E3=82=AD=E3=82=B9=E3=83=88=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1109.black_lily_of_priestess/give/2.give.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/artifact/1109.black_lily_of_priestess/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1109.black_lily_of_priestess/give/2.give.mcfunction index b0c8900dc7e..ad60b8ae0a6 100644 --- a/Asset/data/asset/functions/artifact/1109.black_lily_of_priestess/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1109.black_lily_of_priestess/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"巫女の黒百合","color":"#8e2c30"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text":"自身に付与されたデバフ1つにつき"}','[{"text":"攻撃+2.5%","color":"green"},{"text":"、","color":"white"},{"text":"被回復量-5%","color":"red"},{"text":"を10秒間得る","color":"white"}]','{"text":"(それぞれ最大10%、20%)"}','{"text":"穢れに染まってしまった黒い花","color":"gray"}','{"text":"穢れに染まってしまった黒い花","color":"gray"}'] + data modify storage asset:artifact Lore set value ['{"text":"自身に付与されたデバフ1つにつき"}','[{"text":"攻撃+2.5%","color":"green"},{"text":"、","color":"white"},{"text":"被回復量-5%","color":"red"},{"text":"を10秒間得る","color":"white"}]','{"text":"(それぞれ最大10%、20%)"}','{"text":"穢れに染まってしまった黒い花","color":"gray"}','{"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 9bd0a2caf8f6526bd39ffb9f7d42f480313f24dc Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Tue, 25 Nov 2025 02:46:44 +0900 Subject: [PATCH 3/7] =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../give/2.give.mcfunction | 10 ++--- .../trigger/2.check_condition.mcfunction | 3 ++ .../trigger/3.main.mcfunction | 34 ++++----------- .../trigger/effect.mcfunction | 31 ++++++++++++++ .../_/end.mcfunction | 7 ++++ .../_/given.mcfunction | 7 ++++ .../_/register.mcfunction | 7 ++++ .../_/remove.mcfunction | 7 ++++ .../_/tick.mcfunction | 7 ++++ .../0342.prayer_amidst_blight/end/.mcfunction | 8 ++++ .../given/.mcfunction | 8 ++++ .../modifier/add.mcfunction | 19 +++++++++ .../modifier/remove.mcfunction | 15 +++++++ .../register.mcfunction | 41 +++++++++++++++++++ .../remove/.mcfunction | 8 ++++ .../tick/.mcfunction | 8 ++++ .../asset/tags/functions/artifact/attack.json | 1 + .../asset/tags/functions/artifact/killed.json | 3 +- .../data/asset/tags/functions/effect/end.json | 1 + .../asset/tags/functions/effect/given.json | 1 + .../asset/tags/functions/effect/register.json | 3 +- .../asset/tags/functions/effect/remove.json | 1 + .../asset/tags/functions/effect/tick.json | 1 + 23 files changed, 198 insertions(+), 33 deletions(-) create mode 100644 Asset/data/asset/functions/artifact/1109.black_lily_of_priestess/trigger/effect.mcfunction create mode 100644 Asset/data/asset/functions/effect/0342.prayer_amidst_blight/_/end.mcfunction create mode 100644 Asset/data/asset/functions/effect/0342.prayer_amidst_blight/_/given.mcfunction create mode 100644 Asset/data/asset/functions/effect/0342.prayer_amidst_blight/_/register.mcfunction create mode 100644 Asset/data/asset/functions/effect/0342.prayer_amidst_blight/_/remove.mcfunction create mode 100644 Asset/data/asset/functions/effect/0342.prayer_amidst_blight/_/tick.mcfunction create mode 100644 Asset/data/asset/functions/effect/0342.prayer_amidst_blight/end/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0342.prayer_amidst_blight/given/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0342.prayer_amidst_blight/modifier/add.mcfunction create mode 100644 Asset/data/asset/functions/effect/0342.prayer_amidst_blight/modifier/remove.mcfunction create mode 100644 Asset/data/asset/functions/effect/0342.prayer_amidst_blight/register.mcfunction create mode 100644 Asset/data/asset/functions/effect/0342.prayer_amidst_blight/remove/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0342.prayer_amidst_blight/tick/.mcfunction diff --git a/Asset/data/asset/functions/artifact/1109.black_lily_of_priestess/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1109.black_lily_of_priestess/give/2.give.mcfunction index ad60b8ae0a6..5aea223909f 100644 --- a/Asset/data/asset/functions/artifact/1109.black_lily_of_priestess/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1109.black_lily_of_priestess/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"巫女の黒百合","color":"#8e2c30"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text":"自身に付与されたデバフ1つにつき"}','[{"text":"攻撃+2.5%","color":"green"},{"text":"、","color":"white"},{"text":"被回復量-5%","color":"red"},{"text":"を10秒間得る","color":"white"}]','{"text":"(それぞれ最大10%、20%)"}','{"text":"穢れに染まってしまった黒い花","color":"gray"}','{"text":"沈みゆく世界で、静かに祈りは抗う","color":"gray"}'] + data modify storage asset:artifact Lore set value ['{"text":"自身に付与されたデバフ1つにつき"}','[{"text":"攻撃+2%","color":"green"},{"text":"、","color":"white"},{"text":"与回復量-4%","color":"red"},{"text":"を10秒間得る","color":"white"}]','{"text":"(それぞれ最大10%、20%)"}','{"text":"穢れに染まってしまった黒い花","color":"gray"}','{"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 @@ -25,7 +25,7 @@ # 神器を発動できるスロット (string) Wikiを参照 data modify storage asset:artifact Slot set value "hotbar" # 神器のトリガー (string) Wikiを参照 - data modify storage asset:artifact Trigger set value "onKilled" + data modify storage asset:artifact Trigger set value "onAttack" # 効果が重複可能か否か (boolean) (オプション) # data modify storage asset:artifact EnableDuplication set value # 神器の発動条件 (TextComponentString) (オプション) @@ -49,7 +49,7 @@ # MP回復量 (int) # data modify storage asset:artifact MPHealWhenHit set value # 神器のクールダウン (int) (オプション) - # data modify storage asset:artifact LocalCooldown set value + data modify storage asset:artifact LocalCooldown set value 300 # 種別クールダウン ({Type: string, Duration: int}) (オプション) # data modify storage asset:artifact TypeCooldown.Type set value # data modify storage asset:artifact TypeCooldown.Duration set value @@ -59,9 +59,9 @@ # グローバルクールダウン (int) (オプション) # data modify storage asset:artifact SpecialCooldown set value # クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) - # data modify storage asset:artifact DisableCooldownMessage set value + data modify storage asset:artifact DisableCooldownMessage set value true # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) - # data modify storage asset:artifact DisableMPMessage set value + data modify storage asset:artifact DisableMPMessage set value true # 破壊時の音を鳴らさないかどうか (boolean) (オプション) # data modify storage asset:artifact DisableBreakSound set value # 扱える神 (string[]) Wikiを参照 diff --git a/Asset/data/asset/functions/artifact/1109.black_lily_of_priestess/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1109.black_lily_of_priestess/trigger/2.check_condition.mcfunction index d2e1eacad8b..1298cd10d5e 100644 --- a/Asset/data/asset/functions/artifact/1109.black_lily_of_priestess/trigger/2.check_condition.mcfunction +++ b/Asset/data/asset/functions/artifact/1109.black_lily_of_priestess/trigger/2.check_condition.mcfunction @@ -10,6 +10,9 @@ function asset:artifact/common/check_condition/hotbar # 他にアイテム等確認する場合はここに書く +# IsDoT:trueの際は発動しない + execute if entity @s[tag=CanUsed] if data storage asset:context Attack{IsDoT:true} run tag @s remove CanUsed + # 自身にデバフがあるかをチェック execute if entity @s[tag=CanUsed] run function api:entity/mob/effect/get/size/bad execute if entity @s[tag=CanUsed] store result score $UT.DebuffCount Temporary run data get storage api: Return.EffectSize.Bad diff --git a/Asset/data/asset/functions/artifact/1109.black_lily_of_priestess/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1109.black_lily_of_priestess/trigger/3.main.mcfunction index c4387314165..89f11baeb29 100644 --- a/Asset/data/asset/functions/artifact/1109.black_lily_of_priestess/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1109.black_lily_of_priestess/trigger/3.main.mcfunction @@ -9,28 +9,12 @@ # ここから先は神器側の効果の処理を書く -#> Private -# @private - #declare score_holder $MaxStack 調整班用にここで設定しておく - -# スタック最大値 - scoreboard players set $MaxStack Temporary 4 - -# 調整班用効果量設定 - # 効果時間 - data modify storage api: Argument.Duration set value 200 - # 攻撃補正 - data modify storage api: Argument.FieldOverride.Modifier.Attack set value 0.025 - # 被回復補正 - data modify storage api: Argument.FieldOverride.Modifier.ReceiveHeal set value -0.05 - -# Stackをデバフ数にしておく - execute store result storage api: Argument.Stack int 1 run scoreboard players operation $UT.DebuffCount Temporary < $MaxStack Temporary - -# 付与 - data modify storage api: Argument.ID set value 342 - function api:entity/mob/effect/give - function api:entity/mob/effect/reset - -# リセット - scoreboard players reset $MaxStack Temporary +# 演出 + #playsound ogg:ambient.nether.crimson_forest.shine3 player @a ~ ~ ~ 0.4 2 + particle minecraft:dust_color_transition 0.4 0 0 1 0. 0 0 ~ ~1.2 ~ 1.5 1 1.5 0 60 + playsound ogg:ambient.nether.crimson_forest.shine3 player @a ~ ~ ~ 0.2 1.4 + playsound ogg:ambient.nether.crimson_forest.shine3 player @a ~ ~ ~ 0.2 1.2 + playsound minecraft:weather.rain.above player @a ~ ~ ~ 0.2 0.8 + +# エフェクト + function asset:artifact/1109.black_lily_of_priestess/trigger/effect diff --git a/Asset/data/asset/functions/artifact/1109.black_lily_of_priestess/trigger/effect.mcfunction b/Asset/data/asset/functions/artifact/1109.black_lily_of_priestess/trigger/effect.mcfunction new file mode 100644 index 00000000000..780054765a3 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1109.black_lily_of_priestess/trigger/effect.mcfunction @@ -0,0 +1,31 @@ +#> asset:artifact/1109.black_lily_of_priestess/trigger/effect +# +# +# +# @within function asset:artifact/1109.black_lily_of_priestess/trigger/3.main + +#> Private +# @private + #declare score_holder $MaxStack 調整班用にここで設定しておく + +# スタック最大値 + scoreboard players set $MaxStack Temporary 5 + +# Stackをデバフ数にしておく + execute store result storage api: Argument.Stack int 1 run scoreboard players operation $UT.DebuffCount Temporary < $MaxStack Temporary + +# 調整班用効果量設定 + # 効果時間 + data modify storage api: Argument.Duration set value 200 + # 攻撃補正 + execute store result storage api: Argument.FieldOverride.Modifier.Attack float 0.02 run scoreboard players get $UT.DebuffCount Temporary + # 与回復補正 + execute store result storage api: Argument.FieldOverride.Modifier.Heal float -0.04 run scoreboard players get $UT.DebuffCount Temporary + +# 付与 + data modify storage api: Argument.ID set value 342 + function api:entity/mob/effect/give + function api:entity/mob/effect/reset + +# リセット + scoreboard players reset $MaxStack Temporary diff --git a/Asset/data/asset/functions/effect/0342.prayer_amidst_blight/_/end.mcfunction b/Asset/data/asset/functions/effect/0342.prayer_amidst_blight/_/end.mcfunction new file mode 100644 index 00000000000..58984fb90a1 --- /dev/null +++ b/Asset/data/asset/functions/effect/0342.prayer_amidst_blight/_/end.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0342.prayer_amidst_blight/_/end +# +# Effectの効果の終了時に実行されるfunction +# +# @within tag/function asset:effect/end + +execute if data storage asset:context {id:342} run function asset:effect/0342.prayer_amidst_blight/end/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0342.prayer_amidst_blight/_/given.mcfunction b/Asset/data/asset/functions/effect/0342.prayer_amidst_blight/_/given.mcfunction new file mode 100644 index 00000000000..f267ef84752 --- /dev/null +++ b/Asset/data/asset/functions/effect/0342.prayer_amidst_blight/_/given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0342.prayer_amidst_blight/_/given +# +# Effectが付与された時に実行されるfunction +# +# @within tag/function asset:effect/given + +execute if data storage asset:context {id:342} run function asset:effect/0342.prayer_amidst_blight/given/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0342.prayer_amidst_blight/_/register.mcfunction b/Asset/data/asset/functions/effect/0342.prayer_amidst_blight/_/register.mcfunction new file mode 100644 index 00000000000..bd1face0679 --- /dev/null +++ b/Asset/data/asset/functions/effect/0342.prayer_amidst_blight/_/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0342.prayer_amidst_blight/_/register +# +# +# +# @within tag/function asset:effect/register + +execute if data storage asset:context {id:342} run function asset:effect/0342.prayer_amidst_blight/register \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0342.prayer_amidst_blight/_/remove.mcfunction b/Asset/data/asset/functions/effect/0342.prayer_amidst_blight/_/remove.mcfunction new file mode 100644 index 00000000000..cf250344c7c --- /dev/null +++ b/Asset/data/asset/functions/effect/0342.prayer_amidst_blight/_/remove.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0342.prayer_amidst_blight/_/remove +# +# Effectが神器や牛乳によって削除された時に実行されるfunction +# +# @within tag/function asset:effect/remove + +execute if data storage asset:context {id:342} run function asset:effect/0342.prayer_amidst_blight/remove/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0342.prayer_amidst_blight/_/tick.mcfunction b/Asset/data/asset/functions/effect/0342.prayer_amidst_blight/_/tick.mcfunction new file mode 100644 index 00000000000..3a30b06defd --- /dev/null +++ b/Asset/data/asset/functions/effect/0342.prayer_amidst_blight/_/tick.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0342.prayer_amidst_blight/_/tick +# +# Effectが発動している間毎tick実行されるfunction +# +# @within tag/function asset:effect/tick + +execute if data storage asset:context {id:342} run function asset:effect/0342.prayer_amidst_blight/tick/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0342.prayer_amidst_blight/end/.mcfunction b/Asset/data/asset/functions/effect/0342.prayer_amidst_blight/end/.mcfunction new file mode 100644 index 00000000000..acff221626a --- /dev/null +++ b/Asset/data/asset/functions/effect/0342.prayer_amidst_blight/end/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0342.prayer_amidst_blight/end/ +# +# Effectの効果が切れた時の処理 +# +# @within function asset:effect/0342.prayer_amidst_blight/_/end + +# 補正を付与 + function asset:effect/0342.prayer_amidst_blight/modifier/remove diff --git a/Asset/data/asset/functions/effect/0342.prayer_amidst_blight/given/.mcfunction b/Asset/data/asset/functions/effect/0342.prayer_amidst_blight/given/.mcfunction new file mode 100644 index 00000000000..a474d0b11eb --- /dev/null +++ b/Asset/data/asset/functions/effect/0342.prayer_amidst_blight/given/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0342.prayer_amidst_blight/given/ +# +# Effectが付与された時の処理 +# +# @within function asset:effect/0342.prayer_amidst_blight/_/given + +# 補正を付与 + function asset:effect/0342.prayer_amidst_blight/modifier/add diff --git a/Asset/data/asset/functions/effect/0342.prayer_amidst_blight/modifier/add.mcfunction b/Asset/data/asset/functions/effect/0342.prayer_amidst_blight/modifier/add.mcfunction new file mode 100644 index 00000000000..b8b3cb4cfe3 --- /dev/null +++ b/Asset/data/asset/functions/effect/0342.prayer_amidst_blight/modifier/add.mcfunction @@ -0,0 +1,19 @@ +#> asset:effect/0342.prayer_amidst_blight/modifier/add +# +# +# +# @within function asset:effect/0342.prayer_amidst_blight/given/ + +# スタックなんてただの飾りです 偉い人にはそれがわからんのですよ + +# 攻撃補正 + 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.Modifier.Attack + data modify storage api: Argument.Operation set value "multiply" + function api:modifier/attack/base/add + +# 回復補正 + 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.Modifier.Heal + data modify storage api: Argument.Operation set value "multiply" + function api:modifier/heal/add diff --git a/Asset/data/asset/functions/effect/0342.prayer_amidst_blight/modifier/remove.mcfunction b/Asset/data/asset/functions/effect/0342.prayer_amidst_blight/modifier/remove.mcfunction new file mode 100644 index 00000000000..63c9a21dff9 --- /dev/null +++ b/Asset/data/asset/functions/effect/0342.prayer_amidst_blight/modifier/remove.mcfunction @@ -0,0 +1,15 @@ +#> asset:effect/0342.prayer_amidst_blight/modifier/remove +# +# +# +# @within function +# asset:effect/0342.prayer_amidst_blight/end/ +# asset:effect/0342.prayer_amidst_blight/remove/ + +# 攻撃補正 + data modify storage api: Argument.UUID set from storage asset:context this.UUID + function api:modifier/attack/base/remove + +# 回復補正 + data modify storage api: Argument.UUID set from storage asset:context this.UUID + function api:modifier/heal/remove diff --git a/Asset/data/asset/functions/effect/0342.prayer_amidst_blight/register.mcfunction b/Asset/data/asset/functions/effect/0342.prayer_amidst_blight/register.mcfunction new file mode 100644 index 00000000000..ed04eadc0bd --- /dev/null +++ b/Asset/data/asset/functions/effect/0342.prayer_amidst_blight/register.mcfunction @@ -0,0 +1,41 @@ +#> asset:effect/0342.prayer_amidst_blight/register +# +# Effectのデータを指定 +# +# @within function asset:effect/0342.prayer_amidst_blight/_/register + +# ExtendsSafe (boolean) (default = false) + # data modify storage asset:effect ExtendsSafe set value true +# ID (int) + data modify storage asset:effect ID set value 342 +# 名前 (TextComponentString) + data modify storage asset:effect Name set value '{"text":"穢中の祈り","color":"#8e2c30"}' +# 説明文 (TextComponentString[]) + data modify storage asset:effect Description set value ['{"text":"与ダメージが上昇し、与回復量が減少する","color":"white"}'] +# 効果時間 (int) (default = API || error) + # data modify storage asset:effect Duration set value +# スタック (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 1 +# 悪い効果か否か (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 + +# フィールド + data modify storage asset:effect Field.UUID set value [I;1,3,342,0] + data modify storage asset:effect Field.Modifier.Attack set value 0.02 + data modify storage asset:effect Field.Modifier.Heal set value -0.04 diff --git a/Asset/data/asset/functions/effect/0342.prayer_amidst_blight/remove/.mcfunction b/Asset/data/asset/functions/effect/0342.prayer_amidst_blight/remove/.mcfunction new file mode 100644 index 00000000000..e4b5beacbec --- /dev/null +++ b/Asset/data/asset/functions/effect/0342.prayer_amidst_blight/remove/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0342.prayer_amidst_blight/remove/ +# +# Effectが削除された時の処理 +# +# @within function asset:effect/0342.prayer_amidst_blight/_/remove + +# 補正を付与 + function asset:effect/0342.prayer_amidst_blight/modifier/remove diff --git a/Asset/data/asset/functions/effect/0342.prayer_amidst_blight/tick/.mcfunction b/Asset/data/asset/functions/effect/0342.prayer_amidst_blight/tick/.mcfunction new file mode 100644 index 00000000000..25b2eff6920 --- /dev/null +++ b/Asset/data/asset/functions/effect/0342.prayer_amidst_blight/tick/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0342.prayer_amidst_blight/tick/ +# +# Effectのtick処理 +# +# @within function asset:effect/0342.prayer_amidst_blight/_/tick + +# 演出 + execute if predicate lib:random_pass_per/30 run particle minecraft:dust_color_transition 0.4 0 0 1 0. 0 0 ~ ~1.2 ~ 1.5 1 1.5 0 1 diff --git a/Asset/data/asset/tags/functions/artifact/attack.json b/Asset/data/asset/tags/functions/artifact/attack.json index 2758c71743e..17b78852ed9 100644 --- a/Asset/data/asset/tags/functions/artifact/attack.json +++ b/Asset/data/asset/tags/functions/artifact/attack.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1109.black_lily_of_priestess/trigger/1.trigger", "asset:artifact/0897.lightning_broach/trigger/1.trigger", "asset:artifact/0554.catastrophe/attack/1.trigger", "asset:artifact/1110.lantern_of_firefly/trigger/1.trigger", diff --git a/Asset/data/asset/tags/functions/artifact/killed.json b/Asset/data/asset/tags/functions/artifact/killed.json index 9bedf3f753f..f5af5fd44f7 100644 --- a/Asset/data/asset/tags/functions/artifact/killed.json +++ b/Asset/data/asset/tags/functions/artifact/killed.json @@ -1,10 +1,9 @@ { "values": [ - "asset:artifact/1109.black_lily_of_priestess/trigger/1.trigger", "asset:artifact/0292.craving_sword/kill/1.trigger", "asset:artifact/0728.magatama_of_soul_eating/trigger/1.trigger", "asset:artifact/0566.great_sage_helmet/kill/1.trigger", "asset:artifact/0950.residue_of_pumpkin/trigger/1.trigger", "asset:artifact/1083.tablet_of_oracle/trigger/1.trigger" ] -} \ 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 81710cbe5a5..15a08cb75fa 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/0342.prayer_amidst_blight/_/end", "asset:effect/0025.levitation/_/end", "asset:effect/0621.loyalty_shield/_/end", "asset:effect/0653.absolute_drive/_/end", diff --git a/Asset/data/asset/tags/functions/effect/given.json b/Asset/data/asset/tags/functions/effect/given.json index c20c6c55872..f32458030bb 100644 --- a/Asset/data/asset/tags/functions/effect/given.json +++ b/Asset/data/asset/tags/functions/effect/given.json @@ -1,5 +1,6 @@ { "values": [ + "asset:effect/0342.prayer_amidst_blight/_/given", "asset:effect/0315.charge_of_aurora_scythe/_/given", "asset:effect/0621.loyalty_shield/_/given", "asset:effect/0653.absolute_drive/_/given", diff --git a/Asset/data/asset/tags/functions/effect/register.json b/Asset/data/asset/tags/functions/effect/register.json index 2df8839cf1a..d9078849cc1 100644 --- a/Asset/data/asset/tags/functions/effect/register.json +++ b/Asset/data/asset/tags/functions/effect/register.json @@ -1,5 +1,6 @@ { "values": [ + "asset:effect/0342.prayer_amidst_blight/_/register", "asset:effect/0025.levitation/_/register", "asset:effect/0247.great_demon_armor/_/register", "asset:effect/0246.flame_devil_armor/_/register", @@ -167,4 +168,4 @@ "asset:effect/0007.defense_base_debuff/_/register", "asset:effect/0258.spirit_melody/_/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 3e8ceea4eb6..00e69186cf1 100644 --- a/Asset/data/asset/tags/functions/effect/remove.json +++ b/Asset/data/asset/tags/functions/effect/remove.json @@ -1,5 +1,6 @@ { "values": [ + "asset:effect/0342.prayer_amidst_blight/_/remove", "asset:effect/0025.levitation/_/remove", "asset:effect/0245.flame_hunter_attire/_/remove", "asset:effect/0255.kaguya_s_difficulties/_/remove", diff --git a/Asset/data/asset/tags/functions/effect/tick.json b/Asset/data/asset/tags/functions/effect/tick.json index 8a5fbd5389e..6c1fc1dc0f8 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/0342.prayer_amidst_blight/_/tick", "asset:effect/0025.levitation/_/tick", "asset:effect/0244.aurora_armor/_/tick", "asset:effect/0243.oblivious_snow/_/tick", From 2bc583a2db7e2fa69bc283d04be428702c8f6b34 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Tue, 25 Nov 2025 02:47:13 +0900 Subject: [PATCH 4/7] =?UTF-8?q?=E9=9A=A0=E3=81=97=E6=9E=A0=E3=81=AB?= =?UTF-8?q?=E6=8A=95=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifact/1109.black_lily_of_priestess/register.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/artifact/1109.black_lily_of_priestess/register.mcfunction b/Asset/data/asset/functions/artifact/1109.black_lily_of_priestess/register.mcfunction index 1e275b255de..1fe82b35457 100644 --- a/Asset/data/asset/functions/artifact/1109.black_lily_of_priestess/register.mcfunction +++ b/Asset/data/asset/functions/artifact/1109.black_lily_of_priestess/register.mcfunction @@ -4,4 +4,4 @@ # # @within tag/function asset:artifact/register -data modify storage asset:artifact RarityRegistry[3] append value [1109] \ No newline at end of file +data modify storage asset:artifact HideRarityRegistry[3] append value [1109] From 06c34aa93c26eeee528775de6f1c88b840f524c4 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Tue, 25 Nov 2025 02:52:06 +0900 Subject: [PATCH 5/7] =?UTF-8?q?=E3=83=90=E3=83=95=E5=80=8D=E7=8E=87?= =?UTF-8?q?=E3=82=92=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1109.black_lily_of_priestess/give/2.give.mcfunction | 2 +- .../1109.black_lily_of_priestess/trigger/effect.mcfunction | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1109.black_lily_of_priestess/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1109.black_lily_of_priestess/give/2.give.mcfunction index 5aea223909f..5e864aad245 100644 --- a/Asset/data/asset/functions/artifact/1109.black_lily_of_priestess/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1109.black_lily_of_priestess/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"巫女の黒百合","color":"#8e2c30"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text":"自身に付与されたデバフ1つにつき"}','[{"text":"攻撃+2%","color":"green"},{"text":"、","color":"white"},{"text":"与回復量-4%","color":"red"},{"text":"を10秒間得る","color":"white"}]','{"text":"(それぞれ最大10%、20%)"}','{"text":"穢れに染まってしまった黒い花","color":"gray"}','{"text":"沈みゆく世界で穢れを抱き、散りゆく時を待つ","color":"gray"}'] + data modify storage asset:artifact Lore set value ['{"text":"自身に付与されたデバフ1つにつき"}','[{"text":"攻撃+2.5%","color":"green"},{"text":"、","color":"white"},{"text":"与回復量-5%","color":"red"},{"text":"を10秒間得る","color":"white"}]','{"text":"(それぞれ最大12.5%、-25%)"}','{"text":"穢れに染まってしまった黒い花","color":"gray"}','{"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/artifact/1109.black_lily_of_priestess/trigger/effect.mcfunction b/Asset/data/asset/functions/artifact/1109.black_lily_of_priestess/trigger/effect.mcfunction index 780054765a3..1b0a70efc9f 100644 --- a/Asset/data/asset/functions/artifact/1109.black_lily_of_priestess/trigger/effect.mcfunction +++ b/Asset/data/asset/functions/artifact/1109.black_lily_of_priestess/trigger/effect.mcfunction @@ -18,9 +18,9 @@ # 効果時間 data modify storage api: Argument.Duration set value 200 # 攻撃補正 - execute store result storage api: Argument.FieldOverride.Modifier.Attack float 0.02 run scoreboard players get $UT.DebuffCount Temporary + execute store result storage api: Argument.FieldOverride.Modifier.Attack float 0.025 run scoreboard players get $UT.DebuffCount Temporary # 与回復補正 - execute store result storage api: Argument.FieldOverride.Modifier.Heal float -0.04 run scoreboard players get $UT.DebuffCount Temporary + execute store result storage api: Argument.FieldOverride.Modifier.Heal float -0.05 run scoreboard players get $UT.DebuffCount Temporary # 付与 data modify storage api: Argument.ID set value 342 From 61879f22d47c1655c023e6189479280561f2073e Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Tue, 25 Nov 2025 04:49:10 +0900 Subject: [PATCH 6/7] =?UTF-8?q?=E3=83=95=E3=83=AC=E3=83=BC=E3=83=90?= =?UTF-8?q?=E3=83=BC=E3=83=86=E3=82=AD=E3=82=B9=E3=83=88=E3=82=92=E8=AA=BF?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1109.black_lily_of_priestess/give/2.give.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/artifact/1109.black_lily_of_priestess/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1109.black_lily_of_priestess/give/2.give.mcfunction index 5e864aad245..4d8f75cd4b9 100644 --- a/Asset/data/asset/functions/artifact/1109.black_lily_of_priestess/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1109.black_lily_of_priestess/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"巫女の黒百合","color":"#8e2c30"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text":"自身に付与されたデバフ1つにつき"}','[{"text":"攻撃+2.5%","color":"green"},{"text":"、","color":"white"},{"text":"与回復量-5%","color":"red"},{"text":"を10秒間得る","color":"white"}]','{"text":"(それぞれ最大12.5%、-25%)"}','{"text":"穢れに染まってしまった黒い花","color":"gray"}','{"text":"沈みゆく世界で穢れを抱き、散りゆく時を待つ","color":"gray"}'] + data modify storage asset:artifact Lore set value ['{"text":"自身に付与されたデバフ1つにつき"}','[{"text":"攻撃+2.5%","color":"green"},{"text":"、","color":"white"},{"text":"与回復量-5%","color":"red"},{"text":"を10秒間得る","color":"white"}]','{"text":"(それぞれ最大12.5%、-25%)"}','{"text":"穢れに染まってしまった黒い花","color":"gray"}','{"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 3bb993ed8723cdab9ae73ba73c1396d9fd7d95a5 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Tue, 25 Nov 2025 05:39:41 +0900 Subject: [PATCH 7/7] =?UTF-8?q?=E3=83=90=E3=83=95=E6=BC=94=E5=87=BA?= =?UTF-8?q?=E3=82=92=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/effect/0342.prayer_amidst_blight/tick/.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/effect/0342.prayer_amidst_blight/tick/.mcfunction b/Asset/data/asset/functions/effect/0342.prayer_amidst_blight/tick/.mcfunction index 25b2eff6920..c4fc97f9b51 100644 --- a/Asset/data/asset/functions/effect/0342.prayer_amidst_blight/tick/.mcfunction +++ b/Asset/data/asset/functions/effect/0342.prayer_amidst_blight/tick/.mcfunction @@ -5,4 +5,4 @@ # @within function asset:effect/0342.prayer_amidst_blight/_/tick # 演出 - execute if predicate lib:random_pass_per/30 run particle minecraft:dust_color_transition 0.4 0 0 1 0. 0 0 ~ ~1.2 ~ 1.5 1 1.5 0 1 + execute if predicate lib:random_pass_per/30 run particle minecraft:dust_color_transition 0.4 0 0 0.6 0 0 0 ~ ~1.2 ~ 1 0.4 1 0 1