From e8f3c7a3136a7e3ae337f5493b24d57c2b0fe9bb Mon Sep 17 00:00:00 2001
From: EllaCoat <uraito02kou@gmail.com>
Date: Sun, 25 Aug 2024 22:16:30 +0900
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E6=97=A6=E3=82=B3=E3=83=9F=E3=83=83?=
 =?UTF-8?q?=E3=83=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../0398.crystal_healer/ai/heal/.mcfunction    | 18 ++++--------------
 .../ai/heal/loop.mcfunction                    | 12 ++++++++++++
 2 files changed, 16 insertions(+), 14 deletions(-)
 create mode 100644 Asset/data/asset/functions/mob/0398.crystal_healer/ai/heal/loop.mcfunction

diff --git a/Asset/data/asset/functions/mob/0398.crystal_healer/ai/heal/.mcfunction b/Asset/data/asset/functions/mob/0398.crystal_healer/ai/heal/.mcfunction
index 30d7468e6e..f64d545489 100644
--- a/Asset/data/asset/functions/mob/0398.crystal_healer/ai/heal/.mcfunction
+++ b/Asset/data/asset/functions/mob/0398.crystal_healer/ai/heal/.mcfunction
@@ -4,28 +4,18 @@
 #
 # @within function asset:mob/0398.crystal_healer/tick/
 
-#> Private
-# @private
-    #declare tag B2.NotTarget
-
-# 周囲のファルシオスの神官にTagを付与
-    tag @e[type=wither_skeleton,scores={MobID=397},distance=..25] add B2.NotTarget
-    tag @e[type=wither_skeleton,scores={MobID=398},distance=..25] add B2.NotTarget
-
 # 演出
     particle happy_villager ~ ~2 ~ 0.75 0.5 0.75 0.3 20 force @a[distance=..32]
     playsound entity.arrow.hit_player hostile @a[distance=..32] ~ ~ ~ 1 1.6
     playsound entity.allay.item_thrown master @a[distance=..32] ~ ~ ~ 2 0.5 0.0
     playsound entity.ender_eye.death master @a ~ ~ ~ 2 0.5 0.0
-    execute as @e[type=#lib:living,tag=Enemy,tag=!B2.NotTarget,distance=..25,sort=nearest,limit=10] run particle heart ~ ~1.2 ~ 0.4 0.4 0.4 0 5 force @a[distance=..32]
-
+    execute as @e[type=wither_skeleton,scores={MobID=392},distance=..25] at @s run particle heart ~ ~1.2 ~ 0.4 0.4 0.4 0 5 force @a[distance=..32]
+    execute positioned ~ ~2 ~ facing entity @e[type=wither_skeleton,scores={MobID=392},distance=..25] eyes run function asset:mob/0398.crystal_healer/ai/heal/loop
+ 
 # 回復
 # 難易度値によって回復量が変動 150N
     function api:global_vars/get_difficulty
     execute store result storage api: Argument.Heal int 150 run data get storage api: Return.Difficulty
     function api:heal/modifier
-    execute as @e[type=#lib:living,tag=Enemy,tag=!B2.NotTarget,distance=..25,sort=nearest,limit=10] run function api:heal/
+    execute as @e[type=wither_skeleton,scores={MobID=392},distance=..25] run function api:heal/
     function api:heal/reset
-
-# リセット
-    tag @e[type=wither_skeleton,tag=B2.NotTarget,distance=..25] add B2.NotTarget
diff --git a/Asset/data/asset/functions/mob/0398.crystal_healer/ai/heal/loop.mcfunction b/Asset/data/asset/functions/mob/0398.crystal_healer/ai/heal/loop.mcfunction
new file mode 100644
index 0000000000..bb973326d5
--- /dev/null
+++ b/Asset/data/asset/functions/mob/0398.crystal_healer/ai/heal/loop.mcfunction
@@ -0,0 +1,12 @@
+#> asset:mob/0398.crystal_healer/ai/heal/loop
+#
+# 回復エフェクト ループ処理
+#
+# @within function
+#   asset:mob/0398.crystal_healer/ai/heal/
+#   asset:mob/0398.crystal_healer/ai/heal/loop
+
+# 演出
+#    execute unless entity @e[type=wither_skeleton,scores={MobID=392},distance=..100] run return 0
+    particle dust 0.125 1 0.2 1 ~ ~ ~ 0.05 0.05 0.05 0 3 force @a[distance=..32]
+    execute positioned ^ ^ ^0.5 unless entity @e[type=wither_skeleton,scores={MobID=392},distance=..0.5] run function asset:mob/0398.crystal_healer/ai/heal/loop