From 56ec63399033b4200633632c6639686cc68d7933 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Sat, 3 Jan 2026 12:59:53 +0900 Subject: [PATCH 01/14] =?UTF-8?q?[Object=205]=20=E9=87=8D=E5=8A=9B?= =?UTF-8?q?=E9=A3=9B=E7=BF=94=E4=BD=93=E6=8A=BD=E8=B1=A1=E3=81=AB=E5=AD=98?= =?UTF-8?q?=E5=9C=A8=E6=99=82=E9=96=93=E3=82=92=E8=B6=85=E9=81=8E=E3=81=97?= =?UTF-8?q?=E3=81=9F=E9=9A=9B=E3=81=AE=E5=87=A6=E7=90=86=E3=82=92=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../range_over/.mcfunction | 8 ++++++++ .../0005.abstract_gravity_projectile/register.mcfunction | 1 + .../0005.abstract_gravity_projectile/tick/.mcfunction | 6 ++++++ .../asset/functions/object/alias/5/range_over.mcfunction | 8 ++++++++ 4 files changed, 23 insertions(+) create mode 100644 Asset/data/asset/functions/object/0005.abstract_gravity_projectile/range_over/.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/5/range_over.mcfunction diff --git a/Asset/data/asset/functions/object/0005.abstract_gravity_projectile/range_over/.mcfunction b/Asset/data/asset/functions/object/0005.abstract_gravity_projectile/range_over/.mcfunction new file mode 100644 index 0000000000..fb853cdba2 --- /dev/null +++ b/Asset/data/asset/functions/object/0005.abstract_gravity_projectile/range_over/.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/0005.abstract_gravity_projectile/range_over/ +# +# 射程限界に到達した際の処理 デフォルトはhitメソッドを直接呼び出す +# +# @within asset:object/alias/5/range_over + +# hitメソッド呼び出し + function asset:object/call.m {method:hit} diff --git a/Asset/data/asset/functions/object/0005.abstract_gravity_projectile/register.mcfunction b/Asset/data/asset/functions/object/0005.abstract_gravity_projectile/register.mcfunction index 6cf214c432..5efd766398 100644 --- a/Asset/data/asset/functions/object/0005.abstract_gravity_projectile/register.mcfunction +++ b/Asset/data/asset/functions/object/0005.abstract_gravity_projectile/register.mcfunction @@ -18,3 +18,4 @@ data modify storage asset:object ID set value 5 # フィールド(オプション) data modify storage asset:object Field.Motion set value 1f + data modify storage asset:object Field.Tick set value 2147483647 diff --git a/Asset/data/asset/functions/object/0005.abstract_gravity_projectile/tick/.mcfunction b/Asset/data/asset/functions/object/0005.abstract_gravity_projectile/tick/.mcfunction index fbb1a94aad..6d057a1be6 100644 --- a/Asset/data/asset/functions/object/0005.abstract_gravity_projectile/tick/.mcfunction +++ b/Asset/data/asset/functions/object/0005.abstract_gravity_projectile/tick/.mcfunction @@ -6,3 +6,9 @@ # 自身が何にも乗っていなければ、hitメソッドを発動する execute unless predicate lib:is_vehicle at @s run function asset:object/call.m {method:hit} + +# 存在時間のデクリメント + execute store result storage asset:context this.Tick int 0.9999999999 run data get storage asset:context this.Tick 1 + +# 存在時間が0かつまだ生存しているならrange_overメソッドを発動 + execute if data storage asset:context this{Tick:0} if score @s ObjectID matches -2147483648..2147483647 at @s run function asset:object/call.m {method:"range_over"} diff --git a/Asset/data/asset/functions/object/alias/5/range_over.mcfunction b/Asset/data/asset/functions/object/alias/5/range_over.mcfunction new file mode 100644 index 0000000000..0e331051b5 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/5/range_over.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/5/range_over +# +# メソッド処理のエイリアス +# +# @within asset_manager:object/call_method/run_method.m + +# 元のメソッド処理を呼び出す + function asset:object/0005.abstract_gravity_projectile/range_over/ \ No newline at end of file From efc7b99153ea5fe4424660de3c054fd5c0c1058b Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Sat, 3 Jan 2026 13:13:11 +0900 Subject: [PATCH 02/14] =?UTF-8?q?[Artifact=2035,=20Object=201002]=20?= =?UTF-8?q?=E9=AD=94=E5=A5=B3=E3=81=AB=E4=B8=8E=E3=81=88=E3=82=8B=E9=89=84?= =?UTF-8?q?=E6=A7=8C=E3=81=AE=E5=87=A6=E7=90=86=E3=82=92=E9=87=8D=E5=8A=9B?= =?UTF-8?q?=E9=A3=9B=E7=BF=94=E4=BD=93=E6=8A=BD=E8=B1=A1=E3=82=92=E7=B6=99?= =?UTF-8?q?=E6=89=BF=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trigger/3.main.mcfunction | 2 ++ .../object/1002.malleus_maleficarum/hit/.mcfunction | 11 +++++++++++ .../{tick => hit}/witchification.mcfunction | 4 ++-- .../object/1002.malleus_maleficarum/init/.mcfunction | 12 ------------ .../1002.malleus_maleficarum/register.mcfunction | 11 ++++++----- .../object/1002.malleus_maleficarum/tick/.mcfunction | 10 ++-------- .../1002.malleus_maleficarum/tick/hit.mcfunction | 12 ------------ .../asset/functions/object/alias/1002/hit.mcfunction | 8 ++++++++ .../functions/object/alias/1002/init.mcfunction | 8 -------- 9 files changed, 31 insertions(+), 47 deletions(-) create mode 100644 Asset/data/asset/functions/object/1002.malleus_maleficarum/hit/.mcfunction rename Asset/data/asset/functions/object/1002.malleus_maleficarum/{tick => hit}/witchification.mcfunction (66%) delete mode 100644 Asset/data/asset/functions/object/1002.malleus_maleficarum/init/.mcfunction delete mode 100644 Asset/data/asset/functions/object/1002.malleus_maleficarum/tick/hit.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1002/hit.mcfunction delete mode 100644 Asset/data/asset/functions/object/alias/1002/init.mcfunction diff --git a/Asset/data/asset/functions/artifact/0035.malleus_maleficarum/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0035.malleus_maleficarum/trigger/3.main.mcfunction index b88bda110f..15c3248882 100644 --- a/Asset/data/asset/functions/artifact/0035.malleus_maleficarum/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0035.malleus_maleficarum/trigger/3.main.mcfunction @@ -11,4 +11,6 @@ # 弾を召喚 data modify storage api: Argument.ID set value 1002 + data modify storage api: Argument.FieldOverride.Tick set value 60 + data modify storage api: Argument.FieldOverride.Motion set value 0.8 execute anchored eyes positioned ^ ^ ^1 run function api:object/summon diff --git a/Asset/data/asset/functions/object/1002.malleus_maleficarum/hit/.mcfunction b/Asset/data/asset/functions/object/1002.malleus_maleficarum/hit/.mcfunction new file mode 100644 index 0000000000..095a5c6524 --- /dev/null +++ b/Asset/data/asset/functions/object/1002.malleus_maleficarum/hit/.mcfunction @@ -0,0 +1,11 @@ +#> asset:object/1002.malleus_maleficarum/hit/ +# +# 継承先などから実行される処理 +# +# @within asset:object/alias/1002/hit + +# super + function asset:object/super.method + +# 魔女化 + execute positioned ~-1 ~-1 ~-1 as @e[type=#lib:living_without_player,type=!witch,tag=!Uninterferable,tag=!Enemy.Boss,tag=!Uninterferable,dx=1,dy=1,dz=1,sort=random,limit=1] at @s run function asset:object/1002.malleus_maleficarum/hit/witchification diff --git a/Asset/data/asset/functions/object/1002.malleus_maleficarum/tick/witchification.mcfunction b/Asset/data/asset/functions/object/1002.malleus_maleficarum/hit/witchification.mcfunction similarity index 66% rename from Asset/data/asset/functions/object/1002.malleus_maleficarum/tick/witchification.mcfunction rename to Asset/data/asset/functions/object/1002.malleus_maleficarum/hit/witchification.mcfunction index 7858b1fa13..9f2ab6b77d 100644 --- a/Asset/data/asset/functions/object/1002.malleus_maleficarum/tick/witchification.mcfunction +++ b/Asset/data/asset/functions/object/1002.malleus_maleficarum/hit/witchification.mcfunction @@ -1,8 +1,8 @@ -#> asset:object/1002.malleus_maleficarum/tick/witchification +#> asset:object/1002.malleus_maleficarum/hit/witchification # # 魔女化 # -# @within function asset:object/1002.malleus_maleficarum/tick/hit +# @within function asset:object/1002.malleus_maleficarum/hit/ # 効果音 playsound entity.zombie_villager.converted neutral @a ~ ~ ~ 1 1 diff --git a/Asset/data/asset/functions/object/1002.malleus_maleficarum/init/.mcfunction b/Asset/data/asset/functions/object/1002.malleus_maleficarum/init/.mcfunction deleted file mode 100644 index 87dd46e256..0000000000 --- a/Asset/data/asset/functions/object/1002.malleus_maleficarum/init/.mcfunction +++ /dev/null @@ -1,12 +0,0 @@ -#> asset:object/1002.malleus_maleficarum/init/ -# -# Objectのinit時の処理 -# -# @within asset:object/alias/1002/init - -# Motion - data modify storage lib: Argument.VectorMagnitude set value 0.8 - execute on vehicle at @s run function lib:motion/ - -# ダメージを与えて描画更新 - execute on vehicle run damage @s 0 diff --git a/Asset/data/asset/functions/object/1002.malleus_maleficarum/register.mcfunction b/Asset/data/asset/functions/object/1002.malleus_maleficarum/register.mcfunction index c712d2de6a..3b81776f9f 100644 --- a/Asset/data/asset/functions/object/1002.malleus_maleficarum/register.mcfunction +++ b/Asset/data/asset/functions/object/1002.malleus_maleficarum/register.mcfunction @@ -5,16 +5,17 @@ # @within function asset:object/alias/1002/register # 継承(オプション) - # data modify storage asset:object Extends append value - # function asset:object/extends + data modify storage asset:object Extends append value 5 + 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 1002 # フィールド(オプション) - # data modify storage asset:object Field.myValue set value \ No newline at end of file + data modify storage asset:object Field.Motion set value 0.8 + data modify storage asset:object Field.Tick set value 60 diff --git a/Asset/data/asset/functions/object/1002.malleus_maleficarum/tick/.mcfunction b/Asset/data/asset/functions/object/1002.malleus_maleficarum/tick/.mcfunction index 6890acbf45..158b539040 100644 --- a/Asset/data/asset/functions/object/1002.malleus_maleficarum/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1002.malleus_maleficarum/tick/.mcfunction @@ -4,14 +4,8 @@ # # @within asset:object/alias/1002/tick -# Tick加算 - scoreboard players add @s General.Object.Tick 1 - # vfx particle soul_fire_flame ~ ~ ~ 0 0 0 0 1 -# Vehicleがいなければヒット処理 - execute unless predicate lib:is_vehicle at @s run function asset:object/1002.malleus_maleficarum/tick/hit - -# セーフティ - execute if score @s General.Object.Tick matches 60.. run function asset:object/1002.malleus_maleficarum/tick/hit +# super.tick + execute at @s run function asset:object/super.tick diff --git a/Asset/data/asset/functions/object/1002.malleus_maleficarum/tick/hit.mcfunction b/Asset/data/asset/functions/object/1002.malleus_maleficarum/tick/hit.mcfunction deleted file mode 100644 index 63ad916cdd..0000000000 --- a/Asset/data/asset/functions/object/1002.malleus_maleficarum/tick/hit.mcfunction +++ /dev/null @@ -1,12 +0,0 @@ -#> asset:object/1002.malleus_maleficarum/tick/hit -# -# -# -# @within function asset:object/1002.malleus_maleficarum/tick/ - -# 魔女化 - execute positioned ~-1 ~-1 ~-1 as @e[type=#lib:living,type=!player,type=!witch,tag=!Uninterferable,tag=!Enemy.Boss,tag=!Uninterferable,dx=1,dy=1,dz=1,sort=nearest,limit=1] at @s run function asset:object/1002.malleus_maleficarum/tick/witchification - -# 消滅 - execute on vehicle run kill @s - kill @s diff --git a/Asset/data/asset/functions/object/alias/1002/hit.mcfunction b/Asset/data/asset/functions/object/alias/1002/hit.mcfunction new file mode 100644 index 0000000000..61cdd6354f --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1002/hit.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1002/hit +# +# メソッド処理のエイリアス +# +# @within asset_manager:object/call_method/run_method.m + +# 元のメソッド処理を呼び出す + function asset:object/1002.malleus_maleficarum/hit/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1002/init.mcfunction b/Asset/data/asset/functions/object/alias/1002/init.mcfunction deleted file mode 100644 index 2cf5ca2b68..0000000000 --- a/Asset/data/asset/functions/object/alias/1002/init.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset:object/alias/1002/init -# -# Init処理のエイリアス -# -# @within asset_manager:object/init/init.m - -# 元のInit処理を呼び出す - function asset:object/1002.malleus_maleficarum/init/ \ No newline at end of file From 9283a568681dceeaa90de0177ce7ef4e334aa5ba Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Sat, 3 Jan 2026 13:49:49 +0900 Subject: [PATCH 03/14] =?UTF-8?q?[Artifact=201120,=20Object=201053]=20?= =?UTF-8?q?=E7=81=AB=E7=82=8E=E6=94=BE=E5=B0=84=E5=99=A8=E3=81=AE=E5=87=A6?= =?UTF-8?q?=E7=90=86=E3=82=92=E9=87=8D=E5=8A=9B=E9=A3=9B=E7=BF=94=E4=BD=93?= =?UTF-8?q?=E6=8A=BD=E8=B1=A1=E3=82=92=E7=B6=99=E6=89=BF=E3=81=99=E3=82=8B?= =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trigger/3.main.mcfunction | 6 ++-- .../trigger/shoot.mcfunction | 26 ++++++++++++++ .../_index.d.mcfunction | 7 ---- .../1053.flamethrower_ball/hit/.mcfunction | 28 +++++++++++++++ .../1053.flamethrower_ball/init/.mcfunction | 36 ------------------- .../range_over/.mcfunction | 9 +++++ .../register.mcfunction | 11 +++--- .../1053.flamethrower_ball/summon/.mcfunction | 8 ----- .../summon/debug.mcfunction | 10 ------ .../1053.flamethrower_ball/tick/.mcfunction | 11 ++---- .../tick/hit.mcfunction | 31 ---------------- .../object/alias/1053/hit.mcfunction | 8 +++++ .../object/alias/1053/init.mcfunction | 8 ----- .../object/alias/1053/range_over.mcfunction | 8 +++++ .../object/alias/1053/summon.mcfunction | 8 ----- 15 files changed, 90 insertions(+), 125 deletions(-) create mode 100644 Asset/data/asset/functions/artifact/1120.flamethrower/trigger/shoot.mcfunction delete mode 100644 Asset/data/asset/functions/object/1053.flamethrower_ball/_index.d.mcfunction create mode 100644 Asset/data/asset/functions/object/1053.flamethrower_ball/hit/.mcfunction delete mode 100644 Asset/data/asset/functions/object/1053.flamethrower_ball/init/.mcfunction create mode 100644 Asset/data/asset/functions/object/1053.flamethrower_ball/range_over/.mcfunction delete mode 100644 Asset/data/asset/functions/object/1053.flamethrower_ball/summon/.mcfunction delete mode 100644 Asset/data/asset/functions/object/1053.flamethrower_ball/summon/debug.mcfunction delete mode 100644 Asset/data/asset/functions/object/1053.flamethrower_ball/tick/hit.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1053/hit.mcfunction delete mode 100644 Asset/data/asset/functions/object/alias/1053/init.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1053/range_over.mcfunction delete mode 100644 Asset/data/asset/functions/object/alias/1053/summon.mcfunction diff --git a/Asset/data/asset/functions/artifact/1120.flamethrower/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1120.flamethrower/trigger/3.main.mcfunction index 564a038f48..5e957c5ecc 100644 --- a/Asset/data/asset/functions/artifact/1120.flamethrower/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1120.flamethrower/trigger/3.main.mcfunction @@ -12,7 +12,5 @@ # 演出 playsound entity.blaze.shoot player @a ~ ~ ~ 1 1 -# 召喚 - data modify storage api: Argument.ID set value 1053 - execute store result storage api: Argument.FieldOverride.UserID int 1 run scoreboard players get @s UserID - execute anchored eyes positioned ^ ^ ^1 run function api:object/summon +# + execute anchored eyes positioned ^ ^ ^1 run function asset:artifact/1120.flamethrower/trigger/shoot diff --git a/Asset/data/asset/functions/artifact/1120.flamethrower/trigger/shoot.mcfunction b/Asset/data/asset/functions/artifact/1120.flamethrower/trigger/shoot.mcfunction new file mode 100644 index 0000000000..c08d2de58b --- /dev/null +++ b/Asset/data/asset/functions/artifact/1120.flamethrower/trigger/shoot.mcfunction @@ -0,0 +1,26 @@ +#> asset:artifact/1120.flamethrower/trigger/shoot +# +# +# +# @within function asset:artifact/1120.flamethrower/trigger/3.main + +#> Private +# @private + #declare tag SpreadMarker + +# 前方拡散して召喚 + summon marker ~ ~ ~ {Tags:["SpreadMarker"]} + data modify storage lib: Argument.Distance set value 1 + data modify storage lib: Argument.Spread set value 0.3 + execute as @e[type=marker,tag=SpreadMarker,distance=..10,sort=nearest,limit=1] rotated as @p[tag=this] run function lib:forward_spreader/circle + +# 召喚 + data modify storage api: Argument.ID set value 1053 + data modify storage api: Argument.FieldOverride.Damage set value 112f + data modify storage api: Argument.FieldOverride.Tick set value 40f + data modify storage api: Argument.FieldOverride.Motion set value 1f + execute store result storage api: Argument.FieldOverride.UserID int 1 run scoreboard players get @s UserID + execute facing entity @e[type=marker,tag=SpreadMarker,sort=nearest,limit=1] eyes run function api:object/summon + +# リセット + kill @e[type=marker,tag=SpreadMarker,distance=..10] diff --git a/Asset/data/asset/functions/object/1053.flamethrower_ball/_index.d.mcfunction b/Asset/data/asset/functions/object/1053.flamethrower_ball/_index.d.mcfunction deleted file mode 100644 index aa9794e3c2..0000000000 --- a/Asset/data/asset/functions/object/1053.flamethrower_ball/_index.d.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> asset:object/1053.flamethrower_ball/_index.d -# @private - -#> tag -# @within function asset:object/1053.flamethrower_ball/** - #declare tag 1053.Snowball - #declare tag 1053.Init diff --git a/Asset/data/asset/functions/object/1053.flamethrower_ball/hit/.mcfunction b/Asset/data/asset/functions/object/1053.flamethrower_ball/hit/.mcfunction new file mode 100644 index 0000000000..cab77300fc --- /dev/null +++ b/Asset/data/asset/functions/object/1053.flamethrower_ball/hit/.mcfunction @@ -0,0 +1,28 @@ +#> asset:object/1053.flamethrower_ball/hit/ +# +# 継承先などから実行される処理 +# +# @within asset:object/alias/1053/hit + +#> private +# @private + #declare score_holder $UserID + +# super + function asset:object/super.method + +# 演出 + particle flame ~ ~ ~ 0 0 0 0.2 8 + particle lava ~ ~ ~ 0 0 0 1 6 + +# ダメージ + data modify storage api: Argument.Damage set from storage asset:context this.Damage + data modify storage api: Argument.AttackType set value "Physical" + data modify storage api: Argument.ElementType set value "Fire" + execute store result score $UserID Temporary run data get storage asset:context this.UserID + execute as @a if score @s UserID = $UserID Temporary run function api:damage/modifier + execute positioned ~-1.75 ~-1.75 ~-1.75 as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,dx=2.5,dy=2.5,dz=2.5] run function api:damage/ + function api:damage/reset + +# リセット + scoreboard players reset $UserID Temporary diff --git a/Asset/data/asset/functions/object/1053.flamethrower_ball/init/.mcfunction b/Asset/data/asset/functions/object/1053.flamethrower_ball/init/.mcfunction deleted file mode 100644 index 072f9f9e7c..0000000000 --- a/Asset/data/asset/functions/object/1053.flamethrower_ball/init/.mcfunction +++ /dev/null @@ -1,36 +0,0 @@ -#> asset:object/1053.flamethrower_ball/init/ -# -# Objectのinit時の処理 -# -# @within asset:object/alias/1053/init - -#> private -# @private - #declare score_holder $OwnerID - #declare tag SpreadMarker - #declare tag 1053.Owner - -# タグ付け。initタグくれよ - tag @s add 1053.Init - - execute store result score $OwnerID Temporary run data get storage asset:context this.UserID - execute at @a if score $OwnerID Temporary = @p UserID as @p run tag @s add 1053.Owner - -# 前方拡散してから - summon marker ~ ~ ~ {Tags:["SpreadMarker"]} - data modify storage lib: Argument.Distance set value 1 - data modify storage lib: Argument.Spread set value 0.3 - execute as @e[type=marker,tag=SpreadMarker,distance=..10,sort=nearest,limit=1] rotated as @p[tag=1053.Owner] run function lib:forward_spreader/circle - -# モーションでぶっ飛ばす。飛ぶのは下の雪玉 - data modify storage lib: Argument.VectorMagnitude set value 1 - execute facing entity @e[type=marker,tag=SpreadMarker,distance=..10,sort=nearest,limit=1] feet as @e[type=snowball,tag=1053.Snowball,tag=1053.Init,distance=..3,sort=nearest,limit=1] run function lib:motion/ - data remove storage lib: Argument - -# タグ消す - tag @s remove 1053.Init - tag @p[tag=1053.Owner] remove 1053.Owner - tag @e[type=snowball,tag=1053.Snowball,tag=1053.Init,distance=..3,sort=nearest,limit=1] remove 1053.Init - -# リセット - kill @e[type=marker,tag=SpreadMarker,distance=..10] diff --git a/Asset/data/asset/functions/object/1053.flamethrower_ball/range_over/.mcfunction b/Asset/data/asset/functions/object/1053.flamethrower_ball/range_over/.mcfunction new file mode 100644 index 0000000000..4633fa9bef --- /dev/null +++ b/Asset/data/asset/functions/object/1053.flamethrower_ball/range_over/.mcfunction @@ -0,0 +1,9 @@ +#> asset:object/1053.flamethrower_ball/range_over/ +# +# 継承先などから実行される処理 +# +# @within asset:object/alias/1053/range_over + +# 消滅 + execute on vehicle run kill @s + kill @s diff --git a/Asset/data/asset/functions/object/1053.flamethrower_ball/register.mcfunction b/Asset/data/asset/functions/object/1053.flamethrower_ball/register.mcfunction index 406587a95b..5a241e293c 100644 --- a/Asset/data/asset/functions/object/1053.flamethrower_ball/register.mcfunction +++ b/Asset/data/asset/functions/object/1053.flamethrower_ball/register.mcfunction @@ -5,14 +5,17 @@ # @within function asset:object/alias/1053/register # 継承(オプション) - # data modify storage asset:object Extends append value - # function asset:object/extends + data modify storage asset:object Extends append value 5 + function asset:object/extends # 他のモブに継承されることを許可するか (boolean) (オプション) - # data modify storage asset:object ExtendsSafe set value + # data modify storage asset:object ExtendsSafe set value # 継承されることを前提とした、抽象的なオブジェクトであるかどうか(boolean) data modify storage asset:object IsAbstract set value false # ID (int) data modify storage asset:object ID set value 1053 # フィールド(オプション) - # data modify storage asset:object Field.myValue set value \ No newline at end of file + data modify storage asset:object Field.Motion set value 1f + data modify storage asset:object Field.Tick set value 40 + data modify storage asset:object Field.Damage set value 1 + data modify storage asset:object Field.UserID set value -1 diff --git a/Asset/data/asset/functions/object/1053.flamethrower_ball/summon/.mcfunction b/Asset/data/asset/functions/object/1053.flamethrower_ball/summon/.mcfunction deleted file mode 100644 index d377c321c9..0000000000 --- a/Asset/data/asset/functions/object/1053.flamethrower_ball/summon/.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset:object/1053.flamethrower_ball/summon/ -# -# Object召喚処理の呼び出し時に実行されるfunction -# -# @within asset:object/alias/1053/summon - -# 元となるEntityを召喚する - summon snowball ~ ~ ~ {Silent:1b,Tags:["1053.Snowball","1053.Init"],Passengers:[{id:"minecraft:marker",Tags:["ObjectInit"]}],Item:{id:"minecraft:stone",Count:1b,tag:{CustomModelData:20019}}} diff --git a/Asset/data/asset/functions/object/1053.flamethrower_ball/summon/debug.mcfunction b/Asset/data/asset/functions/object/1053.flamethrower_ball/summon/debug.mcfunction deleted file mode 100644 index 411a8478e8..0000000000 --- a/Asset/data/asset/functions/object/1053.flamethrower_ball/summon/debug.mcfunction +++ /dev/null @@ -1,10 +0,0 @@ -#> asset:object/1053.flamethrower_ball/summon/debug -# -# 動作チェック用の召喚処理 使い終わったら消してもいいかも -# -# @user -# @private - -# 召喚 - data modify storage api: Argument.ID set value 1053 - function api:object/summon \ No newline at end of file diff --git a/Asset/data/asset/functions/object/1053.flamethrower_ball/tick/.mcfunction b/Asset/data/asset/functions/object/1053.flamethrower_ball/tick/.mcfunction index bf0b53fd7c..d39018e2cc 100644 --- a/Asset/data/asset/functions/object/1053.flamethrower_ball/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1053.flamethrower_ball/tick/.mcfunction @@ -4,15 +4,8 @@ # # @within asset:object/alias/1053/tick -# Tick加算 - scoreboard players add @s General.Object.Tick 1 - # 演出 particle flame ~ ~ ~ 0 0 0 0 0 -# 雪玉がいない場合ヒット - execute unless predicate lib:is_vehicle run function asset:object/1053.flamethrower_ball/tick/hit - -# 消滅処理 - execute if score @s General.Object.Tick matches 40.. run kill @e[type=snowball,tag=1053.Snowball,distance=..1,sort=nearest,limit=1] - kill @s[scores={General.Object.Tick=40..}] +# super.tick + execute at @s run function asset:object/super.tick diff --git a/Asset/data/asset/functions/object/1053.flamethrower_ball/tick/hit.mcfunction b/Asset/data/asset/functions/object/1053.flamethrower_ball/tick/hit.mcfunction deleted file mode 100644 index aae60201f6..0000000000 --- a/Asset/data/asset/functions/object/1053.flamethrower_ball/tick/hit.mcfunction +++ /dev/null @@ -1,31 +0,0 @@ -#> asset:object/1053.flamethrower_ball/tick/hit -# -# -# -# @within function asset:object/1053.flamethrower_ball/tick/ - -#> private -# @private - #declare score_holder $OwnerID - -# 演出 - particle flame ~ ~ ~ 0 0 0 0.2 8 - particle lava ~ ~ ~ 0 0 0 1 6 - -# ダメージを与える -# ダメージ設定 - # 与えるダメージ - data modify storage api: Argument.Damage set value 112.0f - # 物理属性 - data modify storage api: Argument.AttackType set value "Physical" - # 属性 - data modify storage api: Argument.ElementType set value "Fire" - # ダメージ - execute store result score $OwnerID Temporary run data get storage asset:context this.UserID - execute at @a if score $OwnerID Temporary = @p UserID as @p run function api:damage/modifier - execute positioned ~-1.75 ~-1.75 ~-1.75 as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,dx=2.5,dy=2.5,dz=2.5] run function api:damage/ -# リセット - function api:damage/reset - scoreboard players reset $OwnerID Temporary - -kill @s diff --git a/Asset/data/asset/functions/object/alias/1053/hit.mcfunction b/Asset/data/asset/functions/object/alias/1053/hit.mcfunction new file mode 100644 index 0000000000..d6cee32523 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1053/hit.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1053/hit +# +# メソッド処理のエイリアス +# +# @within asset_manager:object/call_method/run_method.m + +# 元のメソッド処理を呼び出す + function asset:object/1053.flamethrower_ball/hit/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1053/init.mcfunction b/Asset/data/asset/functions/object/alias/1053/init.mcfunction deleted file mode 100644 index a99f18bf12..0000000000 --- a/Asset/data/asset/functions/object/alias/1053/init.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset:object/alias/1053/init -# -# Init処理のエイリアス -# -# @within asset_manager:object/init/init.m - -# 元のInit処理を呼び出す - function asset:object/1053.flamethrower_ball/init/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1053/range_over.mcfunction b/Asset/data/asset/functions/object/alias/1053/range_over.mcfunction new file mode 100644 index 0000000000..a7db488f5a --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1053/range_over.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1053/range_over +# +# メソッド処理のエイリアス +# +# @within asset_manager:object/call_method/run_method.m + +# 元のメソッド処理を呼び出す + function asset:object/1053.flamethrower_ball/range_over/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1053/summon.mcfunction b/Asset/data/asset/functions/object/alias/1053/summon.mcfunction deleted file mode 100644 index 7eb984527e..0000000000 --- a/Asset/data/asset/functions/object/alias/1053/summon.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset:object/alias/1053/summon -# -# Object召喚処理のエイリアス -# -# @within asset_manager:object/summon/summon.m - -# 元の召喚処理を呼び出す - function asset:object/1053.flamethrower_ball/summon/ \ No newline at end of file From 792332a835755e379d6c76a1e2f25da48d431adc Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Sat, 3 Jan 2026 13:51:36 +0900 Subject: [PATCH 04/14] =?UTF-8?q?[Artifact=201206,=20Object=201106]=20?= =?UTF-8?q?=E3=83=88=E3=83=AA=E3=83=97=E3=83=AB=E3=82=B9=E3=83=91=E3=83=BC?= =?UTF-8?q?=E3=82=AF=E3=83=AB=E3=83=9C=E3=83=A0=E3=81=AE=E5=87=A6=E7=90=86?= =?UTF-8?q?=E3=82=92=E9=87=8D=E5=8A=9B=E9=A3=9B=E7=BF=94=E4=BD=93=E6=8A=BD?= =?UTF-8?q?=E8=B1=A1=E3=82=92=E7=B6=99=E6=89=BF=E3=81=99=E3=82=8B=E3=82=88?= =?UTF-8?q?=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trigger/throw_bomb.mcfunction | 1 + .../{tick/boom.mcfunction => hit/.mcfunction} | 13 ++++++------- .../object/1106.sparkle_bomb/init/.mcfunction | 12 ------------ .../object/1106.sparkle_bomb/register.mcfunction | 5 +++-- .../object/1106.sparkle_bomb/tick/.mcfunction | 8 ++------ .../functions/object/alias/1106/hit.mcfunction | 8 ++++++++ .../functions/object/alias/1106/init.mcfunction | 8 -------- 7 files changed, 20 insertions(+), 35 deletions(-) rename Asset/data/asset/functions/object/1106.sparkle_bomb/{tick/boom.mcfunction => hit/.mcfunction} (87%) delete mode 100644 Asset/data/asset/functions/object/1106.sparkle_bomb/init/.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1106/hit.mcfunction delete mode 100644 Asset/data/asset/functions/object/alias/1106/init.mcfunction diff --git a/Asset/data/asset/functions/artifact/1206.triple_sparkle_bomb/trigger/throw_bomb.mcfunction b/Asset/data/asset/functions/artifact/1206.triple_sparkle_bomb/trigger/throw_bomb.mcfunction index 974dba86a0..53bb5790be 100644 --- a/Asset/data/asset/functions/artifact/1206.triple_sparkle_bomb/trigger/throw_bomb.mcfunction +++ b/Asset/data/asset/functions/artifact/1206.triple_sparkle_bomb/trigger/throw_bomb.mcfunction @@ -25,6 +25,7 @@ # Object召喚 data modify storage api: Argument.ID set value 1106 data modify storage api: Argument.FieldOverride.Damage set value 175 + data modify storage api: Argument.FieldOverride.Tick set value 60 execute store result storage api: Argument.FieldOverride.UserID int 1 run scoreboard players get @s UserID execute facing entity @e[type=marker,tag=SpreadMarker,distance=..10,limit=1] eyes run function api:object/summon diff --git a/Asset/data/asset/functions/object/1106.sparkle_bomb/tick/boom.mcfunction b/Asset/data/asset/functions/object/1106.sparkle_bomb/hit/.mcfunction similarity index 87% rename from Asset/data/asset/functions/object/1106.sparkle_bomb/tick/boom.mcfunction rename to Asset/data/asset/functions/object/1106.sparkle_bomb/hit/.mcfunction index 883bdab94a..c0d8ef48a2 100644 --- a/Asset/data/asset/functions/object/1106.sparkle_bomb/tick/boom.mcfunction +++ b/Asset/data/asset/functions/object/1106.sparkle_bomb/hit/.mcfunction @@ -1,13 +1,16 @@ -#> asset:object/1106.sparkle_bomb/tick/boom +#> asset:object/1106.sparkle_bomb/hit/ # +# 継承先などから実行される処理 # -# -# @within function asset:object/1106.sparkle_bomb/tick/ +# @within asset:object/alias/1106/hit #> Private # @private #declare score_holder $UserID +# super + function asset:object/super.method + # 演出　 particle firework ~ ~ ~ 0 0 0 0.3 45 force @a[distance=..48] particle dust 0.2 1 1 1.5 ~ ~ ~ 1 1 1 0 40 force @a[distance=..48] @@ -28,7 +31,3 @@ # リセット scoreboard players reset $UserID Temporary - -# 消滅 - execute on vehicle run kill @s - kill @s diff --git a/Asset/data/asset/functions/object/1106.sparkle_bomb/init/.mcfunction b/Asset/data/asset/functions/object/1106.sparkle_bomb/init/.mcfunction deleted file mode 100644 index da2096866b..0000000000 --- a/Asset/data/asset/functions/object/1106.sparkle_bomb/init/.mcfunction +++ /dev/null @@ -1,12 +0,0 @@ -#> asset:object/1106.sparkle_bomb/init/ -# -# Objectのinit時の処理 -# -# @within asset:object/alias/1106/init - -# Motion - data modify storage lib: Argument.VectorMagnitude set from storage asset:context this.Motion - execute on vehicle run function lib:motion/ - -# 描画更新 - execute on vehicle run damage @s 1 diff --git a/Asset/data/asset/functions/object/1106.sparkle_bomb/register.mcfunction b/Asset/data/asset/functions/object/1106.sparkle_bomb/register.mcfunction index fec46abf57..919cfc913e 100644 --- a/Asset/data/asset/functions/object/1106.sparkle_bomb/register.mcfunction +++ b/Asset/data/asset/functions/object/1106.sparkle_bomb/register.mcfunction @@ -5,8 +5,8 @@ # @within function asset:object/alias/1106/register # 継承(オプション) - # data modify storage asset:object Extends append value - # function asset:object/extends + data modify storage asset:object Extends append value 5 + function asset:object/extends # 他のObjectに継承されることを許可するか (boolean) (オプション) # data modify storage asset:object ExtendsSafe set value # 継承されることを前提とした、抽象的なObjectであるかどうか(boolean) @@ -18,6 +18,7 @@ data modify storage asset:object ID set value 1106 # フィールド(オプション) data modify storage asset:object Field.Motion set value 1.2 + data modify storage asset:object Field.Tick set value 60 data modify storage asset:object Field.LeftRotate set value false data modify storage asset:object Field.Damage set value 1 data modify storage asset:object Field.UserID set value -1 diff --git a/Asset/data/asset/functions/object/1106.sparkle_bomb/tick/.mcfunction b/Asset/data/asset/functions/object/1106.sparkle_bomb/tick/.mcfunction index 67d19577d4..36d0d5c898 100644 --- a/Asset/data/asset/functions/object/1106.sparkle_bomb/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1106.sparkle_bomb/tick/.mcfunction @@ -4,9 +4,6 @@ # # @within asset:object/alias/1106/tick -# Tick加算 - scoreboard players add @s General.Object.Tick 1 - # vfx particle dust 0.2 1 1 1 ~ ~ ~ 0.1 0.1 0.1 0 1 normal @@ -15,6 +12,5 @@ execute unless data storage asset:context this{LeftRotate:true} run tp @s ~ ~ ~ ~22.5 ~ execute if data storage asset:context this{LeftRotate:true} run tp @s ~ ~ ~ ~-22.5 ~ -# 消滅処理 - execute unless predicate lib:is_vehicle run function asset:object/1106.sparkle_bomb/tick/boom - execute if score @s General.Object.Tick matches 60.. if entity @s run function asset:object/1106.sparkle_bomb/tick/boom +# super + execute at @s run function asset:object/super.tick diff --git a/Asset/data/asset/functions/object/alias/1106/hit.mcfunction b/Asset/data/asset/functions/object/alias/1106/hit.mcfunction new file mode 100644 index 0000000000..ad983a7b38 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1106/hit.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1106/hit +# +# メソッド処理のエイリアス +# +# @within asset_manager:object/call_method/run_method.m + +# 元のメソッド処理を呼び出す + function asset:object/1106.sparkle_bomb/hit/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1106/init.mcfunction b/Asset/data/asset/functions/object/alias/1106/init.mcfunction deleted file mode 100644 index 278f82ddd9..0000000000 --- a/Asset/data/asset/functions/object/alias/1106/init.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset:object/alias/1106/init -# -# Init処理のエイリアス -# -# @within asset_manager:object/init/init.m - -# 元のInit処理を呼び出す - function asset:object/1106.sparkle_bomb/init/ \ No newline at end of file From 436439ee4aaec4328be64d759fde0c9c5bd9fb23 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Sat, 3 Jan 2026 14:34:59 +0900 Subject: [PATCH 05/14] =?UTF-8?q?[Artifact=201197,=201110]=20=E3=83=98?= =?UTF-8?q?=E3=83=B4=E3=82=A3=E3=83=A9=E3=83=B4=E3=82=A1=E3=83=9C=E3=83=A0?= =?UTF-8?q?=E3=81=AE=E5=87=A6=E7=90=86=E3=82=92=E9=87=8D=E5=8A=9B=E9=A3=9B?= =?UTF-8?q?=E7=BF=94=E4=BD=93=E6=8A=BD=E8=B1=A1=E3=82=92=E7=B6=99=E6=89=BF?= =?UTF-8?q?=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trigger/throw_bomb.mcfunction | 2 ++ .../1110.heavy_lava_bomb/hit/.mcfunction | 14 ++++++++++ .../1110.heavy_lava_bomb/init/.mcfunction | 12 -------- .../1110.heavy_lava_bomb/register.mcfunction | 8 ++++-- .../1110.heavy_lava_bomb/tick/.mcfunction | 15 ++++------ .../tick/before_boom.mcfunction | 28 +++++++++---------- .../object/alias/1110/hit.mcfunction | 8 ++++++ .../object/alias/1110/init.mcfunction | 8 ------ 8 files changed, 49 insertions(+), 46 deletions(-) create mode 100644 Asset/data/asset/functions/object/1110.heavy_lava_bomb/hit/.mcfunction delete mode 100644 Asset/data/asset/functions/object/1110.heavy_lava_bomb/init/.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1110/hit.mcfunction delete mode 100644 Asset/data/asset/functions/object/alias/1110/init.mcfunction diff --git a/Asset/data/asset/functions/artifact/1197.heavy_lava_bomb/trigger/throw_bomb.mcfunction b/Asset/data/asset/functions/artifact/1197.heavy_lava_bomb/trigger/throw_bomb.mcfunction index b963f7bdeb..ebeeb60df0 100644 --- a/Asset/data/asset/functions/artifact/1197.heavy_lava_bomb/trigger/throw_bomb.mcfunction +++ b/Asset/data/asset/functions/artifact/1197.heavy_lava_bomb/trigger/throw_bomb.mcfunction @@ -23,6 +23,8 @@ # Object召喚 data modify storage api: Argument.ID set value 1110 data modify storage api: Argument.FieldOverride.Damage set value 450 + data modify storage api: Argument.FieldOverride.Tick set value 60 + data modify storage api: Argument.FieldOverride.Motion set value 1f execute store result storage api: Argument.FieldOverride.UserID int 1 run scoreboard players get @s UserID execute facing entity @e[type=marker,tag=SpreadMarker,distance=..10,limit=1] eyes run function api:object/summon diff --git a/Asset/data/asset/functions/object/1110.heavy_lava_bomb/hit/.mcfunction b/Asset/data/asset/functions/object/1110.heavy_lava_bomb/hit/.mcfunction new file mode 100644 index 0000000000..8c66c731bf --- /dev/null +++ b/Asset/data/asset/functions/object/1110.heavy_lava_bomb/hit/.mcfunction @@ -0,0 +1,14 @@ +#> asset:object/1110.heavy_lava_bomb/hit/ +# +# 継承先などから実行される処理 +# +# @within asset:object/alias/1110/hit + +# 一度しか実行されないようにする + execute if data storage asset:context this{AlreadyHit:true} run return fail + +# 雪玉を消し飛ばす + execute on vehicle run kill @s + +# ヒット判定 + data modify storage asset:context this.AlreadyHit set value true diff --git a/Asset/data/asset/functions/object/1110.heavy_lava_bomb/init/.mcfunction b/Asset/data/asset/functions/object/1110.heavy_lava_bomb/init/.mcfunction deleted file mode 100644 index 46f634b80f..0000000000 --- a/Asset/data/asset/functions/object/1110.heavy_lava_bomb/init/.mcfunction +++ /dev/null @@ -1,12 +0,0 @@ -#> asset:object/1110.heavy_lava_bomb/init/ -# -# Objectのinit時の処理 -# -# @within asset:object/alias/1110/init - -# Motion - data modify storage lib: Argument.VectorMagnitude set from storage asset:context this.Motion - execute on vehicle run function lib:motion/ - -# 描画更新 - execute on vehicle run damage @s 1 diff --git a/Asset/data/asset/functions/object/1110.heavy_lava_bomb/register.mcfunction b/Asset/data/asset/functions/object/1110.heavy_lava_bomb/register.mcfunction index ec4bc2f793..ec4f8357bf 100644 --- a/Asset/data/asset/functions/object/1110.heavy_lava_bomb/register.mcfunction +++ b/Asset/data/asset/functions/object/1110.heavy_lava_bomb/register.mcfunction @@ -5,8 +5,8 @@ # @within function asset:object/alias/1110/register # 継承(オプション) - # data modify storage asset:object Extends append value - # function asset:object/extends + data modify storage asset:object Extends append value 5 + function asset:object/extends # 他のObjectに継承されることを許可するか (boolean) (オプション) # data modify storage asset:object ExtendsSafe set value # 継承されることを前提とした、抽象的なObjectであるかどうか(boolean) @@ -17,7 +17,9 @@ # ID (int) data modify storage asset:object ID set value 1110 # フィールド(オプション) - data modify storage asset:object Field.Motion set value 1 + data modify storage asset:object Field.Motion set value 1f + data modify storage asset:object Field.Tick set value 60 data modify storage asset:object Field.LeftRotate set value false + data modify storage asset:object Field.AlreadyHit set value false data modify storage asset:object Field.Damage set value 1 data modify storage asset:object Field.UserID set value -1 diff --git a/Asset/data/asset/functions/object/1110.heavy_lava_bomb/tick/.mcfunction b/Asset/data/asset/functions/object/1110.heavy_lava_bomb/tick/.mcfunction index d91d3e30d4..08b6e4937d 100644 --- a/Asset/data/asset/functions/object/1110.heavy_lava_bomb/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1110.heavy_lava_bomb/tick/.mcfunction @@ -8,8 +8,8 @@ # @private #declare tag 1110.NoVehicle -# Tick加算 - scoreboard players add @s General.Object.Tick 1 +# 既にヒットしたならTick加算 + execute if data storage asset:context this{AlreadyHit:true} run scoreboard players add @s General.Object.Tick 1 # 雪玉がいる間のvfx execute if predicate lib:is_vehicle run particle dust 1 0.45 0.1 1.2 ~ ~ ~ 0.1 0.1 0.1 0 2 normal @a @@ -19,14 +19,11 @@ execute unless data storage asset:context this{LeftRotate:true} run tp @s ~ ~ ~ ~5 ~ execute if data storage asset:context this{LeftRotate:true} run tp @s ~ ~ ~ ~-5 ~ -# 一定Tick以上経ったら雪玉をkill - execute if score @s General.Object.Tick matches 60.. on vehicle run kill @s - -# 雪玉がいなくなったらスコアを1000まで持っていく - execute unless score @s General.Object.Tick matches 1000.. unless predicate lib:is_vehicle run scoreboard players set @s General.Object.Tick 1000 +# super.tick + execute at @s run function asset:object/super.tick # 爆発前の諸々 - execute if score @s General.Object.Tick matches 1000.. run function asset:object/1110.heavy_lava_bomb/tick/before_boom + execute if score @s General.Object.Tick matches 1.. run function asset:object/1110.heavy_lava_bomb/tick/before_boom # 爆発 - execute if score @s General.Object.Tick matches 1024.. run function asset:object/1110.heavy_lava_bomb/tick/boom + execute if score @s General.Object.Tick matches 24.. run function asset:object/1110.heavy_lava_bomb/tick/boom diff --git a/Asset/data/asset/functions/object/1110.heavy_lava_bomb/tick/before_boom.mcfunction b/Asset/data/asset/functions/object/1110.heavy_lava_bomb/tick/before_boom.mcfunction index ff357a55be..54aae617e6 100644 --- a/Asset/data/asset/functions/object/1110.heavy_lava_bomb/tick/before_boom.mcfunction +++ b/Asset/data/asset/functions/object/1110.heavy_lava_bomb/tick/before_boom.mcfunction @@ -10,20 +10,20 @@ execute if predicate lib:is_in_water/include_flowing if block ~ ~-0.1 ~ #lib:no_collision run tp @s ~ ~-0.1 ~ # 膨らむ - execute if entity @s[scores={General.Object.Tick=1003}] run playsound entity.puffer_fish.blow_up neutral @a ~ ~ ~ 0.8 1 - execute if entity @s[scores={General.Object.Tick=1003}] run data modify entity @s start_interpolation set value 0 - execute if entity @s[scores={General.Object.Tick=1003}] run data modify entity @s interpolation_duration set value 3 - execute if entity @s[scores={General.Object.Tick=1003}] run data modify entity @s transformation.scale set value [2.5f,2.5f,2.5f] + execute if entity @s[scores={General.Object.Tick=3}] run playsound entity.puffer_fish.blow_up neutral @a ~ ~ ~ 0.8 1 + execute if entity @s[scores={General.Object.Tick=3}] run data modify entity @s start_interpolation set value 0 + execute if entity @s[scores={General.Object.Tick=3}] run data modify entity @s interpolation_duration set value 3 + execute if entity @s[scores={General.Object.Tick=3}] run data modify entity @s transformation.scale set value [2.5f,2.5f,2.5f] - execute if entity @s[scores={General.Object.Tick=1006}] run data modify entity @s start_interpolation set value 0 - execute if entity @s[scores={General.Object.Tick=1006}] run data modify entity @s interpolation_duration set value 2 - execute if entity @s[scores={General.Object.Tick=1006}] run data modify entity @s transformation.scale set value [1.5f,1.5f,1.5f] + execute if entity @s[scores={General.Object.Tick=6}] run data modify entity @s start_interpolation set value 0 + execute if entity @s[scores={General.Object.Tick=6}] run data modify entity @s interpolation_duration set value 2 + execute if entity @s[scores={General.Object.Tick=6}] run data modify entity @s transformation.scale set value [1.5f,1.5f,1.5f] - execute if entity @s[scores={General.Object.Tick=1013}] run playsound entity.puffer_fish.blow_up neutral @a ~ ~ ~ 0.8 0.8 - execute if entity @s[scores={General.Object.Tick=1013}] run data modify entity @s start_interpolation set value 0 - execute if entity @s[scores={General.Object.Tick=1013}] run data modify entity @s interpolation_duration set value 3 - execute if entity @s[scores={General.Object.Tick=1013}] run data modify entity @s transformation.scale set value [5.0f,5.0f,5.0f] + execute if entity @s[scores={General.Object.Tick=13}] run playsound entity.puffer_fish.blow_up neutral @a ~ ~ ~ 0.8 0.8 + execute if entity @s[scores={General.Object.Tick=13}] run data modify entity @s start_interpolation set value 0 + execute if entity @s[scores={General.Object.Tick=13}] run data modify entity @s interpolation_duration set value 3 + execute if entity @s[scores={General.Object.Tick=13}] run data modify entity @s transformation.scale set value [5.0f,5.0f,5.0f] - execute if entity @s[scores={General.Object.Tick=1016}] run data modify entity @s start_interpolation set value 0 - execute if entity @s[scores={General.Object.Tick=1016}] run data modify entity @s interpolation_duration set value 3 - execute if entity @s[scores={General.Object.Tick=1016}] run data modify entity @s transformation.scale set value [3.2f,3.2f,3.2f] + execute if entity @s[scores={General.Object.Tick=16}] run data modify entity @s start_interpolation set value 0 + execute if entity @s[scores={General.Object.Tick=16}] run data modify entity @s interpolation_duration set value 3 + execute if entity @s[scores={General.Object.Tick=16}] run data modify entity @s transformation.scale set value [3.2f,3.2f,3.2f] diff --git a/Asset/data/asset/functions/object/alias/1110/hit.mcfunction b/Asset/data/asset/functions/object/alias/1110/hit.mcfunction new file mode 100644 index 0000000000..47e6a03e37 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1110/hit.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1110/hit +# +# メソッド処理のエイリアス +# +# @within asset_manager:object/call_method/run_method.m + +# 元のメソッド処理を呼び出す + function asset:object/1110.heavy_lava_bomb/hit/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1110/init.mcfunction b/Asset/data/asset/functions/object/alias/1110/init.mcfunction deleted file mode 100644 index de1306b250..0000000000 --- a/Asset/data/asset/functions/object/alias/1110/init.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset:object/alias/1110/init -# -# Init処理のエイリアス -# -# @within asset_manager:object/init/init.m - -# 元のInit処理を呼び出す - function asset:object/1110.heavy_lava_bomb/init/ \ No newline at end of file From 4b4b13d50048cf9eb25b9e5e814e9869eb1c3f10 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Sat, 3 Jan 2026 14:42:23 +0900 Subject: [PATCH 06/14] =?UTF-8?q?[Artifact=201120,=20Object=201053]=20?= =?UTF-8?q?=E7=81=AB=E7=82=8E=E6=94=BE=E5=B0=84=E5=99=A8=E3=81=AE=E6=94=BB?= =?UTF-8?q?=E6=92=83=E5=AF=BE=E8=B1=A1=E3=81=8C=E5=8D=98=E4=BD=93=E3=81=A7?= =?UTF-8?q?=E3=81=AA=E3=81=84=E5=95=8F=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/1053.flamethrower_ball/hit/.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/object/1053.flamethrower_ball/hit/.mcfunction b/Asset/data/asset/functions/object/1053.flamethrower_ball/hit/.mcfunction index cab77300fc..d487f1e7ab 100644 --- a/Asset/data/asset/functions/object/1053.flamethrower_ball/hit/.mcfunction +++ b/Asset/data/asset/functions/object/1053.flamethrower_ball/hit/.mcfunction @@ -21,7 +21,7 @@ data modify storage api: Argument.ElementType set value "Fire" execute store result score $UserID Temporary run data get storage asset:context this.UserID execute as @a if score @s UserID = $UserID Temporary run function api:damage/modifier - execute positioned ~-1.75 ~-1.75 ~-1.75 as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,dx=2.5,dy=2.5,dz=2.5] run function api:damage/ + execute positioned ~-1.75 ~-1.75 ~-1.75 as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=2.5,dy=2.5,dz=2.5,sort=random,limit=1] run function api:damage/ function api:damage/reset # リセット From ccf25582674f5879dfbf1bba5c05dbf5f14e99fb Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Sat, 3 Jan 2026 16:24:28 +0900 Subject: [PATCH 07/14] =?UTF-8?q?[Artifact=201037,=20Object=201041]=20?= =?UTF-8?q?=E3=82=B0=E3=83=A9=E3=83=B3=E3=83=89=E3=83=BB=E3=83=95=E3=83=AC?= =?UTF-8?q?=E3=82=A4=E3=83=A0=E3=81=AE=E5=87=A6=E7=90=86=E3=82=92=E9=87=8D?= =?UTF-8?q?=E5=8A=9B=E9=A3=9B=E7=BF=94=E4=BD=93=E6=8A=BD=E8=B1=A1=E3=82=92?= =?UTF-8?q?=E7=B6=99=E6=89=BF=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trigger/3.main.mcfunction | 1 + .../landing.mcfunction => hit/.mcfunction} | 26 +++++++------------ .../{tick/vfx/landing => hit/vfx}/.mcfunction | 4 +-- .../hit/vfx/random.m.mcfunction | 9 +++++++ .../vfx/landing => hit/vfx}/random.mcfunction | 4 +-- .../object/1041.grand_flame/init/.mcfunction | 9 ------- .../1041.grand_flame/register.mcfunction | 5 ++-- .../1041.grand_flame/summon/.mcfunction | 11 -------- .../1041.grand_flame/summon/m.mcfunction | 7 ----- .../object/1041.grand_flame/tick/.mcfunction | 10 +++---- .../{vfx/flying.mcfunction => vfx.mcfunction} | 2 +- .../tick/vfx/landing/random.m.mcfunction | 9 ------- .../object/alias/1041/hit.mcfunction | 8 ++++++ .../object/alias/1041/init.mcfunction | 8 ------ .../object/alias/1041/summon.mcfunction | 8 ------ 15 files changed, 39 insertions(+), 82 deletions(-) rename Asset/data/asset/functions/object/1041.grand_flame/{tick/landing.mcfunction => hit/.mcfunction} (63%) rename Asset/data/asset/functions/object/1041.grand_flame/{tick/vfx/landing => hit/vfx}/.mcfunction (99%) create mode 100644 Asset/data/asset/functions/object/1041.grand_flame/hit/vfx/random.m.mcfunction rename Asset/data/asset/functions/object/1041.grand_flame/{tick/vfx/landing => hit/vfx}/random.mcfunction (98%) delete mode 100644 Asset/data/asset/functions/object/1041.grand_flame/init/.mcfunction delete mode 100644 Asset/data/asset/functions/object/1041.grand_flame/summon/.mcfunction delete mode 100644 Asset/data/asset/functions/object/1041.grand_flame/summon/m.mcfunction rename Asset/data/asset/functions/object/1041.grand_flame/tick/{vfx/flying.mcfunction => vfx.mcfunction} (98%) delete mode 100644 Asset/data/asset/functions/object/1041.grand_flame/tick/vfx/landing/random.m.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1041/hit.mcfunction delete mode 100644 Asset/data/asset/functions/object/alias/1041/init.mcfunction delete mode 100644 Asset/data/asset/functions/object/alias/1041/summon.mcfunction diff --git a/Asset/data/asset/functions/artifact/1037.grand_flame/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1037.grand_flame/trigger/3.main.mcfunction index e8b700e8c4..7fcbdaa05d 100644 --- a/Asset/data/asset/functions/artifact/1037.grand_flame/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1037.grand_flame/trigger/3.main.mcfunction @@ -28,6 +28,7 @@ # Object召喚 data modify storage api: Argument.ID set value 1041 + data modify storage api: Argument.FieldOverride.Tick set value 100 data modify storage api: Argument.FieldOverride.Motion set value 1.5 execute store result storage api: Argument.FieldOverride.Damage int 1 run scoreboard players get $Damage Temporary execute store result storage api: Argument.FieldOverride.UserID int 1 run scoreboard players get @s UserID diff --git a/Asset/data/asset/functions/object/1041.grand_flame/tick/landing.mcfunction b/Asset/data/asset/functions/object/1041.grand_flame/hit/.mcfunction similarity index 63% rename from Asset/data/asset/functions/object/1041.grand_flame/tick/landing.mcfunction rename to Asset/data/asset/functions/object/1041.grand_flame/hit/.mcfunction index 5ce6543b40..e3c9100bfa 100644 --- a/Asset/data/asset/functions/object/1041.grand_flame/tick/landing.mcfunction +++ b/Asset/data/asset/functions/object/1041.grand_flame/hit/.mcfunction @@ -1,37 +1,35 @@ -#> asset:object/1041.grand_flame/tick/landing +#> asset:object/1041.grand_flame/hit/ # +# 継承先などから実行される処理 # -# -# @within function asset:object/1041.grand_flame/tick/ +# @within asset:object/alias/1041/hit #> Private # @private - #declare tag 1041.Already #declare score_holder $UserID -# 1度しか実行されないように - execute if entity @s[tag=1041.Already] run return fail - tag @s add 1041.Already +# super + function asset:object/super.method # playsound playsound entity.wither.shoot player @a[distance=..32] ~ ~ ~ 2 0.6 playsound entity.generic.explode player @a[distance=..32] ~ ~ ~ 2 1 # 演出(球体) - function asset:object/1041.grand_flame/tick/vfx/landing/ + function asset:object/1041.grand_flame/hit/vfx/ # 演出(ランダム) x3 execute store result storage asset:temp Args.Yaw float 0.01 run random value 0..35999 execute store result storage asset:temp Args.Pitch float 0.01 run random value 0..35999 - function asset:object/1041.grand_flame/tick/vfx/landing/random.m with storage asset:temp Args + function asset:object/1041.grand_flame/hit/vfx/random.m with storage asset:temp Args execute store result storage asset:temp Args.Yaw float 0.01 run random value 0..35999 execute store result storage asset:temp Args.Pitch float 0.01 run random value 0..35999 - function asset:object/1041.grand_flame/tick/vfx/landing/random.m with storage asset:temp Args + function asset:object/1041.grand_flame/hit/vfx/random.m with storage asset:temp Args execute store result storage asset:temp Args.Yaw float 0.01 run random value 0..35999 execute store result storage asset:temp Args.Pitch float 0.01 run random value 0..35999 - function asset:object/1041.grand_flame/tick/vfx/landing/random.m with storage asset:temp Args + function asset:object/1041.grand_flame/hit/vfx/random.m with storage asset:temp Args # ダメージ data modify storage api: Argument.Damage set from storage asset:context this.Damage @@ -39,13 +37,9 @@ data modify storage api: Argument.ElementType set value "Fire" execute store result score $UserID Temporary run data get storage asset:context this.UserID execute as @a if score @s UserID = $UserID Temporary run function api:damage/modifier - execute as @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,distance=..5] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..5] run function api:damage/ function api:damage/reset # リセット data remove storage asset:temp Args scoreboard players reset $UserID Temporary - -# 消滅 - execute on vehicle run kill @s - kill @s diff --git a/Asset/data/asset/functions/object/1041.grand_flame/tick/vfx/landing/.mcfunction b/Asset/data/asset/functions/object/1041.grand_flame/hit/vfx/.mcfunction similarity index 99% rename from Asset/data/asset/functions/object/1041.grand_flame/tick/vfx/landing/.mcfunction rename to Asset/data/asset/functions/object/1041.grand_flame/hit/vfx/.mcfunction index 2535eb0694..61cba3ddb7 100644 --- a/Asset/data/asset/functions/object/1041.grand_flame/tick/vfx/landing/.mcfunction +++ b/Asset/data/asset/functions/object/1041.grand_flame/hit/vfx/.mcfunction @@ -1,8 +1,8 @@ -#> asset:object/1041.grand_flame/tick/vfx/landing/ +#> asset:object/1041.grand_flame/hit/vfx/ # # # -# @within function asset:object/1041.grand_flame/tick/landing +# @within function asset:object/1041.grand_flame/hit/ # 球 particle dust 100000000 1 0 4 ~-0.0 ~1.294 ~4.83 0.0 0.0 0.0 0.0 1 force @a[distance=..64] diff --git a/Asset/data/asset/functions/object/1041.grand_flame/hit/vfx/random.m.mcfunction b/Asset/data/asset/functions/object/1041.grand_flame/hit/vfx/random.m.mcfunction new file mode 100644 index 0000000000..1faab5025d --- /dev/null +++ b/Asset/data/asset/functions/object/1041.grand_flame/hit/vfx/random.m.mcfunction @@ -0,0 +1,9 @@ +#> asset:object/1041.grand_flame/hit/vfx/random.m +# +# @input args: +# Yaw : float +# Pitch : float +# @within function asset:object/1041.grand_flame/hit/ + +# マクロで回転し実行 + $execute rotated $(Yaw) $(Pitch) run function asset:object/1041.grand_flame/hit/vfx/random diff --git a/Asset/data/asset/functions/object/1041.grand_flame/tick/vfx/landing/random.mcfunction b/Asset/data/asset/functions/object/1041.grand_flame/hit/vfx/random.mcfunction similarity index 98% rename from Asset/data/asset/functions/object/1041.grand_flame/tick/vfx/landing/random.mcfunction rename to Asset/data/asset/functions/object/1041.grand_flame/hit/vfx/random.mcfunction index bffb201779..490d5a3768 100644 --- a/Asset/data/asset/functions/object/1041.grand_flame/tick/vfx/landing/random.mcfunction +++ b/Asset/data/asset/functions/object/1041.grand_flame/hit/vfx/random.mcfunction @@ -1,8 +1,8 @@ -#> asset:object/1041.grand_flame/tick/vfx/landing/random +#> asset:object/1041.grand_flame/hit/vfx/random # # # -# @within function asset:object/1041.grand_flame/tick/vfx/landing/random.m +# @within function asset:object/1041.grand_flame/hit/vfx/random.m # 円.004 particle flame ^-0.0 ^0.0 ^0.2 ^-16.298 ^0.0 ^1000000000.0 0.00000000076 0 force @a[distance=..64] diff --git a/Asset/data/asset/functions/object/1041.grand_flame/init/.mcfunction b/Asset/data/asset/functions/object/1041.grand_flame/init/.mcfunction deleted file mode 100644 index 54010e3eeb..0000000000 --- a/Asset/data/asset/functions/object/1041.grand_flame/init/.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -#> asset:object/1041.grand_flame/init/ -# -# Objectのinit時の処理 -# -# @within asset:object/alias/1041/init - -# motion - data modify storage lib: Argument.VectorMagnitude set from storage asset:context this.Motion - execute on vehicle run function lib:motion/ diff --git a/Asset/data/asset/functions/object/1041.grand_flame/register.mcfunction b/Asset/data/asset/functions/object/1041.grand_flame/register.mcfunction index 8245e95b54..81b517241e 100644 --- a/Asset/data/asset/functions/object/1041.grand_flame/register.mcfunction +++ b/Asset/data/asset/functions/object/1041.grand_flame/register.mcfunction @@ -5,8 +5,8 @@ # @within function asset:object/alias/1041/register # 継承(オプション) - # data modify storage asset:object Extends append value - # function asset:object/extends + data modify storage asset:object Extends append value 5 + function asset:object/extends # 他のObjectに継承されることを許可するか (boolean) (オプション) # data modify storage asset:object ExtendsSafe set value # 継承されることを前提とした、抽象的なObjectであるかどうか(boolean) @@ -18,5 +18,6 @@ data modify storage asset:object ID set value 1041 # フィールド(オプション) data modify storage asset:object Field.Motion set value 1.0f + data modify storage asset:object Field.Tick set value 100 data modify storage asset:object Field.Damage set value 1 data modify storage asset:object Field.UserID set value -1 diff --git a/Asset/data/asset/functions/object/1041.grand_flame/summon/.mcfunction b/Asset/data/asset/functions/object/1041.grand_flame/summon/.mcfunction deleted file mode 100644 index f60913f2c6..0000000000 --- a/Asset/data/asset/functions/object/1041.grand_flame/summon/.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -#> asset:object/1041.grand_flame/summon/ -# -# Object召喚処理の呼び出し時に実行されるfunction -# -# @within asset:object/alias/1041/summon - -# 元となるEntityを召喚する - 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 - function asset:object/1041.grand_flame/summon/m with storage asset:temp Args - data remove storage asset:temp Args diff --git a/Asset/data/asset/functions/object/1041.grand_flame/summon/m.mcfunction b/Asset/data/asset/functions/object/1041.grand_flame/summon/m.mcfunction deleted file mode 100644 index d44942d170..0000000000 --- a/Asset/data/asset/functions/object/1041.grand_flame/summon/m.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> asset:object/1041.grand_flame/summon/m -# -# -# -# @within function asset:object/1041.grand_flame/summon/ - - $summon snowball ~ ~ ~ {Rotation:$(Rotation),Silent:1b,Tags:["Uninterferable"],Item:{id:"minecraft:stone",Count:1b,tag:{CustomModelData:20019}},Passengers:[{id:"minecraft:marker",Tags:["ObjectInit"]}]} diff --git a/Asset/data/asset/functions/object/1041.grand_flame/tick/.mcfunction b/Asset/data/asset/functions/object/1041.grand_flame/tick/.mcfunction index b7156cb36d..4914757810 100644 --- a/Asset/data/asset/functions/object/1041.grand_flame/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1041.grand_flame/tick/.mcfunction @@ -4,12 +4,8 @@ # # @within asset:object/alias/1041/tick -# Tick加算 - scoreboard players add @s General.Object.Tick 1 - # 演出 - function asset:object/1041.grand_flame/tick/vfx/flying + function asset:object/1041.grand_flame/tick/vfx -# 消滅処理 - execute unless predicate lib:is_vehicle run function asset:object/1041.grand_flame/tick/landing - execute if score @s General.Object.Tick matches 100.. run function asset:object/1041.grand_flame/tick/landing +# super.tick + execute at @s run function asset:object/super.tick diff --git a/Asset/data/asset/functions/object/1041.grand_flame/tick/vfx/flying.mcfunction b/Asset/data/asset/functions/object/1041.grand_flame/tick/vfx.mcfunction similarity index 98% rename from Asset/data/asset/functions/object/1041.grand_flame/tick/vfx/flying.mcfunction rename to Asset/data/asset/functions/object/1041.grand_flame/tick/vfx.mcfunction index decdd8a3a7..4b9c761ea8 100644 --- a/Asset/data/asset/functions/object/1041.grand_flame/tick/vfx/flying.mcfunction +++ b/Asset/data/asset/functions/object/1041.grand_flame/tick/vfx.mcfunction @@ -1,4 +1,4 @@ -#> asset:object/1041.grand_flame/tick/vfx/flying +#> asset:object/1041.grand_flame/tick/vfx # # # diff --git a/Asset/data/asset/functions/object/1041.grand_flame/tick/vfx/landing/random.m.mcfunction b/Asset/data/asset/functions/object/1041.grand_flame/tick/vfx/landing/random.m.mcfunction deleted file mode 100644 index 20fa723626..0000000000 --- a/Asset/data/asset/functions/object/1041.grand_flame/tick/vfx/landing/random.m.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -#> asset:object/1041.grand_flame/tick/vfx/landing/random.m -# -# @input args: -# Yaw : float -# Pitch : float -# @within function asset:object/1041.grand_flame/tick/landing - -# マクロで回転し実行 - $execute rotated $(Yaw) $(Pitch) run function asset:object/1041.grand_flame/tick/vfx/landing/random diff --git a/Asset/data/asset/functions/object/alias/1041/hit.mcfunction b/Asset/data/asset/functions/object/alias/1041/hit.mcfunction new file mode 100644 index 0000000000..259f0e6680 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1041/hit.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1041/hit +# +# メソッド処理のエイリアス +# +# @within asset_manager:object/call_method/run_method.m + +# 元のメソッド処理を呼び出す + function asset:object/1041.grand_flame/hit/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1041/init.mcfunction b/Asset/data/asset/functions/object/alias/1041/init.mcfunction deleted file mode 100644 index 3ae994446a..0000000000 --- a/Asset/data/asset/functions/object/alias/1041/init.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset:object/alias/1041/init -# -# Init処理のエイリアス -# -# @within asset_manager:object/init/init.m - -# 元のInit処理を呼び出す - function asset:object/1041.grand_flame/init/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1041/summon.mcfunction b/Asset/data/asset/functions/object/alias/1041/summon.mcfunction deleted file mode 100644 index 3d78591ace..0000000000 --- a/Asset/data/asset/functions/object/alias/1041/summon.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset:object/alias/1041/summon -# -# Object召喚処理のエイリアス -# -# @within asset_manager:object/summon/summon.m - -# 元の召喚処理を呼び出す - function asset:object/1041.grand_flame/summon/ \ No newline at end of file From 10ac336607f24455cb870b35e26167bac160d771 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Sat, 3 Jan 2026 17:01:26 +0900 Subject: [PATCH 08/14] =?UTF-8?q?[Artifact=201264,=20Object=201139]=20?= =?UTF-8?q?=E3=82=B7=E3=83=B3=E3=83=97=E3=83=AB=E3=82=B0=E3=83=AC=E3=83=8D?= =?UTF-8?q?=E3=83=BC=E3=83=89=E3=81=AE=E5=87=A6=E7=90=86=E3=82=92=E9=87=8D?= =?UTF-8?q?=E5=8A=9B=E9=A3=9B=E7=BF=94=E4=BD=93=E6=8A=BD=E8=B1=A1=E3=82=92?= =?UTF-8?q?=E7=B6=99=E6=89=BF=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trigger/throw.mcfunction | 2 ++ .../{tick/boom.mcfunction => hit/.mcfunction} | 18 ++++++------------ .../1139.simple_grenade/init/.mcfunction | 12 ------------ .../1139.simple_grenade/register.mcfunction | 5 +++-- .../1139.simple_grenade/tick/.mcfunction | 12 ------------ .../functions/object/alias/1139/hit.mcfunction | 8 ++++++++ .../object/alias/1139/init.mcfunction | 8 -------- .../object/alias/1139/tick.mcfunction | 8 -------- 8 files changed, 19 insertions(+), 54 deletions(-) rename Asset/data/asset/functions/object/1139.simple_grenade/{tick/boom.mcfunction => hit/.mcfunction} (77%) delete mode 100644 Asset/data/asset/functions/object/1139.simple_grenade/init/.mcfunction delete mode 100644 Asset/data/asset/functions/object/1139.simple_grenade/tick/.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1139/hit.mcfunction delete mode 100644 Asset/data/asset/functions/object/alias/1139/init.mcfunction delete mode 100644 Asset/data/asset/functions/object/alias/1139/tick.mcfunction diff --git a/Asset/data/asset/functions/artifact/1264.simple_grenade/trigger/throw.mcfunction b/Asset/data/asset/functions/artifact/1264.simple_grenade/trigger/throw.mcfunction index f1ff67d171..4896d1ef86 100644 --- a/Asset/data/asset/functions/artifact/1264.simple_grenade/trigger/throw.mcfunction +++ b/Asset/data/asset/functions/artifact/1264.simple_grenade/trigger/throw.mcfunction @@ -23,6 +23,8 @@ # Object召喚 data modify storage api: Argument.ID set value 1139 data modify storage api: Argument.FieldOverride.Damage set value 50 + data modify storage api: Argument.FieldOverride.Tick set value 60 + data modify storage api: Argument.FieldOverride.Motion set value 1f execute store result storage api: Argument.FieldOverride.UserID int 1 run scoreboard players get @s UserID execute facing entity @e[type=marker,tag=SpreadMarker,distance=..10,limit=1] eyes run function api:object/summon diff --git a/Asset/data/asset/functions/object/1139.simple_grenade/tick/boom.mcfunction b/Asset/data/asset/functions/object/1139.simple_grenade/hit/.mcfunction similarity index 77% rename from Asset/data/asset/functions/object/1139.simple_grenade/tick/boom.mcfunction rename to Asset/data/asset/functions/object/1139.simple_grenade/hit/.mcfunction index 2b433e3626..225fa3c5da 100644 --- a/Asset/data/asset/functions/object/1139.simple_grenade/tick/boom.mcfunction +++ b/Asset/data/asset/functions/object/1139.simple_grenade/hit/.mcfunction @@ -1,18 +1,16 @@ -#> asset:object/1139.simple_grenade/tick/boom +#> asset:object/1139.simple_grenade/hit/ # +# 継承先などから実行される処理 # -# -# @within function asset:object/1139.simple_grenade/tick/ +# @within asset:object/alias/1139/hit #> Private # @private #declare tag 1139.Target - #declare tag 1139.Already #declare score_holder $UserID -# 一度しか爆発しないように - execute if entity @s[tag=1139.Already] run return fail - tag @s add 1139.Already +# super + function asset:object/super.method # 演出 particle flame ~ ~ ~ 0.5 0.5 0.5 0.05 60 normal @a @@ -38,8 +36,4 @@ # リセット scoreboard players reset $UserID Temporary - tag @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,distance=..10] remove 1139.Target - -# 消滅 - execute on vehicle run kill @s - kill @s + tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..10] remove 1139.Target diff --git a/Asset/data/asset/functions/object/1139.simple_grenade/init/.mcfunction b/Asset/data/asset/functions/object/1139.simple_grenade/init/.mcfunction deleted file mode 100644 index 8700a023fd..0000000000 --- a/Asset/data/asset/functions/object/1139.simple_grenade/init/.mcfunction +++ /dev/null @@ -1,12 +0,0 @@ -#> asset:object/1139.simple_grenade/init/ -# -# Objectのinit時の処理 -# -# @within asset:object/alias/1139/init - -# Motion - data modify storage lib: Argument.VectorMagnitude set from storage asset:context this.Motion - execute on vehicle run function lib:motion/ - -# 描画更新 - execute on vehicle run damage @s 1 diff --git a/Asset/data/asset/functions/object/1139.simple_grenade/register.mcfunction b/Asset/data/asset/functions/object/1139.simple_grenade/register.mcfunction index a362e389dd..cd09677fd5 100644 --- a/Asset/data/asset/functions/object/1139.simple_grenade/register.mcfunction +++ b/Asset/data/asset/functions/object/1139.simple_grenade/register.mcfunction @@ -5,8 +5,8 @@ # @within function asset:object/alias/1139/register # 継承(オプション) - # data modify storage asset:object Extends append value - # function asset:object/extends + data modify storage asset:object Extends append value 5 + function asset:object/extends # 他のObjectに継承されることを許可するか (boolean) (オプション) # data modify storage asset:object ExtendsSafe set value # 継承されることを前提とした、抽象的なObjectであるかどうか(boolean) @@ -18,5 +18,6 @@ data modify storage asset:object ID set value 1139 # フィールド(オプション) data modify storage asset:object Field.Motion set value 1.0f + data modify storage asset:object Field.Tick set value 60 data modify storage asset:object Field.Damage set value 1 data modify storage asset:object Field.UserID set value -1 diff --git a/Asset/data/asset/functions/object/1139.simple_grenade/tick/.mcfunction b/Asset/data/asset/functions/object/1139.simple_grenade/tick/.mcfunction deleted file mode 100644 index 34a5173271..0000000000 --- a/Asset/data/asset/functions/object/1139.simple_grenade/tick/.mcfunction +++ /dev/null @@ -1,12 +0,0 @@ -#> asset:object/1139.simple_grenade/tick/ -# -# Objectのtick時の処理 -# -# @within asset:object/alias/1139/tick - -# Tick加算 - scoreboard players add @s General.Object.Tick 1 - -# 雪玉消滅か時間経過で爆発 - execute unless predicate lib:is_vehicle run function asset:object/1139.simple_grenade/tick/boom - execute if score @s General.Object.Tick matches 60.. if entity @s run function asset:object/1139.simple_grenade/tick/boom diff --git a/Asset/data/asset/functions/object/alias/1139/hit.mcfunction b/Asset/data/asset/functions/object/alias/1139/hit.mcfunction new file mode 100644 index 0000000000..aa5e852ae3 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1139/hit.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1139/hit +# +# メソッド処理のエイリアス +# +# @within asset_manager:object/call_method/run_method.m + +# 元のメソッド処理を呼び出す + function asset:object/1139.simple_grenade/hit/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1139/init.mcfunction b/Asset/data/asset/functions/object/alias/1139/init.mcfunction deleted file mode 100644 index 8bbf5a27e6..0000000000 --- a/Asset/data/asset/functions/object/alias/1139/init.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset:object/alias/1139/init -# -# Init処理のエイリアス -# -# @within asset_manager:object/init/init.m - -# 元のInit処理を呼び出す - function asset:object/1139.simple_grenade/init/ diff --git a/Asset/data/asset/functions/object/alias/1139/tick.mcfunction b/Asset/data/asset/functions/object/alias/1139/tick.mcfunction deleted file mode 100644 index 515a28a58c..0000000000 --- a/Asset/data/asset/functions/object/alias/1139/tick.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset:object/alias/1139/tick -# -# Tick時処理のエイリアス -# -# @within asset_manager:object/tick/tick.m - -# 元のTick処理を呼び出す - function asset:object/1139.simple_grenade/tick/ From d21314e6bd47383c764300abc2c0c739327c6cd7 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Sat, 3 Jan 2026 18:04:06 +0900 Subject: [PATCH 09/14] =?UTF-8?q?[Artifact=20464,=20Object=201086]=20?= =?UTF-8?q?=E3=82=B5=E3=83=B3=E3=83=80=E3=83=BC=E3=83=9C=E3=83=AB=E3=83=88?= =?UTF-8?q?=E3=82=A8=E3=82=AF=E3=82=B9=E3=83=97=E3=83=AD=E3=82=A4=E3=83=88?= =?UTF-8?q?=E3=81=AE=E5=87=A6=E7=90=86=E3=82=92=E9=87=8D=E5=8A=9B=E9=A3=9B?= =?UTF-8?q?=E7=BF=94=E4=BD=93=E6=8A=BD=E8=B1=A1=E3=82=92=E7=B6=99=E6=89=BF?= =?UTF-8?q?=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trigger/3.main.mcfunction | 2 ++ .../_index.d.mcfunction | 6 ---- .../main.mcfunction => hit/.mcfunction} | 28 ++++++++----------- .../{tick => hit}/vfx/particle.mcfunction | 4 +-- .../hit/vfx/random.m.mcfunction | 7 +++++ .../vfx/random.mcfunction} | 6 ++-- .../1086.lightning_exploit/init/.mcfunction | 12 -------- .../range_over/.mcfunction | 9 ++++++ .../register.mcfunction | 8 ++++-- .../summon/debug.mcfunction | 10 ------- .../1086.lightning_exploit/tick/.mcfunction | 15 ---------- .../tick/vfx/vfx.m.mcfunction | 7 ----- .../object/alias/1086/hit.mcfunction | 8 ++++++ .../object/alias/1086/init.mcfunction | 8 ------ .../object/alias/1086/range_over.mcfunction | 8 ++++++ .../object/alias/1086/tick.mcfunction | 8 ------ 16 files changed, 56 insertions(+), 90 deletions(-) delete mode 100644 Asset/data/asset/functions/object/1086.lightning_exploit/_index.d.mcfunction rename Asset/data/asset/functions/object/1086.lightning_exploit/{tick/landing/main.mcfunction => hit/.mcfunction} (58%) rename Asset/data/asset/functions/object/1086.lightning_exploit/{tick => hit}/vfx/particle.mcfunction (96%) create mode 100644 Asset/data/asset/functions/object/1086.lightning_exploit/hit/vfx/random.m.mcfunction rename Asset/data/asset/functions/object/1086.lightning_exploit/{tick/vfx/main.mcfunction => hit/vfx/random.mcfunction} (53%) delete mode 100644 Asset/data/asset/functions/object/1086.lightning_exploit/init/.mcfunction create mode 100644 Asset/data/asset/functions/object/1086.lightning_exploit/range_over/.mcfunction delete mode 100644 Asset/data/asset/functions/object/1086.lightning_exploit/summon/debug.mcfunction delete mode 100644 Asset/data/asset/functions/object/1086.lightning_exploit/tick/.mcfunction delete mode 100644 Asset/data/asset/functions/object/1086.lightning_exploit/tick/vfx/vfx.m.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1086/hit.mcfunction delete mode 100644 Asset/data/asset/functions/object/alias/1086/init.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1086/range_over.mcfunction delete mode 100644 Asset/data/asset/functions/object/alias/1086/tick.mcfunction diff --git a/Asset/data/asset/functions/artifact/0464.lightning_exploit/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0464.lightning_exploit/trigger/3.main.mcfunction index 982db8f5c1..51fb54abe5 100644 --- a/Asset/data/asset/functions/artifact/0464.lightning_exploit/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0464.lightning_exploit/trigger/3.main.mcfunction @@ -25,6 +25,8 @@ # 召喚 data modify storage api: Argument.ID set value 1086 data modify storage api: Argument.FieldOverride.Damage set value 110 + data modify storage api: Argument.FieldOverride.Tick set value 140 + data modify storage api: Argument.FieldOverride.Motion set value 0.8 execute store result storage api: Argument.FieldOverride.UserID int 1 run scoreboard players get @s UserID execute anchored eyes positioned ^ ^ ^1 facing entity @e[type=marker,tag=SpreadMarker,distance=..10,sort=nearest,limit=1] feet run function api:object/summon diff --git a/Asset/data/asset/functions/object/1086.lightning_exploit/_index.d.mcfunction b/Asset/data/asset/functions/object/1086.lightning_exploit/_index.d.mcfunction deleted file mode 100644 index e0b47a3a54..0000000000 --- a/Asset/data/asset/functions/object/1086.lightning_exploit/_index.d.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#> asset:object/1086.lightning_exploit/_index.d -# @private - -#> tag -# @within function asset:object/1086.lightning_exploit/** - #declare tag 1086.Owner diff --git a/Asset/data/asset/functions/object/1086.lightning_exploit/tick/landing/main.mcfunction b/Asset/data/asset/functions/object/1086.lightning_exploit/hit/.mcfunction similarity index 58% rename from Asset/data/asset/functions/object/1086.lightning_exploit/tick/landing/main.mcfunction rename to Asset/data/asset/functions/object/1086.lightning_exploit/hit/.mcfunction index 6cc56eaaa8..8d63ed2fab 100644 --- a/Asset/data/asset/functions/object/1086.lightning_exploit/tick/landing/main.mcfunction +++ b/Asset/data/asset/functions/object/1086.lightning_exploit/hit/.mcfunction @@ -1,40 +1,34 @@ -#> asset:object/1086.lightning_exploit/tick/landing/main +#> asset:object/1086.lightning_exploit/hit/ # +# 継承先などから実行される処理 # -# -# @within function asset:object/1086.lightning_exploit/tick/ +# @within asset:object/alias/1086/hit #> private # @private - #declare score_holder $OwnerID - -# 紐づけ - execute store result score $OwnerID Temporary run data get storage asset:context this.UserID - execute as @a if score @s UserID = $OwnerID Temporary run tag @s add 1086.Owner - scoreboard players reset $OwnerID Temporary + #declare score_holder $UserID # 演出 particle dust 1 0.941 0.102 1 ~ ~ ~ 0.5 0.5 0.5 0 30 - function asset:object/1086.lightning_exploit/tick/vfx/main - function asset:object/1086.lightning_exploit/tick/vfx/main + function asset:object/1086.lightning_exploit/hit/vfx/random + function asset:object/1086.lightning_exploit/hit/vfx/random playsound minecraft:block.chain.place player @a ~ ~ ~ 1 2 playsound minecraft:item.flintandsteel.use player @a ~ ~ ~ 1 2 playsound minecraft:entity.generic.hurt player @a ~ ~ ~ 1 1.3 playsound minecraft:entity.breeze.death player @a ~ ~ ~ 1 1 - # ダメージ data modify storage api: Argument.Damage set from storage asset:context this.Damage data modify storage api: Argument.AttackType set value "Physical" data modify storage api: Argument.ElementType set value "Thunder" -# 補正functionを実行 - execute as @a[tag=1086.Owner,sort=nearest,limit=1] run function api:damage/modifier -# ダメージを与える + execute store result score $UserID Temporary run data get storage asset:context this.UserID + execute as @a if score @s UserID = $UserID Temporary run function api:damage/modifier execute as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..3.5] run function api:damage/ -# リセット function api:damage/reset - tag @a[tag=1086.Owner] remove 1086.Owner # 残り攻撃回数が0になったら消える execute store result storage asset:context this.AttackCount int 0.9999999999 run data get storage asset:context this.AttackCount execute if data storage asset:context this{AttackCount:0} run kill @s + +# リセット + scoreboard players reset $UserID Temporary diff --git a/Asset/data/asset/functions/object/1086.lightning_exploit/tick/vfx/particle.mcfunction b/Asset/data/asset/functions/object/1086.lightning_exploit/hit/vfx/particle.mcfunction similarity index 96% rename from Asset/data/asset/functions/object/1086.lightning_exploit/tick/vfx/particle.mcfunction rename to Asset/data/asset/functions/object/1086.lightning_exploit/hit/vfx/particle.mcfunction index 86d6ec03d7..00687ee107 100644 --- a/Asset/data/asset/functions/object/1086.lightning_exploit/tick/vfx/particle.mcfunction +++ b/Asset/data/asset/functions/object/1086.lightning_exploit/hit/vfx/particle.mcfunction @@ -1,8 +1,8 @@ -#> asset:object/1086.lightning_exploit/tick/vfx/particle +#> asset:object/1086.lightning_exploit/hit/vfx/particle # # # -# @within function asset:object/1086.lightning_exploit/tick/vfx/vfx.m +# @within function asset:object/1086.lightning_exploit/hit/vfx/random # [ImportKey]: NobwRALgngDgpmAXGAxgSwE4oDYIDRgCuhaAJkmAIykCslcATAGwBGAtEwwwBxsAsfAGYBONsOaC2KSgENSABhGCAzAHZKwsAQB2MgLYJkgMMUABJS1gYMjPoDOScCgD2hbRCRN5BFHDdwMDmAAbjLYhIbgAB5IXmBQMQC+CQQ2pGiE9ojKAHQ0BLYQ1u6IsXDY2GgwtoaU8rEYToUQhrFotgCi5ZXV7QCOhKHYUADKVj7kiIKh1UkAukA_3 # 円 1 diff --git a/Asset/data/asset/functions/object/1086.lightning_exploit/hit/vfx/random.m.mcfunction b/Asset/data/asset/functions/object/1086.lightning_exploit/hit/vfx/random.m.mcfunction new file mode 100644 index 0000000000..10ba7a2135 --- /dev/null +++ b/Asset/data/asset/functions/object/1086.lightning_exploit/hit/vfx/random.m.mcfunction @@ -0,0 +1,7 @@ +#> asset:object/1086.lightning_exploit/hit/vfx/random.m +# +# +# +# @within function asset:object/1086.lightning_exploit/hit/vfx/random + +$execute rotated $(X) $(Y) run function asset:object/1086.lightning_exploit/hit/vfx/particle diff --git a/Asset/data/asset/functions/object/1086.lightning_exploit/tick/vfx/main.mcfunction b/Asset/data/asset/functions/object/1086.lightning_exploit/hit/vfx/random.mcfunction similarity index 53% rename from Asset/data/asset/functions/object/1086.lightning_exploit/tick/vfx/main.mcfunction rename to Asset/data/asset/functions/object/1086.lightning_exploit/hit/vfx/random.mcfunction index f6b0df38cc..578a95ea50 100644 --- a/Asset/data/asset/functions/object/1086.lightning_exploit/tick/vfx/main.mcfunction +++ b/Asset/data/asset/functions/object/1086.lightning_exploit/hit/vfx/random.mcfunction @@ -1,15 +1,15 @@ -#> asset:object/1086.lightning_exploit/tick/vfx/main +#> asset:object/1086.lightning_exploit/hit/vfx/random # # # -# @within function asset:object/1086.lightning_exploit/tick/landing/main +# @within function asset:object/1086.lightning_exploit/hit/ # ランダムにする execute store result storage asset:temp Args.X int 1 run random value 0..359 execute store result storage asset:temp Args.Y int 1 run random value 0..359 # - function asset:object/1086.lightning_exploit/tick/vfx/vfx.m with storage asset:temp Args + function asset:object/1086.lightning_exploit/hit/vfx/random.m with storage asset:temp Args # リセット data remove storage asset:temp Args diff --git a/Asset/data/asset/functions/object/1086.lightning_exploit/init/.mcfunction b/Asset/data/asset/functions/object/1086.lightning_exploit/init/.mcfunction deleted file mode 100644 index f0b477923b..0000000000 --- a/Asset/data/asset/functions/object/1086.lightning_exploit/init/.mcfunction +++ /dev/null @@ -1,12 +0,0 @@ -#> asset:object/1086.lightning_exploit/init/ -# -# Objectのinit時の処理 -# -# @within asset:object/alias/1086/init - -# 雪玉を殴る（描画更新で） - execute on vehicle run damage @s 1 - -# モーションでぶっ飛ばす。飛ぶのは下の雪玉 - data modify storage lib: Argument.VectorMagnitude set value 0.8 - execute on vehicle run function lib:motion/ diff --git a/Asset/data/asset/functions/object/1086.lightning_exploit/range_over/.mcfunction b/Asset/data/asset/functions/object/1086.lightning_exploit/range_over/.mcfunction new file mode 100644 index 0000000000..73bd4e982b --- /dev/null +++ b/Asset/data/asset/functions/object/1086.lightning_exploit/range_over/.mcfunction @@ -0,0 +1,9 @@ +#> asset:object/1086.lightning_exploit/range_over/ +# +# 継承先などから実行される処理 +# +# @within asset:object/alias/1086/range_over + +# 消滅 + execute on vehicle run kill @s + kill @s diff --git a/Asset/data/asset/functions/object/1086.lightning_exploit/register.mcfunction b/Asset/data/asset/functions/object/1086.lightning_exploit/register.mcfunction index 4d15750c5c..129f4efd98 100644 --- a/Asset/data/asset/functions/object/1086.lightning_exploit/register.mcfunction +++ b/Asset/data/asset/functions/object/1086.lightning_exploit/register.mcfunction @@ -5,8 +5,8 @@ # @within function asset:object/alias/1086/register # 継承(オプション) - # data modify storage asset:object Extends append value - # function asset:object/extends + data modify storage asset:object Extends append value 5 + function asset:object/extends # 他のObjectに継承されることを許可するか (boolean) (オプション) # data modify storage asset:object ExtendsSafe set value # 継承されることを前提とした、抽象的なObjectであるかどうか(boolean) @@ -18,3 +18,7 @@ data modify storage asset:object ID set value 1086 # フィールド(オプション) data modify storage asset:object Field.AttackCount set value 15 + data modify storage asset:object Field.Motion set value 0.8 + data modify storage asset:object Field.Tick set value 140 + data modify storage asset:object Field.Damage set value 1 + data modify storage asset:object Field.UserID set value -1 diff --git a/Asset/data/asset/functions/object/1086.lightning_exploit/summon/debug.mcfunction b/Asset/data/asset/functions/object/1086.lightning_exploit/summon/debug.mcfunction deleted file mode 100644 index e606bf4d4a..0000000000 --- a/Asset/data/asset/functions/object/1086.lightning_exploit/summon/debug.mcfunction +++ /dev/null @@ -1,10 +0,0 @@ -#> asset:object/1086.lightning_exploit/summon/debug -# -# 動作チェック用の召喚処理 使い終わったら消してもいいかも -# -# @user -# @private - -# 召喚 - data modify storage api: Argument.ID set value 1086 - function api:object/summon \ No newline at end of file diff --git a/Asset/data/asset/functions/object/1086.lightning_exploit/tick/.mcfunction b/Asset/data/asset/functions/object/1086.lightning_exploit/tick/.mcfunction deleted file mode 100644 index 08af67aa4d..0000000000 --- a/Asset/data/asset/functions/object/1086.lightning_exploit/tick/.mcfunction +++ /dev/null @@ -1,15 +0,0 @@ -#> asset:object/1086.lightning_exploit/tick/ -# -# Objectのtick時の処理 -# -# @within asset:object/alias/1086/tick - -# Tick加算 - scoreboard players add @s General.Object.Tick 1 - -# 雪玉がいない場合ヒット - execute unless predicate lib:is_vehicle run function asset:object/1086.lightning_exploit/tick/landing/main - -# 消滅処理 - execute if score @s General.Object.Tick matches 140.. on vehicle run kill @s - execute if score @s General.Object.Tick matches 140.. run kill @s diff --git a/Asset/data/asset/functions/object/1086.lightning_exploit/tick/vfx/vfx.m.mcfunction b/Asset/data/asset/functions/object/1086.lightning_exploit/tick/vfx/vfx.m.mcfunction deleted file mode 100644 index dadd07a0dd..0000000000 --- a/Asset/data/asset/functions/object/1086.lightning_exploit/tick/vfx/vfx.m.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> asset:object/1086.lightning_exploit/tick/vfx/vfx.m -# -# -# -# @within function asset:object/1086.lightning_exploit/tick/vfx/main - -$execute rotated $(X) $(Y) run function asset:object/1086.lightning_exploit/tick/vfx/particle diff --git a/Asset/data/asset/functions/object/alias/1086/hit.mcfunction b/Asset/data/asset/functions/object/alias/1086/hit.mcfunction new file mode 100644 index 0000000000..1dd9c5fefd --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1086/hit.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1086/hit +# +# メソッド処理のエイリアス +# +# @within asset_manager:object/call_method/run_method.m + +# 元のメソッド処理を呼び出す + function asset:object/1086.lightning_exploit/hit/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1086/init.mcfunction b/Asset/data/asset/functions/object/alias/1086/init.mcfunction deleted file mode 100644 index b8f4143a49..0000000000 --- a/Asset/data/asset/functions/object/alias/1086/init.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset:object/alias/1086/init -# -# Init処理のエイリアス -# -# @within asset_manager:object/init/init.m - -# 元のInit処理を呼び出す - function asset:object/1086.lightning_exploit/init/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1086/range_over.mcfunction b/Asset/data/asset/functions/object/alias/1086/range_over.mcfunction new file mode 100644 index 0000000000..f8e77a4e94 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1086/range_over.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1086/range_over +# +# メソッド処理のエイリアス +# +# @within asset_manager:object/call_method/run_method.m + +# 元のメソッド処理を呼び出す + function asset:object/1086.lightning_exploit/range_over/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1086/tick.mcfunction b/Asset/data/asset/functions/object/alias/1086/tick.mcfunction deleted file mode 100644 index ee6b2e8af3..0000000000 --- a/Asset/data/asset/functions/object/alias/1086/tick.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset:object/alias/1086/tick -# -# Tick時処理のエイリアス -# -# @within asset_manager:object/tick/tick.m - -# 元のTick処理を呼び出す - function asset:object/1086.lightning_exploit/tick/ \ No newline at end of file From d1578dcd78e06a1b03b6342524865aa88fd1984f Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Sat, 3 Jan 2026 18:26:32 +0900 Subject: [PATCH 10/14] =?UTF-8?q?[Artifact=201197,=20Object=20=201110]=20?= =?UTF-8?q?=E3=83=98=E3=83=B4=E3=82=A3=E3=83=A9=E3=83=B4=E3=82=A1=E3=83=9C?= =?UTF-8?q?=E3=83=A0=E3=81=AE=E5=87=A6=E7=90=86=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../object/1110.heavy_lava_bomb/hit/.mcfunction | 12 ++++++------ .../{tick => hit}/before_boom.mcfunction | 4 ++-- .../{tick => hit}/boom.mcfunction | 4 ++-- .../1110.heavy_lava_bomb/range_over/.mcfunction | 11 +++++++++++ .../object/1110.heavy_lava_bomb/register.mcfunction | 1 - .../object/1110.heavy_lava_bomb/tick/.mcfunction | 13 ------------- .../object/alias/1110/range_over.mcfunction | 8 ++++++++ 7 files changed, 29 insertions(+), 24 deletions(-) rename Asset/data/asset/functions/object/1110.heavy_lava_bomb/{tick => hit}/before_boom.mcfunction (94%) rename Asset/data/asset/functions/object/1110.heavy_lava_bomb/{tick => hit}/boom.mcfunction (90%) create mode 100644 Asset/data/asset/functions/object/1110.heavy_lava_bomb/range_over/.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1110/range_over.mcfunction diff --git a/Asset/data/asset/functions/object/1110.heavy_lava_bomb/hit/.mcfunction b/Asset/data/asset/functions/object/1110.heavy_lava_bomb/hit/.mcfunction index 8c66c731bf..225b2ed20d 100644 --- a/Asset/data/asset/functions/object/1110.heavy_lava_bomb/hit/.mcfunction +++ b/Asset/data/asset/functions/object/1110.heavy_lava_bomb/hit/.mcfunction @@ -4,11 +4,11 @@ # # @within asset:object/alias/1110/hit -# 一度しか実行されないようにする - execute if data storage asset:context this{AlreadyHit:true} run return fail +# 既にヒットしたならTick加算 + scoreboard players add @s General.Object.Tick 1 -# 雪玉を消し飛ばす - execute on vehicle run kill @s +# 爆発前の諸々 + execute if score @s General.Object.Tick matches 1..23 run function asset:object/1110.heavy_lava_bomb/hit/before_boom -# ヒット判定 - data modify storage asset:context this.AlreadyHit set value true +# 爆発 + execute if score @s General.Object.Tick matches 24.. run function asset:object/1110.heavy_lava_bomb/hit/boom diff --git a/Asset/data/asset/functions/object/1110.heavy_lava_bomb/tick/before_boom.mcfunction b/Asset/data/asset/functions/object/1110.heavy_lava_bomb/hit/before_boom.mcfunction similarity index 94% rename from Asset/data/asset/functions/object/1110.heavy_lava_bomb/tick/before_boom.mcfunction rename to Asset/data/asset/functions/object/1110.heavy_lava_bomb/hit/before_boom.mcfunction index 54aae617e6..fc88e1a20c 100644 --- a/Asset/data/asset/functions/object/1110.heavy_lava_bomb/tick/before_boom.mcfunction +++ b/Asset/data/asset/functions/object/1110.heavy_lava_bomb/hit/before_boom.mcfunction @@ -1,8 +1,8 @@ -#> asset:object/1110.heavy_lava_bomb/tick/before_boom +#> asset:object/1110.heavy_lava_bomb/hit/before_boom # # 爆発前の諸々 # -# @within function asset:object/1110.heavy_lava_bomb/tick/ +# @within function asset:object/1110.heavy_lava_bomb/hit/ # 下に落ちていく # 水中の場合は減速する diff --git a/Asset/data/asset/functions/object/1110.heavy_lava_bomb/tick/boom.mcfunction b/Asset/data/asset/functions/object/1110.heavy_lava_bomb/hit/boom.mcfunction similarity index 90% rename from Asset/data/asset/functions/object/1110.heavy_lava_bomb/tick/boom.mcfunction rename to Asset/data/asset/functions/object/1110.heavy_lava_bomb/hit/boom.mcfunction index be3c3a8b9d..fb7f1adfe2 100644 --- a/Asset/data/asset/functions/object/1110.heavy_lava_bomb/tick/boom.mcfunction +++ b/Asset/data/asset/functions/object/1110.heavy_lava_bomb/hit/boom.mcfunction @@ -1,8 +1,8 @@ -#> asset:object/1110.heavy_lava_bomb/tick/boom +#> asset:object/1110.heavy_lava_bomb/hit/boom # # # -# @within function asset:object/1110.heavy_lava_bomb/tick/ +# @within function asset:object/1110.heavy_lava_bomb/hit/ #> Private # @private diff --git a/Asset/data/asset/functions/object/1110.heavy_lava_bomb/range_over/.mcfunction b/Asset/data/asset/functions/object/1110.heavy_lava_bomb/range_over/.mcfunction new file mode 100644 index 0000000000..64bfe96a68 --- /dev/null +++ b/Asset/data/asset/functions/object/1110.heavy_lava_bomb/range_over/.mcfunction @@ -0,0 +1,11 @@ +#> asset:object/1110.heavy_lava_bomb/range_over/ +# +# 継承先などから実行される処理 +# +# @within asset:object/alias/1110/range_over + +# 雪玉とさようなら + execute on vehicle run kill @s + +# hitメソッドとこんにちは + function asset:object/call.m {method:"hit"} diff --git a/Asset/data/asset/functions/object/1110.heavy_lava_bomb/register.mcfunction b/Asset/data/asset/functions/object/1110.heavy_lava_bomb/register.mcfunction index ec4f8357bf..6028b11826 100644 --- a/Asset/data/asset/functions/object/1110.heavy_lava_bomb/register.mcfunction +++ b/Asset/data/asset/functions/object/1110.heavy_lava_bomb/register.mcfunction @@ -20,6 +20,5 @@ data modify storage asset:object Field.Motion set value 1f data modify storage asset:object Field.Tick set value 60 data modify storage asset:object Field.LeftRotate set value false - data modify storage asset:object Field.AlreadyHit set value false data modify storage asset:object Field.Damage set value 1 data modify storage asset:object Field.UserID set value -1 diff --git a/Asset/data/asset/functions/object/1110.heavy_lava_bomb/tick/.mcfunction b/Asset/data/asset/functions/object/1110.heavy_lava_bomb/tick/.mcfunction index 08b6e4937d..60d796a175 100644 --- a/Asset/data/asset/functions/object/1110.heavy_lava_bomb/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1110.heavy_lava_bomb/tick/.mcfunction @@ -4,13 +4,6 @@ # # @within asset:object/alias/1110/tick -#> Private -# @private - #declare tag 1110.NoVehicle - -# 既にヒットしたならTick加算 - execute if data storage asset:context this{AlreadyHit:true} run scoreboard players add @s General.Object.Tick 1 - # 雪玉がいる間のvfx execute if predicate lib:is_vehicle run particle dust 1 0.45 0.1 1.2 ~ ~ ~ 0.1 0.1 0.1 0 2 normal @a @@ -21,9 +14,3 @@ # super.tick execute at @s run function asset:object/super.tick - -# 爆発前の諸々 - execute if score @s General.Object.Tick matches 1.. run function asset:object/1110.heavy_lava_bomb/tick/before_boom - -# 爆発 - execute if score @s General.Object.Tick matches 24.. run function asset:object/1110.heavy_lava_bomb/tick/boom diff --git a/Asset/data/asset/functions/object/alias/1110/range_over.mcfunction b/Asset/data/asset/functions/object/alias/1110/range_over.mcfunction new file mode 100644 index 0000000000..4b88289131 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1110/range_over.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1110/range_over +# +# メソッド処理のエイリアス +# +# @within asset_manager:object/call_method/run_method.m + +# 元のメソッド処理を呼び出す + function asset:object/1110.heavy_lava_bomb/range_over/ \ No newline at end of file From 14806836572dce489bc6ea195a0daaf13574c280 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Sat, 3 Jan 2026 18:36:27 +0900 Subject: [PATCH 11/14] =?UTF-8?q?[Artifact=201197,=20Object=201110]=20?= =?UTF-8?q?=E3=83=98=E3=83=B4=E3=82=A3=E3=83=A9=E3=83=B4=E3=82=A1=E3=83=9C?= =?UTF-8?q?=E3=83=A0=E3=81=AEMotion=E3=81=8C=E5=9B=BA=E5=AE=9A=E3=81=AB?= =?UTF-8?q?=E3=81=AA=E3=81=A3=E3=81=A6=E3=81=84=E3=81=9F=E5=95=8F=E9=A1=8C?= =?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 --- .../artifact/1197.heavy_lava_bomb/trigger/throw_bomb.mcfunction | 1 - 1 file changed, 1 deletion(-) diff --git a/Asset/data/asset/functions/artifact/1197.heavy_lava_bomb/trigger/throw_bomb.mcfunction b/Asset/data/asset/functions/artifact/1197.heavy_lava_bomb/trigger/throw_bomb.mcfunction index ebeeb60df0..d1acd74ae1 100644 --- a/Asset/data/asset/functions/artifact/1197.heavy_lava_bomb/trigger/throw_bomb.mcfunction +++ b/Asset/data/asset/functions/artifact/1197.heavy_lava_bomb/trigger/throw_bomb.mcfunction @@ -24,7 +24,6 @@ data modify storage api: Argument.ID set value 1110 data modify storage api: Argument.FieldOverride.Damage set value 450 data modify storage api: Argument.FieldOverride.Tick set value 60 - data modify storage api: Argument.FieldOverride.Motion set value 1f execute store result storage api: Argument.FieldOverride.UserID int 1 run scoreboard players get @s UserID execute facing entity @e[type=marker,tag=SpreadMarker,distance=..10,limit=1] eyes run function api:object/summon From 89e4af81026ec5b4e0742111dee999b0ca48049e Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Sat, 3 Jan 2026 21:47:36 +0900 Subject: [PATCH 12/14] =?UTF-8?q?[Artifact=201264,=20Object=201139]=20?= =?UTF-8?q?=E3=82=B7=E3=83=B3=E3=83=97=E3=83=AB=E3=82=B0=E3=83=AC=E3=83=8D?= =?UTF-8?q?=E3=83=BC=E3=83=89=E3=81=AE=E3=83=A2=E3=83=BC=E3=82=B7=E3=83=A7?= =?UTF-8?q?=E3=83=B3=E3=82=92=E5=9B=BA=E5=AE=9A=E3=81=97=E3=81=A6=E3=81=97?= =?UTF-8?q?=E3=81=BE=E3=81=A3=E3=81=A6=E3=81=84=E3=81=9F=E5=95=8F=E9=A1=8C?= =?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 --- .../artifact/1264.simple_grenade/trigger/throw.mcfunction | 1 - 1 file changed, 1 deletion(-) diff --git a/Asset/data/asset/functions/artifact/1264.simple_grenade/trigger/throw.mcfunction b/Asset/data/asset/functions/artifact/1264.simple_grenade/trigger/throw.mcfunction index 4896d1ef86..230f13ace1 100644 --- a/Asset/data/asset/functions/artifact/1264.simple_grenade/trigger/throw.mcfunction +++ b/Asset/data/asset/functions/artifact/1264.simple_grenade/trigger/throw.mcfunction @@ -24,7 +24,6 @@ data modify storage api: Argument.ID set value 1139 data modify storage api: Argument.FieldOverride.Damage set value 50 data modify storage api: Argument.FieldOverride.Tick set value 60 - data modify storage api: Argument.FieldOverride.Motion set value 1f execute store result storage api: Argument.FieldOverride.UserID int 1 run scoreboard players get @s UserID execute facing entity @e[type=marker,tag=SpreadMarker,distance=..10,limit=1] eyes run function api:object/summon From b5185c7cfbed9c9649aa84e357abad7e1f46ee33 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Sat, 3 Jan 2026 22:04:35 +0900 Subject: [PATCH 13/14] =?UTF-8?q?[Object=205]=20=E9=87=8D=E5=8A=9B?= =?UTF-8?q?=E9=A3=9B=E7=BF=94=E4=BD=93=E6=8A=BD=E8=B1=A1=E3=81=AErange=5Fo?= =?UTF-8?q?ver=E3=82=92=E5=91=BC=E3=81=B3=E5=87=BA=E3=81=99=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E3=82=92=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../object/0005.abstract_gravity_projectile/tick/.mcfunction | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Asset/data/asset/functions/object/0005.abstract_gravity_projectile/tick/.mcfunction b/Asset/data/asset/functions/object/0005.abstract_gravity_projectile/tick/.mcfunction index 6d057a1be6..fac9fd24d1 100644 --- a/Asset/data/asset/functions/object/0005.abstract_gravity_projectile/tick/.mcfunction +++ b/Asset/data/asset/functions/object/0005.abstract_gravity_projectile/tick/.mcfunction @@ -10,5 +10,5 @@ # 存在時間のデクリメント execute store result storage asset:context this.Tick int 0.9999999999 run data get storage asset:context this.Tick 1 -# 存在時間が0かつまだ生存しているならrange_overメソッドを発動 - execute if data storage asset:context this{Tick:0} if score @s ObjectID matches -2147483648..2147483647 at @s run function asset:object/call.m {method:"range_over"} +# 存在時間が0 && 雪玉がある ならrange_overメソッドを発動 + execute if data storage asset:context this{Tick:0} if predicate lib:is_vehicle at @s run function asset:object/call.m {method:"range_over"} From bf6cbd12baea16183926a7168437681cfcfb796d Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Tue, 27 Jan 2026 14:31:48 +0900 Subject: [PATCH 14/14] =?UTF-8?q?[Artifact=201120,=20Object=201053]=20?= =?UTF-8?q?=E7=81=AB=E7=82=8E=E6=94=BE=E5=B0=84=E5=99=A8=E3=81=AE=E7=AF=84?= =?UTF-8?q?=E5=9B=B2=E3=81=AE=E4=BB=95=E6=A7=98=E5=A4=89=E6=9B=B4=E3=81=AB?= =?UTF-8?q?=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/object/1053.flamethrower_ball/hit/.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/object/1053.flamethrower_ball/hit/.mcfunction b/Asset/data/asset/functions/object/1053.flamethrower_ball/hit/.mcfunction index d487f1e7ab..d1cd14079f 100644 --- a/Asset/data/asset/functions/object/1053.flamethrower_ball/hit/.mcfunction +++ b/Asset/data/asset/functions/object/1053.flamethrower_ball/hit/.mcfunction @@ -21,7 +21,7 @@ data modify storage api: Argument.ElementType set value "Fire" execute store result score $UserID Temporary run data get storage asset:context this.UserID execute as @a if score @s UserID = $UserID Temporary run function api:damage/modifier - execute positioned ~-1.75 ~-1.75 ~-1.75 as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=2.5,dy=2.5,dz=2.5,sort=random,limit=1] run function api:damage/ + execute positioned ~-1.75 ~-1.75 ~-1.75 as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=2.5,dy=2.5,dz=2.5] run function api:damage/ function api:damage/reset # リセット