diff --git a/Asset/data/asset/functions/mob/0392.ecual_first/_index.d.mcfunction b/Asset/data/asset/functions/mob/0392.ecual_first/_index.d.mcfunction index 380010513..9f230bb94 100644 --- a/Asset/data/asset/functions/mob/0392.ecual_first/_index.d.mcfunction +++ b/Asset/data/asset/functions/mob/0392.ecual_first/_index.d.mcfunction @@ -24,6 +24,7 @@ #declare tag AW.WaterWall #declare tag AW.HydroStorm #declare tag AW.HydroStormFirst + #declare tag AW.HydroAnnounce #> val # @within function asset:mob/0392.ecual_first/** diff --git a/Asset/data/asset/functions/mob/0392.ecual_first/ai/projectile/hydro/2.tick.mcfunction b/Asset/data/asset/functions/mob/0392.ecual_first/ai/projectile/hydro/2.tick.mcfunction index 604aa00d9..5f2e80ae6 100644 --- a/Asset/data/asset/functions/mob/0392.ecual_first/ai/projectile/hydro/2.tick.mcfunction +++ b/Asset/data/asset/functions/mob/0392.ecual_first/ai/projectile/hydro/2.tick.mcfunction @@ -26,6 +26,10 @@ # VFX execute if score @s AW.ProjectileTick matches 1..110 run function asset:mob/0392.ecual_first/ai/projectile/hydro/direction/vfx/tick +# 予告線 + execute as @e[type=item_display,tag=AW.HydroAnnounce,distance=..2] run data merge entity @s {teleport_duration:0,transformation:{scale:[3f,0.1f,60f]}} + execute if entity @s[tag=!AW.HydroStormFirst] if entity @e[type=marker,tag=AW.Marker.SummonPoint,distance=24.25..25.75] run function asset:mob/0392.ecual_first/ai/projectile/hydro/direction/announce_line + # サウンド scoreboard players operation $AW.Temp Temporary = @s AW.ProjectileTick scoreboard players operation $AW.Temp Temporary %= $2 Const @@ -42,7 +46,8 @@ execute on passengers on passengers run data modify entity @s Age set value 0 # TP - execute at @s run tp @s ^ ^ ^1.25 + execute at @s run tp @s ^ ^ ^1 + execute if predicate api:global_vars/difficulty/min/hard at @s run tp @s ^ ^ ^0.25 # キル execute if score @s AW.ProjectileTick matches 111.. run function asset:mob/0392.ecual_first/ai/projectile/hydro/4.kill diff --git a/Asset/data/asset/functions/mob/0392.ecual_first/ai/projectile/hydro/direction/announce_line.mcfunction b/Asset/data/asset/functions/mob/0392.ecual_first/ai/projectile/hydro/direction/announce_line.mcfunction new file mode 100644 index 000000000..5d5e54ade --- /dev/null +++ b/Asset/data/asset/functions/mob/0392.ecual_first/ai/projectile/hydro/direction/announce_line.mcfunction @@ -0,0 +1,8 @@ +#> asset:mob/0392.ecual_first/ai/projectile/hydro/direction/announce_line +# +# 予告線 +# +# @within function asset:mob/0392.ecual_first/ai/projectile/hydro/2.tick + +summon item_display ^ ^ ^ {interpolation_duration:0,teleport_duration:0,Tags:["AW.HydroAnnounce","AllowProcessingCommonTag","AutoKillWhenDiePassenger"],brightness:{sky:15,block:15},transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,-1.2f,30f],scale:[0f,0f,60f]},item:{id:"purple_stained_glass",Count:1b},Passengers:[{id:"area_effect_cloud",Particle:"block air",Radius:0f,Duration:10}]} +tp @e[tag=AW.HydroAnnounce,distance=..0.001] ~ ~ ~ ~ ~ diff --git a/Asset/data/asset/tags/functions/mob/death.json b/Asset/data/asset/tags/functions/mob/death.json index 3eb2578e8..b03327147 100644 --- a/Asset/data/asset/tags/functions/mob/death.json +++ b/Asset/data/asset/tags/functions/mob/death.json @@ -4,7 +4,6 @@ "asset:mob/0402.drown_spellbook/_/death", "asset:mob/0401.darkness_spellbook/_/death", "asset:mob/0400.explosion_spellbook/_/death", - "asset:mob/0398.crystal_healer/_/death", "asset:mob/0392.ecual_first/_/death", "asset:mob/0391.axia_first/_/death", "asset:mob/0265.dark_familiar/_/death", @@ -87,4 +86,4 @@ "asset:mob/0139.blast_eye/death/1.trigger", "asset:mob/0186.ferocious_bee/death/1.trigger" ] -} \ No newline at end of file +}