♻️ 雪玉系Objectの処理を重力飛翔体抽象を継承する仕様に変更

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

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
 

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

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

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 40
+    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]

Asset/data/asset/functions/artifact/1197.heavy_lava_bomb/trigger/throw_bomb.mcfunction

@@ -23,6 +23,7 @@
 # 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
     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
 

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
 

Asset/data/asset/functions/artifact/1264.simple_grenade/trigger/throw.mcfunction

@@ -23,6 +23,7 @@
 # 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
     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
 

Asset/data/asset/functions/object/0005.abstract_gravity_projectile/hit/.mcfunction

@@ -4,8 +4,5 @@
 #
 # @within asset:object/alias/5/hit
 
-# フェイルセーフ用の消える処理
-    execute on vehicle run kill @s
-
-# マーカーを消す処理
-    kill @s
+# killメソッド呼び出し
+    function asset:object/call.m {method:"kill"}

Asset/data/asset/functions/object/0005.abstract_gravity_projectile/kill/.mcfunction

@@ -0,0 +1,11 @@
+#> asset:object/0005.abstract_gravity_projectile/kill/
+#
+# 継承先などから実行される処理
+#
+# @within asset:object/alias/5/kill
+
+# 雪玉kill
+    execute on vehicle run kill @s
+
+# kill
+    kill @s

Asset/data/asset/functions/object/0005.abstract_gravity_projectile/range_over/.mcfunction

@@ -0,0 +1,8 @@
+#> asset:object/0005.abstract_gravity_projectile/range_over/
+#
+# 射程限界に到達した際の処理 デフォルトはkillメソッドを直接呼び出す
+#
+# @within asset:object/alias/5/range_over
+
+# killメソッド呼び出し
+    function asset:object/call.m {method:"kill"}

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

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 predicate lib:is_vehicle at @s run function asset:object/call.m {method:"range_over"}

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

Asset/data/asset/functions/object/1002.malleus_maleficarum/tick/witchification.mcfunction → 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

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 
+    data modify storage asset:object Field.Motion set value 0.8
+    data modify storage asset:object Field.Tick set value 60

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

Asset/data/asset/functions/object/1041.grand_flame/tick/landing.mcfunction → 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
@@ -45,7 +43,3 @@
 # リセット
     data remove storage asset:temp Args
     scoreboard players reset $UserID Temporary
-
-# 消滅
-    execute on vehicle run kill @s
-    kill @s

Asset/data/asset/functions/object/1041.grand_flame/tick/vfx/landing/.mcfunction → 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]

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

Asset/data/asset/functions/object/1041.grand_flame/tick/vfx/landing/random.mcfunction → 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]

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

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

Asset/data/asset/functions/object/1041.grand_flame/tick/vfx/flying.mcfunction → 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
 #
 #
 #