diff --git a/Asset/data/asset/functions/artifact/0529.safety_helmet/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0529.safety_helmet/give/2.give.mcfunction index bec9459f47..2b924f851f 100644 --- a/Asset/data/asset/functions/artifact/0529.safety_helmet/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0529.safety_helmet/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"保護帽","color":"yellow"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['[{"text":"被ダメ時","color":"red"},{"text":"に少しの間","color":"white"},{"text":"耐性","color":"dark_gray"},{"text":"が付与される","color":"white"}]','{"text":""}','{"text":"安全確認よし!","color":"yellow"}'] + data modify storage asset:artifact Lore set value ['[{"translate":"被ダメージ時に2秒間%1$sを得る","color":"white","with":[{"text":"耐性+20%","color":"green"}]}]','{"text":""}','{"text":"安全確認よし!","color":"yellow"}'] # 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション) # data modify storage asset:artifact ConsumeItem.Item set value # data modify storage asset:artifact ConsumeItem.Count set value diff --git a/Asset/data/asset/functions/artifact/0529.safety_helmet/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0529.safety_helmet/trigger/3.main.mcfunction index 266b66e37a..5ae6c5bd46 100644 --- a/Asset/data/asset/functions/artifact/0529.safety_helmet/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0529.safety_helmet/trigger/3.main.mcfunction @@ -10,7 +10,11 @@ # ここから先は神器側の効果の処理を書く # 演出 - playsound entity.ender_eye.death player @p ~ ~ ~ 1.0 1.0 + playsound entity.ender_eye.death player @s ~ ~ ~ 1.0 1.0 -# 耐性付与 - effect give @s resistance 3 1 \ No newline at end of file +# 耐性バフ付与 + data modify storage api: Argument.ID set value 302 + data modify storage api: Argument.Duration set value 60 + data modify storage api: Argument.FieldOverride.Amount set value 0.2 + function api:entity/mob/effect/give + function api:entity/mob/effect/reset diff --git a/Asset/data/asset/functions/effect/0302.safety_check_complete/_/end.mcfunction b/Asset/data/asset/functions/effect/0302.safety_check_complete/_/end.mcfunction new file mode 100644 index 0000000000..78644071c0 --- /dev/null +++ b/Asset/data/asset/functions/effect/0302.safety_check_complete/_/end.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0302.safety_check_complete/_/end +# +# Effectの効果の終了時に実行されるfunction +# +# @within tag/function asset:effect/end + +execute if data storage asset:context {id:302} run function asset:effect/0302.safety_check_complete/end/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0302.safety_check_complete/_/given.mcfunction b/Asset/data/asset/functions/effect/0302.safety_check_complete/_/given.mcfunction new file mode 100644 index 0000000000..1160a75998 --- /dev/null +++ b/Asset/data/asset/functions/effect/0302.safety_check_complete/_/given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0302.safety_check_complete/_/given +# +# Effectが付与された時に実行されるfunction +# +# @within tag/function asset:effect/given + +execute if data storage asset:context {id:302} run function asset:effect/0302.safety_check_complete/given/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0302.safety_check_complete/_/register.mcfunction b/Asset/data/asset/functions/effect/0302.safety_check_complete/_/register.mcfunction new file mode 100644 index 0000000000..62da05d958 --- /dev/null +++ b/Asset/data/asset/functions/effect/0302.safety_check_complete/_/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0302.safety_check_complete/_/register +# +# +# +# @within tag/function asset:effect/register + +execute if data storage asset:context {id:302} run function asset:effect/0302.safety_check_complete/register \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0302.safety_check_complete/_/remove.mcfunction b/Asset/data/asset/functions/effect/0302.safety_check_complete/_/remove.mcfunction new file mode 100644 index 0000000000..f5070c0a32 --- /dev/null +++ b/Asset/data/asset/functions/effect/0302.safety_check_complete/_/remove.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0302.safety_check_complete/_/remove +# +# Effectが神器や牛乳によって削除された時に実行されるfunction +# +# @within tag/function asset:effect/remove + +execute if data storage asset:context {id:302} run function asset:effect/0302.safety_check_complete/remove/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0302.safety_check_complete/end/.mcfunction b/Asset/data/asset/functions/effect/0302.safety_check_complete/end/.mcfunction new file mode 100644 index 0000000000..1904ffc8d1 --- /dev/null +++ b/Asset/data/asset/functions/effect/0302.safety_check_complete/end/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0302.safety_check_complete/end/ +# +# Effectの効果が切れた時の処理 +# +# @within function asset:effect/0302.safety_check_complete/_/end + +# 削除 + function asset:effect/0302.safety_check_complete/modifier/remove diff --git a/Asset/data/asset/functions/effect/0302.safety_check_complete/given/.mcfunction b/Asset/data/asset/functions/effect/0302.safety_check_complete/given/.mcfunction new file mode 100644 index 0000000000..c80b4117d4 --- /dev/null +++ b/Asset/data/asset/functions/effect/0302.safety_check_complete/given/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0302.safety_check_complete/given/ +# +# Effectが付与された時の処理 +# +# @within function asset:effect/0302.safety_check_complete/_/given + +# 付与 + function asset:effect/0302.safety_check_complete/modifier/add diff --git a/Asset/data/asset/functions/effect/0302.safety_check_complete/modifier/add.mcfunction b/Asset/data/asset/functions/effect/0302.safety_check_complete/modifier/add.mcfunction new file mode 100644 index 0000000000..e56b3666f4 --- /dev/null +++ b/Asset/data/asset/functions/effect/0302.safety_check_complete/modifier/add.mcfunction @@ -0,0 +1,11 @@ +#> asset:effect/0302.safety_check_complete/modifier/add +# +# +# +# @within function asset:effect/0302.safety_check_complete/given/ + +# 耐性 + data modify storage api: Argument.UUID set from storage asset:context this.UUID + data modify storage api: Argument.Amount set from storage asset:context this.Amount + data modify storage api: Argument.Operation set value "multiply" + function api:modifier/defense/base/add diff --git a/Asset/data/asset/functions/effect/0302.safety_check_complete/modifier/remove.mcfunction b/Asset/data/asset/functions/effect/0302.safety_check_complete/modifier/remove.mcfunction new file mode 100644 index 0000000000..df16296278 --- /dev/null +++ b/Asset/data/asset/functions/effect/0302.safety_check_complete/modifier/remove.mcfunction @@ -0,0 +1,11 @@ +#> asset:effect/0302.safety_check_complete/modifier/remove +# +# +# +# @within function +# asset:effect/0302.safety_check_complete/end/ +# asset:effect/0302.safety_check_complete/remove/ + +# 耐性 + data modify storage api: Argument.UUID set from storage asset:context this.UUID + function api:modifier/defense/base/remove diff --git a/Asset/data/asset/functions/effect/0302.safety_check_complete/register.mcfunction b/Asset/data/asset/functions/effect/0302.safety_check_complete/register.mcfunction new file mode 100644 index 0000000000..d05819d5b0 --- /dev/null +++ b/Asset/data/asset/functions/effect/0302.safety_check_complete/register.mcfunction @@ -0,0 +1,40 @@ +#> asset:effect/0302.safety_check_complete/register +# +# Effectのデータを指定 +# +# @within function asset:effect/0302.safety_check_complete/_/register + +# ExtendsSafe (boolean) (default = false) + # data modify storage asset:effect ExtendsSafe set value true +# ID (int) + data modify storage asset:effect ID set value 302 +# 名前 (TextComponentString) + data modify storage asset:effect Name set value '{"text":"安全確認よし!","color":"yellow"}' +# 説明文 (TextComponentString[]) + data modify storage asset:effect Description set value ['{"text":"被ダメージが大きく低下する","color":"white"}'] +# 効果時間 (int) (default = API || error) + # data modify storage asset:effect Duration set value +# スタック (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 +# エフェクトをUIに表示するか (boolean) (default = true) + # data modify storage asset:effect Visible set value +# エフェクトのスタックををUIに表示するか (boolean) (default = true) + data modify storage asset:effect StackVisible set value false + +# フィールド + data modify storage asset:effect Field.UUID set value [I;1,3,302,0] + data modify storage asset:effect Field.Amount set value 0.2 diff --git a/Asset/data/asset/functions/effect/0302.safety_check_complete/remove/.mcfunction b/Asset/data/asset/functions/effect/0302.safety_check_complete/remove/.mcfunction new file mode 100644 index 0000000000..a4d3083a9f --- /dev/null +++ b/Asset/data/asset/functions/effect/0302.safety_check_complete/remove/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0302.safety_check_complete/remove/ +# +# Effectが削除された時の処理 +# +# @within function asset:effect/0302.safety_check_complete/_/remove + +# 削除 + function asset:effect/0302.safety_check_complete/modifier/remove diff --git a/Asset/data/asset/tags/functions/effect/end.json b/Asset/data/asset/tags/functions/effect/end.json index 830d84ddfe..9cde81f92d 100644 --- a/Asset/data/asset/tags/functions/effect/end.json +++ b/Asset/data/asset/tags/functions/effect/end.json @@ -1,5 +1,6 @@ { "values": [ + "asset:effect/0302.safety_check_complete/_/end", "asset:effect/0360.calamity_bind/_/end", "asset:effect/0345.topaz_protection/_/end", "asset:effect/0342.prayer_amidst_blight/_/end", diff --git a/Asset/data/asset/tags/functions/effect/given.json b/Asset/data/asset/tags/functions/effect/given.json index 27f5c619e1..ca5e5539d0 100644 --- a/Asset/data/asset/tags/functions/effect/given.json +++ b/Asset/data/asset/tags/functions/effect/given.json @@ -1,5 +1,6 @@ { "values": [ + "asset:effect/0302.safety_check_complete/_/given", "asset:effect/0360.calamity_bind/_/given", "asset:effect/0345.topaz_protection/_/given", "asset:effect/0342.prayer_amidst_blight/_/given", diff --git a/Asset/data/asset/tags/functions/effect/register.json b/Asset/data/asset/tags/functions/effect/register.json index 93388e722f..888e04bb23 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/0302.safety_check_complete/_/register", "asset:effect/0117.slowness/_/register", "asset:effect/0360.calamity_bind/_/register", "asset:effect/0345.topaz_protection/_/register", @@ -173,4 +174,4 @@ "asset:effect/0007.defense_base_debuff/_/register", "asset:effect/0258.spirit_melody/_/register" ] -} \ No newline at end of file +} diff --git a/Asset/data/asset/tags/functions/effect/remove.json b/Asset/data/asset/tags/functions/effect/remove.json index fd58a5b151..ea015e1df2 100644 --- a/Asset/data/asset/tags/functions/effect/remove.json +++ b/Asset/data/asset/tags/functions/effect/remove.json @@ -1,5 +1,6 @@ { "values": [ + "asset:effect/0302.safety_check_complete/_/remove", "asset:effect/0360.calamity_bind/_/remove", "asset:effect/0345.topaz_protection/_/remove", "asset:effect/0342.prayer_amidst_blight/_/remove",