diff --git a/Asset/data/asset/functions/artifact/0258.chen_dream_pillow/give/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/0258.cat_dream_pillow/give/1.trigger.mcfunction similarity index 63% rename from Asset/data/asset/functions/artifact/0258.chen_dream_pillow/give/1.trigger.mcfunction rename to Asset/data/asset/functions/artifact/0258.cat_dream_pillow/give/1.trigger.mcfunction index 01f9c6365b..cda2b37e54 100644 --- a/Asset/data/asset/functions/artifact/0258.chen_dream_pillow/give/1.trigger.mcfunction +++ b/Asset/data/asset/functions/artifact/0258.cat_dream_pillow/give/1.trigger.mcfunction @@ -1,7 +1,7 @@ -#> asset:artifact/0258.chen_dream_pillow/give/1.trigger +#> asset:artifact/0258.cat_dream_pillow/give/1.trigger # # 神器の取得処理の呼び出し時に実行されるfunction # # @within tag/function asset:artifact/give -execute if data storage asset:context {id:258} run function asset:artifact/0258.chen_dream_pillow/give/2.give +execute if data storage asset:context {id:258} run function asset:artifact/0258.cat_dream_pillow/give/2.give diff --git a/Asset/data/asset/functions/artifact/0258.chen_dream_pillow/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0258.cat_dream_pillow/give/2.give.mcfunction similarity index 75% rename from Asset/data/asset/functions/artifact/0258.chen_dream_pillow/give/2.give.mcfunction rename to Asset/data/asset/functions/artifact/0258.cat_dream_pillow/give/2.give.mcfunction index 00f36db5e6..b8b08c2ae7 100644 --- a/Asset/data/asset/functions/artifact/0258.chen_dream_pillow/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0258.cat_dream_pillow/give/2.give.mcfunction @@ -1,9 +1,9 @@ -#> asset:artifact/0258.chen_dream_pillow/give/2.give +#> asset:artifact/0258.cat_dream_pillow/give/2.give # # 神器の作成部 ここでID等を定義する # # @user -# @within function asset:artifact/0258.chen_dream_pillow/give/1.trigger +# @within function asset:artifact/0258.cat_dream_pillow/give/1.trigger # 神器の説明や消費MPなどをここで設定する。 # 最後にasset:artifact/common/giveを実行することで入手可能。 @@ -11,19 +11,19 @@ # 神器のID (int) スプレッドシートの値を入れる data modify storage asset:artifact ID set value 258 # 神器のベースアイテム - data modify storage asset:artifact Item set value "minecraft:carrot_on_a_stick" + data modify storage asset:artifact Item set value "minecraft:stick" # 神器の名前 (TextComponentString) - data modify storage asset:artifact Name set value '{"text":"ちぇん氏の夢枕","color":"light_purple"}' + data modify storage asset:artifact Name set value '{"text":"猫の夢見枕","color":"#F8CEF5"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text":"「あぁ~ためになる~」"}'] + data modify storage asset:artifact Lore set value ['{"text":"回復対象に回復量の30%分のバリアを付与する。"}','{"text":"猫の意匠が施された枕。","color":"gray"}','{"text":"この枕で眠ると猫に囲まれる夢を見る。","color":"gray"}'] # MP以外の消費物 (TextComponentString) (オプション) # data modify storage asset:artifact CostText set value # 使用回数 (int) (オプション) - data modify storage asset:artifact RemainingCount set value 1 + # data modify storage asset:artifact RemainingCount set value # 神器を発動できるスロット (string) Wikiを参照 - data modify storage asset:artifact Slot set value "auto" + data modify storage asset:artifact Slot set value "hotbar" # 神器のトリガー (string) Wikiを参照 - data modify storage asset:artifact Trigger set value "onClick" + data modify storage asset:artifact Trigger set value "onHeal" # 神器の発動条件 (TextComponentString) (オプション) # data modify storage asset:artifact Condition set value # 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) @@ -39,21 +39,21 @@ # 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) # data modify storage asset:artifact AttackInfo.AttackRange set value # MP消費量 (int) - data modify storage asset:artifact MPCost set value 0 + data modify storage asset:artifact MPCost set value 12 # MP必要量 (int) (オプション) # data modify storage asset:artifact MPRequire set value # 神器のクールダウン (int) (オプション) - # data modify storage asset:artifact LocalCooldown set value + data modify storage asset:artifact LocalCooldown set value 200 # グローバルクールダウン (int) (オプション) # data modify storage asset:artifact SpecialCooldown set value # クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) - # data modify storage asset:artifact DisableCooldownMessage set value + data modify storage asset:artifact DisableCooldownMessage set value true # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) - # data modify storage asset:artifact DisableMPMessage set value + data modify storage asset:artifact DisableMPMessage set value true # 扱える神 (string[]) Wikiを参照 - data modify storage asset:artifact CanUsedGod set value ["Nyaptov"] + data modify storage asset:artifact CanUsedGod set value ["Nyaptov", "Rumor"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) # data modify storage asset:artifact CustomNBT set value {} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0258.chen_dream_pillow/register.mcfunction b/Asset/data/asset/functions/artifact/0258.cat_dream_pillow/register.mcfunction similarity index 76% rename from Asset/data/asset/functions/artifact/0258.chen_dream_pillow/register.mcfunction rename to Asset/data/asset/functions/artifact/0258.cat_dream_pillow/register.mcfunction index 4f68d679de..92b6ad24bf 100644 --- a/Asset/data/asset/functions/artifact/0258.chen_dream_pillow/register.mcfunction +++ b/Asset/data/asset/functions/artifact/0258.cat_dream_pillow/register.mcfunction @@ -1,4 +1,4 @@ -#> asset:artifact/0258.chen_dream_pillow/register +#> asset:artifact/0258.cat_dream_pillow/register # # 神器プールへの登録処理 # diff --git a/Asset/data/asset/functions/artifact/0258.chen_dream_pillow/trigger/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/0258.cat_dream_pillow/trigger/1.trigger.mcfunction similarity index 60% rename from Asset/data/asset/functions/artifact/0258.chen_dream_pillow/trigger/1.trigger.mcfunction rename to Asset/data/asset/functions/artifact/0258.cat_dream_pillow/trigger/1.trigger.mcfunction index a6c9e77bc7..e20d615308 100644 --- a/Asset/data/asset/functions/artifact/0258.chen_dream_pillow/trigger/1.trigger.mcfunction +++ b/Asset/data/asset/functions/artifact/0258.cat_dream_pillow/trigger/1.trigger.mcfunction @@ -1,8 +1,8 @@ -#> asset:artifact/0258.chen_dream_pillow/trigger/1.trigger +#> asset:artifact/0258.cat_dream_pillow/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:258} run function asset:artifact/0258.chen_dream_pillow/trigger/2.check_condition \ No newline at end of file + execute if data storage asset:context id{hotbar:[258]} run function asset:artifact/0258.cat_dream_pillow/trigger/2.check_condition diff --git a/Asset/data/asset/functions/artifact/0258.cat_dream_pillow/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/0258.cat_dream_pillow/trigger/2.check_condition.mcfunction new file mode 100644 index 0000000000..275fdcae99 --- /dev/null +++ b/Asset/data/asset/functions/artifact/0258.cat_dream_pillow/trigger/2.check_condition.mcfunction @@ -0,0 +1,14 @@ +#> asset:artifact/0258.cat_dream_pillow/trigger/2.check_condition +# +# 神器の発動条件をチェックします +# +# @within function asset:artifact/0258.cat_dream_pillow/trigger/1.trigger + +# 神器IDの設定 + data modify storage asset:artifact TargetID set value 258 +# 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く + function asset:artifact/common/check_condition/hotbar +# 他にアイテム等確認する場合はここに書く + +# CanUsedタグをチェックして3.main.mcfunctionを実行する + execute if entity @s[tag=CanUsed] run function asset:artifact/0258.cat_dream_pillow/trigger/3.main diff --git a/Asset/data/asset/functions/artifact/0258.cat_dream_pillow/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0258.cat_dream_pillow/trigger/3.main.mcfunction new file mode 100644 index 0000000000..81a0054c06 --- /dev/null +++ b/Asset/data/asset/functions/artifact/0258.cat_dream_pillow/trigger/3.main.mcfunction @@ -0,0 +1,41 @@ +#> asset:artifact/0258.cat_dream_pillow/trigger/3.main +# +# 神器のメイン処理部 +# +# @within function asset:artifact/0258.cat_dream_pillow/trigger/2.check_condition + +# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う auto/feet/legs/chest/head/mainhand/offhandを記載してね + function asset:artifact/common/use/hotbar + +# ここから先は神器側の効果の処理を書く + +#> Private +# @private + #declare score_holder $Random + +# 演出 + particle dust 1000000000 -0.3 -0.2 1 ~ ~1.2 ~ 0.8 0.4 0.8 0 50 + +# 乱数生成 + execute store result score $Random Temporary run function lib:random/ + scoreboard players operation $Random Temporary %= $3 Const + +# playsound + execute if score $Random Temporary matches 0 run playsound entity.cat.ambient player @a ~ ~ ~ 1 1 0 + execute if score $Random Temporary matches 1 run playsound entity.cat.purreow player @a ~ ~ ~ 1 1 0 + execute if score $Random Temporary matches 2 run playsound entity.cat.stray_ambient player @a ~ ~ ~ 1 1 0 + +# ToとAmountsをコピー + data modify storage asset:temp Temp.To set from storage asset:context Heal.To + data modify storage asset:temp Temp.Amounts set from storage asset:context Heal.Amounts + +# 回復対象へそれぞれの回復量の30%分のバリアを付与 + function asset:artifact/0258.cat_dream_pillow/trigger/give_barrier + +# リセット + scoreboard players reset $TempUserID Temporary + scoreboard players reset $Random Temporary + scoreboard players reset $BarrierAmount Temporary + scoreboard players reset $CurrentBarrier Temporary + scoreboard players reset $MaxHP30Per Temporary + data remove storage asset:temp Temp diff --git a/Asset/data/asset/functions/artifact/0258.cat_dream_pillow/trigger/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0258.cat_dream_pillow/trigger/_index.d.mcfunction new file mode 100644 index 0000000000..c9e4cec1cc --- /dev/null +++ b/Asset/data/asset/functions/artifact/0258.cat_dream_pillow/trigger/_index.d.mcfunction @@ -0,0 +1,9 @@ +#> asset:artifact/0258.cat_dream_pillow/trigger/_index.d +# @private + +#> tag +# @within function asset:artifact/0258.cat_dream_pillow/trigger/** + #declare score_holder $TempUserID + #declare score_holder $BarrierAmount + #declare score_holder $CurrentBarrier + #declare tag BarrierTarget diff --git a/Asset/data/asset/functions/artifact/0258.cat_dream_pillow/trigger/give_barrier.mcfunction b/Asset/data/asset/functions/artifact/0258.cat_dream_pillow/trigger/give_barrier.mcfunction new file mode 100644 index 0000000000..c7cbdf76ae --- /dev/null +++ b/Asset/data/asset/functions/artifact/0258.cat_dream_pillow/trigger/give_barrier.mcfunction @@ -0,0 +1,48 @@ +#> asset:artifact/0258.cat_dream_pillow/trigger/give_barrier +# +# バリアをプレイヤーに再帰で付与していく +# +# @within function +# asset:artifact/0258.cat_dream_pillow/trigger/3.main +# asset:artifact/0258.cat_dream_pillow/trigger/give_barrier + +# このmcf実行前にHeal.To[]とHeal.Amounts[]をコピーする +# Temp.To[]の最後尾のUserIDのプレイヤーに、Temp.Amounts[]の最後尾の値の30%のバリアを付与する +# ↑が終わったらTemp.To[]とTemp.Amountsの最後尾の要素を削除し、要素が残っていれば再帰する + +# UserIDを取得 + execute store result score $TempUserID Temporary run data get storage asset:temp Temp.To[-1] + +# Amountsの30%の10倍を取得 代入する際に0.1倍にする + execute store result score $BarrierAmount Temporary run data get storage asset:temp Temp.Amounts[-1] 3 + +# 該当プレイヤーにTagをつけておく + execute at @a if score $TempUserID Temporary = @p UserID run tag @p add BarrierTarget + +# 演出 使用者には演出を出さない + execute at @p[tag=BarrierTarget,tag=!this] run particle dust 1000000000 -0.3 -0.2 1 ~ ~1.2 ~ 0.8 0.4 0.8 0 50 + +# 現在のバリアの数値を取得 + data modify storage api: Argument.UUID set value [I;1,3,267,0] + function api:entity/player/absorption/get + execute store result score $CurrentBarrier Temporary run data get storage api: Return.Absorption.Amount 10 + +# 付与するバリア数値 < 現在バリア数値ならTagを削除 + execute if score $BarrierAmount Temporary < $CurrentBarrier Temporary run tag @p[tag=BarrierTarget] remove BarrierTarget + +# バリア数値をフィールドへ代入 + execute store result storage api: Argument.FieldOverride.Barrier double 0.1 run scoreboard players get $BarrierAmount Temporary + +# バリア用エフェクトを付与 + data modify storage api: Argument.ID set value 267 + execute as @p[tag=BarrierTarget] run function api:entity/mob/effect/give + +# Tagを削除 + tag @p[tag=BarrierTarget] remove BarrierTarget + +# 配列の最後尾の要素を削除 + data remove storage asset:temp Temp.To[-1] + data remove storage asset:temp Temp.Amounts[-1] + +# 要素がまだあれば再帰 + execute if data storage asset:temp Temp.To[-1] run function asset:artifact/0258.cat_dream_pillow/trigger/give_barrier diff --git a/Asset/data/asset/functions/artifact/0258.chen_dream_pillow/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/0258.chen_dream_pillow/trigger/2.check_condition.mcfunction deleted file mode 100644 index 50fb85bdcb..0000000000 --- a/Asset/data/asset/functions/artifact/0258.chen_dream_pillow/trigger/2.check_condition.mcfunction +++ /dev/null @@ -1,12 +0,0 @@ -#> asset:artifact/0258.chen_dream_pillow/trigger/2.check_condition -# -# 神器の発動条件をチェックします -# -# @within function asset:artifact/0258.chen_dream_pillow/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/0258.chen_dream_pillow/trigger/3.main \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0258.chen_dream_pillow/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0258.chen_dream_pillow/trigger/3.main.mcfunction deleted file mode 100644 index 3578a6bdd8..0000000000 --- a/Asset/data/asset/functions/artifact/0258.chen_dream_pillow/trigger/3.main.mcfunction +++ /dev/null @@ -1,26 +0,0 @@ -#> asset:artifact/0258.chen_dream_pillow/trigger/3.main -# -# 神器のメイン処理部 -# -# @within function asset:artifact/0258.chen_dream_pillow/trigger/2.check_condition - -#> private -# @private - #declare score_holder $Fluctuation - -# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う auto/feet/legs/chest/head/mainhand/offhandを記載してね - function asset:artifact/common/use/auto - -# ここから先は神器側の効果の処理を書く - -# 演出 - particle minecraft:composter ~ ~1 ~ 0.5 0.5 0.5 1 100 force @s - playsound minecraft:ui.toast.challenge_complete player @a ~ ~ ~ 1 1 - title @a times 20 60 20 - title @a title {"text":"あぁ~ためになる~","color":"aqua","bold":true} - title @a subtitle {"text":"ちぇん氏のTwitterをフォローしよう!"} - tellraw @a [{"text":"とってもためになるちぇん氏のTwitter:","color":"white"},{"text":"@CMD__Cat","color":"aqua","clickEvent":{"action":"open_url","value":"https://twitter.com/CMD__Cat"},"hoverEvent":{"action":"show_text","contents":{"text":"クリックしてアクセス!"}}}] - -# MP回復 - scoreboard players set $Fluctuation Lib 1231 - function lib:mp/fluctuation \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0267.dreaming_veil/_/end.mcfunction b/Asset/data/asset/functions/effect/0267.dreaming_veil/_/end.mcfunction new file mode 100644 index 0000000000..1257a8be30 --- /dev/null +++ b/Asset/data/asset/functions/effect/0267.dreaming_veil/_/end.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0267.dreaming_veil/_/end +# +# Effectの効果の終了時に実行されるfunction +# +# @within tag/function asset:effect/end + +execute if data storage asset:context {id:267} run function asset:effect/0267.dreaming_veil/end/ diff --git a/Asset/data/asset/functions/effect/0267.dreaming_veil/_/given.mcfunction b/Asset/data/asset/functions/effect/0267.dreaming_veil/_/given.mcfunction new file mode 100644 index 0000000000..0827a37b0e --- /dev/null +++ b/Asset/data/asset/functions/effect/0267.dreaming_veil/_/given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0267.dreaming_veil/_/given +# +# Effectが付与された時に実行されるfunction +# +# @within tag/function asset:effect/given + +execute if data storage asset:context {id:267} run function asset:effect/0267.dreaming_veil/given/ diff --git a/Asset/data/asset/functions/effect/0267.dreaming_veil/_/re-given.mcfunction b/Asset/data/asset/functions/effect/0267.dreaming_veil/_/re-given.mcfunction new file mode 100644 index 0000000000..b16831aa2b --- /dev/null +++ b/Asset/data/asset/functions/effect/0267.dreaming_veil/_/re-given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0267.dreaming_veil/_/re-given +# +# Effectが上書きされた時に実行されるfunction +# +# @within tag/function asset:effect/re-given + +execute if data storage asset:context {id:267} run function asset:effect/0267.dreaming_veil/re-given/ diff --git a/Asset/data/asset/functions/effect/0267.dreaming_veil/_/register.mcfunction b/Asset/data/asset/functions/effect/0267.dreaming_veil/_/register.mcfunction new file mode 100644 index 0000000000..fe721ad1b4 --- /dev/null +++ b/Asset/data/asset/functions/effect/0267.dreaming_veil/_/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0267.dreaming_veil/_/register +# +# +# +# @within tag/function asset:effect/register + +execute if data storage asset:context {id:267} run function asset:effect/0267.dreaming_veil/register diff --git a/Asset/data/asset/functions/effect/0267.dreaming_veil/_/remove.mcfunction b/Asset/data/asset/functions/effect/0267.dreaming_veil/_/remove.mcfunction new file mode 100644 index 0000000000..378b888486 --- /dev/null +++ b/Asset/data/asset/functions/effect/0267.dreaming_veil/_/remove.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0267.dreaming_veil/_/remove +# +# Effectが神器や牛乳によって削除された時に実行されるfunction +# +# @within tag/function asset:effect/remove + +execute if data storage asset:context {id:267} run function asset:effect/0267.dreaming_veil/remove/ diff --git a/Asset/data/asset/functions/effect/0267.dreaming_veil/_index.d.mcfunction b/Asset/data/asset/functions/effect/0267.dreaming_veil/_index.d.mcfunction new file mode 100644 index 0000000000..7178a1671d --- /dev/null +++ b/Asset/data/asset/functions/effect/0267.dreaming_veil/_index.d.mcfunction @@ -0,0 +1,6 @@ +#> asset:effect/0267.dreaming_veil/_index.d +# @private + +#> 0267.dreaming_veil +# @within function asset:effect/0267.dreaming_veil/** + #declare diff --git a/Asset/data/asset/functions/effect/0267.dreaming_veil/barrier/add.mcfunction b/Asset/data/asset/functions/effect/0267.dreaming_veil/barrier/add.mcfunction new file mode 100644 index 0000000000..0a2c29a35f --- /dev/null +++ b/Asset/data/asset/functions/effect/0267.dreaming_veil/barrier/add.mcfunction @@ -0,0 +1,16 @@ +#> asset:effect/0267.dreaming_veil/barrier/add +# +# バリアを付与する +# +# @within function +# asset:effect/0267.dreaming_veil/given/ +# asset:effect/0267.dreaming_veil/re-given/ + +# フィールドからバリア量を取得 + data modify storage api: Argument.Amount set from storage asset:context this.Barrier + +# バリア設定 + data modify storage api: Argument.UUID set value [I;1,3,267,0] + data modify storage api: Argument.Priority set value 1 + data modify storage api: Argument.WipedCallback set value "asset:effect/0267.dreaming_veil/remove/" + function api:entity/player/absorption/add diff --git a/Asset/data/asset/functions/effect/0267.dreaming_veil/barrier/remove.mcfunction b/Asset/data/asset/functions/effect/0267.dreaming_veil/barrier/remove.mcfunction new file mode 100644 index 0000000000..7a56a71297 --- /dev/null +++ b/Asset/data/asset/functions/effect/0267.dreaming_veil/barrier/remove.mcfunction @@ -0,0 +1,11 @@ +#> asset:effect/0267.dreaming_veil/barrier/remove +# +# バリアを削除する +# +# @within function +# asset:effect/0267.dreaming_veil/end/ +# asset:effect/0267.dreaming_veil/remove/ + +# バリアを削除する + data modify storage api: Argument.UUID set value [I;1,3,267,0] + function api:entity/player/absorption/remove diff --git a/Asset/data/asset/functions/effect/0267.dreaming_veil/end/.mcfunction b/Asset/data/asset/functions/effect/0267.dreaming_veil/end/.mcfunction new file mode 100644 index 0000000000..6bde1e8967 --- /dev/null +++ b/Asset/data/asset/functions/effect/0267.dreaming_veil/end/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0267.dreaming_veil/end/ +# +# Effectの効果が切れた時の処理 +# +# @within function asset:effect/0267.dreaming_veil/_/end + +# バリアを削除する + function asset:effect/0267.dreaming_veil/barrier/remove diff --git a/Asset/data/asset/functions/effect/0267.dreaming_veil/given/.mcfunction b/Asset/data/asset/functions/effect/0267.dreaming_veil/given/.mcfunction new file mode 100644 index 0000000000..04debfbe7f --- /dev/null +++ b/Asset/data/asset/functions/effect/0267.dreaming_veil/given/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0267.dreaming_veil/given/ +# +# Effectが付与された時の処理 +# +# @within function asset:effect/0267.dreaming_veil/_/given + +# バリアを付与する + function asset:effect/0267.dreaming_veil/barrier/add diff --git a/Asset/data/asset/functions/effect/0267.dreaming_veil/re-given/.mcfunction b/Asset/data/asset/functions/effect/0267.dreaming_veil/re-given/.mcfunction new file mode 100644 index 0000000000..2d0cdd6593 --- /dev/null +++ b/Asset/data/asset/functions/effect/0267.dreaming_veil/re-given/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0267.dreaming_veil/re-given/ +# +# Effectが上書きされた時の処理 +# +# @within function asset:effect/0267.dreaming_veil/_/re-given + +# バリアを付与する + function asset:effect/0267.dreaming_veil/barrier/add diff --git a/Asset/data/asset/functions/effect/0267.dreaming_veil/register.mcfunction b/Asset/data/asset/functions/effect/0267.dreaming_veil/register.mcfunction new file mode 100644 index 0000000000..03982dd94e --- /dev/null +++ b/Asset/data/asset/functions/effect/0267.dreaming_veil/register.mcfunction @@ -0,0 +1,35 @@ +#> asset:effect/0267.dreaming_veil/register +# +# Effectのデータを指定 +# +# @within function asset:effect/0267.dreaming_veil/_/register + +# ExtendsSafe (boolean) (default = false) + # data modify storage asset:effect ExtendsSafe set value true +# ID (int) + data modify storage asset:effect ID set value 267 +# 名前 (TextComponentString) + data modify storage asset:effect Name set value '{"text":"夢見の護り","color":"light_purple"}' +# 説明文 (TextComponentString[]) + data modify storage asset:effect Description set value ['{"text":"ダメージを吸収する","color":"white"}'] +# 効果時間 (int) (default = API || error) + data modify storage asset:effect Duration set value 600 +# スタック (int) (default = API || 1) + # data modify storage asset:effect Stack set value +# 効果時間の操作方法 (default = API || "replace") + # data modify storage asset:effect DurationOperation set value +# スタックの操作方法 (default = API || "replace") + # data modify storage asset:effect StackOperation set value +# 最大効果時間 (int) (default = 2147483647) + # data modify storage asset:effect MaxDuration set value +# 最大スタック (int) (default = 2147483647) + data modify storage asset:effect MaxStack set value 1 +# 悪い効果か否か (boolean) + data modify storage asset:effect IsBadEffect set value false +# 死亡時のエフェクトの処理 (default = "remove") + # data modify storage asset:effect ProcessOnDied set value +# 消すのに必要なレベル (int) (default = 1) + data modify storage asset:effect RequireClearLv set value 3 + +# フィールド + # data modify storage asset:effect Field set value {} diff --git a/Asset/data/asset/functions/effect/0267.dreaming_veil/remove/.mcfunction b/Asset/data/asset/functions/effect/0267.dreaming_veil/remove/.mcfunction new file mode 100644 index 0000000000..283f14e250 --- /dev/null +++ b/Asset/data/asset/functions/effect/0267.dreaming_veil/remove/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0267.dreaming_veil/remove/ +# +# Effectが削除された時の処理 +# +# @within function asset:effect/0267.dreaming_veil/_/remove + +# バリアを削除する + function asset:effect/0267.dreaming_veil/barrier/remove 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 4cb0d676c9..1e5268b531 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 @@ -70,7 +70,6 @@ "asset:artifact/0295.call_elemental_familiar/trigger/1.trigger", "asset:artifact/0093.diamond_armor_set/trigger/1.trigger", "asset:artifact/0290.carefully_collector/trigger/1.trigger", - "asset:artifact/0258.chen_dream_pillow/trigger/1.trigger", "asset:artifact/0361.rainbow_crystal/trigger/1.trigger", "asset:artifact/0212.anti_materiel_rifle/trigger/1.trigger", "asset:artifact/0107.dispenser_canon/trigger/1.trigger", diff --git a/Asset/data/asset/tags/functions/artifact/give.json b/Asset/data/asset/tags/functions/artifact/give.json index 9da6d1a772..94867329bd 100644 --- a/Asset/data/asset/tags/functions/artifact/give.json +++ b/Asset/data/asset/tags/functions/artifact/give.json @@ -270,7 +270,7 @@ "asset:artifact/0249.wakinyan/give/1.trigger", "asset:artifact/0250.phoenix/give/1.trigger", "asset:artifact/0252.void_transaction/give/1.trigger", - "asset:artifact/0258.chen_dream_pillow/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", diff --git a/Asset/data/asset/tags/functions/artifact/heal.json b/Asset/data/asset/tags/functions/artifact/heal.json index 1156e209c6..76f5d6a9d4 100644 --- a/Asset/data/asset/tags/functions/artifact/heal.json +++ b/Asset/data/asset/tags/functions/artifact/heal.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/0258.cat_dream_pillow/trigger/1.trigger", "asset:artifact/1108.white_lily_of_priestess/trigger/1.trigger", "asset:artifact/1069.sprout_of_dappled_sunlight/trigger/1.trigger" ] diff --git a/Asset/data/asset/tags/functions/artifact/register.json b/Asset/data/asset/tags/functions/artifact/register.json index 5c00e187f9..1626141926 100644 --- a/Asset/data/asset/tags/functions/artifact/register.json +++ b/Asset/data/asset/tags/functions/artifact/register.json @@ -67,7 +67,7 @@ "asset:artifact/0250.phoenix/register", "asset:artifact/0252.void_transaction/register", "asset:artifact/0253.holy_barrier/register", - "asset:artifact/0258.chen_dream_pillow/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", diff --git a/Asset/data/asset/tags/functions/effect/end.json b/Asset/data/asset/tags/functions/effect/end.json index a312ed37d7..dcfc22cd17 100644 --- a/Asset/data/asset/tags/functions/effect/end.json +++ b/Asset/data/asset/tags/functions/effect/end.json @@ -33,6 +33,7 @@ "asset:effect/0608.sinking/_/end", "asset:effect/0612.infringement/_/end", "asset:effect/0613.white_curse/_/end", - "asset:effect/0203.secret_meat/_/end" + "asset:effect/0203.secret_meat/_/end", + "asset:effect/0267.dreaming_veil/_/end" ] -} \ No newline at end of file +} diff --git a/Asset/data/asset/tags/functions/effect/given.json b/Asset/data/asset/tags/functions/effect/given.json index 0f5b86caa4..77c9592a9e 100644 --- a/Asset/data/asset/tags/functions/effect/given.json +++ b/Asset/data/asset/tags/functions/effect/given.json @@ -31,6 +31,7 @@ "asset:effect/0608.sinking/_/given", "asset:effect/0612.infringement/_/given", "asset:effect/0613.white_curse/_/given", - "asset:effect/0203.secret_meat/_/given" + "asset:effect/0203.secret_meat/_/given", + "asset:effect/0267.dreaming_veil/_/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 0e31070541..f0a7b869c3 100644 --- a/Asset/data/asset/tags/functions/effect/re-given.json +++ b/Asset/data/asset/tags/functions/effect/re-given.json @@ -9,6 +9,7 @@ "asset:effect/0607.sedation/_/re-given", "asset:effect/0608.sinking/_/re-given", "asset:effect/0612.infringement/_/re-given", - "asset:effect/0613.white_curse/_/re-given" + "asset:effect/0613.white_curse/_/re-given", + "asset:effect/0267.dreaming_veil/_/re-given" ] } diff --git a/Asset/data/asset/tags/functions/effect/register.json b/Asset/data/asset/tags/functions/effect/register.json index ab1ab74627..ce0fdac0c5 100644 --- a/Asset/data/asset/tags/functions/effect/register.json +++ b/Asset/data/asset/tags/functions/effect/register.json @@ -37,6 +37,7 @@ "asset:effect/0608.sinking/_/register", "asset:effect/0612.infringement/_/register", "asset:effect/0613.white_curse/_/register", - "asset:effect/0203.secret_meat/_/register" + "asset:effect/0203.secret_meat/_/register", + "asset:effect/0267.dreaming_veil/_/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 eddf384632..ac78e00ae4 100644 --- a/Asset/data/asset/tags/functions/effect/remove.json +++ b/Asset/data/asset/tags/functions/effect/remove.json @@ -31,6 +31,7 @@ "asset:effect/0608.sinking/_/remove", "asset:effect/0612.infringement/_/remove", "asset:effect/0613.white_curse/_/remove", - "asset:effect/0203.secret_meat/_/remove" + "asset:effect/0203.secret_meat/_/remove", + "asset:effect/0267.dreaming_veil/_/remove" ] -} \ No newline at end of file +}