⚖️ [Artifact 515] 時刻みの薬の性能を変更 & EffectAssetに移行

Asset/data/asset/functions/artifact/0515.time_medicine/give/2.give.mcfunction

@@ -13,9 +13,9 @@
 # 神器のベースアイテム
     data modify storage asset:artifact Item set value "minecraft:potion"
 # 神器の名前 (TextComponentString)
-    data modify storage asset:artifact Name set value '[{"text":"時刻みの薬","color":"white"}]'
+    data modify storage asset:artifact Name set value '[{"text":"時","color":"#ffea96"},{"text":"刻","color":"#d6c88b"},{"text":"み","color":"#9cadad"},{"text":"の","color":"#86a9ce"},{"text":"薬","color":"#467bb5"}]'
 # 神器の説明文 (TextComponentString[])
-    data modify storage asset:artifact Lore set value ['[{"text":"時間を封じ込めた薬"}]','[{"text":"朝と夜で効果が違う"}]','[{"text":"朝：火炎耐性、移動速度、採掘速度上昇","color":"yellow"}]','[{"text":"夜：低速落下、跳躍、暗視","color":"yellow"}]']
+    data modify storage asset:artifact Lore set value ['{"text":"時間を封じ込めた薬"}','{"text":"60秒間、朝と夜で異なる効果を得る"}','{"translate":"-%1$s朝：%2$s、%3$s","color":"white","with":[{"text":"\\u0002","font":"space"},{"text":"物理耐性+10%","color":"green"},{"text":"与回復量+10%","color":"green"}]}','{"translate":"-%1$s夜：%2$s、%3$s","color":"white","with":[{"text":"\\u0002","font":"space"},{"text":"魔法耐性+10%","color":"green"},{"text":"MP回復量+10%","color":"green"}]}']
 # 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション)
     # data modify storage asset:artifact ConsumeItem.Item set value
     # data modify storage asset:artifact ConsumeItem.Count set value

Asset/data/asset/functions/artifact/0515.time_medicine/trigger/3.main.mcfunction

@@ -8,7 +8,10 @@
     function asset:artifact/common/use/auto
 
 # ここから先は神器側の効果の処理を書く
-# 朝
-    execute if predicate lib:is_day run function asset:artifact/0515.time_medicine/trigger/day
-# 夜
-    execute if predicate lib:is_night run function asset:artifact/0515.time_medicine/trigger/night
+
+# 朝と夜で異なるバフを付与
+    execute if predicate lib:is_day run function asset:artifact/0515.time_medicine/trigger/effect.m {ID:357}
+    execute if predicate lib:is_night run function asset:artifact/0515.time_medicine/trigger/effect.m {ID:358}
+
+# リセット
+    data remove storage asset:temp Effect

Asset/data/asset/functions/artifact/0515.time_medicine/trigger/effect.m.mcfunction

@@ -0,0 +1,23 @@
+#> asset:artifact/0515.time_medicine/trigger/effect.m
+#
+#
+#
+# @within function asset:artifact/0515.time_medicine/trigger/3.main
+
+# 効果時間
+    data modify storage api: Argument.Duration set value 1200
+
+# 補正量
+    data modify storage api: Argument.FieldOverride.PhysicalDefense set value 0.1
+    data modify storage api: Argument.FieldOverride.Heal set value 0.1
+
+    data modify storage api: Argument.FieldOverride.MagicDefense set value 0.1
+    data modify storage api: Argument.FieldOverride.MPHeal set value 0.1
+
+# 今エンドにいるならエンド判定を設定
+    execute if predicate lib:dimension/is_end run data modify storage api: Argument.FieldOverride.InTheEnd set value true
+
+# エフェクト
+    $data modify storage api: Argument.ID set value $(ID)
+    function api:entity/mob/effect/give
+    function api:entity/mob/effect/reset

Asset/data/asset/functions/effect/0357.time_ticker_morning/_/end.mcfunction

@@ -0,0 +1,7 @@
+#> asset:effect/0357.time_ticker_morning/_/end
+#
+# Effectの効果の終了時に実行されるfunction
+#
+# @within tag/function asset:effect/end
+
+execute if data storage asset:context {id:357} run function asset:effect/0357.time_ticker_morning/end/

Asset/data/asset/functions/effect/0357.time_ticker_morning/_/given.mcfunction

@@ -0,0 +1,7 @@
+#> asset:effect/0357.time_ticker_morning/_/given
+#
+# Effectが付与された時に実行されるfunction
+#
+# @within tag/function asset:effect/given
+
+execute if data storage asset:context {id:357} run function asset:effect/0357.time_ticker_morning/given/

Asset/data/asset/functions/effect/0357.time_ticker_morning/_/register.mcfunction

@@ -0,0 +1,7 @@
+#> asset:effect/0357.time_ticker_morning/_/register
+#
+#
+#
+# @within tag/function asset:effect/register
+
+execute if data storage asset:context {id:357} run function asset:effect/0357.time_ticker_morning/register

Asset/data/asset/functions/effect/0357.time_ticker_morning/_/remove.mcfunction

@@ -0,0 +1,7 @@
+#> asset:effect/0357.time_ticker_morning/_/remove
+#
+# Effectが神器や牛乳によって削除された時に実行されるfunction
+#
+# @within tag/function asset:effect/remove
+
+execute if data storage asset:context {id:357} run function asset:effect/0357.time_ticker_morning/remove/

Asset/data/asset/functions/effect/0357.time_ticker_morning/_/tick.mcfunction

@@ -0,0 +1,7 @@
+#> asset:effect/0357.time_ticker_morning/_/tick
+#
+# Effectが発動している間毎tick実行されるfunction
+#
+# @within tag/function asset:effect/tick
+
+execute if data storage asset:context {id:357} run function asset:effect/0357.time_ticker_morning/tick/

Asset/data/asset/functions/effect/0357.time_ticker_morning/end/.mcfunction

@@ -0,0 +1,8 @@
+#> asset:effect/0357.time_ticker_morning/end/
+#
+# Effectの効果が切れた時の処理
+#
+# @within function asset:effect/0357.time_ticker_morning/_/end
+
+# 削除
+    function asset:effect/0357.time_ticker_morning/modifier/remove

Asset/data/asset/functions/effect/0357.time_ticker_morning/given/.mcfunction

@@ -0,0 +1,8 @@
+#> asset:effect/0357.time_ticker_morning/given/
+#
+# Effectが付与された時の処理
+#
+# @within function asset:effect/0357.time_ticker_morning/_/given
+
+# 付与
+    function asset:effect/0357.time_ticker_morning/modifier/add

Asset/data/asset/functions/effect/0357.time_ticker_morning/modifier/add.mcfunction

@@ -0,0 +1,17 @@
+#> asset:effect/0357.time_ticker_morning/modifier/add
+#
+#
+#
+# @within function asset:effect/0357.time_ticker_morning/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.PhysicalDefense
+    data modify storage api: Argument.Operation set value "multiply"
+    function api:modifier/defense/physical/add
+
+# 与回復量
+    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.Heal
+    data modify storage api: Argument.Operation set value "multiply"
+    function api:modifier/heal/add

Asset/data/asset/functions/effect/0357.time_ticker_morning/modifier/remove.mcfunction

@@ -0,0 +1,15 @@
+#> asset:effect/0357.time_ticker_morning/modifier/remove
+#
+#
+#
+# @within function
+#   asset:effect/0357.time_ticker_morning/end/
+#   asset:effect/0357.time_ticker_morning/remove/
+
+# 物理耐性
+    data modify storage api: Argument.UUID set from storage asset:context this.UUID
+    function api:modifier/defense/physical/remove
+
+# 与回復量
+    data modify storage api: Argument.UUID set from storage asset:context this.UUID
+    function api:modifier/heal/remove

Asset/data/asset/functions/effect/0357.time_ticker_morning/register.mcfunction

@@ -0,0 +1,48 @@
+#> asset:effect/0357.time_ticker_morning/register
+#
+# Effectのデータを指定
+#
+# @within function asset:effect/0357.time_ticker_morning/_/register
+
+# ExtendsSafe (boolean) (default = false)
+    # data modify storage asset:effect ExtendsSafe set value true
+# ID (int)
+    data modify storage asset:effect ID set value 357
+# 名前 (TextComponentString)
+    data modify storage asset:effect Name set value '{"text":"時刻み・白昼","color":"#ffea96"}'
+# 説明文 (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 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,357,0]
+    data modify storage asset:effect Field.Amount.PhysicalDefense set value 0.1
+    data modify storage asset:effect Field.Amount.Heal set value 0.1
+    data modify storage asset:effect Field.Amount.MagicDefense set value 0.1
+    data modify storage asset:effect Field.Amount.MPHeal set value 0.1
+
+# エンド判定
+    data modify storage asset:effect Field.InTheEnd set value false

Asset/data/asset/functions/effect/0357.time_ticker_morning/remove/.mcfunction

@@ -0,0 +1,8 @@
+#> asset:effect/0357.time_ticker_morning/remove/
+#
+# Effectが削除された時の処理
+#
+# @within function asset:effect/0357.time_ticker_morning/_/remove
+
+# 削除
+    function asset:effect/0357.time_ticker_morning/modifier/remove

Asset/data/asset/functions/effect/0357.time_ticker_morning/tick/.mcfunction

@@ -0,0 +1,17 @@
+#> asset:effect/0357.time_ticker_morning/tick/
+#
+# Effectのtick処理
+#
+# @within function asset:effect/0357.time_ticker_morning/_/tick
+
+# 夜になったら効果切り替え(エンド除く)
+# 1tick前のディメンションがエンドの場合は付与せずに解除だけ行う
+    execute if predicate lib:is_night unless predicate lib:dimension/is_end if data storage asset:context this{InTheEnd:false} run function asset:effect/0357.time_ticker_morning/tick/night
+    execute if predicate lib:is_night unless predicate lib:dimension/is_end run data modify storage asset:context Duration set value 0
+
+# 今がエンド && 前tickにエンドにいない なら夜バフを付与
+    execute if predicate lib:dimension/is_end if data storage asset:context this{InTheEnd:false} run function asset:effect/0357.time_ticker_morning/tick/night
+    execute if predicate lib:dimension/is_end if data storage asset:context this{InTheEnd:false} run data modify storage asset:context this.InTheEnd set value true
+
+# エンドにいないならエンド判定をfalseにしておく
+    execute unless predicate lib:dimension/is_end if data storage asset:context this{InTheEnd:true} run data modify storage asset:context this.InTheEnd set value false

Asset/data/asset/functions/effect/0357.time_ticker_morning/tick/night.mcfunction

@@ -0,0 +1,13 @@
+#> asset:effect/0357.time_ticker_morning/tick/night
+#
+#
+#
+# @within function asset:effect/0357.time_ticker_morning/tick/
+
+# 効果時間とフィールドを引き継いで夜バフを付与
+    data modify storage api: Argument.ID set value 358
+    execute store result storage api: Argument.Duration int 0.9999999999 run data get storage asset:context Duration
+    data modify storage api: Argument.FieldOverride set from storage asset:context this
+    execute if predicate lib:dimension/is_end run data modify storage api: Argument.FieldOverride.InTheEnd set value true
+    function api:entity/mob/effect/give
+    function api:entity/mob/effect/reset

Asset/data/asset/functions/effect/0358.time_ticker_night/_/end.mcfunction

@@ -0,0 +1,7 @@
+#> asset:effect/0358.time_ticker_night/_/end
+#
+# Effectの効果の終了時に実行されるfunction
+#
+# @within tag/function asset:effect/end
+
+execute if data storage asset:context {id:358} run function asset:effect/0358.time_ticker_night/end/

Asset/data/asset/functions/effect/0358.time_ticker_night/_/given.mcfunction

@@ -0,0 +1,7 @@
+#> asset:effect/0358.time_ticker_night/_/given
+#
+# Effectが付与された時に実行されるfunction
+#
+# @within tag/function asset:effect/given
+
+execute if data storage asset:context {id:358} run function asset:effect/0358.time_ticker_night/given/

Asset/data/asset/functions/effect/0358.time_ticker_night/_/register.mcfunction

@@ -0,0 +1,7 @@
+#> asset:effect/0358.time_ticker_night/_/register
+#
+#
+#
+# @within tag/function asset:effect/register
+
+execute if data storage asset:context {id:358} run function asset:effect/0358.time_ticker_night/register

Asset/data/asset/functions/effect/0358.time_ticker_night/_/remove.mcfunction

@@ -0,0 +1,7 @@
+#> asset:effect/0358.time_ticker_night/_/remove
+#
+# Effectが神器や牛乳によって削除された時に実行されるfunction
+#
+# @within tag/function asset:effect/remove
+
+execute if data storage asset:context {id:358} run function asset:effect/0358.time_ticker_night/remove/

Asset/data/asset/functions/effect/0358.time_ticker_night/_/tick.mcfunction

@@ -0,0 +1,7 @@
+#> asset:effect/0358.time_ticker_night/_/tick
+#
+# Effectが発動している間毎tick実行されるfunction
+#
+# @within tag/function asset:effect/tick
+
+execute if data storage asset:context {id:358} run function asset:effect/0358.time_ticker_night/tick/

Asset/data/asset/functions/effect/0358.time_ticker_night/end/.mcfunction

@@ -0,0 +1,8 @@
+#> asset:effect/0358.time_ticker_night/end/
+#
+# Effectの効果が切れた時の処理
+#
+# @within function asset:effect/0358.time_ticker_night/_/end
+
+# 削除
+    function asset:effect/0358.time_ticker_night/modifier/remove

Asset/data/asset/functions/effect/0358.time_ticker_night/given/.mcfunction

@@ -0,0 +1,8 @@
+#> asset:effect/0358.time_ticker_night/given/
+#
+# Effectが付与された時の処理
+#
+# @within function asset:effect/0358.time_ticker_night/_/given
+
+# 付与
+    function asset:effect/0358.time_ticker_night/modifier/add

Asset/data/asset/functions/effect/0358.time_ticker_night/modifier/add.mcfunction

@@ -0,0 +1,17 @@
+#> asset:effect/0358.time_ticker_night/modifier/add
+#
+#
+#
+# @within function asset:effect/0358.time_ticker_night/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.MagicDefense
+    data modify storage api: Argument.Operation set value "multiply"
+    function api:modifier/defense/magic/add
+
+# MP回復量
+    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.MPHeal
+    data modify storage api: Argument.Operation set value "multiply"
+    function api:modifier/mp_heal/add

Asset/data/asset/functions/effect/0358.time_ticker_night/modifier/remove.mcfunction

@@ -0,0 +1,15 @@
+#> asset:effect/0358.time_ticker_night/modifier/remove
+#
+#
+#
+# @within function
+#   asset:effect/0358.time_ticker_night/end/
+#   asset:effect/0358.time_ticker_night/remove/
+
+# 魔法耐性
+    data modify storage api: Argument.UUID set from storage asset:context this.UUID
+    function api:modifier/defense/magic/remove
+
+# MP回復量
+    data modify storage api: Argument.UUID set from storage asset:context this.UUID
+    function api:modifier/mp_heal/remove