From db8484b3ccf68a30af81d708aa32ad35f1b8d821 Mon Sep 17 00:00:00 2001 From: k22992068-crypto <286215529+k22992068-crypto@users.noreply.github.com> Date: Thu, 21 May 2026 00:14:38 +0900 Subject: [PATCH 1/6] =?UTF-8?q?1430=E3=81=AE=E7=A5=9E=E5=99=A8=E3=81=AEgiv?= =?UTF-8?q?e=E3=81=A8trigger=E3=81=AE=E5=87=A6=E7=90=86=E3=82=92=E4=BD=9C?= =?UTF-8?q?=E3=81=A3=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../give/1.trigger.mcfunction | 7 ++ .../give/2.give.mcfunction | 74 +++++++++++++++++++ .../1430.shield_of_fate/register.mcfunction | 7 ++ .../trigger/0.load.mcfunction | 9 +++ .../trigger/1.trigger.mcfunction | 8 ++ .../trigger/2.check_condition.mcfunction | 16 ++++ .../trigger/3.main.mcfunction | 20 +++++ .../trigger/_index.d.mcfunction | 6 ++ .../trigger/dis_equip/.mcfunction | 7 ++ .../trigger/dis_equip/main.mcfunction | 6 ++ .../trigger/equip/.mcfunction | 7 ++ .../trigger/equip/main.mcfunction | 5 ++ .../artifact/damage/from_entity/.json | 1 + .../tags/functions/artifact/dis_equip.json | 3 +- .../asset/tags/functions/artifact/equip.json | 1 + .../asset/tags/functions/artifact/give.json | 3 +- .../asset/tags/functions/artifact/load.json | 3 +- .../tags/functions/artifact/register.json | 3 +- 18 files changed, 182 insertions(+), 4 deletions(-) create mode 100644 Asset/data/asset/functions/artifact/1430.shield_of_fate/give/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1430.shield_of_fate/give/2.give.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1430.shield_of_fate/register.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/0.load.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/2.check_condition.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/3.main.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/_index.d.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/dis_equip/.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/dis_equip/main.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/equip/.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/equip/main.mcfunction diff --git a/Asset/data/asset/functions/artifact/1430.shield_of_fate/give/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1430.shield_of_fate/give/1.trigger.mcfunction new file mode 100644 index 00000000000..0fe4c5e4ced --- /dev/null +++ b/Asset/data/asset/functions/artifact/1430.shield_of_fate/give/1.trigger.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1430.shield_of_fate/give/1.trigger +# +# 神器の取得処理の呼び出し時に実行されるfunction +# +# @within tag/function asset:artifact/give + +execute if data storage asset:context {id:1430} run function asset:artifact/1430.shield_of_fate/give/2.give \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1430.shield_of_fate/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1430.shield_of_fate/give/2.give.mcfunction new file mode 100644 index 00000000000..43ddc071158 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1430.shield_of_fate/give/2.give.mcfunction @@ -0,0 +1,74 @@ +#> asset:artifact/1430.shield_of_fate/give/2.give +# +# 神器の作成部 ここでID等を定義する +# +# @user +# @within function asset:artifact/1430.shield_of_fate/give/1.trigger + +# 神器の説明や消費MPなどをここで設定する。 +# 最後にasset:artifact/common/giveを実行することで入手可能。 + +# 神器のID (int) スプレッドシートの値を入れる + data modify storage asset:artifact ID set value 1430 +# 神器のベースアイテム + 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 ['{"text":"test"}'] +# 消費アイテム ({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 "onDamageFromEntity" +# 効果が重複可能か否か (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 +# 装備時ステータス補正 ({Type: string, Amount: double, Operation: string, StackReduction?: double}[]) (オプション) + data modify storage asset:artifact Equipment.Modifiers append value {Type:"defense/base",Amount:0.15d,Operation:"multiply_base"} +# 扱える神 (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/1430.shield_of_fate/register.mcfunction b/Asset/data/asset/functions/artifact/1430.shield_of_fate/register.mcfunction new file mode 100644 index 00000000000..cb5cc17d9e3 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1430.shield_of_fate/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1430.shield_of_fate/register +# +# 神器プールへの登録処理 +# +# @within tag/function asset:artifact/register + +data modify storage asset:artifact RarityRegistry[3] append value [1430] \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/0.load.mcfunction b/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/0.load.mcfunction new file mode 100644 index 00000000000..159eb5ae47a --- /dev/null +++ b/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/0.load.mcfunction @@ -0,0 +1,9 @@ +#> asset:artifact/1430.shield_of_fate/trigger/0.load +# +# 神器に利用するスコアボード等の初期化処理 +# +# @within tag/function asset:artifact/load + +#> 定義類はここに +# @within function asset:artifact/1430.shield_of_fate/trigger/** + scoreboard objectives add \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/1.trigger.mcfunction new file mode 100644 index 00000000000..04844e10305 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/1.trigger.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1430.shield_of_fate/trigger/1.trigger +# +# 指定したイベントタイミングで実行されるfunction +# +# @within tag/function asset:artifact/** + +# storage asset:idのhotbarに装備している神器のIDが入っているので比較し、~/2.check_condition.mcfunctionを実行する + execute if data storage asset:context id{hotbar:[1430]} run function asset:artifact/1430.shield_of_fate/trigger/2.check_condition diff --git a/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/2.check_condition.mcfunction new file mode 100644 index 00000000000..090a721c743 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/2.check_condition.mcfunction @@ -0,0 +1,16 @@ +#> asset:artifact/1430.shield_of_fate/trigger/2.check_condition +# +# 神器の発動条件をチェックします +# +# @within function asset:artifact/1430.shield_of_fate/trigger/1.trigger + +# ID指定する + data modify storage asset:artifact TargetID set value 1430 +# 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く + function asset:artifact/common/check_condition/hotbar +# 確率10%を引けなかったらCanUsedタグを削除 + execute if entity @s[tag=CanUsed] unless predicate lib:random_pass_per/10 run tag @s remove CanUsed +# 既にダメージを受けている場合はタグを削除 + execute if data storage asset:context Damage{IsVanilla:1b} run tag @s remove CanUsed +# CanUsedタグをチェックして3.main.mcfunctionを実行する + execute if entity @s[tag=CanUsed] run function asset:artifact/1430.shield_of_fate/trigger/3.main diff --git a/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/3.main.mcfunction new file mode 100644 index 00000000000..cef2fd18ddd --- /dev/null +++ b/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/3.main.mcfunction @@ -0,0 +1,20 @@ +#> asset:artifact/1430.shield_of_fate/trigger/3.main +# +# 神器のメイン処理部 +# +# @within function asset:artifact/1430.shield_of_fate/trigger/2.check_condition + +# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う + function asset:artifact/common/use/hotbar + +#> Private +# @private + #declare score_holder $13Q.Damage + +# 受けたダメージを0.5倍して自身にその数値分ダメージを与える + execute store result storage api: Argument.Damage double 0.005 run data get storage asset:context Damage.Amount 100 + data modify storage api: Argument.AttackType set from storage asset:context Damage.AttackType + data modify storage api: Argument.ElementType set from storage asset:context Damage.ElementType + data modify storage api: Argument.FixedDamage set value true + function api:damage/ + function api:damage/reset diff --git a/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/_index.d.mcfunction b/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/_index.d.mcfunction new file mode 100644 index 00000000000..7b3f4795d19 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/_index.d.mcfunction @@ -0,0 +1,6 @@ +#> asset:artifact/1430.shield_of_fate/trigger/_index.d +# @private + +#> tag +# @within function asset:artifact/1430.shield_of_fate/trigger/** + #declare \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/dis_equip/.mcfunction b/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/dis_equip/.mcfunction new file mode 100644 index 00000000000..23730d516d0 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/dis_equip/.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1430.shield_of_fate/trigger/dis_equip/ +# +# 装備を外した時に外した部位にのみのidが入った状態でトリガーされる +# +# @within tag/function asset:artifact/dis_equip + +execute if data storage asset:context id{hotbar:[1430]} run function asset:artifact/1430.shield_of_fate/trigger/dis_equip/main diff --git a/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/dis_equip/main.mcfunction b/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/dis_equip/main.mcfunction new file mode 100644 index 00000000000..b7362f08b0e --- /dev/null +++ b/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/dis_equip/main.mcfunction @@ -0,0 +1,6 @@ +#> asset:artifact/1430.shield_of_fate/trigger/dis_equip/main +# +# 装備を外した時のメイン処理 +# +# @within function asset:artifact/1430.shield_of_fate/trigger/dis_equip/ + diff --git a/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/equip/.mcfunction b/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/equip/.mcfunction new file mode 100644 index 00000000000..3f67752937c --- /dev/null +++ b/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/equip/.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1430.shield_of_fate/trigger/equip/ +# +# 装備を装備時に装備した部位にのみのidが入った状態でトリガーされる +# +# @within tag/function asset:artifact/equip + +execute if data storage asset:context id{hotbar:[1430]} run function asset:artifact/1430.shield_of_fate/trigger/equip/main diff --git a/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/equip/main.mcfunction b/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/equip/main.mcfunction new file mode 100644 index 00000000000..5a948fbf5ad --- /dev/null +++ b/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/equip/main.mcfunction @@ -0,0 +1,5 @@ +#> asset:artifact/1430.shield_of_fate/trigger/equip/main +# +# 装備を付けた時のメイン処理 +# +# @within function asset:artifact/1430.shield_of_fate/trigger/equip/ diff --git a/Asset/data/asset/tags/functions/artifact/damage/from_entity/.json b/Asset/data/asset/tags/functions/artifact/damage/from_entity/.json index f6c32b00d73..77d7ea8c5e5 100644 --- a/Asset/data/asset/tags/functions/artifact/damage/from_entity/.json +++ b/Asset/data/asset/tags/functions/artifact/damage/from_entity/.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1430.shield_of_fate/trigger/1.trigger", "asset:artifact/0554.catastrophe/damage_entity/1.trigger", "asset:artifact/1141.bell_of_courage/trigger/1.trigger", "asset:artifact/1082.cursed_straw_doll/trigger/1.trigger", diff --git a/Asset/data/asset/tags/functions/artifact/dis_equip.json b/Asset/data/asset/tags/functions/artifact/dis_equip.json index ca65e872bfd..eb01c7edc1f 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/1430.shield_of_fate/trigger/dis_equip/", "asset:artifact/1318.blue_bouquet/trigger/dis_equip/", "asset:artifact/1317.oblivious_feather/trigger/dis_equip/", "asset:artifact/0740.flower_of_hazy_moon/dis_equip/", @@ -64,4 +65,4 @@ "asset:artifact/0961.light_charm/trigger/dis_equip/", "asset:artifact/0960.heavy_charm/trigger/dis_equip/" ] -} +} \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/artifact/equip.json b/Asset/data/asset/tags/functions/artifact/equip.json index 7bf0cc89d40..36c1b46bf7b 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/1430.shield_of_fate/trigger/equip/", "asset:artifact/1318.blue_bouquet/trigger/1.trigger", "asset:artifact/1317.oblivious_feather/trigger/1.trigger", "asset:artifact/1140.over_pulse_booster/equip/1.trigger", diff --git a/Asset/data/asset/tags/functions/artifact/give.json b/Asset/data/asset/tags/functions/artifact/give.json index c1b07b3055c..3457016af5f 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/1430.shield_of_fate/give/1.trigger", "asset:artifact/1318.blue_bouquet/give/1.trigger", "asset:artifact/1363.hydra_fang/give/1.trigger", "asset:artifact/1401.yuzu/give/1.trigger", @@ -521,4 +522,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/load.json b/Asset/data/asset/tags/functions/artifact/load.json index ad77fe0f779..aa957cdd0bf 100644 --- a/Asset/data/asset/tags/functions/artifact/load.json +++ b/Asset/data/asset/tags/functions/artifact/load.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1430.shield_of_fate/trigger/0.load", "asset:artifact/1220.sacred_hardener/trigger/0.load", "asset:artifact/1269.apocalypse/trigger/0.load", "asset:artifact/1061.hekireki/trigger/0.load", @@ -54,4 +55,4 @@ "asset:artifact/0270.angel_ray_lv.10/trigger/0.load", "asset:artifact/0431.weather_lock_cane/trigger/0.load" ] -} +} \ 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 d11b2b9656e..556ba22e465 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/1430.shield_of_fate/register", "asset:artifact/1318.blue_bouquet/register", "asset:artifact/1363.hydra_fang/register", "asset:artifact/1401.yuzu/register", @@ -299,4 +300,4 @@ "asset:artifact/1027.fire_of_rebirth/register", "asset:artifact/1111.rod_o_redeem/register" ] -} +} \ No newline at end of file From 8e44114a276851270423ac09d03270131f964e4b Mon Sep 17 00:00:00 2001 From: k22992068-crypto <286215529+k22992068-crypto@users.noreply.github.com> Date: Thu, 21 May 2026 15:03:51 +0900 Subject: [PATCH 2/6] =?UTF-8?q?=F0=9F=A9=B9=20=E4=BD=BF=E7=94=A8=E3=81=97?= =?UTF-8?q?=E3=81=AA=E3=81=840.load=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB?= =?UTF-8?q?=E3=81=AE=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1430.shield_of_fate/trigger/0.load.mcfunction | 9 --------- Asset/data/asset/tags/functions/artifact/load.json | 3 +-- 2 files changed, 1 insertion(+), 11 deletions(-) delete mode 100644 Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/0.load.mcfunction diff --git a/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/0.load.mcfunction b/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/0.load.mcfunction deleted file mode 100644 index 159eb5ae47a..00000000000 --- a/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/0.load.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -#> asset:artifact/1430.shield_of_fate/trigger/0.load -# -# 神器に利用するスコアボード等の初期化処理 -# -# @within tag/function asset:artifact/load - -#> 定義類はここに -# @within function asset:artifact/1430.shield_of_fate/trigger/** - scoreboard objectives add \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/artifact/load.json b/Asset/data/asset/tags/functions/artifact/load.json index aa957cdd0bf..ad77fe0f779 100644 --- a/Asset/data/asset/tags/functions/artifact/load.json +++ b/Asset/data/asset/tags/functions/artifact/load.json @@ -1,6 +1,5 @@ { "values": [ - "asset:artifact/1430.shield_of_fate/trigger/0.load", "asset:artifact/1220.sacred_hardener/trigger/0.load", "asset:artifact/1269.apocalypse/trigger/0.load", "asset:artifact/1061.hekireki/trigger/0.load", @@ -55,4 +54,4 @@ "asset:artifact/0270.angel_ray_lv.10/trigger/0.load", "asset:artifact/0431.weather_lock_cane/trigger/0.load" ] -} \ No newline at end of file +} From 4c76cb1af3d1f75f66bff08455ef502ec5f5a826 Mon Sep 17 00:00:00 2001 From: k22992068-crypto <286215529+k22992068-crypto@users.noreply.github.com> Date: Thu, 21 May 2026 17:47:04 +0900 Subject: [PATCH 3/6] =?UTF-8?q?=E2=9C=A8=20[Artifact=201430]=E9=81=8B?= =?UTF-8?q?=E5=91=BD=E3=81=AE=E7=9B=BE=E3=82=92=E4=BD=9C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1430.shield_of_fate/give/2.give.mcfunction | 8 ++++---- .../trigger/3.main.mcfunction | 9 +++++++-- .../trigger/_index.d.mcfunction | 6 +++++- .../trigger/dis_equip/main.mcfunction | 12 ++++++++++++ .../dis_equip/remove_modifier.mcfunction | 17 +++++++++++++++++ .../trigger/equip/main.mcfunction | 2 ++ .../trigger/equip/trigger.mcfunction | 18 ++++++++++++++++++ 7 files changed, 65 insertions(+), 7 deletions(-) create mode 100644 Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/dis_equip/remove_modifier.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/equip/trigger.mcfunction diff --git a/Asset/data/asset/functions/artifact/1430.shield_of_fate/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1430.shield_of_fate/give/2.give.mcfunction index 43ddc071158..01ab3f20a1c 100644 --- a/Asset/data/asset/functions/artifact/1430.shield_of_fate/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1430.shield_of_fate/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":"#3E53FF"},{"text":"の","color":"#737FFF"},{"text":"盾","color":"#8DB2FC"}]' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text":"test"}'] + data modify storage asset:artifact Lore set value ['[{"text":"受けるダメージが15%軽減されるが"}]','[{"text":"確率で追加ダメージを受ける"}]','[{"text":"肝心な時にあなたを護るのは心。忘れないでよね","color":"gray","italic":true}]'] # 消費アイテム ({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 @@ -43,9 +43,9 @@ # 攻撃に関する情報 -攻撃範囲 (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 120 # MP必要量 (int) (オプション) - # data modify storage asset:artifact MPRequire set value + data modify storage asset:artifact MPRequire set value 0 # MP回復量 (int) # data modify storage asset:artifact MPHealWhenHit set value # 神器のクールダウン (int) (オプション) diff --git a/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/3.main.mcfunction index cef2fd18ddd..46896fe0fde 100644 --- a/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/3.main.mcfunction @@ -4,8 +4,6 @@ # # @within function asset:artifact/1430.shield_of_fate/trigger/2.check_condition -# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う - function asset:artifact/common/use/hotbar #> Private # @private @@ -18,3 +16,10 @@ data modify storage api: Argument.FixedDamage set value true function api:damage/ function api:damage/reset + +# sound + playsound minecraft:entity.evoker.prepare_attack master @a ~ ~ ~ 1.0 2 0.0 + playsound minecraft:entity.item.break master @a ~ ~ ~ 0.5 0.7 0.0 + playsound minecraft:entity.iron_golem.damage master @a ~ ~ ~ 0.5 0.7 0.0 +# particle + particle block redstone_block ~ ~1 ~ 0 0 0 1 20 diff --git a/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/_index.d.mcfunction b/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/_index.d.mcfunction index 7b3f4795d19..c86589a737b 100644 --- a/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/_index.d.mcfunction +++ b/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/_index.d.mcfunction @@ -3,4 +3,8 @@ #> tag # @within function asset:artifact/1430.shield_of_fate/trigger/** - #declare \ No newline at end of file + #declare tag 13Q.Equipped + +#> score +# @within function asset:artifact/1430.shield_of_fate/trigger/** + #declare score_holder $13Q.Damage diff --git a/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/dis_equip/main.mcfunction b/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/dis_equip/main.mcfunction index b7362f08b0e..6b6b9db392e 100644 --- a/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/dis_equip/main.mcfunction +++ b/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/dis_equip/main.mcfunction @@ -4,3 +4,15 @@ # # @within function asset:artifact/1430.shield_of_fate/trigger/dis_equip/ +#> prv +# @private + #declare score_holder $13Q.ItemCount + +# まだ持っているか確認 + execute store result score $13Q.ItemCount Temporary if data storage asset:context New.Items.hotbar[{tag:{TSB:{ID:1430}}}] + +# なければ削除 + execute if score $13Q.ItemCount Temporary matches ..0 run function asset:artifact/1430.shield_of_fate/trigger/dis_equip/remove_modifier + +# リセット + scoreboard players reset $13Q.ItemCount Temporary diff --git a/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/dis_equip/remove_modifier.mcfunction b/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/dis_equip/remove_modifier.mcfunction new file mode 100644 index 00000000000..ae6b3a690e0 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/dis_equip/remove_modifier.mcfunction @@ -0,0 +1,17 @@ +#> asset:artifact/1430.shield_of_fate/trigger/dis_equip/remove_modifier +# +# 装備を外した時のメイン効果 +# +# @within function asset:artifact/1430.shield_of_fate/trigger/dis_equip/main + +# 装備タグを外す + tag @s remove 13Q.Equipped +# MP消費 + data modify storage api: Argument.Fluctuation set value -120 + data modify storage api: Argument.DisableLog set value true + function api:mp/fluctuation + +# sound + playsound minecraft:item.armor.equip_generic player @a ~ ~ ~ 1 0.8 + playsound minecraft:block.copper_trapdoor.open master @a ~ ~ ~ 1.0 0.9 0.0 + playsound minecraft:block.copper_door.open master @a ~ ~ ~ 1.0 0.5 0.0 diff --git a/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/equip/main.mcfunction b/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/equip/main.mcfunction index 5a948fbf5ad..b57dbeb1511 100644 --- a/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/equip/main.mcfunction +++ b/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/equip/main.mcfunction @@ -3,3 +3,5 @@ # 装備を付けた時のメイン処理 # # @within function asset:artifact/1430.shield_of_fate/trigger/equip/ + + execute unless entity @s[tag=13Q.Equipped] run function asset:artifact/1430.shield_of_fate/trigger/equip/trigger diff --git a/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/equip/trigger.mcfunction b/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/equip/trigger.mcfunction new file mode 100644 index 00000000000..c6f3fb6f8d7 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/equip/trigger.mcfunction @@ -0,0 +1,18 @@ +#> asset:artifact/1430.shield_of_fate/trigger/equip/trigger +# +# 装備時の具体的な処理 +# +# @within function asset:artifact/1430.shield_of_fate/trigger/equip/main + +# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う + +# MP消費 + data modify storage api: Argument.Fluctuation set value -120 + data modify storage api: Argument.DisableLog set value true + function api:mp/fluctuation +# 装備タグの付与 + tag @s add 13Q.Equipped +# sound + playsound minecraft:block.copper_trapdoor.open master @a ~ ~ ~ 1.0 0.5 0.0 + + playsound disabled_sounds:item.armor.equip_iron player @a ~ ~ ~ 1 1 From f3ab7f008f4e98f803385bec1f595e279460b68b Mon Sep 17 00:00:00 2001 From: k22992068-crypto <286215529+k22992068-crypto@users.noreply.github.com> Date: Sat, 23 May 2026 01:01:07 +0900 Subject: [PATCH 4/6] =?UTF-8?q?=F0=9F=8E=A8=20[Artifact=201430]=20?= =?UTF-8?q?=E5=8B=87=E6=B0=97=E3=81=AE=E7=9B=BE=E3=81=AE=E3=83=A1=E3=82=A4?= =?UTF-8?q?=E3=83=B3=E3=83=88=E3=83=AA=E3=82=AC=E3=83=BC=E3=81=AE=E5=A4=89?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../give/2.give.mcfunction | 4 +-- .../trigger/1.trigger.mcfunction | 7 +++-- .../trigger/2.check_condition.mcfunction | 9 +++---- .../trigger/3.main.mcfunction | 27 ++++++------------- .../trigger/_index.d.mcfunction | 1 + .../trigger/equip/.mcfunction | 7 ----- .../trigger/equip/main.mcfunction | 7 ----- .../trigger/equip/trigger.mcfunction | 18 ------------- .../artifact/damage/from_entity/.json | 1 - .../asset/tags/functions/artifact/equip.json | 2 +- 10 files changed, 18 insertions(+), 65 deletions(-) delete mode 100644 Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/equip/.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/equip/main.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/equip/trigger.mcfunction diff --git a/Asset/data/asset/functions/artifact/1430.shield_of_fate/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1430.shield_of_fate/give/2.give.mcfunction index 01ab3f20a1c..2f7a054af09 100644 --- a/Asset/data/asset/functions/artifact/1430.shield_of_fate/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1430.shield_of_fate/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '[{"text":"運命","color":"#3E53FF"},{"text":"の","color":"#737FFF"},{"text":"盾","color":"#8DB2FC"}]' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['[{"text":"受けるダメージが15%軽減されるが"}]','[{"text":"確率で追加ダメージを受ける"}]','[{"text":"肝心な時にあなたを護るのは心。忘れないでよね","color":"gray","italic":true}]'] + data modify storage asset:artifact Lore set value ['[{"text":"装備すると耐性が15%上昇するが、"}]','[{"text":"HPが低くなると逆に耐性が下がってしまう"}]','[{"text":"肝心な時にあなたを護るのは心。忘れないでよね","color":"gray","italic":true}]'] # 消費アイテム ({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 @@ -65,7 +65,7 @@ # 破壊時の音を鳴らさないかどうか (boolean) (オプション) # data modify storage asset:artifact DisableBreakSound set value # 装備時ステータス補正 ({Type: string, Amount: double, Operation: string, StackReduction?: double}[]) (オプション) - data modify storage asset:artifact Equipment.Modifiers append value {Type:"defense/base",Amount:0.15d,Operation:"multiply_base"} + # data modify storage asset:artifact Equipment.Modifiers append value {Type:"defense/base",Amount:0.15d,Operation:"multiply_base"} # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora","Rumor"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) diff --git a/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/1.trigger.mcfunction index 04844e10305..ef30a51ef16 100644 --- a/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/1.trigger.mcfunction +++ b/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/1.trigger.mcfunction @@ -1,8 +1,7 @@ #> asset:artifact/1430.shield_of_fate/trigger/1.trigger # -# 指定したイベントタイミングで実行されるfunction +# 装備を装備時に装備した部位にのみのidが入った状態でトリガーされる # -# @within tag/function asset:artifact/** +# @within tag/function asset:artifact/equip -# storage asset:idのhotbarに装備している神器のIDが入っているので比較し、~/2.check_condition.mcfunctionを実行する - execute if data storage asset:context id{hotbar:[1430]} run function asset:artifact/1430.shield_of_fate/trigger/2.check_condition +execute if data storage asset:context id{hotbar:[1430]} run function asset:artifact/1430.shield_of_fate/trigger/2.check_condition diff --git a/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/2.check_condition.mcfunction index 090a721c743..392f4eff07f 100644 --- a/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/2.check_condition.mcfunction +++ b/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/2.check_condition.mcfunction @@ -1,16 +1,13 @@ #> asset:artifact/1430.shield_of_fate/trigger/2.check_condition # -# 神器の発動条件をチェックします +# 装備を付けた時のメイン処理 # # @within function asset:artifact/1430.shield_of_fate/trigger/1.trigger - # ID指定する data modify storage asset:artifact TargetID set value 1430 # 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く function asset:artifact/common/check_condition/hotbar -# 確率10%を引けなかったらCanUsedタグを削除 - execute if entity @s[tag=CanUsed] unless predicate lib:random_pass_per/10 run tag @s remove CanUsed -# 既にダメージを受けている場合はタグを削除 - execute if data storage asset:context Damage{IsVanilla:1b} run tag @s remove CanUsed +# 他にアイテム等確認する場合はここに書く + execute if entity @s[tag=13Q.Equipped] run tag @s remove CanUsed # CanUsedタグをチェックして3.main.mcfunctionを実行する execute if entity @s[tag=CanUsed] run function asset:artifact/1430.shield_of_fate/trigger/3.main diff --git a/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/3.main.mcfunction index 46896fe0fde..86414e34297 100644 --- a/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/3.main.mcfunction @@ -1,25 +1,14 @@ #> asset:artifact/1430.shield_of_fate/trigger/3.main # -# 神器のメイン処理部 +# 装備時の具体的な処理 # # @within function asset:artifact/1430.shield_of_fate/trigger/2.check_condition - -#> Private -# @private - #declare score_holder $13Q.Damage - -# 受けたダメージを0.5倍して自身にその数値分ダメージを与える - execute store result storage api: Argument.Damage double 0.005 run data get storage asset:context Damage.Amount 100 - data modify storage api: Argument.AttackType set from storage asset:context Damage.AttackType - data modify storage api: Argument.ElementType set from storage asset:context Damage.ElementType - data modify storage api: Argument.FixedDamage set value true - function api:damage/ - function api:damage/reset - +# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う + function asset:artifact/common/use/hotbar +# 装備タグの付与 + tag @s add 13Q.Equipped # sound - playsound minecraft:entity.evoker.prepare_attack master @a ~ ~ ~ 1.0 2 0.0 - playsound minecraft:entity.item.break master @a ~ ~ ~ 0.5 0.7 0.0 - playsound minecraft:entity.iron_golem.damage master @a ~ ~ ~ 0.5 0.7 0.0 -# particle - particle block redstone_block ~ ~1 ~ 0 0 0 1 20 + playsound minecraft:block.copper_trapdoor.open master @a ~ ~ ~ 1.0 0.5 0.0 + + playsound disabled_sounds:item.armor.equip_iron player @a ~ ~ ~ 1 1 diff --git a/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/_index.d.mcfunction b/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/_index.d.mcfunction index c86589a737b..6fa6f437560 100644 --- a/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/_index.d.mcfunction +++ b/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/_index.d.mcfunction @@ -8,3 +8,4 @@ #> score # @within function asset:artifact/1430.shield_of_fate/trigger/** #declare score_holder $13Q.Damage + #declare score_holder $13Q.HealthPer diff --git a/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/equip/.mcfunction b/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/equip/.mcfunction deleted file mode 100644 index 3f67752937c..00000000000 --- a/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/equip/.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> asset:artifact/1430.shield_of_fate/trigger/equip/ -# -# 装備を装備時に装備した部位にのみのidが入った状態でトリガーされる -# -# @within tag/function asset:artifact/equip - -execute if data storage asset:context id{hotbar:[1430]} run function asset:artifact/1430.shield_of_fate/trigger/equip/main diff --git a/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/equip/main.mcfunction b/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/equip/main.mcfunction deleted file mode 100644 index b57dbeb1511..00000000000 --- a/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/equip/main.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> asset:artifact/1430.shield_of_fate/trigger/equip/main -# -# 装備を付けた時のメイン処理 -# -# @within function asset:artifact/1430.shield_of_fate/trigger/equip/ - - execute unless entity @s[tag=13Q.Equipped] run function asset:artifact/1430.shield_of_fate/trigger/equip/trigger diff --git a/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/equip/trigger.mcfunction b/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/equip/trigger.mcfunction deleted file mode 100644 index c6f3fb6f8d7..00000000000 --- a/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/equip/trigger.mcfunction +++ /dev/null @@ -1,18 +0,0 @@ -#> asset:artifact/1430.shield_of_fate/trigger/equip/trigger -# -# 装備時の具体的な処理 -# -# @within function asset:artifact/1430.shield_of_fate/trigger/equip/main - -# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う - -# MP消費 - data modify storage api: Argument.Fluctuation set value -120 - data modify storage api: Argument.DisableLog set value true - function api:mp/fluctuation -# 装備タグの付与 - tag @s add 13Q.Equipped -# sound - playsound minecraft:block.copper_trapdoor.open master @a ~ ~ ~ 1.0 0.5 0.0 - - playsound disabled_sounds:item.armor.equip_iron player @a ~ ~ ~ 1 1 diff --git a/Asset/data/asset/tags/functions/artifact/damage/from_entity/.json b/Asset/data/asset/tags/functions/artifact/damage/from_entity/.json index 77d7ea8c5e5..f6c32b00d73 100644 --- a/Asset/data/asset/tags/functions/artifact/damage/from_entity/.json +++ b/Asset/data/asset/tags/functions/artifact/damage/from_entity/.json @@ -1,6 +1,5 @@ { "values": [ - "asset:artifact/1430.shield_of_fate/trigger/1.trigger", "asset:artifact/0554.catastrophe/damage_entity/1.trigger", "asset:artifact/1141.bell_of_courage/trigger/1.trigger", "asset:artifact/1082.cursed_straw_doll/trigger/1.trigger", diff --git a/Asset/data/asset/tags/functions/artifact/equip.json b/Asset/data/asset/tags/functions/artifact/equip.json index 36c1b46bf7b..2532393f622 100644 --- a/Asset/data/asset/tags/functions/artifact/equip.json +++ b/Asset/data/asset/tags/functions/artifact/equip.json @@ -1,6 +1,6 @@ { "values": [ - "asset:artifact/1430.shield_of_fate/trigger/equip/", + "asset:artifact/1430.shield_of_fate/trigger/1.trigger", "asset:artifact/1318.blue_bouquet/trigger/1.trigger", "asset:artifact/1317.oblivious_feather/trigger/1.trigger", "asset:artifact/1140.over_pulse_booster/equip/1.trigger", From 9e3edccff35d6f95f031d0fffe163721a283285c Mon Sep 17 00:00:00 2001 From: k22992068-crypto <286215529+k22992068-crypto@users.noreply.github.com> Date: Sat, 23 May 2026 17:50:20 +0900 Subject: [PATCH 5/6] =?UTF-8?q?=E2=9C=A8=20[Artifact=201430]=20=E5=8B=87?= =?UTF-8?q?=E6=B0=97=E3=81=AE=E7=9B=BE=E3=81=AE=E8=A3=85=E5=82=99=E6=99=82?= =?UTF-8?q?=E3=82=A8=E3=83=95=E3=82=A7=E3=82=AF=E3=83=88=E3=81=AE=E4=BD=9C?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trigger/3.main.mcfunction | 5 +++ .../dis_equip/remove_modifier.mcfunction | 4 ++ .../_/end.mcfunction | 7 ++++ .../_/given.mcfunction | 7 ++++ .../_/register.mcfunction | 7 ++++ .../_/remove.mcfunction | 7 ++++ .../_index.d.mcfunction | 6 +++ .../end/.mcfunction | 8 ++++ .../given/.mcfunction | 8 ++++ .../modifier/add.mcfunction | 11 ++++++ .../modifier/remove.mcfunction | 11 ++++++ .../register.mcfunction | 39 +++++++++++++++++++ .../remove/.mcfunction | 8 ++++ .../data/asset/tags/functions/effect/end.json | 3 +- .../asset/tags/functions/effect/given.json | 3 +- .../asset/tags/functions/effect/register.json | 1 + .../asset/tags/functions/effect/remove.json | 3 +- .../asset/tags/functions/effect/tick.json | 2 +- 18 files changed, 136 insertions(+), 4 deletions(-) create mode 100644 Asset/data/asset/functions/effect/354.protecction_of_courage/_/end.mcfunction create mode 100644 Asset/data/asset/functions/effect/354.protecction_of_courage/_/given.mcfunction create mode 100644 Asset/data/asset/functions/effect/354.protecction_of_courage/_/register.mcfunction create mode 100644 Asset/data/asset/functions/effect/354.protecction_of_courage/_/remove.mcfunction create mode 100644 Asset/data/asset/functions/effect/354.protecction_of_courage/_index.d.mcfunction create mode 100644 Asset/data/asset/functions/effect/354.protecction_of_courage/end/.mcfunction create mode 100644 Asset/data/asset/functions/effect/354.protecction_of_courage/given/.mcfunction create mode 100644 Asset/data/asset/functions/effect/354.protecction_of_courage/modifier/add.mcfunction create mode 100644 Asset/data/asset/functions/effect/354.protecction_of_courage/modifier/remove.mcfunction create mode 100644 Asset/data/asset/functions/effect/354.protecction_of_courage/register.mcfunction create mode 100644 Asset/data/asset/functions/effect/354.protecction_of_courage/remove/.mcfunction diff --git a/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/3.main.mcfunction index 86414e34297..5b2a75819d9 100644 --- a/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/3.main.mcfunction @@ -8,6 +8,11 @@ function asset:artifact/common/use/hotbar # 装備タグの付与 tag @s add 13Q.Equipped + +#>Effect付与 + data modify storage api: Argument.ID set value 354 + execute as @s run function api:entity/mob/effect/give + # sound playsound minecraft:block.copper_trapdoor.open master @a ~ ~ ~ 1.0 0.5 0.0 diff --git a/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/dis_equip/remove_modifier.mcfunction b/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/dis_equip/remove_modifier.mcfunction index ae6b3a690e0..2befbc4173c 100644 --- a/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/dis_equip/remove_modifier.mcfunction +++ b/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/dis_equip/remove_modifier.mcfunction @@ -11,6 +11,10 @@ data modify storage api: Argument.DisableLog set value true function api:mp/fluctuation +# 削除 (IDから) + data modify storage api: Argument.ID set value 354 + execute as @s run function api:entity/mob/effect/remove/from_id + # sound playsound minecraft:item.armor.equip_generic player @a ~ ~ ~ 1 0.8 playsound minecraft:block.copper_trapdoor.open master @a ~ ~ ~ 1.0 0.9 0.0 diff --git a/Asset/data/asset/functions/effect/354.protecction_of_courage/_/end.mcfunction b/Asset/data/asset/functions/effect/354.protecction_of_courage/_/end.mcfunction new file mode 100644 index 00000000000..ab46a7aad06 --- /dev/null +++ b/Asset/data/asset/functions/effect/354.protecction_of_courage/_/end.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/354.protecction_of_courage/_/end +# +# Effectの効果の終了時に実行されるfunction +# +# @within tag/function asset:effect/end + +execute if data storage asset:context {id:354} run function asset:effect/354.protecction_of_courage/end/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/354.protecction_of_courage/_/given.mcfunction b/Asset/data/asset/functions/effect/354.protecction_of_courage/_/given.mcfunction new file mode 100644 index 00000000000..cbfec5c0c76 --- /dev/null +++ b/Asset/data/asset/functions/effect/354.protecction_of_courage/_/given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/354.protecction_of_courage/_/given +# +# Effectが付与された時に実行されるfunction +# +# @within tag/function asset:effect/given + +execute if data storage asset:context {id:354} run function asset:effect/354.protecction_of_courage/given/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/354.protecction_of_courage/_/register.mcfunction b/Asset/data/asset/functions/effect/354.protecction_of_courage/_/register.mcfunction new file mode 100644 index 00000000000..16b4d1e4474 --- /dev/null +++ b/Asset/data/asset/functions/effect/354.protecction_of_courage/_/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/354.protecction_of_courage/_/register +# +# +# +# @within tag/function asset:effect/register + +execute if data storage asset:context {id:354} run function asset:effect/354.protecction_of_courage/register \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/354.protecction_of_courage/_/remove.mcfunction b/Asset/data/asset/functions/effect/354.protecction_of_courage/_/remove.mcfunction new file mode 100644 index 00000000000..c34d643e58f --- /dev/null +++ b/Asset/data/asset/functions/effect/354.protecction_of_courage/_/remove.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/354.protecction_of_courage/_/remove +# +# Effectが神器や牛乳によって削除された時に実行されるfunction +# +# @within tag/function asset:effect/remove + +execute if data storage asset:context {id:354} run function asset:effect/354.protecction_of_courage/remove/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/354.protecction_of_courage/_index.d.mcfunction b/Asset/data/asset/functions/effect/354.protecction_of_courage/_index.d.mcfunction new file mode 100644 index 00000000000..f22af7b7749 --- /dev/null +++ b/Asset/data/asset/functions/effect/354.protecction_of_courage/_index.d.mcfunction @@ -0,0 +1,6 @@ +#> asset:effect/354.protecction_of_courage/_index.d +# @private + +#> 354.protecction_of_courage +# @within function asset:effect/354.protecction_of_courage/** + #declare \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/354.protecction_of_courage/end/.mcfunction b/Asset/data/asset/functions/effect/354.protecction_of_courage/end/.mcfunction new file mode 100644 index 00000000000..b4eb7d90b3c --- /dev/null +++ b/Asset/data/asset/functions/effect/354.protecction_of_courage/end/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/354.protecction_of_courage/end/ +# +# Effectの効果が切れた時の処理 +# +# @within function asset:effect/354.protecction_of_courage/_/end + +# 補正の削除 + function asset:effect/354.protecction_of_courage/modifier/remove diff --git a/Asset/data/asset/functions/effect/354.protecction_of_courage/given/.mcfunction b/Asset/data/asset/functions/effect/354.protecction_of_courage/given/.mcfunction new file mode 100644 index 00000000000..d462cca6000 --- /dev/null +++ b/Asset/data/asset/functions/effect/354.protecction_of_courage/given/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/354.protecction_of_courage/given/ +# +# Effectが付与された時の処理 +# +# @within function asset:effect/354.protecction_of_courage/_/given + +# 補正を追加 + function asset:effect/354.protecction_of_courage/modifier/add diff --git a/Asset/data/asset/functions/effect/354.protecction_of_courage/modifier/add.mcfunction b/Asset/data/asset/functions/effect/354.protecction_of_courage/modifier/add.mcfunction new file mode 100644 index 00000000000..8b224021fc7 --- /dev/null +++ b/Asset/data/asset/functions/effect/354.protecction_of_courage/modifier/add.mcfunction @@ -0,0 +1,11 @@ +#> asset:effect/354.protecction_of_courage/modifier/add +# +# 効果の付与 +# +# @within function asset:effect/354.protecction_of_courage/given/ + +# 補正を付与する + data modify storage api: Argument.UUID set value [I;1,3,354,0] + data modify storage api: Argument.Amount set value 0.15 + data modify storage api: Argument.Operation set value "multiply_base" + function api:modifier/defense/base/add diff --git a/Asset/data/asset/functions/effect/354.protecction_of_courage/modifier/remove.mcfunction b/Asset/data/asset/functions/effect/354.protecction_of_courage/modifier/remove.mcfunction new file mode 100644 index 00000000000..f059afb33b5 --- /dev/null +++ b/Asset/data/asset/functions/effect/354.protecction_of_courage/modifier/remove.mcfunction @@ -0,0 +1,11 @@ +#> asset:effect/354.protecction_of_courage/modifier/remove +# +# 補正の削除 +# +# @within function +# asset:effect/354.protecction_of_courage/remove/ +# asset:effect/354.protecction_of_courage/end/ + +# 補正を削除する + data modify storage api: Argument.UUID set value [I;1,3,354,0] + function api:modifier/defense/base/remove diff --git a/Asset/data/asset/functions/effect/354.protecction_of_courage/register.mcfunction b/Asset/data/asset/functions/effect/354.protecction_of_courage/register.mcfunction new file mode 100644 index 00000000000..7bdcc02e8ee --- /dev/null +++ b/Asset/data/asset/functions/effect/354.protecction_of_courage/register.mcfunction @@ -0,0 +1,39 @@ +#> asset:effect/354.protecction_of_courage/register +# +# Effectのデータを指定 +# +# @within function asset:effect/354.protecction_of_courage/_/register + +# ExtendsSafe (boolean) (default = false) + # data modify storage asset:effect ExtendsSafe set value true +# ID (int) + data modify storage asset:effect ID set value 354 +# 名前 (TextComponentString) + data modify storage asset:effect Name set value '{"text":"勇気の存護"}' +# 説明文 (TextComponentString[]) + data modify storage asset:effect Description set value ['{"text":盾に守られ耐性+15%}'] +# 効果時間 (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 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 false + +# フィールド + # data modify storage asset:effect Field set value {} diff --git a/Asset/data/asset/functions/effect/354.protecction_of_courage/remove/.mcfunction b/Asset/data/asset/functions/effect/354.protecction_of_courage/remove/.mcfunction new file mode 100644 index 00000000000..dcdd671b884 --- /dev/null +++ b/Asset/data/asset/functions/effect/354.protecction_of_courage/remove/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/354.protecction_of_courage/remove/ +# +# Effectが削除された時の処理 +# +# @within function asset:effect/354.protecction_of_courage/_/remove + +# 補正の削除 + function asset:effect/354.protecction_of_courage/modifier/remove diff --git a/Asset/data/asset/tags/functions/effect/end.json b/Asset/data/asset/tags/functions/effect/end.json index 6ad677e0ec8..561b1639fc0 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/354.protecction_of_courage/_/end", "asset:effect/0350.yuzu/_/end", "asset:effect/0025.levitation/_/end", "asset:effect/0621.loyalty_shield/_/end", @@ -103,4 +104,4 @@ "asset:effect/0007.defense_base_debuff/_/end", "asset:effect/0258.spirit_melody/_/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 cbd3fa33974..1223dff8c85 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/354.protecction_of_courage/_/given", "asset:effect/0350.yuzu/_/given", "asset:effect/0315.charge_of_aurora_scythe/_/given", "asset:effect/0621.loyalty_shield/_/given", @@ -97,4 +98,4 @@ "asset:effect/0007.defense_base_debuff/_/given", "asset:effect/0258.spirit_melody/_/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 ae199961e9f..a59c106085a 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/354.protecction_of_courage/_/register", "asset:effect/0350.yuzu/_/register", "asset:effect/0025.levitation/_/register", "asset:effect/0247.great_demon_armor/_/register", diff --git a/Asset/data/asset/tags/functions/effect/remove.json b/Asset/data/asset/tags/functions/effect/remove.json index 2fdc0d79ea1..aa27695706d 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/354.protecction_of_courage/_/remove", "asset:effect/0350.yuzu/_/remove", "asset:effect/0025.levitation/_/remove", "asset:effect/0245.flame_hunter_attire/_/remove", @@ -111,4 +112,4 @@ "asset:effect/0007.defense_base_debuff/_/remove", "asset:effect/0258.spirit_melody/_/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 ba1e207a78d..b972234f21f 100644 --- a/Asset/data/asset/tags/functions/effect/tick.json +++ b/Asset/data/asset/tags/functions/effect/tick.json @@ -98,4 +98,4 @@ "asset:effect/0279.poison_of_vinderre/_/tick", "asset:effect/0258.spirit_melody/_/tick" ] -} \ No newline at end of file +} From 619e4d35331a0c844ecda0cf5d4f027c08c66eb6 Mon Sep 17 00:00:00 2001 From: k22992068-crypto <286215529+k22992068-crypto@users.noreply.github.com> Date: Sun, 24 May 2026 16:35:22 +0900 Subject: [PATCH 6/6] =?UTF-8?q?=E2=9C=A8=20[Artifact=201430]=20=E5=8B=87?= =?UTF-8?q?=E6=B0=97=E3=81=AE=E7=9B=BE=E3=81=AE=E3=83=87=E3=83=90=E3=83=95?= =?UTF-8?q?=E3=81=AE=E4=BD=9C=E6=88=90&=E8=A3=85=E5=82=99=E5=8A=B9?= =?UTF-8?q?=E6=9E=9C=E3=81=AE=E5=AE=9F=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../give/2.give.mcfunction | 4 +- .../tick/1.trigger.mcfunction | 7 ++++ .../tick/2.check_condition.mcfunction | 23 +++++++++++ .../1430.shield_of_fate/tick/buff.mcfunction | 15 +++++++ .../tick/check_buff.mcfunction | 12 ++++++ .../tick/check_debuff.mcfunction | 12 ++++++ .../tick/debuff.mcfunction | 15 +++++++ .../trigger/0.load.mcfunction | 9 +++++ .../trigger/_index.d.mcfunction | 2 + .../dis_equip/remove_modifier.mcfunction | 2 + .../_/end.mcfunction | 4 +- .../_/given.mcfunction | 4 +- .../_/register.mcfunction | 4 +- .../_/remove.mcfunction | 4 +- .../_index.d.mcfunction | 6 +++ .../end/.mcfunction | 8 ++++ .../given/.mcfunction | 8 ++++ .../modifier/add.mcfunction | 4 +- .../modifier/remove.mcfunction | 6 +-- .../register.mcfunction | 8 ++-- .../remove/.mcfunction | 8 ++++ .../effect/0355.heart_gap/_/end.mcfunction | 7 ++++ .../effect/0355.heart_gap/_/given.mcfunction | 7 ++++ .../0355.heart_gap/_/register.mcfunction | 7 ++++ .../effect/0355.heart_gap/_/remove.mcfunction | 7 ++++ .../effect/0355.heart_gap/_/tick.mcfunction | 7 ++++ .../effect/0355.heart_gap/end/.mcfunction | 8 ++++ .../effect/0355.heart_gap/given/.mcfunction | 8 ++++ .../0355.heart_gap/modifier/add.mcfunction | 11 ++++++ .../0355.heart_gap/modifier/remove.mcfunction | 11 ++++++ .../effect/0355.heart_gap/register.mcfunction | 39 +++++++++++++++++++ .../effect/0355.heart_gap/remove/.mcfunction | 8 ++++ .../effect/0355.heart_gap/tick/.mcfunction | 9 +++++ .../_index.d.mcfunction | 6 --- .../end/.mcfunction | 8 ---- .../given/.mcfunction | 8 ---- .../remove/.mcfunction | 8 ---- .../asset/tags/functions/artifact/load.json | 1 + .../asset/tags/functions/artifact/tick.json | 1 + .../data/asset/tags/functions/effect/end.json | 5 ++- .../asset/tags/functions/effect/given.json | 5 ++- .../asset/tags/functions/effect/register.json | 5 ++- .../asset/tags/functions/effect/remove.json | 5 ++- .../asset/tags/functions/effect/tick.json | 1 + 44 files changed, 290 insertions(+), 57 deletions(-) create mode 100644 Asset/data/asset/functions/artifact/1430.shield_of_fate/tick/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1430.shield_of_fate/tick/2.check_condition.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1430.shield_of_fate/tick/buff.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1430.shield_of_fate/tick/check_buff.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1430.shield_of_fate/tick/check_debuff.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1430.shield_of_fate/tick/debuff.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/0.load.mcfunction rename Asset/data/asset/functions/effect/{354.protecction_of_courage => 0354.protecction_of_courage}/_/end.mcfunction (64%) rename Asset/data/asset/functions/effect/{354.protecction_of_courage => 0354.protecction_of_courage}/_/given.mcfunction (63%) rename Asset/data/asset/functions/effect/{354.protecction_of_courage => 0354.protecction_of_courage}/_/register.mcfunction (53%) rename Asset/data/asset/functions/effect/{354.protecction_of_courage => 0354.protecction_of_courage}/_/remove.mcfunction (66%) create mode 100644 Asset/data/asset/functions/effect/0354.protecction_of_courage/_index.d.mcfunction create mode 100644 Asset/data/asset/functions/effect/0354.protecction_of_courage/end/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0354.protecction_of_courage/given/.mcfunction rename Asset/data/asset/functions/effect/{354.protecction_of_courage => 0354.protecction_of_courage}/modifier/add.mcfunction (70%) rename Asset/data/asset/functions/effect/{354.protecction_of_courage => 0354.protecction_of_courage}/modifier/remove.mcfunction (52%) rename Asset/data/asset/functions/effect/{354.protecction_of_courage => 0354.protecction_of_courage}/register.mcfunction (87%) create mode 100644 Asset/data/asset/functions/effect/0354.protecction_of_courage/remove/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0355.heart_gap/_/end.mcfunction create mode 100644 Asset/data/asset/functions/effect/0355.heart_gap/_/given.mcfunction create mode 100644 Asset/data/asset/functions/effect/0355.heart_gap/_/register.mcfunction create mode 100644 Asset/data/asset/functions/effect/0355.heart_gap/_/remove.mcfunction create mode 100644 Asset/data/asset/functions/effect/0355.heart_gap/_/tick.mcfunction create mode 100644 Asset/data/asset/functions/effect/0355.heart_gap/end/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0355.heart_gap/given/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0355.heart_gap/modifier/add.mcfunction create mode 100644 Asset/data/asset/functions/effect/0355.heart_gap/modifier/remove.mcfunction create mode 100644 Asset/data/asset/functions/effect/0355.heart_gap/register.mcfunction create mode 100644 Asset/data/asset/functions/effect/0355.heart_gap/remove/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0355.heart_gap/tick/.mcfunction delete mode 100644 Asset/data/asset/functions/effect/354.protecction_of_courage/_index.d.mcfunction delete mode 100644 Asset/data/asset/functions/effect/354.protecction_of_courage/end/.mcfunction delete mode 100644 Asset/data/asset/functions/effect/354.protecction_of_courage/given/.mcfunction delete mode 100644 Asset/data/asset/functions/effect/354.protecction_of_courage/remove/.mcfunction diff --git a/Asset/data/asset/functions/artifact/1430.shield_of_fate/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1430.shield_of_fate/give/2.give.mcfunction index 2f7a054af09..dd3c09f1bcb 100644 --- a/Asset/data/asset/functions/artifact/1430.shield_of_fate/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1430.shield_of_fate/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '[{"text":"運命","color":"#3E53FF"},{"text":"の","color":"#737FFF"},{"text":"盾","color":"#8DB2FC"}]' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['[{"text":"装備すると耐性が15%上昇するが、"}]','[{"text":"HPが低くなると逆に耐性が下がってしまう"}]','[{"text":"肝心な時にあなたを護るのは心。忘れないでよね","color":"gray","italic":true}]'] + data modify storage asset:artifact Lore set value ['[{"text":"装備すると耐性が15%上昇するが、"}]','[{"text":"体力が30%以下になると逆に耐性が15%低下する"}]','[{"text":"肝心な時にあなたを護るのは心。忘れないでよね","color":"gray","italic":true}]'] # 消費アイテム ({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 "onDamageFromEntity" + data modify storage asset:artifact Trigger set value "passive" # 効果が重複可能か否か (boolean) (オプション) # data modify storage asset:artifact EnableDuplication set value # 神器の発動条件 (TextComponentString) (オプション) diff --git a/Asset/data/asset/functions/artifact/1430.shield_of_fate/tick/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1430.shield_of_fate/tick/1.trigger.mcfunction new file mode 100644 index 00000000000..ca92165953d --- /dev/null +++ b/Asset/data/asset/functions/artifact/1430.shield_of_fate/tick/1.trigger.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1430.shield_of_fate/tick/1.trigger +# +# 装備を装備時に装備した部位にのみのidが入った状態でトリガーされる +# +# @within tag/function asset:artifact/** + +execute if data storage asset:context id{hotbar:[1430]} run function asset:artifact/1430.shield_of_fate/tick/2.check_condition diff --git a/Asset/data/asset/functions/artifact/1430.shield_of_fate/tick/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1430.shield_of_fate/tick/2.check_condition.mcfunction new file mode 100644 index 00000000000..4658d8cd4dc --- /dev/null +++ b/Asset/data/asset/functions/artifact/1430.shield_of_fate/tick/2.check_condition.mcfunction @@ -0,0 +1,23 @@ +#> asset:artifact/1430.shield_of_fate/tick/2.check_condition +# +# 神器の発動条件のチェック +# +# @within function asset:artifact/1430.shield_of_fate/tick/1.trigger + +#> Val +# @private + #declare score_holder $13Q.HealthPer + +# 現在体力割合を取得する + function api:entity/player/get_health_per + execute store result score $13Q.HealthPer Temporary run data get storage api: Return.HealthPer 1000 + +# 体力が30%以下かつ前tickの体力が30％以下じゃない時 + execute if score $13Q.HealthPer Temporary matches ..300 unless score @s 13Q.HealthHolder matches ..300 run function asset:artifact/1430.shield_of_fate/tick/check_buff +# 体力が30%以下でないかつ前tickの体力が30％以下の時 + execute unless score $13Q.HealthPer Temporary matches ..300 if score @s 13Q.HealthHolder matches ..300 run function asset:artifact/1430.shield_of_fate/tick/check_debuff + +# 体力割合を保存 + scoreboard players operation @s 13Q.HealthHolder = $13Q.HealthPer Temporary +# リセット + scoreboard players reset $13Q.HealthPer Temporary diff --git a/Asset/data/asset/functions/artifact/1430.shield_of_fate/tick/buff.mcfunction b/Asset/data/asset/functions/artifact/1430.shield_of_fate/tick/buff.mcfunction new file mode 100644 index 00000000000..be53b45d159 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1430.shield_of_fate/tick/buff.mcfunction @@ -0,0 +1,15 @@ +#> asset:artifact/1430.shield_of_fate/tick/buff +# +# バフの付与を行う +# +# @within function asset:artifact/1430.shield_of_fate/tick/check_debuff + +#>デバフ付与 + data modify storage api: Argument.ID set value 354 + execute as @s run function api:entity/mob/effect/give + function api:entity/mob/effect/reset + +#>バフ削除 + data modify storage api: Argument.ID set value 355 + execute as @s run function api:entity/mob/effect/remove/from_id + function api:entity/mob/effect/reset diff --git a/Asset/data/asset/functions/artifact/1430.shield_of_fate/tick/check_buff.mcfunction b/Asset/data/asset/functions/artifact/1430.shield_of_fate/tick/check_buff.mcfunction new file mode 100644 index 00000000000..a2807b0742b --- /dev/null +++ b/Asset/data/asset/functions/artifact/1430.shield_of_fate/tick/check_buff.mcfunction @@ -0,0 +1,12 @@ +#> asset:artifact/1430.shield_of_fate/tick/check_buff +# +# バフが付与されていれば削除しデバフ付与の処理を行う +# +# @within function asset:artifact/1430.shield_of_fate/tick/2.check_condition + +# 耐性エフェクト(ID 354)を検索する + data modify storage api: Argument.ID set value 354 + function api:entity/mob/effect/get/from_id + +# 付与されていたら実行 + execute if data storage api: Return.Effect run function asset:artifact/1430.shield_of_fate/tick/debuff diff --git a/Asset/data/asset/functions/artifact/1430.shield_of_fate/tick/check_debuff.mcfunction b/Asset/data/asset/functions/artifact/1430.shield_of_fate/tick/check_debuff.mcfunction new file mode 100644 index 00000000000..da2d5449d1a --- /dev/null +++ b/Asset/data/asset/functions/artifact/1430.shield_of_fate/tick/check_debuff.mcfunction @@ -0,0 +1,12 @@ +#> asset:artifact/1430.shield_of_fate/tick/check_debuff +# +# デバフが付与されていれば削除しバフ付与の処理を行う +# +# @within function asset:artifact/1430.shield_of_fate/tick/2.check_condition + +# 耐性エフェクト(ID 354)を検索する + data modify storage api: Argument.ID set value 355 + function api:entity/mob/effect/get/from_id + +# 付与されていたら実行 + execute if data storage api: Return.Effect run function asset:artifact/1430.shield_of_fate/tick/buff diff --git a/Asset/data/asset/functions/artifact/1430.shield_of_fate/tick/debuff.mcfunction b/Asset/data/asset/functions/artifact/1430.shield_of_fate/tick/debuff.mcfunction new file mode 100644 index 00000000000..7379107e5ca --- /dev/null +++ b/Asset/data/asset/functions/artifact/1430.shield_of_fate/tick/debuff.mcfunction @@ -0,0 +1,15 @@ +#> asset:artifact/1430.shield_of_fate/tick/debuff +# +# デバフの付与を行う +# +# @within function asset:artifact/1430.shield_of_fate/tick/check_buff + +#>デバフ付与 + data modify storage api: Argument.ID set value 355 + function api:entity/mob/effect/give + function api:entity/mob/effect/reset + +#>バフ削除 + data modify storage api: Argument.ID set value 354 + function api:entity/mob/effect/remove/from_id + function api:entity/mob/effect/reset diff --git a/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/0.load.mcfunction b/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/0.load.mcfunction new file mode 100644 index 00000000000..aea19ec0d12 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/0.load.mcfunction @@ -0,0 +1,9 @@ +#> asset:artifact/1430.shield_of_fate/trigger/0.load +# +# +# +# @within tag/function asset:artifact/load + +#> 定義類はここに +# @within function asset:artifact/1430.shield_of_fate/** + scoreboard objectives add 13Q.HealthHolder dummy diff --git a/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/_index.d.mcfunction b/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/_index.d.mcfunction index 6fa6f437560..44bfa0f1e2d 100644 --- a/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/_index.d.mcfunction +++ b/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/_index.d.mcfunction @@ -8,4 +8,6 @@ #> score # @within function asset:artifact/1430.shield_of_fate/trigger/** #declare score_holder $13Q.Damage +#> score +# @within function asset:artifact/1430.shield_of_fate/tick/** #declare score_holder $13Q.HealthPer diff --git a/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/dis_equip/remove_modifier.mcfunction b/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/dis_equip/remove_modifier.mcfunction index 2befbc4173c..e7172853fe6 100644 --- a/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/dis_equip/remove_modifier.mcfunction +++ b/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/dis_equip/remove_modifier.mcfunction @@ -14,6 +14,8 @@ # 削除 (IDから) data modify storage api: Argument.ID set value 354 execute as @s run function api:entity/mob/effect/remove/from_id + data modify storage api: Argument.ID set value 355 + execute as @s run function api:entity/mob/effect/remove/from_id # sound playsound minecraft:item.armor.equip_generic player @a ~ ~ ~ 1 0.8 diff --git a/Asset/data/asset/functions/effect/354.protecction_of_courage/_/end.mcfunction b/Asset/data/asset/functions/effect/0354.protecction_of_courage/_/end.mcfunction similarity index 64% rename from Asset/data/asset/functions/effect/354.protecction_of_courage/_/end.mcfunction rename to Asset/data/asset/functions/effect/0354.protecction_of_courage/_/end.mcfunction index ab46a7aad06..1db8f04204f 100644 --- a/Asset/data/asset/functions/effect/354.protecction_of_courage/_/end.mcfunction +++ b/Asset/data/asset/functions/effect/0354.protecction_of_courage/_/end.mcfunction @@ -1,7 +1,7 @@ -#> asset:effect/354.protecction_of_courage/_/end +#> asset:effect/0354.protecction_of_courage/_/end # # Effectの効果の終了時に実行されるfunction # # @within tag/function asset:effect/end -execute if data storage asset:context {id:354} run function asset:effect/354.protecction_of_courage/end/ \ No newline at end of file +execute if data storage asset:context {id:354} run function asset:effect/0354.protecction_of_courage/end/ diff --git a/Asset/data/asset/functions/effect/354.protecction_of_courage/_/given.mcfunction b/Asset/data/asset/functions/effect/0354.protecction_of_courage/_/given.mcfunction similarity index 63% rename from Asset/data/asset/functions/effect/354.protecction_of_courage/_/given.mcfunction rename to Asset/data/asset/functions/effect/0354.protecction_of_courage/_/given.mcfunction index cbfec5c0c76..a567c5e809d 100644 --- a/Asset/data/asset/functions/effect/354.protecction_of_courage/_/given.mcfunction +++ b/Asset/data/asset/functions/effect/0354.protecction_of_courage/_/given.mcfunction @@ -1,7 +1,7 @@ -#> asset:effect/354.protecction_of_courage/_/given +#> asset:effect/0354.protecction_of_courage/_/given # # Effectが付与された時に実行されるfunction # # @within tag/function asset:effect/given -execute if data storage asset:context {id:354} run function asset:effect/354.protecction_of_courage/given/ \ No newline at end of file +execute if data storage asset:context {id:354} run function asset:effect/0354.protecction_of_courage/given/ diff --git a/Asset/data/asset/functions/effect/354.protecction_of_courage/_/register.mcfunction b/Asset/data/asset/functions/effect/0354.protecction_of_courage/_/register.mcfunction similarity index 53% rename from Asset/data/asset/functions/effect/354.protecction_of_courage/_/register.mcfunction rename to Asset/data/asset/functions/effect/0354.protecction_of_courage/_/register.mcfunction index 16b4d1e4474..62ab7f35e43 100644 --- a/Asset/data/asset/functions/effect/354.protecction_of_courage/_/register.mcfunction +++ b/Asset/data/asset/functions/effect/0354.protecction_of_courage/_/register.mcfunction @@ -1,7 +1,7 @@ -#> asset:effect/354.protecction_of_courage/_/register +#> asset:effect/0354.protecction_of_courage/_/register # # # # @within tag/function asset:effect/register -execute if data storage asset:context {id:354} run function asset:effect/354.protecction_of_courage/register \ No newline at end of file +execute if data storage asset:context {id:354} run function asset:effect/0354.protecction_of_courage/register diff --git a/Asset/data/asset/functions/effect/354.protecction_of_courage/_/remove.mcfunction b/Asset/data/asset/functions/effect/0354.protecction_of_courage/_/remove.mcfunction similarity index 66% rename from Asset/data/asset/functions/effect/354.protecction_of_courage/_/remove.mcfunction rename to Asset/data/asset/functions/effect/0354.protecction_of_courage/_/remove.mcfunction index c34d643e58f..0cdcd02e267 100644 --- a/Asset/data/asset/functions/effect/354.protecction_of_courage/_/remove.mcfunction +++ b/Asset/data/asset/functions/effect/0354.protecction_of_courage/_/remove.mcfunction @@ -1,7 +1,7 @@ -#> asset:effect/354.protecction_of_courage/_/remove +#> asset:effect/0354.protecction_of_courage/_/remove # # Effectが神器や牛乳によって削除された時に実行されるfunction # # @within tag/function asset:effect/remove -execute if data storage asset:context {id:354} run function asset:effect/354.protecction_of_courage/remove/ \ No newline at end of file +execute if data storage asset:context {id:354} run function asset:effect/0354.protecction_of_courage/remove/ diff --git a/Asset/data/asset/functions/effect/0354.protecction_of_courage/_index.d.mcfunction b/Asset/data/asset/functions/effect/0354.protecction_of_courage/_index.d.mcfunction new file mode 100644 index 00000000000..018d8964ede --- /dev/null +++ b/Asset/data/asset/functions/effect/0354.protecction_of_courage/_index.d.mcfunction @@ -0,0 +1,6 @@ +#> asset:effect/0354.protecction_of_courage/_index.d +# @private + +#> 0354.protecction_of_courage +# @within function asset:effect/0354.protecction_of_courage/** + #declare diff --git a/Asset/data/asset/functions/effect/0354.protecction_of_courage/end/.mcfunction b/Asset/data/asset/functions/effect/0354.protecction_of_courage/end/.mcfunction new file mode 100644 index 00000000000..7db7a37499a --- /dev/null +++ b/Asset/data/asset/functions/effect/0354.protecction_of_courage/end/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0354.protecction_of_courage/end/ +# +# Effectの効果が切れた時の処理 +# +# @within function asset:effect/0354.protecction_of_courage/_/end + +# 補正の削除 + function asset:effect/0354.protecction_of_courage/modifier/remove diff --git a/Asset/data/asset/functions/effect/0354.protecction_of_courage/given/.mcfunction b/Asset/data/asset/functions/effect/0354.protecction_of_courage/given/.mcfunction new file mode 100644 index 00000000000..1fcbe54ab39 --- /dev/null +++ b/Asset/data/asset/functions/effect/0354.protecction_of_courage/given/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0354.protecction_of_courage/given/ +# +# Effectが付与された時の処理 +# +# @within function asset:effect/0354.protecction_of_courage/_/given + +# 補正を追加 + function asset:effect/0354.protecction_of_courage/modifier/add diff --git a/Asset/data/asset/functions/effect/354.protecction_of_courage/modifier/add.mcfunction b/Asset/data/asset/functions/effect/0354.protecction_of_courage/modifier/add.mcfunction similarity index 70% rename from Asset/data/asset/functions/effect/354.protecction_of_courage/modifier/add.mcfunction rename to Asset/data/asset/functions/effect/0354.protecction_of_courage/modifier/add.mcfunction index 8b224021fc7..1e28fbb936f 100644 --- a/Asset/data/asset/functions/effect/354.protecction_of_courage/modifier/add.mcfunction +++ b/Asset/data/asset/functions/effect/0354.protecction_of_courage/modifier/add.mcfunction @@ -1,8 +1,8 @@ -#> asset:effect/354.protecction_of_courage/modifier/add +#> asset:effect/0354.protecction_of_courage/modifier/add # # 効果の付与 # -# @within function asset:effect/354.protecction_of_courage/given/ +# @within function asset:effect/0354.protecction_of_courage/given/ # 補正を付与する data modify storage api: Argument.UUID set value [I;1,3,354,0] diff --git a/Asset/data/asset/functions/effect/354.protecction_of_courage/modifier/remove.mcfunction b/Asset/data/asset/functions/effect/0354.protecction_of_courage/modifier/remove.mcfunction similarity index 52% rename from Asset/data/asset/functions/effect/354.protecction_of_courage/modifier/remove.mcfunction rename to Asset/data/asset/functions/effect/0354.protecction_of_courage/modifier/remove.mcfunction index f059afb33b5..ef8f4c29804 100644 --- a/Asset/data/asset/functions/effect/354.protecction_of_courage/modifier/remove.mcfunction +++ b/Asset/data/asset/functions/effect/0354.protecction_of_courage/modifier/remove.mcfunction @@ -1,10 +1,10 @@ -#> asset:effect/354.protecction_of_courage/modifier/remove +#> asset:effect/0354.protecction_of_courage/modifier/remove # # 補正の削除 # # @within function -# asset:effect/354.protecction_of_courage/remove/ -# asset:effect/354.protecction_of_courage/end/ +# asset:effect/0354.protecction_of_courage/remove/ +# asset:effect/0354.protecction_of_courage/end/ # 補正を削除する data modify storage api: Argument.UUID set value [I;1,3,354,0] diff --git a/Asset/data/asset/functions/effect/354.protecction_of_courage/register.mcfunction b/Asset/data/asset/functions/effect/0354.protecction_of_courage/register.mcfunction similarity index 87% rename from Asset/data/asset/functions/effect/354.protecction_of_courage/register.mcfunction rename to Asset/data/asset/functions/effect/0354.protecction_of_courage/register.mcfunction index 7bdcc02e8ee..72aa6e4faf5 100644 --- a/Asset/data/asset/functions/effect/354.protecction_of_courage/register.mcfunction +++ b/Asset/data/asset/functions/effect/0354.protecction_of_courage/register.mcfunction @@ -1,8 +1,8 @@ -#> asset:effect/354.protecction_of_courage/register +#> asset:effect/0354.protecction_of_courage/register # # Effectのデータを指定 # -# @within function asset:effect/354.protecction_of_courage/_/register +# @within function asset:effect/0354.protecction_of_courage/_/register # ExtendsSafe (boolean) (default = false) # data modify storage asset:effect ExtendsSafe set value true @@ -27,11 +27,11 @@ # 悪い効果か否か (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) - # data modify storage asset:effect Visible set value + data modify storage asset:effect Visible set value "false" # エフェクトのスタックををUIに表示するか (boolean) (default = true) data modify storage asset:effect StackVisible set value false diff --git a/Asset/data/asset/functions/effect/0354.protecction_of_courage/remove/.mcfunction b/Asset/data/asset/functions/effect/0354.protecction_of_courage/remove/.mcfunction new file mode 100644 index 00000000000..8325e6e9a3e --- /dev/null +++ b/Asset/data/asset/functions/effect/0354.protecction_of_courage/remove/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0354.protecction_of_courage/remove/ +# +# Effectが削除された時の処理 +# +# @within function asset:effect/0354.protecction_of_courage/_/remove + +# 補正の削除 + function asset:effect/0354.protecction_of_courage/modifier/remove diff --git a/Asset/data/asset/functions/effect/0355.heart_gap/_/end.mcfunction b/Asset/data/asset/functions/effect/0355.heart_gap/_/end.mcfunction new file mode 100644 index 00000000000..75d0f8ff9f9 --- /dev/null +++ b/Asset/data/asset/functions/effect/0355.heart_gap/_/end.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0355.heart_gap/_/end +# +# Effectの効果の終了時に実行されるfunction +# +# @within tag/function asset:effect/end + +execute if data storage asset:context {id:355} run function asset:effect/0355.heart_gap/end/ diff --git a/Asset/data/asset/functions/effect/0355.heart_gap/_/given.mcfunction b/Asset/data/asset/functions/effect/0355.heart_gap/_/given.mcfunction new file mode 100644 index 00000000000..15942f82c35 --- /dev/null +++ b/Asset/data/asset/functions/effect/0355.heart_gap/_/given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0355.heart_gap/_/given +# +# Effectが付与された時に実行されるfunction +# +# @within tag/function asset:effect/given + +execute if data storage asset:context {id:355} run function asset:effect/0355.heart_gap/given/ diff --git a/Asset/data/asset/functions/effect/0355.heart_gap/_/register.mcfunction b/Asset/data/asset/functions/effect/0355.heart_gap/_/register.mcfunction new file mode 100644 index 00000000000..4a69f9eed6b --- /dev/null +++ b/Asset/data/asset/functions/effect/0355.heart_gap/_/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0355.heart_gap/_/register +# +# +# +# @within tag/function asset:effect/register + +execute if data storage asset:context {id:355} run function asset:effect/0355.heart_gap/register diff --git a/Asset/data/asset/functions/effect/0355.heart_gap/_/remove.mcfunction b/Asset/data/asset/functions/effect/0355.heart_gap/_/remove.mcfunction new file mode 100644 index 00000000000..3c6b0868b42 --- /dev/null +++ b/Asset/data/asset/functions/effect/0355.heart_gap/_/remove.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0355.heart_gap/_/remove +# +# Effectが神器や牛乳によって削除された時に実行されるfunction +# +# @within tag/function asset:effect/remove + +execute if data storage asset:context {id:355} run function asset:effect/0355.heart_gap/remove/ diff --git a/Asset/data/asset/functions/effect/0355.heart_gap/_/tick.mcfunction b/Asset/data/asset/functions/effect/0355.heart_gap/_/tick.mcfunction new file mode 100644 index 00000000000..993eda50647 --- /dev/null +++ b/Asset/data/asset/functions/effect/0355.heart_gap/_/tick.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0355.heart_gap/_/tick +# +# +# +# @within tag/function asset:effect/tick + +execute if data storage asset:context {id:355} run function asset:effect/0355.heart_gap/tick/ diff --git a/Asset/data/asset/functions/effect/0355.heart_gap/end/.mcfunction b/Asset/data/asset/functions/effect/0355.heart_gap/end/.mcfunction new file mode 100644 index 00000000000..b49f1d03bcd --- /dev/null +++ b/Asset/data/asset/functions/effect/0355.heart_gap/end/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0355.heart_gap/end/ +# +# Effectの効果が切れた時の処理 +# +# @within function asset:effect/0355.heart_gap/_/end + +# 補正の削除 + function asset:effect/0355.heart_gap/modifier/remove diff --git a/Asset/data/asset/functions/effect/0355.heart_gap/given/.mcfunction b/Asset/data/asset/functions/effect/0355.heart_gap/given/.mcfunction new file mode 100644 index 00000000000..fe8033cd946 --- /dev/null +++ b/Asset/data/asset/functions/effect/0355.heart_gap/given/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0355.heart_gap/given/ +# +# Effectが付与された時の処理 +# +# @within function asset:effect/0355.heart_gap/_/given + +# 補正の追加 + function asset:effect/0355.heart_gap/modifier/add diff --git a/Asset/data/asset/functions/effect/0355.heart_gap/modifier/add.mcfunction b/Asset/data/asset/functions/effect/0355.heart_gap/modifier/add.mcfunction new file mode 100644 index 00000000000..b37b140608a --- /dev/null +++ b/Asset/data/asset/functions/effect/0355.heart_gap/modifier/add.mcfunction @@ -0,0 +1,11 @@ +#> asset:effect/0355.heart_gap/modifier/add +# +# 効果の付与 +# +# @within function asset:effect/0355.heart_gap/given/ + +# 補正を付与する + data modify storage api: Argument.UUID set value [I;1,3,355,0] + data modify storage api: Argument.Amount set value -0.15 + data modify storage api: Argument.Operation set value "multiply_base" + function api:modifier/defense/base/add diff --git a/Asset/data/asset/functions/effect/0355.heart_gap/modifier/remove.mcfunction b/Asset/data/asset/functions/effect/0355.heart_gap/modifier/remove.mcfunction new file mode 100644 index 00000000000..827a3583633 --- /dev/null +++ b/Asset/data/asset/functions/effect/0355.heart_gap/modifier/remove.mcfunction @@ -0,0 +1,11 @@ +#> asset:effect/0355.heart_gap/modifier/remove +# +# 補正の削除 +# +# @within function +# asset:effect/0355.heart_gap/remove/ +# asset:effect/0355.heart_gap/end/ + +# 補正を削除する + data modify storage api: Argument.UUID set value [I;1,3,355,0] + function api:modifier/defense/base/remove diff --git a/Asset/data/asset/functions/effect/0355.heart_gap/register.mcfunction b/Asset/data/asset/functions/effect/0355.heart_gap/register.mcfunction new file mode 100644 index 00000000000..85d91d0d925 --- /dev/null +++ b/Asset/data/asset/functions/effect/0355.heart_gap/register.mcfunction @@ -0,0 +1,39 @@ +#> asset:effect/0355.heart_gap/register +# +# Effectのデータを指定 +# +# @within function asset:effect/0355.heart_gap/_/register + +# ExtendsSafe (boolean) (default = false) + # data modify storage asset:effect ExtendsSafe set value true +# ID (int) + data modify storage asset:effect ID set value 355 +# 名前 (TextComponentString) + data modify storage asset:effect Name set value '{"text":"心隙弱化"}' +# 説明文 (TextComponentString[]) + data modify storage asset:effect Description set value ['{"text":"これはあなたの心の隙。"}','{"text":"耐性-15%"}'] +# 効果時間 (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 1 +# 悪い効果か否か (boolean) + data modify storage asset:effect IsBadEffect set value true +# 死亡時のエフェクトの処理 (default = "remove") + 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) + data modify storage asset:effect Visible set value "false" +# エフェクトのスタックをを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/0355.heart_gap/remove/.mcfunction b/Asset/data/asset/functions/effect/0355.heart_gap/remove/.mcfunction new file mode 100644 index 00000000000..44bb3b68ce9 --- /dev/null +++ b/Asset/data/asset/functions/effect/0355.heart_gap/remove/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0355.heart_gap/remove/ +# +# Effectが削除された時の処理 +# +# @within function asset:effect/0355.heart_gap/_/remove + +# 補正の削除 + function asset:effect/0355.heart_gap/modifier/remove diff --git a/Asset/data/asset/functions/effect/0355.heart_gap/tick/.mcfunction b/Asset/data/asset/functions/effect/0355.heart_gap/tick/.mcfunction new file mode 100644 index 00000000000..e3e004171d5 --- /dev/null +++ b/Asset/data/asset/functions/effect/0355.heart_gap/tick/.mcfunction @@ -0,0 +1,9 @@ +#> asset:effect/0355.heart_gap/tick/ +# +# Effectのtick処理 +# +# @within function asset:effect/0355.heart_gap/_/tick + +# 演出 + # execute if predicate lib:random_pass_per/10 run + particle block redstone_block ~ ~0.8 ~ 0.4 0.6 0.4 0 1 normal @a diff --git a/Asset/data/asset/functions/effect/354.protecction_of_courage/_index.d.mcfunction b/Asset/data/asset/functions/effect/354.protecction_of_courage/_index.d.mcfunction deleted file mode 100644 index f22af7b7749..00000000000 --- a/Asset/data/asset/functions/effect/354.protecction_of_courage/_index.d.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#> asset:effect/354.protecction_of_courage/_index.d -# @private - -#> 354.protecction_of_courage -# @within function asset:effect/354.protecction_of_courage/** - #declare \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/354.protecction_of_courage/end/.mcfunction b/Asset/data/asset/functions/effect/354.protecction_of_courage/end/.mcfunction deleted file mode 100644 index b4eb7d90b3c..00000000000 --- a/Asset/data/asset/functions/effect/354.protecction_of_courage/end/.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset:effect/354.protecction_of_courage/end/ -# -# Effectの効果が切れた時の処理 -# -# @within function asset:effect/354.protecction_of_courage/_/end - -# 補正の削除 - function asset:effect/354.protecction_of_courage/modifier/remove diff --git a/Asset/data/asset/functions/effect/354.protecction_of_courage/given/.mcfunction b/Asset/data/asset/functions/effect/354.protecction_of_courage/given/.mcfunction deleted file mode 100644 index d462cca6000..00000000000 --- a/Asset/data/asset/functions/effect/354.protecction_of_courage/given/.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset:effect/354.protecction_of_courage/given/ -# -# Effectが付与された時の処理 -# -# @within function asset:effect/354.protecction_of_courage/_/given - -# 補正を追加 - function asset:effect/354.protecction_of_courage/modifier/add diff --git a/Asset/data/asset/functions/effect/354.protecction_of_courage/remove/.mcfunction b/Asset/data/asset/functions/effect/354.protecction_of_courage/remove/.mcfunction deleted file mode 100644 index dcdd671b884..00000000000 --- a/Asset/data/asset/functions/effect/354.protecction_of_courage/remove/.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset:effect/354.protecction_of_courage/remove/ -# -# Effectが削除された時の処理 -# -# @within function asset:effect/354.protecction_of_courage/_/remove - -# 補正の削除 - function asset:effect/354.protecction_of_courage/modifier/remove diff --git a/Asset/data/asset/tags/functions/artifact/load.json b/Asset/data/asset/tags/functions/artifact/load.json index ad77fe0f779..5b077774fa8 100644 --- a/Asset/data/asset/tags/functions/artifact/load.json +++ b/Asset/data/asset/tags/functions/artifact/load.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1430.shield_of_fate/trigger/0.load", "asset:artifact/1220.sacred_hardener/trigger/0.load", "asset:artifact/1269.apocalypse/trigger/0.load", "asset:artifact/1061.hekireki/trigger/0.load", diff --git a/Asset/data/asset/tags/functions/artifact/tick.json b/Asset/data/asset/tags/functions/artifact/tick.json index 878334fd80a..d59e2b92e0e 100644 --- a/Asset/data/asset/tags/functions/artifact/tick.json +++ b/Asset/data/asset/tags/functions/artifact/tick.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1430.shield_of_fate/tick/1.trigger", "asset:artifact/1324.balance_star/trigger/1.trigger", "asset:artifact/0237.schrodingers_cat/trigger/1.trigger", "asset:artifact/1057.great_demon_head/tick/1.trigger", diff --git a/Asset/data/asset/tags/functions/effect/end.json b/Asset/data/asset/tags/functions/effect/end.json index 561b1639fc0..7c8635556bf 100644 --- a/Asset/data/asset/tags/functions/effect/end.json +++ b/Asset/data/asset/tags/functions/effect/end.json @@ -1,6 +1,7 @@ { "values": [ - "asset:effect/354.protecction_of_courage/_/end", + "asset:effect/0355.heart_gap/_/end", + "asset:effect/0354.protecction_of_courage/_/end", "asset:effect/0350.yuzu/_/end", "asset:effect/0025.levitation/_/end", "asset:effect/0621.loyalty_shield/_/end", @@ -104,4 +105,4 @@ "asset:effect/0007.defense_base_debuff/_/end", "asset:effect/0258.spirit_melody/_/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 1223dff8c85..dcbfee8e1aa 100644 --- a/Asset/data/asset/tags/functions/effect/given.json +++ b/Asset/data/asset/tags/functions/effect/given.json @@ -1,6 +1,7 @@ { "values": [ - "asset:effect/354.protecction_of_courage/_/given", + "asset:effect/0355.heart_gap/_/given", + "asset:effect/0354.protecction_of_courage/_/given", "asset:effect/0350.yuzu/_/given", "asset:effect/0315.charge_of_aurora_scythe/_/given", "asset:effect/0621.loyalty_shield/_/given", @@ -98,4 +99,4 @@ "asset:effect/0007.defense_base_debuff/_/given", "asset:effect/0258.spirit_melody/_/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 a59c106085a..a202aaf0233 100644 --- a/Asset/data/asset/tags/functions/effect/register.json +++ b/Asset/data/asset/tags/functions/effect/register.json @@ -1,6 +1,7 @@ { "values": [ - "asset:effect/354.protecction_of_courage/_/register", + "asset:effect/0355.heart_gap/_/register", + "asset:effect/0354.protecction_of_courage/_/register", "asset:effect/0350.yuzu/_/register", "asset:effect/0025.levitation/_/register", "asset:effect/0247.great_demon_armor/_/register", @@ -168,4 +169,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 aa27695706d..4c5e50f15c0 100644 --- a/Asset/data/asset/tags/functions/effect/remove.json +++ b/Asset/data/asset/tags/functions/effect/remove.json @@ -1,6 +1,7 @@ { "values": [ - "asset:effect/354.protecction_of_courage/_/remove", + "asset:effect/0355.heart_gap/_/remove", + "asset:effect/0354.protecction_of_courage/_/remove", "asset:effect/0350.yuzu/_/remove", "asset:effect/0025.levitation/_/remove", "asset:effect/0245.flame_hunter_attire/_/remove", @@ -112,4 +113,4 @@ "asset:effect/0007.defense_base_debuff/_/remove", "asset:effect/0258.spirit_melody/_/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 b972234f21f..cef901dbc07 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/0355.heart_gap/_/tick", "asset:effect/0350.yuzu/_/tick", "asset:effect/0025.levitation/_/tick", "asset:effect/0244.aurora_armor/_/tick",