ホーミングショットの処理を変更。これでいいか！？

ProjectTSB · Jan 7, 2025 · c66ac39 · c66ac39
1 parent 362e0b0
commit c66ac39
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 12 deletions.
diff --git a/Asset/data/asset/functions/mob/1004.tultaria/tick/skill/water/homing_shot/shot/.mcfunction b/Asset/data/asset/functions/mob/1004.tultaria/tick/skill/water/homing_shot/shot/.mcfunction
@@ -11,20 +11,15 @@
 
 # 弾を出す
     # 中心
-        execute positioned ^ ^ ^10 run summon marker ~ ~ ~ {Tags:["FacingMarker"]}
         function asset:mob/1004.tultaria/tick/skill/water/homing_shot/shot/summon
     # 横1
-        execute positioned ^5 ^ ^10 run summon marker ~ ~ ~ {Tags:["FacingMarker"]}
-        function asset:mob/1004.tultaria/tick/skill/water/homing_shot/shot/summon
+        execute facing ^5 ^ ^10 run function asset:mob/1004.tultaria/tick/skill/water/homing_shot/shot/summon
     # 横1
-        execute positioned ^-5 ^ ^10 run summon marker ~ ~ ~ {Tags:["FacingMarker"]}
-        function asset:mob/1004.tultaria/tick/skill/water/homing_shot/shot/summon
+        execute facing ^-5 ^ ^10 run function asset:mob/1004.tultaria/tick/skill/water/homing_shot/shot/summon
     # 横2
-        execute if entity @s[scores={RW.Phase=3..}] positioned ^15 ^ ^10 run summon marker ~ ~ ~ {Tags:["FacingMarker"]}
-        execute if entity @s[scores={RW.Phase=3..}] run function asset:mob/1004.tultaria/tick/skill/water/homing_shot/shot/summon
+        execute if entity @s[scores={RW.Phase=3..}] facing ^15 ^ ^10 run function asset:mob/1004.tultaria/tick/skill/water/homing_shot/shot/summon
     # 横2
-        execute if entity @s[scores={RW.Phase=3..}] positioned ^-15 ^ ^10 run summon marker ~ ~ ~ {Tags:["FacingMarker"]}
-        execute if entity @s[scores={RW.Phase=3..}] run function asset:mob/1004.tultaria/tick/skill/water/homing_shot/shot/summon
+        execute if entity @s[scores={RW.Phase=3..}] facing ^-15 ^ ^10 run function asset:mob/1004.tultaria/tick/skill/water/homing_shot/shot/summon
 
 # 演出
     playsound item.trident.riptide_3 hostile @a ~ ~ ~ 2 1.5

diff --git a/Asset/data/asset/functions/object/2044.lastboss_ice_bullet/init/.mcfunction b/Asset/data/asset/functions/object/2044.lastboss_ice_bullet/init/.mcfunction
@@ -12,10 +12,10 @@
     execute store result storage asset:context this.TargetID int 1 run scoreboard players get @p[distance=..64] UserID
 
 # マーカーの方向く
-    execute facing entity @e[type=marker,tag=FacingMarker,limit=1] eyes run tp @s ~ ~ ~ ~ ~
+#    execute facing entity @e[type=marker,tag=FacingMarker,limit=1] eyes run tp @s ~ ~ ~ ~ ~
 
 # キル
-    kill @e[type=marker,tag=FacingMarker,limit=1]
+#    kill @e[type=marker,tag=FacingMarker,limit=1]
 
 # super
     function asset:object/super.init
diff --git a/Asset/data/asset/functions/object/2044.lastboss_ice_bullet/summon/.mcfunction b/Asset/data/asset/functions/object/2044.lastboss_ice_bullet/summon/.mcfunction
@@ -5,4 +5,7 @@
 # @within asset:object/alias/2044/summon
 
 # 元となるEntityを召喚する
-    summon item_display ~ ~ ~ {brightness:{block:15,sky:15},billboard:"center",teleport_duration:1,Tags:["ObjectInit"],item:{id:"minecraft:leather_horse_armor",Count:1b,tag:{display:{color:7862527},CustomModelData:20375}}}
+    execute as 0-0-0-0-0 positioned as @s run tp @s ~ ~ ~ ~ 0
+    data modify storage asset:temp Args.Rotation set from entity 0-0-0-0-0 Rotation
+    function asset:object/2044.lastboss_ice_bullet/summon/m with storage asset:temp Args
+    data remove storage asset:temp Args
diff --git a/Asset/data/asset/functions/object/2044.lastboss_ice_bullet/summon/m.mcfunction b/Asset/data/asset/functions/object/2044.lastboss_ice_bullet/summon/m.mcfunction
@@ -0,0 +1,8 @@
+#> asset:object/2044.lastboss_ice_bullet/summon/m
+#
+#
+#
+# @within function asset:object/2044.lastboss_ice_bullet/summon/
+
+# 元となるEntityを召喚する
+    $summon item_display ~ ~ ~ {Rotation:$(Rotation),brightness:{block:15,sky:15},billboard:"center",teleport_duration:1,Tags:["ObjectInit"],item:{id:"minecraft:leather_horse_armor",Count:1b,tag:{display:{color:7862527},CustomModelData:20375}}}