From 394bab38b9ea83896b1a7129a17d6334315f71fa Mon Sep 17 00:00:00 2001
From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com>
Date: Fri, 21 Nov 2025 17:13:31 +0900
Subject: [PATCH 01/18] =?UTF-8?q?=E3=83=80=E3=83=A1=E3=83=BC=E3=82=B8?=
 =?UTF-8?q?=E5=AE=9A=E7=BE=A9=E3=82=92register=E3=81=A7=E8=A1=8C=E3=81=86?=
 =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mob/0420.astro_blaze/attack/.mcfunction   | 20 +++++-----------
 .../mob/0420.astro_blaze/register.mcfunction  |  3 ++-
 .../0420.astro_blaze/tick/summon.mcfunction   |  1 +
 .../hit_entity/.mcfunction                    | 23 +++++++------------
 .../register.mcfunction                       | 10 +++++---
 5 files changed, 24 insertions(+), 33 deletions(-)

diff --git a/Asset/data/asset/functions/mob/0420.astro_blaze/attack/.mcfunction b/Asset/data/asset/functions/mob/0420.astro_blaze/attack/.mcfunction
index 7c6bf4a434..b0b207a89e 100644
--- a/Asset/data/asset/functions/mob/0420.astro_blaze/attack/.mcfunction
+++ b/Asset/data/asset/functions/mob/0420.astro_blaze/attack/.mcfunction
@@ -8,21 +8,13 @@
     execute unless data storage asset:context Attack{IsVanilla:true} run return fail
 
 # 演出
-    execute as @p[tag=Victim] at @s run particle dust 0.975 0.25 0.2 1 ~ ~ ~ 0.5 1 0.5 0 30
+    execute at @p[tag=Victim] run particle dust 0.975 0.25 0.2 1 ~ ~ ~ 0.5 1 0.5 0 30
 
 # ダメージ
-    # 引数の設定
-    # 与えるダメージ
-        data modify storage api: Argument.Damage set value 40.0f
-    # 第一属性
-        data modify storage api: Argument.AttackType set value "Magic"
-    # 第二属性
-        data modify storage api: Argument.ElementType set value "Fire"
-    # デスログ
-        data modify storage api: Argument.DeathMessage append value '[{"translate": "%1$sは%2$sによって丸焦げにされてしまった","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"lib:","interpret":true}]}]'
-# 補正functionを実行
+    data modify storage api: Argument.Damage set from storage asset:context this.Damage.Vannila
+    data modify storage api: Argument.AttackType set value "Magic"
+    data modify storage api: Argument.ElementType set value "Fire"
+    data modify storage api: Argument.DeathMessage append value '[{"translate": "%1$sは%2$sによって丸焦げにされてしまった","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"lib:","interpret":true}]}]'
     function api:damage/modifier
-# ダメージを与える
-    execute as @p[tag=Victim] at @s run function api:damage/
-# リセット
+    execute as @p[tag=Victim] run function api:damage/
     function api:damage/reset
diff --git a/Asset/data/asset/functions/mob/0420.astro_blaze/register.mcfunction b/Asset/data/asset/functions/mob/0420.astro_blaze/register.mcfunction
index 8224d4e28f..b3ea73f791 100644
--- a/Asset/data/asset/functions/mob/0420.astro_blaze/register.mcfunction
+++ b/Asset/data/asset/functions/mob/0420.astro_blaze/register.mcfunction
@@ -62,4 +62,5 @@
     # 雷倍率 (float) (オプション)
         data modify storage asset:mob Resist.Thunder set value 0.6
 # フィールド
-    # data modify storage asset:mob Field.myValue set value
+    data modify storage asset:mob Field.Damage.Vannila set value 40f
+    data modify storage asset:mob Field.Damage.Object set value 18f
diff --git a/Asset/data/asset/functions/mob/0420.astro_blaze/tick/summon.mcfunction b/Asset/data/asset/functions/mob/0420.astro_blaze/tick/summon.mcfunction
index 8180d26d44..556138b6d6 100644
--- a/Asset/data/asset/functions/mob/0420.astro_blaze/tick/summon.mcfunction
+++ b/Asset/data/asset/functions/mob/0420.astro_blaze/tick/summon.mcfunction
@@ -5,6 +5,7 @@
 # @within function asset:mob/0420.astro_blaze/tick/fire
 
 # オーバーライドを設定
+    data modify storage api: Argument.FieldOverride.Damage set from storage asset:context this.Damage.Object
     execute store result storage api: Argument.FieldOverride.MobUUID int 1 run scoreboard players get @s MobUUID
 
 # 召喚
diff --git a/Asset/data/asset/functions/object/2171.astro_blaze_bullet/hit_entity/.mcfunction b/Asset/data/asset/functions/object/2171.astro_blaze_bullet/hit_entity/.mcfunction
index bb03b82ea7..2bdf03b0ef 100644
--- a/Asset/data/asset/functions/object/2171.astro_blaze_bullet/hit_entity/.mcfunction
+++ b/Asset/data/asset/functions/object/2171.astro_blaze_bullet/hit_entity/.mcfunction
@@ -4,21 +4,14 @@
 #
 # @within asset:object/alias/2171/hit_entity
 
-# 引数の設定
-    # 与えるダメージ
-        data modify storage api: Argument.Damage set value 18.0f
-    # 第一属性
-        data modify storage api: Argument.AttackType set value "Physical"
-    # 第二属性
-        data modify storage api: Argument.ElementType set value "Fire"
-    # デスログ
-        data modify storage api: Argument.DeathMessage append value '[{"translate": "%1$sの身体は%2$sの弾幕に貫かれてしまった","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"lib:","interpret":true}]}]'
-    # 補正functionを実行
-        data modify storage api: Argument.MobUUID set from storage asset:context this.MobUUID
-        function api:damage/modifier_manual
-    # ダメージを与える
-        execute positioned ~-0.5 ~-0.5 ~-0.5 as @p[tag=!PlayerShouldInvulnerable,dx=0] run function api:damage/
-# リセット
+# ダメージ
+    data modify storage api: Argument.Damage set from storage asset:context this.Damage
+    data modify storage api: Argument.AttackType set value "Physical"
+    data modify storage api: Argument.ElementType set value "Fire"
+    data modify storage api: Argument.DeathMessage append value '[{"translate": "%1$sの身体は%2$sの弾幕に貫かれてしまった","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"lib:","interpret":true}]}]'
+    data modify storage api: Argument.MobUUID set from storage asset:context this.MobUUID
+    function api:damage/modifier_manual
+    execute positioned ~-0.5 ~-0.5 ~-0.5 as @p[tag=!PlayerShouldInvulnerable,dx=0] run function api:damage/
     function api:damage/reset
 
 # 消失
diff --git a/Asset/data/asset/functions/object/2171.astro_blaze_bullet/register.mcfunction b/Asset/data/asset/functions/object/2171.astro_blaze_bullet/register.mcfunction
index 0a604a6437..cc443fe9e5 100644
--- a/Asset/data/asset/functions/object/2171.astro_blaze_bullet/register.mcfunction
+++ b/Asset/data/asset/functions/object/2171.astro_blaze_bullet/register.mcfunction
@@ -8,13 +8,17 @@
     data modify storage asset:object Extends append value 1
     function asset:object/extends
 # 他のObjectに継承されることを許可するか (boolean) (オプション)
-    # data modify storage asset:object ExtendsSafe set value 
+    # data modify storage asset:object ExtendsSafe set value
 # 継承されることを前提とした、抽象的なObjectであるかどうか(boolean)
     data modify storage asset:object IsAbstract set value false
 # Tickするかどうか(boolean) (オプション)
-    # data modify storage asset:object IsTicking set value 
+    # data modify storage asset:object IsTicking set value
 
 # ID (int)
     data modify storage asset:object ID set value 2171
 # フィールド(オプション)
-    data modify storage asset:object Field set value {Speed:2,Range:64,MovePerStep:0.3}
+    data modify storage asset:object Field.Speed set value 2
+    data modify storage asset:object Field.Range set value 64
+    data modify storage asset:object Field.MovePerStep set value 0.3
+    data modify storage asset:object Field.Damage set value 1
+    data modify storage asset:object Field.MobUUID set value -1

From e83a4620c3d71e210987039d7e33aecb8e778551 Mon Sep 17 00:00:00 2001
From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com>
Date: Fri, 21 Nov 2025 17:54:14 +0900
Subject: [PATCH 02/18] =?UTF-8?q?=E7=99=BA=E5=B0=84=E5=87=A6=E7=90=86?=
 =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3=E5=8F=8A=E3=81=B3=E5=BC=BE=E6=95=B0?=
 =?UTF-8?q?=E3=81=8C=E9=9B=A3=E6=98=93=E5=BA=A6=E6=AF=94=E4=BE=8B=E3=81=A7?=
 =?UTF-8?q?=E5=A2=97=E5=8A=A0=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mob/0420.astro_blaze/register.mcfunction  |  1 +
 .../mob/0420.astro_blaze/tick/.mcfunction     | 33 +++++++++++--------
 .../tick/calc_bullet.mcfunction               | 16 +++++++++
 .../tick/check_through/.mcfunction            | 17 ++++++++++
 .../tick/check_through/recursive.mcfunction   | 16 +++++++++
 .../mob/0420.astro_blaze/tick/fire.mcfunction |  3 ++
 6 files changed, 73 insertions(+), 13 deletions(-)
 create mode 100644 Asset/data/asset/functions/mob/0420.astro_blaze/tick/calc_bullet.mcfunction
 create mode 100644 Asset/data/asset/functions/mob/0420.astro_blaze/tick/check_through/.mcfunction
 create mode 100644 Asset/data/asset/functions/mob/0420.astro_blaze/tick/check_through/recursive.mcfunction

diff --git a/Asset/data/asset/functions/mob/0420.astro_blaze/register.mcfunction b/Asset/data/asset/functions/mob/0420.astro_blaze/register.mcfunction
index b3ea73f791..57535355f6 100644
--- a/Asset/data/asset/functions/mob/0420.astro_blaze/register.mcfunction
+++ b/Asset/data/asset/functions/mob/0420.astro_blaze/register.mcfunction
@@ -64,3 +64,4 @@
 # フィールド
     data modify storage asset:mob Field.Damage.Vannila set value 40f
     data modify storage asset:mob Field.Damage.Object set value 18f
+    data modify storage asset:mob Field.Bullet set value 0
diff --git a/Asset/data/asset/functions/mob/0420.astro_blaze/tick/.mcfunction b/Asset/data/asset/functions/mob/0420.astro_blaze/tick/.mcfunction
index 62bb111b0b..df98e8054d 100644
--- a/Asset/data/asset/functions/mob/0420.astro_blaze/tick/.mcfunction
+++ b/Asset/data/asset/functions/mob/0420.astro_blaze/tick/.mcfunction
@@ -4,28 +4,35 @@
 #
 # @within asset:mob/alias/420/tick
 
+#> Private
+# @private
+    #declare score_holder $Interval
+
 # スコア上昇
     scoreboard players add @s General.Mob.Tick 1
 
 # 移動
     execute if score @s General.Mob.Tick matches 40 run function asset:mob/0420.astro_blaze/tick/jump
 
+# 斜線上にプレイヤーが存在しない場合、スコアを戻す
+    execute if score @s General.Mob.Tick matches 100 unless function asset:mob/0420.astro_blaze/tick/check_through/ run scoreboard players set @s General.Mob.Tick 0
+
 # 発射合図
     execute if score @s General.Mob.Tick matches 100 run function asset:mob/0420.astro_blaze/tick/pre_bullet
     execute if score @s General.Mob.Tick matches 120 run function asset:mob/0420.astro_blaze/tick/pre_bullet
     execute if score @s General.Mob.Tick matches 140 run function asset:mob/0420.astro_blaze/tick/pre_bullet
 
+# 弾数をセット
+    execute if score @s General.Mob.Tick matches 140 run function asset:mob/0420.astro_blaze/tick/calc_bullet
+
+# 弾数が0ならreturn
+    execute if data storage asset:context this{Bullet:0} run return fail
+
 # 発射
-    execute if score @s General.Mob.Tick matches 162 run function asset:mob/0420.astro_blaze/tick/fire
-    execute if score @s General.Mob.Tick matches 164 run function asset:mob/0420.astro_blaze/tick/fire
-    execute if score @s General.Mob.Tick matches 166 run function asset:mob/0420.astro_blaze/tick/fire
-    execute if score @s General.Mob.Tick matches 168 run function asset:mob/0420.astro_blaze/tick/fire
-    execute if score @s General.Mob.Tick matches 170 run function asset:mob/0420.astro_blaze/tick/fire
-    execute if score @s General.Mob.Tick matches 172 run function asset:mob/0420.astro_blaze/tick/fire
-    execute if score @s General.Mob.Tick matches 174 run function asset:mob/0420.astro_blaze/tick/fire
-    execute if score @s General.Mob.Tick matches 176 run function asset:mob/0420.astro_blaze/tick/fire
-    execute if score @s General.Mob.Tick matches 178 run function asset:mob/0420.astro_blaze/tick/fire
-    execute if score @s General.Mob.Tick matches 180 run function asset:mob/0420.astro_blaze/tick/fire
-
-# 一定以上ならスコアをリセットする
-    execute if score @s General.Mob.Tick matches 200 run scoreboard players set @s General.Mob.Tick 0
+    scoreboard players operation $Interval Temporary = @s General.Mob.Tick
+    scoreboard players operation $Interval Temporary %= $2 Const
+    execute if score $Interval Temporary matches 0 run function asset:mob/0420.astro_blaze/tick/fire
+    scoreboard players reset $Interval Temporary
+
+# 弾数が0ならスコア初期化
+    execute if data storage asset:context this{Bullet:0} run scoreboard players set @s General.Mob.Tick 0
diff --git a/Asset/data/asset/functions/mob/0420.astro_blaze/tick/calc_bullet.mcfunction b/Asset/data/asset/functions/mob/0420.astro_blaze/tick/calc_bullet.mcfunction
new file mode 100644
index 0000000000..14f045d670
--- /dev/null
+++ b/Asset/data/asset/functions/mob/0420.astro_blaze/tick/calc_bullet.mcfunction
@@ -0,0 +1,16 @@
+#> asset:mob/0420.astro_blaze/tick/calc_bullet
+#
+# 弾数を設定する
+#
+# @within function asset:mob/0420.astro_blaze/tick/
+
+#> Private
+# @private
+    #declare score_holder $Difficulty
+
+# 難易度比例で弾数を設定する
+# 4+2N
+    function api:global_vars/get_difficulty
+    execute store result score $Difficulty Temporary run data get storage api: Return.Difficulty
+    execute store result storage asset:context this.Bullet int 1 run scoreboard players add $Difficulty Temporary 4
+    scoreboard players reset $Difficulty Temporary
diff --git a/Asset/data/asset/functions/mob/0420.astro_blaze/tick/check_through/.mcfunction b/Asset/data/asset/functions/mob/0420.astro_blaze/tick/check_through/.mcfunction
new file mode 100644
index 0000000000..977a48a074
--- /dev/null
+++ b/Asset/data/asset/functions/mob/0420.astro_blaze/tick/check_through/.mcfunction
@@ -0,0 +1,17 @@
+#> asset:mob/0420.astro_blaze/tick/check_through/
+#
+#
+#
+# @within function asset:mob/0420.astro_blaze/tick/
+
+# 近くのプレイヤーに斜線が通っているか？
+    execute as @a[tag=!PlayerShouldInvulnerable,distance=..20,sort=nearest] facing entity @s eyes run function asset:mob/0420.astro_blaze/tick/check_through/recursive
+
+# 一度も成功してないなら失敗
+    execute unless data storage asset:temp {Success:true} run return run data remove storage asset:temp Success
+
+# リセット
+    data remove storage asset:temp Success
+
+# 成功
+    return 1
diff --git a/Asset/data/asset/functions/mob/0420.astro_blaze/tick/check_through/recursive.mcfunction b/Asset/data/asset/functions/mob/0420.astro_blaze/tick/check_through/recursive.mcfunction
new file mode 100644
index 0000000000..c273514985
--- /dev/null
+++ b/Asset/data/asset/functions/mob/0420.astro_blaze/tick/check_through/recursive.mcfunction
@@ -0,0 +1,16 @@
+#> asset:mob/0420.astro_blaze/tick/check_through/recursive
+#
+# 再帰で自身の位置に辿り着けるか？
+#
+# @within function
+#   asset:mob/0420.astro_blaze/tick/check_through/
+#   asset:mob/0420.astro_blaze/tick/check_through/recursive
+
+# 既に成功してるならreturn
+    execute if data storage asset:context this{Success:true} run return fail
+
+# 自身に接触したら成功判定を返す
+    execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @s[dx=0] run return run data modify storage asset:temp Success set value true
+
+# 再帰
+    execute positioned ^ ^ ^0.5 if block ~ ~ ~ #lib:no_collision/ run function asset:mob/0420.astro_blaze/tick/check_through/recursive
diff --git a/Asset/data/asset/functions/mob/0420.astro_blaze/tick/fire.mcfunction b/Asset/data/asset/functions/mob/0420.astro_blaze/tick/fire.mcfunction
index ff9753d875..f9935726c8 100644
--- a/Asset/data/asset/functions/mob/0420.astro_blaze/tick/fire.mcfunction
+++ b/Asset/data/asset/functions/mob/0420.astro_blaze/tick/fire.mcfunction
@@ -8,6 +8,9 @@
 # @private
     #declare tag BO.Marker
 
+# 弾数のデクリメント
+    execute store result storage asset:context this.Bullet int 0.9999999999 run data get storage asset:context this.Bullet
+
 # Markerを召喚
     execute positioned ~ ~1 ~ run summon marker ~ ~ ~ {Tags:["BO.Marker"]}
 

From 6d69a19e11a01e664f02658ff65408b2d13cd583 Mon Sep 17 00:00:00 2001
From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com>
Date: Fri, 21 Nov 2025 18:00:52 +0900
Subject: [PATCH 03/18] =?UTF-8?q?=E6=BC=94=E5=87=BA=E3=82=92=E8=AA=BF?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../functions/object/2171.astro_blaze_bullet/tick/.mcfunction | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Asset/data/asset/functions/object/2171.astro_blaze_bullet/tick/.mcfunction b/Asset/data/asset/functions/object/2171.astro_blaze_bullet/tick/.mcfunction
index e371ed475f..7e57d7eb22 100644
--- a/Asset/data/asset/functions/object/2171.astro_blaze_bullet/tick/.mcfunction
+++ b/Asset/data/asset/functions/object/2171.astro_blaze_bullet/tick/.mcfunction
@@ -5,8 +5,8 @@
 # @within asset:object/alias/2171/tick
 
 # パーティクル
-    particle flame ~ ~ ~ 0.2 0.2 0.2 0.05 1 force @a[distance=..32]
-    particle minecraft:dust 1 0.560 0.150 1 ~ ~ ~ 0.2 0.2 0.2 0 1 force @a[distance=..32]
+    execute if predicate lib:random_pass_per/25 run particle flame ~ ~ ~ 0.05 0.05 0.05 0.025 1 force @a[distance=..32]
+    execute run particle minecraft:dust 1 0.560 0.150 1 ~ ~ ~ 0.2 0.2 0.2 0 1 force @a[distance=..32]
 
 # 継承元の処理
     function asset:object/super.tick

From 785310bf6c48fb40d940049f7ebe097979f368fe Mon Sep 17 00:00:00 2001
From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com>
Date: Fri, 21 Nov 2025 18:01:10 +0900
Subject: [PATCH 04/18] =?UTF-8?q?=E5=BC=BE=E6=95=B0=E8=A8=AD=E5=AE=9A?=
 =?UTF-8?q?=E3=81=AE=E3=83=9F=E3=82=B9=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../functions/mob/0420.astro_blaze/tick/calc_bullet.mcfunction  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Asset/data/asset/functions/mob/0420.astro_blaze/tick/calc_bullet.mcfunction b/Asset/data/asset/functions/mob/0420.astro_blaze/tick/calc_bullet.mcfunction
index 14f045d670..6be44a036f 100644
--- a/Asset/data/asset/functions/mob/0420.astro_blaze/tick/calc_bullet.mcfunction
+++ b/Asset/data/asset/functions/mob/0420.astro_blaze/tick/calc_bullet.mcfunction
@@ -11,6 +11,6 @@
 # 難易度比例で弾数を設定する
 # 4+2N
     function api:global_vars/get_difficulty
-    execute store result score $Difficulty Temporary run data get storage api: Return.Difficulty
+    execute store result score $Difficulty Temporary run data get storage api: Return.Difficulty 2
     execute store result storage asset:context this.Bullet int 1 run scoreboard players add $Difficulty Temporary 4
     scoreboard players reset $Difficulty Temporary

From 149888a2d134b31c4de1f757ea8499fd7bfd54c0 Mon Sep 17 00:00:00 2001
From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com>
Date: Fri, 21 Nov 2025 18:42:43 +0900
Subject: [PATCH 05/18] =?UTF-8?q?=E9=96=A2=E6=95=B0=E5=90=8D=E5=A4=89?=
 =?UTF-8?q?=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data/asset/functions/mob/0420.astro_blaze/tick/.mcfunction  | 2 +-
 .../tick/{calc_bullet.mcfunction => set_bullet.mcfunction}      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename Asset/data/asset/functions/mob/0420.astro_blaze/tick/{calc_bullet.mcfunction => set_bullet.mcfunction} (91%)

diff --git a/Asset/data/asset/functions/mob/0420.astro_blaze/tick/.mcfunction b/Asset/data/asset/functions/mob/0420.astro_blaze/tick/.mcfunction
index df98e8054d..242dc4c470 100644
--- a/Asset/data/asset/functions/mob/0420.astro_blaze/tick/.mcfunction
+++ b/Asset/data/asset/functions/mob/0420.astro_blaze/tick/.mcfunction
@@ -23,7 +23,7 @@
     execute if score @s General.Mob.Tick matches 140 run function asset:mob/0420.astro_blaze/tick/pre_bullet
 
 # 弾数をセット
-    execute if score @s General.Mob.Tick matches 140 run function asset:mob/0420.astro_blaze/tick/calc_bullet
+    execute if score @s General.Mob.Tick matches 140 run function asset:mob/0420.astro_blaze/tick/set_bullet
 
 # 弾数が0ならreturn
     execute if data storage asset:context this{Bullet:0} run return fail
diff --git a/Asset/data/asset/functions/mob/0420.astro_blaze/tick/calc_bullet.mcfunction b/Asset/data/asset/functions/mob/0420.astro_blaze/tick/set_bullet.mcfunction
similarity index 91%
rename from Asset/data/asset/functions/mob/0420.astro_blaze/tick/calc_bullet.mcfunction
rename to Asset/data/asset/functions/mob/0420.astro_blaze/tick/set_bullet.mcfunction
index 6be44a036f..d1807fb884 100644
--- a/Asset/data/asset/functions/mob/0420.astro_blaze/tick/calc_bullet.mcfunction
+++ b/Asset/data/asset/functions/mob/0420.astro_blaze/tick/set_bullet.mcfunction
@@ -1,4 +1,4 @@
-#> asset:mob/0420.astro_blaze/tick/calc_bullet
+#> asset:mob/0420.astro_blaze/tick/set_bullet
 #
 # 弾数を設定する
 #

From 429416e5535985a49b4ed037176176fba0f9fb54 Mon Sep 17 00:00:00 2001
From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com>
Date: Sat, 22 Nov 2025 03:30:13 +0900
Subject: [PATCH 06/18] =?UTF-8?q?=E3=83=87=E3=82=A3=E3=83=AC=E3=82=AF?=
 =?UTF-8?q?=E3=83=88=E3=83=AA=E8=AA=BF=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mob/0420.astro_blaze/tick/.mcfunction      | 17 ++---------------
 .../0420.astro_blaze/tick/shoot/.mcfunction    | 18 ++++++++++++++++++
 .../spread.mcfunction}                         |  8 ++++----
 .../tick/{ => shoot}/summon.mcfunction         |  6 +++---
 4 files changed, 27 insertions(+), 22 deletions(-)
 create mode 100644 Asset/data/asset/functions/mob/0420.astro_blaze/tick/shoot/.mcfunction
 rename Asset/data/asset/functions/mob/0420.astro_blaze/tick/{fire.mcfunction => shoot/spread.mcfunction} (86%)
 rename Asset/data/asset/functions/mob/0420.astro_blaze/tick/{ => shoot}/summon.mcfunction (75%)

diff --git a/Asset/data/asset/functions/mob/0420.astro_blaze/tick/.mcfunction b/Asset/data/asset/functions/mob/0420.astro_blaze/tick/.mcfunction
index 242dc4c470..33095bad9d 100644
--- a/Asset/data/asset/functions/mob/0420.astro_blaze/tick/.mcfunction
+++ b/Asset/data/asset/functions/mob/0420.astro_blaze/tick/.mcfunction
@@ -4,10 +4,6 @@
 #
 # @within asset:mob/alias/420/tick
 
-#> Private
-# @private
-    #declare score_holder $Interval
-
 # スコア上昇
     scoreboard players add @s General.Mob.Tick 1
 
@@ -25,14 +21,5 @@
 # 弾数をセット
     execute if score @s General.Mob.Tick matches 140 run function asset:mob/0420.astro_blaze/tick/set_bullet
 
-# 弾数が0ならreturn
-    execute if data storage asset:context this{Bullet:0} run return fail
-
-# 発射
-    scoreboard players operation $Interval Temporary = @s General.Mob.Tick
-    scoreboard players operation $Interval Temporary %= $2 Const
-    execute if score $Interval Temporary matches 0 run function asset:mob/0420.astro_blaze/tick/fire
-    scoreboard players reset $Interval Temporary
-
-# 弾数が0ならスコア初期化
-    execute if data storage asset:context this{Bullet:0} run scoreboard players set @s General.Mob.Tick 0
+# 弾数が0でなければ発射
+    execute unless data storage asset:context this{Bullet:0} run function asset:mob/0420.astro_blaze/tick/shoot/
diff --git a/Asset/data/asset/functions/mob/0420.astro_blaze/tick/shoot/.mcfunction b/Asset/data/asset/functions/mob/0420.astro_blaze/tick/shoot/.mcfunction
new file mode 100644
index 0000000000..c07ffa0bbf
--- /dev/null
+++ b/Asset/data/asset/functions/mob/0420.astro_blaze/tick/shoot/.mcfunction
@@ -0,0 +1,18 @@
+#> asset:mob/0420.astro_blaze/tick/shoot/
+#
+#
+#
+# @within function asset:mob/0420.astro_blaze/tick/
+
+#> Private
+# @private
+    #declare score_holder $Interval
+
+# 発射
+    scoreboard players operation $Interval Temporary = @s General.Mob.Tick
+    scoreboard players operation $Interval Temporary %= $2 Const
+    execute if score $Interval Temporary matches 0 run function asset:mob/0420.astro_blaze/tick/shoot/spread
+    scoreboard players reset $Interval Temporary
+
+# 弾数が0ならスコア初期化
+    execute if data storage asset:context this{Bullet:0} run scoreboard players set @s General.Mob.Tick 0
diff --git a/Asset/data/asset/functions/mob/0420.astro_blaze/tick/fire.mcfunction b/Asset/data/asset/functions/mob/0420.astro_blaze/tick/shoot/spread.mcfunction
similarity index 86%
rename from Asset/data/asset/functions/mob/0420.astro_blaze/tick/fire.mcfunction
rename to Asset/data/asset/functions/mob/0420.astro_blaze/tick/shoot/spread.mcfunction
index f9935726c8..d9f02e9577 100644
--- a/Asset/data/asset/functions/mob/0420.astro_blaze/tick/fire.mcfunction
+++ b/Asset/data/asset/functions/mob/0420.astro_blaze/tick/shoot/spread.mcfunction
@@ -1,8 +1,8 @@
-#> asset:mob/0420.astro_blaze/tick/fire
+#> asset:mob/0420.astro_blaze/tick/shoot/spread
 #
-# 発射！！！
 #
-# @within function asset:mob/0420.astro_blaze/tick/
+#
+# @within function asset:mob/0420.astro_blaze/tick/shoot/
 
 #> Tags
 # @private
@@ -22,7 +22,7 @@
     execute as @e[type=marker,tag=BO.Marker,distance=..3] at @s facing entity @a[tag=!PlayerShouldInvulnerable,distance=..100,sort=random,limit=1] eyes rotated ~ ~2.5 run function lib:forward_spreader/circle
 
 # 発射
-    execute positioned ~ ~1 ~ facing entity @e[type=marker,tag=BO.Marker,distance=..15,limit=1] feet run function asset:mob/0420.astro_blaze/tick/summon
+    execute positioned ~ ~1 ~ facing entity @e[type=marker,tag=BO.Marker,distance=..15,limit=1] feet run function asset:mob/0420.astro_blaze/tick/shoot/summon
 
 # マーカーを戻してあげる
     kill @e[type=marker,tag=BO.Marker,distance=..15,limit=1]
diff --git a/Asset/data/asset/functions/mob/0420.astro_blaze/tick/summon.mcfunction b/Asset/data/asset/functions/mob/0420.astro_blaze/tick/shoot/summon.mcfunction
similarity index 75%
rename from Asset/data/asset/functions/mob/0420.astro_blaze/tick/summon.mcfunction
rename to Asset/data/asset/functions/mob/0420.astro_blaze/tick/shoot/summon.mcfunction
index 556138b6d6..5c232f8a66 100644
--- a/Asset/data/asset/functions/mob/0420.astro_blaze/tick/summon.mcfunction
+++ b/Asset/data/asset/functions/mob/0420.astro_blaze/tick/shoot/summon.mcfunction
@@ -1,8 +1,8 @@
-#> asset:mob/0420.astro_blaze/tick/summon
+#> asset:mob/0420.astro_blaze/tick/shoot/summon
 #
-# 弾幕召喚
 #
-# @within function asset:mob/0420.astro_blaze/tick/fire
+#
+# @within function asset:mob/0420.astro_blaze/tick/shoot/spread
 
 # オーバーライドを設定
     data modify storage api: Argument.FieldOverride.Damage set from storage asset:context this.Damage.Object

From c17db8ed54a3568d68c679f833a1b8003628f34d Mon Sep 17 00:00:00 2001
From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com>
Date: Sat, 22 Nov 2025 13:02:58 +0900
Subject: [PATCH 07/18] =?UTF-8?q?=E6=96=9C=E7=B7=9A=E3=81=8C=E9=80=9A?=
 =?UTF-8?q?=E3=81=A3=E3=81=9F=E3=83=97=E3=83=AC=E3=82=A4=E3=83=A4=E3=83=BC?=
 =?UTF-8?q?=E3=81=AB=E5=AF=BE=E3=81=97=E3=81=A6=E9=80=A3=E5=B0=84=E3=81=99?=
 =?UTF-8?q?=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E4=BB=95=E6=A7=98=E3=82=92?=
 =?UTF-8?q?=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tick/check_through/recursive.mcfunction           |  2 +-
 .../tick/check_through/success.mcfunction             | 11 +++++++++++
 .../mob/0420.astro_blaze/tick/shoot/.mcfunction       |  2 +-
 .../shoot/{spread.mcfunction => spread.m.mcfunction}  |  6 +++---
 .../mob/0420.astro_blaze/tick/shoot/summon.mcfunction |  2 +-
 5 files changed, 17 insertions(+), 6 deletions(-)
 create mode 100644 Asset/data/asset/functions/mob/0420.astro_blaze/tick/check_through/success.mcfunction
 rename Asset/data/asset/functions/mob/0420.astro_blaze/tick/shoot/{spread.mcfunction => spread.m.mcfunction} (71%)

diff --git a/Asset/data/asset/functions/mob/0420.astro_blaze/tick/check_through/recursive.mcfunction b/Asset/data/asset/functions/mob/0420.astro_blaze/tick/check_through/recursive.mcfunction
index c273514985..1b172bc5e0 100644
--- a/Asset/data/asset/functions/mob/0420.astro_blaze/tick/check_through/recursive.mcfunction
+++ b/Asset/data/asset/functions/mob/0420.astro_blaze/tick/check_through/recursive.mcfunction
@@ -10,7 +10,7 @@
     execute if data storage asset:context this{Success:true} run return fail
 
 # 自身に接触したら成功判定を返す
-    execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @s[dx=0] run return run data modify storage asset:temp Success set value true
+    execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @s[dx=0] run function asset:mob/0420.astro_blaze/tick/check_through/success
 
 # 再帰
     execute positioned ^ ^ ^0.5 if block ~ ~ ~ #lib:no_collision/ run function asset:mob/0420.astro_blaze/tick/check_through/recursive
diff --git a/Asset/data/asset/functions/mob/0420.astro_blaze/tick/check_through/success.mcfunction b/Asset/data/asset/functions/mob/0420.astro_blaze/tick/check_through/success.mcfunction
new file mode 100644
index 0000000000..19ef3a4777
--- /dev/null
+++ b/Asset/data/asset/functions/mob/0420.astro_blaze/tick/check_through/success.mcfunction
@@ -0,0 +1,11 @@
+#> asset:mob/0420.astro_blaze/tick/check_through/success
+#
+# 成功
+#
+# @within function asset:mob/0420.astro_blaze/tick/check_through/recursive
+
+# 成功判定
+    data modify storage asset:temp Success set value true
+
+# 自身のUserIDをFieldへ入れておく
+    execute store result storage asset:context this.TargetID int 1 run scoreboard players get @s UserID
diff --git a/Asset/data/asset/functions/mob/0420.astro_blaze/tick/shoot/.mcfunction b/Asset/data/asset/functions/mob/0420.astro_blaze/tick/shoot/.mcfunction
index c07ffa0bbf..cdf8d76493 100644
--- a/Asset/data/asset/functions/mob/0420.astro_blaze/tick/shoot/.mcfunction
+++ b/Asset/data/asset/functions/mob/0420.astro_blaze/tick/shoot/.mcfunction
@@ -11,7 +11,7 @@
 # 発射
     scoreboard players operation $Interval Temporary = @s General.Mob.Tick
     scoreboard players operation $Interval Temporary %= $2 Const
-    execute if score $Interval Temporary matches 0 run function asset:mob/0420.astro_blaze/tick/shoot/spread
+    execute if score $Interval Temporary matches 0 run function asset:mob/0420.astro_blaze/tick/shoot/spread.m with storage asset:context this
     scoreboard players reset $Interval Temporary
 
 # 弾数が0ならスコア初期化
diff --git a/Asset/data/asset/functions/mob/0420.astro_blaze/tick/shoot/spread.mcfunction b/Asset/data/asset/functions/mob/0420.astro_blaze/tick/shoot/spread.m.mcfunction
similarity index 71%
rename from Asset/data/asset/functions/mob/0420.astro_blaze/tick/shoot/spread.mcfunction
rename to Asset/data/asset/functions/mob/0420.astro_blaze/tick/shoot/spread.m.mcfunction
index d9f02e9577..61e1c801ef 100644
--- a/Asset/data/asset/functions/mob/0420.astro_blaze/tick/shoot/spread.mcfunction
+++ b/Asset/data/asset/functions/mob/0420.astro_blaze/tick/shoot/spread.m.mcfunction
@@ -1,4 +1,4 @@
-#> asset:mob/0420.astro_blaze/tick/shoot/spread
+#> asset:mob/0420.astro_blaze/tick/shoot/spread.m
 #
 #
 #
@@ -18,8 +18,8 @@
     data modify storage lib: Argument.Distance set value 8.0
     data modify storage lib: Argument.Spread set value 1.5
 
-# 前方拡散を実行する
-    execute as @e[type=marker,tag=BO.Marker,distance=..3] at @s facing entity @a[tag=!PlayerShouldInvulnerable,distance=..100,sort=random,limit=1] eyes rotated ~ ~2.5 run function lib:forward_spreader/circle
+# ターゲット方向に対して前方拡散を実行する
+    $execute as @e[type=marker,tag=BO.Marker,distance=..3] at @s facing entity @p[scores={UserID=$(TargetID)},distance=..100] eyes rotated ~ ~2.5 run function lib:forward_spreader/circle
 
 # 発射
     execute positioned ~ ~1 ~ facing entity @e[type=marker,tag=BO.Marker,distance=..15,limit=1] feet run function asset:mob/0420.astro_blaze/tick/shoot/summon
diff --git a/Asset/data/asset/functions/mob/0420.astro_blaze/tick/shoot/summon.mcfunction b/Asset/data/asset/functions/mob/0420.astro_blaze/tick/shoot/summon.mcfunction
index 5c232f8a66..76ce7f704a 100644
--- a/Asset/data/asset/functions/mob/0420.astro_blaze/tick/shoot/summon.mcfunction
+++ b/Asset/data/asset/functions/mob/0420.astro_blaze/tick/shoot/summon.mcfunction
@@ -2,7 +2,7 @@
 #
 #
 #
-# @within function asset:mob/0420.astro_blaze/tick/shoot/spread
+# @within function asset:mob/0420.astro_blaze/tick/shoot/spread.m
 
 # オーバーライドを設定
     data modify storage api: Argument.FieldOverride.Damage set from storage asset:context this.Damage.Object

From 3a892c222e5ee2913802d2449deeae64fbe0c12b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=91=A0=E7=92=83?=
 <87566955+Lapis-LJA@users.noreply.github.com>
Date: Sat, 22 Nov 2025 14:38:09 +0900
Subject: [PATCH 08/18] =?UTF-8?q?=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88?=
 =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data/asset/functions/mob/0420.astro_blaze/tick/.mcfunction  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Asset/data/asset/functions/mob/0420.astro_blaze/tick/.mcfunction b/Asset/data/asset/functions/mob/0420.astro_blaze/tick/.mcfunction
index 33095bad9d..4014ec3e73 100644
--- a/Asset/data/asset/functions/mob/0420.astro_blaze/tick/.mcfunction
+++ b/Asset/data/asset/functions/mob/0420.astro_blaze/tick/.mcfunction
@@ -10,7 +10,7 @@
 # 移動
     execute if score @s General.Mob.Tick matches 40 run function asset:mob/0420.astro_blaze/tick/jump
 
-# 斜線上にプレイヤーが存在しない場合、スコアを戻す
+# 射線上にプレイヤーが存在しない場合、スコアを戻す
     execute if score @s General.Mob.Tick matches 100 unless function asset:mob/0420.astro_blaze/tick/check_through/ run scoreboard players set @s General.Mob.Tick 0
 
 # 発射合図

From 0febb01d6672fd51aa5db09f6137007a31fee947 Mon Sep 17 00:00:00 2001
From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com>
Date: Sat, 22 Nov 2025 15:14:08 +0900
Subject: [PATCH 09/18] =?UTF-8?q?=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88?=
 =?UTF-8?q?=E3=81=AE=E8=AA=A4=E5=AD=97=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mob/0420.astro_blaze/tick/check_through/.mcfunction         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Asset/data/asset/functions/mob/0420.astro_blaze/tick/check_through/.mcfunction b/Asset/data/asset/functions/mob/0420.astro_blaze/tick/check_through/.mcfunction
index 977a48a074..dac56c8e8b 100644
--- a/Asset/data/asset/functions/mob/0420.astro_blaze/tick/check_through/.mcfunction
+++ b/Asset/data/asset/functions/mob/0420.astro_blaze/tick/check_through/.mcfunction
@@ -4,7 +4,7 @@
 #
 # @within function asset:mob/0420.astro_blaze/tick/
 
-# 近くのプレイヤーに斜線が通っているか？
+# 近くのプレイヤーに射線が通っているか？
     execute as @a[tag=!PlayerShouldInvulnerable,distance=..20,sort=nearest] facing entity @s eyes run function asset:mob/0420.astro_blaze/tick/check_through/recursive
 
 # 一度も成功してないなら失敗

From ba47253fc1ee059fc9b29d39bae46826a4adeb20 Mon Sep 17 00:00:00 2001
From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com>
Date: Sat, 22 Nov 2025 15:27:47 +0900
Subject: [PATCH 10/18] =?UTF-8?q?=E3=82=BF=E3=83=BC=E3=82=B2=E3=83=83?=
 =?UTF-8?q?=E3=83=88=E3=81=8C=E3=81=84=E3=81=AA=E3=81=8F=E3=81=AA=E3=81=A3?=
 =?UTF-8?q?=E3=81=9F=E5=A0=B4=E5=90=88=E3=81=AE=E5=87=A6=E7=90=86=E3=82=92?=
 =?UTF-8?q?=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mob/0420.astro_blaze/tick/shoot/spread.m.mcfunction        | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Asset/data/asset/functions/mob/0420.astro_blaze/tick/shoot/spread.m.mcfunction b/Asset/data/asset/functions/mob/0420.astro_blaze/tick/shoot/spread.m.mcfunction
index 61e1c801ef..41d9e1a9aa 100644
--- a/Asset/data/asset/functions/mob/0420.astro_blaze/tick/shoot/spread.m.mcfunction
+++ b/Asset/data/asset/functions/mob/0420.astro_blaze/tick/shoot/spread.m.mcfunction
@@ -8,6 +8,9 @@
 # @private
     #declare tag BO.Marker
 
+# まず、ターゲットがいなくなった場合、弾を0にしてreturnする
+    $execute unless entity @p[scores={UserID=$(TargetID)},distance=..100] run return run data modify storage asset:context this.Bullet set value 0
+
 # 弾数のデクリメント
     execute store result storage asset:context this.Bullet int 0.9999999999 run data get storage asset:context this.Bullet
 

From 80817c626fbd431c1cb4405b0d56bad28ec9f882 Mon Sep 17 00:00:00 2001
From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com>
Date: Sat, 22 Nov 2025 15:28:16 +0900
Subject: [PATCH 11/18] =?UTF-8?q?=E3=82=BF=E3=83=BC=E3=82=B2=E3=83=83?=
 =?UTF-8?q?=E3=83=88=E3=81=AB=E5=AF=BE=E3=81=99=E3=82=8B=E3=82=BB=E3=83=AC?=
 =?UTF-8?q?=E3=82=AF=E3=82=BF=E3=83=BC=E3=81=AEdistance=E3=82=92=E7=B8=AE?=
 =?UTF-8?q?=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mob/0420.astro_blaze/tick/shoot/spread.m.mcfunction       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Asset/data/asset/functions/mob/0420.astro_blaze/tick/shoot/spread.m.mcfunction b/Asset/data/asset/functions/mob/0420.astro_blaze/tick/shoot/spread.m.mcfunction
index 41d9e1a9aa..60f68f1a02 100644
--- a/Asset/data/asset/functions/mob/0420.astro_blaze/tick/shoot/spread.m.mcfunction
+++ b/Asset/data/asset/functions/mob/0420.astro_blaze/tick/shoot/spread.m.mcfunction
@@ -9,7 +9,7 @@
     #declare tag BO.Marker
 
 # まず、ターゲットがいなくなった場合、弾を0にしてreturnする
-    $execute unless entity @p[scores={UserID=$(TargetID)},distance=..100] run return run data modify storage asset:context this.Bullet set value 0
+    $execute unless entity @p[scores={UserID=$(TargetID)},distance=..50] run return run data modify storage asset:context this.Bullet set value 0
 
 # 弾数のデクリメント
     execute store result storage asset:context this.Bullet int 0.9999999999 run data get storage asset:context this.Bullet
@@ -22,7 +22,7 @@
     data modify storage lib: Argument.Spread set value 1.5
 
 # ターゲット方向に対して前方拡散を実行する
-    $execute as @e[type=marker,tag=BO.Marker,distance=..3] at @s facing entity @p[scores={UserID=$(TargetID)},distance=..100] eyes rotated ~ ~2.5 run function lib:forward_spreader/circle
+    $execute as @e[type=marker,tag=BO.Marker,distance=..3] at @s facing entity @p[scores={UserID=$(TargetID)},distance=..50] eyes rotated ~ ~2.5 run function lib:forward_spreader/circle
 
 # 発射
     execute positioned ~ ~1 ~ facing entity @e[type=marker,tag=BO.Marker,distance=..15,limit=1] feet run function asset:mob/0420.astro_blaze/tick/shoot/summon

From 22c1ecdb480669ce96e916314d0314d5c12910f3 Mon Sep 17 00:00:00 2001
From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com>
Date: Sat, 22 Nov 2025 15:32:31 +0900
Subject: [PATCH 12/18] =?UTF-8?q?flame=E3=83=91=E3=83=BC=E3=83=86=E3=82=A3?=
 =?UTF-8?q?=E3=82=AF=E3=83=AB=E3=81=AE=E7=99=BA=E7=94=9F=E7=8E=87=E3=82=92?=
 =?UTF-8?q?=E8=AA=BF=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../functions/object/2171.astro_blaze_bullet/tick/.mcfunction   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Asset/data/asset/functions/object/2171.astro_blaze_bullet/tick/.mcfunction b/Asset/data/asset/functions/object/2171.astro_blaze_bullet/tick/.mcfunction
index 7e57d7eb22..ff844cffc0 100644
--- a/Asset/data/asset/functions/object/2171.astro_blaze_bullet/tick/.mcfunction
+++ b/Asset/data/asset/functions/object/2171.astro_blaze_bullet/tick/.mcfunction
@@ -5,7 +5,7 @@
 # @within asset:object/alias/2171/tick
 
 # パーティクル
-    execute if predicate lib:random_pass_per/25 run particle flame ~ ~ ~ 0.05 0.05 0.05 0.025 1 force @a[distance=..32]
+    execute if predicate lib:random_pass_per/15 run particle flame ~ ~ ~ 0.05 0.05 0.05 0.025 1 force @a[distance=..32]
     execute run particle minecraft:dust 1 0.560 0.150 1 ~ ~ ~ 0.2 0.2 0.2 0 1 force @a[distance=..32]
 
 # 継承元の処理

From 586010cba20a4bd85b5996b67ab36f8d58de07ee Mon Sep 17 00:00:00 2001
From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com>
Date: Sat, 22 Nov 2025 15:38:48 +0900
Subject: [PATCH 13/18] =?UTF-8?q?=E3=82=BF=E3=83=BC=E3=82=B2=E3=83=83?=
 =?UTF-8?q?=E3=83=88=E3=81=8C=E3=81=84=E3=81=AA=E3=81=8F=E3=81=AA=E3=81=A3?=
 =?UTF-8?q?=E3=81=9F=E5=88=A4=E5=AE=9A=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mob/0420.astro_blaze/tick/shoot/spread.m.mcfunction         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Asset/data/asset/functions/mob/0420.astro_blaze/tick/shoot/spread.m.mcfunction b/Asset/data/asset/functions/mob/0420.astro_blaze/tick/shoot/spread.m.mcfunction
index 60f68f1a02..c65a4ab811 100644
--- a/Asset/data/asset/functions/mob/0420.astro_blaze/tick/shoot/spread.m.mcfunction
+++ b/Asset/data/asset/functions/mob/0420.astro_blaze/tick/shoot/spread.m.mcfunction
@@ -9,7 +9,7 @@
     #declare tag BO.Marker
 
 # まず、ターゲットがいなくなった場合、弾を0にしてreturnする
-    $execute unless entity @p[scores={UserID=$(TargetID)},distance=..50] run return run data modify storage asset:context this.Bullet set value 0
+    $execute unless entity @p[tag=!PlayerShouldInvulnerable,scores={UserID=$(TargetID)},distance=..50] run return run data modify storage asset:context this.Bullet set value 0
 
 # 弾数のデクリメント
     execute store result storage asset:context this.Bullet int 0.9999999999 run data get storage asset:context this.Bullet

From 01ee94bab00fa628cde8c305e5debdab69d728a8 Mon Sep 17 00:00:00 2001
From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com>
Date: Sat, 22 Nov 2025 15:41:12 +0900
Subject: [PATCH 14/18] =?UTF-8?q?=E5=88=A4=E5=AE=9A=E3=82=92=E3=81=95?=
 =?UTF-8?q?=E3=82=89=E3=81=AB=E7=B8=AE=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mob/0420.astro_blaze/tick/shoot/spread.m.mcfunction       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Asset/data/asset/functions/mob/0420.astro_blaze/tick/shoot/spread.m.mcfunction b/Asset/data/asset/functions/mob/0420.astro_blaze/tick/shoot/spread.m.mcfunction
index c65a4ab811..125753490a 100644
--- a/Asset/data/asset/functions/mob/0420.astro_blaze/tick/shoot/spread.m.mcfunction
+++ b/Asset/data/asset/functions/mob/0420.astro_blaze/tick/shoot/spread.m.mcfunction
@@ -9,7 +9,7 @@
     #declare tag BO.Marker
 
 # まず、ターゲットがいなくなった場合、弾を0にしてreturnする
-    $execute unless entity @p[tag=!PlayerShouldInvulnerable,scores={UserID=$(TargetID)},distance=..50] run return run data modify storage asset:context this.Bullet set value 0
+    $execute unless entity @p[tag=!PlayerShouldInvulnerable,scores={UserID=$(TargetID)},distance=..35] run return run data modify storage asset:context this.Bullet set value 0
 
 # 弾数のデクリメント
     execute store result storage asset:context this.Bullet int 0.9999999999 run data get storage asset:context this.Bullet
@@ -22,7 +22,7 @@
     data modify storage lib: Argument.Spread set value 1.5
 
 # ターゲット方向に対して前方拡散を実行する
-    $execute as @e[type=marker,tag=BO.Marker,distance=..3] at @s facing entity @p[scores={UserID=$(TargetID)},distance=..50] eyes rotated ~ ~2.5 run function lib:forward_spreader/circle
+    $execute as @e[type=marker,tag=BO.Marker,distance=..3] at @s facing entity @p[scores={UserID=$(TargetID)},distance=..35] eyes rotated ~ ~2.5 run function lib:forward_spreader/circle
 
 # 発射
     execute positioned ~ ~1 ~ facing entity @e[type=marker,tag=BO.Marker,distance=..15,limit=1] feet run function asset:mob/0420.astro_blaze/tick/shoot/summon

From bae53916e0cbdfaf6b092a025f0e52b250caf187 Mon Sep 17 00:00:00 2001
From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com>
Date: Sun, 14 Dec 2025 23:48:35 +0900
Subject: [PATCH 15/18] =?UTF-8?q?=E7=99=BA=E5=B0=84=E3=81=BE=E3=81=A7?=
 =?UTF-8?q?=E3=81=8C=E6=97=A9=E3=81=8F=E3=81=AA=E3=81=A3=E3=81=A6=E3=81=84?=
 =?UTF-8?q?=E3=82=8B=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data/asset/functions/mob/0420.astro_blaze/tick/.mcfunction  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Asset/data/asset/functions/mob/0420.astro_blaze/tick/.mcfunction b/Asset/data/asset/functions/mob/0420.astro_blaze/tick/.mcfunction
index 4014ec3e73..450c1d1bb5 100644
--- a/Asset/data/asset/functions/mob/0420.astro_blaze/tick/.mcfunction
+++ b/Asset/data/asset/functions/mob/0420.astro_blaze/tick/.mcfunction
@@ -22,4 +22,4 @@
     execute if score @s General.Mob.Tick matches 140 run function asset:mob/0420.astro_blaze/tick/set_bullet
 
 # 弾数が0でなければ発射
-    execute unless data storage asset:context this{Bullet:0} run function asset:mob/0420.astro_blaze/tick/shoot/
+    execute if score @s General.Mob.Tick matches 162.. unless data storage asset:context this{Bullet:0} run function asset:mob/0420.astro_blaze/tick/shoot/

From 4d90322daffa474e28e768a24c3ebd82802e7e81 Mon Sep 17 00:00:00 2001
From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com>
Date: Mon, 15 Dec 2025 00:16:52 +0900
Subject: [PATCH 16/18] =?UTF-8?q?execute=20run=E3=82=92=E5=89=8A=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../functions/object/2171.astro_blaze_bullet/tick/.mcfunction   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Asset/data/asset/functions/object/2171.astro_blaze_bullet/tick/.mcfunction b/Asset/data/asset/functions/object/2171.astro_blaze_bullet/tick/.mcfunction
index ff844cffc0..3a8e0b2907 100644
--- a/Asset/data/asset/functions/object/2171.astro_blaze_bullet/tick/.mcfunction
+++ b/Asset/data/asset/functions/object/2171.astro_blaze_bullet/tick/.mcfunction
@@ -6,7 +6,7 @@
 
 # パーティクル
     execute if predicate lib:random_pass_per/15 run particle flame ~ ~ ~ 0.05 0.05 0.05 0.025 1 force @a[distance=..32]
-    execute run particle minecraft:dust 1 0.560 0.150 1 ~ ~ ~ 0.2 0.2 0.2 0 1 force @a[distance=..32]
+    particle minecraft:dust 1 0.560 0.150 1 ~ ~ ~ 0.2 0.2 0.2 0 1 force @a[distance=..32]
 
 # 継承元の処理
     function asset:object/super.tick

From a49b2871e0e4a9bd01bffd8c2dba5aacd22a24cb Mon Sep 17 00:00:00 2001
From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com>
Date: Mon, 15 Dec 2025 00:17:58 +0900
Subject: [PATCH 17/18] =?UTF-8?q?Vanilla=E3=81=AE=E8=AA=A4=E5=AD=97?=
 =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../asset/functions/mob/0420.astro_blaze/attack/.mcfunction     | 2 +-
 .../asset/functions/mob/0420.astro_blaze/register.mcfunction    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Asset/data/asset/functions/mob/0420.astro_blaze/attack/.mcfunction b/Asset/data/asset/functions/mob/0420.astro_blaze/attack/.mcfunction
index b0b207a89e..97757dec88 100644
--- a/Asset/data/asset/functions/mob/0420.astro_blaze/attack/.mcfunction
+++ b/Asset/data/asset/functions/mob/0420.astro_blaze/attack/.mcfunction
@@ -11,7 +11,7 @@
     execute at @p[tag=Victim] run particle dust 0.975 0.25 0.2 1 ~ ~ ~ 0.5 1 0.5 0 30
 
 # ダメージ
-    data modify storage api: Argument.Damage set from storage asset:context this.Damage.Vannila
+    data modify storage api: Argument.Damage set from storage asset:context this.Damage.Vanilla
     data modify storage api: Argument.AttackType set value "Magic"
     data modify storage api: Argument.ElementType set value "Fire"
     data modify storage api: Argument.DeathMessage append value '[{"translate": "%1$sは%2$sによって丸焦げにされてしまった","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"lib:","interpret":true}]}]'
diff --git a/Asset/data/asset/functions/mob/0420.astro_blaze/register.mcfunction b/Asset/data/asset/functions/mob/0420.astro_blaze/register.mcfunction
index 57535355f6..efd6572f27 100644
--- a/Asset/data/asset/functions/mob/0420.astro_blaze/register.mcfunction
+++ b/Asset/data/asset/functions/mob/0420.astro_blaze/register.mcfunction
@@ -62,6 +62,6 @@
     # 雷倍率 (float) (オプション)
         data modify storage asset:mob Resist.Thunder set value 0.6
 # フィールド
-    data modify storage asset:mob Field.Damage.Vannila set value 40f
+    data modify storage asset:mob Field.Damage.Vanilla set value 40f
     data modify storage asset:mob Field.Damage.Object set value 18f
     data modify storage asset:mob Field.Bullet set value 0

From a05a71a2c662ba095927f9f06f32d444a076c640 Mon Sep 17 00:00:00 2001
From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com>
Date: Mon, 15 Dec 2025 00:40:06 +0900
Subject: [PATCH 18/18] =?UTF-8?q?=E8=A6=96=E7=B7=9A=E3=81=8C=E9=80=9A?=
 =?UTF-8?q?=E3=81=A3=E3=81=A6=E3=81=84=E3=82=8B=E3=81=8B=E3=81=AE=E5=88=A4?=
 =?UTF-8?q?=E5=AE=9A=E3=82=92=E4=B8=80=E6=99=82storage=E3=81=A7=E3=81=AF?=
 =?UTF-8?q?=E3=81=AA=E3=81=8F=E3=83=95=E3=82=A3=E3=83=BC=E3=83=AB=E3=83=89?=
 =?UTF-8?q?=E3=81=A7=E5=AE=9F=E8=A3=85=E3=81=99=E3=82=8B=E3=82=88=E3=81=86?=
 =?UTF-8?q?=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mob/0420.astro_blaze/tick/check_through/.mcfunction   | 8 ++++----
 .../tick/check_through/success.mcfunction                 | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Asset/data/asset/functions/mob/0420.astro_blaze/tick/check_through/.mcfunction b/Asset/data/asset/functions/mob/0420.astro_blaze/tick/check_through/.mcfunction
index dac56c8e8b..07a8385511 100644
--- a/Asset/data/asset/functions/mob/0420.astro_blaze/tick/check_through/.mcfunction
+++ b/Asset/data/asset/functions/mob/0420.astro_blaze/tick/check_through/.mcfunction
@@ -4,14 +4,14 @@
 #
 # @within function asset:mob/0420.astro_blaze/tick/
 
+# 初期化
+    data modify storage asset:context this.Success set value false
+
 # 近くのプレイヤーに射線が通っているか？
     execute as @a[tag=!PlayerShouldInvulnerable,distance=..20,sort=nearest] facing entity @s eyes run function asset:mob/0420.astro_blaze/tick/check_through/recursive
 
 # 一度も成功してないなら失敗
-    execute unless data storage asset:temp {Success:true} run return run data remove storage asset:temp Success
-
-# リセット
-    data remove storage asset:temp Success
+    execute unless data storage asset:context this{Success:true} run return 0
 
 # 成功
     return 1
diff --git a/Asset/data/asset/functions/mob/0420.astro_blaze/tick/check_through/success.mcfunction b/Asset/data/asset/functions/mob/0420.astro_blaze/tick/check_through/success.mcfunction
index 19ef3a4777..af862c78b3 100644
--- a/Asset/data/asset/functions/mob/0420.astro_blaze/tick/check_through/success.mcfunction
+++ b/Asset/data/asset/functions/mob/0420.astro_blaze/tick/check_through/success.mcfunction
@@ -5,7 +5,7 @@
 # @within function asset:mob/0420.astro_blaze/tick/check_through/recursive
 
 # 成功判定
-    data modify storage asset:temp Success set value true
+    data modify storage asset:context this.Success set value true
 
 # 自身のUserIDをFieldへ入れておく
     execute store result storage asset:context this.TargetID int 1 run scoreboard players get @s UserID