diff --git a/Asset/data/asset/functions/artifact/0566.great_sage_helmet/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0566.great_sage_helmet/_index.d.mcfunction index b18575d8f3..c5c47be8c6 100644 --- a/Asset/data/asset/functions/artifact/0566.great_sage_helmet/_index.d.mcfunction +++ b/Asset/data/asset/functions/artifact/0566.great_sage_helmet/_index.d.mcfunction @@ -1,10 +1,6 @@ #> asset:artifact/0566.great_sage_helmet/_index.d # @private -#> tag -# @within function asset:artifact/056?.great_sage_*/** - #declare tag FQ.Fullset - #> score_holder # @within function asset:artifact/0566.great_sage_helmet/fullset/** #declare score_holder $Random diff --git a/Asset/data/asset/functions/artifact/0566.great_sage_helmet/equip/fullset/damage/.mcfunction b/Asset/data/asset/functions/artifact/0566.great_sage_helmet/damage/.mcfunction similarity index 71% rename from Asset/data/asset/functions/artifact/0566.great_sage_helmet/equip/fullset/damage/.mcfunction rename to Asset/data/asset/functions/artifact/0566.great_sage_helmet/damage/.mcfunction index 7e25b7417c..499ddc2c2f 100644 --- a/Asset/data/asset/functions/artifact/0566.great_sage_helmet/equip/fullset/damage/.mcfunction +++ b/Asset/data/asset/functions/artifact/0566.great_sage_helmet/damage/.mcfunction @@ -1,8 +1,8 @@ -#> asset:artifact/0566.great_sage_helmet/equip/fullset/damage/ +#> asset:artifact/0566.great_sage_helmet/damage/ # +# 神器のトリガー処理 # -# -# @within function asset:artifact/0566.great_sage_helmet/equip/fullset/damage/check +# @within function asset:artifact/alias/566/damage/ #> Val # @private @@ -13,7 +13,7 @@ execute store result score $FQ.HealthPer Temporary run data get storage api: Return.HealthPer 1000 # 体力が20%以下かつ10%の確率で喋る - execute if score $FQ.HealthPer Temporary matches ..200 if predicate lib:random_pass_per/10 run function asset:artifact/0566.great_sage_helmet/equip/fullset/damage/talk + execute if score $FQ.HealthPer Temporary matches ..200 if predicate lib:random_pass_per/10 run function asset:artifact/0566.great_sage_helmet/damage/talk # リセット scoreboard players reset $FQ.HealthPer Temporary diff --git a/Asset/data/asset/functions/artifact/0566.great_sage_helmet/damage/check.mcfunction b/Asset/data/asset/functions/artifact/0566.great_sage_helmet/damage/check.mcfunction new file mode 100644 index 0000000000..7b547778f8 --- /dev/null +++ b/Asset/data/asset/functions/artifact/0566.great_sage_helmet/damage/check.mcfunction @@ -0,0 +1,10 @@ +#> asset:artifact/0566.great_sage_helmet/damage/check +# +# 神器の使用条件の確認処理 +# +# @within function asset:artifact/alias/566/damage/check + +# フルセットかどうか確認する + data modify storage api: Argument.ID set value 256 + function api:entity/mob/effect/get/from_id + execute unless data storage api: Return.Effect{Stack:4} run tag @s remove CanUsed diff --git a/Asset/data/asset/functions/artifact/0566.great_sage_helmet/equip/fullset/damage/talk.mcfunction b/Asset/data/asset/functions/artifact/0566.great_sage_helmet/damage/talk.mcfunction similarity index 96% rename from Asset/data/asset/functions/artifact/0566.great_sage_helmet/equip/fullset/damage/talk.mcfunction rename to Asset/data/asset/functions/artifact/0566.great_sage_helmet/damage/talk.mcfunction index fbc51632f4..067edabdcb 100644 --- a/Asset/data/asset/functions/artifact/0566.great_sage_helmet/equip/fullset/damage/talk.mcfunction +++ b/Asset/data/asset/functions/artifact/0566.great_sage_helmet/damage/talk.mcfunction @@ -1,8 +1,8 @@ -#> asset:artifact/0566.great_sage_helmet/equip/fullset/damage/talk +#> asset:artifact/0566.great_sage_helmet/damage/talk # # # -# @within function asset:artifact/0566.great_sage_helmet/equip/fullset/damage/ +# @within function asset:artifact/0566.great_sage_helmet/damage/ # 喋る playsound minecraft:entity.allay.hurt player @a ~ ~ ~ 0.4 1.6 diff --git a/Asset/data/asset/functions/artifact/0566.great_sage_helmet/equip.mcfunction b/Asset/data/asset/functions/artifact/0566.great_sage_helmet/equip.mcfunction new file mode 100644 index 0000000000..ac627ccc5b --- /dev/null +++ b/Asset/data/asset/functions/artifact/0566.great_sage_helmet/equip.mcfunction @@ -0,0 +1,9 @@ +#> asset:artifact/0566.great_sage_helmet/equip +# +# 神器の装備時の処理 +# +# @within function asset:artifact/alias/566/equip + +# 演出 + particle end_rod ~ ~1.7 ~ 0.3 0.1 0.3 0.1 10 normal @a + playsound minecraft:block.enchantment_table.use player @a ~ ~ ~ 0.8 1 diff --git a/Asset/data/asset/functions/artifact/0566.great_sage_helmet/equip/.mcfunction b/Asset/data/asset/functions/artifact/0566.great_sage_helmet/equip/.mcfunction deleted file mode 100644 index f1ab524b4f..0000000000 --- a/Asset/data/asset/functions/artifact/0566.great_sage_helmet/equip/.mcfunction +++ /dev/null @@ -1,43 +0,0 @@ -#> asset:artifact/0566.great_sage_helmet/equip/ -# -# 神器のトリガー処理 -# -# @within function asset:artifact/alias/566/equip/ - - -# 魔法耐性+7.5% - data modify storage api: Argument.UUID set value [I;1,1,566,6] - data modify storage api: Argument.Amount set value 0.075 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/defense/magic/add - -# 魔法攻撃+7.5% - data modify storage api: Argument.UUID set value [I;1,1,566,6] - data modify storage api: Argument.Amount set value 0.075 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/attack/magic/add - -# MP回復量+10% - data modify storage api: Argument.UUID set value [I;1,1,566,6] - data modify storage api: Argument.Amount set value 0.1 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/mp_regen/add - -# 物理耐性-10% - data modify storage api: Argument.UUID set value [I;1,1,566,6] - data modify storage api: Argument.Amount set value -0.075 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/defense/physical/add - -# 物理攻撃-17.5% - data modify storage api: Argument.UUID set value [I;1,1,566,6] - data modify storage api: Argument.Amount set value -0.1 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/attack/physical/add - -# 演出 - particle end_rod ~ ~1.7 ~ 0.3 0.1 0.3 0.1 10 normal @a - playsound minecraft:block.enchantment_table.use player @a ~ ~ ~ 0.8 1 - -# セット効果用のファンクション実行（実行は頭のほうで） - execute if data storage asset:context id.all{head:566,chest:567,legs:568,feet:569} run function asset:artifact/0566.great_sage_helmet/equip/fullset/equip diff --git a/Asset/data/asset/functions/artifact/0566.great_sage_helmet/equip/check.mcfunction b/Asset/data/asset/functions/artifact/0566.great_sage_helmet/equip/check.mcfunction deleted file mode 100644 index 4fc3840f42..0000000000 --- a/Asset/data/asset/functions/artifact/0566.great_sage_helmet/equip/check.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> asset:artifact/0566.great_sage_helmet/equip/check -# -# 神器の使用条件の確認処理 -# -# @within function asset:artifact/alias/566/equip/check - - \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0566.great_sage_helmet/equip/dis_equip/.mcfunction b/Asset/data/asset/functions/artifact/0566.great_sage_helmet/equip/dis_equip/.mcfunction deleted file mode 100644 index 446bb22478..0000000000 --- a/Asset/data/asset/functions/artifact/0566.great_sage_helmet/equip/dis_equip/.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> asset:artifact/0566.great_sage_helmet/equip/dis_equip/ -# -# 装備を外した時に外した部位にのみのidが入った状態でトリガーされる -# -# @within tag/function asset:artifact/dis_equip - -execute if data storage asset:context id{head:566} run function asset:artifact/0566.great_sage_helmet/equip/dis_equip/main diff --git a/Asset/data/asset/functions/artifact/0566.great_sage_helmet/equip/dis_equip/main.mcfunction b/Asset/data/asset/functions/artifact/0566.great_sage_helmet/equip/dis_equip/main.mcfunction deleted file mode 100644 index d36b386363..0000000000 --- a/Asset/data/asset/functions/artifact/0566.great_sage_helmet/equip/dis_equip/main.mcfunction +++ /dev/null @@ -1,28 +0,0 @@ -#> asset:artifact/0566.great_sage_helmet/equip/dis_equip/main -# -# 装備を外した時のメイン処理 -# -# @within function asset:artifact/0566.great_sage_helmet/equip/dis_equip/ - -# 魔法耐性+7.5% - data modify storage api: Argument.UUID set value [I;1,1,566,6] - function api:modifier/defense/magic/remove - -# 魔法攻撃+7.5% - data modify storage api: Argument.UUID set value [I;1,1,566,6] - function api:modifier/attack/magic/remove - -# MP回復量+10% - data modify storage api: Argument.UUID set value [I;1,1,566,6] - function api:modifier/mp_regen/remove - -# 物理耐性-10% - data modify storage api: Argument.UUID set value [I;1,1,566,6] - function api:modifier/defense/physical/remove - -# 物理攻撃-17.5% - data modify storage api: Argument.UUID set value [I;1,1,566,6] - function api:modifier/attack/physical/remove - -# フルセット外す - execute if entity @s[tag=FQ.Fullset] run function asset:artifact/0566.great_sage_helmet/equip/fullset/dis_equip diff --git a/Asset/data/asset/functions/artifact/0566.great_sage_helmet/equip/fullset/damage/check.mcfunction b/Asset/data/asset/functions/artifact/0566.great_sage_helmet/equip/fullset/damage/check.mcfunction deleted file mode 100644 index 61c5429ee8..0000000000 --- a/Asset/data/asset/functions/artifact/0566.great_sage_helmet/equip/fullset/damage/check.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset:artifact/0566.great_sage_helmet/equip/fullset/damage/check -# -# -# -# @within tag/function asset:artifact/** - -# フルセットかどうか見る - execute if entity @s[tag=FQ.Fullset] run function asset:artifact/0566.great_sage_helmet/equip/fullset/damage/ diff --git a/Asset/data/asset/functions/artifact/0566.great_sage_helmet/equip/fullset/heal/.mcfunction b/Asset/data/asset/functions/artifact/0566.great_sage_helmet/equip/fullset/heal/.mcfunction deleted file mode 100644 index 01d5584152..0000000000 --- a/Asset/data/asset/functions/artifact/0566.great_sage_helmet/equip/fullset/heal/.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset:artifact/0566.great_sage_helmet/equip/fullset/heal/ -# -# -# -# @within function asset:artifact/0566.great_sage_helmet/equip/fullset/heal/check - -# 確率で話しかけてくる - execute if predicate lib:random_pass_per/5 run function asset:artifact/0566.great_sage_helmet/equip/fullset/heal/talk diff --git a/Asset/data/asset/functions/artifact/0566.great_sage_helmet/equip/fullset/heal/check.mcfunction b/Asset/data/asset/functions/artifact/0566.great_sage_helmet/equip/fullset/heal/check.mcfunction deleted file mode 100644 index f38aa43300..0000000000 --- a/Asset/data/asset/functions/artifact/0566.great_sage_helmet/equip/fullset/heal/check.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset:artifact/0566.great_sage_helmet/equip/fullset/heal/check -# -# -# -# @within tag/function asset:artifact/** - -# フルセットかどうか見る - execute if entity @s[tag=FQ.Fullset] run function asset:artifact/0566.great_sage_helmet/equip/fullset/heal/ diff --git a/Asset/data/asset/functions/artifact/0566.great_sage_helmet/equip/fullset/kill/check.mcfunction b/Asset/data/asset/functions/artifact/0566.great_sage_helmet/equip/fullset/kill/check.mcfunction deleted file mode 100644 index 3be04576db..0000000000 --- a/Asset/data/asset/functions/artifact/0566.great_sage_helmet/equip/fullset/kill/check.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset:artifact/0566.great_sage_helmet/equip/fullset/kill/check -# -# -# -# @within tag/function asset:artifact/** - -# フルセットかどうか見る - execute if entity @s[tag=FQ.Fullset] run function asset:artifact/0566.great_sage_helmet/equip/fullset/kill/ diff --git a/Asset/data/asset/functions/artifact/0566.great_sage_helmet/equip/fullset/tick/check.mcfunction b/Asset/data/asset/functions/artifact/0566.great_sage_helmet/equip/fullset/tick/check.mcfunction deleted file mode 100644 index cffc7923ff..0000000000 --- a/Asset/data/asset/functions/artifact/0566.great_sage_helmet/equip/fullset/tick/check.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset:artifact/0566.great_sage_helmet/equip/fullset/tick/check -# -# -# -# @within tag/function asset:artifact/** - -# フルセットかどうか見る - execute if entity @s[tag=FQ.Fullset] run function asset:artifact/0566.great_sage_helmet/equip/fullset/tick/ diff --git a/Asset/data/asset/functions/artifact/0566.great_sage_helmet/heal/.mcfunction b/Asset/data/asset/functions/artifact/0566.great_sage_helmet/heal/.mcfunction new file mode 100644 index 0000000000..ba59c51635 --- /dev/null +++ b/Asset/data/asset/functions/artifact/0566.great_sage_helmet/heal/.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/0566.great_sage_helmet/heal/ +# +# 神器のトリガー処理 +# +# @within function asset:artifact/alias/566/heal/ + +# 確率で話しかけてくる + execute if predicate lib:random_pass_per/5 run function asset:artifact/0566.great_sage_helmet/heal/talk diff --git a/Asset/data/asset/functions/artifact/0566.great_sage_helmet/heal/check.mcfunction b/Asset/data/asset/functions/artifact/0566.great_sage_helmet/heal/check.mcfunction new file mode 100644 index 0000000000..6e2d0cb918 --- /dev/null +++ b/Asset/data/asset/functions/artifact/0566.great_sage_helmet/heal/check.mcfunction @@ -0,0 +1,10 @@ +#> asset:artifact/0566.great_sage_helmet/heal/check +# +# 神器の使用条件の確認処理 +# +# @within function asset:artifact/alias/566/heal/check + +# フルセットかどうか確認する + data modify storage api: Argument.ID set value 256 + function api:entity/mob/effect/get/from_id + execute unless data storage api: Return.Effect{Stack:4} run tag @s remove CanUsed diff --git a/Asset/data/asset/functions/artifact/0566.great_sage_helmet/equip/fullset/heal/talk.mcfunction b/Asset/data/asset/functions/artifact/0566.great_sage_helmet/heal/talk.mcfunction similarity index 96% rename from Asset/data/asset/functions/artifact/0566.great_sage_helmet/equip/fullset/heal/talk.mcfunction rename to Asset/data/asset/functions/artifact/0566.great_sage_helmet/heal/talk.mcfunction index 49330cb4e4..e929732a9f 100644 --- a/Asset/data/asset/functions/artifact/0566.great_sage_helmet/equip/fullset/heal/talk.mcfunction +++ b/Asset/data/asset/functions/artifact/0566.great_sage_helmet/heal/talk.mcfunction @@ -1,8 +1,8 @@ -#> asset:artifact/0566.great_sage_helmet/equip/fullset/heal/talk +#> asset:artifact/0566.great_sage_helmet/heal/talk # # # -# @within function asset:artifact/0566.great_sage_helmet/equip/fullset/heal/ +# @within function asset:artifact/0566.great_sage_helmet/heal/ # 喋る playsound minecraft:entity.allay.item_given player @a ~ ~ ~ 2 1.45 diff --git a/Asset/data/asset/functions/artifact/0566.great_sage_helmet/equip/fullset/kill/.mcfunction b/Asset/data/asset/functions/artifact/0566.great_sage_helmet/kill/.mcfunction similarity index 60% rename from Asset/data/asset/functions/artifact/0566.great_sage_helmet/equip/fullset/kill/.mcfunction rename to Asset/data/asset/functions/artifact/0566.great_sage_helmet/kill/.mcfunction index 8182601b06..30309bb469 100644 --- a/Asset/data/asset/functions/artifact/0566.great_sage_helmet/equip/fullset/kill/.mcfunction +++ b/Asset/data/asset/functions/artifact/0566.great_sage_helmet/kill/.mcfunction @@ -1,11 +1,11 @@ -#> asset:artifact/0566.great_sage_helmet/equip/fullset/kill/ +#> asset:artifact/0566.great_sage_helmet/kill/ # +# 神器のトリガー処理 # -# -# @within function asset:artifact/0566.great_sage_helmet/equip/fullset/kill/check +# @within function asset:artifact/alias/566/kill/ # 周囲に敵モブがいる場合、4%の確率で話してくる - execute if entity @e[tag=Enemy,tag=!Uninterferable,distance=..35] if predicate lib:random_pass_per/4 run function asset:artifact/0566.great_sage_helmet/equip/fullset/kill/talk + execute if entity @e[tag=Enemy,tag=!Uninterferable,distance=..35] if predicate lib:random_pass_per/4 run function asset:artifact/0566.great_sage_helmet/kill/talk # 周囲に敵モブがいなくなった場合、10%の確率で話してくる - execute unless entity @e[tag=Enemy,tag=!Uninterferable,distance=..35] if predicate lib:random_pass_per/10 run function asset:artifact/0566.great_sage_helmet/equip/fullset/kill/talk_genocide + execute unless entity @e[tag=Enemy,tag=!Uninterferable,distance=..35] if predicate lib:random_pass_per/10 run function asset:artifact/0566.great_sage_helmet/kill/talk_genocide diff --git a/Asset/data/asset/functions/artifact/0566.great_sage_helmet/kill/check.mcfunction b/Asset/data/asset/functions/artifact/0566.great_sage_helmet/kill/check.mcfunction new file mode 100644 index 0000000000..1fbd99ff08 --- /dev/null +++ b/Asset/data/asset/functions/artifact/0566.great_sage_helmet/kill/check.mcfunction @@ -0,0 +1,10 @@ +#> asset:artifact/0566.great_sage_helmet/kill/check +# +# 神器の使用条件の確認処理 +# +# @within function asset:artifact/alias/566/kill/check + +# フルセットかどうか確認する + data modify storage api: Argument.ID set value 256 + function api:entity/mob/effect/get/from_id + execute unless data storage api: Return.Effect{Stack:4} run tag @s remove CanUsed diff --git a/Asset/data/asset/functions/artifact/0566.great_sage_helmet/equip/fullset/kill/talk.mcfunction b/Asset/data/asset/functions/artifact/0566.great_sage_helmet/kill/talk.mcfunction similarity index 96% rename from Asset/data/asset/functions/artifact/0566.great_sage_helmet/equip/fullset/kill/talk.mcfunction rename to Asset/data/asset/functions/artifact/0566.great_sage_helmet/kill/talk.mcfunction index 2fdd50028d..ecbdf0e7b7 100644 --- a/Asset/data/asset/functions/artifact/0566.great_sage_helmet/equip/fullset/kill/talk.mcfunction +++ b/Asset/data/asset/functions/artifact/0566.great_sage_helmet/kill/talk.mcfunction @@ -1,8 +1,8 @@ -#> asset:artifact/0566.great_sage_helmet/equip/fullset/kill/talk +#> asset:artifact/0566.great_sage_helmet/kill/talk # # # -# @within function asset:artifact/0566.great_sage_helmet/equip/fullset/kill/ +# @within function asset:artifact/0566.great_sage_helmet/kill/ # 喋る playsound minecraft:entity.allay.item_given player @a ~ ~ ~ 2 1.45 diff --git a/Asset/data/asset/functions/artifact/0566.great_sage_helmet/equip/fullset/kill/talk_genocide.mcfunction b/Asset/data/asset/functions/artifact/0566.great_sage_helmet/kill/talk_genocide.mcfunction similarity index 96% rename from Asset/data/asset/functions/artifact/0566.great_sage_helmet/equip/fullset/kill/talk_genocide.mcfunction rename to Asset/data/asset/functions/artifact/0566.great_sage_helmet/kill/talk_genocide.mcfunction index 2f378bd963..69806b4ead 100644 --- a/Asset/data/asset/functions/artifact/0566.great_sage_helmet/equip/fullset/kill/talk_genocide.mcfunction +++ b/Asset/data/asset/functions/artifact/0566.great_sage_helmet/kill/talk_genocide.mcfunction @@ -1,8 +1,8 @@ -#> asset:artifact/0566.great_sage_helmet/equip/fullset/kill/talk_genocide +#> asset:artifact/0566.great_sage_helmet/kill/talk_genocide # # # -# @within function asset:artifact/0566.great_sage_helmet/equip/fullset/kill/ +# @within function asset:artifact/0566.great_sage_helmet/kill/ # 喋る playsound minecraft:entity.allay.item_given player @a ~ ~ ~ 2 1.45 diff --git a/Asset/data/asset/functions/artifact/0566.great_sage_helmet/load.mcfunction b/Asset/data/asset/functions/artifact/0566.great_sage_helmet/load.mcfunction index 068ff3634e..e6269dfb0f 100644 --- a/Asset/data/asset/functions/artifact/0566.great_sage_helmet/load.mcfunction +++ b/Asset/data/asset/functions/artifact/0566.great_sage_helmet/load.mcfunction @@ -5,6 +5,8 @@ # @within tag/function asset:artifact/load #> 定義類はここに -# @within function asset:artifact/0566.great_sage_helmet/** +# @within function +# asset:artifact/0566.great_sage_helmet/** +# asset:effect/0256.the_great_sage_s_attire/** scoreboard objectives add FQ.TalkTime dummy scoreboard objectives add FQ.Favorability dummy diff --git a/Asset/data/asset/functions/artifact/0566.great_sage_helmet/register.mcfunction b/Asset/data/asset/functions/artifact/0566.great_sage_helmet/register.mcfunction index b362dddb5a..c9dbadb3d3 100644 --- a/Asset/data/asset/functions/artifact/0566.great_sage_helmet/register.mcfunction +++ b/Asset/data/asset/functions/artifact/0566.great_sage_helmet/register.mcfunction @@ -4,50 +4,62 @@ # # @within function asset:artifact/alias/566/register -# 神器のID (int) スプレッドシートの値を入れる - data modify storage asset:artifact ID set value 566 -# 神器のベースアイテム - data modify storage asset:artifact Item set value "minecraft:leather_helmet" -# 神器の名前 (TextComponentString) - data modify storage asset:artifact Name set value '{"text":"大賢者の帽子","color":"#FED4FF"}' -# 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['[{"text":"大賢者エリュサスの祈りが込められた帽子","color":"#FED4FF"}]','{"text":"この衣服はエリュサスの写し身そのものだ","color":"#FED4FF"}','[{"text":"魔法耐性+7.5% 魔法攻撃+7.5%","color":"dark_purple"}]','[{"text":"MP回復量+10%","color":"green"}]','[{"text":"物理耐性","color":"dark_green"},{"text":"-7.5% ","color":"dark_red"},{"text":"物理攻撃","color":"dark_green"},{"text":"-10%","color":"dark_red"}]'] -# 消費アイテム ({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 "head" -# 神器のトリガー (string) Wikiを参照 - data modify storage asset:artifact Trigger set value "equip" -# 神器の発動条件 (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 -# グローバルクールダウン (int) (オプション) - # data modify storage asset:artifact SpecialCooldown set value -# クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) - # data modify storage asset:artifact DisableCooldownMessage set value -# 扱える神 (string[]) Wikiを参照 - data modify storage asset:artifact CanUsedGod set value ["Flora", "Nyaptov", "Wi-ki", "Rumor"] -# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) - data modify storage asset:artifact CustomNBT set value {HideFlags:68,display:{color:14598115},Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:5,Operation:0,UUID:[I;1,1,566,6],Slot:"head"},{AttributeName:"generic.armor_toughness",Name:"generic.armor_toughness",Amount:2.5,Operation:0,UUID:[I;1,1,566,6],Slot:"head"}]} - \ No newline at end of file +# 神器のID (int) スプレッドシートの値を入れる + data modify storage asset:artifact ID set value 566 +# 神器のベースアイテム + data modify storage asset:artifact Item set value "minecraft:leather_helmet" +# 神器の名前 (TextComponentString) + data modify storage asset:artifact Name set value '{"text":"大賢者の帽子","color":"#FED4FF"}' +# 神器の説明文 (TextComponentString[]) + data modify storage asset:artifact Lore set value ['[{"text":"大賢者エリュサスの祈りが込められた帽子","color":"#FED4FF"}]','{"text":"この衣服はエリュサスの写し身そのものだ","color":"#FED4FF"}'] +# 消費アイテム ({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 "head" +# 神器のトリガー (string) Wikiを参照 + # data modify storage asset:artifact Trigger set value +# 神器のサブトリガー (string[]) (オプション) + data modify storage asset:artifact SubTriggers set value ["equip","damage","heal","kill","tick"] +# 神器の発動条件 (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 +# グローバルクールダウン (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 +# 装備時効果 (int) (オプション) + data modify storage asset:artifact EquipID set value 256 +# 装備時補正 (Component[]) (オプション) + data modify storage asset:artifact Modifiers set value [] + data modify storage asset:artifact Modifiers append value {Type:"attack/magic",Amount:0.075d,Operation:"multiply_base"} + data modify storage asset:artifact Modifiers append value {Type:"defense/magic",Amount:0.075d,Operation:"multiply_base"} + data modify storage asset:artifact Modifiers append value {Type:"attack/physical",Amount:-0.10d,Operation:"multiply_base"} + data modify storage asset:artifact Modifiers append value {Type:"defense/physical",Amount:-0.075d,Operation:"multiply_base"} + data modify storage asset:artifact Modifiers append value {Type:"mp_regen",Amount:0.10d,Operation:"multiply_base"} +# 扱える神 (string[]) Wikiを参照 + data modify storage asset:artifact CanUsedGod set value ["Flora", "Nyaptov", "Wi-ki", "Rumor"] +# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) + data modify storage asset:artifact CustomNBT set value {HideFlags:68,display:{color:14598115},Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:5,Operation:0,UUID:[I;1,1,566,6],Slot:"head"},{AttributeName:"generic.armor_toughness",Name:"generic.armor_toughness",Amount:2.5,Operation:0,UUID:[I;1,1,566,6],Slot:"head"}]} diff --git a/Asset/data/asset/functions/artifact/0566.great_sage_helmet/equip/fullset/tick/.mcfunction b/Asset/data/asset/functions/artifact/0566.great_sage_helmet/tick/.mcfunction similarity index 75% rename from Asset/data/asset/functions/artifact/0566.great_sage_helmet/equip/fullset/tick/.mcfunction rename to Asset/data/asset/functions/artifact/0566.great_sage_helmet/tick/.mcfunction index a48799db56..869af53788 100644 --- a/Asset/data/asset/functions/artifact/0566.great_sage_helmet/equip/fullset/tick/.mcfunction +++ b/Asset/data/asset/functions/artifact/0566.great_sage_helmet/tick/.mcfunction @@ -1,14 +1,14 @@ -#> asset:artifact/0566.great_sage_helmet/equip/fullset/tick/ +#> asset:artifact/0566.great_sage_helmet/tick/ # +# 神器のトリガー処理 # -# -# @within function asset:artifact/0566.great_sage_helmet/equip/fullset/tick/check +# @within function asset:artifact/alias/566/tick/ # 時間経過 execute unless predicate lib:in_battle run scoreboard players add @s FQ.TalkTime 1 # 確率で喋る - execute if score @s FQ.TalkTime matches 3000.. if predicate lib:random_pass_per/40 run function asset:artifact/0566.great_sage_helmet/equip/fullset/tick/talk + execute if score @s FQ.TalkTime matches 3000.. if predicate lib:random_pass_per/40 run function asset:artifact/0566.great_sage_helmet/tick/talk # 確率で好感度を1上げる execute if score @s FQ.TalkTime matches 3000.. if predicate lib:random_pass_per/10 run scoreboard players add @s FQ.Favorability 1 diff --git a/Asset/data/asset/functions/artifact/0566.great_sage_helmet/tick/check.mcfunction b/Asset/data/asset/functions/artifact/0566.great_sage_helmet/tick/check.mcfunction new file mode 100644 index 0000000000..6b10130c23 --- /dev/null +++ b/Asset/data/asset/functions/artifact/0566.great_sage_helmet/tick/check.mcfunction @@ -0,0 +1,10 @@ +#> asset:artifact/0566.great_sage_helmet/tick/check +# +# 神器の使用条件の確認処理 +# +# @within function asset:artifact/alias/566/tick/check + +# フルセットかどうか確認する + data modify storage api: Argument.ID set value 256 + function api:entity/mob/effect/get/from_id + execute unless data storage api: Return.Effect{Stack:4} run tag @s remove CanUsed diff --git a/Asset/data/asset/functions/artifact/0566.great_sage_helmet/equip/fullset/tick/talk.mcfunction b/Asset/data/asset/functions/artifact/0566.great_sage_helmet/tick/talk.mcfunction similarity index 96% rename from Asset/data/asset/functions/artifact/0566.great_sage_helmet/equip/fullset/tick/talk.mcfunction rename to Asset/data/asset/functions/artifact/0566.great_sage_helmet/tick/talk.mcfunction index 4f4e3f1b82..8b77c3619a 100644 --- a/Asset/data/asset/functions/artifact/0566.great_sage_helmet/equip/fullset/tick/talk.mcfunction +++ b/Asset/data/asset/functions/artifact/0566.great_sage_helmet/tick/talk.mcfunction @@ -1,8 +1,8 @@ -#> asset:artifact/0566.great_sage_helmet/equip/fullset/tick/talk +#> asset:artifact/0566.great_sage_helmet/tick/talk # # # -# @within function asset:artifact/0566.great_sage_helmet/equip/fullset/tick/ +# @within function asset:artifact/0566.great_sage_helmet/tick/ # 喋る playsound minecraft:entity.allay.item_given player @a ~ ~ ~ 2 1.45 diff --git a/Asset/data/asset/functions/artifact/0567.great_sage_chestplate/equip.mcfunction b/Asset/data/asset/functions/artifact/0567.great_sage_chestplate/equip.mcfunction new file mode 100644 index 0000000000..618909265c --- /dev/null +++ b/Asset/data/asset/functions/artifact/0567.great_sage_chestplate/equip.mcfunction @@ -0,0 +1,5 @@ + + +# 演出 + particle end_rod ~ ~1.3 ~ 0.3 0.1 0.3 0.1 10 normal @a + playsound minecraft:block.enchantment_table.use player @a ~ ~ ~ 0.8 1 diff --git a/Asset/data/asset/functions/artifact/0567.great_sage_chestplate/equip/.mcfunction b/Asset/data/asset/functions/artifact/0567.great_sage_chestplate/equip/.mcfunction deleted file mode 100644 index 648d8a1ba2..0000000000 --- a/Asset/data/asset/functions/artifact/0567.great_sage_chestplate/equip/.mcfunction +++ /dev/null @@ -1,43 +0,0 @@ -#> asset:artifact/0567.great_sage_chestplate/equip/ -# -# 神器のトリガー処理 -# -# @within function asset:artifact/alias/567/equip/ - - -# 魔法耐性+7.5% - data modify storage api: Argument.UUID set value [I;1,1,567,5] - data modify storage api: Argument.Amount set value 0.075 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/defense/magic/add - -# 魔法攻撃+7.5% - data modify storage api: Argument.UUID set value [I;1,1,567,5] - data modify storage api: Argument.Amount set value 0.075 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/attack/magic/add - -# MP回復量+10% - data modify storage api: Argument.UUID set value [I;1,1,567,5] - data modify storage api: Argument.Amount set value 0.1 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/mp_regen/add - -# 物理耐性-10% - data modify storage api: Argument.UUID set value [I;1,1,567,5] - data modify storage api: Argument.Amount set value -0.075 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/defense/physical/add - -# 物理攻撃-17.5% - data modify storage api: Argument.UUID set value [I;1,1,567,5] - data modify storage api: Argument.Amount set value -0.1 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/attack/physical/add - -# 演出 - particle end_rod ~ ~1.3 ~ 0.3 0.1 0.3 0.1 10 normal @a - playsound minecraft:block.enchantment_table.use player @a ~ ~ ~ 0.8 1 - -# セット効果用のファンクション実行（実行は頭のほうで） - execute if data storage asset:context id.all{head:566,chest:567,legs:568,feet:569} run function asset:artifact/0566.great_sage_helmet/equip/fullset/equip diff --git a/Asset/data/asset/functions/artifact/0567.great_sage_chestplate/equip/dis_equip/.mcfunction b/Asset/data/asset/functions/artifact/0567.great_sage_chestplate/equip/dis_equip/.mcfunction deleted file mode 100644 index b2b1ffe32c..0000000000 --- a/Asset/data/asset/functions/artifact/0567.great_sage_chestplate/equip/dis_equip/.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> asset:artifact/0567.great_sage_chestplate/equip/dis_equip/ -# -# 装備を外した時に外した部位にのみのidが入った状態でトリガーされる -# -# @within tag/function asset:artifact/dis_equip - -execute if data storage asset:context id{chest:567} run function asset:artifact/0567.great_sage_chestplate/equip/dis_equip/main \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0567.great_sage_chestplate/equip/dis_equip/main.mcfunction b/Asset/data/asset/functions/artifact/0567.great_sage_chestplate/equip/dis_equip/main.mcfunction deleted file mode 100644 index cc171c2569..0000000000 --- a/Asset/data/asset/functions/artifact/0567.great_sage_chestplate/equip/dis_equip/main.mcfunction +++ /dev/null @@ -1,28 +0,0 @@ -#> asset:artifact/0567.great_sage_chestplate/equip/dis_equip/main -# -# 装備を外した時のメイン処理 -# -# @within function asset:artifact/0567.great_sage_chestplate/equip/dis_equip/ - -# 魔法耐性+7.5% - data modify storage api: Argument.UUID set value [I;1,1,567,5] - function api:modifier/defense/magic/remove - -# 魔法攻撃+7.5% - data modify storage api: Argument.UUID set value [I;1,1,567,5] - function api:modifier/attack/magic/remove - -# MP回復量+10% - data modify storage api: Argument.UUID set value [I;1,1,567,5] - function api:modifier/mp_regen/remove - -# 物理耐性-10% - data modify storage api: Argument.UUID set value [I;1,1,567,5] - function api:modifier/defense/physical/remove - -# 物理攻撃-17.5% - data modify storage api: Argument.UUID set value [I;1,1,567,5] - function api:modifier/attack/physical/remove - -# フルセット外す - execute if entity @s[tag=FQ.Fullset] run function asset:artifact/0566.great_sage_helmet/equip/fullset/dis_equip diff --git a/Asset/data/asset/functions/artifact/0567.great_sage_chestplate/register.mcfunction b/Asset/data/asset/functions/artifact/0567.great_sage_chestplate/register.mcfunction index 3e331f3105..ee577d12d8 100644 --- a/Asset/data/asset/functions/artifact/0567.great_sage_chestplate/register.mcfunction +++ b/Asset/data/asset/functions/artifact/0567.great_sage_chestplate/register.mcfunction @@ -4,50 +4,62 @@ # # @within function asset:artifact/alias/567/register -# 神器のID (int) スプレッドシートの値を入れる - data modify storage asset:artifact ID set value 567 -# 神器のベースアイテム - data modify storage asset:artifact Item set value "minecraft:leather_chestplate" -# 神器の名前 (TextComponentString) - data modify storage asset:artifact Name set value '{"text":"大賢者のローブ(上)","color":"#FED4FF"}' -# 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['[{"text":"大賢者エリュサスの祈りが込められたローブ","color":"#FED4FF"}]','{"text":"この衣服はエリュサスの写し身そのものだ","color":"#FED4FF"}','[{"text":"魔法耐性+7.5% 魔法攻撃+7.5%","color":"dark_purple"}]','[{"text":"MP回復量+10%","color":"green"}]','[{"text":"物理耐性","color":"dark_green"},{"text":"-7.5% ","color":"dark_red"},{"text":"物理攻撃","color":"dark_green"},{"text":"-10%","color":"dark_red"}]'] -# 消費アイテム ({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 "chest" -# 神器のトリガー (string) Wikiを参照 - data modify storage asset:artifact Trigger set value "equip" -# 神器の発動条件 (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 -# グローバルクールダウン (int) (オプション) - # data modify storage asset:artifact SpecialCooldown set value -# クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) - # data modify storage asset:artifact DisableCooldownMessage set value -# 扱える神 (string[]) Wikiを参照 - data modify storage asset:artifact CanUsedGod set value ["Flora", "Nyaptov", "Wi-ki", "Rumor"] -# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) - data modify storage asset:artifact CustomNBT set value {HideFlags:68,display:{color:14598115},Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:8,Operation:0,UUID:[I;1,1,567,5],Slot:"chest"},{AttributeName:"generic.armor_toughness",Name:"generic.armor_toughness",Amount:2.5,Operation:0,UUID:[I;1,1,567,5],Slot:"chest"}]} - \ No newline at end of file +# 神器のID (int) スプレッドシートの値を入れる + data modify storage asset:artifact ID set value 567 +# 神器のベースアイテム + data modify storage asset:artifact Item set value "minecraft:leather_chestplate" +# 神器の名前 (TextComponentString) + data modify storage asset:artifact Name set value '{"text":"大賢者のローブ(上)","color":"#FED4FF"}' +# 神器の説明文 (TextComponentString[]) + data modify storage asset:artifact Lore set value ['[{"text":"大賢者エリュサスの祈りが込められたローブ","color":"#FED4FF"}]','{"text":"この衣服はエリュサスの写し身そのものだ","color":"#FED4FF"}'] +# 消費アイテム ({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 "chest" +# 神器のトリガー (string) Wikiを参照 + # data modify storage asset:artifact Trigger set value +# 神器のサブトリガー (string[]) (オプション) + data modify storage asset:artifact SubTriggers set value ["equip"] +# 神器の発動条件 (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 +# グローバルクールダウン (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 +# 装備時効果 (int) (オプション) + data modify storage asset:artifact EquipID set value 256 +# 装備時補正 (Component[]) (オプション) + data modify storage asset:artifact Modifiers set value [] + data modify storage asset:artifact Modifiers append value {Type:"attack/magic",Amount:0.075d,Operation:"multiply_base"} + data modify storage asset:artifact Modifiers append value {Type:"defense/magic",Amount:0.075d,Operation:"multiply_base"} + data modify storage asset:artifact Modifiers append value {Type:"attack/physical",Amount:-0.10d,Operation:"multiply_base"} + data modify storage asset:artifact Modifiers append value {Type:"defense/physical",Amount:-0.075d,Operation:"multiply_base"} + data modify storage asset:artifact Modifiers append value {Type:"mp_regen",Amount:0.10d,Operation:"multiply_base"} +# 扱える神 (string[]) Wikiを参照 + data modify storage asset:artifact CanUsedGod set value ["Flora", "Nyaptov", "Wi-ki", "Rumor"] +# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) + data modify storage asset:artifact CustomNBT set value {HideFlags:68,display:{color:14598115},Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:8,Operation:0,UUID:[I;1,1,567,5],Slot:"chest"},{AttributeName:"generic.armor_toughness",Name:"generic.armor_toughness",Amount:2.5,Operation:0,UUID:[I;1,1,567,5],Slot:"chest"}]} diff --git a/Asset/data/asset/functions/artifact/0568.great_sage_leggings/equip.mcfunction b/Asset/data/asset/functions/artifact/0568.great_sage_leggings/equip.mcfunction new file mode 100644 index 0000000000..76c35208a9 --- /dev/null +++ b/Asset/data/asset/functions/artifact/0568.great_sage_leggings/equip.mcfunction @@ -0,0 +1,5 @@ + + +# 演出 + particle end_rod ~ ~0.4 ~ 0.3 0.1 0.3 0.1 10 normal @a + playsound minecraft:block.enchantment_table.use player @a ~ ~ ~ 0.8 1 diff --git a/Asset/data/asset/functions/artifact/0568.great_sage_leggings/equip/.mcfunction b/Asset/data/asset/functions/artifact/0568.great_sage_leggings/equip/.mcfunction deleted file mode 100644 index db669c79c0..0000000000 --- a/Asset/data/asset/functions/artifact/0568.great_sage_leggings/equip/.mcfunction +++ /dev/null @@ -1,43 +0,0 @@ -#> asset:artifact/0568.great_sage_leggings/equip/ -# -# 神器のトリガー処理 -# -# @within function asset:artifact/alias/568/equip/ - - -# 魔法耐性+7.5% - data modify storage api: Argument.UUID set value [I;1,1,568,4] - data modify storage api: Argument.Amount set value 0.075 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/defense/magic/add - -# 魔法攻撃+7.5% - data modify storage api: Argument.UUID set value [I;1,1,568,4] - data modify storage api: Argument.Amount set value 0.075 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/attack/magic/add - -# MP回復量+10% - data modify storage api: Argument.UUID set value [I;1,1,568,4] - data modify storage api: Argument.Amount set value 0.1 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/mp_regen/add - -# 物理耐性-10% - data modify storage api: Argument.UUID set value [I;1,1,568,4] - data modify storage api: Argument.Amount set value -0.075 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/defense/physical/add - -# 物理攻撃-17.5% - data modify storage api: Argument.UUID set value [I;1,1,568,4] - data modify storage api: Argument.Amount set value -0.1 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/attack/physical/add - -# 演出 - particle end_rod ~ ~0.4 ~ 0.3 0.1 0.3 0.1 10 normal @a - playsound minecraft:block.enchantment_table.use player @a ~ ~ ~ 0.8 1 - -# セット効果用のファンクション実行（実行は頭のほうで） - execute if data storage asset:context id.all{head:566,chest:567,legs:568,feet:569} run function asset:artifact/0566.great_sage_helmet/equip/fullset/equip diff --git a/Asset/data/asset/functions/artifact/0568.great_sage_leggings/equip/dis_equip/.mcfunction b/Asset/data/asset/functions/artifact/0568.great_sage_leggings/equip/dis_equip/.mcfunction deleted file mode 100644 index 74c7083cdb..0000000000 --- a/Asset/data/asset/functions/artifact/0568.great_sage_leggings/equip/dis_equip/.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> asset:artifact/0568.great_sage_leggings/equip/dis_equip/ -# -# 装備を外した時に外した部位にのみのidが入った状態でトリガーされる -# -# @within tag/function asset:artifact/dis_equip - -execute if data storage asset:context id{legs:568} run function asset:artifact/0568.great_sage_leggings/equip/dis_equip/main \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0568.great_sage_leggings/equip/dis_equip/main.mcfunction b/Asset/data/asset/functions/artifact/0568.great_sage_leggings/equip/dis_equip/main.mcfunction deleted file mode 100644 index c6d67e10a8..0000000000 --- a/Asset/data/asset/functions/artifact/0568.great_sage_leggings/equip/dis_equip/main.mcfunction +++ /dev/null @@ -1,28 +0,0 @@ -#> asset:artifact/0568.great_sage_leggings/equip/dis_equip/main -# -# 装備を外した時のメイン処理 -# -# @within function asset:artifact/0568.great_sage_leggings/equip/dis_equip/ - -# 魔法耐性+7.5% - data modify storage api: Argument.UUID set value [I;1,1,568,4] - function api:modifier/defense/magic/remove - -# 魔法攻撃+7.5% - data modify storage api: Argument.UUID set value [I;1,1,568,4] - function api:modifier/attack/magic/remove - -# MP回復量+10% - data modify storage api: Argument.UUID set value [I;1,1,568,4] - function api:modifier/mp_regen/remove - -# 物理耐性-10% - data modify storage api: Argument.UUID set value [I;1,1,568,4] - function api:modifier/defense/physical/remove - -# 物理攻撃-17.5% - data modify storage api: Argument.UUID set value [I;1,1,568,4] - function api:modifier/attack/physical/remove - -# フルセット外す - execute if entity @s[tag=FQ.Fullset] run function asset:artifact/0566.great_sage_helmet/equip/fullset/dis_equip diff --git a/Asset/data/asset/functions/artifact/0568.great_sage_leggings/register.mcfunction b/Asset/data/asset/functions/artifact/0568.great_sage_leggings/register.mcfunction index c2385f95b9..cffa265de3 100644 --- a/Asset/data/asset/functions/artifact/0568.great_sage_leggings/register.mcfunction +++ b/Asset/data/asset/functions/artifact/0568.great_sage_leggings/register.mcfunction @@ -4,50 +4,62 @@ # # @within function asset:artifact/alias/568/register -# 神器のID (int) スプレッドシートの値を入れる - data modify storage asset:artifact ID set value 568 -# 神器のベースアイテム - data modify storage asset:artifact Item set value "minecraft:leather_leggings" -# 神器の名前 (TextComponentString) - data modify storage asset:artifact Name set value '{"text":"大賢者のローブ(下)","color":"#FED4FF"}' -# 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['[{"text":"大賢者エリュサスの祈りが込められたローブ","color":"#FED4FF"}]','{"text":"この衣服はエリュサスの写し身そのものだ","color":"#FED4FF"}','[{"text":"魔法耐性+7.5% 魔法攻撃+7.5%","color":"dark_purple"}]','[{"text":"MP回復量+10%","color":"green"}]','[{"text":"物理耐性","color":"dark_green"},{"text":"-7.5% ","color":"dark_red"},{"text":"物理攻撃","color":"dark_green"},{"text":"-10%","color":"dark_red"}]'] -# 消費アイテム ({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 "legs" -# 神器のトリガー (string) Wikiを参照 - data modify storage asset:artifact Trigger set value "equip" -# 神器の発動条件 (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 -# グローバルクールダウン (int) (オプション) - # data modify storage asset:artifact SpecialCooldown set value -# クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) - # data modify storage asset:artifact DisableCooldownMessage set value -# 扱える神 (string[]) Wikiを参照 - data modify storage asset:artifact CanUsedGod set value ["Flora", "Nyaptov", "Wi-ki", "Rumor"] -# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) - data modify storage asset:artifact CustomNBT set value {HideFlags:68,display:{color:14598115},Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:7,Operation:0,UUID:[I;1,1,568,4],Slot:"legs"},{AttributeName:"generic.armor_toughness",Name:"generic.armor_toughness",Amount:2.5,Operation:0,UUID:[I;1,1,568,4],Slot:"legs"}]} - \ No newline at end of file +# 神器のID (int) スプレッドシートの値を入れる + data modify storage asset:artifact ID set value 568 +# 神器のベースアイテム + data modify storage asset:artifact Item set value "minecraft:leather_leggings" +# 神器の名前 (TextComponentString) + data modify storage asset:artifact Name set value '{"text":"大賢者のローブ(下)","color":"#FED4FF"}' +# 神器の説明文 (TextComponentString[]) + data modify storage asset:artifact Lore set value ['[{"text":"大賢者エリュサスの祈りが込められたローブ","color":"#FED4FF"}]','{"text":"この衣服はエリュサスの写し身そのものだ","color":"#FED4FF"}'] +# 消費アイテム ({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 "legs" +# 神器のトリガー (string) Wikiを参照 + # data modify storage asset:artifact Trigger set value +# 神器のサブトリガー (string[]) (オプション) + data modify storage asset:artifact SubTriggers set value ["equip"] +# 神器の発動条件 (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 +# グローバルクールダウン (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 +# 装備時効果 (int) (オプション) + data modify storage asset:artifact EquipID set value 256 +# 装備時補正 (Component[]) (オプション) + data modify storage asset:artifact Modifiers set value [] + data modify storage asset:artifact Modifiers append value {Type:"attack/magic",Amount:0.075d,Operation:"multiply_base"} + data modify storage asset:artifact Modifiers append value {Type:"defense/magic",Amount:0.075d,Operation:"multiply_base"} + data modify storage asset:artifact Modifiers append value {Type:"attack/physical",Amount:-0.10d,Operation:"multiply_base"} + data modify storage asset:artifact Modifiers append value {Type:"defense/physical",Amount:-0.075d,Operation:"multiply_base"} + data modify storage asset:artifact Modifiers append value {Type:"mp_regen",Amount:0.10d,Operation:"multiply_base"} +# 扱える神 (string[]) Wikiを参照 + data modify storage asset:artifact CanUsedGod set value ["Flora", "Nyaptov", "Wi-ki", "Rumor"] +# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) + data modify storage asset:artifact CustomNBT set value {HideFlags:68,display:{color:14598115},Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:7,Operation:0,UUID:[I;1,1,568,4],Slot:"legs"},{AttributeName:"generic.armor_toughness",Name:"generic.armor_toughness",Amount:2.5,Operation:0,UUID:[I;1,1,568,4],Slot:"legs"}]} diff --git a/Asset/data/asset/functions/artifact/0569.great_sage_boots/equip.mcfunction b/Asset/data/asset/functions/artifact/0569.great_sage_boots/equip.mcfunction new file mode 100644 index 0000000000..c094556475 --- /dev/null +++ b/Asset/data/asset/functions/artifact/0569.great_sage_boots/equip.mcfunction @@ -0,0 +1,5 @@ + + +# 演出 + particle end_rod ~ ~ ~ 0.3 0.1 0.3 0.1 10 normal @a + playsound minecraft:block.enchantment_table.use player @a ~ ~ ~ 0.8 1 diff --git a/Asset/data/asset/functions/artifact/0569.great_sage_boots/equip/.mcfunction b/Asset/data/asset/functions/artifact/0569.great_sage_boots/equip/.mcfunction deleted file mode 100644 index 6245174517..0000000000 --- a/Asset/data/asset/functions/artifact/0569.great_sage_boots/equip/.mcfunction +++ /dev/null @@ -1,43 +0,0 @@ -#> asset:artifact/0569.great_sage_boots/equip/ -# -# 神器のトリガー処理 -# -# @within function asset:artifact/alias/569/equip/ - - -# 魔法耐性+7.5% - data modify storage api: Argument.UUID set value [I;1,1,569,3] - data modify storage api: Argument.Amount set value 0.075 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/defense/magic/add - -# 魔法攻撃+7.5% - data modify storage api: Argument.UUID set value [I;1,1,569,3] - data modify storage api: Argument.Amount set value 0.075 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/attack/magic/add - -# MP回復量+10% - data modify storage api: Argument.UUID set value [I;1,1,569,3] - data modify storage api: Argument.Amount set value 0.1 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/mp_regen/add - -# 物理耐性-10% - data modify storage api: Argument.UUID set value [I;1,1,569,3] - data modify storage api: Argument.Amount set value -0.075 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/defense/physical/add - -# 物理攻撃-17.5% - data modify storage api: Argument.UUID set value [I;1,1,569,3] - data modify storage api: Argument.Amount set value -0.1 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/attack/physical/add - -# 演出 - particle end_rod ~ ~ ~ 0.3 0.1 0.3 0.1 10 normal @a - playsound minecraft:block.enchantment_table.use player @a ~ ~ ~ 0.8 1 - -# セット効果用のファンクション実行（実行は頭のほうで） - execute if data storage asset:context id.all{head:566,chest:567,legs:568,feet:569} run function asset:artifact/0566.great_sage_helmet/equip/fullset/equip diff --git a/Asset/data/asset/functions/artifact/0569.great_sage_boots/equip/dis_equip/.mcfunction b/Asset/data/asset/functions/artifact/0569.great_sage_boots/equip/dis_equip/.mcfunction deleted file mode 100644 index 0ad5ffe011..0000000000 --- a/Asset/data/asset/functions/artifact/0569.great_sage_boots/equip/dis_equip/.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> asset:artifact/0569.great_sage_boots/equip/dis_equip/ -# -# 装備を外した時に外した部位にのみのidが入った状態でトリガーされる -# -# @within tag/function asset:artifact/dis_equip - -execute if data storage asset:context id{feet:569} run function asset:artifact/0569.great_sage_boots/equip/dis_equip/main \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0569.great_sage_boots/equip/dis_equip/main.mcfunction b/Asset/data/asset/functions/artifact/0569.great_sage_boots/equip/dis_equip/main.mcfunction deleted file mode 100644 index 36b3e37500..0000000000 --- a/Asset/data/asset/functions/artifact/0569.great_sage_boots/equip/dis_equip/main.mcfunction +++ /dev/null @@ -1,28 +0,0 @@ -#> asset:artifact/0569.great_sage_boots/equip/dis_equip/main -# -# 装備を外した時のメイン処理 -# -# @within function asset:artifact/0569.great_sage_boots/equip/dis_equip/ - -# 魔法耐性+7.5% - data modify storage api: Argument.UUID set value [I;1,1,569,3] - function api:modifier/defense/magic/remove - -# 魔法攻撃+7.5% - data modify storage api: Argument.UUID set value [I;1,1,569,3] - function api:modifier/attack/magic/remove - -# MP回復量+10% - data modify storage api: Argument.UUID set value [I;1,1,569,3] - function api:modifier/mp_regen/remove - -# 物理耐性-10% - data modify storage api: Argument.UUID set value [I;1,1,569,3] - function api:modifier/defense/physical/remove - -# 物理攻撃-17.5% - data modify storage api: Argument.UUID set value [I;1,1,569,3] - function api:modifier/attack/physical/remove - -# フルセット外す - execute if entity @s[tag=FQ.Fullset] run function asset:artifact/0566.great_sage_helmet/equip/fullset/dis_equip diff --git a/Asset/data/asset/functions/artifact/0569.great_sage_boots/register.mcfunction b/Asset/data/asset/functions/artifact/0569.great_sage_boots/register.mcfunction index 3f65020ddf..753db67891 100644 --- a/Asset/data/asset/functions/artifact/0569.great_sage_boots/register.mcfunction +++ b/Asset/data/asset/functions/artifact/0569.great_sage_boots/register.mcfunction @@ -4,50 +4,62 @@ # # @within function asset:artifact/alias/569/register -# 神器のID (int) スプレッドシートの値を入れる - data modify storage asset:artifact ID set value 569 -# 神器のベースアイテム - data modify storage asset:artifact Item set value "minecraft:leather_boots" -# 神器の名前 (TextComponentString) - data modify storage asset:artifact Name set value '{"text":"大賢者のブーツ","color":"#FED4FF"}' -# 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['[{"text":"大賢者エリュサスの祈りが込められたブーツ","color":"#FED4FF"}]','{"text":"この衣服はエリュサスの写し身そのものだ","color":"#FED4FF"}','[{"text":"魔法耐性+7.5% 魔法攻撃+7.5%","color":"dark_purple"}]','[{"text":"MP回復量+10%","color":"green"}]','[{"text":"物理耐性","color":"dark_green"},{"text":"-7.5% ","color":"dark_red"},{"text":"物理攻撃","color":"dark_green"},{"text":"-10%","color":"dark_red"}]'] -# 消費アイテム ({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 "feet" -# 神器のトリガー (string) Wikiを参照 - data modify storage asset:artifact Trigger set value "equip" -# 神器の発動条件 (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 -# グローバルクールダウン (int) (オプション) - # data modify storage asset:artifact SpecialCooldown set value -# クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) - # data modify storage asset:artifact DisableCooldownMessage set value -# 扱える神 (string[]) Wikiを参照 - data modify storage asset:artifact CanUsedGod set value ["Flora", "Nyaptov", "Wi-ki", "Rumor"] -# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) - data modify storage asset:artifact CustomNBT set value {HideFlags:68,display:{color:14598115},Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:5,Operation:0,UUID:[I;1,1,569,3],Slot:"feet"},{AttributeName:"generic.armor_toughness",Name:"generic.armor_toughness",Amount:2.5,Operation:0,UUID:[I;1,1,569,3],Slot:"feet"}]} - \ No newline at end of file +# 神器のID (int) スプレッドシートの値を入れる + data modify storage asset:artifact ID set value 569 +# 神器のベースアイテム + data modify storage asset:artifact Item set value "minecraft:leather_boots" +# 神器の名前 (TextComponentString) + data modify storage asset:artifact Name set value '{"text":"大賢者のブーツ","color":"#FED4FF"}' +# 神器の説明文 (TextComponentString[]) + data modify storage asset:artifact Lore set value ['[{"text":"大賢者エリュサスの祈りが込められたブーツ","color":"#FED4FF"}]','{"text":"この衣服はエリュサスの写し身そのものだ","color":"#FED4FF"}'] +# 消費アイテム ({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 "feet" +# 神器のトリガー (string) Wikiを参照 + # data modify storage asset:artifact Trigger set value +# 神器のサブトリガー (string[]) (オプション) + data modify storage asset:artifact SubTriggers set value ["equip"] +# 神器の発動条件 (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 +# グローバルクールダウン (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 +# 装備時効果 (int) (オプション) + data modify storage asset:artifact EquipID set value 256 +# 装備時補正 (Component[]) (オプション) + data modify storage asset:artifact Modifiers set value [] + data modify storage asset:artifact Modifiers append value {Type:"attack/magic",Amount:0.075d,Operation:"multiply_base"} + data modify storage asset:artifact Modifiers append value {Type:"defense/magic",Amount:0.075d,Operation:"multiply_base"} + data modify storage asset:artifact Modifiers append value {Type:"attack/physical",Amount:-0.10d,Operation:"multiply_base"} + data modify storage asset:artifact Modifiers append value {Type:"defense/physical",Amount:-0.075d,Operation:"multiply_base"} + data modify storage asset:artifact Modifiers append value {Type:"mp_regen",Amount:0.10d,Operation:"multiply_base"} +# 扱える神 (string[]) Wikiを参照 + data modify storage asset:artifact CanUsedGod set value ["Flora", "Nyaptov", "Wi-ki", "Rumor"] +# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) + data modify storage asset:artifact CustomNBT set value {HideFlags:68,display:{color:14598115},Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:5,Operation:0,UUID:[I;1,1,569,3],Slot:"feet"},{AttributeName:"generic.armor_toughness",Name:"generic.armor_toughness",Amount:2.5,Operation:0,UUID:[I;1,1,569,3],Slot:"feet"}]} diff --git a/Asset/data/asset/functions/artifact/alias/566/damage/.mcfunction b/Asset/data/asset/functions/artifact/alias/566/damage/.mcfunction new file mode 100644 index 0000000000..b92d980c03 --- /dev/null +++ b/Asset/data/asset/functions/artifact/alias/566/damage/.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/alias/566/damage/ +# +# 神器のトリガー処理のエイリアス +# +# @within function asset:artifact/triggers/event/use.m + +function asset:artifact/0566.great_sage_helmet/damage/ diff --git a/Asset/data/asset/functions/artifact/alias/566/damage/check.mcfunction b/Asset/data/asset/functions/artifact/alias/566/damage/check.mcfunction new file mode 100644 index 0000000000..8db6e2e94d --- /dev/null +++ b/Asset/data/asset/functions/artifact/alias/566/damage/check.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/alias/566/damage/check +# +# 神器の使用条件の確認処理のエイリアス +# +# @within function asset:artifact/triggers/event/check.m + +function asset:artifact/0566.great_sage_helmet/damage/check diff --git a/Asset/data/asset/functions/artifact/alias/566/equip.mcfunction b/Asset/data/asset/functions/artifact/alias/566/equip.mcfunction new file mode 100644 index 0000000000..b596f28b6a --- /dev/null +++ b/Asset/data/asset/functions/artifact/alias/566/equip.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/alias/566/equip +# +# 神器の装備時の処理のエイリアス +# +# @within function asset:artifact/triggers/equip/equip.m + +function asset:artifact/0566.great_sage_helmet/equip diff --git a/Asset/data/asset/functions/artifact/alias/566/equip/.mcfunction b/Asset/data/asset/functions/artifact/alias/566/equip/.mcfunction deleted file mode 100644 index eded777a08..0000000000 --- a/Asset/data/asset/functions/artifact/alias/566/equip/.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> asset:artifact/alias/566/equip/ -# -# 神器のトリガー処理のエイリアス -# -# @within function asset_manager:artifact/triggers/event/use.m - -function asset:artifact/0566.great_sage_helmet/equip/ diff --git a/Asset/data/asset/functions/artifact/alias/566/equip/check.mcfunction b/Asset/data/asset/functions/artifact/alias/566/equip/check.mcfunction deleted file mode 100644 index 179064d7df..0000000000 --- a/Asset/data/asset/functions/artifact/alias/566/equip/check.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> asset:artifact/alias/566/equip/check -# -# 神器の使用条件の確認処理のエイリアス -# -# @within function asset_manager:artifact/triggers/event/check.m - -function asset:artifact/0566.great_sage_helmet/equip/check diff --git a/Asset/data/asset/functions/artifact/alias/566/heal/.mcfunction b/Asset/data/asset/functions/artifact/alias/566/heal/.mcfunction new file mode 100644 index 0000000000..a9d193529d --- /dev/null +++ b/Asset/data/asset/functions/artifact/alias/566/heal/.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/alias/566/heal/ +# +# 神器のトリガー処理のエイリアス +# +# @within function asset:artifact/triggers/event/use.m + +function asset:artifact/0566.great_sage_helmet/heal/ diff --git a/Asset/data/asset/functions/artifact/alias/566/heal/check.mcfunction b/Asset/data/asset/functions/artifact/alias/566/heal/check.mcfunction new file mode 100644 index 0000000000..efe46a718e --- /dev/null +++ b/Asset/data/asset/functions/artifact/alias/566/heal/check.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/alias/566/heal/check +# +# 神器の使用条件の確認処理のエイリアス +# +# @within function asset:artifact/triggers/event/check.m + +function asset:artifact/0566.great_sage_helmet/heal/check diff --git a/Asset/data/asset/functions/artifact/alias/566/kill/.mcfunction b/Asset/data/asset/functions/artifact/alias/566/kill/.mcfunction new file mode 100644 index 0000000000..cc5747abaf --- /dev/null +++ b/Asset/data/asset/functions/artifact/alias/566/kill/.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/alias/566/kill/ +# +# 神器のトリガー処理のエイリアス +# +# @within function asset:artifact/triggers/event/use.m + +function asset:artifact/0566.great_sage_helmet/kill/ diff --git a/Asset/data/asset/functions/artifact/alias/566/kill/check.mcfunction b/Asset/data/asset/functions/artifact/alias/566/kill/check.mcfunction new file mode 100644 index 0000000000..f87524ae55 --- /dev/null +++ b/Asset/data/asset/functions/artifact/alias/566/kill/check.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/alias/566/kill/check +# +# 神器の使用条件の確認処理のエイリアス +# +# @within function asset:artifact/triggers/event/check.m + +function asset:artifact/0566.great_sage_helmet/kill/check diff --git a/Asset/data/asset/functions/artifact/alias/566/tick/.mcfunction b/Asset/data/asset/functions/artifact/alias/566/tick/.mcfunction new file mode 100644 index 0000000000..7812aa0c74 --- /dev/null +++ b/Asset/data/asset/functions/artifact/alias/566/tick/.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/alias/566/tick/ +# +# 神器のトリガー処理のエイリアス +# +# @within function asset:artifact/triggers/event/use.m + +function asset:artifact/0566.great_sage_helmet/tick/ diff --git a/Asset/data/asset/functions/artifact/alias/566/tick/check.mcfunction b/Asset/data/asset/functions/artifact/alias/566/tick/check.mcfunction new file mode 100644 index 0000000000..bd5ebfd52c --- /dev/null +++ b/Asset/data/asset/functions/artifact/alias/566/tick/check.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/alias/566/tick/check +# +# 神器の使用条件の確認処理のエイリアス +# +# @within function asset:artifact/triggers/event/check.m + +function asset:artifact/0566.great_sage_helmet/tick/check diff --git a/Asset/data/asset/functions/artifact/alias/567/equip.mcfunction b/Asset/data/asset/functions/artifact/alias/567/equip.mcfunction new file mode 100644 index 0000000000..7682ddfca1 --- /dev/null +++ b/Asset/data/asset/functions/artifact/alias/567/equip.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/alias/567/equip +# +# 神器の装備時の処理のエイリアス +# +# @within function asset:artifact/triggers/equip/equip.m + +function asset:artifact/0567.great_sage_chestplate/equip diff --git a/Asset/data/asset/functions/artifact/alias/567/equip/.mcfunction b/Asset/data/asset/functions/artifact/alias/567/equip/.mcfunction deleted file mode 100644 index ab17ce1264..0000000000 --- a/Asset/data/asset/functions/artifact/alias/567/equip/.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> asset:artifact/alias/567/equip/ -# -# 神器のトリガー処理のエイリアス -# -# @within function asset_manager:artifact/triggers/event/use.m - -function asset:artifact/0567.great_sage_chestplate/equip/ diff --git a/Asset/data/asset/functions/artifact/alias/568/equip.mcfunction b/Asset/data/asset/functions/artifact/alias/568/equip.mcfunction new file mode 100644 index 0000000000..5155d78335 --- /dev/null +++ b/Asset/data/asset/functions/artifact/alias/568/equip.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/alias/568/equip +# +# 神器の装備時の処理のエイリアス +# +# @within function asset:artifact/triggers/equip/equip.m + +function asset:artifact/0568.great_sage_leggings/equip diff --git a/Asset/data/asset/functions/artifact/alias/568/equip/.mcfunction b/Asset/data/asset/functions/artifact/alias/568/equip/.mcfunction deleted file mode 100644 index 40f3e162a3..0000000000 --- a/Asset/data/asset/functions/artifact/alias/568/equip/.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> asset:artifact/alias/568/equip/ -# -# 神器のトリガー処理のエイリアス -# -# @within function asset_manager:artifact/triggers/event/use.m - -function asset:artifact/0568.great_sage_leggings/equip/ diff --git a/Asset/data/asset/functions/artifact/alias/569/equip.mcfunction b/Asset/data/asset/functions/artifact/alias/569/equip.mcfunction new file mode 100644 index 0000000000..b45c610bb9 --- /dev/null +++ b/Asset/data/asset/functions/artifact/alias/569/equip.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/alias/569/equip +# +# 神器の装備時の処理のエイリアス +# +# @within function asset:artifact/triggers/equip/equip.m + +function asset:artifact/0569.great_sage_boots/equip diff --git a/Asset/data/asset/functions/artifact/alias/569/equip/.mcfunction b/Asset/data/asset/functions/artifact/alias/569/equip/.mcfunction deleted file mode 100644 index c5030a6d51..0000000000 --- a/Asset/data/asset/functions/artifact/alias/569/equip/.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> asset:artifact/alias/569/equip/ -# -# 神器のトリガー処理のエイリアス -# -# @within function asset_manager:artifact/triggers/event/use.m - -function asset:artifact/0569.great_sage_boots/equip/ diff --git a/Asset/data/asset/functions/effect/0256.the_great_sage_s_attire/_/given.mcfunction b/Asset/data/asset/functions/effect/0256.the_great_sage_s_attire/_/given.mcfunction new file mode 100644 index 0000000000..246105f7d5 --- /dev/null +++ b/Asset/data/asset/functions/effect/0256.the_great_sage_s_attire/_/given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0256.the_great_sage_s_attire/_/given +# +# Effectが付与された時に実行されるfunction +# +# @within tag/function asset:effect/given + +execute if data storage asset:context {id:256} run function asset:effect/0256.the_great_sage_s_attire/given/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0256.the_great_sage_s_attire/_/re-given.mcfunction b/Asset/data/asset/functions/effect/0256.the_great_sage_s_attire/_/re-given.mcfunction new file mode 100644 index 0000000000..8a138c17ce --- /dev/null +++ b/Asset/data/asset/functions/effect/0256.the_great_sage_s_attire/_/re-given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0256.the_great_sage_s_attire/_/re-given +# +# Effectが上書きされた時に実行されるfunction +# +# @within tag/function asset:effect/re-given + +execute if data storage asset:context {id:256} run function asset:effect/0256.the_great_sage_s_attire/re-given/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0256.the_great_sage_s_attire/_/register.mcfunction b/Asset/data/asset/functions/effect/0256.the_great_sage_s_attire/_/register.mcfunction new file mode 100644 index 0000000000..bd41ab29fa --- /dev/null +++ b/Asset/data/asset/functions/effect/0256.the_great_sage_s_attire/_/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0256.the_great_sage_s_attire/_/register +# +# +# +# @within tag/function asset:effect/register + +execute if data storage asset:context {id:256} run function asset:effect/0256.the_great_sage_s_attire/register \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0256.the_great_sage_s_attire/_/remove.mcfunction b/Asset/data/asset/functions/effect/0256.the_great_sage_s_attire/_/remove.mcfunction new file mode 100644 index 0000000000..b29182eb7f --- /dev/null +++ b/Asset/data/asset/functions/effect/0256.the_great_sage_s_attire/_/remove.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0256.the_great_sage_s_attire/_/remove +# +# Effectが神器や牛乳によって削除された時に実行されるfunction +# +# @within tag/function asset:effect/remove + +execute if data storage asset:context {id:256} run function asset:effect/0256.the_great_sage_s_attire/remove/ \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0566.great_sage_helmet/equip/fullset/dis_equip.mcfunction b/Asset/data/asset/functions/effect/0256.the_great_sage_s_attire/fullset/dis_equip.mcfunction similarity index 91% rename from Asset/data/asset/functions/artifact/0566.great_sage_helmet/equip/fullset/dis_equip.mcfunction rename to Asset/data/asset/functions/effect/0256.the_great_sage_s_attire/fullset/dis_equip.mcfunction index 5bff52194a..f1f84c0c88 100644 --- a/Asset/data/asset/functions/artifact/0566.great_sage_helmet/equip/fullset/dis_equip.mcfunction +++ b/Asset/data/asset/functions/effect/0256.the_great_sage_s_attire/fullset/dis_equip.mcfunction @@ -1,11 +1,10 @@ -#> asset:artifact/0566.great_sage_helmet/equip/fullset/dis_equip +#> asset:effect/0256.the_great_sage_s_attire/fullset/dis_equip # # # -# @within function asset:artifact/056?.great_sage_*/equip/dis_equip/main - -# タグを消す - tag @s remove FQ.Fullset +# @within function +# asset:effect/0256.the_great_sage_s_attire/re-given/ +# asset:effect/0256.the_great_sage_s_attire/remove/ # 喋る playsound minecraft:entity.allay.item_thrown player @a ~ ~ ~ 1 1.4 diff --git a/Asset/data/asset/functions/artifact/0566.great_sage_helmet/equip/fullset/equip.mcfunction b/Asset/data/asset/functions/effect/0256.the_great_sage_s_attire/fullset/equip.mcfunction similarity index 91% rename from Asset/data/asset/functions/artifact/0566.great_sage_helmet/equip/fullset/equip.mcfunction rename to Asset/data/asset/functions/effect/0256.the_great_sage_s_attire/fullset/equip.mcfunction index 3f8548676b..7966e399a9 100644 --- a/Asset/data/asset/functions/artifact/0566.great_sage_helmet/equip/fullset/equip.mcfunction +++ b/Asset/data/asset/functions/effect/0256.the_great_sage_s_attire/fullset/equip.mcfunction @@ -1,11 +1,10 @@ -#> asset:artifact/0566.great_sage_helmet/equip/fullset/equip +#> asset:effect/0256.the_great_sage_s_attire/fullset/equip # # # -# @within function asset:artifact/056?.great_sage_*/equip/ - -# タグを付与する - tag @s add FQ.Fullset +# @within function +# asset:effect/0256.the_great_sage_s_attire/given/ +# asset:effect/0256.the_great_sage_s_attire/re-given/ # フルセット時喋る playsound minecraft:entity.allay.item_given player @a ~ ~ ~ 2 1.45 diff --git a/Asset/data/asset/functions/effect/0256.the_great_sage_s_attire/given/.mcfunction b/Asset/data/asset/functions/effect/0256.the_great_sage_s_attire/given/.mcfunction new file mode 100644 index 0000000000..453f254595 --- /dev/null +++ b/Asset/data/asset/functions/effect/0256.the_great_sage_s_attire/given/.mcfunction @@ -0,0 +1,11 @@ +#> asset:effect/0256.the_great_sage_s_attire/given/ +# +# Effectが付与された時の処理 +# +# @within function asset:effect/0256.the_great_sage_s_attire/_/given + +# フルセット効果を付与 + execute if data storage asset:context {Stack:4} run function asset:effect/0256.the_great_sage_s_attire/fullset/equip + +# スタックを記録 + data modify storage asset:context this.PrevStack set from storage asset:context Stack diff --git a/Asset/data/asset/functions/effect/0256.the_great_sage_s_attire/re-given/.mcfunction b/Asset/data/asset/functions/effect/0256.the_great_sage_s_attire/re-given/.mcfunction new file mode 100644 index 0000000000..ffda487f80 --- /dev/null +++ b/Asset/data/asset/functions/effect/0256.the_great_sage_s_attire/re-given/.mcfunction @@ -0,0 +1,14 @@ +#> asset:effect/0256.the_great_sage_s_attire/re-given/ +# +# Effectが上書きされた時の処理 +# +# @within function asset:effect/0256.the_great_sage_s_attire/_/re-given + +# フルセット効果を削除 + execute if data storage asset:context PreviousField{PrevStack:4} unless data storage asset:context {Stack:4} run function asset:effect/0256.the_great_sage_s_attire/fullset/dis_equip + +# フルセット効果を付与 + execute unless data storage asset:context PreviousField{PrevStack:4} if data storage asset:context {Stack:4} run function asset:effect/0256.the_great_sage_s_attire/fullset/equip + +# スタックを記録 + data modify storage asset:context this.PrevStack set from storage asset:context Stack diff --git a/Asset/data/asset/functions/effect/0256.the_great_sage_s_attire/register.mcfunction b/Asset/data/asset/functions/effect/0256.the_great_sage_s_attire/register.mcfunction new file mode 100644 index 0000000000..8b534778a9 --- /dev/null +++ b/Asset/data/asset/functions/effect/0256.the_great_sage_s_attire/register.mcfunction @@ -0,0 +1,36 @@ +#> asset:effect/0256.the_great_sage_s_attire/register +# +# Effectのデータを指定 +# +# @within function asset:effect/0256.the_great_sage_s_attire/_/register + +# ExtendsSafe (boolean) (default = false) + # data modify storage asset:effect ExtendsSafe set value true +# ID (int) + data modify storage asset:effect ID set value 256 +# 名前 (TextComponentString) + data modify storage asset:effect Name set value '{"text":"大賢者の装束","color":"#FED4FF"}' +# 説明文 (TextComponentString[]) + data modify storage asset:effect Description set value [] +# 効果時間 (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 "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 +# 消すのに必要なレベル (int) (default = 1) + data modify storage asset:effect RequireClearLv set value 4 +# エフェクトを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 diff --git a/Asset/data/asset/functions/effect/0256.the_great_sage_s_attire/remove/.mcfunction b/Asset/data/asset/functions/effect/0256.the_great_sage_s_attire/remove/.mcfunction new file mode 100644 index 0000000000..9851c6031c --- /dev/null +++ b/Asset/data/asset/functions/effect/0256.the_great_sage_s_attire/remove/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0256.the_great_sage_s_attire/remove/ +# +# Effectが削除された時の処理 +# +# @within function asset:effect/0256.the_great_sage_s_attire/_/remove + +# フルセット効果を削除 + execute if data storage asset:context {Stack:4} run function asset:effect/0256.the_great_sage_s_attire/fullset/dis_equip diff --git a/Asset/data/asset/tags/functions/effect/given.json b/Asset/data/asset/tags/functions/effect/given.json index d2a7abb8ac..48f8336d8e 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/0256.the_great_sage_s_attire/_/given", + "asset:effect/0256.the_great_sage_s_attire/_/given", "asset:effect/0297.life_is_transitory/_/given", "asset:effect/0262.catastrophe/_/given", "asset:effect/0296.soul_disconnection/_/given", @@ -71,4 +73,4 @@ "asset:effect/0246.flame_devil_armor/_/given", "asset:effect/0247.great_demon_armor/_/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 64ed569d4a..7133ac6194 100644 --- a/Asset/data/asset/tags/functions/effect/re-given.json +++ b/Asset/data/asset/tags/functions/effect/re-given.json @@ -1,5 +1,7 @@ { "values": [ + "asset:effect/0256.the_great_sage_s_attire/_/re-given", + "asset:effect/0256.the_great_sage_s_attire/_/re-given", "asset:effect/0262.catastrophe/_/re-given", "asset:effect/0296.soul_disconnection/_/re-given", "asset:effect/0618.soaked/_/re-given", @@ -41,4 +43,4 @@ "asset:effect/0246.flame_devil_armor/_/re-given", "asset:effect/0247.great_demon_armor/_/re-given" ] -} +} \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/effect/register.json b/Asset/data/asset/tags/functions/effect/register.json index 451f461869..4a25856d40 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/0256.the_great_sage_s_attire/_/register", "asset:effect/0032.invisibility/_/register", "asset:effect/0297.life_is_transitory/_/register", "asset:effect/0262.catastrophe/_/register", @@ -109,4 +110,4 @@ "asset:effect/0246.flame_devil_armor/_/register", "asset:effect/0247.great_demon_armor/_/register" ] -} +} \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/effect/remove.json b/Asset/data/asset/tags/functions/effect/remove.json index 34d3ff6a47..e0553c8f68 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/0256.the_great_sage_s_attire/_/remove", + "asset:effect/0256.the_great_sage_s_attire/_/remove", "asset:effect/0032.invisibility/_/remove", "asset:effect/0297.life_is_transitory/_/remove", "asset:effect/0262.catastrophe/_/remove", @@ -69,4 +71,4 @@ "asset:effect/0007.defense_base_debuff/_/remove", "asset:effect/0258.spirit_melody/_/remove" ] -} +} \ No newline at end of file