diff --git a/Asset/data/asset/functions/mob/0331.aurora_sorcerer/tick/summon.mcfunction b/Asset/data/asset/functions/mob/0331.aurora_sorcerer/tick/summon.mcfunction index aa931cf0237..52622799747 100644 --- a/Asset/data/asset/functions/mob/0331.aurora_sorcerer/tick/summon.mcfunction +++ b/Asset/data/asset/functions/mob/0331.aurora_sorcerer/tick/summon.mcfunction @@ -8,12 +8,8 @@ function api:global_vars/get_difficulty execute store result storage api: Argument.FieldOverride.MPReducePer float 2.5 run data get storage api: Return.Difficulty -# ハードなら強化設定をtrueに - execute if predicate api:global_vars/difficulty/min/3_blessless run data modify storage api: Argument.FieldOverride.Enhanced set value true - # 召喚 data modify storage api: Argument.ID set value 2080 data modify storage api: Argument.FieldOverride.Damage set from storage asset:context this.Damage - data modify storage api: Argument.FieldOverride.Rotation set from entity @s Rotation execute store result storage api: Argument.FieldOverride.MobUUID int 1 run scoreboard players get @s MobUUID function api:object/summon diff --git a/Asset/data/asset/functions/object/2080.aurora_missile/_index.d.mcfunction b/Asset/data/asset/functions/object/2080.aurora_missile/_index.d.mcfunction index ab99d446cd9..06654206bf9 100644 --- a/Asset/data/asset/functions/object/2080.aurora_missile/_index.d.mcfunction +++ b/Asset/data/asset/functions/object/2080.aurora_missile/_index.d.mcfunction @@ -4,5 +4,4 @@ #> tag # @within function asset:object/2080.aurora_missile/** #declare score_holder $Interval - #declare tag 2080.Enhanced #declare tag 2080.AlreadyHit diff --git a/Asset/data/asset/functions/object/2080.aurora_missile/detect_hit_block/.mcfunction b/Asset/data/asset/functions/object/2080.aurora_missile/detect_hit_block/.mcfunction index a0464dc502b..d12430976bb 100644 --- a/Asset/data/asset/functions/object/2080.aurora_missile/detect_hit_block/.mcfunction +++ b/Asset/data/asset/functions/object/2080.aurora_missile/detect_hit_block/.mcfunction @@ -5,5 +5,4 @@ # @within asset:object/alias/2080/detect_hit_block # 判定 - execute if entity @s[tag=!2080.Enhanced] unless block ^ ^ ^0.5 #lib:no_collision/ run data modify storage asset:context IsHitBlock set value true - execute if entity @s[tag=2080.Enhanced] unless block ^ ^ ^0.7 #lib:no_collision/ run data modify storage asset:context IsHitBlock set value true + execute unless block ^ ^ ^0.5 #lib:no_collision/ run data modify storage asset:context IsHitBlock set value true diff --git a/Asset/data/asset/functions/object/2080.aurora_missile/hit_block/.mcfunction b/Asset/data/asset/functions/object/2080.aurora_missile/hit_block/.mcfunction deleted file mode 100644 index d469ec68e6b..00000000000 --- a/Asset/data/asset/functions/object/2080.aurora_missile/hit_block/.mcfunction +++ /dev/null @@ -1,14 +0,0 @@ -#> asset:object/2080.aurora_missile/hit_block/ -# -# 継承先などから実行される処理 -# -# @within asset:object/alias/2080/hit_block - -# Enhanced:trueではないかつ、スコアが一定値以下の場合はkillメソッドとは別で消滅する - execute if entity @s[tag=!2080.Enhanced,scores={General.Object.Tick=..19}] run kill @s - -# Enhanced:trueではなかつ、スコアが一定値以上の場合はkillメソッド呼び出し - execute if entity @s[tag=!2080.Enhanced,scores={General.Object.Tick=20..}] run function asset:object/call.m {method:kill} - -# Enhanced:trueなら問答無用でkillメソッド呼び出し - execute if data storage asset:context this{Enhanced:true} run function asset:object/call.m {method:kill} diff --git a/Asset/data/asset/functions/object/2080.aurora_missile/init/.mcfunction b/Asset/data/asset/functions/object/2080.aurora_missile/init/.mcfunction deleted file mode 100644 index 8dbaf4ba2fe..00000000000 --- a/Asset/data/asset/functions/object/2080.aurora_missile/init/.mcfunction +++ /dev/null @@ -1,18 +0,0 @@ -#> asset:object/2080.aurora_missile/init/ -# -# Objectのinit時の処理 -# -# @within asset:object/alias/2080/init - -# Enhanced:trueならTagを付与 - execute if data storage asset:context this{Enhanced:true} run tag @s add 2080.Enhanced - -# スピード設定 - data modify storage asset:context this.Speed set value 1 - data modify storage asset:context this.Range set value 50 -# Enhancedタグがあるか否かでMovePerStepを変える - execute if entity @s[tag=!2080.Enhanced] run data modify storage asset:context this.MovePerStep set value 0.35 - execute if entity @s[tag=2080.Enhanced] run data modify storage asset:context this.MovePerStep set value 0.5 - -# スーパーメソッド呼び出し - function asset:object/super.init diff --git a/Asset/data/asset/functions/object/2080.aurora_missile/kill/main.mcfunction b/Asset/data/asset/functions/object/2080.aurora_missile/kill/main.mcfunction index ae24b68934e..a7acd58b493 100644 --- a/Asset/data/asset/functions/object/2080.aurora_missile/kill/main.mcfunction +++ b/Asset/data/asset/functions/object/2080.aurora_missile/kill/main.mcfunction @@ -5,13 +5,15 @@ # @within function asset:object/2080.aurora_missile/kill/ # 演出 - execute if entity @s[tag=!2080.Enhanced] rotated ~ 0 positioned ~ ~0.3 ~ run function asset:object/2080.aurora_missile/kill/vfx/normal - execute if entity @s[tag=2080.Enhanced] rotated ~ 0 positioned ~ ~0.3 ~ run function asset:object/2080.aurora_missile/kill/vfx/enhanced - particle dust_color_transition 0.000 1.000 0.886 2 0 0.235 1 ~ ~1.5 ~ 1.3 1.2 1.3 0 60 playsound entity.evoker.prepare_summon hostile @a ~ ~ ~ 0.8 1.5 0 + particle dust_color_transition 0.4 1 0.8 1.5 0.5 0.65 1 ~ ~1.5 ~ 1.2 1.2 1.2 0 12 + +# 演出用Object + data modify storage api: Argument.ID set value 2276 + data modify storage api: Argument.FieldOverride.Scale set value 4f + function api:object/summon # ダメージ -# Enhancedタグがによって範囲が変わる data modify storage api: Argument.Damage set from storage asset:context this.Damage data modify storage api: Argument.AttackType set value "Magic" data modify storage api: Argument.ElementType set value "Thunder" @@ -19,11 +21,8 @@ data modify storage api: Argument.DeathMessage append value '{"translate": "%1$sは%2$sによって空の塵になった","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"lib:","interpret":true}]}' data modify storage api: Argument.MobUUID set from storage asset:context this.MobUUID function api:damage/modifier_manual - execute if entity @s[tag=!2080.Enhanced] as @a[tag=!PlayerShouldInvulnerable,distance=..2] run function api:damage/ - execute if entity @s[tag=2080.Enhanced] as @a[tag=!PlayerShouldInvulnerable,distance=..3] run function api:damage/ + execute positioned ~-2 ~ ~-2 as @a[tag=!PlayerShouldInvulnerable,dx=3,dy=0.5,dz=3] run function api:damage/ function api:damage/reset # 各プレイヤーのMPを減らす -# Enhancedによって範囲が変わる - execute if entity @s[tag=!2080.Enhanced] as @a[tag=!PlayerShouldInvulnerable,distance=..2] run function asset:object/2080.aurora_missile/kill/mp_reduce - execute if entity @s[tag=2080.Enhanced] as @a[tag=!PlayerShouldInvulnerable,distance=..3] run function asset:object/2080.aurora_missile/kill/mp_reduce + execute positioned ~-2 ~ ~-2 as @a[tag=!PlayerShouldInvulnerable,dx=3,dy=0.5,dz=3] run function asset:object/2080.aurora_missile/kill/mp_reduce diff --git a/Asset/data/asset/functions/object/2080.aurora_missile/kill/vfx/enhanced.mcfunction b/Asset/data/asset/functions/object/2080.aurora_missile/kill/vfx/enhanced.mcfunction deleted file mode 100644 index ffd89d13f94..00000000000 --- a/Asset/data/asset/functions/object/2080.aurora_missile/kill/vfx/enhanced.mcfunction +++ /dev/null @@ -1,123 +0,0 @@ -#> asset:object/2080.aurora_missile/kill/vfx/enhanced -# -# -# -# @within function asset:object/2080.aurora_missile/kill/main - -# 円 1 -particle dust 0.000 1.000 0.949 3 ^0 ^ ^-3 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^0.4693 ^ ^-2.96307 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^0.92705 ^ ^-2.85317 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^1.36197 ^ ^-2.67302 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^1.76336 ^ ^-2.42705 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^2.12132 ^ ^-2.12132 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^2.42705 ^ ^-1.76336 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^2.67302 ^ ^-1.36197 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^2.85317 ^ ^-0.92705 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^2.96307 ^ ^-0.4693 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^3 ^ ^0 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^2.96307 ^ ^0.4693 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^2.85317 ^ ^0.92705 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^2.67302 ^ ^1.36197 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^2.42705 ^ ^1.76336 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^2.12132 ^ ^2.12132 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^1.76336 ^ ^2.42705 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^1.36197 ^ ^2.67302 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^0.92705 ^ ^2.85317 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^0.4693 ^ ^2.96307 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^0 ^ ^3 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^-0.4693 ^ ^2.96307 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^-0.92705 ^ ^2.85317 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^-1.36197 ^ ^2.67302 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^-1.76336 ^ ^2.42705 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^-2.12132 ^ ^2.12132 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^-2.42705 ^ ^1.76336 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^-2.67302 ^ ^1.36197 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^-2.85317 ^ ^0.92705 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^-2.96307 ^ ^0.4693 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^-3 ^ ^0 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^-2.96307 ^ ^-0.4693 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^-2.85317 ^ ^-0.92705 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^-2.67302 ^ ^-1.36197 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^-2.42705 ^ ^-1.76336 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^-2.12132 ^ ^-2.12132 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^-1.76336 ^ ^-2.42705 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^-1.36197 ^ ^-2.67302 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^-0.92705 ^ ^-2.85317 0 0 0 0 1 -particle dust 0.000 1.000 0.949 3 ^-0.4693 ^ ^-2.96307 0 0 0 0 1 -# 円 2 -particle dust 0.000 0.867 0.918 3 ^0 ^ ^-2 0 0 0 0 1 -particle dust 0.000 0.867 0.918 3 ^0.39018 ^ ^-1.96157 0 0 0 0 1 -particle dust 0.000 0.867 0.918 3 ^0.76537 ^ ^-1.84776 0 0 0 0 1 -particle dust 0.000 0.867 0.918 3 ^1.11114 ^ ^-1.66294 0 0 0 0 1 -particle dust 0.000 0.867 0.918 3 ^1.41421 ^ ^-1.41421 0 0 0 0 1 -particle dust 0.000 0.867 0.918 3 ^1.66294 ^ ^-1.11114 0 0 0 0 1 -particle dust 0.000 0.867 0.918 3 ^1.84776 ^ ^-0.76537 0 0 0 0 1 -particle dust 0.000 0.867 0.918 3 ^1.96157 ^ ^-0.39018 0 0 0 0 1 -particle dust 0.000 0.867 0.918 3 ^2 ^ ^0 0 0 0 0 1 -particle dust 0.000 0.867 0.918 3 ^1.96157 ^ ^0.39018 0 0 0 0 1 -particle dust 0.000 0.867 0.918 3 ^1.84776 ^ ^0.76537 0 0 0 0 1 -particle dust 0.000 0.867 0.918 3 ^1.66294 ^ ^1.11114 0 0 0 0 1 -particle dust 0.000 0.867 0.918 3 ^1.41421 ^ ^1.41421 0 0 0 0 1 -particle dust 0.000 0.867 0.918 3 ^1.11114 ^ ^1.66294 0 0 0 0 1 -particle dust 0.000 0.867 0.918 3 ^0.76537 ^ ^1.84776 0 0 0 0 1 -particle dust 0.000 0.867 0.918 3 ^0.39018 ^ ^1.96157 0 0 0 0 1 -particle dust 0.000 0.867 0.918 3 ^0 ^ ^2 0 0 0 0 1 -particle dust 0.000 0.867 0.918 3 ^-0.39018 ^ ^1.96157 0 0 0 0 1 -particle dust 0.000 0.867 0.918 3 ^-0.76537 ^ ^1.84776 0 0 0 0 1 -particle dust 0.000 0.867 0.918 3 ^-1.11114 ^ ^1.66294 0 0 0 0 1 -particle dust 0.000 0.867 0.918 3 ^-1.41421 ^ ^1.41421 0 0 0 0 1 -particle dust 0.000 0.867 0.918 3 ^-1.66294 ^ ^1.11114 0 0 0 0 1 -particle dust 0.000 0.867 0.918 3 ^-1.84776 ^ ^0.76537 0 0 0 0 1 -particle dust 0.000 0.867 0.918 3 ^-1.96157 ^ ^0.39018 0 0 0 0 1 -particle dust 0.000 0.867 0.918 3 ^-2 ^ ^0 0 0 0 0 1 -particle dust 0.000 0.867 0.918 3 ^-1.96157 ^ ^-0.39018 0 0 0 0 1 -particle dust 0.000 0.867 0.918 3 ^-1.84776 ^ ^-0.76537 0 0 0 0 1 -particle dust 0.000 0.867 0.918 3 ^-1.66294 ^ ^-1.11114 0 0 0 0 1 -particle dust 0.000 0.867 0.918 3 ^-1.41421 ^ ^-1.41421 0 0 0 0 1 -particle dust 0.000 0.867 0.918 3 ^-1.11114 ^ ^-1.66294 0 0 0 0 1 -particle dust 0.000 0.867 0.918 3 ^-0.76537 ^ ^-1.84776 0 0 0 0 1 -particle dust 0.000 0.867 0.918 3 ^-0.39018 ^ ^-1.96157 0 0 0 0 1 -# 円 3 -particle dust 0.000 0.804 0.933 3 ^0 ^ ^-1 0 0 0 0 1 -particle dust 0.000 0.804 0.933 3 ^0.25882 ^ ^-0.96593 0 0 0 0 1 -particle dust 0.000 0.804 0.933 3 ^0.5 ^ ^-0.86603 0 0 0 0 1 -particle dust 0.000 0.804 0.933 3 ^0.70711 ^ ^-0.70711 0 0 0 0 1 -particle dust 0.000 0.804 0.933 3 ^0.86603 ^ ^-0.5 0 0 0 0 1 -particle dust 0.000 0.804 0.933 3 ^0.96593 ^ ^-0.25882 0 0 0 0 1 -particle dust 0.000 0.804 0.933 3 ^1 ^ ^0 0 0 0 0 1 -particle dust 0.000 0.804 0.933 3 ^0.96593 ^ ^0.25882 0 0 0 0 1 -particle dust 0.000 0.804 0.933 3 ^0.86603 ^ ^0.5 0 0 0 0 1 -particle dust 0.000 0.804 0.933 3 ^0.70711 ^ ^0.70711 0 0 0 0 1 -particle dust 0.000 0.804 0.933 3 ^0.5 ^ ^0.86603 0 0 0 0 1 -particle dust 0.000 0.804 0.933 3 ^0.25882 ^ ^0.96593 0 0 0 0 1 -particle dust 0.000 0.804 0.933 3 ^0 ^ ^1 0 0 0 0 1 -particle dust 0.000 0.804 0.933 3 ^-0.25882 ^ ^0.96593 0 0 0 0 1 -particle dust 0.000 0.804 0.933 3 ^-0.5 ^ ^0.86603 0 0 0 0 1 -particle dust 0.000 0.804 0.933 3 ^-0.70711 ^ ^0.70711 0 0 0 0 1 -particle dust 0.000 0.804 0.933 3 ^-0.86603 ^ ^0.5 0 0 0 0 1 -particle dust 0.000 0.804 0.933 3 ^-0.96593 ^ ^0.25882 0 0 0 0 1 -particle dust 0.000 0.804 0.933 3 ^-1 ^ ^0 0 0 0 0 1 -particle dust 0.000 0.804 0.933 3 ^-0.96593 ^ ^-0.25882 0 0 0 0 1 -particle dust 0.000 0.804 0.933 3 ^-0.86603 ^ ^-0.5 0 0 0 0 1 -particle dust 0.000 0.804 0.933 3 ^-0.70711 ^ ^-0.70711 0 0 0 0 1 -particle dust 0.000 0.804 0.933 3 ^-0.5 ^ ^-0.86603 0 0 0 0 1 -particle dust 0.000 0.804 0.933 3 ^-0.25882 ^ ^-0.96593 0 0 0 0 1 - -# 円 4 -particle dust 0.000 0.545 1.000 3 ^0 ^ ^-0.5 0 0 0 0 1 -particle dust 0.000 0.545 1.000 3 ^0.19134 ^ ^-0.46194 0 0 0 0 1 -particle dust 0.000 0.545 1.000 3 ^0.35355 ^ ^-0.35355 0 0 0 0 1 -particle dust 0.000 0.545 1.000 3 ^0.46194 ^ ^-0.19134 0 0 0 0 1 -particle dust 0.000 0.545 1.000 3 ^0.5 ^ ^0 0 0 0 0 1 -particle dust 0.000 0.545 1.000 3 ^0.46194 ^ ^0.19134 0 0 0 0 1 -particle dust 0.000 0.545 1.000 3 ^0.35355 ^ ^0.35355 0 0 0 0 1 -particle dust 0.000 0.545 1.000 3 ^0.19134 ^ ^0.46194 0 0 0 0 1 -particle dust 0.000 0.545 1.000 3 ^0 ^ ^0.5 0 0 0 0 1 -particle dust 0.000 0.545 1.000 3 ^-0.19134 ^ ^0.46194 0 0 0 0 1 -particle dust 0.000 0.545 1.000 3 ^-0.35355 ^ ^0.35355 0 0 0 0 1 -particle dust 0.000 0.545 1.000 3 ^-0.46194 ^ ^0.19134 0 0 0 0 1 -particle dust 0.000 0.545 1.000 3 ^-0.5 ^ ^0 0 0 0 0 1 -particle dust 0.000 0.545 1.000 3 ^-0.46194 ^ ^-0.19134 0 0 0 0 1 -particle dust 0.000 0.545 1.000 3 ^-0.35355 ^ ^-0.35355 0 0 0 0 1 -particle dust 0.000 0.545 1.000 3 ^-0.19134 ^ ^-0.46194 0 0 0 0 1 diff --git a/Asset/data/asset/functions/object/2080.aurora_missile/kill/vfx/normal.mcfunction b/Asset/data/asset/functions/object/2080.aurora_missile/kill/vfx/normal.mcfunction deleted file mode 100644 index cd766a7cd9f..00000000000 --- a/Asset/data/asset/functions/object/2080.aurora_missile/kill/vfx/normal.mcfunction +++ /dev/null @@ -1,83 +0,0 @@ -#> asset:object/2080.aurora_missile/kill/vfx/normal -# -# -# -# @within function asset:object/2080.aurora_missile/kill/main - -# [ImportKey]: NobwRALgngDgpmAXGAxgSwE4oDYIDRgCuhaAJkmAGwCGArCtQMwCcALALTXMBMADO61oBGSuwBGAdgBmHXqXrdatZrV5ihYAgDtqAWwTJAYYoACDQRjUMegM5JwKAPaEtEJK14EUcF3Ax2wAG7U2IQG4AAeSB5gUFEAvnEEVqRohLaIjATWEJauiNFw2NhoMNYGQrzRGA45EAbRaNYAokUlZU0AjoTB2FAAyhZe5IhSwWUJeODQ8BToWLiaRCTDVHAAHKTczMxSAmKMu6w7tOLUpGLscNyMa6xrEtxCErTUizr6FCbcixZWuun2JwuJCMbiebx1PyIcBBEJhMCRfIEWL5CZgZKpdJgsDZXJRAiFYqlcqVJI1ah1fFgRotIntLo9fqDODDUbYcaJKawAyoTA4fBLMizFASRhyZTsFSUZgCOBCDjMRiMITsFC8MXyRgoVRwKRvPQ8kyMH6WGz+RzOPLcVjgnxQmHBUL+RHRFG8NEYtJIIRZHIYPIFVrE72k9HkylI6nNIP07pFJnUIZINkcyaQbmzPkLAjEIXIMRyq4SCQXIQqC6sOAscS0biiW5y7hrRikK6MCT6j5GYysE1-AGoIF5ES2yH+WFO6EIqluj1nTFRAB0tF9eMjhLaJKq4fqBBpMbgnTjvQGiZZybGcASAF0gA_3 -# 円 2 -particle dust 0.000 1.000 0.918 3 ^0 ^ ^-2 0 0 0 0 1 -particle dust 0.000 1.000 0.918 3 ^0.39018 ^ ^-1.96157 0 0 0 0 1 -particle dust 0.000 1.000 0.918 3 ^0.76537 ^ ^-1.84776 0 0 0 0 1 -particle dust 0.000 1.000 0.918 3 ^1.11114 ^ ^-1.66294 0 0 0 0 1 -particle dust 0.000 1.000 0.918 3 ^1.41421 ^ ^-1.41421 0 0 0 0 1 -particle dust 0.000 1.000 0.918 3 ^1.66294 ^ ^-1.11114 0 0 0 0 1 -particle dust 0.000 1.000 0.918 3 ^1.84776 ^ ^-0.76537 0 0 0 0 1 -particle dust 0.000 1.000 0.918 3 ^1.96157 ^ ^-0.39018 0 0 0 0 1 -particle dust 0.000 1.000 0.918 3 ^2 ^ ^0 0 0 0 0 1 -particle dust 0.000 1.000 0.918 3 ^1.96157 ^ ^0.39018 0 0 0 0 1 -particle dust 0.000 1.000 0.918 3 ^1.84776 ^ ^0.76537 0 0 0 0 1 -particle dust 0.000 1.000 0.918 3 ^1.66294 ^ ^1.11114 0 0 0 0 1 -particle dust 0.000 1.000 0.918 3 ^1.41421 ^ ^1.41421 0 0 0 0 1 -particle dust 0.000 1.000 0.918 3 ^1.11114 ^ ^1.66294 0 0 0 0 1 -particle dust 0.000 1.000 0.918 3 ^0.76537 ^ ^1.84776 0 0 0 0 1 -particle dust 0.000 1.000 0.918 3 ^0.39018 ^ ^1.96157 0 0 0 0 1 -particle dust 0.000 1.000 0.918 3 ^0 ^ ^2 0 0 0 0 1 -particle dust 0.000 1.000 0.918 3 ^-0.39018 ^ ^1.96157 0 0 0 0 1 -particle dust 0.000 1.000 0.918 3 ^-0.76537 ^ ^1.84776 0 0 0 0 1 -particle dust 0.000 1.000 0.918 3 ^-1.11114 ^ ^1.66294 0 0 0 0 1 -particle dust 0.000 1.000 0.918 3 ^-1.41421 ^ ^1.41421 0 0 0 0 1 -particle dust 0.000 1.000 0.918 3 ^-1.66294 ^ ^1.11114 0 0 0 0 1 -particle dust 0.000 1.000 0.918 3 ^-1.84776 ^ ^0.76537 0 0 0 0 1 -particle dust 0.000 1.000 0.918 3 ^-1.96157 ^ ^0.39018 0 0 0 0 1 -particle dust 0.000 1.000 0.918 3 ^-2 ^ ^0 0 0 0 0 1 -particle dust 0.000 1.000 0.918 3 ^-1.96157 ^ ^-0.39018 0 0 0 0 1 -particle dust 0.000 1.000 0.918 3 ^-1.84776 ^ ^-0.76537 0 0 0 0 1 -particle dust 0.000 1.000 0.918 3 ^-1.66294 ^ ^-1.11114 0 0 0 0 1 -particle dust 0.000 1.000 0.918 3 ^-1.41421 ^ ^-1.41421 0 0 0 0 1 -particle dust 0.000 1.000 0.918 3 ^-1.11114 ^ ^-1.66294 0 0 0 0 1 -particle dust 0.000 1.000 0.918 3 ^-0.76537 ^ ^-1.84776 0 0 0 0 1 -particle dust 0.000 1.000 0.918 3 ^-0.39018 ^ ^-1.96157 0 0 0 0 1 -# 円 3 -particle dust 0.000 0.878 0.914 3 ^0 ^ ^-1 0 0 0 0 1 -particle dust 0.000 0.878 0.914 3 ^0.25882 ^ ^-0.96593 0 0 0 0 1 -particle dust 0.000 0.878 0.914 3 ^0.5 ^ ^-0.86603 0 0 0 0 1 -particle dust 0.000 0.878 0.914 3 ^0.70711 ^ ^-0.70711 0 0 0 0 1 -particle dust 0.000 0.878 0.914 3 ^0.86603 ^ ^-0.5 0 0 0 0 1 -particle dust 0.000 0.878 0.914 3 ^0.96593 ^ ^-0.25882 0 0 0 0 1 -particle dust 0.000 0.878 0.914 3 ^1 ^ ^0 0 0 0 0 1 -particle dust 0.000 0.878 0.914 3 ^0.96593 ^ ^0.25882 0 0 0 0 1 -particle dust 0.000 0.878 0.914 3 ^0.86603 ^ ^0.5 0 0 0 0 1 -particle dust 0.000 0.878 0.914 3 ^0.70711 ^ ^0.70711 0 0 0 0 1 -particle dust 0.000 0.878 0.914 3 ^0.5 ^ ^0.86603 0 0 0 0 1 -particle dust 0.000 0.878 0.914 3 ^0.25882 ^ ^0.96593 0 0 0 0 1 -particle dust 0.000 0.878 0.914 3 ^0 ^ ^1 0 0 0 0 1 -particle dust 0.000 0.878 0.914 3 ^-0.25882 ^ ^0.96593 0 0 0 0 1 -particle dust 0.000 0.878 0.914 3 ^-0.5 ^ ^0.86603 0 0 0 0 1 -particle dust 0.000 0.878 0.914 3 ^-0.70711 ^ ^0.70711 0 0 0 0 1 -particle dust 0.000 0.878 0.914 3 ^-0.86603 ^ ^0.5 0 0 0 0 1 -particle dust 0.000 0.878 0.914 3 ^-0.96593 ^ ^0.25882 0 0 0 0 1 -particle dust 0.000 0.878 0.914 3 ^-1 ^ ^0 0 0 0 0 1 -particle dust 0.000 0.878 0.914 3 ^-0.96593 ^ ^-0.25882 0 0 0 0 1 -particle dust 0.000 0.878 0.914 3 ^-0.86603 ^ ^-0.5 0 0 0 0 1 -particle dust 0.000 0.878 0.914 3 ^-0.70711 ^ ^-0.70711 0 0 0 0 1 -particle dust 0.000 0.878 0.914 3 ^-0.5 ^ ^-0.86603 0 0 0 0 1 -particle dust 0.000 0.878 0.914 3 ^-0.25882 ^ ^-0.96593 0 0 0 0 1 - -# 円 4 -particle dust 0.000 0.545 1.000 3 ^0 ^ ^-0.5 0 0 0 0 1 -particle dust 0.000 0.545 1.000 3 ^0.19134 ^ ^-0.46194 0 0 0 0 1 -particle dust 0.000 0.545 1.000 3 ^0.35355 ^ ^-0.35355 0 0 0 0 1 -particle dust 0.000 0.545 1.000 3 ^0.46194 ^ ^-0.19134 0 0 0 0 1 -particle dust 0.000 0.545 1.000 3 ^0.5 ^ ^0 0 0 0 0 1 -particle dust 0.000 0.545 1.000 3 ^0.46194 ^ ^0.19134 0 0 0 0 1 -particle dust 0.000 0.545 1.000 3 ^0.35355 ^ ^0.35355 0 0 0 0 1 -particle dust 0.000 0.545 1.000 3 ^0.19134 ^ ^0.46194 0 0 0 0 1 -particle dust 0.000 0.545 1.000 3 ^0 ^ ^0.5 0 0 0 0 1 -particle dust 0.000 0.545 1.000 3 ^-0.19134 ^ ^0.46194 0 0 0 0 1 -particle dust 0.000 0.545 1.000 3 ^-0.35355 ^ ^0.35355 0 0 0 0 1 -particle dust 0.000 0.545 1.000 3 ^-0.46194 ^ ^0.19134 0 0 0 0 1 -particle dust 0.000 0.545 1.000 3 ^-0.5 ^ ^0 0 0 0 0 1 -particle dust 0.000 0.545 1.000 3 ^-0.46194 ^ ^-0.19134 0 0 0 0 1 -particle dust 0.000 0.545 1.000 3 ^-0.35355 ^ ^-0.35355 0 0 0 0 1 -particle dust 0.000 0.545 1.000 3 ^-0.19134 ^ ^-0.46194 0 0 0 0 1 diff --git a/Asset/data/asset/functions/object/2080.aurora_missile/register.mcfunction b/Asset/data/asset/functions/object/2080.aurora_missile/register.mcfunction index 8615ae3b557..9c2edd85f58 100644 --- a/Asset/data/asset/functions/object/2080.aurora_missile/register.mcfunction +++ b/Asset/data/asset/functions/object/2080.aurora_missile/register.mcfunction @@ -17,4 +17,13 @@ # ID (int) data modify storage asset:object ID set value 2080 # フィールド(オプション) - # data modify storage asset:object Field.myValue set value + +# 飛翔体抽象に必要なデータ + data modify storage asset:object Field.Speed set value 1 + data modify storage asset:object Field.Range set value 50 + data modify storage asset:object Field.MovePerStep set value 0.5 + +# 回転関係 + data modify storage asset:object Field.Spin set value 4 + data modify storage asset:object Field.SpinInterval._ set value 0 + data modify storage asset:object Field.SpinInterval.Max set value 4 diff --git a/Asset/data/asset/functions/object/2080.aurora_missile/summon/m.mcfunction b/Asset/data/asset/functions/object/2080.aurora_missile/summon/m.mcfunction index 7f7fc5912f7..146a615ee20 100644 --- a/Asset/data/asset/functions/object/2080.aurora_missile/summon/m.mcfunction +++ b/Asset/data/asset/functions/object/2080.aurora_missile/summon/m.mcfunction @@ -7,4 +7,4 @@ # @within function asset:object/2080.aurora_missile/summon/ # 元となるEntityを召喚する - $summon marker ~ ~ ~ {Tags:["ObjectInit"],Rotation:$(Rotation)} + $summon item_display ~ ~ ~ {Rotation:$(Rotation),Tags:["ObjectInit"],teleport_duration:1,item:{id:"minecraft:stick",Count:1b,tag:{CustomModelData:20601}},brightness:{sky:15,block:15},transformation:{translation:[0.0f,0.0f,0.0f],left_rotation:[0.0f,0.0f,0.0f,1.0f],scale:[1.2f,1.2f,1.2f],right_rotation:[0.0f,0.0f,0.0f,1.0f]}} diff --git a/Asset/data/asset/functions/object/2080.aurora_missile/tick/.mcfunction b/Asset/data/asset/functions/object/2080.aurora_missile/tick/.mcfunction index 048fa0fd2b5..730ae28e05b 100644 --- a/Asset/data/asset/functions/object/2080.aurora_missile/tick/.mcfunction +++ b/Asset/data/asset/functions/object/2080.aurora_missile/tick/.mcfunction @@ -7,14 +7,22 @@ # Tick加算 scoreboard players add @s General.Object.Tick 1 -# 通常 - execute if entity @s[tag=!2080.Enhanced] run function asset:object/2080.aurora_missile/tick/normal +# 演出 + particle dust_color_transition 0.4 1 0.8 1.5 0.5 0.65 1 ~ ~ ~ 0.1 0.1 0.1 0 1 -# 強化版 - execute if entity @s[tag=2080.Enhanced] run function asset:object/2080.aurora_missile/tick/enhanced +# 一定間隔でplaysound + scoreboard players operation $Interval Temporary = @s General.Object.Tick + scoreboard players operation $Interval Temporary %= $4 Const + execute if score $Interval Temporary matches 0 run playsound block.beacon.power_select hostile @a ~ ~ ~ 0.4 2 0 + scoreboard players reset $Interval Temporary + +# 最初の20tickは誘導弾になる + execute if entity @s[scores={General.Object.Tick=..20}] facing entity @p[gamemode=!spectator,distance=..64] feet positioned ^ ^ ^-150 rotated as @s positioned ^ ^ ^-800 facing entity @s feet positioned as @s run tp @s ~ ~ ~ ~ ~ # スーパーメソッド呼び出し execute at @s run function asset:object/super.tick -# 消滅処理 - kill @s[scores={General.Object.Tick=1000..}] +# 3tick目から回転 + execute store result storage asset:context this.SpinInterval._ int 0.9999999999 run data get storage asset:context this.SpinInterval._ + execute if data storage asset:context this.SpinInterval{_:0} if score @s General.Object.Tick matches 3.. run function asset:object/2080.aurora_missile/tick/spin + execute if data storage asset:context this.SpinInterval{_:0} if score @s General.Object.Tick matches 3.. run data modify storage asset:context this.SpinInterval._ set from storage asset:context this.SpinInterval.Max diff --git a/Asset/data/asset/functions/object/2080.aurora_missile/tick/enhanced.mcfunction b/Asset/data/asset/functions/object/2080.aurora_missile/tick/enhanced.mcfunction deleted file mode 100644 index 7d16c4b9190..00000000000 --- a/Asset/data/asset/functions/object/2080.aurora_missile/tick/enhanced.mcfunction +++ /dev/null @@ -1,23 +0,0 @@ -#> asset:object/2080.aurora_missile/tick/enhanced -# -# -# -# @within function asset:object/2080.aurora_missile/tick/ - -# 演出 - particle dust_color_transition 0.000 1.000 0.886 2 0 0.235 1 ~ ~ ~ 0.2 0.2 0.2 0 3 normal @a - -# 一定間隔でplaysound - scoreboard players operation $Interval Temporary = @s General.Object.Tick - scoreboard players operation $Interval Temporary %= $4 Const - execute if score $Interval Temporary matches 0 run playsound block.beacon.power_select hostile @a ~ ~ ~ 0.4 2 0 - scoreboard players reset $Interval Temporary - -# 最初の20tickは誘導弾になる - execute if entity @s[scores={General.Object.Tick=..20}] facing entity @p feet positioned ^ ^ ^-150 rotated as @s positioned ^ ^ ^-800 facing entity @s feet positioned as @s run tp @s ~ ~ ~ ~ ~ - -# それ以降は前進する - execute if entity @s[scores={General.Object.Tick=21}] run data modify storage asset:context this.MovePerStep set value 0.7 - -# 消滅 - execute if entity @s[scores={General.Object.Tick=50..}] run function asset:object/call.m {method:kill} diff --git a/Asset/data/asset/functions/object/2080.aurora_missile/tick/normal.mcfunction b/Asset/data/asset/functions/object/2080.aurora_missile/tick/normal.mcfunction deleted file mode 100644 index 703e36fe50f..00000000000 --- a/Asset/data/asset/functions/object/2080.aurora_missile/tick/normal.mcfunction +++ /dev/null @@ -1,24 +0,0 @@ -#> asset:object/2080.aurora_missile/tick/normal -# -# -# -# @within function asset:object/2080.aurora_missile/tick/ - -# 演出 - execute if entity @s[scores={General.Object.Tick=..19}] run particle dust_color_transition 0 0.408 0.361 1 0 0.114 0.478 ~ ~ ~ 0 0 0 0 3 normal @a - execute if entity @s[scores={General.Object.Tick=20..}] run particle dust_color_transition 0.000 1.000 0.886 2 0 0.235 1 ~ ~ ~ 0.2 0.2 0.2 0 3 normal @a - -# 一定間隔でplaysound - scoreboard players operation $Interval Temporary = @s General.Object.Tick - scoreboard players operation $Interval Temporary %= $4 Const - execute if score $Interval Temporary matches 0 run playsound block.beacon.power_select hostile @a ~ ~ ~ 0.4 2 0 - scoreboard players reset $Interval Temporary - -# 最初の20tickは誘導弾になる - execute if entity @s[scores={General.Object.Tick=..20}] facing entity @p feet positioned ^ ^ ^-100 rotated as @s positioned ^ ^ ^-800 facing entity @s feet positioned as @s run tp @s ~ ~ ~ ~ ~ - -# それ以降は前進する - execute if entity @s[scores={General.Object.Tick=21}] run data modify storage asset:context this.MovePerStep set value 0.5 - -# 消滅 - execute if entity @s[scores={General.Object.Tick=50..}] run function asset:object/call.m {method:kill} diff --git a/Asset/data/asset/functions/object/2080.aurora_missile/tick/spin.mcfunction b/Asset/data/asset/functions/object/2080.aurora_missile/tick/spin.mcfunction new file mode 100644 index 00000000000..5e392607574 --- /dev/null +++ b/Asset/data/asset/functions/object/2080.aurora_missile/tick/spin.mcfunction @@ -0,0 +1,21 @@ +#> asset:object/2080.aurora_missile/tick/spin +# +# +# +# @within function asset:object/2080.aurora_missile/tick/ + +# start_interpolation + data modify entity @s start_interpolation set value 0 + +# interpolation_duration + data modify entity @s interpolation_duration set from storage asset:context this.SpinInterval.Max + +# 回転 + execute store result storage asset:context this.Spin int 0.9999999999 run data get storage asset:context this.Spin + execute if data storage asset:context this{Spin:3} run data modify entity @s transformation.left_rotation set value [0.0f,0.0f,-0.7071f,0.7071f] + execute if data storage asset:context this{Spin:2} run data modify entity @s transformation.left_rotation set value [0.0f,0.0f,1.0f,0.0f] + execute if data storage asset:context this{Spin:1} run data modify entity @s transformation.left_rotation set value [0.0f,0.0f,0.7071f,0.7071f] + execute if data storage asset:context this{Spin:0} run data modify entity @s transformation.left_rotation set value [0.0f,0.0f,0.0f,1.0f] + +# リセット + execute if data storage asset:context this{Spin:0} run data modify storage asset:context this.Spin set value 4 diff --git a/Asset/data/asset/functions/object/2276.aurora_wave/init/.mcfunction b/Asset/data/asset/functions/object/2276.aurora_wave/init/.mcfunction new file mode 100644 index 00000000000..476101971cd --- /dev/null +++ b/Asset/data/asset/functions/object/2276.aurora_wave/init/.mcfunction @@ -0,0 +1,33 @@ +#> asset:object/2276.aurora_wave/init/ +# +# Objectのinit時の処理 +# +# @within asset:object/alias/2276/init + +# スコアを-3にしておく + scoreboard players set @s General.Object.Tick -3 + +# transformation用のscaleを事前にフィールドに設定しておく + data modify storage asset:context this.PreScale set value [[0f,0f,0f],[0f,0f,0f],[0f,0f,0f]] + data modify storage asset:context this.PreTranslation set value [[0f,0f,0f],[0f,0f,0f],[0f,0f,0f]] + +# 0 + data modify storage asset:context this.PreScale[0][0] set from storage asset:context this.Scale + data modify storage asset:context this.PreScale[0][1] set from storage asset:context this.Scale + data modify storage asset:context this.PreScale[0][2] set from storage asset:context this.Scale + + execute store result storage asset:context this.PreTranslation[0][1] float 0.005 run data get storage asset:context this.Scale 100 + +# 1 + data modify storage asset:context this.PreScale[1][0] set from storage asset:context this.Scale + execute store result storage asset:context this.PreScale[1][1] float 0.015 run data get storage asset:context this.Scale 100 + data modify storage asset:context this.PreScale[1][2] set from storage asset:context this.Scale + + execute store result storage asset:context this.PreTranslation[1][1] float 0.0075 run data get storage asset:context this.Scale 100 + +# 2 + data modify storage asset:context this.PreScale[2][0] set from storage asset:context this.Scale + # data modify storage asset:context this.PreScale[2][1] set value 0f + data modify storage asset:context this.PreScale[2][2] set from storage asset:context this.Scale + + # data modify storage asset:context this.PreTranslation[2][1] set value 0f diff --git a/Asset/data/asset/functions/object/2276.aurora_wave/register.mcfunction b/Asset/data/asset/functions/object/2276.aurora_wave/register.mcfunction new file mode 100644 index 00000000000..4e47a017bdb --- /dev/null +++ b/Asset/data/asset/functions/object/2276.aurora_wave/register.mcfunction @@ -0,0 +1,20 @@ +#> asset:object/2276.aurora_wave/register +# +# Objectのデータを指定 +# +# @within function asset:object/alias/2276/register + +# 継承(オプション) + # data modify storage asset:object Extends append value + # function asset:object/extends +# 他のObjectに継承されることを許可するか (boolean) (オプション) + # data modify storage asset:object ExtendsSafe set value +# 継承されることを前提とした、抽象的なObjectであるかどうか(boolean) + data modify storage asset:object IsAbstract set value false +# Tickするかどうか(boolean) (オプション) + # data modify storage asset:object IsTicking set value + +# ID (int) + data modify storage asset:object ID set value 2276 +# フィールド(オプション) + data modify storage asset:object Field.Scale set value 4f diff --git a/Asset/data/asset/functions/object/2276.aurora_wave/summon/.mcfunction b/Asset/data/asset/functions/object/2276.aurora_wave/summon/.mcfunction new file mode 100644 index 00000000000..53f5a7c82b3 --- /dev/null +++ b/Asset/data/asset/functions/object/2276.aurora_wave/summon/.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/2276.aurora_wave/summon/ +# +# Object召喚処理の呼び出し時に実行されるfunction +# +# @within asset:object/alias/2276/summon + +# 元となるEntityを召喚する + summon minecraft:item_display ~ ~ ~ {Tags:["ObjectInit"],brightness:{sky:15,block:15},item:{id:"stick",Count:1b,tag:{CustomModelData:20602}},transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],scale:[4.5f,0f,4.5f],translation:[0f,0f,0f]}} diff --git a/Asset/data/asset/functions/object/2276.aurora_wave/tick/.mcfunction b/Asset/data/asset/functions/object/2276.aurora_wave/tick/.mcfunction new file mode 100644 index 00000000000..bb5a11fa6f6 --- /dev/null +++ b/Asset/data/asset/functions/object/2276.aurora_wave/tick/.mcfunction @@ -0,0 +1,19 @@ +#> asset:object/2276.aurora_wave/tick/ +# +# Objectのtick時の処理 +# +# @within asset:object/alias/2276/tick + +# Tick加算 + scoreboard players add @s General.Object.Tick 1 + +# でかくなる + execute if score @s General.Object.Tick matches 0 run function asset:object/2276.aurora_wave/tick/transformation/0 + execute if score @s General.Object.Tick matches 3 run function asset:object/2276.aurora_wave/tick/transformation/1 + +# 小さくなる + execute if score @s General.Object.Tick matches 12 run function asset:object/2276.aurora_wave/tick/transformation/2 + + +# 消滅処理 + kill @s[scores={General.Object.Tick=25..}] diff --git a/Asset/data/asset/functions/object/2276.aurora_wave/tick/transformation/0.mcfunction b/Asset/data/asset/functions/object/2276.aurora_wave/tick/transformation/0.mcfunction new file mode 100644 index 00000000000..e0c42b0feba --- /dev/null +++ b/Asset/data/asset/functions/object/2276.aurora_wave/tick/transformation/0.mcfunction @@ -0,0 +1,15 @@ +#> asset:object/2276.aurora_wave/tick/transformation/0 +# +# +# +# @within function asset:object/2276.aurora_wave/tick/ + +# start_interpolation + data modify entity @s start_interpolation set value 0 + +# interpolation_duration + data modify entity @s interpolation_duration set value 3 + +# transformation + data modify entity @s transformation.scale set from storage asset:context this.PreScale[0] + data modify entity @s transformation.translation set from storage asset:context this.PreTranslation[0] diff --git a/Asset/data/asset/functions/object/2276.aurora_wave/tick/transformation/1.mcfunction b/Asset/data/asset/functions/object/2276.aurora_wave/tick/transformation/1.mcfunction new file mode 100644 index 00000000000..7a85d644d49 --- /dev/null +++ b/Asset/data/asset/functions/object/2276.aurora_wave/tick/transformation/1.mcfunction @@ -0,0 +1,15 @@ +#> asset:object/2276.aurora_wave/tick/transformation/1 +# +# +# +# @within function asset:object/2276.aurora_wave/tick/ + +# start_interpolation + data modify entity @s start_interpolation set value 0 + +# interpolation_duration + data modify entity @s interpolation_duration set value 3 + +# transformation + data modify entity @s transformation.scale set from storage asset:context this.PreScale[1] + data modify entity @s transformation.translation set from storage asset:context this.PreTranslation[1] diff --git a/Asset/data/asset/functions/object/2276.aurora_wave/tick/transformation/2.mcfunction b/Asset/data/asset/functions/object/2276.aurora_wave/tick/transformation/2.mcfunction new file mode 100644 index 00000000000..447501e4278 --- /dev/null +++ b/Asset/data/asset/functions/object/2276.aurora_wave/tick/transformation/2.mcfunction @@ -0,0 +1,15 @@ +#> asset:object/2276.aurora_wave/tick/transformation/2 +# +# +# +# @within function asset:object/2276.aurora_wave/tick/ + +# start_interpolation + data modify entity @s start_interpolation set value 0 + +# interpolation_duration + data modify entity @s interpolation_duration set value 13 + +# transformation + data modify entity @s transformation.scale set from storage asset:context this.PreScale[2] + data modify entity @s transformation.translation set from storage asset:context this.PreTranslation[2] diff --git a/Asset/data/asset/functions/object/alias/2080/hit_block.mcfunction b/Asset/data/asset/functions/object/alias/2080/hit_block.mcfunction deleted file mode 100644 index 3cda7171187..00000000000 --- a/Asset/data/asset/functions/object/alias/2080/hit_block.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset:object/alias/2080/hit_block -# -# メソッド処理のエイリアス -# -# @within asset_manager:object/tick/tick.m - -# 元のメソッド処理を呼び出す - function asset:object/2080.aurora_missile/hit_block/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/2080/init.mcfunction b/Asset/data/asset/functions/object/alias/2276/init.mcfunction similarity index 57% rename from Asset/data/asset/functions/object/alias/2080/init.mcfunction rename to Asset/data/asset/functions/object/alias/2276/init.mcfunction index 7dcfe2584b6..d86485472c3 100644 --- a/Asset/data/asset/functions/object/alias/2080/init.mcfunction +++ b/Asset/data/asset/functions/object/alias/2276/init.mcfunction @@ -1,8 +1,8 @@ -#> asset:object/alias/2080/init +#> asset:object/alias/2276/init # # Init処理のエイリアス # # @within asset_manager:object/init/init.m # 元のInit処理を呼び出す - function asset:object/2080.aurora_missile/init/ \ No newline at end of file + function asset:object/2276.aurora_wave/init/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/2276/register.mcfunction b/Asset/data/asset/functions/object/alias/2276/register.mcfunction new file mode 100644 index 00000000000..5834486fd74 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/2276/register.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/2276/register +# +# Objectのデータ指定処理のエイリアス +# +# @within asset_manager:object/summon/register.m + +# 元の登録処理を呼び出す + function asset:object/2276.aurora_wave/register \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/2276/summon.mcfunction b/Asset/data/asset/functions/object/alias/2276/summon.mcfunction new file mode 100644 index 00000000000..e538f817637 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/2276/summon.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/2276/summon +# +# Object召喚処理のエイリアス +# +# @within asset_manager:object/summon/summon.m + +# 元の召喚処理を呼び出す + function asset:object/2276.aurora_wave/summon/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/2276/tick.mcfunction b/Asset/data/asset/functions/object/alias/2276/tick.mcfunction new file mode 100644 index 00000000000..7100f327e0b --- /dev/null +++ b/Asset/data/asset/functions/object/alias/2276/tick.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/2276/tick +# +# Tick時処理のエイリアス +# +# @within asset_manager:object/tick/tick.m + +# 元のTick処理を呼び出す + function asset:object/2276.aurora_wave/tick/ \ No newline at end of file