メテオパターン1作った

ProjectTSB · Oct 6, 2024 · c43a484 · c43a484
1 parent 08ddc7d
commit c43a484
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 52 deletions.
diff --git a/...eteor_rain/meteor/place_marker.mcfunction → ...ain/meteor/place_marker_aiming.mcfunction b/...eteor_rain/meteor/place_marker.mcfunction → ...ain/meteor/place_marker_aiming.mcfunction
@@ -1,14 +1,17 @@
-#> asset:mob/1004.tultaria/tick/skill/fire/meteor_rain/meteor/place_marker
-#
+#> asset:mob/1004.tultaria/tick/skill/fire/meteor_rain/meteor/place_marker_aiming
 #
+# 座標攻撃メテオ
 #
 # @within function asset:mob/1004.tultaria/tick/skill/fire/meteor_rain/pattern/1
 
 # マーカーを召喚
     summon marker ~ ~ ~ {Tags:["SpreadMarker"]}
 
+# メテオのタイプ指定
+    data modify storage api: Argument.FieldOverride set value {Type:Aim}
+
 # マーカーに対して拡散処理を実行
-    execute as @e[type=marker,tag=SpreadMarker,limit=1] at @s run function asset:mob/1004.tultaria/tick/skill/fire/meteor_rain/meteor/spread
-    
+    execute as @e[type=marker,tag=SpreadMarker,limit=1] at @s run function asset:mob/1004.tultaria/tick/skill/fire/meteor_rain/meteor/summon
+
 # マーカーキル
     kill @e[type=marker,tag=SpreadMarker,limit=1]
diff --git a/...tions/mob/1004.tultaria/tick/skill/fire/meteor_rain/meteor/place_marker_spread.mcfunction b/...tions/mob/1004.tultaria/tick/skill/fire/meteor_rain/meteor/place_marker_spread.mcfunction
@@ -0,0 +1,17 @@
+#> asset:mob/1004.tultaria/tick/skill/fire/meteor_rain/meteor/place_marker_spread
+#
+# テキトーな位置に降ってくる隕石
+#
+# @within function asset:mob/1004.tultaria/tick/skill/fire/meteor_rain/pattern/1
+
+# マーカーを召喚
+    summon marker ~ ~ ~ {Tags:["SpreadMarker"]}
+
+# メテオのタイプ指定
+    data modify storage api: Argument.FieldOverride set value {Type:Spread}
+
+# マーカーに対して拡散処理を実行
+    execute as @e[type=marker,tag=SpreadMarker,limit=1] at @s run function asset:mob/1004.tultaria/tick/skill/fire/meteor_rain/meteor/summon
+
+# マーカーキル
+    kill @e[type=marker,tag=SpreadMarker,limit=1]
diff --git a/...ta/asset/functions/mob/1004.tultaria/tick/skill/fire/meteor_rain/meteor/spread.mcfunction b/...ta/asset/functions/mob/1004.tultaria/tick/skill/fire/meteor_rain/meteor/spread.mcfunction
diff --git a/...ta/asset/functions/mob/1004.tultaria/tick/skill/fire/meteor_rain/meteor/summon.mcfunction b/...ta/asset/functions/mob/1004.tultaria/tick/skill/fire/meteor_rain/meteor/summon.mcfunction
@@ -1,9 +1,17 @@
 #> asset:mob/1004.tultaria/tick/skill/fire/meteor_rain/meteor/summon
 #
-# メテオ召喚
+# 召喚処理
 #
-# @within function asset:mob/1004.tultaria/tick/skill/fire/meteor_rain/**
+# @within function
+#   asset:mob/1004.tultaria/tick/skill/fire/meteor_rain/meteor/place_marker_spread
+#   asset:mob/1004.tultaria/tick/skill/fire/meteor_rain/meteor/place_marker_aiming
 
-# 召喚
+# 拡散
+    data modify storage lib: Argument.Bounds set value [[16d,16d],[0d,0d],[16d,16d]]
+    execute at @r[distance=..100] run function lib:spread_entity/
+
+# 召喚IDを指定
     data modify storage api: Argument.ID set value 2028
-    function api:object/summon
+
+# マーカーの位置にオブジェクト召喚
+    execute at @s unless entity @e[type=marker,scores={ObjectID=2041},distance=0.1..4,limit=1] positioned ~ ~40 ~ run function api:object/summon
diff --git a/...t/data/asset/functions/mob/1004.tultaria/tick/skill/fire/meteor_rain/pattern/1.mcfunction b/...t/data/asset/functions/mob/1004.tultaria/tick/skill/fire/meteor_rain/pattern/1.mcfunction
@@ -6,17 +6,21 @@
 
 # メテオ落下1
     # 拡散設置
-        execute if score @s RW.Tick matches 20 at @a run function asset:mob/1004.tultaria/tick/skill/fire/meteor_rain/meteor/place_marker
-    #    execute if score @s RW.Tick matches 20 at @a run function asset:mob/1004.tultaria/tick/skill/fire/meteor_rain/meteor/place_marker
-    #    execute if score @s RW.Tick matches 20 at @a run function asset:mob/1004.tultaria/tick/skill/fire/meteor_rain/meteor/place_marker
-    #    execute if score @s RW.Tick matches 20 at @a run function asset:mob/1004.tultaria/tick/skill/fire/meteor_rain/meteor/place_marker
+        execute if score @s RW.Tick matches 20 run function asset:mob/1004.tultaria/tick/skill/fire/meteor_rain/meteor/place_marker_spread
+        execute if score @s RW.Tick matches 20 run function asset:mob/1004.tultaria/tick/skill/fire/meteor_rain/meteor/place_marker_spread
+        execute if score @s RW.Tick matches 20 run function asset:mob/1004.tultaria/tick/skill/fire/meteor_rain/meteor/place_marker_spread
+        execute if score @s RW.Tick matches 20 run function asset:mob/1004.tultaria/tick/skill/fire/meteor_rain/meteor/place_marker_spread
+    # プレイヤー狙い
+        execute if score @s RW.Tick matches 20 at @r[distance=..100] run function asset:mob/1004.tultaria/tick/skill/fire/meteor_rain/meteor/place_marker_aiming
 
 # メテオ落下2
     # 拡散設置
-        execute if score @s RW.Tick matches 40 at @a run function asset:mob/1004.tultaria/tick/skill/fire/meteor_rain/meteor/place_marker
-    #    execute if score @s RW.Tick matches 40 at @a run function asset:mob/1004.tultaria/tick/skill/fire/meteor_rain/meteor/place_marker
-    #    execute if score @s RW.Tick matches 40 at @a run function asset:mob/1004.tultaria/tick/skill/fire/meteor_rain/meteor/place_marker
-    #    execute if score @s RW.Tick matches 40 at @a run function asset:mob/1004.tultaria/tick/skill/fire/meteor_rain/meteor/place_marker
+        execute if score @s RW.Tick matches 40 at @r[distance=..100] run function asset:mob/1004.tultaria/tick/skill/fire/meteor_rain/meteor/place_marker_spread
+        execute if score @s RW.Tick matches 40 run function asset:mob/1004.tultaria/tick/skill/fire/meteor_rain/meteor/place_marker_spread
+        execute if score @s RW.Tick matches 40 run function asset:mob/1004.tultaria/tick/skill/fire/meteor_rain/meteor/place_marker_spread
+        execute if score @s RW.Tick matches 40 run function asset:mob/1004.tultaria/tick/skill/fire/meteor_rain/meteor/place_marker_spread
+    # プレイヤー狙い
+        execute if score @s RW.Tick matches 20 at @r[distance=..100] run function asset:mob/1004.tultaria/tick/skill/fire/meteor_rain/meteor/place_marker_aiming
 
 # デバッグ用、この行動をループする
     execute if score @s RW.Tick matches 100 run scoreboard players set @s RW.Tick -10

diff --git a/Asset/data/asset/functions/object/2029.lastboss_meteor_marker/init/.mcfunction b/Asset/data/asset/functions/object/2029.lastboss_meteor_marker/init/.mcfunction
diff --git a/Asset/data/asset/functions/object/alias/2029/init.mcfunction b/Asset/data/asset/functions/object/alias/2029/init.mcfunction