diff --git a/Asset/data/asset/functions/artifact/0364.red_knights_sword/trigger/alt_attack/attack.mcfunction b/Asset/data/asset/functions/artifact/0364.red_knights_sword/trigger/alt_attack/attack.mcfunction index e9ffe972605..cccaa0aca59 100644 --- a/Asset/data/asset/functions/artifact/0364.red_knights_sword/trigger/alt_attack/attack.mcfunction +++ b/Asset/data/asset/functions/artifact/0364.red_knights_sword/trigger/alt_attack/attack.mcfunction @@ -27,7 +27,7 @@ function api:entity/mob/effect/reset # ズーム兼ねて鈍足も付与 - data modify storage api: Argument.ID set value 17 + data modify storage api: Argument.ID set value 117 data modify storage api: Argument.Stack set value 10 data modify storage api: Argument.Duration set value 20 function api:entity/mob/effect/give diff --git a/Asset/data/asset/functions/artifact/1089.antimatter_gatling_rifle/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1089.antimatter_gatling_rifle/trigger/3.main.mcfunction index 42ad9665cf3..b9ac3c74081 100644 --- a/Asset/data/asset/functions/artifact/1089.antimatter_gatling_rifle/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1089.antimatter_gatling_rifle/trigger/3.main.mcfunction @@ -11,7 +11,11 @@ # ここから先は神器側の効果の処理を書く # 撃っている間うごけない - effect give @s slowness 1 2 true + data modify storage api: Argument.ID set value 117 + data modify storage api: Argument.Stack set value 9 + data modify storage api: Argument.Duration set value 20 + function api:entity/mob/effect/give + function api:entity/mob/effect/reset # 演出 playsound tsb_sounds:phalanx_shot player @a ~ ~ ~ 0.05 1 diff --git a/Asset/data/asset/functions/effect/0017.slowness/modifier/add.m.mcfunction b/Asset/data/asset/functions/effect/0017.slowness/modifier/add.m.mcfunction index 02ee93cbe8a..ccc7168cff2 100644 --- a/Asset/data/asset/functions/effect/0017.slowness/modifier/add.m.mcfunction +++ b/Asset/data/asset/functions/effect/0017.slowness/modifier/add.m.mcfunction @@ -7,4 +7,4 @@ # @within function asset:effect/0017.slowness/modifier/add # 補正を付与 - $attribute @s generic.movement_speed modifier add 00000001-0000-0003-0000-001100000000 "17.Speed" $(Val) multiply + $attribute @s generic.movement_speed modifier add $(UUID) "$(ID).Speed" $(Val) multiply diff --git a/Asset/data/asset/functions/effect/0017.slowness/modifier/add.mcfunction b/Asset/data/asset/functions/effect/0017.slowness/modifier/add.mcfunction index 552e7655172..15d6081c1ef 100644 --- a/Asset/data/asset/functions/effect/0017.slowness/modifier/add.mcfunction +++ b/Asset/data/asset/functions/effect/0017.slowness/modifier/add.mcfunction @@ -7,6 +7,8 @@ # asset:effect/0017.slowness/re-given/ # (Stack * 5)%移動速度を下げる - execute store result storage asset:temp 17.Val float -0.05 run data get storage asset:context Stack - function asset:effect/0017.slowness/modifier/add.m with storage asset:temp 17 - data remove storage asset:temp 17 + data modify storage asset:temp Args.ID set from storage asset:context originID + data modify storage asset:temp Args.UUID set from storage asset:context this.UUID + execute store result storage asset:temp Args.Val float -0.05 run data get storage asset:context Stack + function asset:effect/0017.slowness/modifier/add.m with storage asset:temp Args + data remove storage asset:temp Args diff --git a/Asset/data/asset/functions/effect/0017.slowness/modifier/remove.m.mcfunction b/Asset/data/asset/functions/effect/0017.slowness/modifier/remove.m.mcfunction new file mode 100644 index 00000000000..2cf0d9550bd --- /dev/null +++ b/Asset/data/asset/functions/effect/0017.slowness/modifier/remove.m.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0017.slowness/modifier/remove.m +# +# +# +# @within function asset:effect/0017.slowness/modifier/remove + +# 補正を付与 + $attribute @s generic.movement_speed modifier remove $(UUID) diff --git a/Asset/data/asset/functions/effect/0017.slowness/modifier/remove.mcfunction b/Asset/data/asset/functions/effect/0017.slowness/modifier/remove.mcfunction index 4b2c1ea19f1..2a541b659d0 100644 --- a/Asset/data/asset/functions/effect/0017.slowness/modifier/remove.mcfunction +++ b/Asset/data/asset/functions/effect/0017.slowness/modifier/remove.mcfunction @@ -8,4 +8,4 @@ # asset:effect/0017.slowness/remove/ # 補正を削除 - attribute @s generic.movement_speed modifier remove 00000001-0000-0003-0000-001100000000 + function asset:effect/0017.slowness/modifier/remove.m with storage asset:context this diff --git a/Asset/data/asset/functions/effect/0017.slowness/register.mcfunction b/Asset/data/asset/functions/effect/0017.slowness/register.mcfunction index 960df1ad704..0dbfea3b84c 100644 --- a/Asset/data/asset/functions/effect/0017.slowness/register.mcfunction +++ b/Asset/data/asset/functions/effect/0017.slowness/register.mcfunction @@ -5,13 +5,13 @@ # @within function asset:effect/0017.slowness/_/register # ExtendsSafe (boolean) (default = false) - # data modify storage asset:effect ExtendsSafe set value true + data modify storage asset:effect ExtendsSafe set value true # ID (int) data modify storage asset:effect ID set value 17 # 名前 (TextComponentString) data modify storage asset:effect Name set value '{"text":"移動速度低下"}' # 説明文 (TextComponentString[]) - data modify storage asset:effect Description set value ['{"text":"移動速度が低下する"}'] + data modify storage asset:effect Description set value ['{"text":"動く速度が低下する"}'] # 効果時間 (int) (default = API || error) # data modify storage asset:effect Duration set value # スタック (int) (default = API || 1) @@ -23,7 +23,7 @@ # 最大効果時間 (int) (default = 2147483647) # data modify storage asset:effect MaxDuration set value # 最大スタック (int) (default = 2147483647) - data modify storage asset:effect MaxStack set value 100 + data modify storage asset:effect MaxStack set value 20 # 悪い効果か否か (boolean) data modify storage asset:effect IsBadEffect set value true # 死亡時のエフェクトの処理 (default = "remove") @@ -40,4 +40,4 @@ # data modify storage asset:effect StackVisible set value # フィールド - # data modify storage asset:effect Field set value {} + data modify storage asset:effect Field.UUID set value "00000001-0000-0003-0000-001100000000" diff --git a/Asset/data/asset/functions/effect/0067.slowness/_/end.mcfunction b/Asset/data/asset/functions/effect/0067.slowness/_/end.mcfunction deleted file mode 100644 index 75733402648..00000000000 --- a/Asset/data/asset/functions/effect/0067.slowness/_/end.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> asset:effect/0067.slowness/_/end -# -# Effectの効果の終了時に実行されるfunction -# -# @within tag/function asset:effect/end - -execute if data storage asset:context {id:67} run function asset:effect/0067.slowness/end/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0067.slowness/_/given.mcfunction b/Asset/data/asset/functions/effect/0067.slowness/_/given.mcfunction deleted file mode 100644 index 1145db3b9be..00000000000 --- a/Asset/data/asset/functions/effect/0067.slowness/_/given.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> asset:effect/0067.slowness/_/given -# -# Effectが付与された時に実行されるfunction -# -# @within tag/function asset:effect/given - -execute if data storage asset:context {id:67} run function asset:effect/0067.slowness/given/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0067.slowness/_/re-given.mcfunction b/Asset/data/asset/functions/effect/0067.slowness/_/re-given.mcfunction deleted file mode 100644 index 37a31c9cf7b..00000000000 --- a/Asset/data/asset/functions/effect/0067.slowness/_/re-given.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> asset:effect/0067.slowness/_/re-given -# -# Effectが上書きされた時に実行されるfunction -# -# @within tag/function asset:effect/re-given - -execute if data storage asset:context {id:67} run function asset:effect/0067.slowness/re-given/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0067.slowness/_/remove.mcfunction b/Asset/data/asset/functions/effect/0067.slowness/_/remove.mcfunction deleted file mode 100644 index 3ec3998c3c8..00000000000 --- a/Asset/data/asset/functions/effect/0067.slowness/_/remove.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> asset:effect/0067.slowness/_/remove -# -# Effectが神器や牛乳によって削除された時に実行されるfunction -# -# @within tag/function asset:effect/remove - -execute if data storage asset:context {id:67} run function asset:effect/0067.slowness/remove/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0067.slowness/end/.mcfunction b/Asset/data/asset/functions/effect/0067.slowness/end/.mcfunction deleted file mode 100644 index 85d3f163067..00000000000 --- a/Asset/data/asset/functions/effect/0067.slowness/end/.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset:effect/0067.slowness/end/ -# -# Effectの効果が切れた時の処理 -# -# @within function asset:effect/0067.slowness/_/end - -# 補正を削除する - function asset:effect/0067.slowness/modifier/remove diff --git a/Asset/data/asset/functions/effect/0067.slowness/given/.mcfunction b/Asset/data/asset/functions/effect/0067.slowness/given/.mcfunction deleted file mode 100644 index 5a873937cfb..00000000000 --- a/Asset/data/asset/functions/effect/0067.slowness/given/.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset:effect/0067.slowness/given/ -# -# Effectが付与された時の処理 -# -# @within function asset:effect/0067.slowness/_/given - -# 補正を付与する - function asset:effect/0067.slowness/modifier/add diff --git a/Asset/data/asset/functions/effect/0067.slowness/modifier/add.m.mcfunction b/Asset/data/asset/functions/effect/0067.slowness/modifier/add.m.mcfunction deleted file mode 100644 index 7e17b95ebc5..00000000000 --- a/Asset/data/asset/functions/effect/0067.slowness/modifier/add.m.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset:effect/0067.slowness/modifier/add.m -# -# マクロで補正を付与する -# -# @within function asset:effect/0067.slowness/modifier/add - -# 補正を付与 - $attribute @s generic.movement_speed modifier add 00000001-0000-0003-0000-004300000000 "67.Speed" $(Val) multiply diff --git a/Asset/data/asset/functions/effect/0067.slowness/modifier/add.mcfunction b/Asset/data/asset/functions/effect/0067.slowness/modifier/add.mcfunction deleted file mode 100644 index f02309976c5..00000000000 --- a/Asset/data/asset/functions/effect/0067.slowness/modifier/add.mcfunction +++ /dev/null @@ -1,12 +0,0 @@ -#> asset:effect/0067.slowness/modifier/add -# -# 補正を付与する -# -# @within function -# asset:effect/0067.slowness/given/ -# asset:effect/0067.slowness/re-given/ - -# (Stack * 5)%移動速度を下げる - execute store result storage asset:temp 67.Val float -0.05 run data get storage asset:context Stack - function asset:effect/0067.slowness/modifier/add.m with storage asset:temp 67 - data remove storage asset:temp 67 diff --git a/Asset/data/asset/functions/effect/0067.slowness/modifier/remove.mcfunction b/Asset/data/asset/functions/effect/0067.slowness/modifier/remove.mcfunction deleted file mode 100644 index 71bb02232e7..00000000000 --- a/Asset/data/asset/functions/effect/0067.slowness/modifier/remove.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -#> asset:effect/0067.slowness/modifier/remove -# -# 補正を削除する -# -# @within function -# asset:effect/0067.slowness/end/ -# asset:effect/0067.slowness/re-given/ -# asset:effect/0067.slowness/remove/ - -# 補正を削除 - attribute @s generic.movement_speed modifier remove 00000001-0000-0003-0000-004300000000 diff --git a/Asset/data/asset/functions/effect/0067.slowness/re-given/.mcfunction b/Asset/data/asset/functions/effect/0067.slowness/re-given/.mcfunction deleted file mode 100644 index 40db6d8f97a..00000000000 --- a/Asset/data/asset/functions/effect/0067.slowness/re-given/.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -#> asset:effect/0067.slowness/re-given/ -# -# Effectが上書きされた時の処理 -# -# @within function asset:effect/0067.slowness/_/re-given - -# 補正を削除してから付与する - function asset:effect/0067.slowness/modifier/remove - function asset:effect/0067.slowness/modifier/add diff --git a/Asset/data/asset/functions/effect/0067.slowness/register.mcfunction b/Asset/data/asset/functions/effect/0067.slowness/register.mcfunction index c14998838a0..8a068590fb1 100644 --- a/Asset/data/asset/functions/effect/0067.slowness/register.mcfunction +++ b/Asset/data/asset/functions/effect/0067.slowness/register.mcfunction @@ -4,40 +4,16 @@ # # @within function asset:effect/0067.slowness/_/register +# 継承 (int) + data modify storage asset:effect Extends append value 17 + function asset:effect/extends + # ExtendsSafe (boolean) (default = false) # data modify storage asset:effect ExtendsSafe set value true # ID (int) data modify storage asset:effect ID set value 67 -# 名前 (TextComponentString) - data modify storage asset:effect Name set value '{"text":"移動速度低下"}' -# 説明文 (TextComponentString[]) - data modify storage asset:effect Description set value ['{"text":"移動速度が低下する"}'] -# 効果時間 (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 100 -# 悪い効果か否か (boolean) - data modify storage asset:effect IsBadEffect set value true -# 死亡時のエフェクトの処理 (default = "remove") - # data modify storage asset:effect ProcessOnDied set value # 消すのに必要なレベル (int) (default = 1) data modify storage asset:effect RequireClearLv set value 2 -# エフェクトをUIに表示するか (boolean) (default = true) - # data modify storage asset:effect Visible set value -# エフェクトのスタックををUIに表示するか (boolean) (default = true) - # data modify storage asset:effect StackVisible set value -# エフェクトをUIに表示するか (boolean) (default = true) - # data modify storage asset:effect Visible set value -# エフェクトのスタックををUIに表示するか (boolean) (default = true) - # data modify storage asset:effect StackVisible set value # フィールド - # data modify storage asset:effect Field set value {} + data modify storage asset:effect Field.UUID set value 00000001-0000-0003-0000-004300000000 diff --git a/Asset/data/asset/functions/effect/0067.slowness/remove/.mcfunction b/Asset/data/asset/functions/effect/0067.slowness/remove/.mcfunction deleted file mode 100644 index d03fd0c4ad5..00000000000 --- a/Asset/data/asset/functions/effect/0067.slowness/remove/.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset:effect/0067.slowness/remove/ -# -# Effectが削除された時の処理 -# -# @within function asset:effect/0067.slowness/_/remove - -# 補正を削除する - function asset:effect/0067.slowness/modifier/remove diff --git a/Asset/data/asset/functions/effect/0117.slowness/_/register.mcfunction b/Asset/data/asset/functions/effect/0117.slowness/_/register.mcfunction new file mode 100644 index 00000000000..ab91c6fc5c5 --- /dev/null +++ b/Asset/data/asset/functions/effect/0117.slowness/_/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0117.slowness/_/register +# +# +# +# @within tag/function asset:effect/register + +execute if data storage asset:context {id:117} run function asset:effect/0117.slowness/register \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0117.slowness/register.mcfunction b/Asset/data/asset/functions/effect/0117.slowness/register.mcfunction new file mode 100644 index 00000000000..50acf1ccab7 --- /dev/null +++ b/Asset/data/asset/functions/effect/0117.slowness/register.mcfunction @@ -0,0 +1,19 @@ +#> asset:effect/0117.slowness/register +# +# Effectのデータを指定 +# +# @within function asset:effect/0117.slowness/_/register + +# 継承 (int) + data modify storage asset:effect Extends append value 17 + function asset:effect/extends + +# ExtendsSafe (boolean) (default = false) + # data modify storage asset:effect ExtendsSafe set value true +# ID (int) + data modify storage asset:effect ID set value 117 +# 消すのに必要なレベル (int) (default = 1) + data modify storage asset:effect RequireClearLv set value 3 + +# フィールド + data modify storage asset:effect Field.UUID set value 00000001-0000-0003-0000-007500000000 diff --git a/Asset/data/asset/tags/functions/effect/end.json b/Asset/data/asset/tags/functions/effect/end.json index 81710cbe5a5..1844a1f4f5f 100644 --- a/Asset/data/asset/tags/functions/effect/end.json +++ b/Asset/data/asset/tags/functions/effect/end.json @@ -47,7 +47,6 @@ "asset:effect/0030.wither/_/end", "asset:effect/0029.poison/_/end", "asset:effect/0618.soaked/_/end", - "asset:effect/0067.slowness/_/end", "asset:effect/0017.slowness/_/end", "asset:effect/0202.sheep_blessing/_/end", "asset:effect/0204.void_transaction/_/end", @@ -103,4 +102,4 @@ "asset:effect/0007.defense_base_debuff/_/end", "asset:effect/0258.spirit_melody/_/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 c20c6c55872..49b4287714a 100644 --- a/Asset/data/asset/tags/functions/effect/given.json +++ b/Asset/data/asset/tags/functions/effect/given.json @@ -45,7 +45,6 @@ "asset:effect/0190.fall_resistance/_/given", "asset:effect/0296.soul_disconnection/_/given", "asset:effect/0618.soaked/_/given", - "asset:effect/0067.slowness/_/given", "asset:effect/0017.slowness/_/given", "asset:effect/0202.sheep_blessing/_/given", "asset:effect/0204.void_transaction/_/given", @@ -97,4 +96,4 @@ "asset:effect/0007.defense_base_debuff/_/given", "asset:effect/0258.spirit_melody/_/given" ] -} \ No newline at end of file +} diff --git a/Asset/data/asset/tags/functions/effect/re-given.json b/Asset/data/asset/tags/functions/effect/re-given.json index baf0379fc2f..8644271af54 100644 --- a/Asset/data/asset/tags/functions/effect/re-given.json +++ b/Asset/data/asset/tags/functions/effect/re-given.json @@ -35,7 +35,6 @@ "asset:effect/0253.purifying_indigo/_/re-given", "asset:effect/0296.soul_disconnection/_/re-given", "asset:effect/0618.soaked/_/re-given", - "asset:effect/0067.slowness/_/re-given", "asset:effect/0017.slowness/_/re-given", "asset:effect/0202.sheep_blessing/_/re-given", "asset:effect/0220.dream_of_burning_butterfly/_/re-given", @@ -59,4 +58,4 @@ "asset:effect/0007.defense_base_debuff/_/re-given", "asset:effect/0258.spirit_melody/_/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 2df8839cf1a..a7dbd867aea 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/0117.slowness/_/register", "asset:effect/0025.levitation/_/register", "asset:effect/0247.great_demon_armor/_/register", "asset:effect/0246.flame_devil_armor/_/register", @@ -167,4 +168,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 3e8ceea4eb6..7c2bfd7609b 100644 --- a/Asset/data/asset/tags/functions/effect/remove.json +++ b/Asset/data/asset/tags/functions/effect/remove.json @@ -57,7 +57,6 @@ "asset:effect/0030.wither/_/remove", "asset:effect/0029.poison/_/remove", "asset:effect/0618.soaked/_/remove", - "asset:effect/0067.slowness/_/remove", "asset:effect/0017.slowness/_/remove", "asset:effect/0206.spirit_state/_/remove", "asset:effect/0207.key_of_the_sun/_/remove", @@ -111,4 +110,4 @@ "asset:effect/0007.defense_base_debuff/_/remove", "asset:effect/0258.spirit_melody/_/remove" ] -} \ No newline at end of file +}