From aaf8e156a347c9287db6b0eba164f0543917d3bf Mon Sep 17 00:00:00 2001 From: Asphere Date: Sun, 14 Jun 2026 21:31:18 +0900 Subject: [PATCH] =?UTF-8?q?[Artifact=201500]=E3=82=A8=E3=83=AC=E3=83=A1?= =?UTF-8?q?=E3=83=B3=E3=82=BF=E3=83=AB=E3=82=A2=E3=83=95=E3=82=A7=E3=82=AF?= =?UTF-8?q?=E3=82=B7=E3=83=A7=E3=83=B3=E3=82=92=E4=BD=9C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../give/1.trigger.mcfunction | 7 ++ .../give/2.give.mcfunction | 71 +++++++++++++++++++ .../trigger/1.trigger.mcfunction | 8 +++ .../trigger/2.check_condition.mcfunction | 13 ++++ .../trigger/3.main.mcfunction | 23 ++++++ .../trigger/dis_equip/.mcfunction | 7 ++ .../trigger/dis_equip/main.mcfunction | 14 ++++ .../0366.fire_affection/_/end.mcfunction | 7 ++ .../0366.fire_affection/_/given.mcfunction | 7 ++ .../0366.fire_affection/_/re-given.mcfunction | 7 ++ .../0366.fire_affection/_/register.mcfunction | 7 ++ .../0366.fire_affection/_/remove.mcfunction | 7 ++ .../0366.fire_affection/end/.mcfunction | 7 ++ .../0366.fire_affection/given/.mcfunction | 7 ++ .../modifier/add.mcfunction | 14 ++++ .../modifier/remove.mcfunction | 12 ++++ .../0366.fire_affection/re-given/.mcfunction | 8 +++ .../0366.fire_affection/register.mcfunction | 39 ++++++++++ .../0366.fire_affection/remove/.mcfunction | 7 ++ .../0367.water_affection/_/end.mcfunction | 7 ++ .../0367.water_affection/_/given.mcfunction | 7 ++ .../_/re-given.mcfunction | 7 ++ .../_/register.mcfunction | 7 ++ .../0367.water_affection/_/remove.mcfunction | 7 ++ .../0367.water_affection/end/.mcfunction | 7 ++ .../0367.water_affection/given/.mcfunction | 7 ++ .../modifier/add.mcfunction | 14 ++++ .../modifier/remove.mcfunction | 12 ++++ .../0367.water_affection/re-given/.mcfunction | 8 +++ .../0367.water_affection/register.mcfunction | 39 ++++++++++ .../0367.water_affection/remove/.mcfunction | 7 ++ .../0368.thunder_affection/_/end.mcfunction | 7 ++ .../0368.thunder_affection/_/given.mcfunction | 7 ++ .../_/re-given.mcfunction | 7 ++ .../_/register.mcfunction | 7 ++ .../_/remove.mcfunction | 7 ++ .../0368.thunder_affection/end/.mcfunction | 7 ++ .../0368.thunder_affection/given/.mcfunction | 7 ++ .../modifier/add.mcfunction | 14 ++++ .../modifier/remove.mcfunction | 12 ++++ .../re-given/.mcfunction | 8 +++ .../register.mcfunction | 39 ++++++++++ .../0368.thunder_affection/remove/.mcfunction | 7 ++ .../asset/tags/functions/artifact/damage.json | 3 +- .../tags/functions/artifact/dis_equip.json | 3 +- .../asset/tags/functions/artifact/equip.json | 3 +- .../asset/tags/functions/artifact/give.json | 3 +- .../data/asset/tags/functions/effect/end.json | 5 +- .../asset/tags/functions/effect/given.json | 5 +- .../asset/tags/functions/effect/re-given.json | 5 +- .../asset/tags/functions/effect/register.json | 5 +- .../asset/tags/functions/effect/remove.json | 5 +- 52 files changed, 558 insertions(+), 9 deletions(-) create mode 100644 Asset/data/asset/functions/artifact/1500.elemental_affection/give/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1500.elemental_affection/give/2.give.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1500.elemental_affection/trigger/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1500.elemental_affection/trigger/2.check_condition.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1500.elemental_affection/trigger/3.main.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1500.elemental_affection/trigger/dis_equip/.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1500.elemental_affection/trigger/dis_equip/main.mcfunction create mode 100644 Asset/data/asset/functions/effect/0366.fire_affection/_/end.mcfunction create mode 100644 Asset/data/asset/functions/effect/0366.fire_affection/_/given.mcfunction create mode 100644 Asset/data/asset/functions/effect/0366.fire_affection/_/re-given.mcfunction create mode 100644 Asset/data/asset/functions/effect/0366.fire_affection/_/register.mcfunction create mode 100644 Asset/data/asset/functions/effect/0366.fire_affection/_/remove.mcfunction create mode 100644 Asset/data/asset/functions/effect/0366.fire_affection/end/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0366.fire_affection/given/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0366.fire_affection/modifier/add.mcfunction create mode 100644 Asset/data/asset/functions/effect/0366.fire_affection/modifier/remove.mcfunction create mode 100644 Asset/data/asset/functions/effect/0366.fire_affection/re-given/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0366.fire_affection/register.mcfunction create mode 100644 Asset/data/asset/functions/effect/0366.fire_affection/remove/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0367.water_affection/_/end.mcfunction create mode 100644 Asset/data/asset/functions/effect/0367.water_affection/_/given.mcfunction create mode 100644 Asset/data/asset/functions/effect/0367.water_affection/_/re-given.mcfunction create mode 100644 Asset/data/asset/functions/effect/0367.water_affection/_/register.mcfunction create mode 100644 Asset/data/asset/functions/effect/0367.water_affection/_/remove.mcfunction create mode 100644 Asset/data/asset/functions/effect/0367.water_affection/end/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0367.water_affection/given/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0367.water_affection/modifier/add.mcfunction create mode 100644 Asset/data/asset/functions/effect/0367.water_affection/modifier/remove.mcfunction create mode 100644 Asset/data/asset/functions/effect/0367.water_affection/re-given/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0367.water_affection/register.mcfunction create mode 100644 Asset/data/asset/functions/effect/0367.water_affection/remove/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0368.thunder_affection/_/end.mcfunction create mode 100644 Asset/data/asset/functions/effect/0368.thunder_affection/_/given.mcfunction create mode 100644 Asset/data/asset/functions/effect/0368.thunder_affection/_/re-given.mcfunction create mode 100644 Asset/data/asset/functions/effect/0368.thunder_affection/_/register.mcfunction create mode 100644 Asset/data/asset/functions/effect/0368.thunder_affection/_/remove.mcfunction create mode 100644 Asset/data/asset/functions/effect/0368.thunder_affection/end/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0368.thunder_affection/given/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0368.thunder_affection/modifier/add.mcfunction create mode 100644 Asset/data/asset/functions/effect/0368.thunder_affection/modifier/remove.mcfunction create mode 100644 Asset/data/asset/functions/effect/0368.thunder_affection/re-given/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0368.thunder_affection/register.mcfunction create mode 100644 Asset/data/asset/functions/effect/0368.thunder_affection/remove/.mcfunction diff --git a/Asset/data/asset/functions/artifact/1500.elemental_affection/give/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1500.elemental_affection/give/1.trigger.mcfunction new file mode 100644 index 0000000000..0054679e02 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1500.elemental_affection/give/1.trigger.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1500.elemental_affection/give/1.trigger +# +# 神器の取得処理の呼び出し時に実行されるfunction +# +# @within tag/function asset:artifact/give + +execute if data storage asset:context {id:1500} run function asset:artifact/1500.elemental_affection/give/2.give \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1500.elemental_affection/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1500.elemental_affection/give/2.give.mcfunction new file mode 100644 index 0000000000..4d26a94fe8 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1500.elemental_affection/give/2.give.mcfunction @@ -0,0 +1,71 @@ +#> asset:artifact/1500.elemental_affection/give/2.give +# +# 神器の作成部 ここでID等を定義する +# +# @user +# @within function asset:artifact/1500.elemental_affection/give/1.trigger + +# 神器の説明や消費MPなどをここで設定する。 +# 最後にasset:artifact/common/giveを実行することで入手可能。 + +# 神器のID (int) スプレッドシートの値を入れる + data modify storage asset:artifact ID set value 1500 +# 神器のベースアイテム + data modify storage asset:artifact Item set value "minecraft:iron_helmet" +# 神器の名前 (TextComponentString) + data modify storage asset:artifact Name set value '{"text":"エレメンタルアフェクション","color":"#7fff00"}' +# 神器の説明文 (TextComponentString[]) + data modify storage asset:artifact Lore set value ['{"text":"火、水、雷属性の攻撃を受けた時、"}','{"text":"該当属性の耐性+2%、上限+60%"}'] +# 消費アイテム ({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 "head" +# 神器のトリガー (string) Wikiを参照 + data modify storage asset:artifact Trigger set value onDamage +# 神器の発動条件 (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 +# グローバルクールダウン (int) (オプション) + # data modify storage asset:artifact SpecialCooldown set value +# クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) + # data modify storage asset:artifact DisableCooldownMessage set value +# MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) + # data modify storage asset:artifact DisableMPMessage set value +# 破壊時の音を鳴らさないかどうか (boolean) (オプション) + # data modify storage asset:artifact DisableBreakSound set value +# 扱える神 (string[]) Wikiを参照 + data modify storage asset:artifact CanUsedGod set value "ALL" +# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) + data modify storage asset:artifact Equipment.Modifiers append value {Type:"defense/fire",Amount:0.1d,Operation:"multiply_base"} + data modify storage asset:artifact Equipment.Modifiers append value {Type:"defense/water",Amount:0.1d,Operation:"multiply_base"} + data modify storage asset:artifact Equipment.Modifiers append value {Type:"defense/thunder",Amount:0.1d,Operation:"multiply_base"} + # data modify storage asset:artifact Equipment.Modifiers append value {Type:"generic.armor",Amount:3d,Operation:"add"} + +# 神器の入手用function + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/1500.elemental_affection/trigger/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1500.elemental_affection/trigger/1.trigger.mcfunction new file mode 100644 index 0000000000..cc13f179af --- /dev/null +++ b/Asset/data/asset/functions/artifact/1500.elemental_affection/trigger/1.trigger.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1500.elemental_affection/trigger/1.trigger +# +# 指定したイベントタイミングで実行されるfunction +# +# @within tag/function asset:artifact/** + +# storage asset:idのheadに装備している神器のIDが入っているので比較し、~/2.check_condition.mcfunctionを実行する + execute if data storage asset:context id{head:1500} run function asset:artifact/1500.elemental_affection/trigger/2.check_condition diff --git a/Asset/data/asset/functions/artifact/1500.elemental_affection/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1500.elemental_affection/trigger/2.check_condition.mcfunction new file mode 100644 index 0000000000..46f70bd334 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1500.elemental_affection/trigger/2.check_condition.mcfunction @@ -0,0 +1,13 @@ +#> asset:artifact/1500.elemental_affection/trigger/2.check_condition +# +# 神器の発動条件をチェックします +# +# @within function asset:artifact/1500.elemental_affection/trigger/1.trigger + +# 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く + function asset:artifact/common/check_condition/head +# 他にアイテム等確認する場合はここに書く + +# CanUsedタグをチェックして3.main.mcfunctionを実行する + execute if data storage asset:context Damage{IsVanilla:1b} run tag @s remove CanUsed + execute if entity @s[tag=CanUsed] run function asset:artifact/1500.elemental_affection/trigger/3.main diff --git a/Asset/data/asset/functions/artifact/1500.elemental_affection/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1500.elemental_affection/trigger/3.main.mcfunction new file mode 100644 index 0000000000..53edb36f70 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1500.elemental_affection/trigger/3.main.mcfunction @@ -0,0 +1,23 @@ +#> asset:artifact/1500.elemental_affection/trigger/3.main +# +# 神器のメイン処理部 +# +# @within function asset:artifact/1500.elemental_affection/trigger/2.check_condition + +# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う + function asset:artifact/common/use/head + +# ここから先は神器側の効果の処理を書く + # say test: 1500.elemental_affection + # particle minecraft:nautilus ~ ~1.25 ~ 0.0 0.5 0.0 0.5 75 + execute if data storage asset:context Damage{ElementType:Fire} run data modify storage api: Argument.ID set value 366 + execute if data storage asset:context Damage{ElementType:Fire} run function api:entity/mob/effect/give + execute if data storage asset:context Damage{ElementType:Fire} run function api:entity/mob/effect/reset + + execute if data storage asset:context Damage{ElementType:Water} run data modify storage api: Argument.ID set value 367 + execute if data storage asset:context Damage{ElementType:Water} run function api:entity/mob/effect/give + execute if data storage asset:context Damage{ElementType:Water} run function api:entity/mob/effect/reset + + execute if data storage asset:context Damage{ElementType:Thunder} run data modify storage api: Argument.ID set value 368 + execute if data storage asset:context Damage{ElementType:Thunder} run function api:entity/mob/effect/give + execute if data storage asset:context Damage{ElementType:Thunder} run function api:entity/mob/effect/reset diff --git a/Asset/data/asset/functions/artifact/1500.elemental_affection/trigger/dis_equip/.mcfunction b/Asset/data/asset/functions/artifact/1500.elemental_affection/trigger/dis_equip/.mcfunction new file mode 100644 index 0000000000..3d6dfb493f --- /dev/null +++ b/Asset/data/asset/functions/artifact/1500.elemental_affection/trigger/dis_equip/.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1500.elemental_affection/trigger/dis_equip/ +# +# 装備を外した時に外した部位にのみのidが入った状態でトリガーされる +# +# @within tag/function asset:artifact/dis_equip + +execute if data storage asset:context id{head:1500} run function asset:artifact/1500.elemental_affection/trigger/dis_equip/main \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1500.elemental_affection/trigger/dis_equip/main.mcfunction b/Asset/data/asset/functions/artifact/1500.elemental_affection/trigger/dis_equip/main.mcfunction new file mode 100644 index 0000000000..2319a44379 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1500.elemental_affection/trigger/dis_equip/main.mcfunction @@ -0,0 +1,14 @@ +#> asset:artifact/1500.elemental_affection/trigger/dis_equip/main +# +# 装備を外した時のメイン処理 +# +# @within function asset:artifact/1500.elemental_affection/trigger/dis_equip/ + data modify storage api: Argument.ID set value 366 + function api:entity/mob/effect/remove/from_id + function api:entity/mob/effect/reset + data modify storage api: Argument.ID set value 367 + function api:entity/mob/effect/remove/from_id + function api:entity/mob/effect/reset + data modify storage api: Argument.ID set value 368 + function api:entity/mob/effect/remove/from_id + function api:entity/mob/effect/reset diff --git a/Asset/data/asset/functions/effect/0366.fire_affection/_/end.mcfunction b/Asset/data/asset/functions/effect/0366.fire_affection/_/end.mcfunction new file mode 100644 index 0000000000..a0f42b183c --- /dev/null +++ b/Asset/data/asset/functions/effect/0366.fire_affection/_/end.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0366.fire_affection/_/end +# +# Effectの効果の終了時に実行されるfunction +# +# @within tag/function asset:effect/end + +execute if data storage asset:context {id:366} run function asset:effect/0366.fire_affection/end/ diff --git a/Asset/data/asset/functions/effect/0366.fire_affection/_/given.mcfunction b/Asset/data/asset/functions/effect/0366.fire_affection/_/given.mcfunction new file mode 100644 index 0000000000..587134e9e6 --- /dev/null +++ b/Asset/data/asset/functions/effect/0366.fire_affection/_/given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0366.fire_affection/_/given +# +# Effectが付与された時に実行されるfunction +# +# @within tag/function asset:effect/given + +execute if data storage asset:context {id:366} run function asset:effect/0366.fire_affection/given/ diff --git a/Asset/data/asset/functions/effect/0366.fire_affection/_/re-given.mcfunction b/Asset/data/asset/functions/effect/0366.fire_affection/_/re-given.mcfunction new file mode 100644 index 0000000000..b3b08f2d7d --- /dev/null +++ b/Asset/data/asset/functions/effect/0366.fire_affection/_/re-given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0366.fire_affection/_/re-given +# +# Effectが上書きされた時に実行されるfunction +# +# @within tag/function asset:effect/re-given + +execute if data storage asset:context {id:366} run function asset:effect/0366.fire_affection/re-given/ diff --git a/Asset/data/asset/functions/effect/0366.fire_affection/_/register.mcfunction b/Asset/data/asset/functions/effect/0366.fire_affection/_/register.mcfunction new file mode 100644 index 0000000000..ccae73aade --- /dev/null +++ b/Asset/data/asset/functions/effect/0366.fire_affection/_/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0366.fire_affection/_/register +# +# +# +# @within tag/function asset:effect/register + +execute if data storage asset:context {id:366} run function asset:effect/0366.fire_affection/register diff --git a/Asset/data/asset/functions/effect/0366.fire_affection/_/remove.mcfunction b/Asset/data/asset/functions/effect/0366.fire_affection/_/remove.mcfunction new file mode 100644 index 0000000000..08696a3730 --- /dev/null +++ b/Asset/data/asset/functions/effect/0366.fire_affection/_/remove.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0366.fire_affection/_/remove +# +# Effectが神器や牛乳によって削除された時に実行されるfunction +# +# @within tag/function asset:effect/remove + +execute if data storage asset:context {id:366} run function asset:effect/0366.fire_affection/remove/ diff --git a/Asset/data/asset/functions/effect/0366.fire_affection/end/.mcfunction b/Asset/data/asset/functions/effect/0366.fire_affection/end/.mcfunction new file mode 100644 index 0000000000..c39143a669 --- /dev/null +++ b/Asset/data/asset/functions/effect/0366.fire_affection/end/.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0366.fire_affection/end/ +# +# Effectの効果が切れた時の処理 +# +# @within function asset:effect/0366.fire_affection/_/end + + function asset:effect/0366.fire_affection/modifier/remove diff --git a/Asset/data/asset/functions/effect/0366.fire_affection/given/.mcfunction b/Asset/data/asset/functions/effect/0366.fire_affection/given/.mcfunction new file mode 100644 index 0000000000..20bb376dea --- /dev/null +++ b/Asset/data/asset/functions/effect/0366.fire_affection/given/.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0366.fire_affection/given/ +# +# Effectが付与された時の処理 +# +# @within function asset:effect/0366.fire_affection/_/given + + function asset:effect/0366.fire_affection/modifier/add diff --git a/Asset/data/asset/functions/effect/0366.fire_affection/modifier/add.mcfunction b/Asset/data/asset/functions/effect/0366.fire_affection/modifier/add.mcfunction new file mode 100644 index 0000000000..15e39f8432 --- /dev/null +++ b/Asset/data/asset/functions/effect/0366.fire_affection/modifier/add.mcfunction @@ -0,0 +1,14 @@ +#> asset:effect/0366.fire_affection/modifier/add +# +# 補正を付与する +# +# @within function +# asset:effect/0366.fire_affection/given/ +# asset:effect/0366.fire_affection/re-given/ + +# 火耐性+5% + data modify storage api: Argument.UUID set value [I;1,3,366,0] + execute store result storage api: Argument.Amount double 0.02 run data get storage asset:context Stack + data modify storage api: Argument.Operation set value "multiply_base" +# リセット + function api:modifier/defense/fire/add diff --git a/Asset/data/asset/functions/effect/0366.fire_affection/modifier/remove.mcfunction b/Asset/data/asset/functions/effect/0366.fire_affection/modifier/remove.mcfunction new file mode 100644 index 0000000000..8cce52fe17 --- /dev/null +++ b/Asset/data/asset/functions/effect/0366.fire_affection/modifier/remove.mcfunction @@ -0,0 +1,12 @@ +#> asset:effect/0366.fire_affection/modifier/remove +# +# 補正を削除する +# +# @within function +# asset:effect/0366.fire_affection/re-given/ +# asset:effect/0366.fire_affection/end/ +# asset:effect/0366.fire_affection/remove/ + +# バフ解除 + data modify storage api: Argument.UUID set value [I;1,3,366,0] + function api:modifier/defense/fire/remove diff --git a/Asset/data/asset/functions/effect/0366.fire_affection/re-given/.mcfunction b/Asset/data/asset/functions/effect/0366.fire_affection/re-given/.mcfunction new file mode 100644 index 0000000000..115c060782 --- /dev/null +++ b/Asset/data/asset/functions/effect/0366.fire_affection/re-given/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0366.fire_affection/re-given/ +# +# Effectが上書きされた時の処理 +# +# @within function asset:effect/0366.fire_affection/_/re-given + + function asset:effect/0366.fire_affection/modifier/remove + function asset:effect/0366.fire_affection/modifier/add diff --git a/Asset/data/asset/functions/effect/0366.fire_affection/register.mcfunction b/Asset/data/asset/functions/effect/0366.fire_affection/register.mcfunction new file mode 100644 index 0000000000..a1f121575a --- /dev/null +++ b/Asset/data/asset/functions/effect/0366.fire_affection/register.mcfunction @@ -0,0 +1,39 @@ +#> asset:effect/0366.fire_affection/register +# +# Effectのデータを指定 +# +# @within function asset:effect/0366.fire_affection/_/register + +# ExtendsSafe (boolean) (default = false) + # data modify storage asset:effect ExtendsSafe set value true +# ID (int) + data modify storage asset:effect ID set value 366 +# 名前 (TextComponentString) + data modify storage asset:effect Name set value '{"text":"ファイアアフェクション","color":"red"}' +# 説明文 (TextComponentString[]) + data modify storage asset:effect Description set value ['{"text":"火属性ダメージを受けるたびに、火耐性がアップする"}'] +# 効果時間 (int) (default = API || error) + data modify storage asset:effect Duration set value 200 +# スタック (int) (default = API || 1) + data modify storage asset:effect Stack set value 1 +# 効果時間の操作方法 (default = API || "replace") + data modify storage asset:effect DurationOperation set value add +# スタックの操作方法 (default = API || "replace") + data modify storage asset:effect StackOperation set value add +# 最大効果時間 (int) (default = 2147483647) + data modify storage asset:effect MaxDuration set value 200 +# 最大スタック (int) (default = 2147483647) + data modify storage asset:effect MaxStack set value 30 +# 悪い効果か否か (boolean) + data modify storage asset:effect IsBadEffect set value false +# 死亡時のエフェクトの処理 (default = "remove") + # data modify storage asset:effect ProcessOnDied set value +# 消すのに必要なレベル (int) (default = 1) + data modify storage asset:effect RequireClearLv set value 3 +# エフェクトをUIに表示するか (boolean) (default = true) + # data modify storage asset:effect Visible set value +# エフェクトのスタックををUIに表示するか (boolean) (default = true) + # data modify storage asset:effect StackVisible set value + +# フィールド + # data modify storage asset:effect Field set value {} diff --git a/Asset/data/asset/functions/effect/0366.fire_affection/remove/.mcfunction b/Asset/data/asset/functions/effect/0366.fire_affection/remove/.mcfunction new file mode 100644 index 0000000000..65c957eb52 --- /dev/null +++ b/Asset/data/asset/functions/effect/0366.fire_affection/remove/.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0366.fire_affection/remove/ +# +# Effectが削除された時の処理 +# +# @within function asset:effect/0366.fire_affection/_/remove + + function asset:effect/0366.fire_affection/modifier/remove diff --git a/Asset/data/asset/functions/effect/0367.water_affection/_/end.mcfunction b/Asset/data/asset/functions/effect/0367.water_affection/_/end.mcfunction new file mode 100644 index 0000000000..2e9d4b6d81 --- /dev/null +++ b/Asset/data/asset/functions/effect/0367.water_affection/_/end.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0367.water_affection/_/end +# +# Effectの効果の終了時に実行されるfunction +# +# @within tag/function asset:effect/end + +execute if data storage asset:context {id:367} run function asset:effect/0367.water_affection/end/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0367.water_affection/_/given.mcfunction b/Asset/data/asset/functions/effect/0367.water_affection/_/given.mcfunction new file mode 100644 index 0000000000..b36c1ca6e4 --- /dev/null +++ b/Asset/data/asset/functions/effect/0367.water_affection/_/given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0367.water_affection/_/given +# +# Effectが付与された時に実行されるfunction +# +# @within tag/function asset:effect/given + +execute if data storage asset:context {id:367} run function asset:effect/0367.water_affection/given/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0367.water_affection/_/re-given.mcfunction b/Asset/data/asset/functions/effect/0367.water_affection/_/re-given.mcfunction new file mode 100644 index 0000000000..ca6a0f8dac --- /dev/null +++ b/Asset/data/asset/functions/effect/0367.water_affection/_/re-given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0367.water_affection/_/re-given +# +# Effectが上書きされた時に実行されるfunction +# +# @within tag/function asset:effect/re-given + +execute if data storage asset:context {id:367} run function asset:effect/0367.water_affection/re-given/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0367.water_affection/_/register.mcfunction b/Asset/data/asset/functions/effect/0367.water_affection/_/register.mcfunction new file mode 100644 index 0000000000..05f2f01ff2 --- /dev/null +++ b/Asset/data/asset/functions/effect/0367.water_affection/_/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0367.water_affection/_/register +# +# +# +# @within tag/function asset:effect/register + +execute if data storage asset:context {id:367} run function asset:effect/0367.water_affection/register \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0367.water_affection/_/remove.mcfunction b/Asset/data/asset/functions/effect/0367.water_affection/_/remove.mcfunction new file mode 100644 index 0000000000..767c16f88e --- /dev/null +++ b/Asset/data/asset/functions/effect/0367.water_affection/_/remove.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0367.water_affection/_/remove +# +# Effectが神器や牛乳によって削除された時に実行されるfunction +# +# @within tag/function asset:effect/remove + +execute if data storage asset:context {id:367} run function asset:effect/0367.water_affection/remove/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0367.water_affection/end/.mcfunction b/Asset/data/asset/functions/effect/0367.water_affection/end/.mcfunction new file mode 100644 index 0000000000..1d37a672c2 --- /dev/null +++ b/Asset/data/asset/functions/effect/0367.water_affection/end/.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0367.water_affection/end/ +# +# Effectの効果が切れた時の処理 +# +# @within function asset:effect/0367.water_affection/_/end + + function asset:effect/0367.water_affection/modifier/remove diff --git a/Asset/data/asset/functions/effect/0367.water_affection/given/.mcfunction b/Asset/data/asset/functions/effect/0367.water_affection/given/.mcfunction new file mode 100644 index 0000000000..63f7b185b8 --- /dev/null +++ b/Asset/data/asset/functions/effect/0367.water_affection/given/.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0367.water_affection/given/ +# +# Effectが付与された時の処理 +# +# @within function asset:effect/0367.water_affection/_/given + + function asset:effect/0367.water_affection/modifier/add diff --git a/Asset/data/asset/functions/effect/0367.water_affection/modifier/add.mcfunction b/Asset/data/asset/functions/effect/0367.water_affection/modifier/add.mcfunction new file mode 100644 index 0000000000..8b71596a06 --- /dev/null +++ b/Asset/data/asset/functions/effect/0367.water_affection/modifier/add.mcfunction @@ -0,0 +1,14 @@ +#> asset:effect/0367.water_affection/modifier/add +# +# 補正を付与する +# +# @within function +# asset:effect/0367.water_affection/given/ +# asset:effect/0367.water_affection/re-given/ + +# 火耐性+5% + data modify storage api: Argument.UUID set value [I;1,3,367,0] + execute store result storage api: Argument.Amount double 0.02 run data get storage asset:context Stack + data modify storage api: Argument.Operation set value "multiply_base" +# リセット + function api:modifier/defense/water/add diff --git a/Asset/data/asset/functions/effect/0367.water_affection/modifier/remove.mcfunction b/Asset/data/asset/functions/effect/0367.water_affection/modifier/remove.mcfunction new file mode 100644 index 0000000000..f4614c2115 --- /dev/null +++ b/Asset/data/asset/functions/effect/0367.water_affection/modifier/remove.mcfunction @@ -0,0 +1,12 @@ +#> asset:effect/0367.water_affection/modifier/remove +# +# 補正を削除する +# +# @within function +# asset:effect/0367.water_affection/re-given/ +# asset:effect/0367.water_affection/end/ +# asset:effect/0367.water_affection/remove/ + +# バフ解除 + data modify storage api: Argument.UUID set value [I;1,3,367,0] + function api:modifier/defense/water/remove diff --git a/Asset/data/asset/functions/effect/0367.water_affection/re-given/.mcfunction b/Asset/data/asset/functions/effect/0367.water_affection/re-given/.mcfunction new file mode 100644 index 0000000000..44baf5ec54 --- /dev/null +++ b/Asset/data/asset/functions/effect/0367.water_affection/re-given/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0367.water_affection/re-given/ +# +# Effectが上書きされた時の処理 +# +# @within function asset:effect/0367.water_affection/_/re-given + + function asset:effect/0367.water_affection/modifier/remove + function asset:effect/0367.water_affection/modifier/add diff --git a/Asset/data/asset/functions/effect/0367.water_affection/register.mcfunction b/Asset/data/asset/functions/effect/0367.water_affection/register.mcfunction new file mode 100644 index 0000000000..c0f1b25b1f --- /dev/null +++ b/Asset/data/asset/functions/effect/0367.water_affection/register.mcfunction @@ -0,0 +1,39 @@ +#> asset:effect/0367.water_affection/register +# +# Effectのデータを指定 +# +# @within function asset:effect/0367.water_affection/_/register + +# ExtendsSafe (boolean) (default = false) + # data modify storage asset:effect ExtendsSafe set value true +# ID (int) + data modify storage asset:effect ID set value 367 +# 名前 (TextComponentString) + data modify storage asset:effect Name set value '{"text":"ウォーターアフェクション","color":"aqua"}' +# 説明文 (TextComponentString[]) + data modify storage asset:effect Description set value ['{"text":"水属性ダメージを受けるたびに、水耐性がアップする"}'] +# 効果時間 (int) (default = API || error) + data modify storage asset:effect Duration set value 200 +# スタック (int) (default = API || 1) + data modify storage asset:effect Stack set value 1 +# 効果時間の操作方法 (default = API || "replace") + data modify storage asset:effect DurationOperation set value add +# スタックの操作方法 (default = API || "replace") + data modify storage asset:effect StackOperation set value add +# 最大効果時間 (int) (default = 2147483647) + data modify storage asset:effect MaxDuration set value 200 +# 最大スタック (int) (default = 2147483647) + data modify storage asset:effect MaxStack set value 30 +# 悪い効果か否か (boolean) + data modify storage asset:effect IsBadEffect set value false +# 死亡時のエフェクトの処理 (default = "remove") + # data modify storage asset:effect ProcessOnDied set value +# 消すのに必要なレベル (int) (default = 1) + data modify storage asset:effect RequireClearLv set value 3 +# エフェクトをUIに表示するか (boolean) (default = true) + # data modify storage asset:effect Visible set value +# エフェクトのスタックををUIに表示するか (boolean) (default = true) + # data modify storage asset:effect StackVisible set value + +# フィールド + # data modify storage asset:effect Field set value {} diff --git a/Asset/data/asset/functions/effect/0367.water_affection/remove/.mcfunction b/Asset/data/asset/functions/effect/0367.water_affection/remove/.mcfunction new file mode 100644 index 0000000000..86b535654b --- /dev/null +++ b/Asset/data/asset/functions/effect/0367.water_affection/remove/.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0367.water_affection/remove/ +# +# Effectが削除された時の処理 +# +# @within function asset:effect/0367.water_affection/_/remove + + function asset:effect/0367.water_affection/modifier/remove diff --git a/Asset/data/asset/functions/effect/0368.thunder_affection/_/end.mcfunction b/Asset/data/asset/functions/effect/0368.thunder_affection/_/end.mcfunction new file mode 100644 index 0000000000..8573146643 --- /dev/null +++ b/Asset/data/asset/functions/effect/0368.thunder_affection/_/end.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0368.thunder_affection/_/end +# +# Effectの効果の終了時に実行されるfunction +# +# @within tag/function asset:effect/end + +execute if data storage asset:context {id:368} run function asset:effect/0368.thunder_affection/end/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0368.thunder_affection/_/given.mcfunction b/Asset/data/asset/functions/effect/0368.thunder_affection/_/given.mcfunction new file mode 100644 index 0000000000..ca20bb08ec --- /dev/null +++ b/Asset/data/asset/functions/effect/0368.thunder_affection/_/given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0368.thunder_affection/_/given +# +# Effectが付与された時に実行されるfunction +# +# @within tag/function asset:effect/given + +execute if data storage asset:context {id:368} run function asset:effect/0368.thunder_affection/given/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0368.thunder_affection/_/re-given.mcfunction b/Asset/data/asset/functions/effect/0368.thunder_affection/_/re-given.mcfunction new file mode 100644 index 0000000000..8328c430ba --- /dev/null +++ b/Asset/data/asset/functions/effect/0368.thunder_affection/_/re-given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0368.thunder_affection/_/re-given +# +# Effectが上書きされた時に実行されるfunction +# +# @within tag/function asset:effect/re-given + +execute if data storage asset:context {id:368} run function asset:effect/0368.thunder_affection/re-given/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0368.thunder_affection/_/register.mcfunction b/Asset/data/asset/functions/effect/0368.thunder_affection/_/register.mcfunction new file mode 100644 index 0000000000..6d75802d9f --- /dev/null +++ b/Asset/data/asset/functions/effect/0368.thunder_affection/_/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0368.thunder_affection/_/register +# +# +# +# @within tag/function asset:effect/register + +execute if data storage asset:context {id:368} run function asset:effect/0368.thunder_affection/register \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0368.thunder_affection/_/remove.mcfunction b/Asset/data/asset/functions/effect/0368.thunder_affection/_/remove.mcfunction new file mode 100644 index 0000000000..2d65417b72 --- /dev/null +++ b/Asset/data/asset/functions/effect/0368.thunder_affection/_/remove.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0368.thunder_affection/_/remove +# +# Effectが神器や牛乳によって削除された時に実行されるfunction +# +# @within tag/function asset:effect/remove + +execute if data storage asset:context {id:368} run function asset:effect/0368.thunder_affection/remove/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0368.thunder_affection/end/.mcfunction b/Asset/data/asset/functions/effect/0368.thunder_affection/end/.mcfunction new file mode 100644 index 0000000000..a58ad04789 --- /dev/null +++ b/Asset/data/asset/functions/effect/0368.thunder_affection/end/.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0368.thunder_affection/end/ +# +# Effectの効果が切れた時の処理 +# +# @within function asset:effect/0368.thunder_affection/_/end + + function asset:effect/0368.thunder_affection/modifier/remove diff --git a/Asset/data/asset/functions/effect/0368.thunder_affection/given/.mcfunction b/Asset/data/asset/functions/effect/0368.thunder_affection/given/.mcfunction new file mode 100644 index 0000000000..5a635fe0c1 --- /dev/null +++ b/Asset/data/asset/functions/effect/0368.thunder_affection/given/.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0368.thunder_affection/given/ +# +# Effectが付与された時の処理 +# +# @within function asset:effect/0368.thunder_affection/_/given + + function asset:effect/0368.thunder_affection/modifier/add diff --git a/Asset/data/asset/functions/effect/0368.thunder_affection/modifier/add.mcfunction b/Asset/data/asset/functions/effect/0368.thunder_affection/modifier/add.mcfunction new file mode 100644 index 0000000000..e64e800125 --- /dev/null +++ b/Asset/data/asset/functions/effect/0368.thunder_affection/modifier/add.mcfunction @@ -0,0 +1,14 @@ +#> asset:effect/0368.thunder_affection/modifier/add +# +# 補正を付与する +# +# @within function +# asset:effect/0368.thunder_affection/given/ +# asset:effect/0368.thunder_affection/re-given/ + +# 火耐性+5% + data modify storage api: Argument.UUID set value [I;1,3,368,0] + execute store result storage api: Argument.Amount double 0.02 run data get storage asset:context Stack + data modify storage api: Argument.Operation set value "multiply_base" +# リセット + function api:modifier/defense/thunder/add diff --git a/Asset/data/asset/functions/effect/0368.thunder_affection/modifier/remove.mcfunction b/Asset/data/asset/functions/effect/0368.thunder_affection/modifier/remove.mcfunction new file mode 100644 index 0000000000..5ed0bf2cd1 --- /dev/null +++ b/Asset/data/asset/functions/effect/0368.thunder_affection/modifier/remove.mcfunction @@ -0,0 +1,12 @@ +#> asset:effect/0368.thunder_affection/modifier/remove +# +# 補正を削除する +# +# @within function +# asset:effect/0368.thunder_affection/re-given/ +# asset:effect/0368.thunder_affection/end/ +# asset:effect/0368.thunder_affection/remove/ + +# バフ解除 + data modify storage api: Argument.UUID set value [I;1,3,368,0] + function api:modifier/defense/thunder/remove diff --git a/Asset/data/asset/functions/effect/0368.thunder_affection/re-given/.mcfunction b/Asset/data/asset/functions/effect/0368.thunder_affection/re-given/.mcfunction new file mode 100644 index 0000000000..df0edfff76 --- /dev/null +++ b/Asset/data/asset/functions/effect/0368.thunder_affection/re-given/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0368.thunder_affection/re-given/ +# +# Effectが上書きされた時の処理 +# +# @within function asset:effect/0368.thunder_affection/_/re-given + + function asset:effect/0368.thunder_affection/modifier/remove + function asset:effect/0368.thunder_affection/modifier/add diff --git a/Asset/data/asset/functions/effect/0368.thunder_affection/register.mcfunction b/Asset/data/asset/functions/effect/0368.thunder_affection/register.mcfunction new file mode 100644 index 0000000000..f0493ef9af --- /dev/null +++ b/Asset/data/asset/functions/effect/0368.thunder_affection/register.mcfunction @@ -0,0 +1,39 @@ +#> asset:effect/0368.thunder_affection/register +# +# Effectのデータを指定 +# +# @within function asset:effect/0368.thunder_affection/_/register + +# ExtendsSafe (boolean) (default = false) + # data modify storage asset:effect ExtendsSafe set value true +# ID (int) + data modify storage asset:effect ID set value 368 +# 名前 (TextComponentString) + data modify storage asset:effect Name set value '{"text":"サンダーアフェクション","color":"gold"}' +# 説明文 (TextComponentString[]) + data modify storage asset:effect Description set value ['{"text":"雷属性ダメージを受けるたびに、雷耐性がアップする"}'] +# 効果時間 (int) (default = API || error) + data modify storage asset:effect Duration set value 200 +# スタック (int) (default = API || 1) + data modify storage asset:effect Stack set value 1 +# 効果時間の操作方法 (default = API || "replace") + data modify storage asset:effect DurationOperation set value add +# スタックの操作方法 (default = API || "replace") + data modify storage asset:effect StackOperation set value add +# 最大効果時間 (int) (default = 2147483647) + data modify storage asset:effect MaxDuration set value 200 +# 最大スタック (int) (default = 2147483647) + data modify storage asset:effect MaxStack set value 30 +# 悪い効果か否か (boolean) + data modify storage asset:effect IsBadEffect set value false +# 死亡時のエフェクトの処理 (default = "remove") + # data modify storage asset:effect ProcessOnDied set value +# 消すのに必要なレベル (int) (default = 1) + data modify storage asset:effect RequireClearLv set value 3 +# エフェクトをUIに表示するか (boolean) (default = true) + # data modify storage asset:effect Visible set value +# エフェクトのスタックををUIに表示するか (boolean) (default = true) + # data modify storage asset:effect StackVisible set value + +# フィールド + # data modify storage asset:effect Field set value {} diff --git a/Asset/data/asset/functions/effect/0368.thunder_affection/remove/.mcfunction b/Asset/data/asset/functions/effect/0368.thunder_affection/remove/.mcfunction new file mode 100644 index 0000000000..7e2886b392 --- /dev/null +++ b/Asset/data/asset/functions/effect/0368.thunder_affection/remove/.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0368.thunder_affection/remove/ +# +# Effectが削除された時の処理 +# +# @within function asset:effect/0368.thunder_affection/_/remove + + function asset:effect/0368.thunder_affection/modifier/remove diff --git a/Asset/data/asset/tags/functions/artifact/damage.json b/Asset/data/asset/tags/functions/artifact/damage.json index 380f200051..5db925fa20 100644 --- a/Asset/data/asset/tags/functions/artifact/damage.json +++ b/Asset/data/asset/tags/functions/artifact/damage.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1500.elemental_affection/trigger/1.trigger", "asset:artifact/1252.fox_candle/trigger/1.trigger", "asset:artifact/0566.great_sage_helmet/damage/1.trigger", "asset:artifact/1138.over_pulse_bodyarmor/damage/1.trigger", @@ -12,4 +13,4 @@ "asset:artifact/0201.cowardly_soul/trigger/1.trigger", "asset:artifact/0529.safety_helmet/trigger/1.trigger" ] -} +} \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/artifact/dis_equip.json b/Asset/data/asset/tags/functions/artifact/dis_equip.json index 075a2cd540..87e5a469c4 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/1500.elemental_affection/trigger/dis_equip/", "asset:artifact/1325.calamity_chain/trigger/dis_equip/", "asset:artifact/1318.blue_bouquet/trigger/dis_equip/", "asset:artifact/1317.oblivious_feather/trigger/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 49f53e2155..9fa3646a22 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/1500.elemental_affection/trigger/1.trigger", "asset:artifact/1325.calamity_chain/trigger/1.trigger", "asset:artifact/1318.blue_bouquet/trigger/1.trigger", "asset:artifact/1317.oblivious_feather/trigger/1.trigger", @@ -109,4 +110,4 @@ "asset:artifact/0709.mage_robe_lower/trigger/1.trigger", "asset:artifact/0710.mage_boots/trigger/1.trigger" ] -} +} \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/artifact/give.json b/Asset/data/asset/tags/functions/artifact/give.json index 16715fe3c7..88212751fb 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/1500.elemental_affection/give/1.trigger", "asset:artifact/1252.fox_candle/give/1.trigger", "asset:artifact/1343.coffee_milk_pack/give/1.trigger", "asset:artifact/1342.fruit_milk_pack/give/1.trigger", @@ -530,4 +531,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/effect/end.json b/Asset/data/asset/tags/functions/effect/end.json index 48b7d4613e..2a0b9b1a4a 100644 --- a/Asset/data/asset/tags/functions/effect/end.json +++ b/Asset/data/asset/tags/functions/effect/end.json @@ -1,5 +1,8 @@ { "values": [ + "asset:effect/0368.thunder_affection/_/end", + "asset:effect/0367.water_affection/_/end", + "asset:effect/0366.fire_affection/_/end", "asset:effect/0360.calamity_bind/_/end", "asset:effect/0345.topaz_protection/_/end", "asset:effect/0342.prayer_amidst_blight/_/end", @@ -105,4 +108,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 366ab80795..1cc76b1b59 100644 --- a/Asset/data/asset/tags/functions/effect/given.json +++ b/Asset/data/asset/tags/functions/effect/given.json @@ -1,5 +1,8 @@ { "values": [ + "asset:effect/0368.thunder_affection/_/given", + "asset:effect/0367.water_affection/_/given", + "asset:effect/0366.fire_affection/_/given", "asset:effect/0352.kitsunebi/_/given", "asset:effect/0360.calamity_bind/_/given", "asset:effect/0345.topaz_protection/_/given", @@ -100,4 +103,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/re-given.json b/Asset/data/asset/tags/functions/effect/re-given.json index d3650bf09a..772eb1c431 100644 --- a/Asset/data/asset/tags/functions/effect/re-given.json +++ b/Asset/data/asset/tags/functions/effect/re-given.json @@ -1,5 +1,8 @@ { "values": [ + "asset:effect/0368.thunder_affection/_/re-given", + "asset:effect/0367.water_affection/_/re-given", + "asset:effect/0366.fire_affection/_/re-given", "asset:effect/0352.kitsunebi/_/re-given", "asset:effect/0345.topaz_protection/_/re-given", "asset:effect/0029.poison/_/re-given", @@ -60,4 +63,4 @@ "asset:effect/0007.defense_base_debuff/_/re-given", "asset:effect/0258.spirit_melody/_/re-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 2a88625f93..1868472bf3 100644 --- a/Asset/data/asset/tags/functions/effect/register.json +++ b/Asset/data/asset/tags/functions/effect/register.json @@ -1,5 +1,8 @@ { "values": [ + "asset:effect/0368.thunder_affection/_/register", + "asset:effect/0367.water_affection/_/register", + "asset:effect/0366.fire_affection/_/register", "asset:effect/0352.kitsunebi/_/register", "asset:effect/0351.nectar_regeneration/_/register", "asset:effect/0117.slowness/_/register", @@ -175,4 +178,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 a036dc5e9a..02fcebddd5 100644 --- a/Asset/data/asset/tags/functions/effect/remove.json +++ b/Asset/data/asset/tags/functions/effect/remove.json @@ -1,5 +1,8 @@ { "values": [ + "asset:effect/0368.thunder_affection/_/remove", + "asset:effect/0367.water_affection/_/remove", + "asset:effect/0366.fire_affection/_/remove", "asset:effect/0360.calamity_bind/_/remove", "asset:effect/0345.topaz_protection/_/remove", "asset:effect/0342.prayer_amidst_blight/_/remove", @@ -113,4 +116,4 @@ "asset:effect/0007.defense_base_debuff/_/remove", "asset:effect/0258.spirit_melody/_/remove" ] -} +} \ No newline at end of file