From 37dfaf0cced3be3cb7f516c4f797b0e9ced782cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=91=A0=E7=92=83?=
 <87566955+Lapis-LJA@users.noreply.github.com>
Date: Tue, 27 Jun 2023 01:38:07 +0900
Subject: [PATCH] =?UTF-8?q?=F0=9F=A9=B9=20=E3=81=84=E3=81=8F=E3=81=A4?=
 =?UTF-8?q?=E3=81=8B=E3=81=AEMob=E3=81=AE=E4=BF=AE=E6=AD=A3=20(#1348)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mob/0054.pumpkin_meteor/tick/damage.mcfunction          | 2 +-
 .../mob/0055.hetukedah/tick/5.magicattack.mcfunction        | 2 +-
 .../functions/mob/0081.snow_cloud/tick/2.tick.mcfunction    | 6 ++----
 .../functions/mob/0219.aorta/hurt/3.rupture.mcfunction      | 4 ++--
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/Asset/data/asset/functions/mob/0054.pumpkin_meteor/tick/damage.mcfunction b/Asset/data/asset/functions/mob/0054.pumpkin_meteor/tick/damage.mcfunction
index 142d6d31aa..727a0bed88 100644
--- a/Asset/data/asset/functions/mob/0054.pumpkin_meteor/tick/damage.mcfunction
+++ b/Asset/data/asset/functions/mob/0054.pumpkin_meteor/tick/damage.mcfunction
@@ -15,7 +15,7 @@
     # 魔法属性
         data modify storage lib: Argument.AttackType set value "Magic"
     # 属性
-        data modify storage lib: Argument.ElementType set value "Water"
+        data modify storage lib: Argument.ElementType set value "Fire"
     # ダメージ
         function lib:damage/modifier
         execute as @a[tag=!PlayerShouldInvulnerable,distance=..3] run function lib:damage/
diff --git a/Asset/data/asset/functions/mob/0055.hetukedah/tick/5.magicattack.mcfunction b/Asset/data/asset/functions/mob/0055.hetukedah/tick/5.magicattack.mcfunction
index ffbf97bf79..93a4534ac8 100644
--- a/Asset/data/asset/functions/mob/0055.hetukedah/tick/5.magicattack.mcfunction
+++ b/Asset/data/asset/functions/mob/0055.hetukedah/tick/5.magicattack.mcfunction
@@ -17,6 +17,6 @@
         data modify storage lib: Argument.ElementType set value "Fire"
     # ダメージ
         function lib:damage/modifier
-        execute as @p[tag=!PlayerShouldInvulnerable,distance=..4] at @s run function lib:damage/
+        execute as @a[tag=!PlayerShouldInvulnerable,distance=..4] run function lib:damage/
 # リセット
     function lib:damage/reset
\ No newline at end of file
diff --git a/Asset/data/asset/functions/mob/0081.snow_cloud/tick/2.tick.mcfunction b/Asset/data/asset/functions/mob/0081.snow_cloud/tick/2.tick.mcfunction
index fcdf93e46b..886d5b4c38 100644
--- a/Asset/data/asset/functions/mob/0081.snow_cloud/tick/2.tick.mcfunction
+++ b/Asset/data/asset/functions/mob/0081.snow_cloud/tick/2.tick.mcfunction
@@ -23,7 +23,5 @@
 # 一定周期の特殊能力(分岐functionに記載)
     execute if score @s 29.SnowTick matches 60.. run function asset:mob/0081.snow_cloud/tick/5.snowing
 
-# 近くにプレイヤーがいない場合は消滅
-    execute unless entity @a[gamemode=!spectator,distance=..30] run kill @s
-
-
+# 近くにプレイヤーがいない場合は奈落行き
+    execute unless entity @a[gamemode=!spectator,distance=..30] run tp @s ~ -999 ~
\ No newline at end of file
diff --git a/Asset/data/asset/functions/mob/0219.aorta/hurt/3.rupture.mcfunction b/Asset/data/asset/functions/mob/0219.aorta/hurt/3.rupture.mcfunction
index 9a38a29a22..9296d05cb7 100644
--- a/Asset/data/asset/functions/mob/0219.aorta/hurt/3.rupture.mcfunction
+++ b/Asset/data/asset/functions/mob/0219.aorta/hurt/3.rupture.mcfunction
@@ -21,5 +21,5 @@
 # 移動速度上昇を付与
     effect give @e[type=#lib:living,tag=Enemy,tag=!this,tag=!Uninterferable,distance=..5] speed 3 2 true
 
-# 死ぬ
-    kill @s
\ No newline at end of file
+# 奈落行き
+    tp @s ~ -999 ~
\ No newline at end of file