Merge branch 'master' of https://github.com/mokkkk/MH_DP

data/asa_animator/functions/brachy/anim/anger/main.mcfunction

@@ -18,7 +18,8 @@ function asa_animator:brachy/model
 execute if entity @s[scores={AsaMatrix=1}] run playsound block.grass.step master @a ~ ~ ~ 2 0.5
 
 execute if entity @s[scores={AsaMatrix=6}] run function asa_animator:brachy/manager/model/change_to_anger
-execute if entity @s[scores={AsaMatrix=11..48}] as @e[distance=0..10,type=armor_stand,tag=BrachyParts,tag=HeadU] at @s positioned ~ ~1.4 ~ run particle flash ~ ~ ~ 0 0 0 0 1
+execute if entity @s[scores={AsaMatrix=11..48}] as @e[type=armor_stand,tag=BrachyParts,tag=HeadU,distance=0..10] at @s positioned ~ ~1.4 ~ run particle flash ~ ~ ~ 0 0 0 0 1
 execute if entity @s[scores={AsaMatrix=11}] run playsound entity.blaze.death master @a ~ ~ ~ 2 0.7
 execute if entity @s[scores={AsaMatrix=11}] run playsound entity.blaze.death master @a ~ ~ ~ 2 0.6
-execute if entity @s[scores={AsaMatrix=11}] run particle block grass_block ^ ^ ^2 2 0.1 2 0 30
+execute if entity @s[scores={AsaMatrix=11}] run particle block grass_block ^ ^ ^2 2 0.1 2 0 30
+execute if entity @s[scores={AsaMatrix=11}] run function asa_animator:brachy/anim/voice/events/damage

data/asa_animator/functions/brachy/anim/charge_bomb/main.mcfunction

@@ -19,6 +19,6 @@ execute if entity @s[scores={AsaMatrix=66..}] run function asa_animator:brachy/a
 execute as @e[type=armor_stand,tag=BrachyParts] run function #asa_matrix:animate
 function asa_animator:brachy/model
 
-execute if entity @s[scores={AsaMatrix=1..50}] if predicate asa_animator:random/020 as @e[distance=0..10,type=armor_stand,tag=BrachyParts,tag=HeadU] at @s run particle spit ~ ~1.4 ~ 0.1 0.1 0.1 0 1
+execute if entity @s[scores={AsaMatrix=1..50}] if predicate asa_animator:random/020 as @e[type=armor_stand,tag=BrachyParts,tag=HeadU,distance=0..10] at @s run particle spit ~ ~1.4 ~ 0.1 0.1 0.1 0 1
 execute if entity @s[scores={AsaMatrix=9}] run playsound block.honey_block.break master @a ~ ~ ~ 2 0.5
 execute if entity @s[scores={AsaMatrix=35}] run playsound block.honey_block.break master @a ~ ~ ~ 2 0.5

data/asa_animator/functions/brachy/anim/death/main.mcfunction

@@ -31,7 +31,7 @@ execute if entity @s[scores={AsaMatrix=84}] run playsound block.grass.step maste
 
 execute if entity @s[scores={AsaMatrix=46}] run playsound entity.blaze.death master @a ~ ~ ~ 1 0.6
 execute if entity @s[scores={AsaMatrix=46}] run playsound entity.blaze.death master @a ~ ~ ~ 1 0.5
-execute if entity @s[scores={AsaMatrix=46..48}] as @e[distance=0..10,type=armor_stand,tag=BrachyParts,tag=HeadU] at @s positioned ~ ~1.4 ~ run particle flash ~ ~ ~ 0 0 0 0 1
+execute if entity @s[scores={AsaMatrix=46..48}] as @e[type=armor_stand,tag=BrachyParts,tag=HeadU,distance=0..10] at @s positioned ~ ~1.4 ~ run particle flash ~ ~ ~ 0 0 0 0 1
 
-execute if entity @s[scores={AsaMatrix=61}] unless entity @s[tag=DestroyHead] as @e[distance=0..30,type=armor_stand,tag=BrachyParts,tag=HeadU] run data modify entity @s ArmorItems[3].tag.CustomModelData set value 10248
-execute if entity @s[scores={AsaMatrix=61}] if entity @s[tag=DestroyHead] as @e[distance=0..30,type=armor_stand,tag=BrachyParts,tag=HeadU] run data modify entity @s ArmorItems[3].tag.CustomModelData set value 10249
+execute if entity @s[scores={AsaMatrix=61}] unless entity @s[tag=DestroyHead] as @e[type=armor_stand,tag=BrachyParts,tag=HeadU,distance=0..30] run data modify entity @s ArmorItems[3].tag.CustomModelData set value 10248
+execute if entity @s[scores={AsaMatrix=61}] if entity @s[tag=DestroyHead] as @e[type=armor_stand,tag=BrachyParts,tag=HeadU,distance=0..30] run data modify entity @s ArmorItems[3].tag.CustomModelData set value 10249

data/asa_animator/functions/brachy/anim/head_bomb/main.mcfunction

@@ -24,8 +24,8 @@ function asa_animator:brachy/model
 execute if entity @s[scores={AsaMatrix=1}] run playsound block.grass.step master @a ~ ~ ~ 2 0.5
 
 execute if entity @s[scores={AsaMatrix=1..10}] run function asa_animator:brachy/manager/rotate
-execute if entity @s[scores={AsaMatrix=1..5}] if entity @e[distance=0..5,tag=BrachyAttackTarget] at @s run tp @s ^ ^ ^-0.5
-execute if entity @s[scores={AsaMatrix=16..25}] unless entity @e[distance=0..4,tag=BrachyAttackTarget] at @s run tp @s ^ ^ ^0.3
+execute if entity @s[scores={AsaMatrix=1..5}] if entity @e[tag=BrachyAttackTarget,distance=0..5] at @s run tp @s ^ ^ ^-0.5
+execute if entity @s[scores={AsaMatrix=16..25}] unless entity @e[tag=BrachyAttackTarget,distance=0..4] at @s run tp @s ^ ^ ^0.3
 
 execute if entity @s[scores={AsaMatrix=26}] positioned ^ ^ ^3.5 run function asa_animator:brachy/anim/head_bomb/events/damage
 

data/asa_animator/functions/brachy/anim/head_bomb_shot/main.mcfunction

@@ -29,7 +29,7 @@ function asa_animator:brachy/model
 
 execute if entity @s[scores={AsaMatrix=1..18}] run function asa_animator:brachy/manager/rotate
 
-execute if entity @s[scores={AsaMatrix=1..12}] if entity @e[distance=0..18,tag=BrachyAttackTarget] at @s run tp @s ^ ^ ^-0.6
+execute if entity @s[scores={AsaMatrix=1..12}] if entity @e[tag=BrachyAttackTarget,distance=0..18] at @s run tp @s ^ ^ ^-0.6
 execute if entity @s[scores={AsaMatrix=1..12}] at @s if block ~ ~-0.2 ~ #asa_animator:no_collision at @s run function asa_animator:zinogre/manager/check_ground
 execute if entity @s[scores={AsaMatrix=1..12}] at @s unless block ~ ~ ~ #asa_animator:no_collision at @s run tp @s ~ ~0.1 ~ ~ ~
 execute if entity @s[scores={AsaMatrix=1..12}] run playsound block.grass.step master @a ~ ~ ~ 2 0.5

data/asa_animator/functions/brachy/anim/hook_l/main.mcfunction

@@ -21,8 +21,8 @@ function asa_animator:brachy/model
 
 execute if entity @s[scores={AsaMatrix=1}] run playsound block.grass.step master @a ~ ~ ~ 2 0.5
 
-execute if entity @s[scores={AsaMatrix=1..12}] if entity @e[distance=0..5,tag=BrachyAttackTarget] at @s run tp @s ^ ^ ^-0.2
-execute if entity @s[scores={AsaMatrix=16..21}] unless entity @e[distance=0..4,tag=BrachyAttackTarget] at @s run tp @s ^ ^ ^0.3
+execute if entity @s[scores={AsaMatrix=1..12}] if entity @e[tag=BrachyAttackTarget,distance=0..5] at @s run tp @s ^ ^ ^-0.2
+execute if entity @s[scores={AsaMatrix=16..21}] unless entity @e[tag=BrachyAttackTarget,distance=0..4] at @s run tp @s ^ ^ ^0.3
 execute if entity @s[scores={AsaMatrix=17..21}] run function asa_animator:brachy/manager/rotate_fast
 
 execute if entity @s[scores={AsaMatrix=22}] positioned ^0.5 ^ ^4 run function asa_animator:brachy/anim/hook_l/events/damage

data/asa_animator/functions/brachy/anim/hook_r/main.mcfunction

@@ -21,8 +21,8 @@ function asa_animator:brachy/model
 
 execute if entity @s[scores={AsaMatrix=1}] run playsound block.grass.step master @a ~ ~ ~ 2 0.5
 
-execute if entity @s[scores={AsaMatrix=1..12}] if entity @e[distance=0..5,tag=BrachyAttackTarget] at @s run tp @s ^ ^ ^-0.2
-execute if entity @s[scores={AsaMatrix=16..21}] unless entity @e[distance=0..4,tag=BrachyAttackTarget] at @s run tp @s ^ ^ ^0.3
+execute if entity @s[scores={AsaMatrix=1..12}] if entity @e[tag=BrachyAttackTarget,distance=0..5] at @s run tp @s ^ ^ ^-0.2
+execute if entity @s[scores={AsaMatrix=16..21}] unless entity @e[tag=BrachyAttackTarget,distance=0..4] at @s run tp @s ^ ^ ^0.3
 execute if entity @s[scores={AsaMatrix=17..21}] run function asa_animator:brachy/manager/rotate_fast
 
 execute if entity @s[scores={AsaMatrix=22}] positioned ^-0.5 ^ ^4 run function asa_animator:brachy/anim/hook_l/events/damage

data/asa_animator/functions/brachy/anim/move/main.mcfunction

@@ -25,4 +25,4 @@ execute at @s if block ~ ~-0.2 ~ #asa_animator:no_collision at @s run function a
 execute at @s unless block ~ ~ ~ #asa_animator:no_collision at @s run tp @s ~ ~0.1 ~ ~ ~
 
 # 敵に十分近づいた場合，遷移
-execute positioned ^ ^ ^5 if entity @e[distance=0..4,tag=BrachyAttackTarget] run function asa_animator:brachy/anim/move/events/change
+execute positioned ^ ^ ^5 if entity @e[tag=BrachyAttackTarget,distance=0..4] run function asa_animator:brachy/anim/move/events/change

data/asa_animator/functions/brachy/anim/move_punch_l/main.mcfunction

@@ -29,7 +29,7 @@ execute if entity @s[scores={AsaMatrix=19..45}] run particle block grass_block ~
 execute if entity @s[scores={AsaMatrix=19..45}] run playsound block.grass.step master @a ~ ~ ~ 2 0.7
 
 execute if entity @s[scores={AsaMatrix=19}] run summon marker ~ ~ ~ {Tags:["BrachyMoveRotate"]}
-execute if entity @s[scores={AsaMatrix=19}] run tp @e[distance=0..3,type=marker,tag=BrachyMoveRotate] ~ ~ ~ ~ 0
+execute if entity @s[scores={AsaMatrix=19}] run tp @e[type=marker,tag=BrachyMoveRotate,distance=0..3] ~ ~ ~ ~ 0
 execute if entity @s[scores={AsaMatrix=21..25}] at @s rotated as @e[type=marker,tag=BrachyMoveRotate] run tp @s ^0.2 ^ ^0.3
 execute if entity @s[scores={AsaMatrix=26..35}] at @s rotated as @e[type=marker,tag=BrachyMoveRotate] run tp @s ^0.1 ^ ^0.7
 execute if entity @s[scores={AsaMatrix=36..45}] at @s rotated as @e[type=marker,tag=BrachyMoveRotate] run tp @s ^ ^ ^0.1

data/asa_animator/functions/brachy/anim/move_punch_r/main.mcfunction

@@ -29,7 +29,7 @@ execute if entity @s[scores={AsaMatrix=19..45}] run particle block grass_block ~
 execute if entity @s[scores={AsaMatrix=19..45}] run playsound block.grass.step master @a ~ ~ ~ 2 0.7
 
 execute if entity @s[scores={AsaMatrix=19}] run summon marker ~ ~ ~ {Tags:["BrachyMoveRotate"]}
-execute if entity @s[scores={AsaMatrix=19}] run tp @e[distance=0..3,type=marker,tag=BrachyMoveRotate] ~ ~ ~ ~ 0
+execute if entity @s[scores={AsaMatrix=19}] run tp @e[type=marker,tag=BrachyMoveRotate,distance=0..3] ~ ~ ~ ~ 0
 execute if entity @s[scores={AsaMatrix=21..25}] at @s rotated as @e[type=marker,tag=BrachyMoveRotate] run tp @s ^-0.2 ^ ^0.3
 execute if entity @s[scores={AsaMatrix=26..35}] at @s rotated as @e[type=marker,tag=BrachyMoveRotate] run tp @s ^-0.1 ^ ^0.7
 execute if entity @s[scores={AsaMatrix=36..45}] at @s rotated as @e[type=marker,tag=BrachyMoveRotate] run tp @s ^ ^ ^0.1

data/asa_animator/functions/brachy/anim/punch_l/main.mcfunction

@@ -22,8 +22,8 @@ function asa_animator:brachy/model
 execute if entity @s[scores={AsaMatrix=1}] run playsound block.grass.step master @a ~ ~ ~ 2 0.5
 
 execute if entity @s[scores={AsaMatrix=1..7}] run function asa_animator:brachy/manager/rotate
-execute if entity @s[scores={AsaMatrix=1..12}] if entity @e[distance=0..5,tag=BrachyAttackTarget] at @s run tp @s ^ ^ ^-0.5
-execute if entity @s[scores={AsaMatrix=16..21}] unless entity @e[distance=0..4,tag=BrachyAttackTarget] at @s run tp @s ^ ^ ^1
+execute if entity @s[scores={AsaMatrix=1..12}] if entity @e[tag=BrachyAttackTarget,distance=0..5] at @s run tp @s ^ ^ ^-0.5
+execute if entity @s[scores={AsaMatrix=16..21}] unless entity @e[tag=BrachyAttackTarget,distance=0..4] at @s run tp @s ^ ^ ^1
 
 execute if entity @s[scores={AsaMatrix=22}] positioned ^ ^ ^3 run function asa_animator:brachy/anim/punch_l/events/damage
 execute unless predicate asa_animator:brachy/combo if entity @s[scores={AsaMatrix=30}] run function asa_animator:brachy/manager/cancel_animation

data/asa_animator/functions/brachy/anim/punch_r/main.mcfunction

@@ -22,8 +22,8 @@ function asa_animator:brachy/model
 execute if entity @s[scores={AsaMatrix=1}] run playsound block.grass.step master @a ~ ~ ~ 2 0.5
 
 execute if entity @s[scores={AsaMatrix=1..7}] run function asa_animator:brachy/manager/rotate
-execute if entity @s[scores={AsaMatrix=1..12}] if entity @e[distance=0..5,tag=BrachyAttackTarget] at @s run tp @s ^ ^ ^-0.5
-execute if entity @s[scores={AsaMatrix=16..21}] unless entity @e[distance=0..4,tag=BrachyAttackTarget] at @s run tp @s ^ ^ ^1
+execute if entity @s[scores={AsaMatrix=1..12}] if entity @e[tag=BrachyAttackTarget,distance=0..5] at @s run tp @s ^ ^ ^-0.5
+execute if entity @s[scores={AsaMatrix=16..21}] unless entity @e[tag=BrachyAttackTarget,distance=0..4] at @s run tp @s ^ ^ ^1
 
 execute if entity @s[scores={AsaMatrix=22}] positioned ^ ^ ^3 run function asa_animator:brachy/anim/punch_l/events/damage
 execute unless predicate asa_animator:brachy/combo if entity @s[scores={AsaMatrix=30}] run function asa_animator:brachy/manager/cancel_animation

data/asa_animator/functions/brachy/anim/punch_turn_l/main.mcfunction

@@ -24,8 +24,8 @@ function asa_animator:brachy/model
 execute if entity @s[scores={AsaMatrix=11}] run playsound block.grass.step master @a ~ ~ ~ 2 0.5
 
 execute if entity @s[scores={AsaMatrix=11..23}] run function asa_animator:brachy/manager/rotate
-execute if entity @s[scores={AsaMatrix=11..22}] if entity @e[distance=0..5,tag=BrachyAttackTarget] at @s run tp @s ^ ^ ^-0.5
-execute if entity @s[scores={AsaMatrix=28..31}] unless entity @e[distance=0..4,tag=BrachyAttackTarget] at @s run tp @s ^ ^ ^1
+execute if entity @s[scores={AsaMatrix=11..22}] if entity @e[tag=BrachyAttackTarget,distance=0..5] at @s run tp @s ^ ^ ^-0.5
+execute if entity @s[scores={AsaMatrix=28..31}] unless entity @e[tag=BrachyAttackTarget,distance=0..4] at @s run tp @s ^ ^ ^1
 
 execute if entity @s[scores={AsaMatrix=32}] positioned ^ ^ ^3 run function asa_animator:brachy/anim/punch_l/events/damage
 execute unless predicate asa_animator:brachy/combo if entity @s[scores={AsaMatrix=40}] run function asa_animator:brachy/manager/cancel_animation

data/asa_animator/functions/brachy/anim/punch_turn_r/main.mcfunction

@@ -24,8 +24,8 @@ function asa_animator:brachy/model
 execute if entity @s[scores={AsaMatrix=11}] run playsound block.grass.step master @a ~ ~ ~ 2 0.5
 
 execute if entity @s[scores={AsaMatrix=11..23}] run function asa_animator:brachy/manager/rotate
-execute if entity @s[scores={AsaMatrix=11..22}] if entity @e[distance=0..5,tag=BrachyAttackTarget] at @s run tp @s ^ ^ ^-0.5
-execute if entity @s[scores={AsaMatrix=28..31}] unless entity @e[distance=0..4,tag=BrachyAttackTarget] at @s run tp @s ^ ^ ^1
+execute if entity @s[scores={AsaMatrix=11..22}] if entity @e[tag=BrachyAttackTarget,distance=0..5] at @s run tp @s ^ ^ ^-0.5
+execute if entity @s[scores={AsaMatrix=28..31}] unless entity @e[tag=BrachyAttackTarget,distance=0..4] at @s run tp @s ^ ^ ^1
 
 execute if entity @s[scores={AsaMatrix=32}] positioned ^ ^ ^3 run function asa_animator:brachy/anim/punch_l/events/damage
 execute unless predicate asa_animator:brachy/combo if entity @s[scores={AsaMatrix=40}] run function asa_animator:brachy/manager/cancel_animation

data/asa_animator/functions/brachy/anim/tail/main.mcfunction

@@ -22,6 +22,6 @@ execute as @e[type=armor_stand,tag=BrachyParts] run function #asa_matrix:animate
 function asa_animator:brachy/model
 
 execute if entity @s[scores={AsaMatrix=1..10}] run function asa_animator:brachy/manager/rotate_lr_r
-execute if entity @s[scores={AsaMatrix=1..7}] unless entity @e[distance=0..4,tag=BrachyAttackTarget] at @s run tp @s ^ ^ ^-0.2
+execute if entity @s[scores={AsaMatrix=1..7}] unless entity @e[tag=BrachyAttackTarget,distance=0..4] at @s run tp @s ^ ^ ^-0.2
 execute if entity @s[scores={AsaMatrix=15}] positioned ^ ^ ^-3 run function asa_animator:brachy/anim/tail/events/damage
 execute if entity @s[scores={AsaMatrix=24}] positioned ^ ^ ^-3 run function asa_animator:brachy/anim/tail/events/damage

data/asa_animator/functions/brachy/anim/voice/events/damage.mcfunction

@@ -0,0 +1,5 @@
+# 3 Damage
+data modify storage score_damage: Argument set value {Damage:0.5f, BypassArmor:0b}
+data merge storage mhdp: {Epf:1}
+execute positioned ^ ^ ^3 as @e[type=!armor_stand,type=!marker,tag=!BrachyParts,distance=..15] run function asa_animator:brachy/anim/voice/events/damage_sub
+execute positioned ^ ^ ^3 as @e[type=!armor_stand,type=!marker,tag=!BrachyParts,distance=..15] unless entity @s[scores={MhdpTAvoid=1..}] run function asa_animator:brachy/anim/voice/events/damage_sub_

data/asa_animator/functions/brachy/anim/voice/events/damage_sub.mcfunction

@@ -0,0 +1,4 @@
+# ダメージ
+tag @s add D_BrachyVoice
+function mh_dp:damage/attack
+tag @s remove D_BrachyVoice

data/asa_animator/functions/brachy/anim/voice/events/damage_sub_.mcfunction

@@ -0,0 +1,4 @@
+# ダメージ
+effect give @s slowness 2 5 true
+effect give @s jump_boost 2 128 true
+execute if entity @s[type=player] at @s run tp @s ~ ~ ~ ~ 90

data/asa_animator/functions/brachy/anim/voice/main.mcfunction

@@ -34,7 +34,8 @@ execute if entity @s[scores={AsaMatrix=1}] run playsound block.grass.step master
 execute if entity @s[scores={AsaMatrix=20}] run playsound block.grass.step master @a ~ ~ ~ 2 0.7
 execute if entity @s[scores={AsaMatrix=38}] run playsound block.grass.step master @a ~ ~ ~ 2 0.7
 
-execute if entity @s[scores={AsaMatrix=54..81}] as @e[distance=0..10,type=armor_stand,tag=BrachyParts,tag=HeadU] at @s positioned ~ ~1.4 ~ run particle flash ~ ~ ~ 0 0 0 0 1
+execute if entity @s[scores={AsaMatrix=54..81}] as @e[type=armor_stand,tag=BrachyParts,tag=HeadU,distance=0..10] at @s positioned ~ ~1.4 ~ run particle flash ~ ~ ~ 0 0 0 0 1
 
 execute if entity @s[scores={AsaMatrix=54}] run playsound entity.blaze.death master @a ~ ~ ~ 2 0.8
-execute if entity @s[scores={AsaMatrix=54}] run playsound entity.blaze.death master @a ~ ~ ~ 2 0.7
+execute if entity @s[scores={AsaMatrix=54}] run playsound entity.blaze.death master @a ~ ~ ~ 2 0.7
+execute if entity @s[scores={AsaMatrix=54}] run function asa_animator:brachy/anim/voice/events/damage

data/asa_animator/functions/brachy/kill.mcfunction

@@ -1,13 +1,19 @@
 kill @e[type=armor_stand,tag=BrachyRoot]
 kill @e[type=armor_stand,tag=BrachyParts]
-scoreboard players reset #mhdp_brachy_health AsaMatrix
-scoreboard players reset #mhdp_brachy_kill_timer AsaMatrix
-scoreboard players reset #mhdp_brachy_anger_damage AsaMatrix
-scoreboard players reset #mhdp_brachy_bomb_count AsaMatrix
-scoreboard players reset #mhdp_brachy_head_damage AsaMatrix
-scoreboard players reset #mhdp_brachy_arml_damage AsaMatrix
-scoreboard players reset #mhdp_brachy_armr_damage AsaMatrix
-scoreboard players reset #mhdp_brachy_tail_damage AsaMatrix
-scoreboard players reset #mhdp_brachy_actcount AsaMatrix
-scoreboard players reset #mhdp_brachy_anger_count AsaMatrix
-scoreboard players reset #mhdp_brachy_combo_count AsaMatrix
+scoreboard players reset #mhdp_brachy_health
+scoreboard players reset #mhdp_brachy_kill_timer
+scoreboard players reset #mhdp_brachy_anger_damage
+scoreboard players reset #mhdp_brachy_bomb_count
+scoreboard players reset #mhdp_brachy_head_damage
+scoreboard players reset #mhdp_brachy_arml_damage
+scoreboard players reset #mhdp_brachy_armr_damage
+scoreboard players reset #mhdp_brachy_tail_damage
+scoreboard players reset #mhdp_brachy_actcount
+scoreboard players reset #mhdp_brachy_anger_count
+scoreboard players reset #mhdp_brachy_combo_count
+scoreboard players reset #brachy_mine_pos
+scoreboard players reset #brachy_mine_x
+scoreboard players reset #brachy_mine_y
+scoreboard players reset #brachy_mine_z
+scoreboard players reset #brachy_height_target
+scoreboard players reset #brachy_damage

data/asa_animator/functions/brachy/manager/bomb/head/set.mcfunction

@@ -1,5 +1,5 @@
 
 # 攻撃用防具立て召喚
 summon armor_stand ~ ~ ~ {Marker:1b,Invisible:1b,Tags:["MonsterShot","BrachyBombS","Start"],ArmorItems:[{},{},{},{}]}
-execute as @e[distance=0..1,type=armor_stand,tag=BrachyBombS,tag=Start] positioned ~ ~5 ~ align y run function asa_animator:brachy/manager/bomb/check_ground_
+execute as @e[type=armor_stand,tag=BrachyBombS,tag=Start,distance=0..1] positioned ~ ~5 ~ align y run function asa_animator:brachy/manager/bomb/check_ground_
 tag @e[type=armor_stand,tag=BrachyBombS,tag=Start] remove Start

data/asa_animator/functions/brachy/manager/bomb/large.mcfunction

@@ -1,6 +1,6 @@
 
 # 攻撃用防具立て召喚
 summon armor_stand ~ ~ ~ {Marker:1b,Invisible:1b,Tags:["MonsterShot","BrachyBomb","Large","Start"],ArmorItems:[{},{},{},{id:"minecraft:barrier",Count:1b,tag:{CustomModelData:10243}}]}
-execute as @e[distance=0..1,type=armor_stand,tag=BrachyBomb,tag=Start] positioned ~ ~5 ~ align y run function asa_animator:brachy/manager/bomb/check_ground_
-execute as @e[distance=0..1,type=armor_stand,tag=BrachyBomb,tag=Start] at @s run particle dust 0.427 0.867 0.467 2 ~ ~0.2 ~ 0.7 0.1 0.7 0 20
+execute as @e[type=armor_stand,tag=BrachyBomb,tag=Start,distance=0..1] positioned ~ ~5 ~ align y run function asa_animator:brachy/manager/bomb/check_ground_
+execute as @e[type=armor_stand,tag=BrachyBomb,tag=Start,distance=0..1] at @s run particle dust 0.427 0.867 0.467 2 ~ ~0.2 ~ 0.7 0.1 0.7 0 20
 tag @e[type=armor_stand,tag=BrachyBomb,tag=Start] remove Start

data/asa_animator/functions/brachy/manager/bomb/normal.mcfunction

@@ -1,6 +1,6 @@
 
 # 攻撃用防具立て召喚
 summon armor_stand ~ ~ ~ {Marker:1b,Invisible:1b,Tags:["MonsterShot","BrachyBomb","Normal","Start"],ArmorItems:[{},{},{},{id:"minecraft:barrier",Count:1b,tag:{CustomModelData:10237}}]}
-execute as @e[distance=0..1,type=armor_stand,tag=BrachyBomb,tag=Start] positioned ~ ~5 ~ align y run function asa_animator:brachy/manager/bomb/check_ground_
-execute as @e[distance=0..1,type=armor_stand,tag=BrachyBomb,tag=Start] at @s run particle dust 0.427 0.867 0.467 2 ~ ~0.2 ~ 0.7 0.1 0.7 0 20
+execute as @e[type=armor_stand,tag=BrachyBomb,tag=Start,distance=0..1] positioned ~ ~5 ~ align y run function asa_animator:brachy/manager/bomb/check_ground_
+execute as @e[type=armor_stand,tag=BrachyBomb,tag=Start,distance=0..1] at @s run particle dust 0.427 0.867 0.467 2 ~ ~0.2 ~ 0.7 0.1 0.7 0 20
 tag @e[type=armor_stand,tag=BrachyBomb,tag=Start] remove Start