diff --git a/Asset/data/asset/functions/artifact/1430.shield_of_fate/effect/buff_give.mcfunction b/Asset/data/asset/functions/artifact/1430.shield_of_fate/effect/buff_give.mcfunction new file mode 100644 index 0000000000..8e40dae99d --- /dev/null +++ b/Asset/data/asset/functions/artifact/1430.shield_of_fate/effect/buff_give.mcfunction @@ -0,0 +1,13 @@ +#> asset:artifact/1430.shield_of_fate/effect/buff_give +# +# バフの付与 +# +# @within function +# asset:artifact/1430.shield_of_fate/trigger/3.main +# asset:artifact/1430.shield_of_fate/tick/check_buff + +#>バフ付与 + data modify storage api: Argument.ID set value 354 + data modify storage api: Argument.FieldOverride.Amount set value 0.15 + function api:entity/mob/effect/give + function api:entity/mob/effect/reset diff --git a/Asset/data/asset/functions/artifact/1430.shield_of_fate/effect/buff_remove.mcfunction b/Asset/data/asset/functions/artifact/1430.shield_of_fate/effect/buff_remove.mcfunction new file mode 100644 index 0000000000..2859442335 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1430.shield_of_fate/effect/buff_remove.mcfunction @@ -0,0 +1,12 @@ +#> asset:artifact/1430.shield_of_fate/effect/buff_remove +# +# バフの削除 +# +# @within function +# asset:artifact/1430.shield_of_fate/tick/check_debuff +# asset:artifact/1430.shield_of_fate/tick/2.check_condition + +#>バフ削除 + 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/effect/debuff_give.mcfunction b/Asset/data/asset/functions/artifact/1430.shield_of_fate/effect/debuff_give.mcfunction new file mode 100644 index 0000000000..0f6c9f4274 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1430.shield_of_fate/effect/debuff_give.mcfunction @@ -0,0 +1,13 @@ +#> asset:artifact/1430.shield_of_fate/effect/debuff_give +# +# デバフの付与 +# +# @within function +# asset:artifact/1430.shield_of_fate/trigger/3.main +# asset:artifact/1430.shield_of_fate/tick/check_debuff + +#>デバフ付与 + data modify storage api: Argument.ID set value 355 + data modify storage api: Argument.FieldOverride.Amount set value -0.15 + function api:entity/mob/effect/give + function api:entity/mob/effect/reset diff --git a/Asset/data/asset/functions/artifact/1430.shield_of_fate/effect/debuff_remove.mcfunction b/Asset/data/asset/functions/artifact/1430.shield_of_fate/effect/debuff_remove.mcfunction new file mode 100644 index 0000000000..3158c77898 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1430.shield_of_fate/effect/debuff_remove.mcfunction @@ -0,0 +1,12 @@ +#> asset:artifact/1430.shield_of_fate/effect/debuff_remove +# +# デバフの削除 +# +# @within function +# asset:artifact/1430.shield_of_fate/tick/check_buff +# asset:artifact/1430.shield_of_fate/tick/2.check_condition + +#>デバフ削除 + data modify storage api: Argument.ID set value 355 + 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/give/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1430.shield_of_fate/give/1.trigger.mcfunction new file mode 100644 index 0000000000..0fe4c5e4ce --- /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 0000000000..dd3c09f1bc --- /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":"運命","color":"#3E53FF"},{"text":"の","color":"#737FFF"},{"text":"盾","color":"#8DB2FC"}]' +# 神器の説明文 (TextComponentString[]) + 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 + # 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 "passive" +# 効果が重複可能か否か (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 120 +# MP必要量 (int) (オプション) + data modify storage asset:artifact MPRequire set value 0 +# 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 0000000000..cb5cc17d9e --- /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/tick/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1430.shield_of_fate/tick/1.trigger.mcfunction new file mode 100644 index 0000000000..ca92165953 --- /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 0000000000..4b3e200078 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1430.shield_of_fate/tick/2.check_condition.mcfunction @@ -0,0 +1,28 @@ +#> asset:artifact/1430.shield_of_fate/tick/2.check_condition +# +# 神器の発動条件のチェック +# +# @within function asset:artifact/1430.shield_of_fate/tick/1.trigger + +# ID指定する + data modify storage asset:artifact TargetID set value 1430 +# 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く + function asset:artifact/common/check_condition/hotbar + +# 使用できない場合バフ、デバフを削除する + execute if entity @s[tag=!CanUsed] run function asset:artifact/1430.shield_of_fate/effect/buff_remove + execute if entity @s[tag=!CanUsed] run function asset:artifact/1430.shield_of_fate/effect/debuff_remove +# 使用できなければリターン + execute if entity @s[tag=!CanUsed] run return fail + +# 現在体力割合を取得する + function api:entity/player/get_health_per + execute store result score $13Q.HealthPer Temporary run data get storage api: Return.HealthPer 1000 + +# 体力が30%以下 + execute if score $13Q.HealthPer Temporary matches ..300 run function asset:artifact/1430.shield_of_fate/tick/check_debuff +# 体力が30%以下でない + execute unless score $13Q.HealthPer Temporary matches ..300 run function asset:artifact/1430.shield_of_fate/tick/check_buff + +# リセット + scoreboard players reset $13Q.HealthPer Temporary 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 0000000000..41a1c6830d --- /dev/null +++ b/Asset/data/asset/functions/artifact/1430.shield_of_fate/tick/check_buff.mcfunction @@ -0,0 +1,13 @@ +#> asset:artifact/1430.shield_of_fate/tick/check_buff +# +# デバフが付与されていれば削除しバフ付与の処理を行う +# +# @within function asset:artifact/1430.shield_of_fate/tick/2.check_condition + +# buff(ID 354)を検索する + data modify storage api: Argument.ID set value 354 + function api:entity/mob/effect/get/from_id + +# 付与されていなかったら実行 + execute unless data storage api: Return.Effect run function asset:artifact/1430.shield_of_fate/effect/buff_give + execute unless data storage api: Return.Effect run function asset:artifact/1430.shield_of_fate/effect/debuff_remove 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 0000000000..bfc8e45558 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1430.shield_of_fate/tick/check_debuff.mcfunction @@ -0,0 +1,13 @@ +#> asset:artifact/1430.shield_of_fate/tick/check_debuff +# +# バフが付与されていれば削除しデバフ付与の処理を行う +# +# @within function asset:artifact/1430.shield_of_fate/tick/2.check_condition + +# debuff(ID 355)を検索する + data modify storage api: Argument.ID set value 355 + function api:entity/mob/effect/get/from_id + +# 付与されていなかったら実行 + execute unless data storage api: Return.Effect run function asset:artifact/1430.shield_of_fate/effect/debuff_give + execute unless data storage api: Return.Effect run function asset:artifact/1430.shield_of_fate/effect/buff_remove 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 0000000000..ef30a51ef1 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/1.trigger.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1430.shield_of_fate/trigger/1.trigger +# +# 装備を装備時に装備した部位にのみの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/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 0000000000..392f4eff07 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/2.check_condition.mcfunction @@ -0,0 +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 +# 他にアイテム等確認する場合はここに書く + 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 new file mode 100644 index 0000000000..f619d4aec8 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/3.main.mcfunction @@ -0,0 +1,27 @@ +#> 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 + +# 装備タグの付与 + tag @s add 13Q.Equipped + +# 現在体力割合を取得する + function api:entity/player/get_health_per + execute store result score $13Q.HealthPer Temporary run data get storage api: Return.HealthPer 1000 + +# 現在体力が30%以下でデバフを、30%より上でバフを付与する + execute if score $13Q.HealthPer Temporary matches ..300 run function asset:artifact/1430.shield_of_fate/effect/debuff_give + execute unless score $13Q.HealthPer Temporary matches ..300 run function asset:artifact/1430.shield_of_fate/effect/buff_give + +# リセット + scoreboard players reset $13Q.HealthPer Temporary + +# sound + playsound minecraft:block.copper_trapdoor.open player @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 new file mode 100644 index 0000000000..4f6e7d372c --- /dev/null +++ b/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/_index.d.mcfunction @@ -0,0 +1,10 @@ +#> asset:artifact/1430.shield_of_fate/trigger/_index.d +# @private + +#> tag +# @within function asset:artifact/1430.shield_of_fate/trigger/** + #declare tag 13Q.Equipped + +#> 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/.mcfunction b/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/dis_equip/.mcfunction new file mode 100644 index 0000000000..23730d516d --- /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 0000000000..6b6b9db392 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/dis_equip/main.mcfunction @@ -0,0 +1,18 @@ +#> asset:artifact/1430.shield_of_fate/trigger/dis_equip/main +# +# 装備を外した時のメイン処理 +# +# @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 0000000000..2ce4fa50e0 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1430.shield_of_fate/trigger/dis_equip/remove_modifier.mcfunction @@ -0,0 +1,23 @@ +#> 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 + +# 削除 (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 + playsound minecraft:block.copper_trapdoor.open player @a ~ ~ ~ 1.0 0.9 0.0 + playsound minecraft:block.copper_door.open player @a ~ ~ ~ 1.0 0.5 0.0 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 0000000000..1db8f04204 --- /dev/null +++ b/Asset/data/asset/functions/effect/0354.protecction_of_courage/_/end.mcfunction @@ -0,0 +1,7 @@ +#> 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/0354.protecction_of_courage/end/ 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 0000000000..a567c5e809 --- /dev/null +++ b/Asset/data/asset/functions/effect/0354.protecction_of_courage/_/given.mcfunction @@ -0,0 +1,7 @@ +#> 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/0354.protecction_of_courage/given/ diff --git a/Asset/data/asset/functions/effect/0354.protecction_of_courage/_/register.mcfunction b/Asset/data/asset/functions/effect/0354.protecction_of_courage/_/register.mcfunction new file mode 100644 index 0000000000..62ab7f35e4 --- /dev/null +++ b/Asset/data/asset/functions/effect/0354.protecction_of_courage/_/register.mcfunction @@ -0,0 +1,7 @@ +#> 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/0354.protecction_of_courage/register 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 0000000000..0cdcd02e26 --- /dev/null +++ b/Asset/data/asset/functions/effect/0354.protecction_of_courage/_/remove.mcfunction @@ -0,0 +1,7 @@ +#> 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/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 0000000000..018d8964ed --- /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 0000000000..7db7a37499 --- /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 0000000000..1fcbe54ab3 --- /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/0354.protecction_of_courage/modifier/add.mcfunction b/Asset/data/asset/functions/effect/0354.protecction_of_courage/modifier/add.mcfunction new file mode 100644 index 0000000000..9167ee93ef --- /dev/null +++ b/Asset/data/asset/functions/effect/0354.protecction_of_courage/modifier/add.mcfunction @@ -0,0 +1,11 @@ +#> asset:effect/0354.protecction_of_courage/modifier/add +# +# 効果の付与 +# +# @within function asset:effect/0354.protecction_of_courage/given/ + +# 補正を付与する + data modify storage api: Argument.UUID set from storage asset:context this.UUID + data modify storage api: Argument.Amount set from storage asset:context this.Amount + data modify storage api: Argument.Operation set value "multiply_base" + function api:modifier/defense/base/add diff --git a/Asset/data/asset/functions/effect/0354.protecction_of_courage/modifier/remove.mcfunction b/Asset/data/asset/functions/effect/0354.protecction_of_courage/modifier/remove.mcfunction new file mode 100644 index 0000000000..925c039e3e --- /dev/null +++ b/Asset/data/asset/functions/effect/0354.protecction_of_courage/modifier/remove.mcfunction @@ -0,0 +1,11 @@ +#> asset:effect/0354.protecction_of_courage/modifier/remove +# +# 補正の削除 +# +# @within function +# asset:effect/0354.protecction_of_courage/remove/ +# asset:effect/0354.protecction_of_courage/end/ + +# 補正を削除する + data modify storage api: Argument.UUID set from storage asset:context this.UUID + function api:modifier/defense/base/remove diff --git a/Asset/data/asset/functions/effect/0354.protecction_of_courage/register.mcfunction b/Asset/data/asset/functions/effect/0354.protecction_of_courage/register.mcfunction new file mode 100644 index 0000000000..e8aa654a70 --- /dev/null +++ b/Asset/data/asset/functions/effect/0354.protecction_of_courage/register.mcfunction @@ -0,0 +1,40 @@ +#> asset:effect/0354.protecction_of_courage/register +# +# Effectのデータを指定 +# +# @within function asset:effect/0354.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":"あなたは守られていると感じる。"}','{"text":"被ダメージが低下する}'] +# 効果時間 (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 "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 true +# エフェクトのスタックををUIに表示するか (boolean) (default = true) + data modify storage asset:effect StackVisible set value false + +# フィールド + data modify storage asset:effect Field.UUID set value [I;1,3,354,0] + data modify storage asset:effect Field.Amount set value 0 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 0000000000..8325e6e9a3 --- /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 0000000000..75d0f8ff9f --- /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 0000000000..15942f82c3 --- /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 0000000000..4a69f9eed6 --- /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 0000000000..3c6b0868b4 --- /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 0000000000..993eda5064 --- /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 0000000000..b49f1d03bc --- /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 0000000000..fe8033cd94 --- /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 0000000000..ae9c5bdfb7 --- /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 from storage asset:context this.UUID + data modify storage api: Argument.Amount set from storage asset:context this.Amount + 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 0000000000..d13ce9bb4d --- /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 from storage asset:context this.UUID + 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 0000000000..d7a610f523 --- /dev/null +++ b/Asset/data/asset/functions/effect/0355.heart_gap/register.mcfunction @@ -0,0 +1,40 @@ +#> 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":"被ダメージが増加する}'] +# 効果時間 (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 true +# エフェクトのスタックををUIに表示するか (boolean) (default = true) + data modify storage asset:effect StackVisible set value false + +# フィールド + data modify storage asset:effect Field.UUID set value [I;1,3,355,0] + data modify storage asset:effect Field.Amount set value 0 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 0000000000..44bb3b68ce --- /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 0000000000..e3e004171d --- /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/tags/functions/artifact/dis_equip.json b/Asset/data/asset/tags/functions/artifact/dis_equip.json index 075a2cd540..9a40bad9a2 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/1325.calamity_chain/trigger/dis_equip/", "asset:artifact/1318.blue_bouquet/trigger/dis_equip/", "asset:artifact/1317.oblivious_feather/trigger/dis_equip/", diff --git a/Asset/data/asset/tags/functions/artifact/equip.json b/Asset/data/asset/tags/functions/artifact/equip.json index 49f53e2155..73eb74e272 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/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", diff --git a/Asset/data/asset/tags/functions/artifact/give.json b/Asset/data/asset/tags/functions/artifact/give.json index 16715fe3c7..2f767f317c 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/1252.fox_candle/give/1.trigger", "asset:artifact/1343.coffee_milk_pack/give/1.trigger", "asset:artifact/1342.fruit_milk_pack/give/1.trigger", diff --git a/Asset/data/asset/tags/functions/artifact/register.json b/Asset/data/asset/tags/functions/artifact/register.json index 7e92660e5a..41209f42f1 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/1252.fox_candle/register", "asset:artifact/1343.coffee_milk_pack/register", "asset:artifact/1342.fruit_milk_pack/register", diff --git a/Asset/data/asset/tags/functions/artifact/tick.json b/Asset/data/asset/tags/functions/artifact/tick.json index 878334fd80..d59e2b92e0 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 48b7d4613e..c71fd2d9ce 100644 --- a/Asset/data/asset/tags/functions/effect/end.json +++ b/Asset/data/asset/tags/functions/effect/end.json @@ -1,5 +1,7 @@ { "values": [ + "asset:effect/0355.heart_gap/_/end", + "asset:effect/0354.protecction_of_courage/_/end", "asset:effect/0360.calamity_bind/_/end", "asset:effect/0345.topaz_protection/_/end", "asset:effect/0342.prayer_amidst_blight/_/end", diff --git a/Asset/data/asset/tags/functions/effect/given.json b/Asset/data/asset/tags/functions/effect/given.json index 366ab80795..9404a1972c 100644 --- a/Asset/data/asset/tags/functions/effect/given.json +++ b/Asset/data/asset/tags/functions/effect/given.json @@ -1,5 +1,7 @@ { "values": [ + "asset:effect/0355.heart_gap/_/given", + "asset:effect/0354.protecction_of_courage/_/given", "asset:effect/0352.kitsunebi/_/given", "asset:effect/0360.calamity_bind/_/given", "asset:effect/0345.topaz_protection/_/given", diff --git a/Asset/data/asset/tags/functions/effect/register.json b/Asset/data/asset/tags/functions/effect/register.json index 2a88625f93..3be7878905 100644 --- a/Asset/data/asset/tags/functions/effect/register.json +++ b/Asset/data/asset/tags/functions/effect/register.json @@ -1,5 +1,7 @@ { "values": [ + "asset:effect/0355.heart_gap/_/register", + "asset:effect/0354.protecction_of_courage/_/register", "asset:effect/0352.kitsunebi/_/register", "asset:effect/0351.nectar_regeneration/_/register", "asset:effect/0117.slowness/_/register", diff --git a/Asset/data/asset/tags/functions/effect/remove.json b/Asset/data/asset/tags/functions/effect/remove.json index a036dc5e9a..b6065a0b9e 100644 --- a/Asset/data/asset/tags/functions/effect/remove.json +++ b/Asset/data/asset/tags/functions/effect/remove.json @@ -1,5 +1,7 @@ { "values": [ + "asset:effect/0355.heart_gap/_/remove", + "asset:effect/0354.protecction_of_courage/_/remove", "asset:effect/0360.calamity_bind/_/remove", "asset:effect/0345.topaz_protection/_/remove", "asset:effect/0342.prayer_amidst_blight/_/remove", diff --git a/Asset/data/asset/tags/functions/effect/tick.json b/Asset/data/asset/tags/functions/effect/tick.json index c055726179..b983dbede0 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/0352.kitsunebi/_/tick", "asset:effect/0351.nectar_regeneration/_/tick", "asset:effect/0360.calamity_bind/_/tick",