From 7a4c558c63556cb1bc7a57a729cabc6dcddafe77 Mon Sep 17 00:00:00 2001
From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com>
Date: Sat, 17 Jan 2026 19:08:20 +0900
Subject: [PATCH 01/20] =?UTF-8?q?=E8=A6=8B=E3=81=9F=E7=9B=AE=E3=82=92?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hit_block/in_air.mcfunction               |  4 ++++
 .../2049.lightning_magic/register.mcfunction  |  1 +
 .../2049.lightning_magic/summon/.mcfunction   |  2 +-
 .../tick/on_ground.mcfunction                 |  8 +++++++-
 .../tick/text_frame.mcfunction                | 18 +++++++++++++++++
 .../tick/thunder.mcfunction                   |  4 ++--
 .../2257.thundercloud/_index.d.mcfunction     |  6 ++++++
 .../2257.thundercloud/register.mcfunction     | 20 +++++++++++++++++++
 .../2257.thundercloud/summon/.mcfunction      |  8 ++++++++
 .../object/2257.thundercloud/tick/.mcfunction | 17 ++++++++++++++++
 .../object/alias/2257/register.mcfunction     |  8 ++++++++
 .../object/alias/2257/summon.mcfunction       |  8 ++++++++
 .../object/alias/2257/tick.mcfunction         |  8 ++++++++
 13 files changed, 108 insertions(+), 4 deletions(-)
 create mode 100644 Asset/data/asset/functions/object/2049.lightning_magic/tick/text_frame.mcfunction
 create mode 100644 Asset/data/asset/functions/object/2257.thundercloud/_index.d.mcfunction
 create mode 100644 Asset/data/asset/functions/object/2257.thundercloud/register.mcfunction
 create mode 100644 Asset/data/asset/functions/object/2257.thundercloud/summon/.mcfunction
 create mode 100644 Asset/data/asset/functions/object/2257.thundercloud/tick/.mcfunction
 create mode 100644 Asset/data/asset/functions/object/alias/2257/register.mcfunction
 create mode 100644 Asset/data/asset/functions/object/alias/2257/summon.mcfunction
 create mode 100644 Asset/data/asset/functions/object/alias/2257/tick.mcfunction

diff --git a/Asset/data/asset/functions/object/2049.lightning_magic/hit_block/in_air.mcfunction b/Asset/data/asset/functions/object/2049.lightning_magic/hit_block/in_air.mcfunction
index 2684eb6678..ded867416c 100644
--- a/Asset/data/asset/functions/object/2049.lightning_magic/hit_block/in_air.mcfunction
+++ b/Asset/data/asset/functions/object/2049.lightning_magic/hit_block/in_air.mcfunction
@@ -13,6 +13,10 @@
 # Tagを付与
     tag @s add 2049.OnGround
 
+# PassengersのScaleを変更
+    execute on passengers if entity @s[type=text_display] run data modify entity @s transformation.scale set value [1.8f,1.8f,1.8f]
+    execute on passengers if entity @s[type=item_display] run data modify entity @s transformation.scale set value [1.8f,1.8f,1.8f]
+
 # MovePerStepを変更
     data modify storage asset:context this.MovePerStep set value 0.15
 
diff --git a/Asset/data/asset/functions/object/2049.lightning_magic/register.mcfunction b/Asset/data/asset/functions/object/2049.lightning_magic/register.mcfunction
index f61b1803b1..c3291a6bfb 100644
--- a/Asset/data/asset/functions/object/2049.lightning_magic/register.mcfunction
+++ b/Asset/data/asset/functions/object/2049.lightning_magic/register.mcfunction
@@ -15,6 +15,7 @@
 # ID (int)
     data modify storage asset:object ID set value 2049
 # フィールド(オプション)
+    data modify storage asset:object Field.Frame set value 5
     data modify storage asset:object Field.Damage set value 1f
     data modify storage asset:object Field.KillTick set value 120
     data modify storage asset:object Field.MobUUID set value -1
diff --git a/Asset/data/asset/functions/object/2049.lightning_magic/summon/.mcfunction b/Asset/data/asset/functions/object/2049.lightning_magic/summon/.mcfunction
index d1c332a9b2..118cc45a74 100644
--- a/Asset/data/asset/functions/object/2049.lightning_magic/summon/.mcfunction
+++ b/Asset/data/asset/functions/object/2049.lightning_magic/summon/.mcfunction
@@ -5,4 +5,4 @@
 # @within asset:object/alias/2049/summon
 
 # 元となるEntityを召喚する
-    summon marker ~ ~ ~ {Rotation:[0.0f,90.0f],Tags:["ObjectInit"]}
+    summon interaction ~ ~ ~ {Tags:["ObjectInit","Uninterferable"],width:0f,height:0f,Rotation:[0f,90f],Passengers:[{id:"text_display",Tags:["AutoKillWhenDieVehicle","ProcessCommonTag"],teleport_duration:1,billboard:"vertical",alignment:"center",brightness:{sky:15,block:15},text:'{"text":"0","font":"object/2049/0"}',background:16711680,transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],scale:[0f,0f,0f],translation:[0f,1.35f,0f]}},{id:"item_display",Rotation:[90f,0f],Tags:["AutoKillWhenDieVehicle","ProcessCommonTag"],teleport_duration:1,billboard:"vertical",item:{id:"stick",Count:1b,tag:{CustomModelData:20586}},transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],scale:[0f,0f,0f],translation:[0f,3.2f,0f]}}]}
diff --git a/Asset/data/asset/functions/object/2049.lightning_magic/tick/on_ground.mcfunction b/Asset/data/asset/functions/object/2049.lightning_magic/tick/on_ground.mcfunction
index b552fb9875..e50dfc461d 100644
--- a/Asset/data/asset/functions/object/2049.lightning_magic/tick/on_ground.mcfunction
+++ b/Asset/data/asset/functions/object/2049.lightning_magic/tick/on_ground.mcfunction
@@ -11,7 +11,13 @@
 # 一定間隔で実行
     scoreboard players operation $Interval Temporary = @s General.Object.Tick
     scoreboard players operation $Interval Temporary %= $8 Const
-    execute if score $Interval Temporary matches 0 at @s rotated ~ 0 run tag @s add 2049.Interval
+    execute if score $Interval Temporary matches 0 run tag @s add 2049.Interval
+    scoreboard players reset $Interval Temporary
+
+# 一定間隔でtext_displayのフレームを反映
+    scoreboard players operation $Interval Temporary = @s General.Object.Tick
+    scoreboard players operation $Interval Temporary %= $3 Const
+    execute if score $Interval Temporary matches 0 on passengers if entity @s[type=text_display] run function asset:object/2049.lightning_magic/tick/text_frame
     scoreboard players reset $Interval Temporary
 
 # IntervalTagがある時のみ実行
diff --git a/Asset/data/asset/functions/object/2049.lightning_magic/tick/text_frame.mcfunction b/Asset/data/asset/functions/object/2049.lightning_magic/tick/text_frame.mcfunction
new file mode 100644
index 0000000000..03c7d7cb8e
--- /dev/null
+++ b/Asset/data/asset/functions/object/2049.lightning_magic/tick/text_frame.mcfunction
@@ -0,0 +1,18 @@
+#> asset:object/2049.lightning_magic/tick/text_frame
+#
+#
+#
+# @within function asset:object/2049.lightning_magic/tick/on_ground
+
+# デクリメント
+    execute store result storage asset:context this.Frame int 0.9999999999 run data get storage asset:context this.Frame
+
+# フレーム反映
+    execute if data storage asset:context this{Frame:4} run data modify entity @s text set value '{"text":"1","font":"object/2049/0"}'
+    execute if data storage asset:context this{Frame:3} run data modify entity @s text set value '{"text":"2","font":"object/2049/0"}'
+    execute if data storage asset:context this{Frame:2} run data modify entity @s text set value '{"text":"3","font":"object/2049/0"}'
+    execute if data storage asset:context this{Frame:1} run data modify entity @s text set value '{"text":"4","font":"object/2049/0"}'
+    execute if data storage asset:context this{Frame:0} run data modify entity @s text set value '{"text":"0","font":"object/2049/0"}'
+
+# リセット
+    execute if data storage asset:context this{Frame:0} run data modify storage asset:context this.Frame set value 5
diff --git a/Asset/data/asset/functions/object/2049.lightning_magic/tick/thunder.mcfunction b/Asset/data/asset/functions/object/2049.lightning_magic/tick/thunder.mcfunction
index 01bac99a5a..fc70d9563a 100644
--- a/Asset/data/asset/functions/object/2049.lightning_magic/tick/thunder.mcfunction
+++ b/Asset/data/asset/functions/object/2049.lightning_magic/tick/thunder.mcfunction
@@ -5,7 +5,7 @@
 # @within function asset:object/2049.lightning_magic/tick/on_ground
 
 # 演出
-    function asset:object/2049.lightning_magic/tick/vfx/thunder
+    # function asset:object/2049.lightning_magic/tick/vfx/thunder
     execute positioned ~ ~0.2 ~ run function asset:object/2049.lightning_magic/tick/vfx/circle
-    particle dust 0.6 0.6 0.8 1.2 ~ ~3 ~ 0.6 0.05 0.6 0 50 normal @a
+    # particle dust 0.6 0.6 0.8 1.2 ~ ~3 ~ 0.6 0.05 0.6 0 50 normal @a
     playsound entity.lightning_bolt.thunder hostile @a ~ ~ ~ 0.3 2 0
diff --git a/Asset/data/asset/functions/object/2257.thundercloud/_index.d.mcfunction b/Asset/data/asset/functions/object/2257.thundercloud/_index.d.mcfunction
new file mode 100644
index 0000000000..8e48a187d6
--- /dev/null
+++ b/Asset/data/asset/functions/object/2257.thundercloud/_index.d.mcfunction
@@ -0,0 +1,6 @@
+#> asset:object/2257.thundercloud/_index.d
+# @private
+
+#> tag
+# @within function asset:object/2257.thundercloud/**
+    #declare
\ No newline at end of file
diff --git a/Asset/data/asset/functions/object/2257.thundercloud/register.mcfunction b/Asset/data/asset/functions/object/2257.thundercloud/register.mcfunction
new file mode 100644
index 0000000000..f362127736
--- /dev/null
+++ b/Asset/data/asset/functions/object/2257.thundercloud/register.mcfunction
@@ -0,0 +1,20 @@
+#> asset:object/2257.thundercloud/register
+#
+# Objectのデータを指定
+#
+# @within function asset:object/alias/2257/register
+
+# 継承(オプション)
+    # data modify storage asset:object Extends append value 
+    # function asset:object/extends
+# 他のObjectに継承されることを許可するか (boolean) (オプション)
+    # 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 
+
+# ID (int)
+    data modify storage asset:object ID set value 2257
+# フィールド(オプション)
+    # data modify storage asset:object Field.myValue set value 
\ No newline at end of file
diff --git a/Asset/data/asset/functions/object/2257.thundercloud/summon/.mcfunction b/Asset/data/asset/functions/object/2257.thundercloud/summon/.mcfunction
new file mode 100644
index 0000000000..eeb7837e09
--- /dev/null
+++ b/Asset/data/asset/functions/object/2257.thundercloud/summon/.mcfunction
@@ -0,0 +1,8 @@
+#> asset:object/2257.thundercloud/summon/
+#
+# Object召喚処理の呼び出し時に実行されるfunction
+#
+# @within asset:object/alias/2257/summon
+
+# 元となるEntityを召喚する
+    summon text_display ~ ~ ~ {Tags:["ObjectInit"],billboard:"vertical",alignment:"center",brightness:{sky:15,block:15},text:'{"text":"0","font":"object/2257/0"}',background:16711680,Passengers:[{id:"item_display",Tags:["AutoKillWhenDieVehicle","ProcessCommonTag"],billboard:"vertical",item:{id:"stick",Count:1b,tag:{CustomModelData:20586}},transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],scale:[1f,1f,1f],translation:[0f,1.2f,0f]}}]}
diff --git a/Asset/data/asset/functions/object/2257.thundercloud/tick/.mcfunction b/Asset/data/asset/functions/object/2257.thundercloud/tick/.mcfunction
new file mode 100644
index 0000000000..e689ef1c2b
--- /dev/null
+++ b/Asset/data/asset/functions/object/2257.thundercloud/tick/.mcfunction
@@ -0,0 +1,17 @@
+#> asset:object/2257.thundercloud/tick/
+#
+# Objectのtick時の処理
+#
+# @within asset:object/alias/2257/tick
+
+# Tick加算
+    scoreboard players add @s General.Object.Tick 1
+
+# 描画
+    execute if score @s General.Object.Tick matches 3 run data modify entity @s text set value '{"text":"1","font":"object/2257/0"}'
+    execute if score @s General.Object.Tick matches 6 run data modify entity @s text set value '{"text":"2","font":"object/2257/0"}'
+    execute if score @s General.Object.Tick matches 9 run data modify entity @s text set value '{"text":"3","font":"object/2257/0"}'
+    execute if score @s General.Object.Tick matches 12 run data modify entity @s text set value '{"text":"4","font":"object/2257/0"}'
+
+# 消滅処理
+    kill @s[scores={General.Object.Tick=12..}]
diff --git a/Asset/data/asset/functions/object/alias/2257/register.mcfunction b/Asset/data/asset/functions/object/alias/2257/register.mcfunction
new file mode 100644
index 0000000000..04d5d4ce0f
--- /dev/null
+++ b/Asset/data/asset/functions/object/alias/2257/register.mcfunction
@@ -0,0 +1,8 @@
+#> asset:object/alias/2257/register
+#
+# Objectのデータ指定処理のエイリアス
+#
+# @within asset_manager:object/summon/register.m
+
+# 元の登録処理を呼び出す
+    function asset:object/2257.thundercloud/register
\ No newline at end of file
diff --git a/Asset/data/asset/functions/object/alias/2257/summon.mcfunction b/Asset/data/asset/functions/object/alias/2257/summon.mcfunction
new file mode 100644
index 0000000000..04e3e71ab9
--- /dev/null
+++ b/Asset/data/asset/functions/object/alias/2257/summon.mcfunction
@@ -0,0 +1,8 @@
+#> asset:object/alias/2257/summon
+#
+# Object召喚処理のエイリアス
+#
+# @within asset_manager:object/summon/summon.m
+
+# 元の召喚処理を呼び出す
+    function asset:object/2257.thundercloud/summon/
\ No newline at end of file
diff --git a/Asset/data/asset/functions/object/alias/2257/tick.mcfunction b/Asset/data/asset/functions/object/alias/2257/tick.mcfunction
new file mode 100644
index 0000000000..701b0ac131
--- /dev/null
+++ b/Asset/data/asset/functions/object/alias/2257/tick.mcfunction
@@ -0,0 +1,8 @@
+#> asset:object/alias/2257/tick
+#
+# Tick時処理のエイリアス
+#
+# @within asset_manager:object/tick/tick.m
+
+# 元のTick処理を呼び出す
+    function asset:object/2257.thundercloud/tick/
\ No newline at end of file

From 9a38391d9e26ca673121ab6c4fa7c258f5c13c43 Mon Sep 17 00:00:00 2001
From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com>
Date: Sat, 17 Jan 2026 19:08:44 +0900
Subject: [PATCH 02/20] =?UTF-8?q?=E4=B8=8D=E8=A6=81=E3=81=AA=E5=87=A6?=
 =?UTF-8?q?=E7=90=86=E3=82=92=E5=89=8A=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tick/thunder.mcfunction                   |  2 --
 .../tick/vfx/thunder.mcfunction               | 33 -------------------
 2 files changed, 35 deletions(-)
 delete mode 100644 Asset/data/asset/functions/object/2049.lightning_magic/tick/vfx/thunder.mcfunction

diff --git a/Asset/data/asset/functions/object/2049.lightning_magic/tick/thunder.mcfunction b/Asset/data/asset/functions/object/2049.lightning_magic/tick/thunder.mcfunction
index fc70d9563a..871de89276 100644
--- a/Asset/data/asset/functions/object/2049.lightning_magic/tick/thunder.mcfunction
+++ b/Asset/data/asset/functions/object/2049.lightning_magic/tick/thunder.mcfunction
@@ -5,7 +5,5 @@
 # @within function asset:object/2049.lightning_magic/tick/on_ground
 
 # 演出
-    # function asset:object/2049.lightning_magic/tick/vfx/thunder
     execute positioned ~ ~0.2 ~ run function asset:object/2049.lightning_magic/tick/vfx/circle
-    # particle dust 0.6 0.6 0.8 1.2 ~ ~3 ~ 0.6 0.05 0.6 0 50 normal @a
     playsound entity.lightning_bolt.thunder hostile @a ~ ~ ~ 0.3 2 0
diff --git a/Asset/data/asset/functions/object/2049.lightning_magic/tick/vfx/thunder.mcfunction b/Asset/data/asset/functions/object/2049.lightning_magic/tick/vfx/thunder.mcfunction
deleted file mode 100644
index c42a5e8537..0000000000
--- a/Asset/data/asset/functions/object/2049.lightning_magic/tick/vfx/thunder.mcfunction
+++ /dev/null
@@ -1,33 +0,0 @@
-#> asset:object/2049.lightning_magic/tick/vfx/thunder
-#
-# 雷のvfx
-#
-# @within function asset:object/2049.lightning_magic/tick/thunder
-
-# [ImportKey]: NobwRALgngDgpmAXGANgSwHYIDRgK55oAmSYATAAwDMARgOwUVwC0AZgIwU3MAsAnAA4qzAIYA2AKzDWRAMaUxNMezhU+YXBhEBbBMkBbvgAJ2GsDBEAnHQGck4WQHs8GCEjITcrCw+12wANxEUPD1wAA8kClwoSIBfWNwIBz9A4NCwCMQosBjEKnjcB1ZWazhXLNwaOAAvNDgLSNw0awAhGrqLAFEARzwglCgAZXNZOBJEViDS+IBdIA_3
-# 線 1
-particle dust 1 1 0 1.2 ~ ~0 ~ 0.05 0 0.05 0 1
-particle dust 1 1 0 1.2 ~ ~0.125 ~ 0.05 0 0.05 0 1
-particle dust 1 1 0 1.2 ~ ~0.25 ~ 0.05 0 0.05 0 1
-particle dust 1 1 0 1.2 ~ ~0.375 ~ 0.05 0 0.05 0 1
-particle dust 1 1 0 1.2 ~ ~0.5 ~ 0.05 0 0.05 0 1
-particle dust 1 1 0 1.2 ~ ~0.625 ~ 0.05 0 0.05 0 1
-particle dust 1 1 0 1.2 ~ ~0.75 ~ 0.05 0 0.05 0 1
-particle dust 1 1 0 1.2 ~ ~0.875 ~ 0.05 0 0.05 0 1
-particle dust 1 1 0 1.2 ~ ~1 ~ 0.05 0 0.05 0 1
-particle dust 1 1 0 1.2 ~ ~1.125 ~ 0.05 0 0.05 0 1
-particle dust 1 1 0 1.2 ~ ~1.25 ~ 0.05 0 0.05 0 1
-particle dust 1 1 0 1.2 ~ ~1.375 ~ 0.05 0 0.05 0 1
-particle dust 1 1 0 1.2 ~ ~1.5 ~ 0.05 0 0.05 0 1
-particle dust 1 1 0 1.2 ~ ~1.625 ~ 0.05 0 0.05 0 1
-particle dust 1 1 0 1.2 ~ ~1.75 ~ 0.05 0 0.05 0 1
-particle dust 1 1 0 1.2 ~ ~1.875 ~ 0.05 0 0.05 0 1
-particle dust 1 1 0 1.2 ~ ~2 ~ 0.05 0 0.05 0 1
-particle dust 1 1 0 1.2 ~ ~2.125 ~ 0.05 0 0.05 0 1
-particle dust 1 1 0 1.2 ~ ~2.25 ~ 0.05 0 0.05 0 1
-particle dust 1 1 0 1.2 ~ ~2.375 ~ 0.05 0 0.05 0 1
-particle dust 1 1 0 1.2 ~ ~2.5 ~ 0.05 0 0.05 0 1
-particle dust 1 1 0 1.2 ~ ~2.625 ~ 0.05 0 0.05 0 1
-particle dust 1 1 0 1.2 ~ ~2.75 ~ 0.05 0 0.05 0 1
-particle dust 1 1 0 1.2 ~ ~2.875 ~ 0.05 0 0.05 0 1
-particle dust 1 1 0 1.2 ~ ~3 ~ 0.05 0 0.05 0 1

From 59f5c0ca7118d472bcaf7ca6df8ae6ec1014d574 Mon Sep 17 00:00:00 2001
From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com>
Date: Sat, 17 Jan 2026 19:32:54 +0900
Subject: [PATCH 03/20] =?UTF-8?q?=E5=87=A6=E7=90=86=E3=81=AE=E8=AB=B8?=
 =?UTF-8?q?=E3=80=85=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tick/summon.mcfunction                       |  2 +-
 .../hit_block/in_air.mcfunction                  |  6 +++---
 .../object/2049.lightning_magic/init/.mcfunction | 16 ----------------
 .../object/2049.lightning_magic/load.mcfunction  |  9 ---------
 .../2049.lightning_magic/register.mcfunction     | 11 ++++++++++-
 .../object/2049.lightning_magic/tick/.mcfunction | 14 +++++---------
 .../2049.lightning_magic/tick/in_air.mcfunction  |  3 +++
 .../tick/on_ground.mcfunction                    |  7 +++++--
 .../functions/object/alias/2049/init.mcfunction  |  8 --------
 Asset/data/asset/tags/functions/object/load.json |  3 +--
 10 files changed, 28 insertions(+), 51 deletions(-)
 delete mode 100644 Asset/data/asset/functions/object/2049.lightning_magic/init/.mcfunction
 delete mode 100644 Asset/data/asset/functions/object/2049.lightning_magic/load.mcfunction
 delete mode 100644 Asset/data/asset/functions/object/alias/2049/init.mcfunction

diff --git a/Asset/data/asset/functions/mob/0371.lightning_spellbook/tick/summon.mcfunction b/Asset/data/asset/functions/mob/0371.lightning_spellbook/tick/summon.mcfunction
index b67d1b3960..473470aa9d 100644
--- a/Asset/data/asset/functions/mob/0371.lightning_spellbook/tick/summon.mcfunction
+++ b/Asset/data/asset/functions/mob/0371.lightning_spellbook/tick/summon.mcfunction
@@ -15,7 +15,7 @@
 # KillTickを設定 (116 + 難易度値 * 16)
 # ((KillTick - 100) / 8) 回だけ攻撃する
     scoreboard players operation $Difficulty Temporary *= $16 Const
-    execute store result storage api: Argument.FieldOverride.KillTick int 1 run scoreboard players add $Difficulty Temporary 116
+    execute store result storage api: Argument.FieldOverride.OnGroundTick int 1 run scoreboard players add $Difficulty Temporary 116
 
 # 魔法を召喚
     data modify storage api: Argument.ID set value 2049
diff --git a/Asset/data/asset/functions/object/2049.lightning_magic/hit_block/in_air.mcfunction b/Asset/data/asset/functions/object/2049.lightning_magic/hit_block/in_air.mcfunction
index ded867416c..33c29e1ca0 100644
--- a/Asset/data/asset/functions/object/2049.lightning_magic/hit_block/in_air.mcfunction
+++ b/Asset/data/asset/functions/object/2049.lightning_magic/hit_block/in_air.mcfunction
@@ -7,12 +7,12 @@
 # プレイヤーの方を向く
     tp @s ~ ~ ~ facing entity @p feet
 
-# Tickの値を変更
-    scoreboard players set @s General.Object.Tick 100
-
 # Tagを付与
     tag @s add 2049.OnGround
 
+# 着地判定
+    data modify storage asset:context this.InAirLimitTick set value -1
+
 # PassengersのScaleを変更
     execute on passengers if entity @s[type=text_display] run data modify entity @s transformation.scale set value [1.8f,1.8f,1.8f]
     execute on passengers if entity @s[type=item_display] run data modify entity @s transformation.scale set value [1.8f,1.8f,1.8f]
diff --git a/Asset/data/asset/functions/object/2049.lightning_magic/init/.mcfunction b/Asset/data/asset/functions/object/2049.lightning_magic/init/.mcfunction
deleted file mode 100644
index 11e3faaa64..0000000000
--- a/Asset/data/asset/functions/object/2049.lightning_magic/init/.mcfunction
+++ /dev/null
@@ -1,16 +0,0 @@
-#> asset:object/2049.lightning_magic/init/
-#
-# Objectのinit時の処理
-#
-# @within asset:object/alias/2049/init
-
-# スピード関連を設定
-    data modify storage asset:context this.Speed set value 1
-    data modify storage asset:context this.Range set value 250
-    data modify storage asset:context this.MovePerStep set value 0.3
-
-# KillTickを設定
-    execute store result score @s 2049.KillTick run data get storage asset:context this.KillTick
-
-# 継承
-    function asset:object/super.init
diff --git a/Asset/data/asset/functions/object/2049.lightning_magic/load.mcfunction b/Asset/data/asset/functions/object/2049.lightning_magic/load.mcfunction
deleted file mode 100644
index 01b8b10474..0000000000
--- a/Asset/data/asset/functions/object/2049.lightning_magic/load.mcfunction
+++ /dev/null
@@ -1,9 +0,0 @@
-#> asset:object/2049.lightning_magic/load
-#
-# Objectに利用するスコアボード等の初期化処理
-#
-# @within tag/function asset:object/load
-
-#> 定義類はここに
-# @within function asset:object/2049.lightning_magic/**
-    scoreboard objectives add 2049.KillTick dummy
diff --git a/Asset/data/asset/functions/object/2049.lightning_magic/register.mcfunction b/Asset/data/asset/functions/object/2049.lightning_magic/register.mcfunction
index c3291a6bfb..82bf1acfe4 100644
--- a/Asset/data/asset/functions/object/2049.lightning_magic/register.mcfunction
+++ b/Asset/data/asset/functions/object/2049.lightning_magic/register.mcfunction
@@ -15,7 +15,16 @@
 # ID (int)
     data modify storage asset:object ID set value 2049
 # フィールド(オプション)
+
+# 飛翔体抽象関連
+    data modify storage asset:object Field.Speed set value 1
+    data modify storage asset:object Field.Range set value 250
+    data modify storage asset:object Field.MovePerStep set value 0.3
+# text_displayのフレーム用
     data modify storage asset:object Field.Frame set value 5
+# 何tickで消滅するか？
+    data modify storage asset:object Field.InAirLimitTick set value 80
+    data modify storage asset:object Field.OnGroundTick set value 120
+# ダメージ
     data modify storage asset:object Field.Damage set value 1f
-    data modify storage asset:object Field.KillTick set value 120
     data modify storage asset:object Field.MobUUID set value -1
diff --git a/Asset/data/asset/functions/object/2049.lightning_magic/tick/.mcfunction b/Asset/data/asset/functions/object/2049.lightning_magic/tick/.mcfunction
index c9a05e1180..2600b62e20 100644
--- a/Asset/data/asset/functions/object/2049.lightning_magic/tick/.mcfunction
+++ b/Asset/data/asset/functions/object/2049.lightning_magic/tick/.mcfunction
@@ -4,14 +4,11 @@
 #
 # @within asset:object/alias/2049/tick
 
-# Tick加算
-    scoreboard players add @s General.Object.Tick 1
-
 # 空中にいるときの処理
-    execute if entity @s[scores={General.Object.Tick=..79}] run function asset:object/2049.lightning_magic/tick/in_air
+    execute if entity @s[tag=!2049.OnGround] run function asset:object/2049.lightning_magic/tick/in_air
 
 # 地面にいるときの処理
-    execute if entity @s[scores={General.Object.Tick=100..}] at @s rotated ~ 0 run function asset:object/2049.lightning_magic/tick/on_ground
+    execute if entity @s[tag= 2049.OnGround] at @s rotated ~ 0 run function asset:object/2049.lightning_magic/tick/on_ground
 
 # 継承
     execute at @s run function asset:object/super.tick
@@ -20,7 +17,6 @@
     tag @s[tag=2049.Interval] remove 2049.Interval
 
 # 消滅
-# 80..99 着陸前で4秒以上経過で消滅
-# 100.. 汎用Tick > KillTickなら消滅
-    execute if entity @s[scores={General.Object.Tick=80..99}] run kill @s
-    execute if score @s General.Object.Tick >= @s 2049.KillTick run kill @s
+# InAirLimitTick == 0 || Tick == 0
+    execute if data storage asset:context this{InAirLimitTick:0} run kill @s
+    execute if data storage asset:context this{OnGroundTick:0} run kill @s
diff --git a/Asset/data/asset/functions/object/2049.lightning_magic/tick/in_air.mcfunction b/Asset/data/asset/functions/object/2049.lightning_magic/tick/in_air.mcfunction
index cce22e927e..1b3770cb7b 100644
--- a/Asset/data/asset/functions/object/2049.lightning_magic/tick/in_air.mcfunction
+++ b/Asset/data/asset/functions/object/2049.lightning_magic/tick/in_air.mcfunction
@@ -4,6 +4,9 @@
 #
 # @within function asset:object/2049.lightning_magic/tick/
 
+# 空中に存在可能なTickのデクリメント
+    execute store result storage asset:context this.InAirLimitTick int 0.9999999999 run data get storage asset:context this.InAirLimitTick
+
 # 演出
     particle dust 1 1 0 1.3 ~ ~ ~ 0.05 0.05 0.05 0 1 normal @a
     particle electric_spark ~ ~ ~ 0.05 0.05 0.05 0 2 normal @a
diff --git a/Asset/data/asset/functions/object/2049.lightning_magic/tick/on_ground.mcfunction b/Asset/data/asset/functions/object/2049.lightning_magic/tick/on_ground.mcfunction
index e50dfc461d..9eff94f3e0 100644
--- a/Asset/data/asset/functions/object/2049.lightning_magic/tick/on_ground.mcfunction
+++ b/Asset/data/asset/functions/object/2049.lightning_magic/tick/on_ground.mcfunction
@@ -8,14 +8,17 @@
 # @private
     #declare score_holder $Interval
 
+# 地上での存在時間のデクリメント
+    execute store result storage asset:context this.OnGroundTick int 0.9999999999 run data get storage asset:context this.OnGroundTick
+
 # 一定間隔で実行
-    scoreboard players operation $Interval Temporary = @s General.Object.Tick
+    execute store result score $Interval Temporary run data get storage asset:context this.OnGroundTick
     scoreboard players operation $Interval Temporary %= $8 Const
     execute if score $Interval Temporary matches 0 run tag @s add 2049.Interval
     scoreboard players reset $Interval Temporary
 
 # 一定間隔でtext_displayのフレームを反映
-    scoreboard players operation $Interval Temporary = @s General.Object.Tick
+    execute store result score $Interval Temporary run data get storage asset:context this.OnGroundTick
     scoreboard players operation $Interval Temporary %= $3 Const
     execute if score $Interval Temporary matches 0 on passengers if entity @s[type=text_display] run function asset:object/2049.lightning_magic/tick/text_frame
     scoreboard players reset $Interval Temporary
diff --git a/Asset/data/asset/functions/object/alias/2049/init.mcfunction b/Asset/data/asset/functions/object/alias/2049/init.mcfunction
deleted file mode 100644
index 41f002719d..0000000000
--- a/Asset/data/asset/functions/object/alias/2049/init.mcfunction
+++ /dev/null
@@ -1,8 +0,0 @@
-#> asset:object/alias/2049/init
-#
-# Init処理のエイリアス
-#
-# @within asset_manager:object/init/init.m
-
-# 元のInit処理を呼び出す
-    function asset:object/2049.lightning_magic/init/
\ No newline at end of file
diff --git a/Asset/data/asset/tags/functions/object/load.json b/Asset/data/asset/tags/functions/object/load.json
index 7046352e61..f4cc9fc634 100644
--- a/Asset/data/asset/tags/functions/object/load.json
+++ b/Asset/data/asset/tags/functions/object/load.json
@@ -46,7 +46,6 @@
         "asset:object/1039.thelema_persuit_entity/load",
         "asset:object/1038.thelema_slash_entity/load",
         "asset:object/2048.wave_magic/load",
-        "asset:object/2049.lightning_magic/load",
         "asset:object/1055.elemental_fish/load",
         "asset:object/2074.water_magic/load",
         "asset:object/2063.damage_area/load",
@@ -58,4 +57,4 @@
         "asset:object/1059.book_of_hero/load",
         "asset:object/2031.giant_pumpkin/load"
     ]
-}
\ No newline at end of file
+}

From 339ccd849ba7dd205c24fc58702da2ac5098ea24 Mon Sep 17 00:00:00 2001
From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com>
Date: Sat, 17 Jan 2026 19:55:12 +0900
Subject: [PATCH 04/20] =?UTF-8?q?kill=E3=83=A1=E3=82=BD=E3=83=83=E3=83=89?=
 =?UTF-8?q?=E3=82=92=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../2049.lightning_magic/hit_entity/.mcfunction      |  2 +-
 .../object/2049.lightning_magic/kill/.mcfunction     | 12 ++++++++++++
 .../object/2049.lightning_magic/tick/.mcfunction     |  4 ++--
 .../2049.lightning_magic/tick/on_ground.mcfunction   |  2 +-
 .../functions/object/alias/2049/kill.mcfunction      |  8 ++++++++
 5 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100644 Asset/data/asset/functions/object/2049.lightning_magic/kill/.mcfunction
 create mode 100644 Asset/data/asset/functions/object/alias/2049/kill.mcfunction

diff --git a/Asset/data/asset/functions/object/2049.lightning_magic/hit_entity/.mcfunction b/Asset/data/asset/functions/object/2049.lightning_magic/hit_entity/.mcfunction
index 132f8cb787..ed0de96bc9 100644
--- a/Asset/data/asset/functions/object/2049.lightning_magic/hit_entity/.mcfunction
+++ b/Asset/data/asset/functions/object/2049.lightning_magic/hit_entity/.mcfunction
@@ -17,4 +17,4 @@
     function api:damage/reset
 
 # 消滅
-    function asset:object/call.m {method:kill}
+    function asset:object/call.m {method:"kill"}
diff --git a/Asset/data/asset/functions/object/2049.lightning_magic/kill/.mcfunction b/Asset/data/asset/functions/object/2049.lightning_magic/kill/.mcfunction
new file mode 100644
index 0000000000..e969916c5a
--- /dev/null
+++ b/Asset/data/asset/functions/object/2049.lightning_magic/kill/.mcfunction
@@ -0,0 +1,12 @@
+#> asset:object/2049.lightning_magic/kill/
+#
+# 継承先などから実行される処理
+#
+# @within asset:object/alias/2049/kill
+
+# 演出
+    particle flash ~ ~1.2 ~ 0 0 0 0 1
+
+# 消滅
+    execute on passengers run kill @s
+    kill @s
diff --git a/Asset/data/asset/functions/object/2049.lightning_magic/tick/.mcfunction b/Asset/data/asset/functions/object/2049.lightning_magic/tick/.mcfunction
index 2600b62e20..6125f12f03 100644
--- a/Asset/data/asset/functions/object/2049.lightning_magic/tick/.mcfunction
+++ b/Asset/data/asset/functions/object/2049.lightning_magic/tick/.mcfunction
@@ -18,5 +18,5 @@
 
 # 消滅
 # InAirLimitTick == 0 || Tick == 0
-    execute if data storage asset:context this{InAirLimitTick:0} run kill @s
-    execute if data storage asset:context this{OnGroundTick:0} run kill @s
+    execute if data storage asset:context this{InAirLimitTick:0} run function asset:object/call.m {method:"kill"}
+    execute if data storage asset:context this{OnGroundTick:0} run function asset:object/call.m {method:"kill"}
diff --git a/Asset/data/asset/functions/object/2049.lightning_magic/tick/on_ground.mcfunction b/Asset/data/asset/functions/object/2049.lightning_magic/tick/on_ground.mcfunction
index 9eff94f3e0..23f2eaa983 100644
--- a/Asset/data/asset/functions/object/2049.lightning_magic/tick/on_ground.mcfunction
+++ b/Asset/data/asset/functions/object/2049.lightning_magic/tick/on_ground.mcfunction
@@ -19,7 +19,7 @@
 
 # 一定間隔でtext_displayのフレームを反映
     execute store result score $Interval Temporary run data get storage asset:context this.OnGroundTick
-    scoreboard players operation $Interval Temporary %= $3 Const
+    scoreboard players operation $Interval Temporary %= $2 Const
     execute if score $Interval Temporary matches 0 on passengers if entity @s[type=text_display] run function asset:object/2049.lightning_magic/tick/text_frame
     scoreboard players reset $Interval Temporary
 
diff --git a/Asset/data/asset/functions/object/alias/2049/kill.mcfunction b/Asset/data/asset/functions/object/alias/2049/kill.mcfunction
new file mode 100644
index 0000000000..6974e36a5c
--- /dev/null
+++ b/Asset/data/asset/functions/object/alias/2049/kill.mcfunction
@@ -0,0 +1,8 @@
+#> asset:object/alias/2049/kill
+#
+# メソッド処理のエイリアス
+#
+# @within asset_manager:object/call_method/run_method.m
+
+# 元のメソッド処理を呼び出す
+    function asset:object/2049.lightning_magic/kill/
\ No newline at end of file

From 8cd65713b3566ed7a90520173eea6fb3cc1dfa3b Mon Sep 17 00:00:00 2001
From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com>
Date: Sat, 17 Jan 2026 19:56:20 +0900
Subject: [PATCH 05/20] =?UTF-8?q?=E5=87=A6=E7=90=86=E3=81=AE=E5=A4=89?=
 =?UTF-8?q?=E6=9B=B4=E3=81=AB=E4=BC=B4=E3=81=A3=E3=81=A6=E5=8F=AC=E5=96=9A?=
 =?UTF-8?q?=E6=99=82=E3=81=AEFieldOverride=E3=82=92=E5=A4=89=E3=81=88?=
 =?UTF-8?q?=E5=BF=98=E3=82=8C=E3=81=A6=E3=81=84=E3=81=9F=E5=95=8F=E9=A1=8C?=
 =?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

---
 .../mob/0371.lightning_spellbook/tick/summon.mcfunction       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Asset/data/asset/functions/mob/0371.lightning_spellbook/tick/summon.mcfunction b/Asset/data/asset/functions/mob/0371.lightning_spellbook/tick/summon.mcfunction
index 473470aa9d..d97ddd8f80 100644
--- a/Asset/data/asset/functions/mob/0371.lightning_spellbook/tick/summon.mcfunction
+++ b/Asset/data/asset/functions/mob/0371.lightning_spellbook/tick/summon.mcfunction
@@ -13,9 +13,9 @@
     execute store result score $Difficulty Temporary run data get storage api: Return.Difficulty
 
 # KillTickを設定 (116 + 難易度値 * 16)
-# ((KillTick - 100) / 8) 回だけ攻撃する
+# (KillTick / 8) 回だけ攻撃する
     scoreboard players operation $Difficulty Temporary *= $16 Const
-    execute store result storage api: Argument.FieldOverride.OnGroundTick int 1 run scoreboard players add $Difficulty Temporary 116
+    execute store result storage api: Argument.FieldOverride.OnGroundTick int 1 run scoreboard players add $Difficulty Temporary 16
 
 # 魔法を召喚
     data modify storage api: Argument.ID set value 2049

From d966f40d5ea8addad7b013b43218351ffaeb4cd9 Mon Sep 17 00:00:00 2001
From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com>
Date: Sat, 17 Jan 2026 20:05:23 +0900
Subject: [PATCH 06/20] =?UTF-8?q?Object=E5=8F=AC=E5=96=9A=E6=99=82?=
 =?UTF-8?q?=E3=81=AE=E3=82=BB=E3=83=AC=E3=82=AF=E3=82=BF=E3=83=BC=E3=83=9F?=
 =?UTF-8?q?=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

---
 .../mob/0371.lightning_spellbook/tick/summon.mcfunction         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Asset/data/asset/functions/mob/0371.lightning_spellbook/tick/summon.mcfunction b/Asset/data/asset/functions/mob/0371.lightning_spellbook/tick/summon.mcfunction
index d97ddd8f80..dcd3582e0b 100644
--- a/Asset/data/asset/functions/mob/0371.lightning_spellbook/tick/summon.mcfunction
+++ b/Asset/data/asset/functions/mob/0371.lightning_spellbook/tick/summon.mcfunction
@@ -20,7 +20,7 @@
 # 魔法を召喚
     data modify storage api: Argument.ID set value 2049
     data modify storage api: Argument.FieldOverride.Damage set from storage asset:context this.Damage
-    execute store result storage api: Argument.FieldOverride.MobUUID int 1 run scoreboard players get @e[type=zombie,tag=this,distance=..3,limit=1] MobUUID
+    execute store result storage api: Argument.FieldOverride.MobUUID int 1 run scoreboard players get @s MobUUID
     function api:object/summon
 
 # リセット

From 1bc3888be74b32ec2ab46b7d0af97e439629a3fe Mon Sep 17 00:00:00 2001
From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com>
Date: Sat, 17 Jan 2026 20:17:17 +0900
Subject: [PATCH 07/20] =?UTF-8?q?=E3=83=92=E3=83=83=E3=83=88=E5=88=A4?=
 =?UTF-8?q?=E5=AE=9A=E3=82=92=E5=86=86=E6=9F=B1Lib=E3=82=92=E7=94=A8?=
 =?UTF-8?q?=E3=81=84=E3=81=A6=E5=88=A4=E5=AE=9A=E3=81=99=E3=82=8B=E3=82=88?=
 =?UTF-8?q?=E3=81=86=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../detect_hit_entity/.mcfunction                     |  2 +-
 .../2049.lightning_magic/hit_entity/.mcfunction       | 11 ++++++++++-
 .../2049.lightning_magic/tick/on_ground.mcfunction    |  4 ++--
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/Asset/data/asset/functions/object/2049.lightning_magic/detect_hit_entity/.mcfunction b/Asset/data/asset/functions/object/2049.lightning_magic/detect_hit_entity/.mcfunction
index b86d488c5c..6f07018696 100644
--- a/Asset/data/asset/functions/object/2049.lightning_magic/detect_hit_entity/.mcfunction
+++ b/Asset/data/asset/functions/object/2049.lightning_magic/detect_hit_entity/.mcfunction
@@ -5,4 +5,4 @@
 # @within asset:object/alias/2049/detect_hit_entity
 
 # 地面に着いた後、かつIntervalTagのある時のみ判定
-    execute if entity @s[tag=2049.OnGround,tag=2049.Interval] if entity @p[distance=..1.2] run data modify storage asset:context IsHitEntity set value true
+    execute if entity @s[tag=2049.OnGround,tag=2049.Interval] if entity @p[tag=!PlayerShouldInvulnerable,distance=..3.2] run data modify storage asset:context IsHitEntity set value true
diff --git a/Asset/data/asset/functions/object/2049.lightning_magic/hit_entity/.mcfunction b/Asset/data/asset/functions/object/2049.lightning_magic/hit_entity/.mcfunction
index ed0de96bc9..a232d4defd 100644
--- a/Asset/data/asset/functions/object/2049.lightning_magic/hit_entity/.mcfunction
+++ b/Asset/data/asset/functions/object/2049.lightning_magic/hit_entity/.mcfunction
@@ -4,6 +4,12 @@
 #
 # @within asset:object/alias/2049/hit_entity
 
+# 円柱Libを用いて判定する
+    data modify storage lib: Argument.BoundingCylinder.Radius set value 1.2d
+    data modify storage lib: Argument.BoundingCylinder.Height set value 3.25d
+    data modify storage lib: Argument.BoundingCylinder.Selector set value "@a[tag=!PlayerShouldInvulnerable,distance=..5]"
+    execute positioned ~ ~-0.25 ~ run function lib:bounding_cylinder/
+
 # MobのAttackトリガー起動用Metadata
     data modify storage api: Argument.Metadata set value "371.Debuff"
 
@@ -13,8 +19,11 @@
     data modify storage api: Argument.ElementType set value "Thunder"
     data modify storage api: Argument.MobUUID set from storage asset:context this.MobUUID
     function api:damage/modifier_manual
-    execute as @a[tag=!PlayerShouldInvulnerable,distance=..1.2] run function api:damage/
+    execute as @a[tag=BoundingCylinder,distance=..5] run function api:damage/
     function api:damage/reset
 
+# リセット
+    tag @a[tag=BoundingCylinder,distance=..5] remove BoundingCylinder
+
 # 消滅
     function asset:object/call.m {method:"kill"}
diff --git a/Asset/data/asset/functions/object/2049.lightning_magic/tick/on_ground.mcfunction b/Asset/data/asset/functions/object/2049.lightning_magic/tick/on_ground.mcfunction
index 23f2eaa983..def740b76b 100644
--- a/Asset/data/asset/functions/object/2049.lightning_magic/tick/on_ground.mcfunction
+++ b/Asset/data/asset/functions/object/2049.lightning_magic/tick/on_ground.mcfunction
@@ -27,5 +27,5 @@
     execute if entity @s[tag=2049.Interval] run function asset:object/2049.lightning_magic/tick/thunder
 
 # プレイヤーの方向へ誘導する
-    execute if predicate api:global_vars/difficulty/max/2_hard facing entity @p feet positioned ^ ^ ^-100 rotated as @s positioned ^ ^ ^-400 facing entity @s eyes positioned as @s run tp @s ~ ~ ~ ~ ~
-    execute if predicate api:global_vars/difficulty/min/3_blessless facing entity @p feet positioned ^ ^ ^-100 rotated as @s positioned ^ ^ ^-200 facing entity @s eyes positioned as @s run tp @s ~ ~ ~ ~ ~
+    execute if predicate api:global_vars/difficulty/max/2_hard facing entity @p[gamemode=!spectator,distance=..100] feet positioned ^ ^ ^-100 rotated as @s positioned ^ ^ ^-400 facing entity @s eyes positioned as @s run tp @s ~ ~ ~ ~ ~
+    execute if predicate api:global_vars/difficulty/min/3_blessless facing entity @p[gamemode=!spectator,distance=..100] feet positioned ^ ^ ^-100 rotated as @s positioned ^ ^ ^-200 facing entity @s eyes positioned as @s run tp @s ~ ~ ~ ~ ~

From 6f6bdef36e1859534ae4e114b138b154a80057a2 Mon Sep 17 00:00:00 2001
From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com>
Date: Sat, 17 Jan 2026 20:18:32 +0900
Subject: [PATCH 08/20] =?UTF-8?q?=E6=B0=B4=E3=81=AB=E6=8E=A5=E8=A7=A6?=
 =?UTF-8?q?=E6=99=82=E3=81=AB=E9=9B=B7=E9=9B=B2=E3=81=8C=E5=B1=95=E9=96=8B?=
 =?UTF-8?q?=E3=81=95=E3=82=8C=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

---
 .../object/2049.lightning_magic/detect_hit_block/.mcfunction  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Asset/data/asset/functions/object/2049.lightning_magic/detect_hit_block/.mcfunction b/Asset/data/asset/functions/object/2049.lightning_magic/detect_hit_block/.mcfunction
index b7cd03dcab..19d30b3a40 100644
--- a/Asset/data/asset/functions/object/2049.lightning_magic/detect_hit_block/.mcfunction
+++ b/Asset/data/asset/functions/object/2049.lightning_magic/detect_hit_block/.mcfunction
@@ -5,8 +5,8 @@
 # @within asset:object/alias/2049/detect_hit_block
 
 # 地面に着く前
-    execute if entity @s[tag=!2049.OnGround] unless block ~ ~-0.5 ~ #lib:no_collision run data modify storage asset:context IsHitBlock set value true
+    execute if entity @s[tag=!2049.OnGround] unless block ~ ~-0.5 ~ #lib:no_collision/without_fluid run data modify storage asset:context IsHitBlock set value true
 
 # 地面に着いた後
 # 雷雲が阻まれない限り消滅しない
-    execute if entity @s[tag=2049.OnGround] positioned ~ ~3 ~ unless block ^ ^ ^0.15 #lib:no_collision run data modify storage asset:context IsHitBlock set value true
+    execute if entity @s[tag=2049.OnGround] positioned ~ ~3 ~ unless block ^ ^ ^0.15 #lib:no_collision/without_fluid run data modify storage asset:context IsHitBlock set value true

From 820368fd8649931995ee8b143750d4359916a738 Mon Sep 17 00:00:00 2001
From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com>
Date: Sat, 17 Jan 2026 20:29:20 +0900
Subject: [PATCH 09/20] =?UTF-8?q?=E7=9C=9F=E4=B8=8B=E3=81=8C=E3=83=96?=
 =?UTF-8?q?=E3=83=AD=E3=83=83=E3=82=AF=E3=81=AE=E6=99=82=E3=81=AB=E6=B2=88?=
 =?UTF-8?q?=E3=81=BE=E3=81=AA=E3=81=84=E3=82=88=E3=81=86=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../object/2049.lightning_magic/tick/on_ground.mcfunction      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Asset/data/asset/functions/object/2049.lightning_magic/tick/on_ground.mcfunction b/Asset/data/asset/functions/object/2049.lightning_magic/tick/on_ground.mcfunction
index def740b76b..dcd7b7db00 100644
--- a/Asset/data/asset/functions/object/2049.lightning_magic/tick/on_ground.mcfunction
+++ b/Asset/data/asset/functions/object/2049.lightning_magic/tick/on_ground.mcfunction
@@ -29,3 +29,6 @@
 # プレイヤーの方向へ誘導する
     execute if predicate api:global_vars/difficulty/max/2_hard facing entity @p[gamemode=!spectator,distance=..100] feet positioned ^ ^ ^-100 rotated as @s positioned ^ ^ ^-400 facing entity @s eyes positioned as @s run tp @s ~ ~ ~ ~ ~
     execute if predicate api:global_vars/difficulty/min/3_blessless facing entity @p[gamemode=!spectator,distance=..100] feet positioned ^ ^ ^-100 rotated as @s positioned ^ ^ ^-200 facing entity @s eyes positioned as @s run tp @s ~ ~ ~ ~ ~
+
+# 真下がブロックの場合、角度を0に固定する
+    execute unless block ~ ~-0.15 ~ #lib:no_collision/without_fluid at @s run tp @s ~ ~ ~ ~ 0

From eabc38545bff531e57584f05769b9754b9c3bd98 Mon Sep 17 00:00:00 2001
From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com>
Date: Sat, 17 Jan 2026 22:21:36 +0900
Subject: [PATCH 10/20] =?UTF-8?q?=E3=82=BB=E3=83=AC=E3=82=AF=E3=82=BF?=
 =?UTF-8?q?=E3=83=BC=E3=81=AE=E5=A4=89=E6=9B=B4=E6=BC=8F=E3=82=8C=E3=82=92?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../object/2049.lightning_magic/hit_block/in_air.mcfunction     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Asset/data/asset/functions/object/2049.lightning_magic/hit_block/in_air.mcfunction b/Asset/data/asset/functions/object/2049.lightning_magic/hit_block/in_air.mcfunction
index 33c29e1ca0..4e444cd4b3 100644
--- a/Asset/data/asset/functions/object/2049.lightning_magic/hit_block/in_air.mcfunction
+++ b/Asset/data/asset/functions/object/2049.lightning_magic/hit_block/in_air.mcfunction
@@ -5,7 +5,7 @@
 # @within function asset:object/2049.lightning_magic/hit_block/
 
 # プレイヤーの方を向く
-    tp @s ~ ~ ~ facing entity @p feet
+    tp @s ~ ~ ~ facing entity @p[tag=!PlayerShouldInvulnerable] feet
 
 # Tagを付与
     tag @s add 2049.OnGround

From 235d114d924bdcd971b5857a160be1f4543db1cd Mon Sep 17 00:00:00 2001
From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com>
Date: Sat, 17 Jan 2026 22:23:29 +0900
Subject: [PATCH 11/20] =?UTF-8?q?=E4=B8=8D=E8=A6=81=E3=81=AA=E5=87=A6?=
 =?UTF-8?q?=E7=90=86=E3=82=92=E5=89=8A=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../object/2049.lightning_magic/_index.d.mcfunction    |  1 -
 .../object/2049.lightning_magic/hit_block/.mcfunction  |  7 ++-----
 .../2049.lightning_magic/hit_block/in_air.mcfunction   |  7 -------
 .../2049.lightning_magic/summon/debug.mcfunction       | 10 ----------
 4 files changed, 2 insertions(+), 23 deletions(-)
 delete mode 100644 Asset/data/asset/functions/object/2049.lightning_magic/summon/debug.mcfunction

diff --git a/Asset/data/asset/functions/object/2049.lightning_magic/_index.d.mcfunction b/Asset/data/asset/functions/object/2049.lightning_magic/_index.d.mcfunction
index e9453dac9b..46e0503b00 100644
--- a/Asset/data/asset/functions/object/2049.lightning_magic/_index.d.mcfunction
+++ b/Asset/data/asset/functions/object/2049.lightning_magic/_index.d.mcfunction
@@ -5,4 +5,3 @@
 # @within function asset:object/2049.lightning_magic/**
     #declare tag 2049.OnGround
     #declare tag 2049.Interval
-    #declare tag 2049.RunOnce
diff --git a/Asset/data/asset/functions/object/2049.lightning_magic/hit_block/.mcfunction b/Asset/data/asset/functions/object/2049.lightning_magic/hit_block/.mcfunction
index 5c4050410e..79154cd733 100644
--- a/Asset/data/asset/functions/object/2049.lightning_magic/hit_block/.mcfunction
+++ b/Asset/data/asset/functions/object/2049.lightning_magic/hit_block/.mcfunction
@@ -5,10 +5,7 @@
 # @within asset:object/alias/2049/hit_block
 
 # 地面に着く前
-    execute if entity @s[tag=!2049.OnGround] run function asset:object/2049.lightning_magic/hit_block/in_air
+    execute if entity @s[tag=!2049.OnGround] run return run function asset:object/2049.lightning_magic/hit_block/in_air
 
 # 地面に着いた後
-    execute if entity @s[tag=2049.OnGround,tag=!2049.RunOnce] run function asset:object/call.m {method:kill}
-
-# Tag削除
-    tag @s[tag=2049.RunOnce] remove 2049.RunOnce
+    execute if entity @s[tag=2049.OnGround] run function asset:object/call.m {method:kill}
diff --git a/Asset/data/asset/functions/object/2049.lightning_magic/hit_block/in_air.mcfunction b/Asset/data/asset/functions/object/2049.lightning_magic/hit_block/in_air.mcfunction
index 4e444cd4b3..a28b25f0f8 100644
--- a/Asset/data/asset/functions/object/2049.lightning_magic/hit_block/in_air.mcfunction
+++ b/Asset/data/asset/functions/object/2049.lightning_magic/hit_block/in_air.mcfunction
@@ -10,16 +10,9 @@
 # Tagを付与
     tag @s add 2049.OnGround
 
-# 着地判定
-    data modify storage asset:context this.InAirLimitTick set value -1
-
 # PassengersのScaleを変更
     execute on passengers if entity @s[type=text_display] run data modify entity @s transformation.scale set value [1.8f,1.8f,1.8f]
     execute on passengers if entity @s[type=item_display] run data modify entity @s transformation.scale set value [1.8f,1.8f,1.8f]
 
 # MovePerStepを変更
     data modify storage asset:context this.MovePerStep set value 0.15
-
-# 一度しか実行しない用Tagを付与
-# これが付与されるとhit_block/on_groundが実行されない
-    tag @s add 2049.RunOnce
diff --git a/Asset/data/asset/functions/object/2049.lightning_magic/summon/debug.mcfunction b/Asset/data/asset/functions/object/2049.lightning_magic/summon/debug.mcfunction
deleted file mode 100644
index e992fa0727..0000000000
--- a/Asset/data/asset/functions/object/2049.lightning_magic/summon/debug.mcfunction
+++ /dev/null
@@ -1,10 +0,0 @@
-#> asset:object/2049.lightning_magic/summon/debug
-#
-# 動作チェック用の召喚処理 使い終わったら消してもいいかも
-#
-# @user
-# @private
-
-# 召喚
-    data modify storage api: Argument.ID set value 2049
-    function api:object/summon
\ No newline at end of file

From 66eec85067d4bca8bcfba5baa9ec7cbb983f650f Mon Sep 17 00:00:00 2001
From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com>
Date: Sat, 17 Jan 2026 23:02:59 +0900
Subject: [PATCH 12/20] =?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

---
 .../object/2049.lightning_magic/tick/in_air.mcfunction          | 2 +-
 .../object/2049.lightning_magic/tick/thunder.mcfunction         | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Asset/data/asset/functions/object/2049.lightning_magic/tick/in_air.mcfunction b/Asset/data/asset/functions/object/2049.lightning_magic/tick/in_air.mcfunction
index 1b3770cb7b..ca6b7c3e0a 100644
--- a/Asset/data/asset/functions/object/2049.lightning_magic/tick/in_air.mcfunction
+++ b/Asset/data/asset/functions/object/2049.lightning_magic/tick/in_air.mcfunction
@@ -8,6 +8,6 @@
     execute store result storage asset:context this.InAirLimitTick int 0.9999999999 run data get storage asset:context this.InAirLimitTick
 
 # 演出
-    particle dust 1 1 0 1.3 ~ ~ ~ 0.05 0.05 0.05 0 1 normal @a
+    particle dust 0.95 0.85 0.3 0.9 ~ ~1.4 ~ 0.05 1 0.05 0 20 normal @a
     particle electric_spark ~ ~ ~ 0.05 0.05 0.05 0 2 normal @a
     playsound entity.firework_rocket.twinkle hostile @a ~ ~ ~ 0.1 2 0
diff --git a/Asset/data/asset/functions/object/2049.lightning_magic/tick/thunder.mcfunction b/Asset/data/asset/functions/object/2049.lightning_magic/tick/thunder.mcfunction
index 871de89276..bf1b049d80 100644
--- a/Asset/data/asset/functions/object/2049.lightning_magic/tick/thunder.mcfunction
+++ b/Asset/data/asset/functions/object/2049.lightning_magic/tick/thunder.mcfunction
@@ -6,4 +6,5 @@
 
 # 演出
     execute positioned ~ ~0.2 ~ run function asset:object/2049.lightning_magic/tick/vfx/circle
+    particle dust 0.95 0.85 0.3 0.9 ~ ~1.4 ~ 0.05 1 0.05 0 20 normal @a
     playsound entity.lightning_bolt.thunder hostile @a ~ ~ ~ 0.3 2 0

From 4592fe4564fd0f8ffa6c52a5d91b912753ec1d52 Mon Sep 17 00:00:00 2001
From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com>
Date: Sat, 17 Jan 2026 23:08:24 +0900
Subject: [PATCH 13/20] =?UTF-8?q?=E6=BC=94=E5=87=BA=E3=82=92=E8=AA=BF?=
 =?UTF-8?q?=E6=95=B42?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../object/2049.lightning_magic/tick/in_air.mcfunction          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Asset/data/asset/functions/object/2049.lightning_magic/tick/in_air.mcfunction b/Asset/data/asset/functions/object/2049.lightning_magic/tick/in_air.mcfunction
index ca6b7c3e0a..3039988dbc 100644
--- a/Asset/data/asset/functions/object/2049.lightning_magic/tick/in_air.mcfunction
+++ b/Asset/data/asset/functions/object/2049.lightning_magic/tick/in_air.mcfunction
@@ -8,6 +8,6 @@
     execute store result storage asset:context this.InAirLimitTick int 0.9999999999 run data get storage asset:context this.InAirLimitTick
 
 # 演出
-    particle dust 0.95 0.85 0.3 0.9 ~ ~1.4 ~ 0.05 1 0.05 0 20 normal @a
+    particle dust 0.95 0.85 0.3 0.9 ~ ~ ~ 0.05 0.05 0.05 0 1 normal @a
     particle electric_spark ~ ~ ~ 0.05 0.05 0.05 0 2 normal @a
     playsound entity.firework_rocket.twinkle hostile @a ~ ~ ~ 0.1 2 0

From 28b504115996ac27bd84bc5aecc766f5811a102e Mon Sep 17 00:00:00 2001
From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com>
Date: Sat, 17 Jan 2026 23:12:23 +0900
Subject: [PATCH 14/20] =?UTF-8?q?=E6=8C=99=E5=8B=95=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

---
 .../object/2049.lightning_magic/tick/on_ground.mcfunction     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Asset/data/asset/functions/object/2049.lightning_magic/tick/on_ground.mcfunction b/Asset/data/asset/functions/object/2049.lightning_magic/tick/on_ground.mcfunction
index dcd7b7db00..837920cae8 100644
--- a/Asset/data/asset/functions/object/2049.lightning_magic/tick/on_ground.mcfunction
+++ b/Asset/data/asset/functions/object/2049.lightning_magic/tick/on_ground.mcfunction
@@ -30,5 +30,5 @@
     execute if predicate api:global_vars/difficulty/max/2_hard facing entity @p[gamemode=!spectator,distance=..100] feet positioned ^ ^ ^-100 rotated as @s positioned ^ ^ ^-400 facing entity @s eyes positioned as @s run tp @s ~ ~ ~ ~ ~
     execute if predicate api:global_vars/difficulty/min/3_blessless facing entity @p[gamemode=!spectator,distance=..100] feet positioned ^ ^ ^-100 rotated as @s positioned ^ ^ ^-200 facing entity @s eyes positioned as @s run tp @s ~ ~ ~ ~ ~
 
-# 真下がブロックの場合、角度を0に固定する
-    execute unless block ~ ~-0.15 ~ #lib:no_collision/without_fluid at @s run tp @s ~ ~ ~ ~ 0
+# 現在座標がno_collisonかつ真下がブロックの場合、角度を0に固定する
+    execute if block ~ ~ ~ #lib:no_collision/without_fluid unless block ~ ~-0.15 ~ #lib:no_collision/without_fluid at @s run tp @s ~ ~ ~ ~ 0

From 734861424a13e76f18c5438817746cdfd8026a56 Mon Sep 17 00:00:00 2001
From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com>
Date: Sat, 17 Jan 2026 23:13:04 +0900
Subject: [PATCH 15/20] =?UTF-8?q?=E9=9B=A3=E6=98=93=E5=BA=A6=E3=81=A7?=
 =?UTF-8?q?=E8=BF=BD=E5=B0=BE=E6=80=A7=E8=83=BD=E3=81=8C=E5=A4=89=E3=82=8F?=
 =?UTF-8?q?=E3=82=89=E3=81=AA=E3=81=84=E3=82=88=E3=81=86=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../object/2049.lightning_magic/tick/on_ground.mcfunction      | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Asset/data/asset/functions/object/2049.lightning_magic/tick/on_ground.mcfunction b/Asset/data/asset/functions/object/2049.lightning_magic/tick/on_ground.mcfunction
index 837920cae8..fcfe82f3ea 100644
--- a/Asset/data/asset/functions/object/2049.lightning_magic/tick/on_ground.mcfunction
+++ b/Asset/data/asset/functions/object/2049.lightning_magic/tick/on_ground.mcfunction
@@ -27,8 +27,7 @@
     execute if entity @s[tag=2049.Interval] run function asset:object/2049.lightning_magic/tick/thunder
 
 # プレイヤーの方向へ誘導する
-    execute if predicate api:global_vars/difficulty/max/2_hard facing entity @p[gamemode=!spectator,distance=..100] feet positioned ^ ^ ^-100 rotated as @s positioned ^ ^ ^-400 facing entity @s eyes positioned as @s run tp @s ~ ~ ~ ~ ~
-    execute if predicate api:global_vars/difficulty/min/3_blessless facing entity @p[gamemode=!spectator,distance=..100] feet positioned ^ ^ ^-100 rotated as @s positioned ^ ^ ^-200 facing entity @s eyes positioned as @s run tp @s ~ ~ ~ ~ ~
+    execute facing entity @p[gamemode=!spectator,distance=..100] feet positioned ^ ^ ^-100 rotated as @s positioned ^ ^ ^-500 facing entity @s eyes positioned as @s run tp @s ~ ~ ~ ~ ~
 
 # 現在座標がno_collisonかつ真下がブロックの場合、角度を0に固定する
     execute if block ~ ~ ~ #lib:no_collision/without_fluid unless block ~ ~-0.15 ~ #lib:no_collision/without_fluid at @s run tp @s ~ ~ ~ ~ 0

From 312d282dc46609c9b949a6357d250ec2597b5c15 Mon Sep 17 00:00:00 2001
From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com>
Date: Sat, 17 Jan 2026 23:19:26 +0900
Subject: [PATCH 16/20] =?UTF-8?q?=E8=AA=A4=E3=81=A3=E3=81=A6=E8=BF=BD?=
 =?UTF-8?q?=E5=B0=BE=E5=8A=9B=E3=82=92=E4=B8=8B=E3=81=92=E3=81=A6=E3=81=84?=
 =?UTF-8?q?=E3=81=9F=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

---
 .../object/2049.lightning_magic/tick/on_ground.mcfunction       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Asset/data/asset/functions/object/2049.lightning_magic/tick/on_ground.mcfunction b/Asset/data/asset/functions/object/2049.lightning_magic/tick/on_ground.mcfunction
index fcfe82f3ea..40134583d3 100644
--- a/Asset/data/asset/functions/object/2049.lightning_magic/tick/on_ground.mcfunction
+++ b/Asset/data/asset/functions/object/2049.lightning_magic/tick/on_ground.mcfunction
@@ -27,7 +27,7 @@
     execute if entity @s[tag=2049.Interval] run function asset:object/2049.lightning_magic/tick/thunder
 
 # プレイヤーの方向へ誘導する
-    execute facing entity @p[gamemode=!spectator,distance=..100] feet positioned ^ ^ ^-100 rotated as @s positioned ^ ^ ^-500 facing entity @s eyes positioned as @s run tp @s ~ ~ ~ ~ ~
+    execute facing entity @p[gamemode=!spectator,distance=..100] feet positioned ^ ^ ^-100 rotated as @s positioned ^ ^ ^-300 facing entity @s eyes positioned as @s run tp @s ~ ~ ~ ~ ~
 
 # 現在座標がno_collisonかつ真下がブロックの場合、角度を0に固定する
     execute if block ~ ~ ~ #lib:no_collision/without_fluid unless block ~ ~-0.15 ~ #lib:no_collision/without_fluid at @s run tp @s ~ ~ ~ ~ 0

From 1cccb3c92a2cb8db96dce2a2e484aece5cab8ff8 Mon Sep 17 00:00:00 2001
From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com>
Date: Sun, 18 Jan 2026 00:52:43 +0900
Subject: [PATCH 17/20] =?UTF-8?q?distance=E3=82=92=E8=A8=AD=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../object/2049.lightning_magic/hit_block/in_air.mcfunction     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Asset/data/asset/functions/object/2049.lightning_magic/hit_block/in_air.mcfunction b/Asset/data/asset/functions/object/2049.lightning_magic/hit_block/in_air.mcfunction
index a28b25f0f8..e90999a53f 100644
--- a/Asset/data/asset/functions/object/2049.lightning_magic/hit_block/in_air.mcfunction
+++ b/Asset/data/asset/functions/object/2049.lightning_magic/hit_block/in_air.mcfunction
@@ -5,7 +5,7 @@
 # @within function asset:object/2049.lightning_magic/hit_block/
 
 # プレイヤーの方を向く
-    tp @s ~ ~ ~ facing entity @p[tag=!PlayerShouldInvulnerable] feet
+    tp @s ~ ~ ~ facing entity @p[tag=!PlayerShouldInvulnerable,distance=..100] feet
 
 # Tagを付与
     tag @s add 2049.OnGround

From e24bbea943280fa10ce7af900ba3a01fed8d23f3 Mon Sep 17 00:00:00 2001
From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com>
Date: Sun, 18 Jan 2026 05:12:29 +0900
Subject: [PATCH 18/20] =?UTF-8?q?=E5=8F=AC=E5=96=9A=E6=99=82=E3=81=AB?=
 =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E6=94=BB=E6=92=83=E5=9B=9E=E6=95=B0=E3=82=92?=
 =?UTF-8?q?=E6=8C=87=E5=AE=9A=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

---
 .../tick/summon.mcfunction                    | 11 ++++------
 .../2049.lightning_magic/register.mcfunction  |  6 +++++-
 .../2049.lightning_magic/tick/.mcfunction     |  4 ++--
 .../tick/on_ground.mcfunction                 | 20 ++++++-------------
 .../tick/thunder.mcfunction                   |  6 ++++++
 5 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/Asset/data/asset/functions/mob/0371.lightning_spellbook/tick/summon.mcfunction b/Asset/data/asset/functions/mob/0371.lightning_spellbook/tick/summon.mcfunction
index dcd3582e0b..60e6451be1 100644
--- a/Asset/data/asset/functions/mob/0371.lightning_spellbook/tick/summon.mcfunction
+++ b/Asset/data/asset/functions/mob/0371.lightning_spellbook/tick/summon.mcfunction
@@ -8,14 +8,11 @@
 # @private
     #declare score_holder $Difficulty
 
-# 難易度値を取得する
+# 難易度値に比例した攻撃回数を設定
+# (難易度値 * 2 + 2)回攻撃する
     function api:global_vars/get_difficulty
-    execute store result score $Difficulty Temporary run data get storage api: Return.Difficulty
-
-# KillTickを設定 (116 + 難易度値 * 16)
-# (KillTick / 8) 回だけ攻撃する
-    scoreboard players operation $Difficulty Temporary *= $16 Const
-    execute store result storage api: Argument.FieldOverride.OnGroundTick int 1 run scoreboard players add $Difficulty Temporary 16
+    execute store result score $Difficulty Temporary run data get storage api: Return.Difficulty 2
+    execute store result storage api: Argument.FieldOverride.AttackCount int 1 run scoreboard players add $Difficulty Temporary 2
 
 # 魔法を召喚
     data modify storage api: Argument.ID set value 2049
diff --git a/Asset/data/asset/functions/object/2049.lightning_magic/register.mcfunction b/Asset/data/asset/functions/object/2049.lightning_magic/register.mcfunction
index 82bf1acfe4..25cc1360de 100644
--- a/Asset/data/asset/functions/object/2049.lightning_magic/register.mcfunction
+++ b/Asset/data/asset/functions/object/2049.lightning_magic/register.mcfunction
@@ -22,9 +22,13 @@
     data modify storage asset:object Field.MovePerStep set value 0.3
 # text_displayのフレーム用
     data modify storage asset:object Field.Frame set value 5
+    data modify storage asset:object Field.FrameInterval set value 2
 # 何tickで消滅するか？
     data modify storage asset:object Field.InAirLimitTick set value 80
-    data modify storage asset:object Field.OnGroundTick set value 120
+# 何回攻撃したら消滅するか？
+    data modify storage asset:object Field.AttackCount set value 4
+# 攻撃のインターバル
+    data modify storage asset:object Field.AttackInterval set value 0
 # ダメージ
     data modify storage asset:object Field.Damage set value 1f
     data modify storage asset:object Field.MobUUID set value -1
diff --git a/Asset/data/asset/functions/object/2049.lightning_magic/tick/.mcfunction b/Asset/data/asset/functions/object/2049.lightning_magic/tick/.mcfunction
index 6125f12f03..56563c9b3d 100644
--- a/Asset/data/asset/functions/object/2049.lightning_magic/tick/.mcfunction
+++ b/Asset/data/asset/functions/object/2049.lightning_magic/tick/.mcfunction
@@ -17,6 +17,6 @@
     tag @s[tag=2049.Interval] remove 2049.Interval
 
 # 消滅
-# InAirLimitTick == 0 || Tick == 0
+# InAirLimitTick == 0 || AttackCount == 0
     execute if data storage asset:context this{InAirLimitTick:0} run function asset:object/call.m {method:"kill"}
-    execute if data storage asset:context this{OnGroundTick:0} run function asset:object/call.m {method:"kill"}
+    execute if data storage asset:context this{AttackCount:0} run function asset:object/call.m {method:"kill"}
diff --git a/Asset/data/asset/functions/object/2049.lightning_magic/tick/on_ground.mcfunction b/Asset/data/asset/functions/object/2049.lightning_magic/tick/on_ground.mcfunction
index 40134583d3..31fb5d2807 100644
--- a/Asset/data/asset/functions/object/2049.lightning_magic/tick/on_ground.mcfunction
+++ b/Asset/data/asset/functions/object/2049.lightning_magic/tick/on_ground.mcfunction
@@ -8,23 +8,15 @@
 # @private
     #declare score_holder $Interval
 
-# 地上での存在時間のデクリメント
-    execute store result storage asset:context this.OnGroundTick int 0.9999999999 run data get storage asset:context this.OnGroundTick
-
 # 一定間隔で実行
-    execute store result score $Interval Temporary run data get storage asset:context this.OnGroundTick
-    scoreboard players operation $Interval Temporary %= $8 Const
-    execute if score $Interval Temporary matches 0 run tag @s add 2049.Interval
-    scoreboard players reset $Interval Temporary
+    execute store result storage asset:context this.AttackInterval int 0.9999999999 run data get storage asset:context this.AttackInterval
+    execute if data storage asset:context this{AttackInterval:0} run function asset:object/2049.lightning_magic/tick/thunder
+    execute if data storage asset:context this{AttackInterval:0} run data modify storage asset:context this.AttackInterval set value 8
 
 # 一定間隔でtext_displayのフレームを反映
-    execute store result score $Interval Temporary run data get storage asset:context this.OnGroundTick
-    scoreboard players operation $Interval Temporary %= $2 Const
-    execute if score $Interval Temporary matches 0 on passengers if entity @s[type=text_display] run function asset:object/2049.lightning_magic/tick/text_frame
-    scoreboard players reset $Interval Temporary
-
-# IntervalTagがある時のみ実行
-    execute if entity @s[tag=2049.Interval] run function asset:object/2049.lightning_magic/tick/thunder
+    execute store result storage asset:context this.FrameInterval int 0.9999999999 run data get storage asset:context this.FrameInterval
+    execute if data storage asset:context this{FrameInterval:0} on passengers if entity @s[type=text_display] run function asset:object/2049.lightning_magic/tick/text_frame
+    execute if data storage asset:context this{FrameInterval:0} run data modify storage asset:context this.FrameInterval set value 2
 
 # プレイヤーの方向へ誘導する
     execute facing entity @p[gamemode=!spectator,distance=..100] feet positioned ^ ^ ^-100 rotated as @s positioned ^ ^ ^-300 facing entity @s eyes positioned as @s run tp @s ~ ~ ~ ~ ~
diff --git a/Asset/data/asset/functions/object/2049.lightning_magic/tick/thunder.mcfunction b/Asset/data/asset/functions/object/2049.lightning_magic/tick/thunder.mcfunction
index bf1b049d80..1c77594e17 100644
--- a/Asset/data/asset/functions/object/2049.lightning_magic/tick/thunder.mcfunction
+++ b/Asset/data/asset/functions/object/2049.lightning_magic/tick/thunder.mcfunction
@@ -4,6 +4,12 @@
 #
 # @within function asset:object/2049.lightning_magic/tick/on_ground
 
+# 攻撃回数のデクリメント
+    execute store result storage asset:context this.AttackCount int 0.9999999999 run data get storage asset:context this.AttackCount
+
+# 各メソッドで使用するIntervalTag
+    tag @s add 2049.Interval
+
 # 演出
     execute positioned ~ ~0.2 ~ run function asset:object/2049.lightning_magic/tick/vfx/circle
     particle dust 0.95 0.85 0.3 0.9 ~ ~1.4 ~ 0.05 1 0.05 0 20 normal @a

From d3bf111c5fea980fe603425ce2d4b03d1f238bc2 Mon Sep 17 00:00:00 2001
From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com>
Date: Sun, 18 Jan 2026 05:18:22 +0900
Subject: [PATCH 19/20] =?UTF-8?q?=E8=BF=BD=E5=B0=BE=E6=99=82=E3=81=AE?=
 =?UTF-8?q?=E8=A7=92=E5=BA=A6=E5=9B=BA=E5=AE=9A=E5=87=A6=E7=90=86=E3=81=A7?=
 =?UTF-8?q?=E4=B8=8A=E3=81=AB=E6=9D=A5=E3=81=AA=E3=81=8F=E3=81=AA=E3=82=8B?=
 =?UTF-8?q?=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

---
 .../object/2049.lightning_magic/tick/on_ground.mcfunction     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Asset/data/asset/functions/object/2049.lightning_magic/tick/on_ground.mcfunction b/Asset/data/asset/functions/object/2049.lightning_magic/tick/on_ground.mcfunction
index 31fb5d2807..fb0942a544 100644
--- a/Asset/data/asset/functions/object/2049.lightning_magic/tick/on_ground.mcfunction
+++ b/Asset/data/asset/functions/object/2049.lightning_magic/tick/on_ground.mcfunction
@@ -21,5 +21,5 @@
 # プレイヤーの方向へ誘導する
     execute facing entity @p[gamemode=!spectator,distance=..100] feet positioned ^ ^ ^-100 rotated as @s positioned ^ ^ ^-300 facing entity @s eyes positioned as @s run tp @s ~ ~ ~ ~ ~
 
-# 現在座標がno_collisonかつ真下がブロックの場合、角度を0に固定する
-    execute if block ~ ~ ~ #lib:no_collision/without_fluid unless block ~ ~-0.15 ~ #lib:no_collision/without_fluid at @s run tp @s ~ ~ ~ ~ 0
+# 現在座標がno_collison && 真下がブロック && 自身が下を向いている なら角度を0に固定する
+    execute if block ~ ~ ~ #lib:no_collision/without_fluid unless block ~ ~-0.15 ~ #lib:no_collision/without_fluid at @s if entity @s[x_rotation=0..90] run tp @s ~ ~ ~ ~ 0

From c91beb6eecabaccbaf050c932b094edb9b37bae4 Mon Sep 17 00:00:00 2001
From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com>
Date: Sun, 18 Jan 2026 20:42:23 +0900
Subject: [PATCH 20/20] =?UTF-8?q?=E6=94=BB=E6=92=83=E3=81=8C=E3=83=92?=
 =?UTF-8?q?=E3=83=83=E3=83=88=E3=81=97=E3=81=AA=E3=81=84=E5=95=8F=E9=A1=8C?=
 =?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

---
 .../object/2049.lightning_magic/hit_entity/.mcfunction      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Asset/data/asset/functions/object/2049.lightning_magic/hit_entity/.mcfunction b/Asset/data/asset/functions/object/2049.lightning_magic/hit_entity/.mcfunction
index a232d4defd..f2ac432ca5 100644
--- a/Asset/data/asset/functions/object/2049.lightning_magic/hit_entity/.mcfunction
+++ b/Asset/data/asset/functions/object/2049.lightning_magic/hit_entity/.mcfunction
@@ -22,8 +22,8 @@
     execute as @a[tag=BoundingCylinder,distance=..5] run function api:damage/
     function api:damage/reset
 
+# ヒットしたなら消滅
+    execute if entity @a[tag=BoundingCylinder,distance=..5,limit=1] run function asset:object/call.m {method:"kill"}
+
 # リセット
     tag @a[tag=BoundingCylinder,distance=..5] remove BoundingCylinder
-
-# 消滅
-    function asset:object/call.m {method:"kill"}