From c111f99da6cab92805dcbda74719cb6abcddb32a Mon Sep 17 00:00:00 2001
From: ogachu0331 <taichi.oga331@gmail.com>
Date: Tue, 9 Jun 2026 02:07:51 +0900
Subject: [PATCH 01/10] =?UTF-8?q?artifact0101=E3=82=B0=E3=83=AA=E3=83=A2?=
 =?UTF-8?q?=E3=83=AF=E3=83=BC=E3=83=AB=E3=81=AE=E4=BD=9C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../0101.grimoire/give/1.trigger.mcfunction   |  7 ++
 .../0101.grimoire/give/2.give.mcfunction      | 68 +++++++++++++++++++
 .../trigger/1.trigger.mcfunction              |  8 +++
 .../trigger/2.check_condition.mcfunction      | 12 ++++
 .../0101.grimoire/trigger/3.main.mcfunction   | 17 +++++
 .../trigger/balletfire.mcfunction             | 12 ++++
 .../trigger/balletthunder.mcfunction          | 12 ++++
 .../trigger/balletwater.mcfunction            | 12 ++++
 .../0101.grimoire/trigger/fire.mcfunction     | 18 +++++
 .../0101.grimoire/trigger/thunder.mcfunction  | 20 ++++++
 .../0101.grimoire/trigger/water.mcfunction    | 20 ++++++
 .../artifact/click.carrot_on_a_stick.json     |  3 +-
 .../asset/tags/functions/artifact/give.json   |  3 +-
 13 files changed, 210 insertions(+), 2 deletions(-)
 create mode 100644 Asset/data/asset/functions/artifact/0101.grimoire/give/1.trigger.mcfunction
 create mode 100644 Asset/data/asset/functions/artifact/0101.grimoire/give/2.give.mcfunction
 create mode 100644 Asset/data/asset/functions/artifact/0101.grimoire/trigger/1.trigger.mcfunction
 create mode 100644 Asset/data/asset/functions/artifact/0101.grimoire/trigger/2.check_condition.mcfunction
 create mode 100644 Asset/data/asset/functions/artifact/0101.grimoire/trigger/3.main.mcfunction
 create mode 100644 Asset/data/asset/functions/artifact/0101.grimoire/trigger/balletfire.mcfunction
 create mode 100644 Asset/data/asset/functions/artifact/0101.grimoire/trigger/balletthunder.mcfunction
 create mode 100644 Asset/data/asset/functions/artifact/0101.grimoire/trigger/balletwater.mcfunction
 create mode 100644 Asset/data/asset/functions/artifact/0101.grimoire/trigger/fire.mcfunction
 create mode 100644 Asset/data/asset/functions/artifact/0101.grimoire/trigger/thunder.mcfunction
 create mode 100644 Asset/data/asset/functions/artifact/0101.grimoire/trigger/water.mcfunction

diff --git a/Asset/data/asset/functions/artifact/0101.grimoire/give/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/0101.grimoire/give/1.trigger.mcfunction
new file mode 100644
index 0000000000..f93923ef02
--- /dev/null
+++ b/Asset/data/asset/functions/artifact/0101.grimoire/give/1.trigger.mcfunction
@@ -0,0 +1,7 @@
+#> asset:artifact/0101.grimoire/give/1.trigger
+#
+# 神器の取得処理の呼び出し時に実行されるfunction
+#
+# @within tag/function asset:artifact/give
+
+execute if data storage asset:context {id:101} run function asset:artifact/0101.grimoire/give/2.give
\ No newline at end of file
diff --git a/Asset/data/asset/functions/artifact/0101.grimoire/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0101.grimoire/give/2.give.mcfunction
new file mode 100644
index 0000000000..dac1f8044b
--- /dev/null
+++ b/Asset/data/asset/functions/artifact/0101.grimoire/give/2.give.mcfunction
@@ -0,0 +1,68 @@
+#> asset:artifact/0101.grimoire/give/2.give
+#
+# 神器の作成部 ここでID等を定義する
+#
+# @user
+# @within function asset:artifact/0101.grimoire/give/1.trigger
+
+# 神器の説明や消費MPなどをここで設定する。
+# 最後にasset:artifact/common/giveを実行することで入手可能。
+
+# 神器のID (int) スプレッドシートの値を入れる
+    data modify storage asset:artifact ID set value 101
+# 神器のベースアイテム
+    data modify storage asset:artifact Item set value "minecraft:carrot_on_a_stick"
+# 神器の名前 (TextComponentString)
+    data modify storage asset:artifact Name set value '{"text":"グリモワール","color":"dark_purple"}'
+# 神器の説明文 (TextComponentString[])
+    data modify storage asset:artifact Lore set value ['{"text":"ランダムな属性の魔法を発動する"}']
+# 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション)
+    # data modify storage asset:artifact ConsumeItem.Item set value '{"translate":"item.minecraft.stick"}'
+    # data modify storage asset:artifact ConsumeItem.Count set value 1
+    # data modify storage asset:artifact ConsumeItem.Extra set value 
+# 使用回数 (int) (オプション)
+    # data modify storage asset:artifact RemainingCount set value 
+# 神器を発動できるスロット (string) Wikiを参照
+    data modify storage asset:artifact Slot set value "mainhand"
+# 神器のトリガー (string) Wikiを参照
+    data modify storage asset:artifact Trigger set value "onClick"
+# 神器の発動条件 (TextComponentString) (オプション)
+    # data modify storage asset:artifact Condition set value 
+# 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション)
+    data modify storage asset:artifact AttackInfo.Damage set value [60]
+# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション)
+    data modify storage asset:artifact AttackInfo.AttackType set value [Magic]
+# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション)
+    data modify storage asset:artifact AttackInfo.ElementType set value [Fire,Water,Thunder]
+# 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション)
+    # data modify storage asset:artifact AttackInfo.BypassResist set value 
+# 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション)
+    # data modify storage asset:artifact AttackInfo.IsRangeAttack set value 
+# 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション)
+    data modify storage asset:artifact AttackInfo.AttackRange set value 10
+# MP消費量 (int) 
+    # data modify storage asset:artifact MPCost set value 
+# MP必要量 (int) (オプション)
+    # data modify storage asset:artifact MPRequire set value 20
+# MP回復量 (int) 
+    data modify storage asset:artifact MPHealWhenHit set value 20
+# 神器のクールダウン (int) (オプション)
+    # data modify storage asset:artifact LocalCooldown set value 
+# 種別クールダウン ({Type: string, Duration: int}) (オプション)
+    data modify storage asset:artifact TypeCooldown.Type set value "longRange"
+    data modify storage asset:artifact TypeCooldown.Duration set value 10
+# グローバルクールダウン (int) (オプション)
+    # data modify storage asset:artifact SpecialCooldown set value 
+# クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション)
+    # data modify storage asset:artifact DisableCooldownMessage set value 
+# MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション)
+    # data modify storage asset:artifact DisableMPMessage set value 
+# 破壊時の音を鳴らさないかどうか (boolean) (オプション)
+    # data modify storage asset:artifact DisableBreakSound set value
+# 扱える神 (string[]) Wikiを参照
+    data modify storage asset:artifact CanUsedGod set value "ALL"
+# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション)
+    # data modify storage asset:artifact CustomNBT set value {}
+
+# 神器の入手用function
+    function asset:artifact/common/give
diff --git a/Asset/data/asset/functions/artifact/0101.grimoire/trigger/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/0101.grimoire/trigger/1.trigger.mcfunction
new file mode 100644
index 0000000000..815b320a41
--- /dev/null
+++ b/Asset/data/asset/functions/artifact/0101.grimoire/trigger/1.trigger.mcfunction
@@ -0,0 +1,8 @@
+#> asset:artifact/0101.grimoire/trigger/1.trigger
+#
+# 指定したイベントタイミングで実行されるfunction
+#
+# @within tag/function asset:artifact/**
+
+# storage asset:idのmainhandに装備している神器のIDが入っているので比較し、~/2.check_condition.mcfunctionを実行する
+    execute if data storage asset:context id{mainhand:101} run function asset:artifact/0101.grimoire/trigger/2.check_condition
\ No newline at end of file
diff --git a/Asset/data/asset/functions/artifact/0101.grimoire/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/0101.grimoire/trigger/2.check_condition.mcfunction
new file mode 100644
index 0000000000..9bf5726ac7
--- /dev/null
+++ b/Asset/data/asset/functions/artifact/0101.grimoire/trigger/2.check_condition.mcfunction
@@ -0,0 +1,12 @@
+#> asset:artifact/0101.grimoire/trigger/2.check_condition
+#
+# 神器の発動条件をチェックします
+#
+# @within function asset:artifact/0101.grimoire/trigger/1.trigger
+
+# 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く
+    function asset:artifact/common/check_condition/mainhand
+# 他にアイテム等確認する場合はここに書く
+    
+# CanUsedタグをチェックして3.main.mcfunctionを実行する
+    execute if entity @s[tag=CanUsed] run function asset:artifact/0101.grimoire/trigger/3.main
\ No newline at end of file
diff --git a/Asset/data/asset/functions/artifact/0101.grimoire/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0101.grimoire/trigger/3.main.mcfunction
new file mode 100644
index 0000000000..0f8eeb9cf4
--- /dev/null
+++ b/Asset/data/asset/functions/artifact/0101.grimoire/trigger/3.main.mcfunction
@@ -0,0 +1,17 @@
+#> asset:artifact/0101.grimoire/trigger/3.main
+#
+# 神器のメイン処理部
+#
+# @within function asset:artifact/0101.grimoire/trigger/2.check_condition
+
+# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う
+    function asset:artifact/common/use/mainhand
+
+# ここから先は神器側の効果の処理を書く
+    execute store result storage asset:temp type int 1 run random value 0..2
+
+
+    execute if data storage asset:temp {type:0} at @s anchored eyes run function asset:artifact/0101.grimoire/trigger/balletfire
+    execute if data storage asset:temp {type:1} at @s anchored eyes run function asset:artifact/0101.grimoire/trigger/balletwater
+    execute if data storage asset:temp {type:2} at @s anchored eyes run function asset:artifact/0101.grimoire/trigger/balletthunder
+    data remove storage asset:temp type
diff --git a/Asset/data/asset/functions/artifact/0101.grimoire/trigger/balletfire.mcfunction b/Asset/data/asset/functions/artifact/0101.grimoire/trigger/balletfire.mcfunction
new file mode 100644
index 0000000000..5f7b32306d
--- /dev/null
+++ b/Asset/data/asset/functions/artifact/0101.grimoire/trigger/balletfire.mcfunction
@@ -0,0 +1,12 @@
+#> asset:artifact/0101.grimoire/trigger/balletfire
+#
+# 弾道
+#
+# @within function asset:artifact/0101.grimoire/trigger/3.main
+# @within function asset:artifact/0101.grimoire/trigger/balletfire
+
+    particle minecraft:dust 1 0 0 1
+    execute unless block ~ ~ ~ #lib:no_collision/ run return run function asset:artifact/0101.grimoire/trigger/fire
+    execute unless entity @s[distance=..10] run return run function asset:artifact/0101.grimoire/trigger/fire
+    execute if entity @e[tag=Enemy,distance=..2] run return run function asset:artifact/0101.grimoire/trigger/fire
+    execute positioned ^ ^ ^0.5 run function asset:artifact/0101.grimoire/trigger/balletfire
diff --git a/Asset/data/asset/functions/artifact/0101.grimoire/trigger/balletthunder.mcfunction b/Asset/data/asset/functions/artifact/0101.grimoire/trigger/balletthunder.mcfunction
new file mode 100644
index 0000000000..e1520680a2
--- /dev/null
+++ b/Asset/data/asset/functions/artifact/0101.grimoire/trigger/balletthunder.mcfunction
@@ -0,0 +1,12 @@
+#> asset:artifact/0101.grimoire/trigger/balletthunder
+#
+# 弾道
+#
+# @within function asset:artifact/0101.grimoire/trigger/3.main
+# @within function asset:artifact/0101.grimoire/trigger/balletthunder
+
+    particle minecraft:dust 1 0.902 0 1
+    execute unless block ~ ~ ~ #lib:no_collision/ run return run function asset:artifact/0101.grimoire/trigger/thunder
+    execute unless entity @s[distance=..10] run return run function asset:artifact/0101.grimoire/trigger/thunder
+    execute if entity @e[tag=Enemy,distance=..2] run return run function asset:artifact/0101.grimoire/trigger/thunder
+    execute positioned ^ ^ ^0.5 run function asset:artifact/0101.grimoire/trigger/balletthunder
diff --git a/Asset/data/asset/functions/artifact/0101.grimoire/trigger/balletwater.mcfunction b/Asset/data/asset/functions/artifact/0101.grimoire/trigger/balletwater.mcfunction
new file mode 100644
index 0000000000..308262fdab
--- /dev/null
+++ b/Asset/data/asset/functions/artifact/0101.grimoire/trigger/balletwater.mcfunction
@@ -0,0 +1,12 @@
+#> asset:artifact/0101.grimoire/trigger/balletwater
+#
+# 弾道
+#
+# @within function asset:artifact/0101.grimoire/trigger/3.main
+# @within function asset:artifact/0101.grimoire/trigger/balletwater
+
+    particle minecraft:dust 0.133 0 1 1
+    execute unless block ~ ~ ~ #lib:no_collision/ run return run function asset:artifact/0101.grimoire/trigger/water
+    execute unless entity @s[distance=..10] run return run function asset:artifact/0101.grimoire/trigger/water
+    execute if entity @e[tag=Enemy,distance=..2] run return run function asset:artifact/0101.grimoire/trigger/water
+    execute positioned ^ ^ ^0.5 run function asset:artifact/0101.grimoire/trigger/balletwater
diff --git a/Asset/data/asset/functions/artifact/0101.grimoire/trigger/fire.mcfunction b/Asset/data/asset/functions/artifact/0101.grimoire/trigger/fire.mcfunction
new file mode 100644
index 0000000000..c50bbba71d
--- /dev/null
+++ b/Asset/data/asset/functions/artifact/0101.grimoire/trigger/fire.mcfunction
@@ -0,0 +1,18 @@
+#> asset:artifact/0101.grimoire/trigger/fire
+#
+# 着弾処理
+#
+# @within function asset:artifact/0101.grimoire/trigger/balletfire
+#1840
+    particle minecraft:flame ~ ~1 ~ 0.5 0.5 0.5 0.05 40
+    playsound item.firecharge.use player @a ~ ~ ~
+# 引数の設定
+    data modify storage api: Argument.Damage set value 60f
+    data modify storage api: Argument.AttackType set value "Magic"
+    data modify storage api: Argument.ElementType set value "Fire"
+# 補正functionを実行
+    function api:damage/modifier
+# 範囲5m以内の敵を対象に
+    execute as @e[tag=Enemy,distance=..5] run function api:damage/
+# リセット
+    function api:damage/reset
diff --git a/Asset/data/asset/functions/artifact/0101.grimoire/trigger/thunder.mcfunction b/Asset/data/asset/functions/artifact/0101.grimoire/trigger/thunder.mcfunction
new file mode 100644
index 0000000000..74375f086e
--- /dev/null
+++ b/Asset/data/asset/functions/artifact/0101.grimoire/trigger/thunder.mcfunction
@@ -0,0 +1,20 @@
+#> asset:artifact/0101.grimoire/trigger/thunder
+#
+# 着弾処理
+#
+# @within function asset:artifact/0101.grimoire/trigger/balletthunder
+#演出
+    data modify storage api: Argument.ID set value 2257
+    data modify storage api: Argument.FieldOverride.Scale set value 4f
+    function api:object/summon
+    playsound entity.generic.explode player @a ~ ~ ~
+# 引数の設定
+    data modify storage api: Argument.Damage set value 60f
+    data modify storage api: Argument.AttackType set value "Magic"
+    data modify storage api: Argument.ElementType set value "Thunder"
+# 補正functionを実行
+    function api:damage/modifier
+# 範囲5m以内の敵を対象に
+    execute as @e[tag=Enemy,distance=..5] run function api:damage/
+# リセット
+    function api:damage/reset
diff --git a/Asset/data/asset/functions/artifact/0101.grimoire/trigger/water.mcfunction b/Asset/data/asset/functions/artifact/0101.grimoire/trigger/water.mcfunction
new file mode 100644
index 0000000000..9ffc16a11e
--- /dev/null
+++ b/Asset/data/asset/functions/artifact/0101.grimoire/trigger/water.mcfunction
@@ -0,0 +1,20 @@
+#> asset:artifact/0101.grimoire/trigger/water
+#
+# 着弾処理
+#
+# @within function asset:artifact/0101.grimoire/trigger/balletwater
+#1840
+    data modify storage api: Argument.ID set value 2256
+    data modify storage api: Argument.FieldOverride.Scale set value 4f
+    function api:object/summon
+    playsound entity.player.splash player @a ~ ~ ~
+# 引数の設定
+    data modify storage api: Argument.Damage set value 60f
+    data modify storage api: Argument.AttackType set value "Magic"
+    data modify storage api: Argument.ElementType set value "Water"
+# 補正functionを実行
+    function api:damage/modifier
+# 範囲5m以内の敵を対象に
+    execute as @e[tag=Enemy,distance=..5] run function api:damage/
+# リセット
+    function api:damage/reset
diff --git a/Asset/data/asset/tags/functions/artifact/click.carrot_on_a_stick.json b/Asset/data/asset/tags/functions/artifact/click.carrot_on_a_stick.json
index 40202c9557..01abfe387d 100644
--- a/Asset/data/asset/tags/functions/artifact/click.carrot_on_a_stick.json
+++ b/Asset/data/asset/tags/functions/artifact/click.carrot_on_a_stick.json
@@ -1,5 +1,6 @@
 {
     "values": [
+        "asset:artifact/0101.grimoire/trigger/1.trigger",
         "asset:artifact/1306.will_o_wisp/trigger/1.trigger",
         "asset:artifact/1144.cradle_of_azure_moon/trigger/1.trigger",
         "asset:artifact/0005.musket_matchlock/trigger/1.trigger",
@@ -176,4 +177,4 @@
         "asset:artifact/2001.staff_of_the_willless/trigger/1.trigger",
         "asset:artifact/0019.scripture/trigger/1.trigger"
     ]
-}
+}
\ No newline at end of file
diff --git a/Asset/data/asset/tags/functions/artifact/give.json b/Asset/data/asset/tags/functions/artifact/give.json
index b21c08376a..b9121416fe 100644
--- a/Asset/data/asset/tags/functions/artifact/give.json
+++ b/Asset/data/asset/tags/functions/artifact/give.json
@@ -1,5 +1,6 @@
 {
     "values": [
+        "asset:artifact/0101.grimoire/give/1.trigger",
         "asset:artifact/1314.topaz_broach/give/1.trigger",
         "asset:artifact/1306.will_o_wisp/give/1.trigger",
         "asset:artifact/1308.magnifier_of_detective_girl/give/1.trigger",
@@ -526,4 +527,4 @@
         "asset:artifact/0735.collision_plate/give/1.trigger",
         "asset:artifact/0745.blade_of_whirlwind/give/1.trigger"
     ]
-}
+}
\ No newline at end of file

From c65927c4521a958c2ccdfb8eb33465c2e1bf06bb Mon Sep 17 00:00:00 2001
From: ogachu0331 <taichi.oga331@gmail.com>
Date: Tue, 9 Jun 2026 10:59:34 +0900
Subject: [PATCH 02/10] =?UTF-8?q?=E6=B1=8E=E7=94=A8=E6=BC=94=E5=87=BA?=
 =?UTF-8?q?=E3=81=AE=E9=81=A9=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../functions/artifact/0101.grimoire/give/2.give.mcfunction | 6 +++---
 .../artifact/0101.grimoire/trigger/3.main.mcfunction        | 5 +++--
 .../artifact/0101.grimoire/trigger/balletfire.mcfunction    | 2 +-
 .../artifact/0101.grimoire/trigger/balletthunder.mcfunction | 2 +-
 .../artifact/0101.grimoire/trigger/balletwater.mcfunction   | 2 +-
 .../artifact/0101.grimoire/trigger/fire.mcfunction          | 4 ++--
 .../artifact/0101.grimoire/trigger/thunder.mcfunction       | 4 ++--
 .../artifact/0101.grimoire/trigger/water.mcfunction         | 4 ++--
 8 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/Asset/data/asset/functions/artifact/0101.grimoire/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0101.grimoire/give/2.give.mcfunction
index dac1f8044b..23ff623314 100644
--- a/Asset/data/asset/functions/artifact/0101.grimoire/give/2.give.mcfunction
+++ b/Asset/data/asset/functions/artifact/0101.grimoire/give/2.give.mcfunction
@@ -29,7 +29,7 @@
 # 神器の発動条件 (TextComponentString) (オプション)
     # data modify storage asset:artifact Condition set value 
 # 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション)
-    data modify storage asset:artifact AttackInfo.Damage set value [60]
+    data modify storage asset:artifact AttackInfo.Damage set value [80]
 # 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション)
     data modify storage asset:artifact AttackInfo.AttackType set value [Magic]
 # 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション)
@@ -45,12 +45,12 @@
 # MP必要量 (int) (オプション)
     # data modify storage asset:artifact MPRequire set value 20
 # MP回復量 (int) 
-    data modify storage asset:artifact MPHealWhenHit set value 20
+    data modify storage asset:artifact MPHealWhenHit set value 11
 # 神器のクールダウン (int) (オプション)
     # data modify storage asset:artifact LocalCooldown set value 
 # 種別クールダウン ({Type: string, Duration: int}) (オプション)
     data modify storage asset:artifact TypeCooldown.Type set value "longRange"
-    data modify storage asset:artifact TypeCooldown.Duration set value 10
+    data modify storage asset:artifact TypeCooldown.Duration set value 16
 # グローバルクールダウン (int) (オプション)
     # data modify storage asset:artifact SpecialCooldown set value 
 # クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション)
diff --git a/Asset/data/asset/functions/artifact/0101.grimoire/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0101.grimoire/trigger/3.main.mcfunction
index 0f8eeb9cf4..908095d253 100644
--- a/Asset/data/asset/functions/artifact/0101.grimoire/trigger/3.main.mcfunction
+++ b/Asset/data/asset/functions/artifact/0101.grimoire/trigger/3.main.mcfunction
@@ -8,9 +8,10 @@
     function asset:artifact/common/use/mainhand
 
 # ここから先は神器側の効果の処理を書く
+# 音
+    playsound item.book.page_turn player @s ~ ~ ~
+# 属性抽選
     execute store result storage asset:temp type int 1 run random value 0..2
-
-
     execute if data storage asset:temp {type:0} at @s anchored eyes run function asset:artifact/0101.grimoire/trigger/balletfire
     execute if data storage asset:temp {type:1} at @s anchored eyes run function asset:artifact/0101.grimoire/trigger/balletwater
     execute if data storage asset:temp {type:2} at @s anchored eyes run function asset:artifact/0101.grimoire/trigger/balletthunder
diff --git a/Asset/data/asset/functions/artifact/0101.grimoire/trigger/balletfire.mcfunction b/Asset/data/asset/functions/artifact/0101.grimoire/trigger/balletfire.mcfunction
index 5f7b32306d..96c67fa870 100644
--- a/Asset/data/asset/functions/artifact/0101.grimoire/trigger/balletfire.mcfunction
+++ b/Asset/data/asset/functions/artifact/0101.grimoire/trigger/balletfire.mcfunction
@@ -8,5 +8,5 @@
     particle minecraft:dust 1 0 0 1
     execute unless block ~ ~ ~ #lib:no_collision/ run return run function asset:artifact/0101.grimoire/trigger/fire
     execute unless entity @s[distance=..10] run return run function asset:artifact/0101.grimoire/trigger/fire
-    execute if entity @e[tag=Enemy,distance=..2] run return run function asset:artifact/0101.grimoire/trigger/fire
+    execute at @e[tag=Enemy,distance=..2,sort=nearest,limit=1] run return run function asset:artifact/0101.grimoire/trigger/fire
     execute positioned ^ ^ ^0.5 run function asset:artifact/0101.grimoire/trigger/balletfire
diff --git a/Asset/data/asset/functions/artifact/0101.grimoire/trigger/balletthunder.mcfunction b/Asset/data/asset/functions/artifact/0101.grimoire/trigger/balletthunder.mcfunction
index e1520680a2..bdfca77c06 100644
--- a/Asset/data/asset/functions/artifact/0101.grimoire/trigger/balletthunder.mcfunction
+++ b/Asset/data/asset/functions/artifact/0101.grimoire/trigger/balletthunder.mcfunction
@@ -8,5 +8,5 @@
     particle minecraft:dust 1 0.902 0 1
     execute unless block ~ ~ ~ #lib:no_collision/ run return run function asset:artifact/0101.grimoire/trigger/thunder
     execute unless entity @s[distance=..10] run return run function asset:artifact/0101.grimoire/trigger/thunder
-    execute if entity @e[tag=Enemy,distance=..2] run return run function asset:artifact/0101.grimoire/trigger/thunder
+    execute at @e[tag=Enemy,distance=..2,sort=nearest,limit=1] run return run function asset:artifact/0101.grimoire/trigger/thunder
     execute positioned ^ ^ ^0.5 run function asset:artifact/0101.grimoire/trigger/balletthunder
diff --git a/Asset/data/asset/functions/artifact/0101.grimoire/trigger/balletwater.mcfunction b/Asset/data/asset/functions/artifact/0101.grimoire/trigger/balletwater.mcfunction
index 308262fdab..744675f7ee 100644
--- a/Asset/data/asset/functions/artifact/0101.grimoire/trigger/balletwater.mcfunction
+++ b/Asset/data/asset/functions/artifact/0101.grimoire/trigger/balletwater.mcfunction
@@ -8,5 +8,5 @@
     particle minecraft:dust 0.133 0 1 1
     execute unless block ~ ~ ~ #lib:no_collision/ run return run function asset:artifact/0101.grimoire/trigger/water
     execute unless entity @s[distance=..10] run return run function asset:artifact/0101.grimoire/trigger/water
-    execute if entity @e[tag=Enemy,distance=..2] run return run function asset:artifact/0101.grimoire/trigger/water
+    execute at @e[tag=Enemy,distance=..2,sort=nearest,limit=1] run return run function asset:artifact/0101.grimoire/trigger/water
     execute positioned ^ ^ ^0.5 run function asset:artifact/0101.grimoire/trigger/balletwater
diff --git a/Asset/data/asset/functions/artifact/0101.grimoire/trigger/fire.mcfunction b/Asset/data/asset/functions/artifact/0101.grimoire/trigger/fire.mcfunction
index c50bbba71d..4c4a50b495 100644
--- a/Asset/data/asset/functions/artifact/0101.grimoire/trigger/fire.mcfunction
+++ b/Asset/data/asset/functions/artifact/0101.grimoire/trigger/fire.mcfunction
@@ -7,12 +7,12 @@
     particle minecraft:flame ~ ~1 ~ 0.5 0.5 0.5 0.05 40
     playsound item.firecharge.use player @a ~ ~ ~
 # 引数の設定
-    data modify storage api: Argument.Damage set value 60f
+    data modify storage api: Argument.Damage set value 80f
     data modify storage api: Argument.AttackType set value "Magic"
     data modify storage api: Argument.ElementType set value "Fire"
 # 補正functionを実行
     function api:damage/modifier
 # 範囲5m以内の敵を対象に
-    execute as @e[tag=Enemy,distance=..5] run function api:damage/
+    execute as @e[tag=Enemy,distance=..2] run function api:damage/
 # リセット
     function api:damage/reset
diff --git a/Asset/data/asset/functions/artifact/0101.grimoire/trigger/thunder.mcfunction b/Asset/data/asset/functions/artifact/0101.grimoire/trigger/thunder.mcfunction
index 74375f086e..046d54de94 100644
--- a/Asset/data/asset/functions/artifact/0101.grimoire/trigger/thunder.mcfunction
+++ b/Asset/data/asset/functions/artifact/0101.grimoire/trigger/thunder.mcfunction
@@ -9,12 +9,12 @@
     function api:object/summon
     playsound entity.generic.explode player @a ~ ~ ~
 # 引数の設定
-    data modify storage api: Argument.Damage set value 60f
+    data modify storage api: Argument.Damage set value 80f
     data modify storage api: Argument.AttackType set value "Magic"
     data modify storage api: Argument.ElementType set value "Thunder"
 # 補正functionを実行
     function api:damage/modifier
 # 範囲5m以内の敵を対象に
-    execute as @e[tag=Enemy,distance=..5] run function api:damage/
+    execute as @e[tag=Enemy,distance=..2] run function api:damage/
 # リセット
     function api:damage/reset
diff --git a/Asset/data/asset/functions/artifact/0101.grimoire/trigger/water.mcfunction b/Asset/data/asset/functions/artifact/0101.grimoire/trigger/water.mcfunction
index 9ffc16a11e..7011de0859 100644
--- a/Asset/data/asset/functions/artifact/0101.grimoire/trigger/water.mcfunction
+++ b/Asset/data/asset/functions/artifact/0101.grimoire/trigger/water.mcfunction
@@ -9,12 +9,12 @@
     function api:object/summon
     playsound entity.player.splash player @a ~ ~ ~
 # 引数の設定
-    data modify storage api: Argument.Damage set value 60f
+    data modify storage api: Argument.Damage set value 80f
     data modify storage api: Argument.AttackType set value "Magic"
     data modify storage api: Argument.ElementType set value "Water"
 # 補正functionを実行
     function api:damage/modifier
 # 範囲5m以内の敵を対象に
-    execute as @e[tag=Enemy,distance=..5] run function api:damage/
+    execute as @e[tag=Enemy,distance=..2] run function api:damage/
 # リセット
     function api:damage/reset

From 733e01431bfc33f1d4b92ecad355f35b2d07de70 Mon Sep 17 00:00:00 2001
From: ogachu0331 <taichi.oga331@gmail.com>
Date: Wed, 10 Jun 2026 10:55:36 +0900
Subject: [PATCH 03/10] =?UTF-8?q?=E8=AA=AC=E6=98=8E=E6=96=87=E3=81=AE?=
 =?UTF-8?q?=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../functions/artifact/0101.grimoire/give/2.give.mcfunction   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Asset/data/asset/functions/artifact/0101.grimoire/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0101.grimoire/give/2.give.mcfunction
index 23ff623314..2b26e00c13 100644
--- a/Asset/data/asset/functions/artifact/0101.grimoire/give/2.give.mcfunction
+++ b/Asset/data/asset/functions/artifact/0101.grimoire/give/2.give.mcfunction
@@ -13,9 +13,9 @@
 # 神器のベースアイテム
     data modify storage asset:artifact Item set value "minecraft:carrot_on_a_stick"
 # 神器の名前 (TextComponentString)
-    data modify storage asset:artifact Name set value '{"text":"グリモワール","color":"dark_purple"}'
+    data modify storage asset:artifact Name set value '{"text":"グリモワール","color":"dark_green"}'
 # 神器の説明文 (TextComponentString[])
-    data modify storage asset:artifact Lore set value ['{"text":"ランダムな属性の魔法を発動する"}']
+    data modify storage asset:artifact Lore set value ['{"text":"ランダムな属性の遠距離魔法を召喚する魔術書"}']
 # 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション)
     # data modify storage asset:artifact ConsumeItem.Item set value '{"translate":"item.minecraft.stick"}'
     # data modify storage asset:artifact ConsumeItem.Count set value 1

From 3bd028c21e0bbb273a125c5692d3df89e7b4182d Mon Sep 17 00:00:00 2001
From: ogachu0331 <taichi.oga331@gmail.com>
Date: Wed, 10 Jun 2026 10:58:39 +0900
Subject: [PATCH 04/10] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=8F=AF=E8=83=BD?=
 =?UTF-8?q?=E4=BF=A1=E4=BB=B0=E3=81=AE=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../functions/artifact/0101.grimoire/give/2.give.mcfunction     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Asset/data/asset/functions/artifact/0101.grimoire/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0101.grimoire/give/2.give.mcfunction
index 2b26e00c13..8fa7035432 100644
--- a/Asset/data/asset/functions/artifact/0101.grimoire/give/2.give.mcfunction
+++ b/Asset/data/asset/functions/artifact/0101.grimoire/give/2.give.mcfunction
@@ -60,7 +60,7 @@
 # 破壊時の音を鳴らさないかどうか (boolean) (オプション)
     # data modify storage asset:artifact DisableBreakSound set value
 # 扱える神 (string[]) Wikiを参照
-    data modify storage asset:artifact CanUsedGod set value "ALL"
+    data modify storage asset:artifact CanUsedGod set value ["Flora","Nyaptov","Wi-ki","Rumor"]
 # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション)
     # data modify storage asset:artifact CustomNBT set value {}
 

From afec5372bdb1d43e13e6abdee3063100823917f8 Mon Sep 17 00:00:00 2001
From: ogachu0331 <taichi.oga331@gmail.com>
Date: Mon, 15 Jun 2026 00:53:23 +0900
Subject: [PATCH 05/10] =?UTF-8?q?=E6=8C=87=E6=91=98=E7=82=B9=E3=81=AE?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../0101.grimoire/ballet/fire.mcfunction      | 22 +++++++++++++++++
 .../fire_hit.mcfunction}                      | 11 +++++----
 .../0101.grimoire/ballet/thunder.mcfunction   | 22 +++++++++++++++++
 .../thunder_hit.mcfunction}                   | 13 ++++++----
 .../0101.grimoire/ballet/water.mcfunction     | 22 +++++++++++++++++
 .../water_hit.mcfunction}                     | 15 ++++++++----
 .../0101.grimoire/give/2.give.mcfunction      | 24 +++++++++----------
 .../0101.grimoire/trigger/3.main.mcfunction   |  6 ++---
 .../trigger/balletfire.mcfunction             | 12 ----------
 .../trigger/balletthunder.mcfunction          | 12 ----------
 .../trigger/balletwater.mcfunction            | 12 ----------
 11 files changed, 106 insertions(+), 65 deletions(-)
 create mode 100644 Asset/data/asset/functions/artifact/0101.grimoire/ballet/fire.mcfunction
 rename Asset/data/asset/functions/artifact/0101.grimoire/{trigger/fire.mcfunction => ballet/fire_hit.mcfunction} (66%)
 create mode 100644 Asset/data/asset/functions/artifact/0101.grimoire/ballet/thunder.mcfunction
 rename Asset/data/asset/functions/artifact/0101.grimoire/{trigger/thunder.mcfunction => ballet/thunder_hit.mcfunction} (72%)
 create mode 100644 Asset/data/asset/functions/artifact/0101.grimoire/ballet/water.mcfunction
 rename Asset/data/asset/functions/artifact/0101.grimoire/{trigger/water.mcfunction => ballet/water_hit.mcfunction} (69%)
 delete mode 100644 Asset/data/asset/functions/artifact/0101.grimoire/trigger/balletfire.mcfunction
 delete mode 100644 Asset/data/asset/functions/artifact/0101.grimoire/trigger/balletthunder.mcfunction
 delete mode 100644 Asset/data/asset/functions/artifact/0101.grimoire/trigger/balletwater.mcfunction

diff --git a/Asset/data/asset/functions/artifact/0101.grimoire/ballet/fire.mcfunction b/Asset/data/asset/functions/artifact/0101.grimoire/ballet/fire.mcfunction
new file mode 100644
index 0000000000..869de40e20
--- /dev/null
+++ b/Asset/data/asset/functions/artifact/0101.grimoire/ballet/fire.mcfunction
@@ -0,0 +1,22 @@
+#> asset:artifact/0101.grimoire/ballet/fire
+#
+# 火の弾道
+#
+# @within function
+#   asset:artifact/0101.grimoire/trigger/3.main
+#   asset:artifact/0101.grimoire/ballet/fire
+
+# 弾道
+    particle minecraft:dust 1 0 0 1
+
+# ブロックに当たったら起爆
+    execute unless block ~ ~ ~ #lib:no_collision/ run return run function asset:artifact/0101.grimoire/ballet/fire_hit
+
+# 射程外に出ても起爆
+    execute unless entity @s[distance=..10] run return run function asset:artifact/0101.grimoire/ballet/fire_hit
+
+# 敵に当たってももちろん起爆
+    execute positioned ~-0.5 ~-0.5 ~-0.5 at @e[type=#lib:living_without_player,dx=0] run return run function asset:artifact/0101.grimoire/ballet/fire_hit
+
+# 起爆しないなら再起
+    execute positioned ^ ^ ^0.5 run function asset:artifact/0101.grimoire/ballet/fire
diff --git a/Asset/data/asset/functions/artifact/0101.grimoire/trigger/fire.mcfunction b/Asset/data/asset/functions/artifact/0101.grimoire/ballet/fire_hit.mcfunction
similarity index 66%
rename from Asset/data/asset/functions/artifact/0101.grimoire/trigger/fire.mcfunction
rename to Asset/data/asset/functions/artifact/0101.grimoire/ballet/fire_hit.mcfunction
index 4c4a50b495..5aca828767 100644
--- a/Asset/data/asset/functions/artifact/0101.grimoire/trigger/fire.mcfunction
+++ b/Asset/data/asset/functions/artifact/0101.grimoire/ballet/fire_hit.mcfunction
@@ -1,9 +1,10 @@
-#> asset:artifact/0101.grimoire/trigger/fire
+#> asset:artifact/0101.grimoire/ballet/fire_hit
 #
 # 着弾処理
 #
-# @within function asset:artifact/0101.grimoire/trigger/balletfire
-#1840
+# @within function asset:artifact/0101.grimoire/ballet/fire
+
+# 演出
     particle minecraft:flame ~ ~1 ~ 0.5 0.5 0.5 0.05 40
     playsound item.firecharge.use player @a ~ ~ ~
 # 引数の設定
@@ -12,7 +13,7 @@
     data modify storage api: Argument.ElementType set value "Fire"
 # 補正functionを実行
     function api:damage/modifier
-# 範囲5m以内の敵を対象に
-    execute as @e[tag=Enemy,distance=..2] run function api:damage/
+# ダメージ
+    execute as @e[type=#lib:living_without_player,distance=..2] run function api:damage/
 # リセット
     function api:damage/reset
diff --git a/Asset/data/asset/functions/artifact/0101.grimoire/ballet/thunder.mcfunction b/Asset/data/asset/functions/artifact/0101.grimoire/ballet/thunder.mcfunction
new file mode 100644
index 0000000000..6d44e3a4d6
--- /dev/null
+++ b/Asset/data/asset/functions/artifact/0101.grimoire/ballet/thunder.mcfunction
@@ -0,0 +1,22 @@
+#> asset:artifact/0101.grimoire/ballet/thunder
+#
+# 雷の弾道
+#
+# @within function
+#   asset:artifact/0101.grimoire/trigger/3.main
+#   asset:artifact/0101.grimoire/ballet/thunder
+
+# 弾道
+    particle minecraft:dust 1 0.902 0 1
+
+# ブロックに当たったら起爆
+    execute unless block ~ ~ ~ #lib:no_collision/ run return run function asset:artifact/0101.grimoire/ballet/thunder_hit
+
+# 射程外に出ても起爆
+    execute unless entity @s[distance=..10] run return run function asset:artifact/0101.grimoire/ballet/thunder_hit
+
+# 敵に当たってももちろん起爆
+    execute positioned ~-0.5 ~-0.5 ~-0.5 at @e[type=#lib:living_without_player,dx=0] run return run function asset:artifact/0101.grimoire/ballet/thunder_hit
+
+# 起爆しないなら再起
+    execute positioned ^ ^ ^0.5 run function asset:artifact/0101.grimoire/ballet/thunder
diff --git a/Asset/data/asset/functions/artifact/0101.grimoire/trigger/thunder.mcfunction b/Asset/data/asset/functions/artifact/0101.grimoire/ballet/thunder_hit.mcfunction
similarity index 72%
rename from Asset/data/asset/functions/artifact/0101.grimoire/trigger/thunder.mcfunction
rename to Asset/data/asset/functions/artifact/0101.grimoire/ballet/thunder_hit.mcfunction
index 046d54de94..bb7667ca92 100644
--- a/Asset/data/asset/functions/artifact/0101.grimoire/trigger/thunder.mcfunction
+++ b/Asset/data/asset/functions/artifact/0101.grimoire/ballet/thunder_hit.mcfunction
@@ -1,20 +1,25 @@
-#> asset:artifact/0101.grimoire/trigger/thunder
+#> asset:artifact/0101.grimoire/ballet/thunder_hit
 #
 # 着弾処理
 #
-# @within function asset:artifact/0101.grimoire/trigger/balletthunder
-#演出
+# @within function asset:artifact/0101.grimoire/ballet/thunder
+
+# 演出
     data modify storage api: Argument.ID set value 2257
     data modify storage api: Argument.FieldOverride.Scale set value 4f
     function api:object/summon
     playsound entity.generic.explode player @a ~ ~ ~
+
 # 引数の設定
     data modify storage api: Argument.Damage set value 80f
     data modify storage api: Argument.AttackType set value "Magic"
     data modify storage api: Argument.ElementType set value "Thunder"
+
 # 補正functionを実行
     function api:damage/modifier
+
 # 範囲5m以内の敵を対象に
-    execute as @e[tag=Enemy,distance=..2] run function api:damage/
+    execute as @e[type=#lib:living_without_player,distance=..2] run function api:damage/
 # リセット
+
     function api:damage/reset
diff --git a/Asset/data/asset/functions/artifact/0101.grimoire/ballet/water.mcfunction b/Asset/data/asset/functions/artifact/0101.grimoire/ballet/water.mcfunction
new file mode 100644
index 0000000000..2bde9fa248
--- /dev/null
+++ b/Asset/data/asset/functions/artifact/0101.grimoire/ballet/water.mcfunction
@@ -0,0 +1,22 @@
+#> asset:artifact/0101.grimoire/ballet/water
+#
+# 水の弾道
+#
+# @within function
+#   asset:artifact/0101.grimoire/trigger/3.main
+#   asset:artifact/0101.grimoire/ballet/water
+
+# 弾道
+    particle minecraft:dust 0.133 0 1 1
+
+# ブロックに当たったら起爆
+    execute unless block ~ ~ ~ #lib:no_collision/ run return run function asset:artifact/0101.grimoire/ballet/water_hit
+
+# 射程外に出ても起爆
+    execute unless entity @s[distance=..10] run return run function asset:artifact/0101.grimoire/ballet/water_hit
+
+# 敵に当たってももちろん起爆
+    execute positioned ~-0.5 ~-0.5 ~-0.5 at @e[type=#lib:living_without_player,dx=0] run return run function asset:artifact/0101.grimoire/ballet/water_hit
+
+# 起爆しないなら再起
+    execute positioned ^ ^ ^0.5 run function asset:artifact/0101.grimoire/ballet/water
diff --git a/Asset/data/asset/functions/artifact/0101.grimoire/trigger/water.mcfunction b/Asset/data/asset/functions/artifact/0101.grimoire/ballet/water_hit.mcfunction
similarity index 69%
rename from Asset/data/asset/functions/artifact/0101.grimoire/trigger/water.mcfunction
rename to Asset/data/asset/functions/artifact/0101.grimoire/ballet/water_hit.mcfunction
index 7011de0859..ebf346651d 100644
--- a/Asset/data/asset/functions/artifact/0101.grimoire/trigger/water.mcfunction
+++ b/Asset/data/asset/functions/artifact/0101.grimoire/ballet/water_hit.mcfunction
@@ -1,20 +1,25 @@
-#> asset:artifact/0101.grimoire/trigger/water
+#> asset:artifact/0101.grimoire/ballet/water_hit
 #
 # 着弾処理
 #
-# @within function asset:artifact/0101.grimoire/trigger/balletwater
-#1840
+# @within function asset:artifact/0101.grimoire/ballet/water
+
+# 演出
     data modify storage api: Argument.ID set value 2256
     data modify storage api: Argument.FieldOverride.Scale set value 4f
     function api:object/summon
     playsound entity.player.splash player @a ~ ~ ~
+
 # 引数の設定
     data modify storage api: Argument.Damage set value 80f
     data modify storage api: Argument.AttackType set value "Magic"
     data modify storage api: Argument.ElementType set value "Water"
+
 # 補正functionを実行
     function api:damage/modifier
-# 範囲5m以内の敵を対象に
-    execute as @e[tag=Enemy,distance=..2] run function api:damage/
+
+# 範囲ダメージ
+    execute as @e[type=#lib:living_without_player,distance=..2] run function api:damage/
+
 # リセット
     function api:damage/reset
diff --git a/Asset/data/asset/functions/artifact/0101.grimoire/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0101.grimoire/give/2.give.mcfunction
index 8fa7035432..3e0fc2cc6e 100644
--- a/Asset/data/asset/functions/artifact/0101.grimoire/give/2.give.mcfunction
+++ b/Asset/data/asset/functions/artifact/0101.grimoire/give/2.give.mcfunction
@@ -19,15 +19,15 @@
 # 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション)
     # data modify storage asset:artifact ConsumeItem.Item set value '{"translate":"item.minecraft.stick"}'
     # data modify storage asset:artifact ConsumeItem.Count set value 1
-    # data modify storage asset:artifact ConsumeItem.Extra set value 
+    # data modify storage asset:artifact ConsumeItem.Extra set value
 # 使用回数 (int) (オプション)
-    # data modify storage asset:artifact RemainingCount set value 
+    # data modify storage asset:artifact RemainingCount set value
 # 神器を発動できるスロット (string) Wikiを参照
     data modify storage asset:artifact Slot set value "mainhand"
 # 神器のトリガー (string) Wikiを参照
     data modify storage asset:artifact Trigger set value "onClick"
 # 神器の発動条件 (TextComponentString) (オプション)
-    # data modify storage asset:artifact Condition set value 
+    # data modify storage asset:artifact Condition set value
 # 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション)
     data modify storage asset:artifact AttackInfo.Damage set value [80]
 # 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション)
@@ -35,28 +35,28 @@
 # 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション)
     data modify storage asset:artifact AttackInfo.ElementType set value [Fire,Water,Thunder]
 # 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション)
-    # data modify storage asset:artifact AttackInfo.BypassResist set value 
+    # data modify storage asset:artifact AttackInfo.BypassResist set value
 # 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション)
-    # data modify storage asset:artifact AttackInfo.IsRangeAttack set value 
+    data modify storage asset:artifact AttackInfo.IsRangeAttack set value "every"
 # 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション)
     data modify storage asset:artifact AttackInfo.AttackRange set value 10
-# MP消費量 (int) 
-    # data modify storage asset:artifact MPCost set value 
+# MP消費量 (int)
+    # data modify storage asset:artifact MPCost set value
 # MP必要量 (int) (オプション)
     # data modify storage asset:artifact MPRequire set value 20
-# MP回復量 (int) 
+# MP回復量 (int)
     data modify storage asset:artifact MPHealWhenHit set value 11
 # 神器のクールダウン (int) (オプション)
-    # data modify storage asset:artifact LocalCooldown set value 
+    # data modify storage asset:artifact LocalCooldown set value
 # 種別クールダウン ({Type: string, Duration: int}) (オプション)
     data modify storage asset:artifact TypeCooldown.Type set value "longRange"
     data modify storage asset:artifact TypeCooldown.Duration set value 16
 # グローバルクールダウン (int) (オプション)
-    # data modify storage asset:artifact SpecialCooldown set value 
+    # data modify storage asset:artifact SpecialCooldown set value
 # クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション)
-    # data modify storage asset:artifact DisableCooldownMessage set value 
+    # data modify storage asset:artifact DisableCooldownMessage set value
 # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション)
-    # data modify storage asset:artifact DisableMPMessage set value 
+    # data modify storage asset:artifact DisableMPMessage set value
 # 破壊時の音を鳴らさないかどうか (boolean) (オプション)
     # data modify storage asset:artifact DisableBreakSound set value
 # 扱える神 (string[]) Wikiを参照
diff --git a/Asset/data/asset/functions/artifact/0101.grimoire/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0101.grimoire/trigger/3.main.mcfunction
index 908095d253..e4c807d4ae 100644
--- a/Asset/data/asset/functions/artifact/0101.grimoire/trigger/3.main.mcfunction
+++ b/Asset/data/asset/functions/artifact/0101.grimoire/trigger/3.main.mcfunction
@@ -12,7 +12,7 @@
     playsound item.book.page_turn player @s ~ ~ ~
 # 属性抽選
     execute store result storage asset:temp type int 1 run random value 0..2
-    execute if data storage asset:temp {type:0} at @s anchored eyes run function asset:artifact/0101.grimoire/trigger/balletfire
-    execute if data storage asset:temp {type:1} at @s anchored eyes run function asset:artifact/0101.grimoire/trigger/balletwater
-    execute if data storage asset:temp {type:2} at @s anchored eyes run function asset:artifact/0101.grimoire/trigger/balletthunder
+    execute if data storage asset:temp {type:0} at @s anchored eyes run function asset:artifact/0101.grimoire/ballet/fire
+    execute if data storage asset:temp {type:1} at @s anchored eyes run function asset:artifact/0101.grimoire/ballet/water
+    execute if data storage asset:temp {type:2} at @s anchored eyes run function asset:artifact/0101.grimoire/ballet/thunder
     data remove storage asset:temp type
diff --git a/Asset/data/asset/functions/artifact/0101.grimoire/trigger/balletfire.mcfunction b/Asset/data/asset/functions/artifact/0101.grimoire/trigger/balletfire.mcfunction
deleted file mode 100644
index 96c67fa870..0000000000
--- a/Asset/data/asset/functions/artifact/0101.grimoire/trigger/balletfire.mcfunction
+++ /dev/null
@@ -1,12 +0,0 @@
-#> asset:artifact/0101.grimoire/trigger/balletfire
-#
-# 弾道
-#
-# @within function asset:artifact/0101.grimoire/trigger/3.main
-# @within function asset:artifact/0101.grimoire/trigger/balletfire
-
-    particle minecraft:dust 1 0 0 1
-    execute unless block ~ ~ ~ #lib:no_collision/ run return run function asset:artifact/0101.grimoire/trigger/fire
-    execute unless entity @s[distance=..10] run return run function asset:artifact/0101.grimoire/trigger/fire
-    execute at @e[tag=Enemy,distance=..2,sort=nearest,limit=1] run return run function asset:artifact/0101.grimoire/trigger/fire
-    execute positioned ^ ^ ^0.5 run function asset:artifact/0101.grimoire/trigger/balletfire
diff --git a/Asset/data/asset/functions/artifact/0101.grimoire/trigger/balletthunder.mcfunction b/Asset/data/asset/functions/artifact/0101.grimoire/trigger/balletthunder.mcfunction
deleted file mode 100644
index bdfca77c06..0000000000
--- a/Asset/data/asset/functions/artifact/0101.grimoire/trigger/balletthunder.mcfunction
+++ /dev/null
@@ -1,12 +0,0 @@
-#> asset:artifact/0101.grimoire/trigger/balletthunder
-#
-# 弾道
-#
-# @within function asset:artifact/0101.grimoire/trigger/3.main
-# @within function asset:artifact/0101.grimoire/trigger/balletthunder
-
-    particle minecraft:dust 1 0.902 0 1
-    execute unless block ~ ~ ~ #lib:no_collision/ run return run function asset:artifact/0101.grimoire/trigger/thunder
-    execute unless entity @s[distance=..10] run return run function asset:artifact/0101.grimoire/trigger/thunder
-    execute at @e[tag=Enemy,distance=..2,sort=nearest,limit=1] run return run function asset:artifact/0101.grimoire/trigger/thunder
-    execute positioned ^ ^ ^0.5 run function asset:artifact/0101.grimoire/trigger/balletthunder
diff --git a/Asset/data/asset/functions/artifact/0101.grimoire/trigger/balletwater.mcfunction b/Asset/data/asset/functions/artifact/0101.grimoire/trigger/balletwater.mcfunction
deleted file mode 100644
index 744675f7ee..0000000000
--- a/Asset/data/asset/functions/artifact/0101.grimoire/trigger/balletwater.mcfunction
+++ /dev/null
@@ -1,12 +0,0 @@
-#> asset:artifact/0101.grimoire/trigger/balletwater
-#
-# 弾道
-#
-# @within function asset:artifact/0101.grimoire/trigger/3.main
-# @within function asset:artifact/0101.grimoire/trigger/balletwater
-
-    particle minecraft:dust 0.133 0 1 1
-    execute unless block ~ ~ ~ #lib:no_collision/ run return run function asset:artifact/0101.grimoire/trigger/water
-    execute unless entity @s[distance=..10] run return run function asset:artifact/0101.grimoire/trigger/water
-    execute at @e[tag=Enemy,distance=..2,sort=nearest,limit=1] run return run function asset:artifact/0101.grimoire/trigger/water
-    execute positioned ^ ^ ^0.5 run function asset:artifact/0101.grimoire/trigger/balletwater

From 04ed1716d607fe1878fadf27f3abe2ab4ce288a5 Mon Sep 17 00:00:00 2001
From: ogachu0331 <taichi.oga331@gmail.com>
Date: Mon, 15 Jun 2026 00:55:50 +0900
Subject: [PATCH 06/10] =?UTF-8?q?=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88?=
 =?UTF-8?q?=E3=82=A2=E3=82=A6=E3=83=88=E3=81=AE=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../functions/artifact/0101.grimoire/ballet/fire_hit.mcfunction | 2 +-
 .../artifact/0101.grimoire/ballet/thunder_hit.mcfunction        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Asset/data/asset/functions/artifact/0101.grimoire/ballet/fire_hit.mcfunction b/Asset/data/asset/functions/artifact/0101.grimoire/ballet/fire_hit.mcfunction
index 5aca828767..18d77ff9d4 100644
--- a/Asset/data/asset/functions/artifact/0101.grimoire/ballet/fire_hit.mcfunction
+++ b/Asset/data/asset/functions/artifact/0101.grimoire/ballet/fire_hit.mcfunction
@@ -13,7 +13,7 @@
     data modify storage api: Argument.ElementType set value "Fire"
 # 補正functionを実行
     function api:damage/modifier
-# ダメージ
+# 範囲ダメージ
     execute as @e[type=#lib:living_without_player,distance=..2] run function api:damage/
 # リセット
     function api:damage/reset
diff --git a/Asset/data/asset/functions/artifact/0101.grimoire/ballet/thunder_hit.mcfunction b/Asset/data/asset/functions/artifact/0101.grimoire/ballet/thunder_hit.mcfunction
index bb7667ca92..c158603307 100644
--- a/Asset/data/asset/functions/artifact/0101.grimoire/ballet/thunder_hit.mcfunction
+++ b/Asset/data/asset/functions/artifact/0101.grimoire/ballet/thunder_hit.mcfunction
@@ -18,7 +18,7 @@
 # 補正functionを実行
     function api:damage/modifier
 
-# 範囲5m以内の敵を対象に
+# 範囲ダメージ
     execute as @e[type=#lib:living_without_player,distance=..2] run function api:damage/
 # リセット
 

From 9d3d1e0945b769a27f0a017d32af93a8288dcab4 Mon Sep 17 00:00:00 2001
From: ogachu0331 <taichi.oga331@gmail.com>
Date: Mon, 15 Jun 2026 12:52:27 +0900
Subject: [PATCH 07/10] =?UTF-8?q?=E6=8C=87=E6=91=98=E7=82=B9=E3=81=AE?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../0101.grimoire/ballet/fire.mcfunction      | 22 -------------------
 .../0101.grimoire/ballet/thunder.mcfunction   | 22 -------------------
 .../0101.grimoire/ballet/water.mcfunction     | 22 -------------------
 .../0101.grimoire/trigger/3.main.mcfunction   |  8 +++----
 .../trigger/ballet/fire.mcfunction            | 22 +++++++++++++++++++
 .../{ => trigger}/ballet/fire_hit.mcfunction  |  4 ++--
 .../trigger/ballet/thunder.mcfunction         | 22 +++++++++++++++++++
 .../ballet/thunder_hit.mcfunction             |  4 ++--
 .../trigger/ballet/water.mcfunction           | 22 +++++++++++++++++++
 .../{ => trigger}/ballet/water_hit.mcfunction |  4 ++--
 10 files changed, 76 insertions(+), 76 deletions(-)
 delete mode 100644 Asset/data/asset/functions/artifact/0101.grimoire/ballet/fire.mcfunction
 delete mode 100644 Asset/data/asset/functions/artifact/0101.grimoire/ballet/thunder.mcfunction
 delete mode 100644 Asset/data/asset/functions/artifact/0101.grimoire/ballet/water.mcfunction
 create mode 100644 Asset/data/asset/functions/artifact/0101.grimoire/trigger/ballet/fire.mcfunction
 rename Asset/data/asset/functions/artifact/0101.grimoire/{ => trigger}/ballet/fire_hit.mcfunction (81%)
 create mode 100644 Asset/data/asset/functions/artifact/0101.grimoire/trigger/ballet/thunder.mcfunction
 rename Asset/data/asset/functions/artifact/0101.grimoire/{ => trigger}/ballet/thunder_hit.mcfunction (83%)
 create mode 100644 Asset/data/asset/functions/artifact/0101.grimoire/trigger/ballet/water.mcfunction
 rename Asset/data/asset/functions/artifact/0101.grimoire/{ => trigger}/ballet/water_hit.mcfunction (84%)

diff --git a/Asset/data/asset/functions/artifact/0101.grimoire/ballet/fire.mcfunction b/Asset/data/asset/functions/artifact/0101.grimoire/ballet/fire.mcfunction
deleted file mode 100644
index 869de40e20..0000000000
--- a/Asset/data/asset/functions/artifact/0101.grimoire/ballet/fire.mcfunction
+++ /dev/null
@@ -1,22 +0,0 @@
-#> asset:artifact/0101.grimoire/ballet/fire
-#
-# 火の弾道
-#
-# @within function
-#   asset:artifact/0101.grimoire/trigger/3.main
-#   asset:artifact/0101.grimoire/ballet/fire
-
-# 弾道
-    particle minecraft:dust 1 0 0 1
-
-# ブロックに当たったら起爆
-    execute unless block ~ ~ ~ #lib:no_collision/ run return run function asset:artifact/0101.grimoire/ballet/fire_hit
-
-# 射程外に出ても起爆
-    execute unless entity @s[distance=..10] run return run function asset:artifact/0101.grimoire/ballet/fire_hit
-
-# 敵に当たってももちろん起爆
-    execute positioned ~-0.5 ~-0.5 ~-0.5 at @e[type=#lib:living_without_player,dx=0] run return run function asset:artifact/0101.grimoire/ballet/fire_hit
-
-# 起爆しないなら再起
-    execute positioned ^ ^ ^0.5 run function asset:artifact/0101.grimoire/ballet/fire
diff --git a/Asset/data/asset/functions/artifact/0101.grimoire/ballet/thunder.mcfunction b/Asset/data/asset/functions/artifact/0101.grimoire/ballet/thunder.mcfunction
deleted file mode 100644
index 6d44e3a4d6..0000000000
--- a/Asset/data/asset/functions/artifact/0101.grimoire/ballet/thunder.mcfunction
+++ /dev/null
@@ -1,22 +0,0 @@
-#> asset:artifact/0101.grimoire/ballet/thunder
-#
-# 雷の弾道
-#
-# @within function
-#   asset:artifact/0101.grimoire/trigger/3.main
-#   asset:artifact/0101.grimoire/ballet/thunder
-
-# 弾道
-    particle minecraft:dust 1 0.902 0 1
-
-# ブロックに当たったら起爆
-    execute unless block ~ ~ ~ #lib:no_collision/ run return run function asset:artifact/0101.grimoire/ballet/thunder_hit
-
-# 射程外に出ても起爆
-    execute unless entity @s[distance=..10] run return run function asset:artifact/0101.grimoire/ballet/thunder_hit
-
-# 敵に当たってももちろん起爆
-    execute positioned ~-0.5 ~-0.5 ~-0.5 at @e[type=#lib:living_without_player,dx=0] run return run function asset:artifact/0101.grimoire/ballet/thunder_hit
-
-# 起爆しないなら再起
-    execute positioned ^ ^ ^0.5 run function asset:artifact/0101.grimoire/ballet/thunder
diff --git a/Asset/data/asset/functions/artifact/0101.grimoire/ballet/water.mcfunction b/Asset/data/asset/functions/artifact/0101.grimoire/ballet/water.mcfunction
deleted file mode 100644
index 2bde9fa248..0000000000
--- a/Asset/data/asset/functions/artifact/0101.grimoire/ballet/water.mcfunction
+++ /dev/null
@@ -1,22 +0,0 @@
-#> asset:artifact/0101.grimoire/ballet/water
-#
-# 水の弾道
-#
-# @within function
-#   asset:artifact/0101.grimoire/trigger/3.main
-#   asset:artifact/0101.grimoire/ballet/water
-
-# 弾道
-    particle minecraft:dust 0.133 0 1 1
-
-# ブロックに当たったら起爆
-    execute unless block ~ ~ ~ #lib:no_collision/ run return run function asset:artifact/0101.grimoire/ballet/water_hit
-
-# 射程外に出ても起爆
-    execute unless entity @s[distance=..10] run return run function asset:artifact/0101.grimoire/ballet/water_hit
-
-# 敵に当たってももちろん起爆
-    execute positioned ~-0.5 ~-0.5 ~-0.5 at @e[type=#lib:living_without_player,dx=0] run return run function asset:artifact/0101.grimoire/ballet/water_hit
-
-# 起爆しないなら再起
-    execute positioned ^ ^ ^0.5 run function asset:artifact/0101.grimoire/ballet/water
diff --git a/Asset/data/asset/functions/artifact/0101.grimoire/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0101.grimoire/trigger/3.main.mcfunction
index e4c807d4ae..da76a46e83 100644
--- a/Asset/data/asset/functions/artifact/0101.grimoire/trigger/3.main.mcfunction
+++ b/Asset/data/asset/functions/artifact/0101.grimoire/trigger/3.main.mcfunction
@@ -9,10 +9,10 @@
 
 # ここから先は神器側の効果の処理を書く
 # 音
-    playsound item.book.page_turn player @s ~ ~ ~
+    playsound item.book.page_turn player @a ~ ~ ~
 # 属性抽選
     execute store result storage asset:temp type int 1 run random value 0..2
-    execute if data storage asset:temp {type:0} at @s anchored eyes run function asset:artifact/0101.grimoire/ballet/fire
-    execute if data storage asset:temp {type:1} at @s anchored eyes run function asset:artifact/0101.grimoire/ballet/water
-    execute if data storage asset:temp {type:2} at @s anchored eyes run function asset:artifact/0101.grimoire/ballet/thunder
+    execute if data storage asset:temp {type:0} anchored eyes run function asset:artifact/0101.grimoire/trigger/ballet/fire
+    execute if data storage asset:temp {type:1} anchored eyes run function asset:artifact/0101.grimoire/trigger/ballet/water
+    execute if data storage asset:temp {type:2} anchored eyes run function asset:artifact/0101.grimoire/trigger/ballet/thunder
     data remove storage asset:temp type
diff --git a/Asset/data/asset/functions/artifact/0101.grimoire/trigger/ballet/fire.mcfunction b/Asset/data/asset/functions/artifact/0101.grimoire/trigger/ballet/fire.mcfunction
new file mode 100644
index 0000000000..b3efc11fa8
--- /dev/null
+++ b/Asset/data/asset/functions/artifact/0101.grimoire/trigger/ballet/fire.mcfunction
@@ -0,0 +1,22 @@
+#> asset:artifact/0101.grimoire/trigger/ballet/fire
+#
+# 火の弾道
+#
+# @within function
+#   asset:artifact/0101.grimoire/trigger/3.main
+#   asset:artifact/0101.grimoire/trigger/ballet/fire
+
+# 弾道
+    particle minecraft:dust 1 0 0 1
+
+# ブロックに当たったら起爆
+    execute unless block ~ ~ ~ #lib:no_collision/ run return run function asset:artifact/0101.grimoire/trigger/ballet/fire_hit
+
+# 射程外に出ても起爆
+    execute unless entity @s[distance=..10] run return run function asset:artifact/0101.grimoire/trigger/ballet/fire_hit
+
+# 敵に当たってももちろん起爆
+    execute positioned ~-0.5 ~-0.5 ~-0.5 @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0] positioned ~0.5 ~0.5 ~0,5 run return run function asset:artifact/0101.grimoire/trigger/ballet/fire_hit
+
+# 起爆しないなら再起
+    execute positioned ^ ^ ^0.5 run function asset:artifact/0101.grimoire/trigger/ballet/fire
diff --git a/Asset/data/asset/functions/artifact/0101.grimoire/ballet/fire_hit.mcfunction b/Asset/data/asset/functions/artifact/0101.grimoire/trigger/ballet/fire_hit.mcfunction
similarity index 81%
rename from Asset/data/asset/functions/artifact/0101.grimoire/ballet/fire_hit.mcfunction
rename to Asset/data/asset/functions/artifact/0101.grimoire/trigger/ballet/fire_hit.mcfunction
index 18d77ff9d4..6d91598e74 100644
--- a/Asset/data/asset/functions/artifact/0101.grimoire/ballet/fire_hit.mcfunction
+++ b/Asset/data/asset/functions/artifact/0101.grimoire/trigger/ballet/fire_hit.mcfunction
@@ -1,8 +1,8 @@
-#> asset:artifact/0101.grimoire/ballet/fire_hit
+#> asset:artifact/0101.grimoire/trigger/ballet/fire_hit
 #
 # 着弾処理
 #
-# @within function asset:artifact/0101.grimoire/ballet/fire
+# @within function asset:artifact/0101.grimoire/trigger/ballet/fire
 
 # 演出
     particle minecraft:flame ~ ~1 ~ 0.5 0.5 0.5 0.05 40
diff --git a/Asset/data/asset/functions/artifact/0101.grimoire/trigger/ballet/thunder.mcfunction b/Asset/data/asset/functions/artifact/0101.grimoire/trigger/ballet/thunder.mcfunction
new file mode 100644
index 0000000000..43247e6095
--- /dev/null
+++ b/Asset/data/asset/functions/artifact/0101.grimoire/trigger/ballet/thunder.mcfunction
@@ -0,0 +1,22 @@
+#> asset:artifact/0101.grimoire/trigger/ballet/thunder
+#
+# 雷の弾道
+#
+# @within function
+#   asset:artifact/0101.grimoire/trigger/3.main
+#   asset:artifact/0101.grimoire/trigger/ballet/thunder
+
+# 弾道
+    particle minecraft:dust 1 0.902 0 1
+
+# ブロックに当たったら起爆
+    execute unless block ~ ~ ~ #lib:no_collision/ run return run function asset:artifact/0101.grimoire/trigger/ballet/thunder_hit
+
+# 射程外に出ても起爆
+    execute unless entity @s[distance=..10] run return run function asset:artifact/0101.grimoire/trigger/ballet/thunder_hit
+
+# 敵に当たってももちろん起爆
+    execute positioned ~-0.5 ~-0.5 ~-0.5 @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0] positioned ~0.5 ~0.5 ~0,5 run return run function asset:artifact/0101.grimoire/trigger/ballet/thunder_hit
+
+# 起爆しないなら再起
+    execute positioned ^ ^ ^0.5 run function asset:artifact/0101.grimoire/trigger/ballet/thunder
diff --git a/Asset/data/asset/functions/artifact/0101.grimoire/ballet/thunder_hit.mcfunction b/Asset/data/asset/functions/artifact/0101.grimoire/trigger/ballet/thunder_hit.mcfunction
similarity index 83%
rename from Asset/data/asset/functions/artifact/0101.grimoire/ballet/thunder_hit.mcfunction
rename to Asset/data/asset/functions/artifact/0101.grimoire/trigger/ballet/thunder_hit.mcfunction
index c158603307..9a1941de84 100644
--- a/Asset/data/asset/functions/artifact/0101.grimoire/ballet/thunder_hit.mcfunction
+++ b/Asset/data/asset/functions/artifact/0101.grimoire/trigger/ballet/thunder_hit.mcfunction
@@ -1,8 +1,8 @@
-#> asset:artifact/0101.grimoire/ballet/thunder_hit
+#> asset:artifact/0101.grimoire/trigger/ballet/thunder_hit
 #
 # 着弾処理
 #
-# @within function asset:artifact/0101.grimoire/ballet/thunder
+# @within function asset:artifact/0101.grimoire/trigger/ballet/thunder
 
 # 演出
     data modify storage api: Argument.ID set value 2257
diff --git a/Asset/data/asset/functions/artifact/0101.grimoire/trigger/ballet/water.mcfunction b/Asset/data/asset/functions/artifact/0101.grimoire/trigger/ballet/water.mcfunction
new file mode 100644
index 0000000000..6d7297f240
--- /dev/null
+++ b/Asset/data/asset/functions/artifact/0101.grimoire/trigger/ballet/water.mcfunction
@@ -0,0 +1,22 @@
+#> asset:artifact/0101.grimoire/trigger/ballet/water
+#
+# 水の弾道
+#
+# @within function
+#   asset:artifact/0101.grimoire/trigger/3.main
+#   asset:artifact/0101.grimoire/trigger/ballet/water
+
+# 弾道
+    particle minecraft:dust 0.133 0 1 1
+
+# ブロックに当たったら起爆
+    execute unless block ~ ~ ~ #lib:no_collision/ run return run function asset:artifact/0101.grimoire/trigger/ballet/water_hit
+
+# 射程外に出ても起爆
+    execute unless entity @s[distance=..10] run return run function asset:artifact/0101.grimoire/trigger/ballet/water_hit
+
+# 敵に当たってももちろん起爆
+    execute positioned ~-0.5 ~-0.5 ~-0.5 @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0] positioned ~0.5 ~0.5 ~0,5 run return run function asset:artifact/0101.grimoire/trigger/ballet/water_hit
+
+# 起爆しないなら再起
+    execute positioned ^ ^ ^0.5 run function asset:artifact/0101.grimoire/trigger/ballet/water
diff --git a/Asset/data/asset/functions/artifact/0101.grimoire/ballet/water_hit.mcfunction b/Asset/data/asset/functions/artifact/0101.grimoire/trigger/ballet/water_hit.mcfunction
similarity index 84%
rename from Asset/data/asset/functions/artifact/0101.grimoire/ballet/water_hit.mcfunction
rename to Asset/data/asset/functions/artifact/0101.grimoire/trigger/ballet/water_hit.mcfunction
index ebf346651d..1afc859aa0 100644
--- a/Asset/data/asset/functions/artifact/0101.grimoire/ballet/water_hit.mcfunction
+++ b/Asset/data/asset/functions/artifact/0101.grimoire/trigger/ballet/water_hit.mcfunction
@@ -1,8 +1,8 @@
-#> asset:artifact/0101.grimoire/ballet/water_hit
+#> asset:artifact/0101.grimoire/trigger/ballet/water_hit
 #
 # 着弾処理
 #
-# @within function asset:artifact/0101.grimoire/ballet/water
+# @within function asset:artifact/0101.grimoire/trigger/ballet/water
 
 # 演出
     data modify storage api: Argument.ID set value 2256

From 259e0abdebbac153b6b64c1c65c2cbf0081a5d8d Mon Sep 17 00:00:00 2001
From: ogachu0331 <taichi.oga331@gmail.com>
Date: Mon, 15 Jun 2026 13:41:41 +0900
Subject: [PATCH 08/10] =?UTF-8?q?=E8=A8=98=E8=BF=B0=E3=83=9F=E3=82=B9?=
 =?UTF-8?q?=E3=81=AE=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../artifact/0101.grimoire/trigger/ballet/fire.mcfunction       | 2 +-
 .../artifact/0101.grimoire/trigger/ballet/thunder.mcfunction    | 2 +-
 .../artifact/0101.grimoire/trigger/ballet/water.mcfunction      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Asset/data/asset/functions/artifact/0101.grimoire/trigger/ballet/fire.mcfunction b/Asset/data/asset/functions/artifact/0101.grimoire/trigger/ballet/fire.mcfunction
index b3efc11fa8..efc484ba38 100644
--- a/Asset/data/asset/functions/artifact/0101.grimoire/trigger/ballet/fire.mcfunction
+++ b/Asset/data/asset/functions/artifact/0101.grimoire/trigger/ballet/fire.mcfunction
@@ -16,7 +16,7 @@
     execute unless entity @s[distance=..10] run return run function asset:artifact/0101.grimoire/trigger/ballet/fire_hit
 
 # 敵に当たってももちろん起爆
-    execute positioned ~-0.5 ~-0.5 ~-0.5 @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0] positioned ~0.5 ~0.5 ~0,5 run return run function asset:artifact/0101.grimoire/trigger/ballet/fire_hit
+    execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0] positioned ~0.5 ~0.5 ~0,5 run return run function asset:artifact/0101.grimoire/trigger/ballet/fire_hit
 
 # 起爆しないなら再起
     execute positioned ^ ^ ^0.5 run function asset:artifact/0101.grimoire/trigger/ballet/fire
diff --git a/Asset/data/asset/functions/artifact/0101.grimoire/trigger/ballet/thunder.mcfunction b/Asset/data/asset/functions/artifact/0101.grimoire/trigger/ballet/thunder.mcfunction
index 43247e6095..7fde99462a 100644
--- a/Asset/data/asset/functions/artifact/0101.grimoire/trigger/ballet/thunder.mcfunction
+++ b/Asset/data/asset/functions/artifact/0101.grimoire/trigger/ballet/thunder.mcfunction
@@ -16,7 +16,7 @@
     execute unless entity @s[distance=..10] run return run function asset:artifact/0101.grimoire/trigger/ballet/thunder_hit
 
 # 敵に当たってももちろん起爆
-    execute positioned ~-0.5 ~-0.5 ~-0.5 @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0] positioned ~0.5 ~0.5 ~0,5 run return run function asset:artifact/0101.grimoire/trigger/ballet/thunder_hit
+    execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0] positioned ~0.5 ~0.5 ~0,5 run return run function asset:artifact/0101.grimoire/trigger/ballet/thunder_hit
 
 # 起爆しないなら再起
     execute positioned ^ ^ ^0.5 run function asset:artifact/0101.grimoire/trigger/ballet/thunder
diff --git a/Asset/data/asset/functions/artifact/0101.grimoire/trigger/ballet/water.mcfunction b/Asset/data/asset/functions/artifact/0101.grimoire/trigger/ballet/water.mcfunction
index 6d7297f240..a7db231bb3 100644
--- a/Asset/data/asset/functions/artifact/0101.grimoire/trigger/ballet/water.mcfunction
+++ b/Asset/data/asset/functions/artifact/0101.grimoire/trigger/ballet/water.mcfunction
@@ -16,7 +16,7 @@
     execute unless entity @s[distance=..10] run return run function asset:artifact/0101.grimoire/trigger/ballet/water_hit
 
 # 敵に当たってももちろん起爆
-    execute positioned ~-0.5 ~-0.5 ~-0.5 @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0] positioned ~0.5 ~0.5 ~0,5 run return run function asset:artifact/0101.grimoire/trigger/ballet/water_hit
+    execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0] positioned ~0.5 ~0.5 ~0,5 run return run function asset:artifact/0101.grimoire/trigger/ballet/water_hit
 
 # 起爆しないなら再起
     execute positioned ^ ^ ^0.5 run function asset:artifact/0101.grimoire/trigger/ballet/water

From 2e30426aff66d862f83be543dcd7c64e93059153 Mon Sep 17 00:00:00 2001
From: ogachu0331 <taichi.oga331@gmail.com>
Date: Mon, 15 Jun 2026 14:02:20 +0900
Subject: [PATCH 09/10] =?UTF-8?q?=E6=A7=8B=E6=96=87=E3=82=A8=E3=83=A9?=
 =?UTF-8?q?=E3=83=BC=E3=81=AE=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../artifact/0101.grimoire/trigger/ballet/fire.mcfunction       | 2 +-
 .../artifact/0101.grimoire/trigger/ballet/thunder.mcfunction    | 2 +-
 .../artifact/0101.grimoire/trigger/ballet/water.mcfunction      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Asset/data/asset/functions/artifact/0101.grimoire/trigger/ballet/fire.mcfunction b/Asset/data/asset/functions/artifact/0101.grimoire/trigger/ballet/fire.mcfunction
index efc484ba38..cefa451652 100644
--- a/Asset/data/asset/functions/artifact/0101.grimoire/trigger/ballet/fire.mcfunction
+++ b/Asset/data/asset/functions/artifact/0101.grimoire/trigger/ballet/fire.mcfunction
@@ -16,7 +16,7 @@
     execute unless entity @s[distance=..10] run return run function asset:artifact/0101.grimoire/trigger/ballet/fire_hit
 
 # 敵に当たってももちろん起爆
-    execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0] positioned ~0.5 ~0.5 ~0,5 run return run function asset:artifact/0101.grimoire/trigger/ballet/fire_hit
+    execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0] positioned ~0.5 ~0.5 ~0.5 run return run function asset:artifact/0101.grimoire/trigger/ballet/fire_hit
 
 # 起爆しないなら再起
     execute positioned ^ ^ ^0.5 run function asset:artifact/0101.grimoire/trigger/ballet/fire
diff --git a/Asset/data/asset/functions/artifact/0101.grimoire/trigger/ballet/thunder.mcfunction b/Asset/data/asset/functions/artifact/0101.grimoire/trigger/ballet/thunder.mcfunction
index 7fde99462a..58eea093f7 100644
--- a/Asset/data/asset/functions/artifact/0101.grimoire/trigger/ballet/thunder.mcfunction
+++ b/Asset/data/asset/functions/artifact/0101.grimoire/trigger/ballet/thunder.mcfunction
@@ -16,7 +16,7 @@
     execute unless entity @s[distance=..10] run return run function asset:artifact/0101.grimoire/trigger/ballet/thunder_hit
 
 # 敵に当たってももちろん起爆
-    execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0] positioned ~0.5 ~0.5 ~0,5 run return run function asset:artifact/0101.grimoire/trigger/ballet/thunder_hit
+    execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0] positioned ~0.5 ~0.5 ~0.5 run return run function asset:artifact/0101.grimoire/trigger/ballet/thunder_hit
 
 # 起爆しないなら再起
     execute positioned ^ ^ ^0.5 run function asset:artifact/0101.grimoire/trigger/ballet/thunder
diff --git a/Asset/data/asset/functions/artifact/0101.grimoire/trigger/ballet/water.mcfunction b/Asset/data/asset/functions/artifact/0101.grimoire/trigger/ballet/water.mcfunction
index a7db231bb3..538392ad2f 100644
--- a/Asset/data/asset/functions/artifact/0101.grimoire/trigger/ballet/water.mcfunction
+++ b/Asset/data/asset/functions/artifact/0101.grimoire/trigger/ballet/water.mcfunction
@@ -16,7 +16,7 @@
     execute unless entity @s[distance=..10] run return run function asset:artifact/0101.grimoire/trigger/ballet/water_hit
 
 # 敵に当たってももちろん起爆
-    execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0] positioned ~0.5 ~0.5 ~0,5 run return run function asset:artifact/0101.grimoire/trigger/ballet/water_hit
+    execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0] positioned ~0.5 ~0.5 ~0.5 run return run function asset:artifact/0101.grimoire/trigger/ballet/water_hit
 
 # 起爆しないなら再起
     execute positioned ^ ^ ^0.5 run function asset:artifact/0101.grimoire/trigger/ballet/water

From 763567b7833b02379339e068e8a044f65c8367b3 Mon Sep 17 00:00:00 2001
From: ogachu0331 <taichi.oga331@gmail.com>
Date: Fri, 19 Jun 2026 18:41:00 +0900
Subject: [PATCH 10/10] =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E6=A9=9F(lv2red)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../functions/artifact/0101.grimoire/register.mcfunction  | 8 ++++++++
 Asset/data/asset/tags/functions/artifact/register.json    | 3 ++-
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 Asset/data/asset/functions/artifact/0101.grimoire/register.mcfunction

diff --git a/Asset/data/asset/functions/artifact/0101.grimoire/register.mcfunction b/Asset/data/asset/functions/artifact/0101.grimoire/register.mcfunction
new file mode 100644
index 0000000000..13d5b9db36
--- /dev/null
+++ b/Asset/data/asset/functions/artifact/0101.grimoire/register.mcfunction
@@ -0,0 +1,8 @@
+#> asset:artifact/0101.grimoire/register
+#
+# 神器プールへの登録処理
+#
+# @within tag/function asset:artifact/register
+
+data modify storage asset:artifact RarityRegistry[2] append value [101]
+data modify storage asset:artifact RarityRegistryWithColor.Red[2] append value [101]
diff --git a/Asset/data/asset/tags/functions/artifact/register.json b/Asset/data/asset/tags/functions/artifact/register.json
index bb157c2708..77df9c7533 100644
--- a/Asset/data/asset/tags/functions/artifact/register.json
+++ b/Asset/data/asset/tags/functions/artifact/register.json
@@ -1,5 +1,6 @@
 {
     "values": [
+        "asset:artifact/0101.grimoire/register",
         "asset:artifact/1409.mana_charm/register",
         "asset:artifact/1327.lunatic_torch/register",
         "asset:artifact/1332.bebebeam/register",
@@ -311,4 +312,4 @@
         "asset:artifact/1027.fire_of_rebirth/register",
         "asset:artifact/1111.rod_o_redeem/register"
     ]
-}
+}
\ No newline at end of file