Skip to content

🩹 [Artifact 1114] 妖精マカロンのバフの効果量を神器側で設定するように #1859

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Lapis-LJA wants to merge 3 commits into
base: master
Choose a base branch
from
Open

🩹 [Artifact 1114] 妖精マカロンのバフの効果量を神器側で設定するように #1859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
75e01e1
説明を修正
Lapis-LJA Jan 3, 2026
9d321af
効果時間とバリア量を神器側で設定するように
Lapis-LJA Jan 3, 2026
a7b2b83
UUIDをフィールドで定義するように
Lapis-LJA Jan 3, 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
2 changes: 1 addition & 1 deletion Asset/data/asset/functions/artifact/1114.fairy_macaron/give/2.give.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# 神器の名前 (TextComponentString)
data modify storage asset:artifact Name set value '{"text":"妖精マカロン","color":"#F6BFFF"}'
# 神器の説明文 (TextComponentString[])
data modify storage asset:artifact Lore set value ['{"text":"HPを5回復し、バリアを5得る。","color":"white"}','{"text":"夜明けの森から届いた","color":"gray"}','{"text":"甘く儚い妖精からの贈り物。","color":"gray"}']
data modify storage asset:artifact Lore set value ['{"text":"体力を5回復し、バリアを5得る。","color":"white"}','{"text":"夜明けの森から届いた","color":"gray"}','{"text":"甘く儚い妖精からの贈り物。","color":"gray"}']
# MP以外の消費物 (TextComponentString) (オプション)
# data modify storage asset:artifact CostText set value
# 使用回数 (int) (オプション)
Expand Down
2 changes: 2 additions & 0 deletions Asset/data/asset/functions/artifact/1114.fairy_macaron/trigger/3.main.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,7 @@

# バリアを得る
data modify storage api: Argument.ID set value 268
data modify storage api: Argument.Duration set value 600
data modify storage api: Argument.FieldOverride.Barrier set value 5
function api:entity/mob/effect/give
function api:entity/mob/effect/reset
4 changes: 2 additions & 2 deletions Asset/data/asset/functions/effect/0268.macaron_barrier/barrier/add.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
# @within function asset:effect/0268.macaron_barrier/given/

# バリア設定
data modify storage api: Argument.Amount set value 5
data modify storage api: Argument.UUID set value [I;1,3,268,0]
data modify storage api: Argument.Amount set from storage asset:context this.Barrier
data modify storage api: Argument.UUID set from storage asset:context this.UUID
data modify storage api: Argument.Priority set value 1
data modify storage api: Argument.WipedCallback set value "asset:effect/0268.macaron_barrier/barrier/break"
function api:entity/player/absorption/add
2 changes: 1 addition & 1 deletion Asset/data/asset/functions/effect/0268.macaron_barrier/barrier/remove.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
# asset:effect/0268.macaron_barrier/remove/

# バリアを削除する
data modify storage api: Argument.UUID set value [I;1,3,268,0]
data modify storage api: Argument.UUID set from storage asset:context this.UUID
function api:entity/player/absorption/remove
6 changes: 3 additions & 3 deletions Asset/data/asset/functions/effect/0268.macaron_barrier/register.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@
# 説明文 (TextComponentString[])
data modify storage asset:effect Description set value ['{"text":"ダメージを吸収する","color":"white"}']
# 効果時間 (int) (default = API || error)
data modify storage asset:effect Duration set value 600
# data modify storage asset:effect Duration set value 600
# スタック (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 600
# data modify storage asset:effect MaxDuration set value 600
# 最大スタック (int) (default = 2147483647)
# data modify storage asset:effect MaxStack set value
# 悪い効果か否か (boolean)
Expand All @@ -36,4 +36,4 @@
data modify storage asset:effect StackVisible set value false

# フィールド
# data modify storage asset:effect Field set value {}
data modify storage asset:effect Field.UUID set value [I;1,3,268,0]