From 5a6d1e377421eddd9273bd1e9fc2d072b342fad0 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Sun, 10 May 2026 03:16:55 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=E8=AB=B8=E3=80=85=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app.general/summon_object/slash_beam.m.mcfunction | 11 +++++++++++ .../02_former_slash/4.3.attack_slash_2.mcfunction | 10 ++-------- .../35_latter_beam/attack_0.mcfunction | 9 ++------- .../35_latter_beam/attack_1.mcfunction | 9 ++------- .../35_latter_beam/attack_2.mcfunction | 9 ++------- .../35_latter_beam/attack_3.mcfunction | 9 ++------- .../35_latter_beam/attack_4.mcfunction | 9 ++------- .../object/2190.eclael_slashbeam/register.mcfunction | 8 ++++---- .../object/2190.eclael_slashbeam/summon/.mcfunction | 6 +++++- .../2190.eclael_slashbeam/summon/debug.mcfunction | 10 ---------- .../object/2190.eclael_slashbeam/tick/.mcfunction | 2 +- 11 files changed, 33 insertions(+), 59 deletions(-) create mode 100644 Asset/data/asset/functions/mob/0327.eclael/tick/app.general/summon_object/slash_beam.m.mcfunction delete mode 100644 Asset/data/asset/functions/object/2190.eclael_slashbeam/summon/debug.mcfunction diff --git a/Asset/data/asset/functions/mob/0327.eclael/tick/app.general/summon_object/slash_beam.m.mcfunction b/Asset/data/asset/functions/mob/0327.eclael/tick/app.general/summon_object/slash_beam.m.mcfunction new file mode 100644 index 00000000000..bc419e79658 --- /dev/null +++ b/Asset/data/asset/functions/mob/0327.eclael/tick/app.general/summon_object/slash_beam.m.mcfunction @@ -0,0 +1,11 @@ +#> asset:mob/0327.eclael/tick/app.general/summon_object/slash_beam.m +# +# @input args: +# Angle : float +# @within function asset:mob/0327.eclael/tick/app.skill_events/** + + data modify storage api: Argument.ID set value 2190 + data modify storage api: Argument.FieldOverride.Damage set from storage asset:context this.Damage.Beam + $data modify storage api: Argument.FieldOverride.Angle set value $(Angle) + execute store result storage api: Argument.FieldOverride.MobUUID int 1 run scoreboard players get @s MobUUID + function api:object/summon diff --git a/Asset/data/asset/functions/mob/0327.eclael/tick/app.skill_events/02_former_slash/4.3.attack_slash_2.mcfunction b/Asset/data/asset/functions/mob/0327.eclael/tick/app.skill_events/02_former_slash/4.3.attack_slash_2.mcfunction index 1a8e2f30368..4984bfab692 100644 --- a/Asset/data/asset/functions/mob/0327.eclael/tick/app.skill_events/02_former_slash/4.3.attack_slash_2.mcfunction +++ b/Asset/data/asset/functions/mob/0327.eclael/tick/app.skill_events/02_former_slash/4.3.attack_slash_2.mcfunction @@ -34,11 +34,5 @@ data modify storage api: Argument.FieldOverride set value {Item:{id:"stick"},Color:16777088,Frames:[20502,20503,20504,20505],Scale:[12f,2f,12f],Transformation:{left_rotation:{axis:[0,0,1],angle:-0.610865f},right_rotation:[0f,0f,0f,1f],translation:[0f,0f,0f]}} execute positioned ^ ^1 ^1 run function api:object/summon -# 弾召喚 - # 弾召喚 - data modify storage api: Argument.ID set value 2190 - data modify storage api: Argument.FieldOverride.Damage set from storage asset:context this.Damage.Beam - data modify storage api: Argument.FieldOverride.Rotation set from entity @s Rotation - data modify storage api: Argument.FieldOverride.Angle set value -0.698132f - execute store result storage api: Argument.FieldOverride.MobUUID int 1 run scoreboard players get @s MobUUID - execute positioned ^ ^1 ^4 run function api:object/summon +# 飛ぶ斬撃を召喚 + execute positioned ^ ^1 ^4 run function asset:mob/0327.eclael/tick/app.general/summon_object/slash_beam.m {Angle:-0.698132f} diff --git a/Asset/data/asset/functions/mob/0327.eclael/tick/app.skill_events/35_latter_beam/attack_0.mcfunction b/Asset/data/asset/functions/mob/0327.eclael/tick/app.skill_events/35_latter_beam/attack_0.mcfunction index bfe557db76d..7bb200e630d 100644 --- a/Asset/data/asset/functions/mob/0327.eclael/tick/app.skill_events/35_latter_beam/attack_0.mcfunction +++ b/Asset/data/asset/functions/mob/0327.eclael/tick/app.skill_events/35_latter_beam/attack_0.mcfunction @@ -37,13 +37,8 @@ data modify storage api: Argument.FieldOverride set value {Item:{id:"stick"},Color:16777088,Frames:[20502,20503,20504,20505],Scale:[18f,5f,20f],Transformation:{left_rotation:{axis:[0,0,1],angle:-0.2f},right_rotation:[0f,0f,0f,1f],translation:[0f,0f,0f]}} execute positioned ^ ^1.8 ^-3 run function api:object/summon -# 弾召喚 - data modify storage api: Argument.ID set value 2190 - data modify storage api: Argument.FieldOverride.Damage set from storage asset:context this.Damage.Beam - data modify storage api: Argument.FieldOverride.Rotation set from entity @s Rotation - data modify storage api: Argument.FieldOverride.Angle set value -0.2f - execute store result storage api: Argument.FieldOverride.MobUUID int 1 run scoreboard players get @s MobUUID - execute positioned ^ ^1 ^1 run function api:object/summon +# 飛ぶ斬撃を召喚 + execute positioned ^ ^1 ^4 run function asset:mob/0327.eclael/tick/app.general/summon_object/slash_beam.m {Angle:-0.2f} # ライン斬撃 execute if predicate api:global_vars/difficulty/min/3_blessless run function asset:mob/0327.eclael/tick/app.skill_events/35_latter_beam/attack_line_slash.m {Rotation:90,PosX:0,PosY:0,PosZ:3,IsGreen:true} diff --git a/Asset/data/asset/functions/mob/0327.eclael/tick/app.skill_events/35_latter_beam/attack_1.mcfunction b/Asset/data/asset/functions/mob/0327.eclael/tick/app.skill_events/35_latter_beam/attack_1.mcfunction index e0c061b2763..d1965c83ecc 100644 --- a/Asset/data/asset/functions/mob/0327.eclael/tick/app.skill_events/35_latter_beam/attack_1.mcfunction +++ b/Asset/data/asset/functions/mob/0327.eclael/tick/app.skill_events/35_latter_beam/attack_1.mcfunction @@ -37,13 +37,8 @@ data modify storage api: Argument.FieldOverride set value {Item:{id:"stick"},Color:16777088,Frames:[20502,20503,20504,20505],Scale:[18f,5f,20f],Transformation:{left_rotation:{axis:[0,0,1],angle:3.31613f},right_rotation:[0f,0f,0f,1f],translation:[0f,0f,0f]}} execute positioned ^ ^1.8 ^-3 run function api:object/summon -# 弾召喚 - data modify storage api: Argument.ID set value 2190 - data modify storage api: Argument.FieldOverride.Damage set from storage asset:context this.Damage.Beam - data modify storage api: Argument.FieldOverride.Rotation set from entity @s Rotation - data modify storage api: Argument.FieldOverride.Angle set value 3.31613f - execute store result storage api: Argument.FieldOverride.MobUUID int 1 run scoreboard players get @s MobUUID - execute positioned ^ ^1 ^1 run function api:object/summon +# 飛ぶ斬撃を召喚 + execute positioned ^ ^1 ^1 run function asset:mob/0327.eclael/tick/app.general/summon_object/slash_beam.m {Angle:3.31613f} # ライン斬撃 execute if predicate api:global_vars/difficulty/min/3_blessless run function asset:mob/0327.eclael/tick/app.skill_events/35_latter_beam/attack_line_slash.m {Rotation:0,PosX:0,PosY:0,PosZ:0,IsGreen:false} diff --git a/Asset/data/asset/functions/mob/0327.eclael/tick/app.skill_events/35_latter_beam/attack_2.mcfunction b/Asset/data/asset/functions/mob/0327.eclael/tick/app.skill_events/35_latter_beam/attack_2.mcfunction index 4ce19fa4d58..023a7b175e2 100644 --- a/Asset/data/asset/functions/mob/0327.eclael/tick/app.skill_events/35_latter_beam/attack_2.mcfunction +++ b/Asset/data/asset/functions/mob/0327.eclael/tick/app.skill_events/35_latter_beam/attack_2.mcfunction @@ -37,13 +37,8 @@ data modify storage api: Argument.FieldOverride set value {Item:{id:"stick"},Color:16777088,Frames:[20502,20503,20504,20505],Scale:[18f,5f,20f],Transformation:{left_rotation:{axis:[0,0,1],angle:-0.3f},right_rotation:[0f,0f,0f,1f],translation:[0f,0f,0f]}} execute positioned ^ ^1.8 ^-3 run function api:object/summon -# 弾召喚 - data modify storage api: Argument.ID set value 2190 - data modify storage api: Argument.FieldOverride.Damage set from storage asset:context this.Damage.Beam - data modify storage api: Argument.FieldOverride.Rotation set from entity @s Rotation - data modify storage api: Argument.FieldOverride.Angle set value -0.3f - execute store result storage api: Argument.FieldOverride.MobUUID int 1 run scoreboard players get @s MobUUID - execute positioned ^ ^1 ^1 run function api:object/summon +# 飛ぶ斬撃を召喚 + execute positioned ^ ^1 ^1 run function asset:mob/0327.eclael/tick/app.general/summon_object/slash_beam.m {Angle:-0.3f} # ライン斬撃 execute if predicate api:global_vars/difficulty/min/3_blessless run function asset:mob/0327.eclael/tick/app.skill_events/35_latter_beam/attack_line_slash.m {Rotation:25,PosX:-2,PosY:0,PosZ:0,IsGreen:true} diff --git a/Asset/data/asset/functions/mob/0327.eclael/tick/app.skill_events/35_latter_beam/attack_3.mcfunction b/Asset/data/asset/functions/mob/0327.eclael/tick/app.skill_events/35_latter_beam/attack_3.mcfunction index 31efece856a..0032fff5fd6 100644 --- a/Asset/data/asset/functions/mob/0327.eclael/tick/app.skill_events/35_latter_beam/attack_3.mcfunction +++ b/Asset/data/asset/functions/mob/0327.eclael/tick/app.skill_events/35_latter_beam/attack_3.mcfunction @@ -32,13 +32,8 @@ function api:damage/reset tag @a remove 93.Temp.AttackTarget -# 弾召喚 - data modify storage api: Argument.ID set value 2190 - data modify storage api: Argument.FieldOverride.Damage set from storage asset:context this.Damage.Beam - data modify storage api: Argument.FieldOverride.Rotation set from entity @s Rotation - data modify storage api: Argument.FieldOverride.Angle set value 0.05f - execute store result storage api: Argument.FieldOverride.MobUUID int 1 run scoreboard players get @s MobUUID - execute positioned ^ ^1 ^1 run function api:object/summon +# 飛ぶ斬撃を召喚 + execute positioned ^ ^1 ^1 run function asset:mob/0327.eclael/tick/app.general/summon_object/slash_beam.m {Angle:0.05f} # 演出 data modify storage api: Argument.ID set value 2001 diff --git a/Asset/data/asset/functions/mob/0327.eclael/tick/app.skill_events/35_latter_beam/attack_4.mcfunction b/Asset/data/asset/functions/mob/0327.eclael/tick/app.skill_events/35_latter_beam/attack_4.mcfunction index e08b53a2b2c..723cac223a2 100644 --- a/Asset/data/asset/functions/mob/0327.eclael/tick/app.skill_events/35_latter_beam/attack_4.mcfunction +++ b/Asset/data/asset/functions/mob/0327.eclael/tick/app.skill_events/35_latter_beam/attack_4.mcfunction @@ -32,13 +32,8 @@ function api:damage/reset tag @a remove 93.Temp.AttackTarget -# 弾召喚 - data modify storage api: Argument.ID set value 2190 - data modify storage api: Argument.FieldOverride.Damage set from storage asset:context this.Damage.Beam - data modify storage api: Argument.FieldOverride.Rotation set from entity @s Rotation - data modify storage api: Argument.FieldOverride.Angle set value -1.74533f - execute store result storage api: Argument.FieldOverride.MobUUID int 1 run scoreboard players get @s MobUUID - execute positioned ^ ^1 ^1 run function api:object/summon +# 飛ぶ斬撃を召喚 + execute positioned ^ ^1 ^1 run function asset:mob/0327.eclael/tick/app.general/summon_object/slash_beam.m {Angle:-1.74533f} # 演出 data modify storage api: Argument.ID set value 2001 diff --git a/Asset/data/asset/functions/object/2190.eclael_slashbeam/register.mcfunction b/Asset/data/asset/functions/object/2190.eclael_slashbeam/register.mcfunction index f5d715488b5..d6945fddc6d 100644 --- a/Asset/data/asset/functions/object/2190.eclael_slashbeam/register.mcfunction +++ b/Asset/data/asset/functions/object/2190.eclael_slashbeam/register.mcfunction @@ -5,16 +5,16 @@ # @within function asset:object/alias/2190/register # 継承(オプション) - # data modify storage asset:object Extends append value + # data modify storage asset:object Extends append value # function asset:object/extends # 他のObjectに継承されることを許可するか (boolean) (オプション) - # data modify storage asset:object ExtendsSafe set value + # data modify storage asset:object ExtendsSafe set value # 継承されることを前提とした、抽象的なObjectであるかどうか(boolean) data modify storage asset:object IsAbstract set value false # Tickするかどうか(boolean) (オプション) - # data modify storage asset:object IsTicking set value + # data modify storage asset:object IsTicking set value # ID (int) data modify storage asset:object ID set value 2190 # フィールド(オプション) - # data modify storage asset:object Field.myValue set value \ No newline at end of file + data modify storage asset:object Field.Angle set value 0.05f diff --git a/Asset/data/asset/functions/object/2190.eclael_slashbeam/summon/.mcfunction b/Asset/data/asset/functions/object/2190.eclael_slashbeam/summon/.mcfunction index e578d9fe631..aa9db05b4b7 100644 --- a/Asset/data/asset/functions/object/2190.eclael_slashbeam/summon/.mcfunction +++ b/Asset/data/asset/functions/object/2190.eclael_slashbeam/summon/.mcfunction @@ -5,4 +5,8 @@ # @within asset:object/alias/2190/summon # 元となるEntityを召喚する - function asset:object/2190.eclael_slashbeam/summon/m with storage asset:context this + execute as 0-0-0-0-0 in minecraft:overworld positioned as @s run tp @s ~ ~ ~ ~ ~ + data modify storage asset:temp Args.Rotation set from entity 0-0-0-0-0 Rotation + data modify storage asset:temp Args.Angle set from storage asset:context this.Angle + function asset:object/2190.eclael_slashbeam/summon/m with storage asset:temp Args + data remove storage asset:temp Args diff --git a/Asset/data/asset/functions/object/2190.eclael_slashbeam/summon/debug.mcfunction b/Asset/data/asset/functions/object/2190.eclael_slashbeam/summon/debug.mcfunction deleted file mode 100644 index fa9995ab527..00000000000 --- a/Asset/data/asset/functions/object/2190.eclael_slashbeam/summon/debug.mcfunction +++ /dev/null @@ -1,10 +0,0 @@ -#> asset:object/2190.eclael_slashbeam/summon/debug -# -# 動作チェック用の召喚処理 使い終わったら消してもいいかも -# -# @user -# @private - -# 召喚 - data modify storage api: Argument.ID set value 2190 - function api:object/summon \ No newline at end of file diff --git a/Asset/data/asset/functions/object/2190.eclael_slashbeam/tick/.mcfunction b/Asset/data/asset/functions/object/2190.eclael_slashbeam/tick/.mcfunction index df8587aafaa..f5a54d05f6d 100644 --- a/Asset/data/asset/functions/object/2190.eclael_slashbeam/tick/.mcfunction +++ b/Asset/data/asset/functions/object/2190.eclael_slashbeam/tick/.mcfunction @@ -11,7 +11,7 @@ particle end_rod ~ ~ ~ 0.5 0.5 0.5 0.05 1 # execute unless entity @s[tag=2190.IsInverse] rotated ~90 ~-40 run function asset:object/2190.eclael_slashbeam/tick/particle # execute if entity @s[tag=2190.IsInverse] rotated ~90 ~40 run function asset:object/2190.eclael_slashbeam/tick/particle - function asset:object/2190.eclael_slashbeam/tick/model + # function asset:object/2190.eclael_slashbeam/tick/model # 移動・攻撃処理 execute positioned ^ ^ ^1 run function asset:object/2190.eclael_slashbeam/tick/hit From 177d468c9681d6282acb5a7ceb7e5d1430ed08d9 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Sun, 10 May 2026 14:08:47 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=E4=B8=8D=E8=A6=81=E3=81=AA=E9=96=A2?= =?UTF-8?q?=E6=95=B0=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../object/2190.eclael_slashbeam/tick/.mcfunction | 5 ++--- .../2190.eclael_slashbeam/tick/model.mcfunction | 13 ------------- 2 files changed, 2 insertions(+), 16 deletions(-) delete mode 100644 Asset/data/asset/functions/object/2190.eclael_slashbeam/tick/model.mcfunction diff --git a/Asset/data/asset/functions/object/2190.eclael_slashbeam/tick/.mcfunction b/Asset/data/asset/functions/object/2190.eclael_slashbeam/tick/.mcfunction index f5a54d05f6d..c21cbe855ec 100644 --- a/Asset/data/asset/functions/object/2190.eclael_slashbeam/tick/.mcfunction +++ b/Asset/data/asset/functions/object/2190.eclael_slashbeam/tick/.mcfunction @@ -9,9 +9,8 @@ # 演出 particle end_rod ~ ~ ~ 0.5 0.5 0.5 0.05 1 - # execute unless entity @s[tag=2190.IsInverse] rotated ~90 ~-40 run function asset:object/2190.eclael_slashbeam/tick/particle - # execute if entity @s[tag=2190.IsInverse] rotated ~90 ~40 run function asset:object/2190.eclael_slashbeam/tick/particle - # function asset:object/2190.eclael_slashbeam/tick/model + execute unless entity @s[tag=2190.IsInverse] rotated ~90 ~-40 run function asset:object/2190.eclael_slashbeam/tick/particle + execute if entity @s[tag=2190.IsInverse] rotated ~90 ~40 run function asset:object/2190.eclael_slashbeam/tick/particle # 移動・攻撃処理 execute positioned ^ ^ ^1 run function asset:object/2190.eclael_slashbeam/tick/hit diff --git a/Asset/data/asset/functions/object/2190.eclael_slashbeam/tick/model.mcfunction b/Asset/data/asset/functions/object/2190.eclael_slashbeam/tick/model.mcfunction deleted file mode 100644 index fb2a694bfbc..00000000000 --- a/Asset/data/asset/functions/object/2190.eclael_slashbeam/tick/model.mcfunction +++ /dev/null @@ -1,13 +0,0 @@ -#> asset:object/2190.eclael_slashbeam/tick/model -# -# Mobのtick時の処理 -# -# @within function asset:object/2190.eclael_slashbeam/tick/ - -# アニメーション - scoreboard players operation $Interval Temporary = @s General.Object.Tick - scoreboard players operation $Interval Temporary %= $3 Const - execute if score $Interval Temporary matches ..0 run data modify entity @s item.tag.CustomModelData set value 20536 - execute if score $Interval Temporary matches 1 run data modify entity @s item.tag.CustomModelData set value 20537 - execute if score $Interval Temporary matches 2.. run data modify entity @s item.tag.CustomModelData set value 20538 - scoreboard players reset $Interval Temporary From 097cc812b78ba61350d39daff88c62f8d8170726 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Sun, 10 May 2026 14:12:32 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=E6=9C=AC=E6=9D=A5=E3=82=B3=E3=83=A1?= =?UTF-8?q?=E3=83=B3=E3=83=88=E3=82=A2=E3=82=A6=E3=83=88=E3=81=95=E3=82=8C?= =?UTF-8?q?=E3=81=A6=E3=81=84=E3=81=9F=E3=82=82=E3=81=AE=E3=82=92=E8=A7=A3?= =?UTF-8?q?=E9=99=A4=E3=81=97=E3=81=A6=E3=81=84=E3=82=8B=E3=83=9F=E3=82=B9?= =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/object/2190.eclael_slashbeam/tick/.mcfunction | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Asset/data/asset/functions/object/2190.eclael_slashbeam/tick/.mcfunction b/Asset/data/asset/functions/object/2190.eclael_slashbeam/tick/.mcfunction index c21cbe855ec..e0c9c4db997 100644 --- a/Asset/data/asset/functions/object/2190.eclael_slashbeam/tick/.mcfunction +++ b/Asset/data/asset/functions/object/2190.eclael_slashbeam/tick/.mcfunction @@ -9,8 +9,8 @@ # 演出 particle end_rod ~ ~ ~ 0.5 0.5 0.5 0.05 1 - execute unless entity @s[tag=2190.IsInverse] rotated ~90 ~-40 run function asset:object/2190.eclael_slashbeam/tick/particle - execute if entity @s[tag=2190.IsInverse] rotated ~90 ~40 run function asset:object/2190.eclael_slashbeam/tick/particle + # execute unless entity @s[tag=2190.IsInverse] rotated ~90 ~-40 run function asset:object/2190.eclael_slashbeam/tick/particle + # execute if entity @s[tag=2190.IsInverse] rotated ~90 ~40 run function asset:object/2190.eclael_slashbeam/tick/particle # 移動・攻撃処理 execute positioned ^ ^ ^1 run function asset:object/2190.eclael_slashbeam/tick/hit