diff --git a/Asset/data/asset/functions/artifact/1470.ninja_hood/give/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1470.ninja_hood/give/1.trigger.mcfunction new file mode 100644 index 0000000000..b04b6b4563 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1470.ninja_hood/give/1.trigger.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1470.ninja_hood/give/1.trigger +# +# 神器の取得処理の呼び出し時に実行されるfunction +# +# @within tag/function asset:artifact/give + +execute if data storage asset:context {id:1470} run function asset:artifact/1470.ninja_hood/give/2.give \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1470.ninja_hood/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1470.ninja_hood/give/2.give.mcfunction new file mode 100644 index 0000000000..e4c548dc6e --- /dev/null +++ b/Asset/data/asset/functions/artifact/1470.ninja_hood/give/2.give.mcfunction @@ -0,0 +1,74 @@ +#> asset:artifact/1470.ninja_hood/give/2.give +# +# 神器の作成部 ここでID等を定義する +# +# @user +# @within function asset:artifact/1470.ninja_hood/give/1.trigger + +# 神器の説明や消費MPなどをここで設定する。 +# 最後にasset:artifact/common/giveを実行することで入手可能。 + +# 神器のID (int) スプレッドシートの値を入れる + data modify storage asset:artifact ID set value 1470 +# 神器のベースアイテム + data modify storage asset:artifact Item set value "minecraft:chainmail_helmet" +# 神器の名前 (TextComponentString) + data modify storage asset:artifact Name set value '{"text": "忍びの頭巾"}' +# 神器の説明文 (TextComponentString[]) + data modify storage asset:artifact Lore set value ['{"text": "一ツ、息ヲ潜メルコト。", "color": "gray"}'] +# 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション) + # data modify storage asset:artifact ConsumeItem.Item set value '{"translate":"item.minecraft.stick"}' + # data modify storage asset:artifact ConsumeItem.Count set value 1 + # data modify storage asset:artifact ConsumeItem.Extra set value +# 使用回数 (int) (オプション) + # data modify storage asset:artifact RemainingCount set value +# 神器を発動できるスロット (string) Wikiを参照 + data modify storage asset:artifact Slot set value "head" +# 神器のトリガー (string) Wikiを参照 + data modify storage asset:artifact Trigger set value "passive" +# 神器の発動条件 (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 +# 装備時効果 ({ID: int, Visible: boolean}[]) (オプション) + data modify storage asset:artifact Equipment.Effects set value [{ID:384,Visible:true,IsSetEffect:true}] +# 装備時ステータス補正 ({Type: string, Amount: double, Operation: string, StackReduction?: double}[]) (オプション) + data modify storage asset:artifact Equipment.Modifiers set value [] + data modify storage asset:artifact Equipment.Modifiers append value {Type:"attack/physical",Amount:0.05d,Operation:"multiply_base"} + data modify storage asset:artifact Equipment.Modifiers append value {Type:"generic.movement_speed",Amount:0.15d,Operation:"multiply_base"} +# 扱える神 (string[]) Wikiを参照 + data modify storage asset:artifact CanUsedGod set value ["Nyaptov", "Rumor"] +# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) + data modify storage asset:artifact CustomNBT set value {HideFlags:253,Unbreakable:1b,Trim:{material:"minecraft:iron",pattern:"tsb_armor:1470"}} + +# 神器の入手用function + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/1470.ninja_hood/register.mcfunction b/Asset/data/asset/functions/artifact/1470.ninja_hood/register.mcfunction new file mode 100644 index 0000000000..8f6c88f364 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1470.ninja_hood/register.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1470.ninja_hood/register +# +# 神器プールへの登録処理 +# +# @within tag/function asset:artifact/register + +data modify storage asset:artifact RarityRegistry[3] append value [1470, 1471, 1472, 1473] +data modify storage asset:artifact RarityRegistryWithColor.Blue[3] append value [1470, 1471, 1472, 1473] diff --git a/Asset/data/asset/functions/artifact/1470.ninja_hood/trigger/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1470.ninja_hood/trigger/1.trigger.mcfunction new file mode 100644 index 0000000000..f63acd88e0 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1470.ninja_hood/trigger/1.trigger.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1470.ninja_hood/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:1470} run function asset:artifact/1470.ninja_hood/trigger/2.check_condition \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1470.ninja_hood/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1470.ninja_hood/trigger/2.check_condition.mcfunction new file mode 100644 index 0000000000..ec248fe044 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1470.ninja_hood/trigger/2.check_condition.mcfunction @@ -0,0 +1,12 @@ +#> asset:artifact/1470.ninja_hood/trigger/2.check_condition +# +# 神器の発動条件をチェックします +# +# @within function asset:artifact/1470.ninja_hood/trigger/1.trigger + +# 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く + function asset:artifact/common/check_condition/head +# 他にアイテム等確認する場合はここに書く + +# CanUsedタグをチェックして3.main.mcfunctionを実行する + execute if entity @s[tag=CanUsed] run function asset:artifact/1470.ninja_hood/trigger/3.main \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1470.ninja_hood/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1470.ninja_hood/trigger/3.main.mcfunction new file mode 100644 index 0000000000..3ea7b67159 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1470.ninja_hood/trigger/3.main.mcfunction @@ -0,0 +1,11 @@ +#> asset:artifact/1470.ninja_hood/trigger/3.main +# +# 神器のメイン処理部 +# +# @within function asset:artifact/1470.ninja_hood/trigger/2.check_condition + +# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う + function asset:artifact/common/use/head + +# ここから先は神器側の効果の処理を書く + playsound ogg:item.armor.equip_leather1 player @a ~ ~ ~ 1.0 1.0 diff --git a/Asset/data/asset/functions/artifact/1471.ninja_robe/give/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1471.ninja_robe/give/1.trigger.mcfunction new file mode 100644 index 0000000000..2f0bf5c56d --- /dev/null +++ b/Asset/data/asset/functions/artifact/1471.ninja_robe/give/1.trigger.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1471.ninja_robe/give/1.trigger +# +# 神器の取得処理の呼び出し時に実行されるfunction +# +# @within tag/function asset:artifact/give + +execute if data storage asset:context {id:1471} run function asset:artifact/1471.ninja_robe/give/2.give \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1471.ninja_robe/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1471.ninja_robe/give/2.give.mcfunction new file mode 100644 index 0000000000..5b499e4183 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1471.ninja_robe/give/2.give.mcfunction @@ -0,0 +1,74 @@ +#> asset:artifact/1471.ninja_robe/give/2.give +# +# 神器の作成部 ここでID等を定義する +# +# @user +# @within function asset:artifact/1471.ninja_robe/give/1.trigger + +# 神器の説明や消費MPなどをここで設定する。 +# 最後にasset:artifact/common/giveを実行することで入手可能。 + +# 神器のID (int) スプレッドシートの値を入れる + data modify storage asset:artifact ID set value 1471 +# 神器のベースアイテム + data modify storage asset:artifact Item set value "minecraft:chainmail_chestplate" +# 神器の名前 (TextComponentString) + data modify storage asset:artifact Name set value '{"text": "忍びの装束"}' +# 神器の説明文 (TextComponentString[]) + data modify storage asset:artifact Lore set value ['{"text": "一ツ、闇ニ紛スルコト。", "color": "gray"}'] +# 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション) + # data modify storage asset:artifact ConsumeItem.Item set value '{"translate":"item.minecraft.stick"}' + # data modify storage asset:artifact ConsumeItem.Count set value 1 + # data modify storage asset:artifact ConsumeItem.Extra set value +# 使用回数 (int) (オプション) + # data modify storage asset:artifact RemainingCount set value +# 神器を発動できるスロット (string) Wikiを参照 + data modify storage asset:artifact Slot set value "chest" +# 神器のトリガー (string) Wikiを参照 + data modify storage asset:artifact Trigger set value "passive" +# 神器の発動条件 (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 +# 装備時効果 ({ID: int, Visible: boolean}[]) (オプション) + data modify storage asset:artifact Equipment.Effects set value [{ID:384,Visible:true,IsSetEffect:true}] +# 装備時ステータス補正 ({Type: string, Amount: double, Operation: string, StackReduction?: double}[]) (オプション) + data modify storage asset:artifact Equipment.Modifiers set value [] + data modify storage asset:artifact Equipment.Modifiers append value {Type:"attack/physical",Amount:0.05d,Operation:"multiply_base"} + data modify storage asset:artifact Equipment.Modifiers append value {Type:"generic.movement_speed",Amount:0.15d,Operation:"multiply_base"} +# 扱える神 (string[]) Wikiを参照 + data modify storage asset:artifact CanUsedGod set value ["Nyaptov", "Rumor"] +# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) + data modify storage asset:artifact CustomNBT set value {HideFlags:253,Unbreakable:1b,Trim:{material:"minecraft:iron",pattern:"tsb_armor:1470"}} + +# 神器の入手用function + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/1471.ninja_robe/trigger/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1471.ninja_robe/trigger/1.trigger.mcfunction new file mode 100644 index 0000000000..121d58fd90 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1471.ninja_robe/trigger/1.trigger.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1471.ninja_robe/trigger/1.trigger +# +# 指定したイベントタイミングで実行されるfunction +# +# @within tag/function asset:artifact/** + +# storage asset:idのchestに装備している神器のIDが入っているので比較し、~/2.check_condition.mcfunctionを実行する + execute if data storage asset:context id{chest:1471} run function asset:artifact/1471.ninja_robe/trigger/2.check_condition \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1471.ninja_robe/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1471.ninja_robe/trigger/2.check_condition.mcfunction new file mode 100644 index 0000000000..d6fc71349f --- /dev/null +++ b/Asset/data/asset/functions/artifact/1471.ninja_robe/trigger/2.check_condition.mcfunction @@ -0,0 +1,12 @@ +#> asset:artifact/1471.ninja_robe/trigger/2.check_condition +# +# 神器の発動条件をチェックします +# +# @within function asset:artifact/1471.ninja_robe/trigger/1.trigger + +# 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く + function asset:artifact/common/check_condition/chest +# 他にアイテム等確認する場合はここに書く + +# CanUsedタグをチェックして3.main.mcfunctionを実行する + execute if entity @s[tag=CanUsed] run function asset:artifact/1471.ninja_robe/trigger/3.main \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1471.ninja_robe/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1471.ninja_robe/trigger/3.main.mcfunction new file mode 100644 index 0000000000..2e3e9bfac7 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1471.ninja_robe/trigger/3.main.mcfunction @@ -0,0 +1,11 @@ +#> asset:artifact/1471.ninja_robe/trigger/3.main +# +# 神器のメイン処理部 +# +# @within function asset:artifact/1471.ninja_robe/trigger/2.check_condition + +# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う + function asset:artifact/common/use/chest + +# ここから先は神器側の効果の処理を書く + playsound ogg:item.armor.equip_leather1 player @a ~ ~ ~ 1.0 1.0 diff --git a/Asset/data/asset/functions/artifact/1472.ninja_pants/give/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1472.ninja_pants/give/1.trigger.mcfunction new file mode 100644 index 0000000000..1d4e8d0c9e --- /dev/null +++ b/Asset/data/asset/functions/artifact/1472.ninja_pants/give/1.trigger.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1472.ninja_pants/give/1.trigger +# +# 神器の取得処理の呼び出し時に実行されるfunction +# +# @within tag/function asset:artifact/give + +execute if data storage asset:context {id:1472} run function asset:artifact/1472.ninja_pants/give/2.give \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1472.ninja_pants/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1472.ninja_pants/give/2.give.mcfunction new file mode 100644 index 0000000000..20aff993b1 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1472.ninja_pants/give/2.give.mcfunction @@ -0,0 +1,74 @@ +#> asset:artifact/1472.ninja_pants/give/2.give +# +# 神器の作成部 ここでID等を定義する +# +# @user +# @within function asset:artifact/1472.ninja_pants/give/1.trigger + +# 神器の説明や消費MPなどをここで設定する。 +# 最後にasset:artifact/common/giveを実行することで入手可能。 + +# 神器のID (int) スプレッドシートの値を入れる + data modify storage asset:artifact ID set value 1472 +# 神器のベースアイテム + data modify storage asset:artifact Item set value "minecraft:chainmail_leggings" +# 神器の名前 (TextComponentString) + data modify storage asset:artifact Name set value '{"text": "忍びの袴"}' +# 神器の説明文 (TextComponentString[]) + data modify storage asset:artifact Lore set value ['{"text": "一ツ、物音ヲタテナイコト。", "color": "gray"}'] +# 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション) + # data modify storage asset:artifact ConsumeItem.Item set value '{"translate":"item.minecraft.stick"}' + # data modify storage asset:artifact ConsumeItem.Count set value 1 + # data modify storage asset:artifact ConsumeItem.Extra set value +# 使用回数 (int) (オプション) + # data modify storage asset:artifact RemainingCount set value +# 神器を発動できるスロット (string) Wikiを参照 + data modify storage asset:artifact Slot set value "legs" +# 神器のトリガー (string) Wikiを参照 + data modify storage asset:artifact Trigger set value "passive" +# 神器の発動条件 (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 +# 装備時効果 ({ID: int, Visible: boolean}[]) (オプション) + data modify storage asset:artifact Equipment.Effects set value [{ID:384,Visible:true,IsSetEffect:true}] +# 装備時ステータス補正 ({Type: string, Amount: double, Operation: string, StackReduction?: double}[]) (オプション) + data modify storage asset:artifact Equipment.Modifiers set value [] + data modify storage asset:artifact Equipment.Modifiers append value {Type:"attack/physical",Amount:0.05d,Operation:"multiply_base"} + data modify storage asset:artifact Equipment.Modifiers append value {Type:"generic.movement_speed",Amount:0.15d,Operation:"multiply_base"} +# 扱える神 (string[]) Wikiを参照 + data modify storage asset:artifact CanUsedGod set value ["Nyaptov", "Rumor"] +# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) + data modify storage asset:artifact CustomNBT set value {HideFlags:253,Unbreakable:1b,Trim:{material:"minecraft:iron",pattern:"tsb_armor:1470"}} + +# 神器の入手用function + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/1472.ninja_pants/trigger/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1472.ninja_pants/trigger/1.trigger.mcfunction new file mode 100644 index 0000000000..ad1c9801f8 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1472.ninja_pants/trigger/1.trigger.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1472.ninja_pants/trigger/1.trigger +# +# 指定したイベントタイミングで実行されるfunction +# +# @within tag/function asset:artifact/** + +# storage asset:idのlegsに装備している神器のIDが入っているので比較し、~/2.check_condition.mcfunctionを実行する + execute if data storage asset:context id{legs:1472} run function asset:artifact/1472.ninja_pants/trigger/2.check_condition \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1472.ninja_pants/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1472.ninja_pants/trigger/2.check_condition.mcfunction new file mode 100644 index 0000000000..9f44e68414 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1472.ninja_pants/trigger/2.check_condition.mcfunction @@ -0,0 +1,12 @@ +#> asset:artifact/1472.ninja_pants/trigger/2.check_condition +# +# 神器の発動条件をチェックします +# +# @within function asset:artifact/1472.ninja_pants/trigger/1.trigger + +# 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く + function asset:artifact/common/check_condition/legs +# 他にアイテム等確認する場合はここに書く + +# CanUsedタグをチェックして3.main.mcfunctionを実行する + execute if entity @s[tag=CanUsed] run function asset:artifact/1472.ninja_pants/trigger/3.main \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1472.ninja_pants/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1472.ninja_pants/trigger/3.main.mcfunction new file mode 100644 index 0000000000..c1a038071b --- /dev/null +++ b/Asset/data/asset/functions/artifact/1472.ninja_pants/trigger/3.main.mcfunction @@ -0,0 +1,11 @@ +#> asset:artifact/1472.ninja_pants/trigger/3.main +# +# 神器のメイン処理部 +# +# @within function asset:artifact/1472.ninja_pants/trigger/2.check_condition + +# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う + function asset:artifact/common/use/legs + +# ここから先は神器側の効果の処理を書く + playsound ogg:item.armor.equip_leather1 player @a ~ ~ ~ 1.0 1.0 diff --git a/Asset/data/asset/functions/artifact/1473.ninja_sandals/give/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1473.ninja_sandals/give/1.trigger.mcfunction new file mode 100644 index 0000000000..63afe6ac4c --- /dev/null +++ b/Asset/data/asset/functions/artifact/1473.ninja_sandals/give/1.trigger.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1473.ninja_sandals/give/1.trigger +# +# 神器の取得処理の呼び出し時に実行されるfunction +# +# @within tag/function asset:artifact/give + +execute if data storage asset:context {id:1473} run function asset:artifact/1473.ninja_sandals/give/2.give \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1473.ninja_sandals/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1473.ninja_sandals/give/2.give.mcfunction new file mode 100644 index 0000000000..082ff7ff0b --- /dev/null +++ b/Asset/data/asset/functions/artifact/1473.ninja_sandals/give/2.give.mcfunction @@ -0,0 +1,74 @@ +#> asset:artifact/1473.ninja_sandals/give/2.give +# +# 神器の作成部 ここでID等を定義する +# +# @user +# @within function asset:artifact/1473.ninja_sandals/give/1.trigger + +# 神器の説明や消費MPなどをここで設定する。 +# 最後にasset:artifact/common/giveを実行することで入手可能。 + +# 神器のID (int) スプレッドシートの値を入れる + data modify storage asset:artifact ID set value 1473 +# 神器のベースアイテム + data modify storage asset:artifact Item set value "minecraft:chainmail_boots" +# 神器の名前 (TextComponentString) + data modify storage asset:artifact Name set value '{"text": "忍びの草鞋"}' +# 神器の説明文 (TextComponentString[]) + data modify storage asset:artifact Lore set value ['{"text": "一ツ、速ヤカニ動クコト。", "color": "gray"}'] +# 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション) + # data modify storage asset:artifact ConsumeItem.Item set value '{"translate":"item.minecraft.stick"}' + # data modify storage asset:artifact ConsumeItem.Count set value 1 + # data modify storage asset:artifact ConsumeItem.Extra set value +# 使用回数 (int) (オプション) + # data modify storage asset:artifact RemainingCount set value +# 神器を発動できるスロット (string) Wikiを参照 + data modify storage asset:artifact Slot set value "feet" +# 神器のトリガー (string) Wikiを参照 + data modify storage asset:artifact Trigger set value "passive" +# 神器の発動条件 (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 +# 装備時効果 ({ID: int, Visible: boolean}[]) (オプション) + data modify storage asset:artifact Equipment.Effects set value [{ID:384,Visible:true,IsSetEffect:true}] +# 装備時ステータス補正 ({Type: string, Amount: double, Operation: string, StackReduction?: double}[]) (オプション) + data modify storage asset:artifact Equipment.Modifiers set value [] + data modify storage asset:artifact Equipment.Modifiers append value {Type:"attack/physical",Amount:0.05d,Operation:"multiply_base"} + data modify storage asset:artifact Equipment.Modifiers append value {Type:"generic.movement_speed",Amount:0.15d,Operation:"multiply_base"} +# 扱える神 (string[]) Wikiを参照 + data modify storage asset:artifact CanUsedGod set value ["Nyaptov", "Rumor"] +# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) + data modify storage asset:artifact CustomNBT set value {HideFlags:253,Unbreakable:1b,Trim:{material:"minecraft:iron",pattern:"tsb_armor:1470"}} + +# 神器の入手用function + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/1473.ninja_sandals/trigger/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1473.ninja_sandals/trigger/1.trigger.mcfunction new file mode 100644 index 0000000000..a9a0d26c0b --- /dev/null +++ b/Asset/data/asset/functions/artifact/1473.ninja_sandals/trigger/1.trigger.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1473.ninja_sandals/trigger/1.trigger +# +# 指定したイベントタイミングで実行されるfunction +# +# @within tag/function asset:artifact/** + +# storage asset:idのfeetに装備している神器のIDが入っているので比較し、~/2.check_condition.mcfunctionを実行する + execute if data storage asset:context id{feet:1473} run function asset:artifact/1473.ninja_sandals/trigger/2.check_condition \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1473.ninja_sandals/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1473.ninja_sandals/trigger/2.check_condition.mcfunction new file mode 100644 index 0000000000..6b4329dc5a --- /dev/null +++ b/Asset/data/asset/functions/artifact/1473.ninja_sandals/trigger/2.check_condition.mcfunction @@ -0,0 +1,12 @@ +#> asset:artifact/1473.ninja_sandals/trigger/2.check_condition +# +# 神器の発動条件をチェックします +# +# @within function asset:artifact/1473.ninja_sandals/trigger/1.trigger + +# 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く + function asset:artifact/common/check_condition/feet +# 他にアイテム等確認する場合はここに書く + +# CanUsedタグをチェックして3.main.mcfunctionを実行する + execute if entity @s[tag=CanUsed] run function asset:artifact/1473.ninja_sandals/trigger/3.main \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1473.ninja_sandals/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1473.ninja_sandals/trigger/3.main.mcfunction new file mode 100644 index 0000000000..d2d3d1785b --- /dev/null +++ b/Asset/data/asset/functions/artifact/1473.ninja_sandals/trigger/3.main.mcfunction @@ -0,0 +1,11 @@ +#> asset:artifact/1473.ninja_sandals/trigger/3.main +# +# 神器のメイン処理部 +# +# @within function asset:artifact/1473.ninja_sandals/trigger/2.check_condition + +# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う + function asset:artifact/common/use/feet + +# ここから先は神器側の効果の処理を書く + playsound ogg:item.armor.equip_leather1 player @a ~ ~ ~ 1.0 1.0 diff --git a/Asset/data/asset/functions/effect/0384.ninjas_mindset/_/given.mcfunction b/Asset/data/asset/functions/effect/0384.ninjas_mindset/_/given.mcfunction new file mode 100644 index 0000000000..04a8838d3a --- /dev/null +++ b/Asset/data/asset/functions/effect/0384.ninjas_mindset/_/given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0384.ninjas_mindset/_/given +# +# Effectが付与された時に実行されるfunction +# +# @within tag/function asset:effect/given + +execute if data storage asset:context {id:384} run function asset:effect/0384.ninjas_mindset/given/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0384.ninjas_mindset/_/re-given.mcfunction b/Asset/data/asset/functions/effect/0384.ninjas_mindset/_/re-given.mcfunction new file mode 100644 index 0000000000..9a3a9a60af --- /dev/null +++ b/Asset/data/asset/functions/effect/0384.ninjas_mindset/_/re-given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0384.ninjas_mindset/_/re-given +# +# Effectが上書きされた時に実行されるfunction +# +# @within tag/function asset:effect/re-given + +execute if data storage asset:context {id:384} run function asset:effect/0384.ninjas_mindset/re-given/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0384.ninjas_mindset/_/register.mcfunction b/Asset/data/asset/functions/effect/0384.ninjas_mindset/_/register.mcfunction new file mode 100644 index 0000000000..1105f64a88 --- /dev/null +++ b/Asset/data/asset/functions/effect/0384.ninjas_mindset/_/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0384.ninjas_mindset/_/register +# +# +# +# @within tag/function asset:effect/register + +execute if data storage asset:context {id:384} run function asset:effect/0384.ninjas_mindset/register \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0384.ninjas_mindset/_/tick.mcfunction b/Asset/data/asset/functions/effect/0384.ninjas_mindset/_/tick.mcfunction new file mode 100644 index 0000000000..1e8f3f23c9 --- /dev/null +++ b/Asset/data/asset/functions/effect/0384.ninjas_mindset/_/tick.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0384.ninjas_mindset/_/tick +# +# Effectが発動している間毎tick実行されるfunction +# +# @within tag/function asset:effect/tick + +execute if data storage asset:context {id:384} run function asset:effect/0384.ninjas_mindset/tick/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0384.ninjas_mindset/_index.d.mcfunction b/Asset/data/asset/functions/effect/0384.ninjas_mindset/_index.d.mcfunction new file mode 100644 index 0000000000..226a530344 --- /dev/null +++ b/Asset/data/asset/functions/effect/0384.ninjas_mindset/_index.d.mcfunction @@ -0,0 +1,6 @@ +#> asset:effect/0384.ninjas_mindset/_index.d +# @private + +#> 0384.ninjas_mindset +# @within function asset:effect/0384.ninjas_mindset/** + #declare tag 0384.IsInDarkness diff --git a/Asset/data/asset/functions/effect/0384.ninjas_mindset/fullset/darkness_buff.mcfunction b/Asset/data/asset/functions/effect/0384.ninjas_mindset/fullset/darkness_buff.mcfunction new file mode 100644 index 0000000000..9a62cf4047 --- /dev/null +++ b/Asset/data/asset/functions/effect/0384.ninjas_mindset/fullset/darkness_buff.mcfunction @@ -0,0 +1,18 @@ +#> asset:effect/0384.ninjas_mindset/fullset/darkness_buff/apply +# +# フルセット時の追加効果の付与 +# +# @within function asset:effect/0384.ninjas_mindset/tick/ + +# 一旦エフェクト消す + data modify storage api: Argument.UUID set value [I;1,3,384,0] + function api:modifier/attack/physical/remove + +# 物理攻撃 + data modify storage api: Argument.UUID set value [I;1,3,384,0] + data modify storage api: Argument.Amount set value 0.15d + data modify storage api: Argument.Operation set value "multiply_base" + function api:modifier/attack/physical/add + +# 判別用tag + tag @s add 0384.IsInDarkness diff --git a/Asset/data/asset/functions/effect/0384.ninjas_mindset/fullset/dis_equip.mcfunction b/Asset/data/asset/functions/effect/0384.ninjas_mindset/fullset/dis_equip.mcfunction new file mode 100644 index 0000000000..bfdbcf9195 --- /dev/null +++ b/Asset/data/asset/functions/effect/0384.ninjas_mindset/fullset/dis_equip.mcfunction @@ -0,0 +1,9 @@ +#> asset:effect/0384.ninjas_mindset/fullset/dis_equip +# +# フルセット効果の剝奪 +# +# @within function asset:effect/0384.ninjas_mindset/re-given/ + +# 物理攻撃 + data modify storage api: Argument.UUID set value [I;1,3,384,0] + function api:modifier/attack/physical/remove diff --git a/Asset/data/asset/functions/effect/0384.ninjas_mindset/fullset/equip.mcfunction b/Asset/data/asset/functions/effect/0384.ninjas_mindset/fullset/equip.mcfunction new file mode 100644 index 0000000000..4e5fe5e12d --- /dev/null +++ b/Asset/data/asset/functions/effect/0384.ninjas_mindset/fullset/equip.mcfunction @@ -0,0 +1,20 @@ +#> asset:effect/0384.ninjas_mindset/fullset/equip +# +# フルセット効果の付与 +# +# @within function asset:effect/0384.ninjas_mindset/given/ +# @within function asset:effect/0384.ninjas_mindset/re-given/ +# @within function asset:effect/0384.ninjas_mindset/tick/ + +# 一旦エフェクト消す + data modify storage api: Argument.UUID set value [I;1,3,384,0] + function api:modifier/attack/physical/remove + +# 物理攻撃 + data modify storage api: Argument.UUID set value [I;1,3,384,0] + data modify storage api: Argument.Amount set value 0.05d + data modify storage api: Argument.Operation set value "multiply_base" + function api:modifier/attack/physical/add + +# 暗所バフは受けていない状態 + tag @s remove 0384.IsInDarkness diff --git a/Asset/data/asset/functions/effect/0384.ninjas_mindset/given/.mcfunction b/Asset/data/asset/functions/effect/0384.ninjas_mindset/given/.mcfunction new file mode 100644 index 0000000000..e70dd26ee2 --- /dev/null +++ b/Asset/data/asset/functions/effect/0384.ninjas_mindset/given/.mcfunction @@ -0,0 +1,11 @@ +#> asset:effect/0384.ninjas_mindset/given/ +# +# Effectが付与された時の処理 +# +# @within function asset:effect/0384.ninjas_mindset/_/given + +# フルセット効果付与 + execute if data storage asset:context {Stack:4} run function asset:effect/0384.ninjas_mindset/fullset/equip + +# this.PrevStackに保存 + data modify storage asset:context this.PrevStack set from storage asset:context Stack diff --git a/Asset/data/asset/functions/effect/0384.ninjas_mindset/re-given/.mcfunction b/Asset/data/asset/functions/effect/0384.ninjas_mindset/re-given/.mcfunction new file mode 100644 index 0000000000..7c6ef0c7e0 --- /dev/null +++ b/Asset/data/asset/functions/effect/0384.ninjas_mindset/re-given/.mcfunction @@ -0,0 +1,14 @@ +#> asset:effect/0384.ninjas_mindset/re-given/ +# +# Effectが上書きされた時の処理 +# +# @within function asset:effect/0384.ninjas_mindset/_/re-given + +# フルセット効果解除 + execute if data storage asset:context PreviousField{PrevStack:4} unless data storage asset:context {Stack:4} run function asset:effect/0384.ninjas_mindset/fullset/dis_equip + +# フルセット効果付与 + execute unless data storage asset:context PreviousField{PrevStack:4} if data storage asset:context {Stack:4} run function asset:effect/0384.ninjas_mindset/fullset/equip + +# this.PrevStackに保存 + data modify storage asset:context this.PrevStack set from storage asset:context Stack diff --git a/Asset/data/asset/functions/effect/0384.ninjas_mindset/register.mcfunction b/Asset/data/asset/functions/effect/0384.ninjas_mindset/register.mcfunction new file mode 100644 index 0000000000..1c28cbe6ed --- /dev/null +++ b/Asset/data/asset/functions/effect/0384.ninjas_mindset/register.mcfunction @@ -0,0 +1,39 @@ +#> asset:effect/0384.ninjas_mindset/register +# +# Effectのデータを指定 +# +# @within function asset:effect/0384.ninjas_mindset/_/register + +# ExtendsSafe (boolean) (default = false) + # data modify storage asset:effect ExtendsSafe set value true +# ID (int) + data modify storage asset:effect ID set value 384 +# 名前 (TextComponentString) + data modify storage asset:effect Name set value '{"text": "忍ビノ心得"}' +# 説明文 (TextComponentString[]) + data modify storage asset:effect Description set value ['{"text": "物理攻撃 +5%", "color": "green"}','{"text": "暗所にいるとき、さらに", "extra": [{"text": "物理攻撃 +10%", "color": "green"}]}'] +# 効果時間 (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 "forceReplace" +# スタックの操作方法 (default = API || "replace") + data modify storage asset:effect StackOperation set value "forceReplace" +# 最大効果時間 (int) (default = 2147483647) + # data modify storage asset:effect MaxDuration set value +# 最大スタック (int) (default = 2147483647) + data modify storage asset:effect MaxStack set value 4 +# 悪い効果か否か (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 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/0384.ninjas_mindset/tick/.mcfunction b/Asset/data/asset/functions/effect/0384.ninjas_mindset/tick/.mcfunction new file mode 100644 index 0000000000..156b40eaee --- /dev/null +++ b/Asset/data/asset/functions/effect/0384.ninjas_mindset/tick/.mcfunction @@ -0,0 +1,13 @@ +#> asset:effect/0384.ninjas_mindset/tick/ +# +# Effectのtick処理 +# +# @within function asset:effect/0384.ninjas_mindset/_/tick + +# 透明化 + execute if data storage asset:context {Stack:4} run effect give @s invisibility 1 0 true + +# 暗所バフ + execute if data storage asset:context {Stack:4} unless entity @s[tag=0384.IsInDarkness] if predicate asset:effect/0384.ninjas_mindset/is_in_darkness run function asset:effect/0384.ninjas_mindset/fullset/darkness_buff + + execute if data storage asset:context {Stack:4} if entity @s[tag=0384.IsInDarkness] unless predicate asset:effect/0384.ninjas_mindset/is_in_darkness run function asset:effect/0384.ninjas_mindset/fullset/equip diff --git a/Asset/data/asset/predicates/effect/0384.ninjas_mindset/is_in_darkness.json b/Asset/data/asset/predicates/effect/0384.ninjas_mindset/is_in_darkness.json new file mode 100644 index 0000000000..27a1e3036a --- /dev/null +++ b/Asset/data/asset/predicates/effect/0384.ninjas_mindset/is_in_darkness.json @@ -0,0 +1,10 @@ +{ + "condition": "location_check", + "predicate": { + "light": { + "light": { + "max": 8 + } + } + } +} diff --git a/Asset/data/asset/tags/functions/artifact/equip.json b/Asset/data/asset/tags/functions/artifact/equip.json index f1c8f6d1ac..57437e505d 100644 --- a/Asset/data/asset/tags/functions/artifact/equip.json +++ b/Asset/data/asset/tags/functions/artifact/equip.json @@ -1,5 +1,9 @@ { "values": [ + "asset:artifact/1473.ninja_sandals/trigger/1.trigger", + "asset:artifact/1472.ninja_pants/trigger/1.trigger", + "asset:artifact/1471.ninja_robe/trigger/1.trigger", + "asset:artifact/1470.ninja_hood/trigger/1.trigger", "asset:artifact/1430.shield_of_fate/trigger/1.trigger", "asset:artifact/0772.dolphin_amulet/trigger/1.trigger", "asset:artifact/1409.mana_charm/trigger/1.trigger", @@ -112,4 +116,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 fdb7a26c47..db2b8d2e77 100644 --- a/Asset/data/asset/tags/functions/artifact/give.json +++ b/Asset/data/asset/tags/functions/artifact/give.json @@ -1,5 +1,9 @@ { "values": [ + "asset:artifact/1473.ninja_sandals/give/1.trigger", + "asset:artifact/1472.ninja_pants/give/1.trigger", + "asset:artifact/1471.ninja_robe/give/1.trigger", + "asset:artifact/1470.ninja_hood/give/1.trigger", "asset:artifact/1562.tsukimi_dango/give/1.trigger", "asset:artifact/1430.shield_of_fate/give/1.trigger", "asset:artifact/1453.frost_flake_bow/give/1.trigger", @@ -540,4 +544,4 @@ "asset:artifact/0735.collision_plate/give/1.trigger", "asset:artifact/0745.blade_of_whirlwind/give/1.trigger" ] -} +} \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/artifact/register.json b/Asset/data/asset/tags/functions/artifact/register.json index 2bba1f3f33..37b10c3ef1 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/1470.ninja_hood/register", "asset:artifact/1562.tsukimi_dango/register", "asset:artifact/1453.frost_flake_bow/register", "asset:artifact/1430.shield_of_fate/register", diff --git a/Asset/data/asset/tags/functions/effect/given.json b/Asset/data/asset/tags/functions/effect/given.json index c40d6e3cb7..1d1d310541 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/0384.ninjas_mindset/_/given", "asset:effect/0371.tsukimi/_/given", "asset:effect/0355.heart_gap/_/given", "asset:effect/0354.protection_of_courage/_/given", @@ -106,4 +107,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 1a963f5001..4ce56d65a3 100644 --- a/Asset/data/asset/tags/functions/effect/re-given.json +++ b/Asset/data/asset/tags/functions/effect/re-given.json @@ -1,5 +1,6 @@ { "values": [ + "asset:effect/0384.ninjas_mindset/_/re-given", "asset:effect/0371.tsukimi/_/re-given", "asset:effect/0348.cool_feeling/_/re-given", "asset:effect/0352.kitsunebi/_/re-given", diff --git a/Asset/data/asset/tags/functions/effect/register.json b/Asset/data/asset/tags/functions/effect/register.json index 78c10d4140..e970d35958 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/0384.ninjas_mindset/_/register", "asset:effect/0371.tsukimi/_/register", "asset:effect/0355.heart_gap/_/register", "asset:effect/0354.protection_of_courage/_/register", @@ -182,4 +183,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/tick.json b/Asset/data/asset/tags/functions/effect/tick.json index 90687895ee..dabd3f3e2f 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/0384.ninjas_mindset/_/tick", "asset:effect/0355.heart_gap/_/tick", "asset:effect/0348.cool_feeling/_/tick", "asset:effect/0356.dolphin_blessing/_/tick", @@ -107,4 +108,4 @@ "asset:effect/0279.poison_of_vinderre/_/tick", "asset:effect/0258.spirit_melody/_/tick" ] -} +} \ No newline at end of file diff --git a/Asset/data/tsb_armor/trim_pattern/1470.json b/Asset/data/tsb_armor/trim_pattern/1470.json new file mode 100644 index 0000000000..593639ad6b --- /dev/null +++ b/Asset/data/tsb_armor/trim_pattern/1470.json @@ -0,0 +1,7 @@ +{ + "asset_id": "tsb_armor:1470", + "description": { + "translate": "trim_pattern.tsb_armor.1470" + }, + "template_item": "minecraft:barrier" +}