diff --git a/Asset/data/asset/functions/artifact/0261.holy_symbol_lv.1/give/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/0261.holy_symbol_lv.1/give/1.trigger.mcfunction deleted file mode 100644 index b67c5823b4d..00000000000 --- a/Asset/data/asset/functions/artifact/0261.holy_symbol_lv.1/give/1.trigger.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> asset:artifact/0261.holy_symbol_lv.1/give/1.trigger -# -# 神器の取得処理の呼び出し時に実行されるfunction -# -# @within tag/function asset:artifact/give - -execute if data storage asset:context {id:261} run function asset:artifact/0261.holy_symbol_lv.1/give/2.give diff --git a/Asset/data/asset/functions/artifact/0261.holy_symbol_lv.1/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0261.holy_symbol_lv.1/give/2.give.mcfunction deleted file mode 100644 index cba6c2f2982..00000000000 --- a/Asset/data/asset/functions/artifact/0261.holy_symbol_lv.1/give/2.give.mcfunction +++ /dev/null @@ -1,64 +0,0 @@ -#> asset:artifact/0261.holy_symbol_lv.1/give/2.give -# -# 神器の作成部 ここでID等を定義する -# -# @user -# @within function asset:artifact/0261.holy_symbol_lv.1/give/1.trigger - -# 神器の説明や消費MPなどをここで設定する。 -# 最後にasset:artifact/common/giveを実行することで入手可能。 - -# 神器のID (int) スプレッドシートの値を入れる - data modify storage asset:artifact ID set value 261 -# 神器のベースアイテム - data modify storage asset:artifact Item set value "minecraft:carrot_on_a_stick" -# 神器の名前 (TextComponentString) - data modify storage asset:artifact Name set value '{"text":"ホーリーシンボル レベル1"}' -# 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text":"聖なる魔法陣を生成し"}','{"text":"発動者および味方の精神を浄化する。"}','""','{"text":"[詳細]","color":"#ffde6e"}','[{"text":"1秒ごとにMPを","color":"white"},{"text":"1%","color":"#6e99ff"},{"text":"回復する。","color":"white"}]','{"text":"10秒間、物理/魔法ダメージ、攻撃速度が","color":"white"}','[{"text":"1%","color":"#6e99ff"},{"text":"増加する。","color":"white"}]'] -# 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション) - # data modify storage asset:artifact ConsumeItem.Item set value - # data modify storage asset:artifact ConsumeItem.Count set value - # 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 "auto" -# 神器のトリガー (string) Wikiを参照 - data modify storage asset:artifact Trigger set value "onClick" -# 神器の発動条件 (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 -# 神器のクールダウン (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 3600 -# クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) - # data modify storage asset:artifact DisableCooldownMessage set value -# MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) - # data modify storage asset:artifact DisableMPMessage set value -# 扱える神 (string[]) Wikiを参照 - data modify storage asset:artifact CanUsedGod set value ["Flora", "Urban", "Nyaptov", "Wi-ki", "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/0261.holy_symbol_lv.1/register.mcfunction b/Asset/data/asset/functions/artifact/0261.holy_symbol_lv.1/register.mcfunction deleted file mode 100644 index c49372e99a7..00000000000 --- a/Asset/data/asset/functions/artifact/0261.holy_symbol_lv.1/register.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset:artifact/0261.holy_symbol_lv.1/register -# -# 神器プールへの登録処理 -# -# @within tag/function asset:artifact/register - -data modify storage asset:artifact RarityRegistry[2] append value [261] -data modify storage asset:artifact RarityRegistryWithColor.Green[2] append value [261] diff --git a/Asset/data/asset/functions/artifact/0261.holy_symbol_lv.1/trigger/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/0261.holy_symbol_lv.1/trigger/1.trigger.mcfunction deleted file mode 100644 index 3ce71e33ab6..00000000000 --- a/Asset/data/asset/functions/artifact/0261.holy_symbol_lv.1/trigger/1.trigger.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset:artifact/0261.holy_symbol_lv.1/trigger/1.trigger -# -# 指定したイベントタイミングで実行されるfunction -# -# @within tag/function asset:artifact/** - -# storage asset:idのauto/feet/legs/chest/head/mainhand/offhandに装備している神器のIDが入っているので比較し、~/2.check_condition.mcfunctionを実行する - execute if data storage asset:context id{auto:261} run function asset:artifact/0261.holy_symbol_lv.1/trigger/2.check_condition \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0261.holy_symbol_lv.1/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/0261.holy_symbol_lv.1/trigger/2.check_condition.mcfunction deleted file mode 100644 index e7f5a93105a..00000000000 --- a/Asset/data/asset/functions/artifact/0261.holy_symbol_lv.1/trigger/2.check_condition.mcfunction +++ /dev/null @@ -1,12 +0,0 @@ -#> asset:artifact/0261.holy_symbol_lv.1/trigger/2.check_condition -# -# 神器の発動条件をチェックします -# -# @within function asset:artifact/0261.holy_symbol_lv.1/trigger/1.trigger - -# 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く auto/feet/legs/chest/head/mainhand/offhandを記載してね - function asset:artifact/common/check_condition/auto -# 他にアイテム等確認する場合はここに書く - -# CanUsedタグをチェックして3.main.mcfunctionを実行する - execute if entity @s[tag=CanUsed] run function asset:artifact/0261.holy_symbol_lv.1/trigger/3.main \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0261.holy_symbol_lv.1/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0261.holy_symbol_lv.1/trigger/3.main.mcfunction deleted file mode 100644 index 405358aa379..00000000000 --- a/Asset/data/asset/functions/artifact/0261.holy_symbol_lv.1/trigger/3.main.mcfunction +++ /dev/null @@ -1,17 +0,0 @@ -#> asset:artifact/0261.holy_symbol_lv.1/trigger/3.main -# -# 神器のメイン処理部 -# -# @within function asset:artifact/0261.holy_symbol_lv.1/trigger/2.check_condition - -# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う auto/feet/legs/chest/head/mainhand/offhandを記載してね - function asset:artifact/common/use/auto - -# ここから先は神器側の効果の処理を書く - -# Objectを召喚 - data modify storage api: Argument.ID set value 1007 - data modify storage api: Argument.FieldOverride.MPHealPer set value 0.01 - data modify storage api: Argument.FieldOverride.Effect.Stack set value 1 - data modify storage api: Argument.FieldOverride.Effect.Duration set value 200 - function api:object/summon diff --git a/Asset/data/asset/functions/artifact/0265.holy_symbol_lv.5/give/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/0265.holy_symbol_lv.5/give/1.trigger.mcfunction deleted file mode 100644 index 865303bf40d..00000000000 --- a/Asset/data/asset/functions/artifact/0265.holy_symbol_lv.5/give/1.trigger.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> asset:artifact/0265.holy_symbol_lv.5/give/1.trigger -# -# 神器の取得処理の呼び出し時に実行されるfunction -# -# @within tag/function asset:artifact/give - -execute if data storage asset:context {id:265} run function asset:artifact/0265.holy_symbol_lv.5/give/2.give diff --git a/Asset/data/asset/functions/artifact/0265.holy_symbol_lv.5/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0265.holy_symbol_lv.5/give/2.give.mcfunction deleted file mode 100644 index d6829fcb5f9..00000000000 --- a/Asset/data/asset/functions/artifact/0265.holy_symbol_lv.5/give/2.give.mcfunction +++ /dev/null @@ -1,64 +0,0 @@ -#> asset:artifact/0265.holy_symbol_lv.5/give/2.give -# -# 神器の作成部 ここでID等を定義する -# -# @user -# @within function asset:artifact/0265.holy_symbol_lv.5/give/1.trigger - -# 神器の説明や消費MPなどをここで設定する。 -# 最後にasset:artifact/common/giveを実行することで入手可能。 - -# 神器のID (int) スプレッドシートの値を入れる - data modify storage asset:artifact ID set value 265 -# 神器のベースアイテム - data modify storage asset:artifact Item set value "minecraft:carrot_on_a_stick" -# 神器の名前 (TextComponentString) - data modify storage asset:artifact Name set value '{"text":"ホーリーシンボル レベル5"}' -# 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text":"聖なる魔法陣を生成し"}','{"text":"発動者および味方の精神を浄化する。"}','""','{"text":"[詳細]","color":"#ffde6e"}','[{"text":"1秒ごとにMPを","color":"white"},{"text":"9%","color":"#6e99ff"},{"text":"回復する。","color":"white"}]','{"text":"16秒間、物理/魔法ダメージ、攻撃速度が","color":"white"}','[{"text":"9%","color":"#6e99ff"},{"text":"増加する。","color":"white"}]'] -# 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション) - # data modify storage asset:artifact ConsumeItem.Item set value - # data modify storage asset:artifact ConsumeItem.Count set value - # 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 "auto" -# 神器のトリガー (string) Wikiを参照 - data modify storage asset:artifact Trigger set value "onClick" -# 神器の発動条件 (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 -# 神器のクールダウン (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 3600 -# クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) - # data modify storage asset:artifact DisableCooldownMessage set value -# MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) - # data modify storage asset:artifact DisableMPMessage set value -# 扱える神 (string[]) Wikiを参照 - data modify storage asset:artifact CanUsedGod set value ["Flora", "Nyaptov", "Wi-ki"] -# カスタム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/0265.holy_symbol_lv.5/register.mcfunction b/Asset/data/asset/functions/artifact/0265.holy_symbol_lv.5/register.mcfunction deleted file mode 100644 index 565e8c0309b..00000000000 --- a/Asset/data/asset/functions/artifact/0265.holy_symbol_lv.5/register.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset:artifact/0265.holy_symbol_lv.5/register -# -# 神器プールへの登録処理 -# -# @within tag/function asset:artifact/register - -data modify storage asset:artifact RarityRegistry[3] append value [265] -data modify storage asset:artifact RarityRegistryWithColor.Green[3] append value [265] diff --git a/Asset/data/asset/functions/artifact/0265.holy_symbol_lv.5/trigger/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/0265.holy_symbol_lv.5/trigger/1.trigger.mcfunction deleted file mode 100644 index 8d7189ae570..00000000000 --- a/Asset/data/asset/functions/artifact/0265.holy_symbol_lv.5/trigger/1.trigger.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset:artifact/0265.holy_symbol_lv.5/trigger/1.trigger -# -# 指定したイベントタイミングで実行されるfunction -# -# @within tag/function asset:artifact/** - -# storage asset:idのauto/feet/legs/chest/head/mainhand/offhandに装備している神器のIDが入っているので比較し、~/2.check_condition.mcfunctionを実行する - execute if data storage asset:context id{auto:265} run function asset:artifact/0265.holy_symbol_lv.5/trigger/2.check_condition \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0265.holy_symbol_lv.5/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/0265.holy_symbol_lv.5/trigger/2.check_condition.mcfunction deleted file mode 100644 index 4acbc9be3d7..00000000000 --- a/Asset/data/asset/functions/artifact/0265.holy_symbol_lv.5/trigger/2.check_condition.mcfunction +++ /dev/null @@ -1,12 +0,0 @@ -#> asset:artifact/0265.holy_symbol_lv.5/trigger/2.check_condition -# -# 神器の発動条件をチェックします -# -# @within function asset:artifact/0265.holy_symbol_lv.5/trigger/1.trigger - -# 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く auto/feet/legs/chest/head/mainhand/offhandを記載してね - function asset:artifact/common/check_condition/auto -# 他にアイテム等確認する場合はここに書く - -# CanUsedタグをチェックして3.main.mcfunctionを実行する - execute if entity @s[tag=CanUsed] run function asset:artifact/0265.holy_symbol_lv.5/trigger/3.main \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0265.holy_symbol_lv.5/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0265.holy_symbol_lv.5/trigger/3.main.mcfunction deleted file mode 100644 index a91d1474665..00000000000 --- a/Asset/data/asset/functions/artifact/0265.holy_symbol_lv.5/trigger/3.main.mcfunction +++ /dev/null @@ -1,15 +0,0 @@ -#> asset:artifact/0265.holy_symbol_lv.5/trigger/3.main -# -# 神器のメイン処理部 -# -# @within function asset:artifact/0265.holy_symbol_lv.5/trigger/2.check_condition - -# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う auto/feet/legs/chest/head/mainhand/offhandを記載してね - function asset:artifact/common/use/auto - -# Objectを召喚 - data modify storage api: Argument.ID set value 1007 - data modify storage api: Argument.FieldOverride.MPHealPer set value 0.09 - data modify storage api: Argument.FieldOverride.Effect.Stack set value 5 - data modify storage api: Argument.FieldOverride.Effect.Duration set value 320 - function api:object/summon diff --git a/Asset/data/asset/tags/functions/artifact/click.carrot_on_a_stick.json b/Asset/data/asset/tags/functions/artifact/click.carrot_on_a_stick.json index 5864dbd3668..f5daab64e6b 100644 --- a/Asset/data/asset/tags/functions/artifact/click.carrot_on_a_stick.json +++ b/Asset/data/asset/tags/functions/artifact/click.carrot_on_a_stick.json @@ -126,9 +126,7 @@ "asset:artifact/0236.health_exchanger/trigger/1.trigger", "asset:artifact/0252.void_transaction/trigger/1.trigger", "asset:artifact/0260.heal_lv.1/trigger/1.trigger", - "asset:artifact/0261.holy_symbol_lv.1/trigger/1.trigger", "asset:artifact/0264.heal_lv.5/trigger/1.trigger", - "asset:artifact/0265.holy_symbol_lv.5/trigger/1.trigger", "asset:artifact/0268.heal_lv.10/trigger/1.trigger", "asset:artifact/0269.holy_symbol_lv.10/trigger/1.trigger", "asset:artifact/0278.reveille/trigger/1.trigger", diff --git a/Asset/data/asset/tags/functions/artifact/give.json b/Asset/data/asset/tags/functions/artifact/give.json index f3eb0088574..258d491f03e 100644 --- a/Asset/data/asset/tags/functions/artifact/give.json +++ b/Asset/data/asset/tags/functions/artifact/give.json @@ -416,10 +416,8 @@ "asset:artifact/0252.void_transaction/give/1.trigger", "asset:artifact/0258.cat_dream_pillow/give/1.trigger", "asset:artifact/0260.heal_lv.1/give/1.trigger", - "asset:artifact/0261.holy_symbol_lv.1/give/1.trigger", "asset:artifact/0262.angel_ray_lv.1/give/1.trigger", "asset:artifact/0264.heal_lv.5/give/1.trigger", - "asset:artifact/0265.holy_symbol_lv.5/give/1.trigger", "asset:artifact/0266.angel_ray_lv.5/give/1.trigger", "asset:artifact/0268.heal_lv.10/give/1.trigger", "asset:artifact/0269.holy_symbol_lv.10/give/1.trigger", diff --git a/Asset/data/asset/tags/functions/artifact/register.json b/Asset/data/asset/tags/functions/artifact/register.json index deba1661508..7f70127a2a7 100644 --- a/Asset/data/asset/tags/functions/artifact/register.json +++ b/Asset/data/asset/tags/functions/artifact/register.json @@ -210,10 +210,8 @@ "asset:artifact/0252.void_transaction/register", "asset:artifact/0258.cat_dream_pillow/register", "asset:artifact/0260.heal_lv.1/register", - "asset:artifact/0261.holy_symbol_lv.1/register", "asset:artifact/0262.angel_ray_lv.1/register", "asset:artifact/0264.heal_lv.5/register", - "asset:artifact/0265.holy_symbol_lv.5/register", "asset:artifact/0266.angel_ray_lv.5/register", "asset:artifact/0268.heal_lv.10/register", "asset:artifact/0269.holy_symbol_lv.10/register",