Skip to content

🩹 [Object 2190] エクレールの飛ぶ斬撃の処理をテクスチャ更新に合わせて調整 #1992

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Lapis-LJA wants to merge 3 commits into
base: master
Choose a base branch
from
Open

🩹 [Object 2190] エクレールの飛ぶ斬撃の処理をテクスチャ更新に合わせて調整 #1992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5a6d1e3
諸々修正
Lapis-LJA May 9, 2026
177d468
不要な関数を削除
Lapis-LJA May 10, 2026
097cc81
本来コメントアウトされていたものを解除しているミスを修正
Lapis-LJA May 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions ...ta/asset/functions/mob/0327.eclael/tick/app.general/summon_object/slash_beam.m.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
10 changes: 2 additions & 8 deletions ...tions/mob/0327.eclael/tick/app.skill_events/02_former_slash/4.3.attack_slash_2.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
9 changes: 2 additions & 7 deletions .../asset/functions/mob/0327.eclael/tick/app.skill_events/35_latter_beam/attack_0.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
9 changes: 2 additions & 7 deletions .../asset/functions/mob/0327.eclael/tick/app.skill_events/35_latter_beam/attack_1.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
9 changes: 2 additions & 7 deletions .../asset/functions/mob/0327.eclael/tick/app.skill_events/35_latter_beam/attack_2.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
9 changes: 2 additions & 7 deletions .../asset/functions/mob/0327.eclael/tick/app.skill_events/35_latter_beam/attack_3.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 2 additions & 7 deletions .../asset/functions/mob/0327.eclael/tick/app.skill_events/35_latter_beam/attack_4.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions Asset/data/asset/functions/object/2190.eclael_slashbeam/register.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
data modify storage asset:object Field.Angle set value 0.05f
6 changes: 5 additions & 1 deletion Asset/data/asset/functions/object/2190.eclael_slashbeam/summon/.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
10 changes: 0 additions & 10 deletions Asset/data/asset/functions/object/2190.eclael_slashbeam/summon/debug.mcfunction
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion Asset/data/asset/functions/object/2190.eclael_slashbeam/tick/.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
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 positioned ^ ^ ^1 run function asset:object/2190.eclael_slashbeam/tick/hit
Expand Down
13 changes: 0 additions & 13 deletions Asset/data/asset/functions/object/2190.eclael_slashbeam/tick/model.mcfunction
View file
Open in desktop

This file was deleted.

Loading