diff --git a/TheSkyBlessing/data/asset_manager/functions/island/register/construct/.mcfunction b/TheSkyBlessing/data/asset_manager/functions/island/register/construct/.mcfunction index c59d920914..c5e9ff0937 100644 --- a/TheSkyBlessing/data/asset_manager/functions/island/register/construct/.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/island/register/construct/.mcfunction @@ -1,8 +1,14 @@ #> asset_manager:island/register/construct/ # @within function world_manager:nexus_loader/try_load_asset/construct.m -# 呪われた神器の本体 - summon armor_stand ~ ~ ~ {Tags:["Object","CursedArtifact","CursedArtifactInit","Uninterferable"],Marker:1b,Invisible:1b,ArmorItems:[{},{},{},{id:"stick",Count:1b,tag:{CustomModelData:20100}}]} +# 呪われた神器の本体を召喚する +# ロードの関係で召喚後に向きを変えると反映されない可能性があるため、直接マクロでRotationを指定して召喚する + data modify storage asset:island Args.Rotation set from storage asset:island Rotation + function asset_manager:island/register/construct/summon.m with storage asset:island Args + data remove storage asset:island Args + +# 空気にしておく setblock ~ ~ ~ air + # データの適用 - execute as @e[type=armor_stand,tag=CursedArtifactInit,distance=..0.01,limit=1] run function asset_manager:island/register/construct/set_data + execute as @e[type=item_display,tag=CursedArtifactInit,distance=..0.01,limit=1] run function asset_manager:island/register/construct/set_data diff --git a/TheSkyBlessing/data/asset_manager/functions/island/register/construct/set_data.mcfunction b/TheSkyBlessing/data/asset_manager/functions/island/register/construct/set_data.mcfunction index 60270e3fee..8e8e2c7f8f 100644 --- a/TheSkyBlessing/data/asset_manager/functions/island/register/construct/set_data.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/island/register/construct/set_data.mcfunction @@ -6,10 +6,6 @@ # EntityStorage呼び出し function oh_my_dat:please -# Entityの方向 - data modify entity @s Pose.Head set value [0f,0.001f,0f] - data modify entity @s Pose.Head[1] set from storage asset:island Rotation - data modify entity @s Rotation[0] set from storage asset:island Rotation # EntityStorageに保存するもの data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].IslandData.ID set from storage asset:island ID data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].IslandData.BossDatapack set from storage asset:island BossDatapack diff --git a/TheSkyBlessing/data/asset_manager/functions/island/register/construct/summon.m.mcfunction b/TheSkyBlessing/data/asset_manager/functions/island/register/construct/summon.m.mcfunction new file mode 100644 index 0000000000..d677c289f5 --- /dev/null +++ b/TheSkyBlessing/data/asset_manager/functions/island/register/construct/summon.m.mcfunction @@ -0,0 +1,7 @@ +#> asset_manager:island/register/construct/summon.m +# +# 呪われた神器の本体を召喚する +# +# @within function asset_manager:island/register/construct/ + + $summon item_display ~ ~ ~ {Rotation:[$(Rotation)f,0.0f],Tags:["Object","CursedArtifact","CursedArtifactInit","Uninterferable"],item:{id:"stick",Count:1b,tag:{CustomModelData:20100}},transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],scale:[1.28f,1.28f,1.28f],translation:[0f,0.64f,0f]}} diff --git a/TheSkyBlessing/data/core/functions/tick/.mcfunction b/TheSkyBlessing/data/core/functions/tick/.mcfunction index 037b5e3f09..e8bb998dba 100644 --- a/TheSkyBlessing/data/core/functions/tick/.mcfunction +++ b/TheSkyBlessing/data/core/functions/tick/.mcfunction @@ -48,7 +48,7 @@ function asset_manager:common/reset_all_context # 解呪処理 - execute as @e[type=armor_stand,tag=CursedArtifact,tag=!DispelledCursedArtifact] at @s run function asset_manager:island/tick/ + execute as @e[type=item_display,tag=CursedArtifact,tag=!DispelledCursedArtifact] at @s run function asset_manager:island/tick/ # スポナー処理部 execute as @e[type=item_display,tag=Spawner] at @s if entity @p[distance=..40] run function asset_manager:spawner/tick/