From 29196e19d17cbf9464f3d13fead3a444ba96c7b7 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Wed, 20 May 2026 05:31:31 +0900 Subject: [PATCH 1/9] =?UTF-8?q?=E6=BC=94=E5=87=BA=E7=94=A8Object=E5=AE=8C?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../object/2276.aurora_wave/init/.mcfunction | 33 +++++++++++++++++++ .../2276.aurora_wave/register.mcfunction | 20 +++++++++++ .../2276.aurora_wave/summon/.mcfunction | 8 +++++ .../object/2276.aurora_wave/tick/.mcfunction | 19 +++++++++++ .../tick/transformation/0.mcfunction | 15 +++++++++ .../tick/transformation/1.mcfunction | 15 +++++++++ .../tick/transformation/2.mcfunction | 15 +++++++++ .../object/alias/2276/init.mcfunction | 8 +++++ .../object/alias/2276/register.mcfunction | 8 +++++ .../object/alias/2276/summon.mcfunction | 8 +++++ .../object/alias/2276/tick.mcfunction | 8 +++++ 11 files changed, 157 insertions(+) create mode 100644 Asset/data/asset/functions/object/2276.aurora_wave/init/.mcfunction create mode 100644 Asset/data/asset/functions/object/2276.aurora_wave/register.mcfunction create mode 100644 Asset/data/asset/functions/object/2276.aurora_wave/summon/.mcfunction create mode 100644 Asset/data/asset/functions/object/2276.aurora_wave/tick/.mcfunction create mode 100644 Asset/data/asset/functions/object/2276.aurora_wave/tick/transformation/0.mcfunction create mode 100644 Asset/data/asset/functions/object/2276.aurora_wave/tick/transformation/1.mcfunction create mode 100644 Asset/data/asset/functions/object/2276.aurora_wave/tick/transformation/2.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/2276/init.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/2276/register.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/2276/summon.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/2276/tick.mcfunction diff --git a/Asset/data/asset/functions/object/2276.aurora_wave/init/.mcfunction b/Asset/data/asset/functions/object/2276.aurora_wave/init/.mcfunction new file mode 100644 index 0000000000..476101971c --- /dev/null +++ b/Asset/data/asset/functions/object/2276.aurora_wave/init/.mcfunction @@ -0,0 +1,33 @@ +#> asset:object/2276.aurora_wave/init/ +# +# Objectのinit時の処理 +# +# @within asset:object/alias/2276/init + +# スコアを-3にしておく + scoreboard players set @s General.Object.Tick -3 + +# transformation用のscaleを事前にフィールドに設定しておく + data modify storage asset:context this.PreScale set value [[0f,0f,0f],[0f,0f,0f],[0f,0f,0f]] + data modify storage asset:context this.PreTranslation set value [[0f,0f,0f],[0f,0f,0f],[0f,0f,0f]] + +# 0 + data modify storage asset:context this.PreScale[0][0] set from storage asset:context this.Scale + data modify storage asset:context this.PreScale[0][1] set from storage asset:context this.Scale + data modify storage asset:context this.PreScale[0][2] set from storage asset:context this.Scale + + execute store result storage asset:context this.PreTranslation[0][1] float 0.005 run data get storage asset:context this.Scale 100 + +# 1 + data modify storage asset:context this.PreScale[1][0] set from storage asset:context this.Scale + execute store result storage asset:context this.PreScale[1][1] float 0.015 run data get storage asset:context this.Scale 100 + data modify storage asset:context this.PreScale[1][2] set from storage asset:context this.Scale + + execute store result storage asset:context this.PreTranslation[1][1] float 0.0075 run data get storage asset:context this.Scale 100 + +# 2 + data modify storage asset:context this.PreScale[2][0] set from storage asset:context this.Scale + # data modify storage asset:context this.PreScale[2][1] set value 0f + data modify storage asset:context this.PreScale[2][2] set from storage asset:context this.Scale + + # data modify storage asset:context this.PreTranslation[2][1] set value 0f diff --git a/Asset/data/asset/functions/object/2276.aurora_wave/register.mcfunction b/Asset/data/asset/functions/object/2276.aurora_wave/register.mcfunction new file mode 100644 index 0000000000..1e802e481d --- /dev/null +++ b/Asset/data/asset/functions/object/2276.aurora_wave/register.mcfunction @@ -0,0 +1,20 @@ +#> asset:object/2276.aurora_wave/register +# +# Objectのデータを指定 +# +# @within function asset:object/alias/2276/register + +# 継承(オプション) + # data modify storage asset:object Extends append value + # function asset:object/extends +# 他のObjectに継承されることを許可するか (boolean) (オプション) + # 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 + +# ID (int) + data modify storage asset:object ID set value 2276 +# フィールド(オプション) + data modify storage asset:object Field.Scale set value 4.5f diff --git a/Asset/data/asset/functions/object/2276.aurora_wave/summon/.mcfunction b/Asset/data/asset/functions/object/2276.aurora_wave/summon/.mcfunction new file mode 100644 index 0000000000..53f5a7c82b --- /dev/null +++ b/Asset/data/asset/functions/object/2276.aurora_wave/summon/.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/2276.aurora_wave/summon/ +# +# Object召喚処理の呼び出し時に実行されるfunction +# +# @within asset:object/alias/2276/summon + +# 元となるEntityを召喚する + summon minecraft:item_display ~ ~ ~ {Tags:["ObjectInit"],brightness:{sky:15,block:15},item:{id:"stick",Count:1b,tag:{CustomModelData:20602}},transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],scale:[4.5f,0f,4.5f],translation:[0f,0f,0f]}} diff --git a/Asset/data/asset/functions/object/2276.aurora_wave/tick/.mcfunction b/Asset/data/asset/functions/object/2276.aurora_wave/tick/.mcfunction new file mode 100644 index 0000000000..bb5a11fa6f --- /dev/null +++ b/Asset/data/asset/functions/object/2276.aurora_wave/tick/.mcfunction @@ -0,0 +1,19 @@ +#> asset:object/2276.aurora_wave/tick/ +# +# Objectのtick時の処理 +# +# @within asset:object/alias/2276/tick + +# Tick加算 + scoreboard players add @s General.Object.Tick 1 + +# でかくなる + execute if score @s General.Object.Tick matches 0 run function asset:object/2276.aurora_wave/tick/transformation/0 + execute if score @s General.Object.Tick matches 3 run function asset:object/2276.aurora_wave/tick/transformation/1 + +# 小さくなる + execute if score @s General.Object.Tick matches 12 run function asset:object/2276.aurora_wave/tick/transformation/2 + + +# 消滅処理 + kill @s[scores={General.Object.Tick=25..}] diff --git a/Asset/data/asset/functions/object/2276.aurora_wave/tick/transformation/0.mcfunction b/Asset/data/asset/functions/object/2276.aurora_wave/tick/transformation/0.mcfunction new file mode 100644 index 0000000000..e0c42b0feb --- /dev/null +++ b/Asset/data/asset/functions/object/2276.aurora_wave/tick/transformation/0.mcfunction @@ -0,0 +1,15 @@ +#> asset:object/2276.aurora_wave/tick/transformation/0 +# +# +# +# @within function asset:object/2276.aurora_wave/tick/ + +# start_interpolation + data modify entity @s start_interpolation set value 0 + +# interpolation_duration + data modify entity @s interpolation_duration set value 3 + +# transformation + data modify entity @s transformation.scale set from storage asset:context this.PreScale[0] + data modify entity @s transformation.translation set from storage asset:context this.PreTranslation[0] diff --git a/Asset/data/asset/functions/object/2276.aurora_wave/tick/transformation/1.mcfunction b/Asset/data/asset/functions/object/2276.aurora_wave/tick/transformation/1.mcfunction new file mode 100644 index 0000000000..7a85d644d4 --- /dev/null +++ b/Asset/data/asset/functions/object/2276.aurora_wave/tick/transformation/1.mcfunction @@ -0,0 +1,15 @@ +#> asset:object/2276.aurora_wave/tick/transformation/1 +# +# +# +# @within function asset:object/2276.aurora_wave/tick/ + +# start_interpolation + data modify entity @s start_interpolation set value 0 + +# interpolation_duration + data modify entity @s interpolation_duration set value 3 + +# transformation + data modify entity @s transformation.scale set from storage asset:context this.PreScale[1] + data modify entity @s transformation.translation set from storage asset:context this.PreTranslation[1] diff --git a/Asset/data/asset/functions/object/2276.aurora_wave/tick/transformation/2.mcfunction b/Asset/data/asset/functions/object/2276.aurora_wave/tick/transformation/2.mcfunction new file mode 100644 index 0000000000..447501e427 --- /dev/null +++ b/Asset/data/asset/functions/object/2276.aurora_wave/tick/transformation/2.mcfunction @@ -0,0 +1,15 @@ +#> asset:object/2276.aurora_wave/tick/transformation/2 +# +# +# +# @within function asset:object/2276.aurora_wave/tick/ + +# start_interpolation + data modify entity @s start_interpolation set value 0 + +# interpolation_duration + data modify entity @s interpolation_duration set value 13 + +# transformation + data modify entity @s transformation.scale set from storage asset:context this.PreScale[2] + data modify entity @s transformation.translation set from storage asset:context this.PreTranslation[2] diff --git a/Asset/data/asset/functions/object/alias/2276/init.mcfunction b/Asset/data/asset/functions/object/alias/2276/init.mcfunction new file mode 100644 index 0000000000..d86485472c --- /dev/null +++ b/Asset/data/asset/functions/object/alias/2276/init.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/2276/init +# +# Init処理のエイリアス +# +# @within asset_manager:object/init/init.m + +# 元のInit処理を呼び出す + function asset:object/2276.aurora_wave/init/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/2276/register.mcfunction b/Asset/data/asset/functions/object/alias/2276/register.mcfunction new file mode 100644 index 0000000000..5834486fd7 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/2276/register.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/2276/register +# +# Objectのデータ指定処理のエイリアス +# +# @within asset_manager:object/summon/register.m + +# 元の登録処理を呼び出す + function asset:object/2276.aurora_wave/register \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/2276/summon.mcfunction b/Asset/data/asset/functions/object/alias/2276/summon.mcfunction new file mode 100644 index 0000000000..e538f81763 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/2276/summon.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/2276/summon +# +# Object召喚処理のエイリアス +# +# @within asset_manager:object/summon/summon.m + +# 元の召喚処理を呼び出す + function asset:object/2276.aurora_wave/summon/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/2276/tick.mcfunction b/Asset/data/asset/functions/object/alias/2276/tick.mcfunction new file mode 100644 index 0000000000..7100f327e0 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/2276/tick.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/2276/tick +# +# Tick時処理のエイリアス +# +# @within asset_manager:object/tick/tick.m + +# 元のTick処理を呼び出す + function asset:object/2276.aurora_wave/tick/ \ No newline at end of file From b8626e0d732624528b69dcbaa25991c55a2ac864 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Wed, 20 May 2026 05:39:39 +0900 Subject: [PATCH 2/9] =?UTF-8?q?=E3=81=A8=E3=82=8A=E3=81=82=E3=81=88?= =?UTF-8?q?=E3=81=9A=E3=82=AA=E3=83=BC=E3=83=AD=E3=83=A9=E3=83=9F=E3=82=B5?= =?UTF-8?q?=E3=82=A4=E3=83=AB=E3=81=ABitem=5Fdisplay?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../2080.aurora_missile/kill/main.mcfunction | 10 ++++++--- .../2080.aurora_missile/register.mcfunction | 4 +++- .../2080.aurora_missile/summon/m.mcfunction | 2 +- .../2080.aurora_missile/tick/.mcfunction | 6 ++++++ .../2080.aurora_missile/tick/spin.mcfunction | 21 +++++++++++++++++++ 5 files changed, 38 insertions(+), 5 deletions(-) create mode 100644 Asset/data/asset/functions/object/2080.aurora_missile/tick/spin.mcfunction diff --git a/Asset/data/asset/functions/object/2080.aurora_missile/kill/main.mcfunction b/Asset/data/asset/functions/object/2080.aurora_missile/kill/main.mcfunction index ae24b68934..a48c435e20 100644 --- a/Asset/data/asset/functions/object/2080.aurora_missile/kill/main.mcfunction +++ b/Asset/data/asset/functions/object/2080.aurora_missile/kill/main.mcfunction @@ -5,10 +5,14 @@ # @within function asset:object/2080.aurora_missile/kill/ # 演出 - execute if entity @s[tag=!2080.Enhanced] rotated ~ 0 positioned ~ ~0.3 ~ run function asset:object/2080.aurora_missile/kill/vfx/normal - execute if entity @s[tag=2080.Enhanced] rotated ~ 0 positioned ~ ~0.3 ~ run function asset:object/2080.aurora_missile/kill/vfx/enhanced - particle dust_color_transition 0.000 1.000 0.886 2 0 0.235 1 ~ ~1.5 ~ 1.3 1.2 1.3 0 60 + #execute if entity @s[tag=!2080.Enhanced] rotated ~ 0 positioned ~ ~0.3 ~ run function asset:object/2080.aurora_missile/kill/vfx/normal + #execute if entity @s[tag=2080.Enhanced] rotated ~ 0 positioned ~ ~0.3 ~ run function asset:object/2080.aurora_missile/kill/vfx/enhanced + #particle dust_color_transition 0.000 1.000 0.886 2 0 0.235 1 ~ ~1.5 ~ 1.3 1.2 1.3 0 60 playsound entity.evoker.prepare_summon hostile @a ~ ~ ~ 0.8 1.5 0 + particle dust_color_transition 0.4 1 0.8 1.5 0.5 0.65 1 ~ ~1.5 ~ 1.2 1.2 1.2 0 12 + + data modify storage api: Argument.ID set value 2276 + function api:object/summon # ダメージ # Enhancedタグがによって範囲が変わる diff --git a/Asset/data/asset/functions/object/2080.aurora_missile/register.mcfunction b/Asset/data/asset/functions/object/2080.aurora_missile/register.mcfunction index 8615ae3b55..424d26375d 100644 --- a/Asset/data/asset/functions/object/2080.aurora_missile/register.mcfunction +++ b/Asset/data/asset/functions/object/2080.aurora_missile/register.mcfunction @@ -17,4 +17,6 @@ # ID (int) data modify storage asset:object ID set value 2080 # フィールド(オプション) - # data modify storage asset:object Field.myValue set value + data modify storage asset:object Field.Spin set value 4 + data modify storage asset:object Field.SpinInterval._ set value 0 + data modify storage asset:object Field.SpinInterval.Max set value 4 diff --git a/Asset/data/asset/functions/object/2080.aurora_missile/summon/m.mcfunction b/Asset/data/asset/functions/object/2080.aurora_missile/summon/m.mcfunction index 7f7fc5912f..146a615ee2 100644 --- a/Asset/data/asset/functions/object/2080.aurora_missile/summon/m.mcfunction +++ b/Asset/data/asset/functions/object/2080.aurora_missile/summon/m.mcfunction @@ -7,4 +7,4 @@ # @within function asset:object/2080.aurora_missile/summon/ # 元となるEntityを召喚する - $summon marker ~ ~ ~ {Tags:["ObjectInit"],Rotation:$(Rotation)} + $summon item_display ~ ~ ~ {Rotation:$(Rotation),Tags:["ObjectInit"],teleport_duration:1,item:{id:"minecraft:stick",Count:1b,tag:{CustomModelData:20601}},brightness:{sky:15,block:15},transformation:{translation:[0.0f,0.0f,0.0f],left_rotation:[0.0f,0.0f,0.0f,1.0f],scale:[1.2f,1.2f,1.2f],right_rotation:[0.0f,0.0f,0.0f,1.0f]}} diff --git a/Asset/data/asset/functions/object/2080.aurora_missile/tick/.mcfunction b/Asset/data/asset/functions/object/2080.aurora_missile/tick/.mcfunction index 048fa0fd2b..0166375a64 100644 --- a/Asset/data/asset/functions/object/2080.aurora_missile/tick/.mcfunction +++ b/Asset/data/asset/functions/object/2080.aurora_missile/tick/.mcfunction @@ -16,5 +16,11 @@ # スーパーメソッド呼び出し execute at @s run function asset:object/super.tick +# 3tick目から回転 + execute store result storage asset:context this.SpinInterval._ int 0.9999999999 run data get storage asset:context this.SpinInterval._ + execute if data storage asset:context this.SpinInterval{_:0} if score @s General.Object.Tick matches 3.. run function asset:object/2080.aurora_missile/tick/spin + execute if data storage asset:context this.SpinInterval{_:0} if score @s General.Object.Tick matches 3.. run data modify storage asset:context this.SpinInterval._ set from storage asset:context this.SpinInterval.Max + + # 消滅処理 kill @s[scores={General.Object.Tick=1000..}] diff --git a/Asset/data/asset/functions/object/2080.aurora_missile/tick/spin.mcfunction b/Asset/data/asset/functions/object/2080.aurora_missile/tick/spin.mcfunction new file mode 100644 index 0000000000..5e39260757 --- /dev/null +++ b/Asset/data/asset/functions/object/2080.aurora_missile/tick/spin.mcfunction @@ -0,0 +1,21 @@ +#> asset:object/2080.aurora_missile/tick/spin +# +# +# +# @within function asset:object/2080.aurora_missile/tick/ + +# start_interpolation + data modify entity @s start_interpolation set value 0 + +# interpolation_duration + data modify entity @s interpolation_duration set from storage asset:context this.SpinInterval.Max + +# 回転 + execute store result storage asset:context this.Spin int 0.9999999999 run data get storage asset:context this.Spin + execute if data storage asset:context this{Spin:3} run data modify entity @s transformation.left_rotation set value [0.0f,0.0f,-0.7071f,0.7071f] + execute if data storage asset:context this{Spin:2} run data modify entity @s transformation.left_rotation set value [0.0f,0.0f,1.0f,0.0f] + execute if data storage asset:context this{Spin:1} run data modify entity @s transformation.left_rotation set value [0.0f,0.0f,0.7071f,0.7071f] + execute if data storage asset:context this{Spin:0} run data modify entity @s transformation.left_rotation set value [0.0f,0.0f,0.0f,1.0f] + +# リセット + execute if data storage asset:context this{Spin:0} run data modify storage asset:context this.Spin set value 4 From 58f91937dd621ac92733387ae5809bd606fc8744 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Sat, 23 May 2026 01:41:14 +0900 Subject: [PATCH 3/9] =?UTF-8?q?=E5=87=A6=E7=90=86=E3=82=92=E5=A4=A7?= =?UTF-8?q?=E5=B9=85=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../2080.aurora_missile/_index.d.mcfunction | 1 - .../detect_hit_block/.mcfunction | 3 +- .../2080.aurora_missile/hit_block/.mcfunction | 14 -- .../2080.aurora_missile/init/.mcfunction | 18 --- .../2080.aurora_missile/kill/main.mcfunction | 13 +- .../kill/vfx/enhanced.mcfunction | 123 ------------------ .../kill/vfx/normal.mcfunction | 83 ------------ .../2080.aurora_missile/register.mcfunction | 7 + .../2080.aurora_missile/tick/.mcfunction | 18 +-- .../tick/enhanced.mcfunction | 23 ---- .../tick/normal.mcfunction | 24 ---- .../object/alias/2080/hit_block.mcfunction | 8 -- .../object/alias/2080/init.mcfunction | 8 -- 13 files changed, 22 insertions(+), 321 deletions(-) delete mode 100644 Asset/data/asset/functions/object/2080.aurora_missile/hit_block/.mcfunction delete mode 100644 Asset/data/asset/functions/object/2080.aurora_missile/init/.mcfunction delete mode 100644 Asset/data/asset/functions/object/2080.aurora_missile/kill/vfx/enhanced.mcfunction delete mode 100644 Asset/data/asset/functions/object/2080.aurora_missile/kill/vfx/normal.mcfunction delete mode 100644 Asset/data/asset/functions/object/2080.aurora_missile/tick/enhanced.mcfunction delete mode 100644 Asset/data/asset/functions/object/2080.aurora_missile/tick/normal.mcfunction delete mode 100644 Asset/data/asset/functions/object/alias/2080/hit_block.mcfunction delete mode 100644 Asset/data/asset/functions/object/alias/2080/init.mcfunction diff --git a/Asset/data/asset/functions/object/2080.aurora_missile/_index.d.mcfunction b/Asset/data/asset/functions/object/2080.aurora_missile/_index.d.mcfunction index ab99d446cd..06654206bf 100644 --- a/Asset/data/asset/functions/object/2080.aurora_missile/_index.d.mcfunction +++ b/Asset/data/asset/functions/object/2080.aurora_missile/_index.d.mcfunction @@ -4,5 +4,4 @@ #> tag # @within function asset:object/2080.aurora_missile/** #declare score_holder $Interval - #declare tag 2080.Enhanced #declare tag 2080.AlreadyHit diff --git a/Asset/data/asset/functions/object/2080.aurora_missile/detect_hit_block/.mcfunction b/Asset/data/asset/functions/object/2080.aurora_missile/detect_hit_block/.mcfunction index a0464dc502..d12430976b 100644 --- a/Asset/data/asset/functions/object/2080.aurora_missile/detect_hit_block/.mcfunction +++ b/Asset/data/asset/functions/object/2080.aurora_missile/detect_hit_block/.mcfunction @@ -5,5 +5,4 @@ # @within asset:object/alias/2080/detect_hit_block # 判定 - execute if entity @s[tag=!2080.Enhanced] unless block ^ ^ ^0.5 #lib:no_collision/ run data modify storage asset:context IsHitBlock set value true - execute if entity @s[tag=2080.Enhanced] unless block ^ ^ ^0.7 #lib:no_collision/ run data modify storage asset:context IsHitBlock set value true + execute unless block ^ ^ ^0.5 #lib:no_collision/ run data modify storage asset:context IsHitBlock set value true diff --git a/Asset/data/asset/functions/object/2080.aurora_missile/hit_block/.mcfunction b/Asset/data/asset/functions/object/2080.aurora_missile/hit_block/.mcfunction deleted file mode 100644 index d469ec68e6..0000000000 --- a/Asset/data/asset/functions/object/2080.aurora_missile/hit_block/.mcfunction +++ /dev/null @@ -1,14 +0,0 @@ -#> asset:object/2080.aurora_missile/hit_block/ -# -# 継承先などから実行される処理 -# -# @within asset:object/alias/2080/hit_block - -# Enhanced:trueではないかつ、スコアが一定値以下の場合はkillメソッドとは別で消滅する - execute if entity @s[tag=!2080.Enhanced,scores={General.Object.Tick=..19}] run kill @s - -# Enhanced:trueではなかつ、スコアが一定値以上の場合はkillメソッド呼び出し - execute if entity @s[tag=!2080.Enhanced,scores={General.Object.Tick=20..}] run function asset:object/call.m {method:kill} - -# Enhanced:trueなら問答無用でkillメソッド呼び出し - execute if data storage asset:context this{Enhanced:true} run function asset:object/call.m {method:kill} diff --git a/Asset/data/asset/functions/object/2080.aurora_missile/init/.mcfunction b/Asset/data/asset/functions/object/2080.aurora_missile/init/.mcfunction deleted file mode 100644 index 8dbaf4ba2f..0000000000 --- a/Asset/data/asset/functions/object/2080.aurora_missile/init/.mcfunction +++ /dev/null @@ -1,18 +0,0 @@ -#> asset:object/2080.aurora_missile/init/ -# -# Objectのinit時の処理 -# -# @within asset:object/alias/2080/init - -# Enhanced:trueならTagを付与 - execute if data storage asset:context this{Enhanced:true} run tag @s add 2080.Enhanced - -# スピード設定 - data modify storage asset:context this.Speed set value 1 - data modify storage asset:context this.Range set value 50 -# Enhancedタグがあるか否かでMovePerStepを変える - execute if entity @s[tag=!2080.Enhanced] run data modify storage asset:context this.MovePerStep set value 0.35 - execute if entity @s[tag=2080.Enhanced] run data modify storage asset:context this.MovePerStep set value 0.5 - -# スーパーメソッド呼び出し - function asset:object/super.init diff --git a/Asset/data/asset/functions/object/2080.aurora_missile/kill/main.mcfunction b/Asset/data/asset/functions/object/2080.aurora_missile/kill/main.mcfunction index a48c435e20..e258f34f55 100644 --- a/Asset/data/asset/functions/object/2080.aurora_missile/kill/main.mcfunction +++ b/Asset/data/asset/functions/object/2080.aurora_missile/kill/main.mcfunction @@ -5,17 +5,15 @@ # @within function asset:object/2080.aurora_missile/kill/ # 演出 - #execute if entity @s[tag=!2080.Enhanced] rotated ~ 0 positioned ~ ~0.3 ~ run function asset:object/2080.aurora_missile/kill/vfx/normal - #execute if entity @s[tag=2080.Enhanced] rotated ~ 0 positioned ~ ~0.3 ~ run function asset:object/2080.aurora_missile/kill/vfx/enhanced - #particle dust_color_transition 0.000 1.000 0.886 2 0 0.235 1 ~ ~1.5 ~ 1.3 1.2 1.3 0 60 playsound entity.evoker.prepare_summon hostile @a ~ ~ ~ 0.8 1.5 0 particle dust_color_transition 0.4 1 0.8 1.5 0.5 0.65 1 ~ ~1.5 ~ 1.2 1.2 1.2 0 12 +# 演出用Object data modify storage api: Argument.ID set value 2276 + data modify storage api: Argument.FieldOverride.Scale set value 4f function api:object/summon # ダメージ -# Enhancedタグがによって範囲が変わる data modify storage api: Argument.Damage set from storage asset:context this.Damage data modify storage api: Argument.AttackType set value "Magic" data modify storage api: Argument.ElementType set value "Thunder" @@ -23,11 +21,8 @@ data modify storage api: Argument.DeathMessage append value '{"translate": "%1$sは%2$sによって空の塵になった","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"lib:","interpret":true}]}' data modify storage api: Argument.MobUUID set from storage asset:context this.MobUUID function api:damage/modifier_manual - execute if entity @s[tag=!2080.Enhanced] as @a[tag=!PlayerShouldInvulnerable,distance=..2] run function api:damage/ - execute if entity @s[tag=2080.Enhanced] as @a[tag=!PlayerShouldInvulnerable,distance=..3] run function api:damage/ + execute positioned ~-2 ~ ~-2 as @a[tag=!PlayerShouldInvulnerable,dx=3,dx=0.5,dx=3] run function api:damage/ function api:damage/reset # 各プレイヤーのMPを減らす -# Enhancedによって範囲が変わる - execute if entity @s[tag=!2080.Enhanced] as @a[tag=!PlayerShouldInvulnerable,distance=..2] run function asset:object/2080.aurora_missile/kill/mp_reduce - execute if entity @s[tag=2080.Enhanced] as @a[tag=!PlayerShouldInvulnerable,distance=..3] run function asset:object/2080.aurora_missile/kill/mp_reduce + execute positioned ~-2 ~ ~-2 as @a[tag=!PlayerShouldInvulnerable,dx=3,dx=0.5,dx=3] run function asset:object/2080.aurora_missile/kill/mp_reduce diff --git a/Asset/data/asset/functions/object/2080.aurora_missile/kill/vfx/enhanced.mcfunction b/Asset/data/asset/functions/object/2080.aurora_missile/kill/vfx/enhanced.mcfunction deleted file mode 100644 index ffd89d13f9..0000000000 --- a/Asset/data/asset/functions/object/2080.aurora_missile/kill/vfx/enhanced.mcfunction +++ /dev/null @@ -1,123 +0,0 @@ -#> asset:object/2080.aurora_missile/kill/vfx/enhanced -# -# -# -# @within function asset:object/2080.aurora_missile/kill/main - -# 円 1 -particle dust 0.000 1.000 0.949 3 ^0 ^ ^-3 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^0.4693 ^ ^-2.96307 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^0.92705 ^ ^-2.85317 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^1.36197 ^ ^-2.67302 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^1.76336 ^ ^-2.42705 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^2.12132 ^ ^-2.12132 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^2.42705 ^ ^-1.76336 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^2.67302 ^ ^-1.36197 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^2.85317 ^ ^-0.92705 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^2.96307 ^ ^-0.4693 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^3 ^ ^0 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^2.96307 ^ ^0.4693 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^2.85317 ^ ^0.92705 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^2.67302 ^ ^1.36197 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^2.42705 ^ ^1.76336 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^2.12132 ^ ^2.12132 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^1.76336 ^ ^2.42705 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^1.36197 ^ ^2.67302 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^0.92705 ^ ^2.85317 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^0.4693 ^ ^2.96307 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^0 ^ ^3 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^-0.4693 ^ ^2.96307 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^-0.92705 ^ ^2.85317 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^-1.36197 ^ ^2.67302 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^-1.76336 ^ ^2.42705 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^-2.12132 ^ ^2.12132 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^-2.42705 ^ ^1.76336 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^-2.67302 ^ ^1.36197 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^-2.85317 ^ ^0.92705 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^-2.96307 ^ ^0.4693 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^-3 ^ ^0 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^-2.96307 ^ ^-0.4693 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^-2.85317 ^ ^-0.92705 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^-2.67302 ^ ^-1.36197 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^-2.42705 ^ ^-1.76336 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^-2.12132 ^ ^-2.12132 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^-1.76336 ^ ^-2.42705 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^-1.36197 ^ ^-2.67302 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^-0.92705 ^ ^-2.85317 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^-0.4693 ^ ^-2.96307 0 0 0 0 1 -# 円 2 -particle dust 0.000 0.867 0.918 3 ^0 ^ ^-2 0 0 0 0 1 -particle dust 0.000 0.867 0.918 3 ^0.39018 ^ ^-1.96157 0 0 0 0 1 -particle dust 0.000 0.867 0.918 3 ^0.76537 ^ ^-1.84776 0 0 0 0 1 -particle dust 0.000 0.867 0.918 3 ^1.11114 ^ ^-1.66294 0 0 0 0 1 -particle dust 0.000 0.867 0.918 3 ^1.41421 ^ ^-1.41421 0 0 0 0 1 -particle dust 0.000 0.867 0.918 3 ^1.66294 ^ ^-1.11114 0 0 0 0 1 -particle dust 0.000 0.867 0.918 3 ^1.84776 ^ ^-0.76537 0 0 0 0 1 -particle dust 0.000 0.867 0.918 3 ^1.96157 ^ ^-0.39018 0 0 0 0 1 -particle dust 0.000 0.867 0.918 3 ^2 ^ ^0 0 0 0 0 1 -particle dust 0.000 0.867 0.918 3 ^1.96157 ^ ^0.39018 0 0 0 0 1 -particle dust 0.000 0.867 0.918 3 ^1.84776 ^ ^0.76537 0 0 0 0 1 -particle dust 0.000 0.867 0.918 3 ^1.66294 ^ ^1.11114 0 0 0 0 1 -particle dust 0.000 0.867 0.918 3 ^1.41421 ^ ^1.41421 0 0 0 0 1 -particle dust 0.000 0.867 0.918 3 ^1.11114 ^ ^1.66294 0 0 0 0 1 -particle dust 0.000 0.867 0.918 3 ^0.76537 ^ ^1.84776 0 0 0 0 1 -particle dust 0.000 0.867 0.918 3 ^0.39018 ^ ^1.96157 0 0 0 0 1 -particle dust 0.000 0.867 0.918 3 ^0 ^ ^2 0 0 0 0 1 -particle dust 0.000 0.867 0.918 3 ^-0.39018 ^ ^1.96157 0 0 0 0 1 -particle dust 0.000 0.867 0.918 3 ^-0.76537 ^ ^1.84776 0 0 0 0 1 -particle dust 0.000 0.867 0.918 3 ^-1.11114 ^ ^1.66294 0 0 0 0 1 -particle dust 0.000 0.867 0.918 3 ^-1.41421 ^ ^1.41421 0 0 0 0 1 -particle dust 0.000 0.867 0.918 3 ^-1.66294 ^ ^1.11114 0 0 0 0 1 -particle dust 0.000 0.867 0.918 3 ^-1.84776 ^ ^0.76537 0 0 0 0 1 -particle dust 0.000 0.867 0.918 3 ^-1.96157 ^ ^0.39018 0 0 0 0 1 -particle dust 0.000 0.867 0.918 3 ^-2 ^ ^0 0 0 0 0 1 -particle dust 0.000 0.867 0.918 3 ^-1.96157 ^ ^-0.39018 0 0 0 0 1 -particle dust 0.000 0.867 0.918 3 ^-1.84776 ^ ^-0.76537 0 0 0 0 1 -particle dust 0.000 0.867 0.918 3 ^-1.66294 ^ ^-1.11114 0 0 0 0 1 -particle dust 0.000 0.867 0.918 3 ^-1.41421 ^ ^-1.41421 0 0 0 0 1 -particle dust 0.000 0.867 0.918 3 ^-1.11114 ^ ^-1.66294 0 0 0 0 1 -particle dust 0.000 0.867 0.918 3 ^-0.76537 ^ ^-1.84776 0 0 0 0 1 -particle dust 0.000 0.867 0.918 3 ^-0.39018 ^ ^-1.96157 0 0 0 0 1 -# 円 3 -particle dust 0.000 0.804 0.933 3 ^0 ^ ^-1 0 0 0 0 1 -particle dust 0.000 0.804 0.933 3 ^0.25882 ^ ^-0.96593 0 0 0 0 1 -particle dust 0.000 0.804 0.933 3 ^0.5 ^ ^-0.86603 0 0 0 0 1 -particle dust 0.000 0.804 0.933 3 ^0.70711 ^ ^-0.70711 0 0 0 0 1 -particle dust 0.000 0.804 0.933 3 ^0.86603 ^ ^-0.5 0 0 0 0 1 -particle dust 0.000 0.804 0.933 3 ^0.96593 ^ ^-0.25882 0 0 0 0 1 -particle dust 0.000 0.804 0.933 3 ^1 ^ ^0 0 0 0 0 1 -particle dust 0.000 0.804 0.933 3 ^0.96593 ^ ^0.25882 0 0 0 0 1 -particle dust 0.000 0.804 0.933 3 ^0.86603 ^ ^0.5 0 0 0 0 1 -particle dust 0.000 0.804 0.933 3 ^0.70711 ^ ^0.70711 0 0 0 0 1 -particle dust 0.000 0.804 0.933 3 ^0.5 ^ ^0.86603 0 0 0 0 1 -particle dust 0.000 0.804 0.933 3 ^0.25882 ^ ^0.96593 0 0 0 0 1 -particle dust 0.000 0.804 0.933 3 ^0 ^ ^1 0 0 0 0 1 -particle dust 0.000 0.804 0.933 3 ^-0.25882 ^ ^0.96593 0 0 0 0 1 -particle dust 0.000 0.804 0.933 3 ^-0.5 ^ ^0.86603 0 0 0 0 1 -particle dust 0.000 0.804 0.933 3 ^-0.70711 ^ ^0.70711 0 0 0 0 1 -particle dust 0.000 0.804 0.933 3 ^-0.86603 ^ ^0.5 0 0 0 0 1 -particle dust 0.000 0.804 0.933 3 ^-0.96593 ^ ^0.25882 0 0 0 0 1 -particle dust 0.000 0.804 0.933 3 ^-1 ^ ^0 0 0 0 0 1 -particle dust 0.000 0.804 0.933 3 ^-0.96593 ^ ^-0.25882 0 0 0 0 1 -particle dust 0.000 0.804 0.933 3 ^-0.86603 ^ ^-0.5 0 0 0 0 1 -particle dust 0.000 0.804 0.933 3 ^-0.70711 ^ ^-0.70711 0 0 0 0 1 -particle dust 0.000 0.804 0.933 3 ^-0.5 ^ ^-0.86603 0 0 0 0 1 -particle dust 0.000 0.804 0.933 3 ^-0.25882 ^ ^-0.96593 0 0 0 0 1 - -# 円 4 -particle dust 0.000 0.545 1.000 3 ^0 ^ ^-0.5 0 0 0 0 1 -particle dust 0.000 0.545 1.000 3 ^0.19134 ^ ^-0.46194 0 0 0 0 1 -particle dust 0.000 0.545 1.000 3 ^0.35355 ^ ^-0.35355 0 0 0 0 1 -particle dust 0.000 0.545 1.000 3 ^0.46194 ^ ^-0.19134 0 0 0 0 1 -particle dust 0.000 0.545 1.000 3 ^0.5 ^ ^0 0 0 0 0 1 -particle dust 0.000 0.545 1.000 3 ^0.46194 ^ ^0.19134 0 0 0 0 1 -particle dust 0.000 0.545 1.000 3 ^0.35355 ^ ^0.35355 0 0 0 0 1 -particle dust 0.000 0.545 1.000 3 ^0.19134 ^ ^0.46194 0 0 0 0 1 -particle dust 0.000 0.545 1.000 3 ^0 ^ ^0.5 0 0 0 0 1 -particle dust 0.000 0.545 1.000 3 ^-0.19134 ^ ^0.46194 0 0 0 0 1 -particle dust 0.000 0.545 1.000 3 ^-0.35355 ^ ^0.35355 0 0 0 0 1 -particle dust 0.000 0.545 1.000 3 ^-0.46194 ^ ^0.19134 0 0 0 0 1 -particle dust 0.000 0.545 1.000 3 ^-0.5 ^ ^0 0 0 0 0 1 -particle dust 0.000 0.545 1.000 3 ^-0.46194 ^ ^-0.19134 0 0 0 0 1 -particle dust 0.000 0.545 1.000 3 ^-0.35355 ^ ^-0.35355 0 0 0 0 1 -particle dust 0.000 0.545 1.000 3 ^-0.19134 ^ ^-0.46194 0 0 0 0 1 diff --git a/Asset/data/asset/functions/object/2080.aurora_missile/kill/vfx/normal.mcfunction b/Asset/data/asset/functions/object/2080.aurora_missile/kill/vfx/normal.mcfunction deleted file mode 100644 index cd766a7cd9..0000000000 --- a/Asset/data/asset/functions/object/2080.aurora_missile/kill/vfx/normal.mcfunction +++ /dev/null @@ -1,83 +0,0 @@ -#> asset:object/2080.aurora_missile/kill/vfx/normal -# -# -# -# @within function asset:object/2080.aurora_missile/kill/main - -# [ImportKey]: NobwRALgngDgpmAXGAxgSwE4oDYIDRgCuhaAJkmAGwCGArCtQMwCcALALTXMBMADO61oBGSuwBGAdgBmHXqXrdatZrV5ihYAgDtqAWwTJAYYoACDQRjUMegM5JwKAPaEtEJK14EUcF3Ax2wAG7U2IQG4AAeSB5gUFEAvnEEVqRohLaIjATWEJauiNFw2NhoMNYGQrzRGA45EAbRaNYAokUlZU0AjoTB2FAAyhZe5IhSwWUJeODQ8BToWLiaRCTDVHAAHKTczMxSAmKMu6w7tOLUpGLscNyMa6xrEtxCErTUizr6FCbcixZWuun2JwuJCMbiebx1PyIcBBEJhMCRfIEWL5CZgZKpdJgsDZXJRAiFYqlcqVJI1ah1fFgRotIntLo9fqDODDUbYcaJKawAyoTA4fBLMizFASRhyZTsFSUZgCOBCDjMRiMITsFC8MXyRgoVRwKRvPQ8kyMH6WGz+RzOPLcVjgnxQmHBUL+RHRFG8NEYtJIIRZHIYPIFVrE72k9HkylI6nNIP07pFJnUIZINkcyaQbmzPkLAjEIXIMRyq4SCQXIQqC6sOAscS0biiW5y7hrRikK6MCT6j5GYysE1-AGoIF5ES2yH+WFO6EIqluj1nTFRAB0tF9eMjhLaJKq4fqBBpMbgnTjvQGiZZybGcASAF0gA_3 -# 円 2 -particle dust 0.000 1.000 0.918 3 ^0 ^ ^-2 0 0 0 0 1 -particle dust 0.000 1.000 0.918 3 ^0.39018 ^ ^-1.96157 0 0 0 0 1 -particle dust 0.000 1.000 0.918 3 ^0.76537 ^ ^-1.84776 0 0 0 0 1 -particle dust 0.000 1.000 0.918 3 ^1.11114 ^ ^-1.66294 0 0 0 0 1 -particle dust 0.000 1.000 0.918 3 ^1.41421 ^ ^-1.41421 0 0 0 0 1 -particle dust 0.000 1.000 0.918 3 ^1.66294 ^ ^-1.11114 0 0 0 0 1 -particle dust 0.000 1.000 0.918 3 ^1.84776 ^ ^-0.76537 0 0 0 0 1 -particle dust 0.000 1.000 0.918 3 ^1.96157 ^ ^-0.39018 0 0 0 0 1 -particle dust 0.000 1.000 0.918 3 ^2 ^ ^0 0 0 0 0 1 -particle dust 0.000 1.000 0.918 3 ^1.96157 ^ ^0.39018 0 0 0 0 1 -particle dust 0.000 1.000 0.918 3 ^1.84776 ^ ^0.76537 0 0 0 0 1 -particle dust 0.000 1.000 0.918 3 ^1.66294 ^ ^1.11114 0 0 0 0 1 -particle dust 0.000 1.000 0.918 3 ^1.41421 ^ ^1.41421 0 0 0 0 1 -particle dust 0.000 1.000 0.918 3 ^1.11114 ^ ^1.66294 0 0 0 0 1 -particle dust 0.000 1.000 0.918 3 ^0.76537 ^ ^1.84776 0 0 0 0 1 -particle dust 0.000 1.000 0.918 3 ^0.39018 ^ ^1.96157 0 0 0 0 1 -particle dust 0.000 1.000 0.918 3 ^0 ^ ^2 0 0 0 0 1 -particle dust 0.000 1.000 0.918 3 ^-0.39018 ^ ^1.96157 0 0 0 0 1 -particle dust 0.000 1.000 0.918 3 ^-0.76537 ^ ^1.84776 0 0 0 0 1 -particle dust 0.000 1.000 0.918 3 ^-1.11114 ^ ^1.66294 0 0 0 0 1 -particle dust 0.000 1.000 0.918 3 ^-1.41421 ^ ^1.41421 0 0 0 0 1 -particle dust 0.000 1.000 0.918 3 ^-1.66294 ^ ^1.11114 0 0 0 0 1 -particle dust 0.000 1.000 0.918 3 ^-1.84776 ^ ^0.76537 0 0 0 0 1 -particle dust 0.000 1.000 0.918 3 ^-1.96157 ^ ^0.39018 0 0 0 0 1 -particle dust 0.000 1.000 0.918 3 ^-2 ^ ^0 0 0 0 0 1 -particle dust 0.000 1.000 0.918 3 ^-1.96157 ^ ^-0.39018 0 0 0 0 1 -particle dust 0.000 1.000 0.918 3 ^-1.84776 ^ ^-0.76537 0 0 0 0 1 -particle dust 0.000 1.000 0.918 3 ^-1.66294 ^ ^-1.11114 0 0 0 0 1 -particle dust 0.000 1.000 0.918 3 ^-1.41421 ^ ^-1.41421 0 0 0 0 1 -particle dust 0.000 1.000 0.918 3 ^-1.11114 ^ ^-1.66294 0 0 0 0 1 -particle dust 0.000 1.000 0.918 3 ^-0.76537 ^ ^-1.84776 0 0 0 0 1 -particle dust 0.000 1.000 0.918 3 ^-0.39018 ^ ^-1.96157 0 0 0 0 1 -# 円 3 -particle dust 0.000 0.878 0.914 3 ^0 ^ ^-1 0 0 0 0 1 -particle dust 0.000 0.878 0.914 3 ^0.25882 ^ ^-0.96593 0 0 0 0 1 -particle dust 0.000 0.878 0.914 3 ^0.5 ^ ^-0.86603 0 0 0 0 1 -particle dust 0.000 0.878 0.914 3 ^0.70711 ^ ^-0.70711 0 0 0 0 1 -particle dust 0.000 0.878 0.914 3 ^0.86603 ^ ^-0.5 0 0 0 0 1 -particle dust 0.000 0.878 0.914 3 ^0.96593 ^ ^-0.25882 0 0 0 0 1 -particle dust 0.000 0.878 0.914 3 ^1 ^ ^0 0 0 0 0 1 -particle dust 0.000 0.878 0.914 3 ^0.96593 ^ ^0.25882 0 0 0 0 1 -particle dust 0.000 0.878 0.914 3 ^0.86603 ^ ^0.5 0 0 0 0 1 -particle dust 0.000 0.878 0.914 3 ^0.70711 ^ ^0.70711 0 0 0 0 1 -particle dust 0.000 0.878 0.914 3 ^0.5 ^ ^0.86603 0 0 0 0 1 -particle dust 0.000 0.878 0.914 3 ^0.25882 ^ ^0.96593 0 0 0 0 1 -particle dust 0.000 0.878 0.914 3 ^0 ^ ^1 0 0 0 0 1 -particle dust 0.000 0.878 0.914 3 ^-0.25882 ^ ^0.96593 0 0 0 0 1 -particle dust 0.000 0.878 0.914 3 ^-0.5 ^ ^0.86603 0 0 0 0 1 -particle dust 0.000 0.878 0.914 3 ^-0.70711 ^ ^0.70711 0 0 0 0 1 -particle dust 0.000 0.878 0.914 3 ^-0.86603 ^ ^0.5 0 0 0 0 1 -particle dust 0.000 0.878 0.914 3 ^-0.96593 ^ ^0.25882 0 0 0 0 1 -particle dust 0.000 0.878 0.914 3 ^-1 ^ ^0 0 0 0 0 1 -particle dust 0.000 0.878 0.914 3 ^-0.96593 ^ ^-0.25882 0 0 0 0 1 -particle dust 0.000 0.878 0.914 3 ^-0.86603 ^ ^-0.5 0 0 0 0 1 -particle dust 0.000 0.878 0.914 3 ^-0.70711 ^ ^-0.70711 0 0 0 0 1 -particle dust 0.000 0.878 0.914 3 ^-0.5 ^ ^-0.86603 0 0 0 0 1 -particle dust 0.000 0.878 0.914 3 ^-0.25882 ^ ^-0.96593 0 0 0 0 1 - -# 円 4 -particle dust 0.000 0.545 1.000 3 ^0 ^ ^-0.5 0 0 0 0 1 -particle dust 0.000 0.545 1.000 3 ^0.19134 ^ ^-0.46194 0 0 0 0 1 -particle dust 0.000 0.545 1.000 3 ^0.35355 ^ ^-0.35355 0 0 0 0 1 -particle dust 0.000 0.545 1.000 3 ^0.46194 ^ ^-0.19134 0 0 0 0 1 -particle dust 0.000 0.545 1.000 3 ^0.5 ^ ^0 0 0 0 0 1 -particle dust 0.000 0.545 1.000 3 ^0.46194 ^ ^0.19134 0 0 0 0 1 -particle dust 0.000 0.545 1.000 3 ^0.35355 ^ ^0.35355 0 0 0 0 1 -particle dust 0.000 0.545 1.000 3 ^0.19134 ^ ^0.46194 0 0 0 0 1 -particle dust 0.000 0.545 1.000 3 ^0 ^ ^0.5 0 0 0 0 1 -particle dust 0.000 0.545 1.000 3 ^-0.19134 ^ ^0.46194 0 0 0 0 1 -particle dust 0.000 0.545 1.000 3 ^-0.35355 ^ ^0.35355 0 0 0 0 1 -particle dust 0.000 0.545 1.000 3 ^-0.46194 ^ ^0.19134 0 0 0 0 1 -particle dust 0.000 0.545 1.000 3 ^-0.5 ^ ^0 0 0 0 0 1 -particle dust 0.000 0.545 1.000 3 ^-0.46194 ^ ^-0.19134 0 0 0 0 1 -particle dust 0.000 0.545 1.000 3 ^-0.35355 ^ ^-0.35355 0 0 0 0 1 -particle dust 0.000 0.545 1.000 3 ^-0.19134 ^ ^-0.46194 0 0 0 0 1 diff --git a/Asset/data/asset/functions/object/2080.aurora_missile/register.mcfunction b/Asset/data/asset/functions/object/2080.aurora_missile/register.mcfunction index 424d26375d..9c2edd85f5 100644 --- a/Asset/data/asset/functions/object/2080.aurora_missile/register.mcfunction +++ b/Asset/data/asset/functions/object/2080.aurora_missile/register.mcfunction @@ -17,6 +17,13 @@ # ID (int) data modify storage asset:object ID set value 2080 # フィールド(オプション) + +# 飛翔体抽象に必要なデータ + data modify storage asset:object Field.Speed set value 1 + data modify storage asset:object Field.Range set value 50 + data modify storage asset:object Field.MovePerStep set value 0.5 + +# 回転関係 data modify storage asset:object Field.Spin set value 4 data modify storage asset:object Field.SpinInterval._ set value 0 data modify storage asset:object Field.SpinInterval.Max set value 4 diff --git a/Asset/data/asset/functions/object/2080.aurora_missile/tick/.mcfunction b/Asset/data/asset/functions/object/2080.aurora_missile/tick/.mcfunction index 0166375a64..51f365f60e 100644 --- a/Asset/data/asset/functions/object/2080.aurora_missile/tick/.mcfunction +++ b/Asset/data/asset/functions/object/2080.aurora_missile/tick/.mcfunction @@ -7,11 +7,17 @@ # Tick加算 scoreboard players add @s General.Object.Tick 1 -# 通常 - execute if entity @s[tag=!2080.Enhanced] run function asset:object/2080.aurora_missile/tick/normal +# 演出 + particle dust_color_transition 0.000 1.000 0.886 2 0 0.235 1 ~ ~ ~ 0.2 0.2 0.2 0 3 normal @a -# 強化版 - execute if entity @s[tag=2080.Enhanced] run function asset:object/2080.aurora_missile/tick/enhanced +# 一定間隔でplaysound + scoreboard players operation $Interval Temporary = @s General.Object.Tick + scoreboard players operation $Interval Temporary %= $4 Const + execute if score $Interval Temporary matches 0 run playsound block.beacon.power_select hostile @a ~ ~ ~ 0.4 2 0 + scoreboard players reset $Interval Temporary + +# 最初の20tickは誘導弾になる + execute if entity @s[scores={General.Object.Tick=..20}] facing entity @p[gamemode=!spectator,distance=..64] feet positioned ^ ^ ^-150 rotated as @s positioned ^ ^ ^-800 facing entity @s feet positioned as @s run tp @s ~ ~ ~ ~ ~ # スーパーメソッド呼び出し execute at @s run function asset:object/super.tick @@ -20,7 +26,3 @@ execute store result storage asset:context this.SpinInterval._ int 0.9999999999 run data get storage asset:context this.SpinInterval._ execute if data storage asset:context this.SpinInterval{_:0} if score @s General.Object.Tick matches 3.. run function asset:object/2080.aurora_missile/tick/spin execute if data storage asset:context this.SpinInterval{_:0} if score @s General.Object.Tick matches 3.. run data modify storage asset:context this.SpinInterval._ set from storage asset:context this.SpinInterval.Max - - -# 消滅処理 - kill @s[scores={General.Object.Tick=1000..}] diff --git a/Asset/data/asset/functions/object/2080.aurora_missile/tick/enhanced.mcfunction b/Asset/data/asset/functions/object/2080.aurora_missile/tick/enhanced.mcfunction deleted file mode 100644 index 7d16c4b919..0000000000 --- a/Asset/data/asset/functions/object/2080.aurora_missile/tick/enhanced.mcfunction +++ /dev/null @@ -1,23 +0,0 @@ -#> asset:object/2080.aurora_missile/tick/enhanced -# -# -# -# @within function asset:object/2080.aurora_missile/tick/ - -# 演出 - particle dust_color_transition 0.000 1.000 0.886 2 0 0.235 1 ~ ~ ~ 0.2 0.2 0.2 0 3 normal @a - -# 一定間隔でplaysound - scoreboard players operation $Interval Temporary = @s General.Object.Tick - scoreboard players operation $Interval Temporary %= $4 Const - execute if score $Interval Temporary matches 0 run playsound block.beacon.power_select hostile @a ~ ~ ~ 0.4 2 0 - scoreboard players reset $Interval Temporary - -# 最初の20tickは誘導弾になる - execute if entity @s[scores={General.Object.Tick=..20}] facing entity @p feet positioned ^ ^ ^-150 rotated as @s positioned ^ ^ ^-800 facing entity @s feet positioned as @s run tp @s ~ ~ ~ ~ ~ - -# それ以降は前進する - execute if entity @s[scores={General.Object.Tick=21}] run data modify storage asset:context this.MovePerStep set value 0.7 - -# 消滅 - execute if entity @s[scores={General.Object.Tick=50..}] run function asset:object/call.m {method:kill} diff --git a/Asset/data/asset/functions/object/2080.aurora_missile/tick/normal.mcfunction b/Asset/data/asset/functions/object/2080.aurora_missile/tick/normal.mcfunction deleted file mode 100644 index 703e36fe50..0000000000 --- a/Asset/data/asset/functions/object/2080.aurora_missile/tick/normal.mcfunction +++ /dev/null @@ -1,24 +0,0 @@ -#> asset:object/2080.aurora_missile/tick/normal -# -# -# -# @within function asset:object/2080.aurora_missile/tick/ - -# 演出 - execute if entity @s[scores={General.Object.Tick=..19}] run particle dust_color_transition 0 0.408 0.361 1 0 0.114 0.478 ~ ~ ~ 0 0 0 0 3 normal @a - execute if entity @s[scores={General.Object.Tick=20..}] run particle dust_color_transition 0.000 1.000 0.886 2 0 0.235 1 ~ ~ ~ 0.2 0.2 0.2 0 3 normal @a - -# 一定間隔でplaysound - scoreboard players operation $Interval Temporary = @s General.Object.Tick - scoreboard players operation $Interval Temporary %= $4 Const - execute if score $Interval Temporary matches 0 run playsound block.beacon.power_select hostile @a ~ ~ ~ 0.4 2 0 - scoreboard players reset $Interval Temporary - -# 最初の20tickは誘導弾になる - execute if entity @s[scores={General.Object.Tick=..20}] facing entity @p feet positioned ^ ^ ^-100 rotated as @s positioned ^ ^ ^-800 facing entity @s feet positioned as @s run tp @s ~ ~ ~ ~ ~ - -# それ以降は前進する - execute if entity @s[scores={General.Object.Tick=21}] run data modify storage asset:context this.MovePerStep set value 0.5 - -# 消滅 - execute if entity @s[scores={General.Object.Tick=50..}] run function asset:object/call.m {method:kill} diff --git a/Asset/data/asset/functions/object/alias/2080/hit_block.mcfunction b/Asset/data/asset/functions/object/alias/2080/hit_block.mcfunction deleted file mode 100644 index 3cda717118..0000000000 --- a/Asset/data/asset/functions/object/alias/2080/hit_block.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset:object/alias/2080/hit_block -# -# メソッド処理のエイリアス -# -# @within asset_manager:object/tick/tick.m - -# 元のメソッド処理を呼び出す - function asset:object/2080.aurora_missile/hit_block/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/2080/init.mcfunction b/Asset/data/asset/functions/object/alias/2080/init.mcfunction deleted file mode 100644 index 7dcfe2584b..0000000000 --- a/Asset/data/asset/functions/object/alias/2080/init.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset:object/alias/2080/init -# -# Init処理のエイリアス -# -# @within asset_manager:object/init/init.m - -# 元のInit処理を呼び出す - function asset:object/2080.aurora_missile/init/ \ No newline at end of file From 636f274ae32fa2c887ba8607947b2eec8d572e69 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Sat, 23 May 2026 01:48:18 +0900 Subject: [PATCH 4/9] =?UTF-8?q?=E3=82=BB=E3=83=AC=E3=82=AF=E3=82=BF?= =?UTF-8?q?=E3=83=BC=E3=81=8C=E3=81=8A=E3=81=8B=E3=81=97=E3=81=84=E5=95=8F?= =?UTF-8?q?=E9=A1=8C=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/2080.aurora_missile/kill/main.mcfunction | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Asset/data/asset/functions/object/2080.aurora_missile/kill/main.mcfunction b/Asset/data/asset/functions/object/2080.aurora_missile/kill/main.mcfunction index e258f34f55..a7acd58b49 100644 --- a/Asset/data/asset/functions/object/2080.aurora_missile/kill/main.mcfunction +++ b/Asset/data/asset/functions/object/2080.aurora_missile/kill/main.mcfunction @@ -21,8 +21,8 @@ data modify storage api: Argument.DeathMessage append value '{"translate": "%1$sは%2$sによって空の塵になった","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"lib:","interpret":true}]}' data modify storage api: Argument.MobUUID set from storage asset:context this.MobUUID function api:damage/modifier_manual - execute positioned ~-2 ~ ~-2 as @a[tag=!PlayerShouldInvulnerable,dx=3,dx=0.5,dx=3] run function api:damage/ + execute positioned ~-2 ~ ~-2 as @a[tag=!PlayerShouldInvulnerable,dx=3,dy=0.5,dz=3] run function api:damage/ function api:damage/reset # 各プレイヤーのMPを減らす - execute positioned ~-2 ~ ~-2 as @a[tag=!PlayerShouldInvulnerable,dx=3,dx=0.5,dx=3] run function asset:object/2080.aurora_missile/kill/mp_reduce + execute positioned ~-2 ~ ~-2 as @a[tag=!PlayerShouldInvulnerable,dx=3,dy=0.5,dz=3] run function asset:object/2080.aurora_missile/kill/mp_reduce From b6c4719fdd3711df6b566c022c180d10e7d779aa Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Sat, 23 May 2026 01:49:16 +0900 Subject: [PATCH 5/9] =?UTF-8?q?=E6=BC=94=E5=87=BA=E3=82=92=E8=AA=BF?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../asset/functions/object/2080.aurora_missile/tick/.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/object/2080.aurora_missile/tick/.mcfunction b/Asset/data/asset/functions/object/2080.aurora_missile/tick/.mcfunction index 51f365f60e..e8f56c2e7f 100644 --- a/Asset/data/asset/functions/object/2080.aurora_missile/tick/.mcfunction +++ b/Asset/data/asset/functions/object/2080.aurora_missile/tick/.mcfunction @@ -8,7 +8,7 @@ scoreboard players add @s General.Object.Tick 1 # 演出 - particle dust_color_transition 0.000 1.000 0.886 2 0 0.235 1 ~ ~ ~ 0.2 0.2 0.2 0 3 normal @a + particle dust_color_transition 0.4 1 0.8 1.5 0.5 0.65 1 ~ ~ ~ 0.1 0.1 01 0 1 # 一定間隔でplaysound scoreboard players operation $Interval Temporary = @s General.Object.Tick From 6527c5011b10836dd1b9b53389fceb0ed7bc132c Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Sat, 23 May 2026 01:51:30 +0900 Subject: [PATCH 6/9] =?UTF-8?q?=E5=8F=AC=E5=96=9A=E5=81=B4=E3=81=AEEnhance?= =?UTF-8?q?d=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/mob/0331.aurora_sorcerer/tick/summon.mcfunction | 3 --- 1 file changed, 3 deletions(-) diff --git a/Asset/data/asset/functions/mob/0331.aurora_sorcerer/tick/summon.mcfunction b/Asset/data/asset/functions/mob/0331.aurora_sorcerer/tick/summon.mcfunction index aa931cf023..869d3d7697 100644 --- a/Asset/data/asset/functions/mob/0331.aurora_sorcerer/tick/summon.mcfunction +++ b/Asset/data/asset/functions/mob/0331.aurora_sorcerer/tick/summon.mcfunction @@ -8,9 +8,6 @@ function api:global_vars/get_difficulty execute store result storage api: Argument.FieldOverride.MPReducePer float 2.5 run data get storage api: Return.Difficulty -# ハードなら強化設定をtrueに - execute if predicate api:global_vars/difficulty/min/3_blessless run data modify storage api: Argument.FieldOverride.Enhanced set value true - # 召喚 data modify storage api: Argument.ID set value 2080 data modify storage api: Argument.FieldOverride.Damage set from storage asset:context this.Damage From 686c9711a9f4b48b5e1475d9310c97fbc43433dd Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Sat, 23 May 2026 01:52:02 +0900 Subject: [PATCH 7/9] =?UTF-8?q?=E4=B8=8D=E8=A6=81=E3=81=AA=E3=83=95?= =?UTF-8?q?=E3=82=A3=E3=83=BC=E3=83=AB=E3=83=89=E8=A8=AD=E5=AE=9A=E3=82=92?= =?UTF-8?q?=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/mob/0331.aurora_sorcerer/tick/summon.mcfunction | 1 - 1 file changed, 1 deletion(-) diff --git a/Asset/data/asset/functions/mob/0331.aurora_sorcerer/tick/summon.mcfunction b/Asset/data/asset/functions/mob/0331.aurora_sorcerer/tick/summon.mcfunction index 869d3d7697..5262279974 100644 --- a/Asset/data/asset/functions/mob/0331.aurora_sorcerer/tick/summon.mcfunction +++ b/Asset/data/asset/functions/mob/0331.aurora_sorcerer/tick/summon.mcfunction @@ -11,6 +11,5 @@ # 召喚 data modify storage api: Argument.ID set value 2080 data modify storage api: Argument.FieldOverride.Damage set from storage asset:context this.Damage - data modify storage api: Argument.FieldOverride.Rotation set from entity @s Rotation execute store result storage api: Argument.FieldOverride.MobUUID int 1 run scoreboard players get @s MobUUID function api:object/summon From 97b926fcf9c8f819f67bc546d09c48996db16c50 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Sat, 23 May 2026 01:57:14 +0900 Subject: [PATCH 8/9] =?UTF-8?q?=E3=83=9F=E3=82=B9=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../asset/functions/object/2080.aurora_missile/tick/.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/object/2080.aurora_missile/tick/.mcfunction b/Asset/data/asset/functions/object/2080.aurora_missile/tick/.mcfunction index e8f56c2e7f..730ae28e05 100644 --- a/Asset/data/asset/functions/object/2080.aurora_missile/tick/.mcfunction +++ b/Asset/data/asset/functions/object/2080.aurora_missile/tick/.mcfunction @@ -8,7 +8,7 @@ scoreboard players add @s General.Object.Tick 1 # 演出 - particle dust_color_transition 0.4 1 0.8 1.5 0.5 0.65 1 ~ ~ ~ 0.1 0.1 01 0 1 + particle dust_color_transition 0.4 1 0.8 1.5 0.5 0.65 1 ~ ~ ~ 0.1 0.1 0.1 0 1 # 一定間隔でplaysound scoreboard players operation $Interval Temporary = @s General.Object.Tick From 340cee737b23e7d09a118ebbfa8ce7d7d96f5b83 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Sat, 23 May 2026 01:57:43 +0900 Subject: [PATCH 9/9] =?UTF-8?q?=E3=83=9F=E3=82=B9=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../asset/functions/object/2276.aurora_wave/register.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/object/2276.aurora_wave/register.mcfunction b/Asset/data/asset/functions/object/2276.aurora_wave/register.mcfunction index 1e802e481d..4e47a017bd 100644 --- a/Asset/data/asset/functions/object/2276.aurora_wave/register.mcfunction +++ b/Asset/data/asset/functions/object/2276.aurora_wave/register.mcfunction @@ -17,4 +17,4 @@ # ID (int) data modify storage asset:object ID set value 2276 # フィールド(オプション) - data modify storage asset:object Field.Scale set value 4.5f + data modify storage asset:object Field.Scale set value 4f