From 36d514363424f488ec5341b113b78d9936062758 Mon Sep 17 00:00:00 2001
From: Lapis-LJA <kosukoji0323@gmail.com>
Date: Sun, 17 May 2026 23:06:28 +0900
Subject: [PATCH 1/4] =?UTF-8?q?=E3=82=BB=E3=83=AC=E3=82=AF=E3=82=BF?=
 =?UTF-8?q?=E3=83=BC=E3=81=ABdistance=E3=82=92=E8=A8=AD=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../artifact/0971.laser_eye_helmet/shot/3.main.mcfunction   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Asset/data/asset/functions/artifact/0971.laser_eye_helmet/shot/3.main.mcfunction b/Asset/data/asset/functions/artifact/0971.laser_eye_helmet/shot/3.main.mcfunction
index 3f0f16db78e..059a5b17db0 100644
--- a/Asset/data/asset/functions/artifact/0971.laser_eye_helmet/shot/3.main.mcfunction
+++ b/Asset/data/asset/functions/artifact/0971.laser_eye_helmet/shot/3.main.mcfunction
@@ -21,13 +21,13 @@
     data modify storage lib: Argument.Distance set value 3.0
     data modify storage lib: Argument.Spread set value 0.5
 # 前方拡散を実行する
-    execute as @e[type=marker,tag=SpreadMarker,limit=1] run function lib:forward_spreader/circle
+    execute as @e[type=marker,tag=SpreadMarker,distance=..5,limit=1] run function lib:forward_spreader/circle
 # 発砲
-    execute anchored eyes facing entity @e[type=marker,tag=SpreadMarker,limit=1] feet run function asset:artifact/0971.laser_eye_helmet/shot/bullet
+    execute anchored eyes facing entity @e[type=marker,tag=SpreadMarker,distance=..5,limit=1] feet run function asset:artifact/0971.laser_eye_helmet/shot/bullet
     tag @s remove Landing
 
 # リセット
-    kill @e[type=marker,tag=SpreadMarker]
+    kill @e[type=marker,tag=SpreadMarker,distance=..5]
     scoreboard players reset $Appropriate_Distance Temporary
     scoreboard players reset $Distance_Damping Temporary
     scoreboard players reset $MinDamage Temporary

From c6c7ad6f3c2f06a178d1bd0d02472ebe37e9b8e2 Mon Sep 17 00:00:00 2001
From: Lapis-LJA <kosukoji0323@gmail.com>
Date: Mon, 18 May 2026 01:48:12 +0900
Subject: [PATCH 2/4] =?UTF-8?q?=E5=AE=8C=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../0971.laser_eye_helmet/shot/3.main.mcfunction   |  3 ++-
 .../0971.laser_eye_helmet/shot/shoot/.mcfunction   | 14 ++++++++++++++
 .../shot/{ => shoot}/damage_attenuation.mcfunction |  4 ++--
 .../shot/{ => shoot}/hit.mcfunction                |  8 ++++----
 .../recursive.mcfunction}                          | 14 +++++++-------
 5 files changed, 29 insertions(+), 14 deletions(-)
 create mode 100644 Asset/data/asset/functions/artifact/0971.laser_eye_helmet/shot/shoot/.mcfunction
 rename Asset/data/asset/functions/artifact/0971.laser_eye_helmet/shot/{ => shoot}/damage_attenuation.mcfunction (77%)
 rename Asset/data/asset/functions/artifact/0971.laser_eye_helmet/shot/{ => shoot}/hit.mcfunction (83%)
 rename Asset/data/asset/functions/artifact/0971.laser_eye_helmet/shot/{bullet.mcfunction => shoot/recursive.mcfunction} (66%)

diff --git a/Asset/data/asset/functions/artifact/0971.laser_eye_helmet/shot/3.main.mcfunction b/Asset/data/asset/functions/artifact/0971.laser_eye_helmet/shot/3.main.mcfunction
index 059a5b17db0..51afc520088 100644
--- a/Asset/data/asset/functions/artifact/0971.laser_eye_helmet/shot/3.main.mcfunction
+++ b/Asset/data/asset/functions/artifact/0971.laser_eye_helmet/shot/3.main.mcfunction
@@ -22,8 +22,9 @@
     data modify storage lib: Argument.Spread set value 0.5
 # 前方拡散を実行する
     execute as @e[type=marker,tag=SpreadMarker,distance=..5,limit=1] run function lib:forward_spreader/circle
+
 # 発砲
-    execute anchored eyes facing entity @e[type=marker,tag=SpreadMarker,distance=..5,limit=1] feet run function asset:artifact/0971.laser_eye_helmet/shot/bullet
+    execute anchored eyes positioned ^ ^ ^15 facing entity @e[type=marker,tag=SpreadMarker,distance=..20,limit=1] eyes positioned as @e[type=marker,tag=SpreadMarker,distance=..20,limit=1] positioned ^ ^ ^2 facing ^ ^ ^-1 run function asset:artifact/0971.laser_eye_helmet/shot/shoot/
     tag @s remove Landing
 
 # リセット
diff --git a/Asset/data/asset/functions/artifact/0971.laser_eye_helmet/shot/shoot/.mcfunction b/Asset/data/asset/functions/artifact/0971.laser_eye_helmet/shot/shoot/.mcfunction
new file mode 100644
index 00000000000..9052b47bb12
--- /dev/null
+++ b/Asset/data/asset/functions/artifact/0971.laser_eye_helmet/shot/shoot/.mcfunction
@@ -0,0 +1,14 @@
+#> asset:artifact/0971.laser_eye_helmet/shot/shoot/
+#
+#
+#
+# @within function asset:artifact/0971.laser_eye_helmet/shot/3.main
+
+# 発射
+    function asset:artifact/0971.laser_eye_helmet/shot/shoot/recursive
+
+# レーザーobject召喚
+    data modify storage api: Argument.ID set value 2168
+    data modify storage api: Argument.FieldOverride set value {Scale:[0.25f,0f,0.25f],Color:7733114,DisappearInterpolation:2,LifeTime:7}
+    execute store result storage api: Argument.FieldOverride.Scale[1] float 0.5 run scoreboard players get $Distance_Damping Temporary
+    execute positioned ^ ^ ^0.5 run function api:object/summon
diff --git a/Asset/data/asset/functions/artifact/0971.laser_eye_helmet/shot/damage_attenuation.mcfunction b/Asset/data/asset/functions/artifact/0971.laser_eye_helmet/shot/shoot/damage_attenuation.mcfunction
similarity index 77%
rename from Asset/data/asset/functions/artifact/0971.laser_eye_helmet/shot/damage_attenuation.mcfunction
rename to Asset/data/asset/functions/artifact/0971.laser_eye_helmet/shot/shoot/damage_attenuation.mcfunction
index c1f3e0343e7..8dd0c6dae60 100644
--- a/Asset/data/asset/functions/artifact/0971.laser_eye_helmet/shot/damage_attenuation.mcfunction
+++ b/Asset/data/asset/functions/artifact/0971.laser_eye_helmet/shot/shoot/damage_attenuation.mcfunction
@@ -1,8 +1,8 @@
-#> asset:artifact/0971.laser_eye_helmet/shot/damage_attenuation
+#> asset:artifact/0971.laser_eye_helmet/shot/shoot/damage_attenuation
 #
 #
 #
-# @within function asset:artifact/0971.laser_eye_helmet/shot/hit
+# @within function asset:artifact/0971.laser_eye_helmet/shot/shoot/hit
 
 # ダメージ減らす
     scoreboard players operation $Distance_Damping Temporary -= $Appropriate_Distance Temporary
diff --git a/Asset/data/asset/functions/artifact/0971.laser_eye_helmet/shot/hit.mcfunction b/Asset/data/asset/functions/artifact/0971.laser_eye_helmet/shot/shoot/hit.mcfunction
similarity index 83%
rename from Asset/data/asset/functions/artifact/0971.laser_eye_helmet/shot/hit.mcfunction
rename to Asset/data/asset/functions/artifact/0971.laser_eye_helmet/shot/shoot/hit.mcfunction
index 4bf918b12cf..307d872f2db 100644
--- a/Asset/data/asset/functions/artifact/0971.laser_eye_helmet/shot/hit.mcfunction
+++ b/Asset/data/asset/functions/artifact/0971.laser_eye_helmet/shot/shoot/hit.mcfunction
@@ -1,9 +1,9 @@
-#> asset:artifact/0971.laser_eye_helmet/shot/hit
+#> asset:artifact/0971.laser_eye_helmet/shot/shoot/hit
 #
 #
 # @within function
-#    asset:artifact/0971.laser_eye_helmet/shot/3.main
-#    asset:artifact/0971.laser_eye_helmet/shot/bullet
+#    asset:artifact/0971.laser_eye_helmet/shot/shoot/
+#    asset:artifact/0971.laser_eye_helmet/shot/shoot/recursive
 
 # 一定の距離から距離減衰するための距離(適正距離をメートル*2で指定)
     scoreboard players set $Appropriate_Distance Temporary 5
@@ -12,7 +12,7 @@
 # 最大ダメージ
     scoreboard players add $Damage Temporary 50
 # もし、適正距離じゃなかった場合、距離-適正距離=減少ダメージにする
-    execute if score $Distance_Damping Temporary >= $Appropriate_Distance Temporary run function asset:artifact/0971.laser_eye_helmet/shot/damage_attenuation
+    execute if score $Distance_Damping Temporary >= $Appropriate_Distance Temporary run function asset:artifact/0971.laser_eye_helmet/shot/shoot/damage_attenuation
 
 # ダメージ設定
     execute store result storage api: Argument.Damage float 1 run scoreboard players get $Damage Temporary
diff --git a/Asset/data/asset/functions/artifact/0971.laser_eye_helmet/shot/bullet.mcfunction b/Asset/data/asset/functions/artifact/0971.laser_eye_helmet/shot/shoot/recursive.mcfunction
similarity index 66%
rename from Asset/data/asset/functions/artifact/0971.laser_eye_helmet/shot/bullet.mcfunction
rename to Asset/data/asset/functions/artifact/0971.laser_eye_helmet/shot/shoot/recursive.mcfunction
index a5cb4319f38..0c009c678cd 100644
--- a/Asset/data/asset/functions/artifact/0971.laser_eye_helmet/shot/bullet.mcfunction
+++ b/Asset/data/asset/functions/artifact/0971.laser_eye_helmet/shot/shoot/recursive.mcfunction
@@ -1,10 +1,10 @@
-#> asset:artifact/0971.laser_eye_helmet/shot/bullet
+#> asset:artifact/0971.laser_eye_helmet/shot/shoot/recursive
 #
 # ビーム部
 #
 # @within function
-#    asset:artifact/0971.laser_eye_helmet/shot/3.main
-#    asset:artifact/0971.laser_eye_helmet/shot/bullet
+#    asset:artifact/0971.laser_eye_helmet/shot/shoot/
+#    asset:artifact/0971.laser_eye_helmet/shot/shoot/recursive
 
 # ここから先は神器側の効果の処理を書く
 
@@ -16,14 +16,14 @@
     execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living_without_player,tag=!Uninterferable,dx=0] run tag @e[type=#lib:living_without_player,tag=!Uninterferable,dx=0,limit=1] add LandingTarget
 
 # 演出
-    particle minecraft:composter ~ ~ ~ 0.1 0.1 0.1 0 1
-    particle minecraft:dust 0.075 0.604 0.063 0.7 ~ ~ ~ 0 0 0 0 0
+    execute if predicate lib:random_pass_per/10 run particle minecraft:composter ~ ~ ~ 0.1 0.1 0.1 0 1
+    execute if predicate lib:random_pass_per/10 run particle minecraft:dust 0.075 0.604 0.063 0.35 ~ ~ ~ 0 0 0 0 0
 
 # 距離減衰をするためにスコアを増やす
     scoreboard players add $Distance_Damping Temporary 1
 
 # 着弾
-    execute if entity @s[tag=Landing] run function asset:artifact/0971.laser_eye_helmet/shot/hit
+    execute if entity @s[tag=Landing] run function asset:artifact/0971.laser_eye_helmet/shot/shoot/hit
 
 # 再起
-    execute positioned ^ ^ ^0.5 if entity @s[tag=!Landing,distance=..15] run function asset:artifact/0971.laser_eye_helmet/shot/bullet
+    execute positioned ^ ^ ^0.5 if entity @s[tag=!Landing,distance=..15] run function asset:artifact/0971.laser_eye_helmet/shot/shoot/recursive

From 46ad69c2630a62fb9a4ec16057f5a00526667166 Mon Sep 17 00:00:00 2001
From: Lapis-LJA <kosukoji0323@gmail.com>
Date: Mon, 18 May 2026 01:49:07 +0900
Subject: [PATCH 3/4] =?UTF-8?q?Lore=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../artifact/0971.laser_eye_helmet/give/2.give.mcfunction       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Asset/data/asset/functions/artifact/0971.laser_eye_helmet/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0971.laser_eye_helmet/give/2.give.mcfunction
index 75b7030602b..576041d1494 100644
--- a/Asset/data/asset/functions/artifact/0971.laser_eye_helmet/give/2.give.mcfunction
+++ b/Asset/data/asset/functions/artifact/0971.laser_eye_helmet/give/2.give.mcfunction
@@ -15,7 +15,7 @@
 # 神器の名前 (TextComponentString)
     data modify storage asset:artifact Name set value '{"text":"レーザーアイヘルメット","color":"green"}'
 # 神器の説明文 (TextComponentString[])
-    data modify storage asset:artifact Lore set value ['{"text":"レーザーアイ形をしたヘルメット"}','{"text":"ビームを放出することができる"}']
+    data modify storage asset:artifact Lore set value ['{"text":"レーザーアイを模したヘルメット"}','{"text":"ビームを放出することができる"}']
 # 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション)
     # data modify storage asset:artifact ConsumeItem.Item set value
     # data modify storage asset:artifact ConsumeItem.Count set value

From 0fcc948a879e01ef22b07a2de6404348a1d7de68 Mon Sep 17 00:00:00 2001
From: Lapis-LJA <kosukoji0323@gmail.com>
Date: Mon, 18 May 2026 22:39:39 +0900
Subject: [PATCH 4/4] =?UTF-8?q?=E7=99=BA=E5=B0=84=E5=87=A6=E7=90=86?=
 =?UTF-8?q?=E3=82=92=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../0971.laser_eye_helmet/shot/3.main.mcfunction   | 14 +-------------
 .../0971.laser_eye_helmet/shot/shoot/.mcfunction   |  2 +-
 .../0971.laser_eye_helmet/shot/spread.mcfunction   | 14 ++++++++++++++
 3 files changed, 16 insertions(+), 14 deletions(-)
 create mode 100644 Asset/data/asset/functions/artifact/0971.laser_eye_helmet/shot/spread.mcfunction

diff --git a/Asset/data/asset/functions/artifact/0971.laser_eye_helmet/shot/3.main.mcfunction b/Asset/data/asset/functions/artifact/0971.laser_eye_helmet/shot/3.main.mcfunction
index 51afc520088..1c5d355e47f 100644
--- a/Asset/data/asset/functions/artifact/0971.laser_eye_helmet/shot/3.main.mcfunction
+++ b/Asset/data/asset/functions/artifact/0971.laser_eye_helmet/shot/3.main.mcfunction
@@ -4,10 +4,6 @@
 #
 # @within function asset:artifact/0971.laser_eye_helmet/shot/2.check_condition
 
-#> Private
-# @private
-    #declare tag SpreadMarker
-
 # 基本的な使用時の処理(MP消費や使用回数の処理など)を行う
     function asset:artifact/common/use/head
 
@@ -16,19 +12,11 @@
 # 演出
     playsound minecraft:block.respawn_anchor.deplete player @a ~ ~ ~ 1 2
 
-# 前方拡散設定
-    execute anchored eyes positioned ^ ^ ^ run summon marker ~ ~ ~ {Tags:["SpreadMarker"]}
-    data modify storage lib: Argument.Distance set value 3.0
-    data modify storage lib: Argument.Spread set value 0.5
-# 前方拡散を実行する
-    execute as @e[type=marker,tag=SpreadMarker,distance=..5,limit=1] run function lib:forward_spreader/circle
-
 # 発砲
-    execute anchored eyes positioned ^ ^ ^15 facing entity @e[type=marker,tag=SpreadMarker,distance=..20,limit=1] eyes positioned as @e[type=marker,tag=SpreadMarker,distance=..20,limit=1] positioned ^ ^ ^2 facing ^ ^ ^-1 run function asset:artifact/0971.laser_eye_helmet/shot/shoot/
+    execute anchored eyes positioned ^ ^ ^15 facing ^ ^ ^-1 summon marker run function asset:artifact/0971.laser_eye_helmet/shot/spread
     tag @s remove Landing
 
 # リセット
-    kill @e[type=marker,tag=SpreadMarker,distance=..5]
     scoreboard players reset $Appropriate_Distance Temporary
     scoreboard players reset $Distance_Damping Temporary
     scoreboard players reset $MinDamage Temporary
diff --git a/Asset/data/asset/functions/artifact/0971.laser_eye_helmet/shot/shoot/.mcfunction b/Asset/data/asset/functions/artifact/0971.laser_eye_helmet/shot/shoot/.mcfunction
index 9052b47bb12..62065c0f7bd 100644
--- a/Asset/data/asset/functions/artifact/0971.laser_eye_helmet/shot/shoot/.mcfunction
+++ b/Asset/data/asset/functions/artifact/0971.laser_eye_helmet/shot/shoot/.mcfunction
@@ -2,7 +2,7 @@
 #
 #
 #
-# @within function asset:artifact/0971.laser_eye_helmet/shot/3.main
+# @within function asset:artifact/0971.laser_eye_helmet/shot/spread
 
 # 発射
     function asset:artifact/0971.laser_eye_helmet/shot/shoot/recursive
diff --git a/Asset/data/asset/functions/artifact/0971.laser_eye_helmet/shot/spread.mcfunction b/Asset/data/asset/functions/artifact/0971.laser_eye_helmet/shot/spread.mcfunction
new file mode 100644
index 00000000000..783ce2b7c60
--- /dev/null
+++ b/Asset/data/asset/functions/artifact/0971.laser_eye_helmet/shot/spread.mcfunction
@@ -0,0 +1,14 @@
+#> asset:artifact/0971.laser_eye_helmet/shot/spread
+#
+#
+#
+# @within function asset:artifact/0971.laser_eye_helmet/shot/3.main
+
+# 前方拡散
+    data modify storage lib: Argument.Distance set value 3
+    data modify storage lib: Argument.Spread set value 0.1
+    function lib:forward_spreader/circle
+    execute facing entity @s eyes facing ^ ^ ^-1 positioned as @s positioned ^ ^ ^-11.5 as @p[tag=this] run function asset:artifact/0971.laser_eye_helmet/shot/shoot/
+
+# Markerを消しておく
+    kill @s