From 18e71f59a1ee1cd1c353be063f00b1be56ef866c Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Sun, 22 Feb 2026 19:51:42 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=E3=83=89=E3=83=AD=E3=83=83=E3=83=97?= =?UTF-8?q?=E3=81=AE=E3=82=BF=E3=82=A4=E3=83=9F=E3=83=B3=E3=82=B0=E3=82=92?= =?UTF-8?q?object=E5=81=B4=E3=81=AB=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../death/app/4.remove_twins.mcfunction | 13 +++++++------ .../2200.twins_escape_animation/init/.mcfunction | 13 +++++++++++++ .../tick/drop/rubiel.m.mcfunction | 9 +++++++++ .../tick/drop/sapphiel.m.mcfunction | 9 +++++++++ .../tick/remove_rubiel.mcfunction | 4 +--- .../tick/remove_sapphiel.mcfunction | 6 +++--- .../functions/object/alias/2200/init.mcfunction | 8 ++++++++ 7 files changed, 50 insertions(+), 12 deletions(-) create mode 100644 Asset/data/asset/functions/object/2200.twins_escape_animation/init/.mcfunction create mode 100644 Asset/data/asset/functions/object/2200.twins_escape_animation/tick/drop/rubiel.m.mcfunction create mode 100644 Asset/data/asset/functions/object/2200.twins_escape_animation/tick/drop/sapphiel.m.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/2200/init.mcfunction diff --git a/Asset/data/asset/functions/mob/0338.corundum_twins/death/app/4.remove_twins.mcfunction b/Asset/data/asset/functions/mob/0338.corundum_twins/death/app/4.remove_twins.mcfunction index 545dab74287..051a62f5a91 100644 --- a/Asset/data/asset/functions/mob/0338.corundum_twins/death/app/4.remove_twins.mcfunction +++ b/Asset/data/asset/functions/mob/0338.corundum_twins/death/app/4.remove_twins.mcfunction @@ -6,13 +6,14 @@ # 討伐演出再生 data modify storage api: Argument.ID set value 2200 + data modify storage api: Argument.FieldOverride.Pos set from entity @s Pos function api:object/summon # サフィの消去 # ボスドロ - data modify storage api: Argument.ID set value 1079 - data modify storage api: Argument.Important set value true - execute positioned ~-0.7 ~1.5 ~2 rotated ~-6 ~ run function api:artifact/spawn/from_id + #data modify storage api: Argument.ID set value 1079 + #data modify storage api: Argument.Important set value true + #execute positioned ~-0.7 ~1.5 ~2 rotated ~-6 ~ run function api:artifact/spawn/from_id # 消去 # execute as @e[tag=9F.ModelRoot,tag=9F.Target] run function animated_java:twins_sapphiel/remove/this execute as @e[tag=9F.Root,tag=9F.Target] run tag @s add 9E.Remove @@ -21,9 +22,9 @@ # ルビィの消去 # ボスドロ - data modify storage api: Argument.ID set value 1078 - data modify storage api: Argument.Important set value true - execute positioned ~0.7 ~1.5 ~2 rotated ~6 ~ run function api:artifact/spawn/from_id + #data modify storage api: Argument.ID set value 1078 + #data modify storage api: Argument.Important set value true + #execute positioned ~0.7 ~1.5 ~2 rotated ~6 ~ run function api:artifact/spawn/from_id # 消去 # TODO：討伐演出再生 # execute as @e[tag=9G.ModelRoot,tag=9G.Target] run function animated_java:twins_rubiel/remove/this diff --git a/Asset/data/asset/functions/object/2200.twins_escape_animation/init/.mcfunction b/Asset/data/asset/functions/object/2200.twins_escape_animation/init/.mcfunction new file mode 100644 index 00000000000..d2acf463701 --- /dev/null +++ b/Asset/data/asset/functions/object/2200.twins_escape_animation/init/.mcfunction @@ -0,0 +1,13 @@ +#> asset:object/2200.twins_escape_animation/init/ +# +# Objectのinit時の処理 +# +# @within asset:object/alias/2200/init + +# Posを分解 + data modify storage asset:temp Pos set from storage asset:context this.Pos + data remove storage asset:context this.Pos + data modify storage asset:context this.Pos.X set from storage asset:temp Pos[0] + data modify storage asset:context this.Pos.Y set from storage asset:temp Pos[1] + data modify storage asset:context this.Pos.Z set from storage asset:temp Pos[2] + data remove storage asset:temp Pos diff --git a/Asset/data/asset/functions/object/2200.twins_escape_animation/tick/drop/rubiel.m.mcfunction b/Asset/data/asset/functions/object/2200.twins_escape_animation/tick/drop/rubiel.m.mcfunction new file mode 100644 index 00000000000..a830534f5c1 --- /dev/null +++ b/Asset/data/asset/functions/object/2200.twins_escape_animation/tick/drop/rubiel.m.mcfunction @@ -0,0 +1,9 @@ +#> asset:object/2200.twins_escape_animation/tick/drop/rubiel.m +# +# +# +# @within function asset:object/2200.twins_escape_animation/tick/remove_rubiel + + data modify storage api: Argument.ID set value 1078 + data modify storage api: Argument.Important set value true + $execute positioned $(X) $(Y) $(Z) positioned ~0.7 ~1.5 ~2 run function api:artifact/spawn/from_id diff --git a/Asset/data/asset/functions/object/2200.twins_escape_animation/tick/drop/sapphiel.m.mcfunction b/Asset/data/asset/functions/object/2200.twins_escape_animation/tick/drop/sapphiel.m.mcfunction new file mode 100644 index 00000000000..090c5902f6e --- /dev/null +++ b/Asset/data/asset/functions/object/2200.twins_escape_animation/tick/drop/sapphiel.m.mcfunction @@ -0,0 +1,9 @@ +#> asset:object/2200.twins_escape_animation/tick/drop/sapphiel.m +# +# +# +# @within function asset:object/2200.twins_escape_animation/tick/remove_sapphiel + + data modify storage api: Argument.ID set value 1079 + data modify storage api: Argument.Important set value true + $execute positioned $(X) $(Y) $(Z) positioned ~-0.7 ~1.5 ~2 run function api:artifact/spawn/from_id diff --git a/Asset/data/asset/functions/object/2200.twins_escape_animation/tick/remove_rubiel.mcfunction b/Asset/data/asset/functions/object/2200.twins_escape_animation/tick/remove_rubiel.mcfunction index 245aa1bccbc..2156b874d15 100644 --- a/Asset/data/asset/functions/object/2200.twins_escape_animation/tick/remove_rubiel.mcfunction +++ b/Asset/data/asset/functions/object/2200.twins_escape_animation/tick/remove_rubiel.mcfunction @@ -6,8 +6,6 @@ # 消去 # ボスドロ - # data modify storage api: Argument.ID set value 1078 - # data modify storage api: Argument.Important set value true - # function api:artifact/spawn/from_id + function asset:object/2200.twins_escape_animation/tick/drop/rubiel.m with storage asset:context this.Pos # 消去 function animated_java:twins_rubiel/remove/this diff --git a/Asset/data/asset/functions/object/2200.twins_escape_animation/tick/remove_sapphiel.mcfunction b/Asset/data/asset/functions/object/2200.twins_escape_animation/tick/remove_sapphiel.mcfunction index 5d87d8e090b..7b059b53ed9 100644 --- a/Asset/data/asset/functions/object/2200.twins_escape_animation/tick/remove_sapphiel.mcfunction +++ b/Asset/data/asset/functions/object/2200.twins_escape_animation/tick/remove_sapphiel.mcfunction @@ -6,8 +6,8 @@ # 消去 # ボスドロ - # data modify storage api: Argument.ID set value 1079 - # data modify storage api: Argument.Important set value true - # function api:artifact/spawn/from_id + function asset:object/2200.twins_escape_animation/tick/drop/sapphiel.m with storage asset:context this.Pos # 消去 function animated_java:twins_sapphiel/remove/this + +tellraw @a {"storage":"asset:context","nbt":"this"} diff --git a/Asset/data/asset/functions/object/alias/2200/init.mcfunction b/Asset/data/asset/functions/object/alias/2200/init.mcfunction new file mode 100644 index 00000000000..6c749adf08c --- /dev/null +++ b/Asset/data/asset/functions/object/alias/2200/init.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/2200/init +# +# Init処理のエイリアス +# +# @within asset_manager:object/init/init.m + +# 元のInit処理を呼び出す + function asset:object/2200.twins_escape_animation/init/ \ No newline at end of file From a8176400fb7260432307224f622536551921157d Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Mon, 23 Feb 2026 00:48:19 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=E3=83=87=E3=83=90=E3=83=83=E3=82=B0?= =?UTF-8?q?=E7=94=A8=E3=82=B3=E3=83=9E=E3=83=B3=E3=83=89=E3=82=92=E5=89=8A?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../2200.twins_escape_animation/tick/remove_sapphiel.mcfunction | 2 -- 1 file changed, 2 deletions(-) diff --git a/Asset/data/asset/functions/object/2200.twins_escape_animation/tick/remove_sapphiel.mcfunction b/Asset/data/asset/functions/object/2200.twins_escape_animation/tick/remove_sapphiel.mcfunction index 7b059b53ed9..849544305ff 100644 --- a/Asset/data/asset/functions/object/2200.twins_escape_animation/tick/remove_sapphiel.mcfunction +++ b/Asset/data/asset/functions/object/2200.twins_escape_animation/tick/remove_sapphiel.mcfunction @@ -9,5 +9,3 @@ function asset:object/2200.twins_escape_animation/tick/drop/sapphiel.m with storage asset:context this.Pos # 消去 function animated_java:twins_sapphiel/remove/this - -tellraw @a {"storage":"asset:context","nbt":"this"}