From 5d53609f5c6ddfae047cbd91d35bc7ee8ad101e0 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Sun, 24 May 2026 12:44:26 +0900 Subject: [PATCH 1/9] =?UTF-8?q?=E5=8A=B9=E6=9E=9C=E5=A4=89=E6=9B=B4?= =?UTF-8?q?=E3=81=AB=E5=90=88=E3=82=8F=E3=81=9B=E3=81=A6Lore=E3=82=92?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifact/0515.time_medicine/give/2.give.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/artifact/0515.time_medicine/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0515.time_medicine/give/2.give.mcfunction index 9ba6138ff9..233e6c2021 100644 --- a/Asset/data/asset/functions/artifact/0515.time_medicine/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0515.time_medicine/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '[{"text":"時刻みの薬","color":"white"}]' # 神器の説明文 (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 From 3cf3cc0b6322782c5b94283f32e2a05ac46205db Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Sun, 24 May 2026 14:33:22 +0900 Subject: [PATCH 2/9] =?UTF-8?q?=E3=82=A8=E3=83=95=E3=82=A7=E3=82=AF?= =?UTF-8?q?=E3=83=88=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../0357.time_ticker_morning/_/end.mcfunction | 7 +++ .../_/given.mcfunction | 7 +++ .../_/register.mcfunction | 7 +++ .../_/remove.mcfunction | 7 +++ .../_/tick.mcfunction | 7 +++ .../0357.time_ticker_morning/end/.mcfunction | 8 ++++ .../given/.mcfunction | 8 ++++ .../modifier/add.mcfunction | 17 +++++++ .../modifier/remove.mcfunction | 15 ++++++ .../register.mcfunction | 48 +++++++++++++++++++ .../remove/.mcfunction | 8 ++++ .../0357.time_ticker_morning/tick/.mcfunction | 17 +++++++ .../tick/night.mcfunction | 13 +++++ .../0358.time_ticker_night/_/end.mcfunction | 7 +++ .../0358.time_ticker_night/_/given.mcfunction | 7 +++ .../_/register.mcfunction | 7 +++ .../_/remove.mcfunction | 7 +++ .../0358.time_ticker_night/_/tick.mcfunction | 7 +++ .../0358.time_ticker_night/end/.mcfunction | 8 ++++ .../0358.time_ticker_night/given/.mcfunction | 8 ++++ .../modifier/add.mcfunction | 17 +++++++ .../modifier/remove.mcfunction | 15 ++++++ .../register.mcfunction | 48 +++++++++++++++++++ .../0358.time_ticker_night/remove/.mcfunction | 8 ++++ .../0358.time_ticker_night/tick/.mcfunction | 16 +++++++ .../tick/morning.mcfunction | 13 +++++ .../data/asset/tags/functions/effect/end.json | 4 +- .../asset/tags/functions/effect/given.json | 4 +- .../asset/tags/functions/effect/register.json | 4 +- .../asset/tags/functions/effect/remove.json | 4 +- .../asset/tags/functions/effect/tick.json | 4 +- 31 files changed, 352 insertions(+), 5 deletions(-) create mode 100644 Asset/data/asset/functions/effect/0357.time_ticker_morning/_/end.mcfunction create mode 100644 Asset/data/asset/functions/effect/0357.time_ticker_morning/_/given.mcfunction create mode 100644 Asset/data/asset/functions/effect/0357.time_ticker_morning/_/register.mcfunction create mode 100644 Asset/data/asset/functions/effect/0357.time_ticker_morning/_/remove.mcfunction create mode 100644 Asset/data/asset/functions/effect/0357.time_ticker_morning/_/tick.mcfunction create mode 100644 Asset/data/asset/functions/effect/0357.time_ticker_morning/end/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0357.time_ticker_morning/given/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0357.time_ticker_morning/modifier/add.mcfunction create mode 100644 Asset/data/asset/functions/effect/0357.time_ticker_morning/modifier/remove.mcfunction create mode 100644 Asset/data/asset/functions/effect/0357.time_ticker_morning/register.mcfunction create mode 100644 Asset/data/asset/functions/effect/0357.time_ticker_morning/remove/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0357.time_ticker_morning/tick/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0357.time_ticker_morning/tick/night.mcfunction create mode 100644 Asset/data/asset/functions/effect/0358.time_ticker_night/_/end.mcfunction create mode 100644 Asset/data/asset/functions/effect/0358.time_ticker_night/_/given.mcfunction create mode 100644 Asset/data/asset/functions/effect/0358.time_ticker_night/_/register.mcfunction create mode 100644 Asset/data/asset/functions/effect/0358.time_ticker_night/_/remove.mcfunction create mode 100644 Asset/data/asset/functions/effect/0358.time_ticker_night/_/tick.mcfunction create mode 100644 Asset/data/asset/functions/effect/0358.time_ticker_night/end/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0358.time_ticker_night/given/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0358.time_ticker_night/modifier/add.mcfunction create mode 100644 Asset/data/asset/functions/effect/0358.time_ticker_night/modifier/remove.mcfunction create mode 100644 Asset/data/asset/functions/effect/0358.time_ticker_night/register.mcfunction create mode 100644 Asset/data/asset/functions/effect/0358.time_ticker_night/remove/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0358.time_ticker_night/tick/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0358.time_ticker_night/tick/morning.mcfunction diff --git a/Asset/data/asset/functions/effect/0357.time_ticker_morning/_/end.mcfunction b/Asset/data/asset/functions/effect/0357.time_ticker_morning/_/end.mcfunction new file mode 100644 index 0000000000..31f28da741 --- /dev/null +++ b/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/ diff --git a/Asset/data/asset/functions/effect/0357.time_ticker_morning/_/given.mcfunction b/Asset/data/asset/functions/effect/0357.time_ticker_morning/_/given.mcfunction new file mode 100644 index 0000000000..a750e964d7 --- /dev/null +++ b/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/ diff --git a/Asset/data/asset/functions/effect/0357.time_ticker_morning/_/register.mcfunction b/Asset/data/asset/functions/effect/0357.time_ticker_morning/_/register.mcfunction new file mode 100644 index 0000000000..9cb55ae185 --- /dev/null +++ b/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 diff --git a/Asset/data/asset/functions/effect/0357.time_ticker_morning/_/remove.mcfunction b/Asset/data/asset/functions/effect/0357.time_ticker_morning/_/remove.mcfunction new file mode 100644 index 0000000000..f4b12c4759 --- /dev/null +++ b/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/ diff --git a/Asset/data/asset/functions/effect/0357.time_ticker_morning/_/tick.mcfunction b/Asset/data/asset/functions/effect/0357.time_ticker_morning/_/tick.mcfunction new file mode 100644 index 0000000000..8309a3d7c9 --- /dev/null +++ b/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/ diff --git a/Asset/data/asset/functions/effect/0357.time_ticker_morning/end/.mcfunction b/Asset/data/asset/functions/effect/0357.time_ticker_morning/end/.mcfunction new file mode 100644 index 0000000000..d089d124e0 --- /dev/null +++ b/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 diff --git a/Asset/data/asset/functions/effect/0357.time_ticker_morning/given/.mcfunction b/Asset/data/asset/functions/effect/0357.time_ticker_morning/given/.mcfunction new file mode 100644 index 0000000000..2362bcfdbe --- /dev/null +++ b/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 diff --git a/Asset/data/asset/functions/effect/0357.time_ticker_morning/modifier/add.mcfunction b/Asset/data/asset/functions/effect/0357.time_ticker_morning/modifier/add.mcfunction new file mode 100644 index 0000000000..badcf124f4 --- /dev/null +++ b/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 diff --git a/Asset/data/asset/functions/effect/0357.time_ticker_morning/modifier/remove.mcfunction b/Asset/data/asset/functions/effect/0357.time_ticker_morning/modifier/remove.mcfunction new file mode 100644 index 0000000000..774f08c60a --- /dev/null +++ b/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 diff --git a/Asset/data/asset/functions/effect/0357.time_ticker_morning/register.mcfunction b/Asset/data/asset/functions/effect/0357.time_ticker_morning/register.mcfunction new file mode 100644 index 0000000000..731d66d9f8 --- /dev/null +++ b/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":"時刻み・白昼"}' +# 説明文 (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 diff --git a/Asset/data/asset/functions/effect/0357.time_ticker_morning/remove/.mcfunction b/Asset/data/asset/functions/effect/0357.time_ticker_morning/remove/.mcfunction new file mode 100644 index 0000000000..5f50f6ddda --- /dev/null +++ b/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 diff --git a/Asset/data/asset/functions/effect/0357.time_ticker_morning/tick/.mcfunction b/Asset/data/asset/functions/effect/0357.time_ticker_morning/tick/.mcfunction new file mode 100644 index 0000000000..705f7fd59e --- /dev/null +++ b/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 + +# +# 夜になったら効果切り替え(エンド除く) + execute if predicate lib:is_night unless predicate lib:dimension/is_end 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 diff --git a/Asset/data/asset/functions/effect/0357.time_ticker_morning/tick/night.mcfunction b/Asset/data/asset/functions/effect/0357.time_ticker_morning/tick/night.mcfunction new file mode 100644 index 0000000000..dbfaeb3586 --- /dev/null +++ b/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 diff --git a/Asset/data/asset/functions/effect/0358.time_ticker_night/_/end.mcfunction b/Asset/data/asset/functions/effect/0358.time_ticker_night/_/end.mcfunction new file mode 100644 index 0000000000..7cfb02f1b5 --- /dev/null +++ b/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/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0358.time_ticker_night/_/given.mcfunction b/Asset/data/asset/functions/effect/0358.time_ticker_night/_/given.mcfunction new file mode 100644 index 0000000000..cbfc4d7f9a --- /dev/null +++ b/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/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0358.time_ticker_night/_/register.mcfunction b/Asset/data/asset/functions/effect/0358.time_ticker_night/_/register.mcfunction new file mode 100644 index 0000000000..404cd78655 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0358.time_ticker_night/_/remove.mcfunction b/Asset/data/asset/functions/effect/0358.time_ticker_night/_/remove.mcfunction new file mode 100644 index 0000000000..976291587f --- /dev/null +++ b/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/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0358.time_ticker_night/_/tick.mcfunction b/Asset/data/asset/functions/effect/0358.time_ticker_night/_/tick.mcfunction new file mode 100644 index 0000000000..53f0b678dd --- /dev/null +++ b/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/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0358.time_ticker_night/end/.mcfunction b/Asset/data/asset/functions/effect/0358.time_ticker_night/end/.mcfunction new file mode 100644 index 0000000000..b6dd753013 --- /dev/null +++ b/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 diff --git a/Asset/data/asset/functions/effect/0358.time_ticker_night/given/.mcfunction b/Asset/data/asset/functions/effect/0358.time_ticker_night/given/.mcfunction new file mode 100644 index 0000000000..7eb2e35f09 --- /dev/null +++ b/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 diff --git a/Asset/data/asset/functions/effect/0358.time_ticker_night/modifier/add.mcfunction b/Asset/data/asset/functions/effect/0358.time_ticker_night/modifier/add.mcfunction new file mode 100644 index 0000000000..b69e9dad70 --- /dev/null +++ b/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 diff --git a/Asset/data/asset/functions/effect/0358.time_ticker_night/modifier/remove.mcfunction b/Asset/data/asset/functions/effect/0358.time_ticker_night/modifier/remove.mcfunction new file mode 100644 index 0000000000..0dd1956e91 --- /dev/null +++ b/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 diff --git a/Asset/data/asset/functions/effect/0358.time_ticker_night/register.mcfunction b/Asset/data/asset/functions/effect/0358.time_ticker_night/register.mcfunction new file mode 100644 index 0000000000..f8297f9c21 --- /dev/null +++ b/Asset/data/asset/functions/effect/0358.time_ticker_night/register.mcfunction @@ -0,0 +1,48 @@ +#> asset:effect/0358.time_ticker_night/register +# +# Effectのデータを指定 +# +# @within function asset:effect/0358.time_ticker_night/_/register + +# ExtendsSafe (boolean) (default = false) + # data modify storage asset:effect ExtendsSafe set value true +# ID (int) + data modify storage asset:effect ID set value 358 +# 名前 (TextComponentString) + data modify storage asset:effect Name set value '{"text":"時刻み・月夜"}' +# 説明文 (TextComponentString[]) + data modify storage asset:effect Description set value ['{"text":"魔法耐性とMP回復量が上昇する"}'] +# 効果時間 (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 +# 悪い効果か否か (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,358,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 diff --git a/Asset/data/asset/functions/effect/0358.time_ticker_night/remove/.mcfunction b/Asset/data/asset/functions/effect/0358.time_ticker_night/remove/.mcfunction new file mode 100644 index 0000000000..ac3866439f --- /dev/null +++ b/Asset/data/asset/functions/effect/0358.time_ticker_night/remove/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0358.time_ticker_night/remove/ +# +# Effectが削除された時の処理 +# +# @within function asset:effect/0358.time_ticker_night/_/remove + +# 削除 + function asset:effect/0358.time_ticker_night/modifier/remove diff --git a/Asset/data/asset/functions/effect/0358.time_ticker_night/tick/.mcfunction b/Asset/data/asset/functions/effect/0358.time_ticker_night/tick/.mcfunction new file mode 100644 index 0000000000..dc779f6e07 --- /dev/null +++ b/Asset/data/asset/functions/effect/0358.time_ticker_night/tick/.mcfunction @@ -0,0 +1,16 @@ +#> asset:effect/0358.time_ticker_night/tick/ +# +# Effectのtick処理 +# +# @within function asset:effect/0358.time_ticker_night/_/tick + +# 朝になったら効果切り替え(エンド除く) + execute if predicate lib:is_day unless predicate lib:dimension/is_end run function asset:effect/0358.time_ticker_night/tick/morning + execute if predicate lib:is_day 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/0358.time_ticker_night/tick/morning + 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 diff --git a/Asset/data/asset/functions/effect/0358.time_ticker_night/tick/morning.mcfunction b/Asset/data/asset/functions/effect/0358.time_ticker_night/tick/morning.mcfunction new file mode 100644 index 0000000000..2e21de187a --- /dev/null +++ b/Asset/data/asset/functions/effect/0358.time_ticker_night/tick/morning.mcfunction @@ -0,0 +1,13 @@ +#> asset:effect/0358.time_ticker_night/tick/morning +# +# +# +# @within function asset:effect/0358.time_ticker_night/tick/ + +# 効果時間とフィールドを引き継いで夜バフを付与 + data modify storage api: Argument.ID set value 357 + 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 diff --git a/Asset/data/asset/tags/functions/effect/end.json b/Asset/data/asset/tags/functions/effect/end.json index ec0622ef77..77a312bdb9 100644 --- a/Asset/data/asset/tags/functions/effect/end.json +++ b/Asset/data/asset/tags/functions/effect/end.json @@ -1,5 +1,7 @@ { "values": [ + "asset:effect/0358.time_ticker_night/_/end", + "asset:effect/0357.time_ticker_morning/_/end", "asset:effect/0342.prayer_amidst_blight/_/end", "asset:effect/0340.endless_thirst/_/end", "asset:effect/0350.yuzu/_/end", @@ -105,4 +107,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 767f196e38..b36be559fa 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/0358.time_ticker_night/_/given", + "asset:effect/0357.time_ticker_morning/_/given", "asset:effect/0342.prayer_amidst_blight/_/given", "asset:effect/0340.endless_thirst/_/given", "asset:effect/0350.yuzu/_/given", @@ -99,4 +101,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/register.json b/Asset/data/asset/tags/functions/effect/register.json index 8cf7418f59..75007e719d 100644 --- a/Asset/data/asset/tags/functions/effect/register.json +++ b/Asset/data/asset/tags/functions/effect/register.json @@ -1,5 +1,7 @@ { "values": [ + "asset:effect/0358.time_ticker_night/_/register", + "asset:effect/0357.time_ticker_morning/_/register", "asset:effect/0339.will_o_wisp/_/register", "asset:effect/0342.prayer_amidst_blight/_/register", "asset:effect/0340.endless_thirst/_/register", @@ -170,4 +172,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 1a797796bf..42ed4eea34 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/0358.time_ticker_night/_/remove", + "asset:effect/0357.time_ticker_morning/_/remove", "asset:effect/0342.prayer_amidst_blight/_/remove", "asset:effect/0340.endless_thirst/_/remove", "asset:effect/0350.yuzu/_/remove", @@ -113,4 +115,4 @@ "asset:effect/0007.defense_base_debuff/_/remove", "asset:effect/0258.spirit_melody/_/remove" ] -} +} \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/effect/tick.json b/Asset/data/asset/tags/functions/effect/tick.json index 59b931998c..458b5d00e6 100644 --- a/Asset/data/asset/tags/functions/effect/tick.json +++ b/Asset/data/asset/tags/functions/effect/tick.json @@ -1,5 +1,7 @@ { "values": [ + "asset:effect/0358.time_ticker_night/_/tick", + "asset:effect/0357.time_ticker_morning/_/tick", "asset:effect/0339.will_o_wisp/_/tick", "asset:effect/0342.prayer_amidst_blight/_/tick", "asset:effect/0340.endless_thirst/_/tick", @@ -101,4 +103,4 @@ "asset:effect/0279.poison_of_vinderre/_/tick", "asset:effect/0258.spirit_melody/_/tick" ] -} +} \ No newline at end of file From 7d67a006d5cd54e198d7204cea6bae647237d9b3 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Sun, 24 May 2026 14:51:57 +0900 Subject: [PATCH 3/9] =?UTF-8?q?=E7=99=BD=E6=98=BC=E3=83=90=E3=83=95?= =?UTF-8?q?=E3=81=AE=E8=AA=AC=E6=98=8E=E3=81=8C=E8=A1=A8=E7=A4=BA=E3=81=95?= =?UTF-8?q?=E3=82=8C=E3=81=AA=E3=81=84=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../effect/0357.time_ticker_morning/register.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/effect/0357.time_ticker_morning/register.mcfunction b/Asset/data/asset/functions/effect/0357.time_ticker_morning/register.mcfunction index 731d66d9f8..2a127a1cda 100644 --- a/Asset/data/asset/functions/effect/0357.time_ticker_morning/register.mcfunction +++ b/Asset/data/asset/functions/effect/0357.time_ticker_morning/register.mcfunction @@ -11,7 +11,7 @@ # 名前 (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) From 9a8ef6c09f4f801e85fa91a4f9ee3e78998dcfda Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Sun, 24 May 2026 14:55:21 +0900 Subject: [PATCH 4/9] =?UTF-8?q?=E3=82=A8=E3=83=95=E3=82=A7=E3=82=AF?= =?UTF-8?q?=E3=83=88=E3=82=92=E4=BB=98=E4=B8=8E=E3=81=99=E3=82=8B=E9=9A=9B?= =?UTF-8?q?=E3=81=AE=E5=87=A6=E7=90=86=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trigger/3.main.mcfunction | 21 +++++++++++++++---- .../0515.time_medicine/trigger/day.mcfunction | 10 --------- .../trigger/effect.m.mcfunction | 13 ++++++++++++ .../trigger/night.mcfunction | 10 --------- 4 files changed, 30 insertions(+), 24 deletions(-) delete mode 100644 Asset/data/asset/functions/artifact/0515.time_medicine/trigger/day.mcfunction create mode 100644 Asset/data/asset/functions/artifact/0515.time_medicine/trigger/effect.m.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/0515.time_medicine/trigger/night.mcfunction diff --git a/Asset/data/asset/functions/artifact/0515.time_medicine/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0515.time_medicine/trigger/3.main.mcfunction index b825bb16ca..14a78df794 100644 --- a/Asset/data/asset/functions/artifact/0515.time_medicine/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0515.time_medicine/trigger/3.main.mcfunction @@ -8,7 +8,20 @@ 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 + +# 効果時間 + data modify storage asset:temp Effect.Duration set value 1200 + +# 補正量 + data modify storage asset:temp Effect.FieldOverride.PhysicalDefense set value 0.1 + data modify storage asset:temp Effect.FieldOverride.Heal set value 0.1 + + data modify storage asset:temp Effect.FieldOverride.MagicDefense set value 0.1 + data modify storage asset:temp Effect.FieldOverride.MPHeal set value 0.1 + +# 朝と夜で異なるバフを付与 + 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 diff --git a/Asset/data/asset/functions/artifact/0515.time_medicine/trigger/day.mcfunction b/Asset/data/asset/functions/artifact/0515.time_medicine/trigger/day.mcfunction deleted file mode 100644 index eed9f6a7b4..0000000000 --- a/Asset/data/asset/functions/artifact/0515.time_medicine/trigger/day.mcfunction +++ /dev/null @@ -1,10 +0,0 @@ -#> asset:artifact/0515.time_medicine/trigger/day -# -# -# -# @within function asset:artifact/0515.time_medicine/trigger/3.main - -# エフェクト - effect give @s fire_resistance 120 0 - effect give @s speed 120 1 - effect give @s haste 120 1 \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0515.time_medicine/trigger/effect.m.mcfunction b/Asset/data/asset/functions/artifact/0515.time_medicine/trigger/effect.m.mcfunction new file mode 100644 index 0000000000..3f529c1202 --- /dev/null +++ b/Asset/data/asset/functions/artifact/0515.time_medicine/trigger/effect.m.mcfunction @@ -0,0 +1,13 @@ +#> asset:artifact/0515.time_medicine/trigger/effect.m +# +# +# +# @within function asset:artifact/0515.time_medicine/trigger/3.main + +# エフェクト + $data modify storage api: Argument.ID set value $(ID) + data modify storage api: Argument.Duration set from storage asset:temp Effect.Duration + data modify storage api: Argument.FieldOverride set from storage asset:temp FieldOverride + 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 diff --git a/Asset/data/asset/functions/artifact/0515.time_medicine/trigger/night.mcfunction b/Asset/data/asset/functions/artifact/0515.time_medicine/trigger/night.mcfunction deleted file mode 100644 index 38cc730013..0000000000 --- a/Asset/data/asset/functions/artifact/0515.time_medicine/trigger/night.mcfunction +++ /dev/null @@ -1,10 +0,0 @@ -#> asset:artifact/0515.time_medicine/trigger/night -# -# -# -# @within function asset:artifact/0515.time_medicine/trigger/3.main - -# エフェクト - effect give @s night_vision 120 0 - effect give @s slow_falling 120 0 - effect give @s jump_boost 120 2 \ No newline at end of file From 883192c0d0ffb80d2afc81418ffb0bda25424ea7 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Sun, 24 May 2026 15:21:16 +0900 Subject: [PATCH 5/9] =?UTF-8?q?=E3=82=A8=E3=83=B3=E3=83=89=E3=81=8B?= =?UTF-8?q?=E3=82=89=E3=82=AA=E3=83=BC=E3=83=90=E3=83=BC=E3=83=AF=E3=83=BC?= =?UTF-8?q?=E3=83=AB=E3=83=89=E3=81=AB=E5=B8=B0=E9=82=84=E3=81=97=E3=81=9F?= =?UTF-8?q?=E9=9A=9B=E3=81=AB=E3=83=90=E3=83=95=E3=81=8C=E5=A2=97=E6=AE=96?= =?UTF-8?q?=E3=81=99=E3=82=8B=E3=83=9F=E3=82=B9=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../effect/0357.time_ticker_morning/tick/.mcfunction | 4 ++-- .../functions/effect/0358.time_ticker_night/tick/.mcfunction | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Asset/data/asset/functions/effect/0357.time_ticker_morning/tick/.mcfunction b/Asset/data/asset/functions/effect/0357.time_ticker_morning/tick/.mcfunction index 705f7fd59e..9ecab718d9 100644 --- a/Asset/data/asset/functions/effect/0357.time_ticker_morning/tick/.mcfunction +++ b/Asset/data/asset/functions/effect/0357.time_ticker_morning/tick/.mcfunction @@ -4,9 +4,9 @@ # # @within function asset:effect/0357.time_ticker_morning/_/tick -# # 夜になったら効果切り替え(エンド除く) - execute if predicate lib:is_night unless predicate lib:dimension/is_end run function asset:effect/0357.time_ticker_morning/tick/night +# 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にエンドにいない なら夜バフを付与 diff --git a/Asset/data/asset/functions/effect/0358.time_ticker_night/tick/.mcfunction b/Asset/data/asset/functions/effect/0358.time_ticker_night/tick/.mcfunction index dc779f6e07..9341ec7423 100644 --- a/Asset/data/asset/functions/effect/0358.time_ticker_night/tick/.mcfunction +++ b/Asset/data/asset/functions/effect/0358.time_ticker_night/tick/.mcfunction @@ -5,7 +5,8 @@ # @within function asset:effect/0358.time_ticker_night/_/tick # 朝になったら効果切り替え(エンド除く) - execute if predicate lib:is_day unless predicate lib:dimension/is_end run function asset:effect/0358.time_ticker_night/tick/morning +# 1tick前のディメンションがエンドの場合は付与せずに解除だけ行う + execute if predicate lib:is_day unless predicate lib:dimension/is_end if data storage asset:context this{InTheEnd:false} run function asset:effect/0358.time_ticker_night/tick/morning execute if predicate lib:is_day unless predicate lib:dimension/is_end run data modify storage asset:context Duration set value 0 # 今がエンド && 前tickにエンドにいない なら朝バフを付与 From ff75b605b810fbaca2c02f63536e3060406368cc Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Sun, 24 May 2026 16:09:45 +0900 Subject: [PATCH 6/9] =?UTF-8?q?=E5=90=8D=E5=89=8D=E3=81=AB=E8=89=B2?= =?UTF-8?q?=E3=82=92=E8=A8=AD=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifact/0515.time_medicine/give/2.give.mcfunction | 2 +- .../effect/0357.time_ticker_morning/register.mcfunction | 2 +- .../functions/effect/0358.time_ticker_night/register.mcfunction | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Asset/data/asset/functions/artifact/0515.time_medicine/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0515.time_medicine/give/2.give.mcfunction index 233e6c2021..1c8e735c2a 100644 --- a/Asset/data/asset/functions/artifact/0515.time_medicine/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0515.time_medicine/give/2.give.mcfunction @@ -13,7 +13,7 @@ # 神器のベースアイテム 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":"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}) (オプション) diff --git a/Asset/data/asset/functions/effect/0357.time_ticker_morning/register.mcfunction b/Asset/data/asset/functions/effect/0357.time_ticker_morning/register.mcfunction index 2a127a1cda..540600239f 100644 --- a/Asset/data/asset/functions/effect/0357.time_ticker_morning/register.mcfunction +++ b/Asset/data/asset/functions/effect/0357.time_ticker_morning/register.mcfunction @@ -9,7 +9,7 @@ # ID (int) data modify storage asset:effect ID set value 357 # 名前 (TextComponentString) - data modify storage asset:effect Name set value '{"text":"時刻み・白昼"}' + 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) diff --git a/Asset/data/asset/functions/effect/0358.time_ticker_night/register.mcfunction b/Asset/data/asset/functions/effect/0358.time_ticker_night/register.mcfunction index f8297f9c21..ee04afde0e 100644 --- a/Asset/data/asset/functions/effect/0358.time_ticker_night/register.mcfunction +++ b/Asset/data/asset/functions/effect/0358.time_ticker_night/register.mcfunction @@ -9,7 +9,7 @@ # ID (int) data modify storage asset:effect ID set value 358 # 名前 (TextComponentString) - data modify storage asset:effect Name set value '{"text":"時刻み・月夜"}' + data modify storage asset:effect Name set value '{"text":"時刻み・月夜","color":"#467bb5"}' # 説明文 (TextComponentString[]) data modify storage asset:effect Description set value ['{"text":"魔法耐性とMP回復量が上昇する"}'] # 効果時間 (int) (default = API || error) From 630b5300ea6263e56360c578d17389f408e40364 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Mon, 25 May 2026 04:41:48 +0900 Subject: [PATCH 7/9] =?UTF-8?q?=E5=AE=9A=E6=95=B0=E8=A8=AD=E5=AE=9A?= =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../0515.time_medicine/trigger/3.main.mcfunction | 10 ---------- .../trigger/effect.m.mcfunction | 16 +++++++++++++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Asset/data/asset/functions/artifact/0515.time_medicine/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0515.time_medicine/trigger/3.main.mcfunction index 14a78df794..884ac633b5 100644 --- a/Asset/data/asset/functions/artifact/0515.time_medicine/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0515.time_medicine/trigger/3.main.mcfunction @@ -9,16 +9,6 @@ # ここから先は神器側の効果の処理を書く -# 効果時間 - data modify storage asset:temp Effect.Duration set value 1200 - -# 補正量 - data modify storage asset:temp Effect.FieldOverride.PhysicalDefense set value 0.1 - data modify storage asset:temp Effect.FieldOverride.Heal set value 0.1 - - data modify storage asset:temp Effect.FieldOverride.MagicDefense set value 0.1 - data modify storage asset:temp Effect.FieldOverride.MPHeal set value 0.1 - # 朝と夜で異なるバフを付与 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} diff --git a/Asset/data/asset/functions/artifact/0515.time_medicine/trigger/effect.m.mcfunction b/Asset/data/asset/functions/artifact/0515.time_medicine/trigger/effect.m.mcfunction index 3f529c1202..ae2d0403ee 100644 --- a/Asset/data/asset/functions/artifact/0515.time_medicine/trigger/effect.m.mcfunction +++ b/Asset/data/asset/functions/artifact/0515.time_medicine/trigger/effect.m.mcfunction @@ -4,10 +4,20 @@ # # @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) - data modify storage api: Argument.Duration set from storage asset:temp Effect.Duration - data modify storage api: Argument.FieldOverride set from storage asset:temp FieldOverride - 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 From 56194a73b668b90f5a38eea157a8020c52751d54 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Mon, 25 May 2026 06:44:18 +0900 Subject: [PATCH 8/9] =?UTF-8?q?=E8=AA=BF=E6=95=B4=E7=8F=AD=E5=90=91?= =?UTF-8?q?=E3=81=91=E3=83=A1=E3=83=A2=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifact/0515.time_medicine/trigger/3.main.mcfunction | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Asset/data/asset/functions/artifact/0515.time_medicine/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0515.time_medicine/trigger/3.main.mcfunction index 884ac633b5..b7568a6983 100644 --- a/Asset/data/asset/functions/artifact/0515.time_medicine/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0515.time_medicine/trigger/3.main.mcfunction @@ -9,6 +9,9 @@ # ここから先は神器側の効果の処理を書く +# 調整班向けメモ +# エンドでは朝と夜の両方のバフが付与されることを忘れないように + # 朝と夜で異なるバフを付与 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} From 56100daae7efe990c2adc4b1ef9bb08d374acba3 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Mon, 25 May 2026 06:44:35 +0900 Subject: [PATCH 9/9] =?UTF-8?q?=E4=B8=8D=E8=A6=81=E3=81=AA=E3=83=AA?= =?UTF-8?q?=E3=82=BB=E3=83=83=E3=83=88=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifact/0515.time_medicine/trigger/3.main.mcfunction | 3 --- 1 file changed, 3 deletions(-) diff --git a/Asset/data/asset/functions/artifact/0515.time_medicine/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0515.time_medicine/trigger/3.main.mcfunction index b7568a6983..8c8145907c 100644 --- a/Asset/data/asset/functions/artifact/0515.time_medicine/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0515.time_medicine/trigger/3.main.mcfunction @@ -15,6 +15,3 @@ # 朝と夜で異なるバフを付与 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