Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
5d53609
効果変更に合わせてLoreを修正
Lapis-LJA May 24, 2026
3cf3cc0
エフェクト完成
Lapis-LJA May 24, 2026
7d67a00
白昼バフの説明が表示されない問題を修正
Lapis-LJA May 24, 2026
9a8ef6c
エフェクトを付与する際の処理を修正
Lapis-LJA May 24, 2026
883192c
エンドからオーバーワールドに帰還した際にバフが増殖するミスを修正
Lapis-LJA May 24, 2026
ff75b60
名前に色を設定
Lapis-LJA May 24, 2026
630b530
定数設定を修正
Lapis-LJA May 24, 2026
56194a7
調整班向けメモを追加
Lapis-LJA May 24, 2026
56100da
不要なリセットを削除
Lapis-LJA May 24, 2026
31c94f0
フィールド構造を変更
Lapis-LJA May 24, 2026
1602c02
core側のバグに仮対応した処理を追加
Lapis-LJA May 24, 2026
3fff5a4
昼と夜に変更
Lapis-LJA May 25, 2026
0ce6169
置換漏れを一括修正
Lapis-LJA May 25, 2026
5598831
Loreを調整
Lapis-LJA May 25, 2026
f5b0e39
[Effect 359] 時刻み・日食を作成
Lapis-LJA May 25, 2026
590e4a3
日食バフに対応
Lapis-LJA May 25, 2026
f92af8e
補正を適用できていない問題を修正
Lapis-LJA May 25, 2026
308c0a8
floatからdoubleへ
Lapis-LJA May 25, 2026
5fdf64c
エフェクトの名前の色を修正
Lapis-LJA May 25, 2026
f0be3e7
Loreを修正
Lapis-LJA May 25, 2026
d181436
使用回数を8に
Lapis-LJA May 25, 2026
0679931
Loreを調整
Lapis-LJA May 25, 2026
3894e96
日食バフに付与時演出を追加
Lapis-LJA May 26, 2026
0d00cf6
月夜バフに付与時演出を追加
Lapis-LJA May 26, 2026
67a2b0e
白昼バフに演出を追加
Lapis-LJA May 26, 2026
b948ed1
カスタムnbtを削除
Lapis-LJA May 26, 2026
8cbc747
Merge branch 'master' into fix/lapis_artifact515
Lapis-LJA May 28, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@
# 神器のベースアイテム
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
# data modify storage asset:artifact ConsumeItem.Extra set value
# 使用回数 (int) (オプション)
data modify storage asset:artifact RemainingCount set value 10
data modify storage asset:artifact RemainingCount set value 8
# 神器を発動できるスロット (string) Wikiを参照
data modify storage asset:artifact Slot set value "auto"
# 神器のトリガー (string) Wikiを参照
Expand Down Expand Up @@ -60,7 +60,7 @@
# 扱える神 (string[]) Wikiを参照
data modify storage asset:artifact CanUsedGod set value "ALL"
# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション)
data modify storage asset:artifact CustomNBT set value {HideFlags:63,CustomPotionColor:16777215}

# data modify storage asset:artifact CustomNBT set value
# 神器の入手用function
function asset:artifact/common/give
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,12 @@
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

# 調整班向けメモ
# エンドでは日食バフ(隠し効果)が付与される
# 攻撃・耐性+ 与回復量・MP回復量-

# 昼・夜・エンドで異なるバフを付与
execute if predicate lib:is_day unless predicate lib:dimension/is_end run function asset:artifact/0515.time_medicine/trigger/effect.m {ID:357}
execute if predicate lib:is_night unless predicate lib:dimension/is_end run function asset:artifact/0515.time_medicine/trigger/effect.m {ID:358}
execute if predicate lib:dimension/is_end run function asset:artifact/0515.time_medicine/trigger/effect.m {ID:359}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
#> 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.Modifier.Day.PhysicalDefense set value 0.1d
data modify storage api: Argument.FieldOverride.Modifier.Day.Heal set value 0.1d
# 夜バフ
data modify storage api: Argument.FieldOverride.Modifier.Night.MagicDefense set value 0.1d
data modify storage api: Argument.FieldOverride.Modifier.Night.MPHeal set value 0.1d
# 日食バフ(エンド)
data modify storage api: Argument.FieldOverride.Modifier.Eclipse.Attack set value 0.1d
data modify storage api: Argument.FieldOverride.Modifier.Eclipse.Defense set value 0.2d
data modify storage api: Argument.FieldOverride.Modifier.Eclipse.Heal set value -0.1d
data modify storage api: Argument.FieldOverride.Modifier.Eclipse.MPHeal set value -0.1d

# エフェクト
$data modify storage api: Argument.ID set value $(ID)
function api:entity/mob/effect/give
function api:entity/mob/effect/reset

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#> asset:effect/0357.time_ticker_day/_/end
#
# Effectの効果の終了時に実行されるfunction
#
# @within tag/function asset:effect/end

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

execute if data storage asset:context {id:357} run function asset:effect/0357.time_ticker_day/given/
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#> asset:effect/0357.time_ticker_day/_/re-given
#
# Effectが上書きされた時に実行されるfunction
#
# @within tag/function asset:effect/re-given

execute if data storage asset:context {id:357} run function asset:effect/0357.time_ticker_day/re-given/
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#> asset:effect/0357.time_ticker_day/_/register
#
#
#
# @within tag/function asset:effect/register

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

execute if data storage asset:context {id:357} run function asset:effect/0357.time_ticker_day/remove/
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#> asset:effect/0357.time_ticker_day/_/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_day/tick/
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#> asset:effect/0357.time_ticker_day/end/
#
# Effectの効果が切れた時の処理
#
# @within function asset:effect/0357.time_ticker_day/_/end

# 削除
function asset:effect/0357.time_ticker_day/modifier/remove
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#> asset:effect/0357.time_ticker_day/given/
#
# Effectが付与された時の処理
#
# @within function asset:effect/0357.time_ticker_day/_/given

# 付与
function asset:effect/0357.time_ticker_day/modifier/add

# 演出
function asset:effect/0357.time_ticker_day/vfx/
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#> asset:effect/0357.time_ticker_day/modifier/add
#
#
#
# @within function asset:effect/0357.time_ticker_day/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.Modifier.Day.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.Modifier.Day.Heal
data modify storage api: Argument.Operation set value "multiply"
function api:modifier/heal/add
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#> asset:effect/0357.time_ticker_day/modifier/remove
#
#
#
# @within function
# asset:effect/0357.time_ticker_day/end/
# asset:effect/0357.time_ticker_day/remove/
# asset:effect/0357.time_ticker_day/tick/

# 物理耐性
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#> asset:effect/0357.time_ticker_day/re-given/
#
# Effectが上書きされた時の処理
#
# @within function asset:effect/0357.time_ticker_day/_/re-given

# 演出
function asset:effect/0357.time_ticker_day/vfx/
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
#> asset:effect/0357.time_ticker_day/register
#
# Effectのデータを指定
#
# @within function asset:effect/0357.time_ticker_day/_/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.Modifier.Day set value {PhysicalDefense:0.1d,Heal:0.1d}
data modify storage asset:effect Field.Modifier.Night set value {MagicDefense:0.df,MPHeal:0.1d}
data modify storage asset:effect Field.Modifier.Eclipse set value {Attack:0.1d,Defense:0.2d,Heal:-0.1d,MPHeal:-0.1d}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#> asset:effect/0357.time_ticker_day/remove/
#
# Effectが削除された時の処理
#
# @within function asset:effect/0357.time_ticker_day/_/remove

# 削除
function asset:effect/0357.time_ticker_day/modifier/remove
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#> asset:effect/0357.time_ticker_day/tick/
#
# Effectのtick処理
#
# @within function asset:effect/0357.time_ticker_day/_/tick

# エフェクトを付与した直後に、効果時間を0にするとendが呼び出されないバグが起きているため、一時的に効果時間を0にする際はmodifier/removeを呼び出す (修正後は要削除)

# 夜になったら月夜バフに切り替え(エンド除く)
execute if predicate lib:is_night unless predicate lib:dimension/is_end run function asset:effect/0357.time_ticker_day/tick/transfer_effect.m
execute if predicate lib:is_night unless predicate lib:dimension/is_end run data modify storage asset:context Duration set value 0
execute if predicate lib:is_night unless predicate lib:dimension/is_end run function asset:effect/0357.time_ticker_day/modifier/remove

# エンドなら日食バフに切り替え
execute if predicate lib:dimension/is_end run function asset:effect/0357.time_ticker_day/tick/transfer_effect.m {ID:359}
execute if predicate lib:dimension/is_end run data modify storage asset:context Duration set value 0
execute if predicate lib:dimension/is_end run function asset:effect/0357.time_ticker_day/modifier/remove
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#> asset:effect/0357.time_ticker_day/tick/transfer_effect.m
#
#
#
# @within function asset:effect/0357.time_ticker_day/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.Modifier set from storage asset:context this.Modifier
function api:entity/mob/effect/give
function api:entity/mob/effect/reset
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#> asset:effect/0357.time_ticker_day/vfx/
#
#
#
# @within function
# asset:effect/0357.time_ticker_day/given/
# asset:effect/0357.time_ticker_day/re-given/

playsound minecraft:block.beacon.power_select player @a ~ ~ ~ 1 1.8
particle dust 1 0.84 0.5 1 ~ ~1.2 ~ 1 1 1 0 40 normal @a
Original file line number Diff line number Diff line change
@@ -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/
Original file line number Diff line number Diff line change
@@ -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/
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#> asset:effect/0358.time_ticker_night/_/re-given
#
# Effectが上書きされた時に実行されるfunction
#
# @within tag/function asset:effect/re-given

execute if data storage asset:context {id:358} run function asset:effect/0358.time_ticker_night/re-given/
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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/
Original file line number Diff line number Diff line change
@@ -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/
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#> 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

# 演出
function asset:effect/0358.time_ticker_night/vfx/
Loading
Loading