Skip to content

♻️ [Artifact 529] 保護帽のバニラエフェクトをEffectAssetに移行 #2005

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 7 commits into
base: master
Choose a base branch
from
Open

♻️ [Artifact 529] 保護帽のバニラエフェクトをEffectAssetに移行 #2005

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a756130
[Effect 302] 安全確認、よし！を作成
Lapis-LJA May 24, 2026
e062ccb
バニラエフェクトにさようなら
Lapis-LJA May 24, 2026
5fed48e
効果量を明記
Lapis-LJA May 24, 2026
6dc873d
神器のフレーバーテキストに合わせて名前を調整
Lapis-LJA May 24, 2026
ee3bf47
Loreを修正
Lapis-LJA May 24, 2026
83c6a2d
Merge branch 'master' into dev/lapis_effect302
Lapis-LJA May 24, 2026
69de871
Loreを調整
Lapis-LJA May 24, 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/0529.safety_helmet/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":"yellow"}'
# 神器の説明文 (TextComponentString[])
data modify storage asset:artifact Lore set value ['[{"text":"被ダメ時","color":"red"},{"text":"に少しの間","color":"white"},{"text":"耐性","color":"dark_gray"},{"text":"が付与される","color":"white"}]','{"text":""}','{"text":"安全確認よし！","color":"yellow"}']
data modify storage asset:artifact Lore set value ['[{"translate":"被ダメージ時に2秒間%1$sを得る","color":"white","with":[{"text":"耐性+20%","color":"green"}]}]','{"text":""}','{"text":"安全確認よし！","color":"yellow"}']
# 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション)
# data modify storage asset:artifact ConsumeItem.Item set value
# data modify storage asset:artifact ConsumeItem.Count set value
Expand Down
8 changes: 6 additions & 2 deletions Asset/data/asset/functions/artifact/0529.safety_helmet/trigger/3.main.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,9 @@
# 演出
playsound entity.ender_eye.death player @p ~ ~ ~ 1.0 1.0

# 耐性付与
effect give @s resistance 3 1
# 耐性バフ付与
data modify storage api: Argument.ID set value 302
data modify storage api: Argument.Duration set value 60
data modify storage api: Argument.FieldOverride.Amount set value 0.2
function api:entity/mob/effect/give
function api:entity/mob/effect/reset
7 changes: 7 additions & 0 deletions Asset/data/asset/functions/effect/0302.safety_check_complete/_/end.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#> asset:effect/0302.safety_check_complete/_/end
#
# Effectの効果の終了時に実行されるfunction
#
# @within tag/function asset:effect/end

execute if data storage asset:context {id:302} run function asset:effect/0302.safety_check_complete/end/
7 changes: 7 additions & 0 deletions Asset/data/asset/functions/effect/0302.safety_check_complete/_/given.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#> asset:effect/0302.safety_check_complete/_/given
#
# Effectが付与された時に実行されるfunction
#
# @within tag/function asset:effect/given

execute if data storage asset:context {id:302} run function asset:effect/0302.safety_check_complete/given/
7 changes: 7 additions & 0 deletions Asset/data/asset/functions/effect/0302.safety_check_complete/_/register.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#> asset:effect/0302.safety_check_complete/_/register
#
#
#
# @within tag/function asset:effect/register

execute if data storage asset:context {id:302} run function asset:effect/0302.safety_check_complete/register
7 changes: 7 additions & 0 deletions Asset/data/asset/functions/effect/0302.safety_check_complete/_/remove.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#> asset:effect/0302.safety_check_complete/_/remove
#
# Effectが神器や牛乳によって削除された時に実行されるfunction
#
# @within tag/function asset:effect/remove

execute if data storage asset:context {id:302} run function asset:effect/0302.safety_check_complete/remove/
8 changes: 8 additions & 0 deletions Asset/data/asset/functions/effect/0302.safety_check_complete/end/.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#> asset:effect/0302.safety_check_complete/end/
#
# Effectの効果が切れた時の処理
#
# @within function asset:effect/0302.safety_check_complete/_/end

# 削除
function asset:effect/0302.safety_check_complete/modifier/remove
8 changes: 8 additions & 0 deletions Asset/data/asset/functions/effect/0302.safety_check_complete/given/.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#> asset:effect/0302.safety_check_complete/given/
#
# Effectが付与された時の処理
#
# @within function asset:effect/0302.safety_check_complete/_/given

# 付与
function asset:effect/0302.safety_check_complete/modifier/add
11 changes: 11 additions & 0 deletions Asset/data/asset/functions/effect/0302.safety_check_complete/modifier/add.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#> asset:effect/0302.safety_check_complete/modifier/add
#
#
#
# @within function asset:effect/0302.safety_check_complete/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
data modify storage api: Argument.Operation set value "multiply"
function api:modifier/defense/base/add
11 changes: 11 additions & 0 deletions Asset/data/asset/functions/effect/0302.safety_check_complete/modifier/remove.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#> asset:effect/0302.safety_check_complete/modifier/remove
#
#
#
# @within function
# asset:effect/0302.safety_check_complete/end/
# asset:effect/0302.safety_check_complete/remove/

# 耐性
data modify storage api: Argument.UUID set from storage asset:context this.UUID
function api:modifier/defense/base/remove
40 changes: 40 additions & 0 deletions Asset/data/asset/functions/effect/0302.safety_check_complete/register.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
#> asset:effect/0302.safety_check_complete/register
#
# Effectのデータを指定
#
# @within function asset:effect/0302.safety_check_complete/_/register

# ExtendsSafe (boolean) (default = false)
# data modify storage asset:effect ExtendsSafe set value true
# ID (int)
data modify storage asset:effect ID set value 302
# 名前 (TextComponentString)
data modify storage asset:effect Name set value '{"text":"安全確認よし！","color":"yellow"}'
# 説明文 (TextComponentString[])
data modify storage asset:effect Description set value ['{"text":"被ダメージが大きく低下する","color":"white"}']
# 効果時間 (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,302,0]
data modify storage asset:effect Field.Amount set value 0.2
8 changes: 8 additions & 0 deletions Asset/data/asset/functions/effect/0302.safety_check_complete/remove/.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#> asset:effect/0302.safety_check_complete/remove/
#
# Effectが削除された時の処理
#
# @within function asset:effect/0302.safety_check_complete/_/remove

# 削除
function asset:effect/0302.safety_check_complete/modifier/remove
1 change: 1 addition & 0 deletions Asset/data/asset/tags/functions/effect/end.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"values": [
"asset:effect/0302.safety_check_complete/_/end",
"asset:effect/0345.topaz_protection/_/end",
"asset:effect/0342.prayer_amidst_blight/_/end",
"asset:effect/0340.endless_thirst/_/end",
Expand Down
1 change: 1 addition & 0 deletions Asset/data/asset/tags/functions/effect/given.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"values": [
"asset:effect/0302.safety_check_complete/_/given",
"asset:effect/0345.topaz_protection/_/given",
"asset:effect/0342.prayer_amidst_blight/_/given",
"asset:effect/0340.endless_thirst/_/given",
Expand Down
1 change: 1 addition & 0 deletions Asset/data/asset/tags/functions/effect/register.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"values": [
"asset:effect/0302.safety_check_complete/_/register",
"asset:effect/0345.topaz_protection/_/register",
"asset:effect/0339.will_o_wisp/_/register",
"asset:effect/0342.prayer_amidst_blight/_/register",
Expand Down
1 change: 1 addition & 0 deletions Asset/data/asset/tags/functions/effect/remove.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"values": [
"asset:effect/0302.safety_check_complete/_/remove",
"asset:effect/0345.topaz_protection/_/remove",
"asset:effect/0342.prayer_amidst_blight/_/remove",
"asset:effect/0340.endless_thirst/_/remove",
Expand Down
Loading