🚸 壁時計の判定を修正

ProjectTSB · Nov 17, 2024 · 6189f58 · 6189f58
1 parent 4e69f18
commit 6189f58
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 8 deletions.
diff --git a/.../functions/mob/0046.clock_of_despair/tick/skill/common/wall_lazer_clock/damage.mcfunction b/.../functions/mob/0046.clock_of_despair/tick/skill/common/wall_lazer_clock/damage.mcfunction
@@ -15,3 +15,4 @@
     function lib:damage/
 # リセット
     function lib:damage/reset
+    tag @s remove DXYZ
diff --git a/...et/functions/mob/0046.clock_of_despair/tick/skill/common/wall_lazer_clock/fire.mcfunction b/...et/functions/mob/0046.clock_of_despair/tick/skill/common/wall_lazer_clock/fire.mcfunction
@@ -6,10 +6,13 @@
 #   asset:mob/0046.clock_of_despair/tick/skill/common/wall_lazer_clock/tick
 #   asset:mob/0046.clock_of_despair/tick/skill/common/wall_lazer_clock/fire
 
-scoreboard players add $LazerDistance Temporary 1
+function asset:mob/0046.clock_of_despair/tick/skill/common/wall_lazer_clock/vfx/fire/
 
-function asset:mob/0046.clock_of_despair/tick/skill/common/wall_lazer_clock/vfx
+data modify storage lib: args.dx set value 6.3
+data modify storage lib: args.dy set value 6.3
+data modify storage lib: args.dz set value 20
+data modify storage lib: args.selector set value "@a[tag=!PlayerShouldInvulnerable,distance=..40]"
+execute positioned ^ ^ ^20 run function lib:rotatable_dxyz/m with storage lib: args
+execute as @a[tag=DXYZ] at @s run function asset:mob/0046.clock_of_despair/tick/skill/common/wall_lazer_clock/damage
 
-execute as @e[type=#lib:living,tag=Friend,tag=!PlayerShouldInvulnerable,tag=!Uninterferable,distance=..8] positioned ^ ^ ^-500 if entity @s[distance=..500.5] positioned ^ ^ ^1000 if entity @s[distance=..500.5] at @s run function asset:mob/0046.clock_of_despair/tick/skill/common/wall_lazer_clock/damage
-
-execute if block ~ ~ ~ #lib:no_collision if score $LazerDistance Temporary matches ..79 positioned ^ ^ ^0.5 run function asset:mob/0046.clock_of_despair/tick/skill/common/wall_lazer_clock/fire
+data remove storage lib: args
diff --git a/...et/functions/mob/0046.clock_of_despair/tick/skill/common/wall_lazer_clock/tick.mcfunction b/...et/functions/mob/0046.clock_of_despair/tick/skill/common/wall_lazer_clock/tick.mcfunction
@@ -26,6 +26,6 @@
 
 # 生存時間加算
     scoreboard players add @s 1A.LifeTime 1
-    execute if score @s 1A.LifeTime matches 120.. rotated ~90 ~ run function asset:mob/0046.clock_of_despair/tick/skill/common/wall_lazer_clock/fire
+    execute if score @s 1A.LifeTime matches 120.. rotated ~90 0 run function asset:mob/0046.clock_of_despair/tick/skill/common/wall_lazer_clock/fire
     execute if score @s 1A.LifeTime matches 120.. run scoreboard players reset $LazerDistance Temporary
     execute if score @s 1A.LifeTime matches 120.. run kill @s
diff --git a/...nctions/mob/0046.clock_of_despair/tick/skill/common/wall_lazer_clock/vfx/fire/.mcfunction b/...nctions/mob/0046.clock_of_despair/tick/skill/common/wall_lazer_clock/vfx/fire/.mcfunction
@@ -0,0 +1,13 @@
+#> asset:mob/0046.clock_of_despair/tick/skill/common/wall_lazer_clock/vfx/fire/
+#
+#
+#
+# @within function
+#   asset:mob/0046.clock_of_despair/tick/skill/common/wall_lazer_clock/fire
+#   asset:mob/0046.clock_of_despair/tick/skill/common/wall_lazer_clock/vfx/fire/
+
+
+scoreboard players add $LazerDistance Temporary 1
+function asset:mob/0046.clock_of_despair/tick/skill/common/wall_lazer_clock/vfx/fire/vfx
+
+execute if block ~ ~ ~ #lib:no_collision if score $LazerDistance Temporary matches ..79 positioned ^ ^ ^0.5 run function asset:mob/0046.clock_of_despair/tick/skill/common/wall_lazer_clock/vfx/fire/
diff --git a/...ll/common/wall_lazer_clock/vfx.mcfunction → .../wall_lazer_clock/vfx/fire/vfx.mcfunction b/...ll/common/wall_lazer_clock/vfx.mcfunction → .../wall_lazer_clock/vfx/fire/vfx.mcfunction
@@ -1,8 +1,8 @@
-#> asset:mob/0046.clock_of_despair/tick/skill/common/wall_lazer_clock/vfx
+#> asset:mob/0046.clock_of_despair/tick/skill/common/wall_lazer_clock/vfx/fire/vfx
 #
 #
 #
-# @within function asset:mob/0046.clock_of_despair/tick/skill/common/wall_lazer_clock/fire
+# @within function asset:mob/0046.clock_of_despair/tick/skill/common/wall_lazer_clock/vfx/fire/
 
 playsound minecraft:block.enchantment_table.use hostile @s ~ ~ ~ 1 1.35