diff --git a/TheSkyBlessing/data/api/functions/teleporter/set_activation_state/from_nearest.mcfunction b/TheSkyBlessing/data/api/functions/teleporter/set_activation_state/from_nearest.mcfunction index a83e64c8ac..6d2292eaeb 100644 --- a/TheSkyBlessing/data/api/functions/teleporter/set_activation_state/from_nearest.mcfunction +++ b/TheSkyBlessing/data/api/functions/teleporter/set_activation_state/from_nearest.mcfunction @@ -5,6 +5,6 @@ # @input storage api: Argument.ActivationState : string("InvisibleDeactivate","VisibleDeactivate","Activate") # @api -execute if entity @e[type=marker,tag=Teleporter,distance=..5,limit=1] as @e[type=marker,tag=Teleporter,distance=..5] run function oh_my_dat:please -execute if entity @e[type=marker,tag=Teleporter,distance=..5,limit=1] run data modify storage api: Argument.ID set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].TeleporterData.ID -execute if entity @e[type=marker,tag=Teleporter,distance=..5,limit=1] if data storage api: Argument.ID run function api:teleporter/set_activation_state/from_id \ No newline at end of file +execute if entity @e[type=item_display,tag=Teleporter,distance=..5,limit=1] as @e[type=item_display,tag=Teleporter,distance=..5,sort=nearest,limit=1] run function oh_my_dat:please +execute if entity @e[type=item_display,tag=Teleporter,distance=..5,limit=1] run data modify storage api: Argument.ID set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].TeleporterData.ID +execute if entity @e[type=item_display,tag=Teleporter,distance=..5,limit=1] if data storage api: Argument.ID run function api:teleporter/set_activation_state/from_id diff --git a/TheSkyBlessing/data/asset/functions/teleporter/common/register.mcfunction b/TheSkyBlessing/data/asset/functions/teleporter/common/register.mcfunction index 808d110a12..a8ba67bf5a 100644 --- a/TheSkyBlessing/data/asset/functions/teleporter/common/register.mcfunction +++ b/TheSkyBlessing/data/asset/functions/teleporter/common/register.mcfunction @@ -4,20 +4,22 @@ # # @input storage asset:teleporter # ID : int -# GroupID : string +# GroupIDs : string # ActivationState : string("InvisibleDeactivate","VisibleDeactivate","Activate") -# Color? : string("white","aqua")(default: "white") +# Dimension: string("minecraft:overworld","minecraft:the_nether","minecraft:the_end") +# Color? : int(default: 16777215) # @within function asset:teleporter/*/register # パラメータチェック execute unless data storage asset:teleporter ID run tellraw @a [{"storage":"global","nbt":"Prefix.ERROR"},{"text":"引数が足りません"},{"text":" ID","color":"red"}] - execute unless data storage asset:teleporter GroupID run tellraw @a [{"storage":"global","nbt":"Prefix.ERROR"},{"text":"引数が足りません"},{"text":" GroupID","color":"red"}] + execute unless data storage asset:teleporter GroupIDs run tellraw @a [{"storage":"global","nbt":"Prefix.ERROR"},{"text":"引数が足りません"},{"text":" GroupIDs","color":"red"}] execute unless data storage asset:teleporter ActivationState run tellraw @a [{"storage":"global","nbt":"Prefix.ERROR"},{"text":"引数が足りません"},{"text":" ActivationState","color":"red"}] - execute unless data storage asset:teleporter Color run data modify storage asset:teleporter Color set value "white" + execute unless data storage asset:teleporter Dimension run tellraw @a [{"storage":"global","nbt":"Prefix.ERROR"},{"text":"引数が足りません"},{"text":" Dimension","color":"red"}] # 登録 function asset_manager:teleporter/register/ # リセット data remove storage asset:teleporter ID - data remove storage asset:teleporter GroupID + data remove storage asset:teleporter GroupIDs data remove storage asset:teleporter ActivationState - data remove storage asset:teleporter Color \ No newline at end of file + data remove storage asset:teleporter Dimension + data remove storage asset:teleporter Color diff --git a/TheSkyBlessing/data/asset/functions/teleporter/example2147483643/register.mcfunction b/TheSkyBlessing/data/asset/functions/teleporter/example2147483643/register.mcfunction index dbcb963bdc..64d796b130 100644 --- a/TheSkyBlessing/data/asset/functions/teleporter/example2147483643/register.mcfunction +++ b/TheSkyBlessing/data/asset/functions/teleporter/example2147483643/register.mcfunction @@ -13,8 +13,8 @@ data modify storage asset:teleporter GroupID set value "example" # デフォルトの起動状態 ("InvisibleDeactivate" | "VisibleDeactivate" | "Activate") data modify storage asset:teleporter ActivationState set value "Activate" -# 色 ("white" | "aqua") - data modify storage asset:teleporter Color set value "white" +# 色 (Optional) + # data modify storage asset:teleporter Color set value 16777215 # 登録 - function asset:teleporter/common/register \ No newline at end of file + function asset:teleporter/common/register diff --git a/TheSkyBlessing/data/asset/functions/teleporter/example2147483644/register.mcfunction b/TheSkyBlessing/data/asset/functions/teleporter/example2147483644/register.mcfunction index b10c226696..d1f8b85194 100644 --- a/TheSkyBlessing/data/asset/functions/teleporter/example2147483644/register.mcfunction +++ b/TheSkyBlessing/data/asset/functions/teleporter/example2147483644/register.mcfunction @@ -13,8 +13,8 @@ data modify storage asset:teleporter GroupID set value "example" # デフォルトの起動状態 ("InvisibleDeactivate" | "VisibleDeactivate" | "Activate") data modify storage asset:teleporter ActivationState set value "Activate" -# 色 ("white" | "aqua") - data modify storage asset:teleporter Color set value "white" +# 色 (Optional) + # data modify storage asset:teleporter Color set value 16777215 # 登録 - function asset:teleporter/common/register \ No newline at end of file + function asset:teleporter/common/register diff --git a/TheSkyBlessing/data/asset/functions/teleporter/example2147483645/register.mcfunction b/TheSkyBlessing/data/asset/functions/teleporter/example2147483645/register.mcfunction index 5987bf8475..58c2b40fe6 100644 --- a/TheSkyBlessing/data/asset/functions/teleporter/example2147483645/register.mcfunction +++ b/TheSkyBlessing/data/asset/functions/teleporter/example2147483645/register.mcfunction @@ -13,8 +13,8 @@ data modify storage asset:teleporter GroupID set value "example" # デフォルトの起動状態 ("InvisibleDeactivate" | "VisibleDeactivate" | "Activate") data modify storage asset:teleporter ActivationState set value "Activate" -# 色 ("white" | "aqua") - data modify storage asset:teleporter Color set value "white" +# 色 (Optional) + # data modify storage asset:teleporter Color set value 16777215 # 登録 - function asset:teleporter/common/register \ No newline at end of file + function asset:teleporter/common/register diff --git a/TheSkyBlessing/data/asset/functions/teleporter/example2147483646/register.mcfunction b/TheSkyBlessing/data/asset/functions/teleporter/example2147483646/register.mcfunction index 7e7b0ade2e..ad136c91a5 100644 --- a/TheSkyBlessing/data/asset/functions/teleporter/example2147483646/register.mcfunction +++ b/TheSkyBlessing/data/asset/functions/teleporter/example2147483646/register.mcfunction @@ -13,8 +13,8 @@ data modify storage asset:teleporter GroupID set value "example" # デフォルトの起動状態 ("InvisibleDeactivate" | "VisibleDeactivate" | "Activate") data modify storage asset:teleporter ActivationState set value "Activate" -# 色 ("white" | "aqua") - data modify storage asset:teleporter Color set value "white" +# 色 (Optional) + # data modify storage asset:teleporter Color set value 16777215 # 登録 - function asset:teleporter/common/register \ No newline at end of file + function asset:teleporter/common/register diff --git a/TheSkyBlessing/data/asset/functions/teleporter/example2147483647/register.mcfunction b/TheSkyBlessing/data/asset/functions/teleporter/example2147483647/register.mcfunction index a0518195a9..302fcebb6a 100644 --- a/TheSkyBlessing/data/asset/functions/teleporter/example2147483647/register.mcfunction +++ b/TheSkyBlessing/data/asset/functions/teleporter/example2147483647/register.mcfunction @@ -13,8 +13,8 @@ data modify storage asset:teleporter GroupID set value "example" # デフォルトの起動状態 ("InvisibleDeactivate" | "VisibleDeactivate" | "Activate") data modify storage asset:teleporter ActivationState set value "Activate" -# 色 ("white" | "aqua") - data modify storage asset:teleporter Color set value "aqua" +# 色 (Optional) + data modify storage asset:teleporter Color set value 53706 # 登録 - function asset:teleporter/common/register \ No newline at end of file + function asset:teleporter/common/register diff --git a/TheSkyBlessing/data/asset_manager/functions/teleporter/_index.d.mcfunction b/TheSkyBlessing/data/asset_manager/functions/teleporter/_index.d.mcfunction index b2fb4c9352..64137f54bb 100644 --- a/TheSkyBlessing/data/asset_manager/functions/teleporter/_index.d.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/teleporter/_index.d.mcfunction @@ -10,6 +10,7 @@ #> Teleporter # @within +# core:tick/ # asset_manager:teleporter/** # api:teleporter/set_activation_state/from_nearest #declare tag Teleporter @@ -20,19 +21,14 @@ #declare tag TeleporterInitialized #declare tag TeleporterInitializing #declare tag TPStar - #declare tag TPStar.White - #declare tag TPStar.Aqua + #declare tag TPStar.Active #declare tag SuppressTeleport #declare tag TPCancel #> for Init -# @within asset_manager:teleporter/tick/star_init/* +# @within asset_manager:teleporter/tick/summon_star/** #declare tag TPStarInit #> OpenDeclares # @within asset_manager:island/dispel/register_tp #declare tag Teleporter - -#> TeleporterExists -# @within asset_manager:teleporter/update_activation_state/* - #declare score_holder $TeleporterExists \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/teleporter/common/increment_activation_state_version.mcfunction b/TheSkyBlessing/data/asset_manager/functions/teleporter/common/increment_activation_state_version.mcfunction new file mode 100644 index 0000000000..5a47d8b988 --- /dev/null +++ b/TheSkyBlessing/data/asset_manager/functions/teleporter/common/increment_activation_state_version.mcfunction @@ -0,0 +1,21 @@ +#> asset_manager:teleporter/common/increment_activation_state_version +# +# +# +# @within function +# asset_manager:teleporter/update_activation_state/ +# asset_manager:teleporter/tick/angel_protection/* + +#> Private +# @private +#declare score_holder $Version + +# 現在値取得 + scoreboard players set $Version Temporary 0 + execute store result score $Version Temporary run data get storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].TeleporterData.ActivationStateVersion +# 加算 + scoreboard players add $Version Temporary 1 +# 更新 + execute store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].TeleporterData.ActivationStateVersion int 1 run scoreboard players get $Version Temporary +# リセット + scoreboard players reset $Version Temporary diff --git a/TheSkyBlessing/data/asset_manager/functions/teleporter/common/update_display_state.mcfunction b/TheSkyBlessing/data/asset_manager/functions/teleporter/common/update_display_state.mcfunction new file mode 100644 index 0000000000..522de921b9 --- /dev/null +++ b/TheSkyBlessing/data/asset_manager/functions/teleporter/common/update_display_state.mcfunction @@ -0,0 +1,12 @@ +#> asset_manager:teleporter/common/update_display_state +# +# +# +# @within function +# asset_manager:teleporter/register/ +# asset_manager:teleporter/tick/global + +execute if data storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].TeleporterData{ActivationState:"Activate"} if data storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].TeleporterData{AngelProtection: true} run data modify entity @s item set value {id:"minecraft:leather_horse_armor",Count:1b,tag:{display:{color:16711680},CustomModelData:20329}} +execute if data storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].TeleporterData{ActivationState:"Activate"} unless data storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].TeleporterData{AngelProtection:true} run data modify entity @s item set value {id:"minecraft:leather_horse_armor",Count:1b,tag:{display:{color:53706},CustomModelData:20329}} +execute if data storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].TeleporterData{ActivationState:"VisibleDeactivate"} run data modify entity @s item set value {id:"minecraft:leather_horse_armor",Count:1b,tag:{display:{color:3092271},CustomModelData:20329}} +execute if data storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].TeleporterData{ActivationState:"InvisibleDeactivate"} run data modify entity @s item set value {} diff --git a/TheSkyBlessing/data/asset_manager/functions/teleporter/register/.mcfunction b/TheSkyBlessing/data/asset_manager/functions/teleporter/register/.mcfunction index 75c4bd53b0..051f857d61 100644 --- a/TheSkyBlessing/data/asset_manager/functions/teleporter/register/.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/teleporter/register/.mcfunction @@ -5,21 +5,24 @@ # @within function asset:teleporter/common/register # ベースエンティティを設定する - summon marker ~ ~ ~ {Tags:["Teleporter","Object","Uninterferable"]} + summon item_display ~ ~ ~ {Tags:["Teleporter","Object","Uninterferable"],transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0.281f,-0.363f,-0.117f,0.881f],translation:[0f,0.001f,0f],scale:[1f,1f,0f]},item:{},brightness:{sky:15,block:15},Rotation:[0f,-90f],teleport_duration:1} # データ取得 - execute as @e[type=marker,tag=Teleporter,distance=..0.01,limit=1] run function oh_my_dat:please + execute as @e[type=item_display,tag=Teleporter,distance=..0.01,limit=1] run function oh_my_dat:please # 直接入れるやつ data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].TeleporterData.ID set from storage asset:teleporter ID - data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].TeleporterData.GroupID set from storage asset:teleporter GroupID + data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].TeleporterData.GroupIDs set from storage asset:teleporter GroupIDs data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].TeleporterData.ActivationState set from storage asset:teleporter ActivationState # グループ側に入れるやつ data modify storage asset:teleporter Teleporters append value {} data modify storage asset:teleporter Teleporters[-1].ID set from storage asset:teleporter ID - data modify storage asset:teleporter Teleporters[-1].GroupID set from storage asset:teleporter GroupID + data modify storage asset:teleporter Teleporters[-1].GroupIDs set from storage asset:teleporter GroupIDs data modify storage asset:teleporter Teleporters[-1].Data.ActivationState set from storage asset:teleporter ActivationState - data modify storage asset:teleporter Teleporters[-1].Data.Color set from storage asset:teleporter Color - data modify storage asset:teleporter Teleporters[-1].Pos set from entity @e[type=marker,tag=Teleporter,distance=..0.01,limit=1] Pos + execute if data storage asset:teleporter Color run function asset_manager:teleporter/register/calculate_and_insert_color_data + data modify storage asset:teleporter Teleporters[-1].Dimension set from storage asset:teleporter Dimension + data modify storage asset:teleporter Teleporters[-1].Pos set from entity @e[type=item_display,tag=Teleporter,distance=..0.01,limit=1] Pos # 参照情報を保存する data modify storage asset:teleporter TeleporterOMDMap append value {} data modify storage asset:teleporter TeleporterOMDMap[-1].TeleporterID set from storage asset:teleporter ID - execute store result storage asset:teleporter TeleporterOMDMap[-1].OhMyDatID int 1 run scoreboard players get @e[type=marker,tag=Teleporter,distance=..0.01,limit=1] OhMyDatID \ No newline at end of file + execute store result storage asset:teleporter TeleporterOMDMap[-1].OhMyDatID int 1 run scoreboard players get @e[type=item_display,tag=Teleporter,distance=..0.01,limit=1] OhMyDatID +# 状態を item_display に反映させる + execute as @e[type=item_display,tag=Teleporter,distance=..0.01,limit=1] run function asset_manager:teleporter/common/update_display_state diff --git a/TheSkyBlessing/data/asset_manager/functions/teleporter/register/calculate_and_insert_color_data.mcfunction b/TheSkyBlessing/data/asset_manager/functions/teleporter/register/calculate_and_insert_color_data.mcfunction new file mode 100644 index 0000000000..af9416bba1 --- /dev/null +++ b/TheSkyBlessing/data/asset_manager/functions/teleporter/register/calculate_and_insert_color_data.mcfunction @@ -0,0 +1,34 @@ +#> asset_manager:teleporter/register/calculate_and_insert_color_data +# +# +# +# @within function asset_manager:teleporter/register/ + +#> Private +# @private + #declare score_holder $R + #declare score_holder $G + #declare score_holder $B + #declare score_holder $Color + +# 色情報取得 + execute store result score $R Temporary run data get storage asset:teleporter Color[0] 1 + execute store result score $G Temporary run data get storage asset:teleporter Color[1] 1 + execute store result score $B Temporary run data get storage asset:teleporter Color[2] 1 + +# カラーコード(10) を計算する + scoreboard players operation $Color Temporary = $R Temporary + scoreboard players operation $Color Temporary *= $256 Const + scoreboard players operation $Color Temporary += $G Temporary + scoreboard players operation $Color Temporary *= $256 Const + scoreboard players operation $Color Temporary += $B Temporary + +# storage にいれる + execute store result storage asset:teleporter Teleporters[-1].Data.Color int 1 run scoreboard players get $Color Temporary + data modify storage asset:teleporter Teleporters[-1].Data.ColorPart set from storage asset:teleporter Color + +# リセット + scoreboard players reset $R Temporary + scoreboard players reset $G Temporary + scoreboard players reset $B Temporary + scoreboard players reset $Color Temporary diff --git a/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/active.mcfunction b/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/active.mcfunction index e1a9ea2921..f4ec6315e7 100644 --- a/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/active.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/active.mcfunction @@ -7,11 +7,12 @@ # 接地しているかの取得 function api:data_get/on_ground # 初期化 - execute if data storage api: {OnGround:true} if entity @s[tag=!TeleporterInitializing,tag=!TeleporterInitialized] run function asset_manager:teleporter/tick/star_init/ + execute if data storage api: {OnGround:true} if entity @s[tag=!TeleporterInitializing,tag=!TeleporterInitialized] run function asset_manager:teleporter/tick/summon_star/init/ # 初期化中 - execute if data storage api: {OnGround:true} if entity @s[tag=TeleporterInitializing] run function asset_manager:teleporter/tick/star_init/summon_once + execute if data storage api: {OnGround:true} if entity @s[tag=TeleporterInitializing] run function asset_manager:teleporter/tick/summon_star/summon/ + execute if data storage api: {OnGround:true} if entity @s[tag=TeleporterInitializing] run function asset_manager:teleporter/tick/summon_star/summon/ # ジャンプ検知 execute if data storage api: {OnGround:false} unless entity @s[tag=!TeleporterInitializing,tag=!TeleporterInitialized] run function asset_manager:teleporter/tick/tp/ # VFX summon area_effect_cloud ~ ~ ~ {Duration:6,Age:4,effects:[{id:"blindness",amplifier:0b,duration:25,show_particles:0b}]} - execute anchored eyes positioned ^ ^ ^ as @e[type=marker,tag=TPStar,distance=..1.8] if score @s TPStarFromUserID = @p[tag=this] UserID facing entity @s feet positioned as @s run function asset_manager:teleporter/tick/vfx/star/ \ No newline at end of file + execute anchored eyes positioned ^ ^ ^ as @e[type=item_display,tag=TPStar,distance=..1.8] if score @s TPStarFromUserID = @p[tag=this] UserID facing entity @s feet positioned as @s run function asset_manager:teleporter/tick/vfx/star/ diff --git a/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/angel_protection/disable.mcfunction b/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/angel_protection/disable.mcfunction new file mode 100644 index 0000000000..d8c86cf1f0 --- /dev/null +++ b/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/angel_protection/disable.mcfunction @@ -0,0 +1,8 @@ +#> asset_manager:teleporter/tick/angel_protection/disable +# +# +# +# @within function asset_manager:teleporter/tick/global + +data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].TeleporterData.AngelProtection set value false +function asset_manager:teleporter/common/increment_activation_state_version diff --git a/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/angel_protection/enable.mcfunction b/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/angel_protection/enable.mcfunction new file mode 100644 index 0000000000..84436a5a6a --- /dev/null +++ b/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/angel_protection/enable.mcfunction @@ -0,0 +1,8 @@ +#> asset_manager:teleporter/tick/angel_protection/enable +# +# +# +# @within function asset_manager:teleporter/tick/global + +data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].TeleporterData.AngelProtection set value true +function asset_manager:teleporter/common/increment_activation_state_version diff --git a/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/cancel/.mcfunction b/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/cancel/.mcfunction index cadee28eec..8cd49ed50c 100644 --- a/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/cancel/.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/cancel/.mcfunction @@ -7,8 +7,8 @@ # storage呼び出し function oh_my_dat:please # リセット - execute anchored eyes positioned ^ ^ ^ positioned ~ ~-0.41 ~ as @e[type=marker,tag=TPStar,distance=..1.8] if score @s TPStarFromUserID = @p[tag=this] UserID run kill @s + execute anchored eyes positioned ^ ^ ^ positioned ~ ~-0.41 ~ as @e[type=item_display,tag=TPStar] if score @s TPStarFromUserID = @p[tag=this] UserID run kill @s data remove storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].Temp.Teleporters tag @s remove TeleporterInitializing tag @s remove TeleporterInitialized - tag @s remove TPCancel \ No newline at end of file + tag @s remove TPCancel diff --git a/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/cancel/check.mcfunction b/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/cancel/check.mcfunction index d6a6e8507d..eab403b7aa 100644 --- a/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/cancel/check.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/cancel/check.mcfunction @@ -4,10 +4,15 @@ # # @within function asset_manager:teleporter/tick/player +# テレポーターの EntityStorage 取得 + execute as @e[type=item_display,tag=FromTeleporter,distance=..1,limit=1] run function oh_my_dat:please +# 戦闘中になったら + execute if data storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].TeleporterData{AngelProtection:true} run tag @s add TPCancel + execute unless data storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].TeleporterData{ActivationState:"Activate"} run tag @s add TPCancel # スニークを解除したら execute unless predicate lib:is_sneaking run tag @s add TPCancel # 地面がなくなったら function api:data_get/on_ground execute if data storage api: {OnGround:false} run tag @s add TPCancel # 動いたら - execute if predicate lib:is_player_moving run tag @s add TPCancel \ No newline at end of file + execute if predicate lib:is_player_moving run tag @s add TPCancel diff --git a/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/global.mcfunction b/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/global.mcfunction index 75f981dd2c..49eedfa909 100644 --- a/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/global.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/global.mcfunction @@ -4,4 +4,25 @@ # # @within function core:tick/ -execute as @e[type=marker,tag=Teleporter] at @s if entity @p[distance=..50] run function asset_manager:teleporter/tick/vfx/teleporter/ \ No newline at end of file +#> Private +# @private +#declare score_holder $Version + +# EntityStorage 呼び出し + function oh_my_dat:please + +# 天使確認 + execute if data storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].TeleporterData{AngelProtection: true} unless entity @e[type=#lib:living,tag=Enemy.Boss,distance=..120] run function asset_manager:teleporter/tick/angel_protection/disable + execute unless data storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].TeleporterData{AngelProtection: true} if entity @e[type=#lib:living,tag=Enemy.Boss,distance=..120] run function asset_manager:teleporter/tick/angel_protection/enable + +# 更新処理 + scoreboard players set $Version Temporary 0 + execute store result score $Version Temporary run data get storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].TeleporterData.ActivationStateVersion + execute unless score @s TeleporterActivationStateVersion = $Version Temporary run function asset_manager:teleporter/common/update_display_state + scoreboard players operation @s TeleporterActivationStateVersion = $Version Temporary + +# VFX + function asset_manager:teleporter/tick/vfx/teleporter/ + +# リセット + scoreboard players reset $Version Temporary diff --git a/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/player.mcfunction b/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/player.mcfunction index fff010874d..772f3010e2 100644 --- a/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/player.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/player.mcfunction @@ -5,13 +5,13 @@ # @within function core:tick/player/ # 対象テレポーターの特定及びタグ付与 - tag @e[type=marker,tag=Teleporter,distance=..1,limit=1] add FromTeleporter + tag @e[type=item_display,tag=Teleporter,distance=..1,limit=1] add FromTeleporter # EntityStorageを取得する - execute as @e[type=marker,tag=FromTeleporter,distance=..1,limit=1] run function oh_my_dat:please + execute as @e[type=item_display,tag=FromTeleporter,distance=..1,limit=1] run function oh_my_dat:please # テレポートのメイン処理 - execute if entity @s[tag=!SuppressTeleport,predicate=lib:is_sneaking] if entity @e[type=marker,tag=FromTeleporter,distance=..1,limit=1] if data storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].TeleporterData{ActivationState:"Activate"} run function asset_manager:teleporter/tick/active + execute if entity @s[tag=!SuppressTeleport,predicate=lib:is_sneaking] if entity @e[type=item_display,tag=FromTeleporter,distance=..1,limit=1] if data storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].TeleporterData{ActivationState:"Activate"} unless data storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].TeleporterData{AngelProtection:true} run function asset_manager:teleporter/tick/active # テレポート後のタグ解除処理 execute if entity @s[tag=SuppressTeleport,predicate=!lib:is_sneaking] run tag @s remove SuppressTeleport # キャンセル処理 @@ -22,4 +22,4 @@ scoreboard players remove @s[scores={TeleporterLogCD=0..}] TeleporterLogCD 1 # リセット - tag @e[type=marker,tag=FromTeleporter,distance=..1,limit=1] remove FromTeleporter \ No newline at end of file + tag @e[type=item_display,tag=FromTeleporter,distance=..1,limit=1] remove FromTeleporter diff --git a/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/star_init/.mcfunction b/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/star_init/.mcfunction deleted file mode 100644 index 9c4b19777a..0000000000 --- a/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/star_init/.mcfunction +++ /dev/null @@ -1,28 +0,0 @@ -#> asset_manager:teleporter/tick/star_init/ -# -# -# -# @within function asset_manager:teleporter/tick/active - -#> Val -# @private -#declare score_holder $ActivateStarCount - -# EntityStorageを再度取得する - execute as @e[type=marker,tag=FromTeleporter,distance=..1,limit=1] run function oh_my_dat:please -# グループIDから対象TP先を取得する - data modify storage asset:teleporter TargetGroupID set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].TeleporterData.GroupID - execute if data storage asset:teleporter TargetGroupID run function asset_manager:teleporter/tick/star_init/get_teleporters_from_group_id -# 繋がってる星の個数のチェック (1つは自身のため、2つ以上のときに初めて繋がってると言える) - execute store result score $ActivateStarCount Temporary if data storage asset:teleporter FilteredTeleporters[].Data{ActivationState:"Activate"} -# つながっている星があるのであれば初期化中タグを付与し、星データをプレイヤーに格納する - execute if score $ActivateStarCount Temporary matches 2.. run function oh_my_dat:please - execute if score $ActivateStarCount Temporary matches 2.. run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].Temp.Teleporters set from storage asset:teleporter FilteredTeleporters - execute if score $ActivateStarCount Temporary matches 2.. run tag @s add TeleporterInitializing -# なければ初期化済タグを付与し、メッセージを出す - execute if score $ActivateStarCount Temporary matches ..1 run tag @s add TeleporterInitialized - execute if score $ActivateStarCount Temporary matches ..1 unless score @s TeleporterLogCD matches 0.. run tellraw @s {"text":"このテレポーターはどこにも繋がっていないようだ...","color":"light_purple"} - execute if score $ActivateStarCount Temporary matches ..1 unless score @s TeleporterLogCD matches 0.. run scoreboard players set @s TeleporterLogCD 60 -# リセット - scoreboard players reset $ActivateStarCount Temporary - data remove storage asset:teleporter FilteredTeleporters \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/star_init/get_teleporters_from_group_id.mcfunction b/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/star_init/get_teleporters_from_group_id.mcfunction deleted file mode 100644 index 6204074373..0000000000 --- a/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/star_init/get_teleporters_from_group_id.mcfunction +++ /dev/null @@ -1,26 +0,0 @@ -#> asset_manager:teleporter/tick/star_init/get_teleporters_from_group_id -# -# -# -# @input storage asset:teleporter TargetGroupID -# @output storage asset:teleporter FilteredTeleporters -# -# @within function asset_manager:teleporter/tick/star_init/ - -# セッション開く - function lib:array/session/open -# 対象テレポーターのGrpupIDと、同一のIDを持つ配列の要素のIndex のみがtrueになる配列(CompareResult)を作る -# CompareResult = Teleporters.map(v => v.GroupID == GroupID) - data modify storage lib: Array append from storage asset:teleporter Teleporters[].GroupID - data modify storage lib: CompareTarget set from storage asset:teleporter TargetGroupID - function lib:array/compare_single -# CompareResultを元に同一のIDの要素を取り出す -# FilteredTeleporters = Teleporters.filiter((v, i) => CompareResult[i]) - data modify storage lib: Array set from storage asset:teleporter Teleporters - data modify storage lib: Masks set from storage lib: CompareResult - function lib:array/mask_inverted - data modify storage asset:teleporter FilteredTeleporters set from storage lib: Array -# セッション閉じる - function lib:array/session/close -# リセット - data remove storage asset:teleporter TargetGroupID \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/star_init/set_data.mcfunction b/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/star_init/set_data.mcfunction deleted file mode 100644 index 8664e44d1a..0000000000 --- a/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/star_init/set_data.mcfunction +++ /dev/null @@ -1,17 +0,0 @@ -#> asset_manager:teleporter/tick/star_init/set_data -# -# -# -# @within function asset_manager:teleporter/tick/star_init/summon - -# ユーザーIDをコピー - scoreboard players operation @s TPStarFromUserID = @p[tag=this] UserID -# ユーザーデータ取得 - function oh_my_dat:please -# 座標データ - data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].TPStarData.TargetPos set from storage asset:teleporter TargetTeleporter.Pos -# 色データ - execute if data storage asset:teleporter TargetTeleporter.Data{Color:"white"} run tag @s add TPStar.White - execute if data storage asset:teleporter TargetTeleporter.Data{Color:"aqua"} run tag @s add TPStar.Aqua -# 初期化タグ削除 - tag @s remove TPStarInit \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/star_init/summon.mcfunction b/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/star_init/summon.mcfunction deleted file mode 100644 index 72f5f02cf3..0000000000 --- a/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/star_init/summon.mcfunction +++ /dev/null @@ -1,17 +0,0 @@ -#> asset_manager:teleporter/tick/star_init/summon -# -# -# -# @within function asset_manager:teleporter/tick/star_init/summon_once - -# 対象のテレポーターを移す - data modify storage asset:teleporter TargetTeleporter set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].Temp.Teleporters[-1] -# 汎用entityを現地へ - data modify entity @s Pos set from storage asset:teleporter TargetTeleporter.Pos -# プレイヤーからその方向の1ブロック先に星を召喚する - execute unless entity @s[distance=..15] facing entity @s feet run summon marker ^ ^ ^1.5 {Tags:["TPStar","TPStarInit"]} - execute unless entity @s[distance=..15] facing entity @s feet positioned ^ ^ ^1.5 as @e[type=marker,tag=TPStarInit,distance=..0.01,limit=1] run function asset_manager:teleporter/tick/star_init/set_data -# 原点へお帰り - execute in overworld run tp @s 0.0 0.0 0.0 -# リセット - data remove storage asset:teleporter TargetTeleporter \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/star_init/summon_once.mcfunction b/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/star_init/summon_once.mcfunction deleted file mode 100644 index 679127bbad..0000000000 --- a/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/star_init/summon_once.mcfunction +++ /dev/null @@ -1,26 +0,0 @@ -#> asset_manager:teleporter/tick/star_init/summon_once -# -# -# -# @input storage asset:teleporter FilteredTeleporters -# @within function -# asset_manager:teleporter/tick/active -# asset_manager:teleporter/tick/star_init/summon_once - -# storage呼び出し - function oh_my_dat:please -# 召喚可能か確認 - execute store success storage asset:teleporter TPStarSummonable byte 1 if data storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].Temp.Teleporters[-1].Data{ActivationState:"Activate"} -# 召喚可能なら召喚する - execute if data storage asset:teleporter {TPStarSummonable: true} anchored eyes positioned ^ ^ ^ as 0-0-0-0-0 run function asset_manager:teleporter/tick/star_init/summon -# 召喚したならstorage呼び出し - execute if data storage asset:teleporter {TPStarSummonable: true} run function oh_my_dat:please -# 否が応でも末尾削除 - data remove storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].Temp.Teleporters[-1] -# 全てのテレポーターを見きったら初期化済タグに切り替える - execute unless data storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].Temp.Teleporters[0] run tag @s remove TeleporterInitializing - execute unless data storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].Temp.Teleporters[0] run tag @s add TeleporterInitialized -# 召喚したならリセット - execute if data storage asset:teleporter {TPStarSummonable: true} run data remove storage asset:teleporter TPStarSummonable -# 召喚できてなかったら再帰 - execute if data storage asset:teleporter {TPStarSummonable:false} if data storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].Temp.Teleporters[0] run function asset_manager:teleporter/tick/star_init/summon_once \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/summon_star/init/.mcfunction b/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/summon_star/init/.mcfunction new file mode 100644 index 0000000000..970da4e3b1 --- /dev/null +++ b/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/summon_star/init/.mcfunction @@ -0,0 +1,30 @@ +#> asset_manager:teleporter/tick/summon_star/init/ +# +# +# +# @within function asset_manager:teleporter/tick/active + +#> Val +# @private + #declare score_holder $ActivateStarCount + #declare score_holder $GroupCount + +# EntityStorageを再度取得する + execute as @e[type=item_display,tag=FromTeleporter,distance=..1,limit=1] run function oh_my_dat:please +# グループIDから対象TP先を取得する + data modify storage asset:teleporter TargetGroupIDs set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].TeleporterData.GroupIDs + execute if data storage asset:teleporter TargetGroupIDs run function asset_manager:teleporter/tick/summon_star/init/get_teleporters/ +# 繋がってる星の個数のチェック (1つは自身のため、2つ以上のときに初めて繋がってると言える) + execute store result score $ActivateStarCount Temporary if data storage asset:teleporter FilteredTeleporters[].Data{ActivationState:"Activate"} + execute store result score $GroupCount Temporary if data storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].TeleporterData.GroupIDs[] +# つながっている星があるのであれば初期化中タグを付与し、星データをプレイヤーに格納する + execute if score $ActivateStarCount Temporary > $GroupCount Temporary run function asset_manager:teleporter/tick/summon_star/init/setup +# なければ初期化済タグを付与し、メッセージを出す + execute if score $ActivateStarCount Temporary <= $GroupCount Temporary run tag @s add TeleporterInitialized + execute if score $ActivateStarCount Temporary <= $GroupCount Temporary unless score @s TeleporterLogCD matches 0.. run tellraw @s {"text":"このテレポーターはどこにも繋がっていないようだ...","color":"light_purple"} + execute if score $ActivateStarCount Temporary <= $GroupCount Temporary unless score @s TeleporterLogCD matches 0.. run scoreboard players set @s TeleporterLogCD 60 +# リセット + scoreboard players reset $ActivateStarCount Temporary + scoreboard players reset $GroupCount Temporary + data remove storage asset:teleporter FilteredTeleporters + data remove storage asset:teleporter Args diff --git a/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/summon_star/init/get_teleporters/.mcfunction b/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/summon_star/init/get_teleporters/.mcfunction new file mode 100644 index 0000000000..78cfe330f2 --- /dev/null +++ b/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/summon_star/init/get_teleporters/.mcfunction @@ -0,0 +1,15 @@ +#> asset_manager:teleporter/tick/summon_star/init/get_teleporters/ +# +# +# +# @within function +# asset_manager:teleporter/tick/summon_star/init/ +# asset_manager:teleporter/tick/summon_star/init/get_teleporters/ + +# データ処理 + data modify storage asset:teleporter Args.TargetGroupID set from storage asset:teleporter TargetGroupIDs[-1] + function asset_manager:teleporter/tick/summon_star/init/get_teleporters/from_group_id.m with storage asset:teleporter Args +# 末尾削除 + data remove storage asset:teleporter TargetGroupIDs[-1] +# 要素があれば再帰 + execute if data storage asset:teleporter TargetGroupIDs[0] run function asset_manager:teleporter/tick/summon_star/init/get_teleporters/ diff --git a/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/summon_star/init/get_teleporters/from_group_id.m.mcfunction b/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/summon_star/init/get_teleporters/from_group_id.m.mcfunction new file mode 100644 index 0000000000..4d7148e8d4 --- /dev/null +++ b/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/summon_star/init/get_teleporters/from_group_id.m.mcfunction @@ -0,0 +1,10 @@ +#> asset_manager:teleporter/tick/summon_star/init/get_teleporters/from_group_id.m +# +# +# +# @input args TargetGroupID +# @output storage asset:teleporter FilteredTeleporters +# +# @within function asset_manager:teleporter/tick/summon_star/init/get_teleporters/ + +$data modify storage asset:teleporter FilteredTeleporters append from storage asset:teleporter Teleporters[{GroupIDs:[$(TargetGroupID)]}] diff --git a/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/summon_star/init/setup.mcfunction b/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/summon_star/init/setup.mcfunction new file mode 100644 index 0000000000..a177c4ed66 --- /dev/null +++ b/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/summon_star/init/setup.mcfunction @@ -0,0 +1,19 @@ +#> asset_manager:teleporter/tick/summon_star/init/setup +# +# +# +# @within function asset_manager:teleporter/tick/summon_star/init/ + +# EntityStorage 呼び出し + function oh_my_dat:please +# セッション開く + function lib:array/session/open +# シャッフルして EntityStorage にいれる + data modify storage lib: Array set from storage asset:teleporter FilteredTeleporters + function lib:array/shuffle + data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].Temp.Teleporters set from storage lib: Array +# セッション閉じる + function lib:array/session/close + +# タグ付与 + tag @s add TeleporterInitializing diff --git a/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/summon_star/summon/.mcfunction b/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/summon_star/summon/.mcfunction new file mode 100644 index 0000000000..95b699877d --- /dev/null +++ b/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/summon_star/summon/.mcfunction @@ -0,0 +1,18 @@ +#> asset_manager:teleporter/tick/summon_star/summon/ +# +# +# +# @input storage asset:teleporter FilteredTeleporters +# @within function asset_manager:teleporter/tick/active + +# EntityStorage 呼び出し + function oh_my_dat:please +# 召喚する + execute anchored eyes positioned ^ ^ ^ as 0-0-0-0-0 run function asset_manager:teleporter/tick/summon_star/summon/as_common_marker +# 召喚で EntityStorage の参照先が変わってるので再度呼び出し + function oh_my_dat:please +# 末尾削除 + data remove storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].Temp.Teleporters[-1] +# 全てのテレポーターを見きったら初期化済タグに切り替える + execute unless data storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].Temp.Teleporters[0] run tag @s remove TeleporterInitializing + execute unless data storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].Temp.Teleporters[0] run tag @s add TeleporterInitialized diff --git a/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/summon_star/summon/as_common_marker.mcfunction b/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/summon_star/summon/as_common_marker.mcfunction new file mode 100644 index 0000000000..835c642701 --- /dev/null +++ b/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/summon_star/summon/as_common_marker.mcfunction @@ -0,0 +1,17 @@ +#> asset_manager:teleporter/tick/summon_star/summon/as_common_marker +# +# +# +# @within function asset_manager:teleporter/tick/summon_star/summon/ + +# 対象のテレポーターを移す + data modify storage asset:teleporter TargetTeleporter set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].Temp.Teleporters[-1] +# 汎用entityを現地へ + data modify entity @s Pos set from storage asset:teleporter TargetTeleporter.Pos +# プレイヤーからその方向の 1.5 ブロック先に星を召喚する + execute unless entity @s[distance=..15] facing entity @s feet run summon item_display ^ ^ ^1.5 {Tags:["TPStar","TPStarInit"],transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0.281f,-0.363f,-0.117f,0.881f],translation:[0f,0f,0f],scale:[0.05f,0.05f,0f]},item:{id:"minecraft:leather_horse_armor",Count:1b,tag:{CustomModelData:20330,display:{color:16777215}}},brightness:{sky:15,block:15},billboard:"center",Rotation:[0f,-90f],teleport_duration:1} + execute unless entity @s[distance=..15] facing entity @s feet positioned ^ ^ ^1.5 as @e[type=item_display,tag=TPStarInit,distance=..0.01,limit=1] run function asset_manager:teleporter/tick/summon_star/summon/set_data +# 原点へお帰り + execute in overworld run tp @s 0.0 0.0 0.0 +# リセット + data remove storage asset:teleporter TargetTeleporter diff --git a/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/summon_star/summon/set_data.mcfunction b/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/summon_star/summon/set_data.mcfunction new file mode 100644 index 0000000000..e719445dad --- /dev/null +++ b/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/summon_star/summon/set_data.mcfunction @@ -0,0 +1,43 @@ +#> asset_manager:teleporter/tick/summon_star/summon/set_data +# +# +# +# @within function asset_manager:teleporter/tick/summon_star/summon/as_common_marker + +# ユーザーIDをコピー + scoreboard players operation @s TPStarFromUserID = @p[tag=this] UserID +# ディメンション取得 + function api:data_get/dimension +# EntityStorage 取得 + function oh_my_dat:please +# 座標データ + data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].TPStarData.TargetPos.X set from storage asset:teleporter TargetTeleporter.Pos[0] + data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].TPStarData.TargetPos.Y set from storage asset:teleporter TargetTeleporter.Pos[1] + data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].TPStarData.TargetPos.Z set from storage asset:teleporter TargetTeleporter.Pos[2] + data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].TPStarData.TargetPos.Dimension set from storage asset:teleporter TargetTeleporter.Dimension +# 有効化されているならタグ付与 + execute if data storage asset:teleporter TargetTeleporter.Data{ActivationState:"Activate"} run tag @s add TPStar.Active +# 有効化されているならサイズ大きく + execute if data storage asset:teleporter TargetTeleporter.Data{ActivationState:"Activate"} run data modify entity @s transformation.scale set value [0.25f,0.25f,0.0f] +# ディメンション確認 + data modify storage asset:teleporter TempDimension set from storage api: Dimension + execute store result storage asset:teleporter IsOtherDimension byte 1 run data modify storage asset:teleporter TempDimension set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].TPStarData.TargetPos.Dimension +# 色データ + # execute unless data storage asset:teleporter TargetTeleporter.Data{ActivationState:"Activate"} run data modify entity @s item.tag.display.color set value 16777215 + execute if data storage asset:teleporter TargetTeleporter.Data{ActivationState:"Activate"} if data storage asset:teleporter {IsOtherDimension: true} if data storage asset:teleporter TargetTeleporter{Dimension:"minecraft:overworld" } run data modify entity @s item.tag.display.color set value 24576 + execute if data storage asset:teleporter TargetTeleporter.Data{ActivationState:"Activate"} if data storage asset:teleporter {IsOtherDimension: true} if data storage asset:teleporter TargetTeleporter{Dimension:"minecraft:the_nether"} run data modify entity @s item.tag.display.color set value 6291456 + execute if data storage asset:teleporter TargetTeleporter.Data{ActivationState:"Activate"} if data storage asset:teleporter {IsOtherDimension: true} if data storage asset:teleporter TargetTeleporter{Dimension:"minecraft:the_end" } run data modify entity @s item.tag.display.color set value 6291552 + execute if data storage asset:teleporter TargetTeleporter.Data{ActivationState:"Activate"} if data storage asset:teleporter {IsOtherDimension:false} unless data storage asset:teleporter TargetTeleporter.Data.Color run data modify entity @s item.tag.display.color set value 10526784 + execute if data storage asset:teleporter TargetTeleporter.Data{ActivationState:"Activate"} if data storage asset:teleporter {IsOtherDimension:false} if data storage asset:teleporter TargetTeleporter.Data.Color run data modify entity @s item.tag.display.color set from storage asset:teleporter TargetTeleporter.Data.Color +# EntityStorage に点滅用に色を保存しておく + execute unless data storage asset:teleporter TargetTeleporter.Data{ActivationState:"Activate"} run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].TPStarData.ColorPart set value [255,255,255] + execute if data storage asset:teleporter TargetTeleporter.Data{ActivationState:"Activate"} if data storage asset:teleporter {IsOtherDimension: true} if data storage asset:teleporter TargetTeleporter{Dimension:"minecraft:overworld" } run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].TPStarData.ColorPart set value [0,96,0] + execute if data storage asset:teleporter TargetTeleporter.Data{ActivationState:"Activate"} if data storage asset:teleporter {IsOtherDimension: true} if data storage asset:teleporter TargetTeleporter{Dimension:"minecraft:the_nether"} run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].TPStarData.ColorPart set value [96,0,0] + execute if data storage asset:teleporter TargetTeleporter.Data{ActivationState:"Activate"} if data storage asset:teleporter {IsOtherDimension: true} if data storage asset:teleporter TargetTeleporter{Dimension:"minecraft:the_end" } run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].TPStarData.ColorPart set value [96,0,96] + execute if data storage asset:teleporter TargetTeleporter.Data{ActivationState:"Activate"} if data storage asset:teleporter {IsOtherDimension:false} unless data storage asset:teleporter TargetTeleporter.Data.Color run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].TPStarData.ColorPart set value [160,160,64] + execute if data storage asset:teleporter TargetTeleporter.Data{ActivationState:"Activate"} if data storage asset:teleporter {IsOtherDimension:false} if data storage asset:teleporter TargetTeleporter.Data.Color run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].TPStarData.ColorPart set from storage asset:teleporter TargetTeleporter.Data.ColorPart +# 初期化タグ削除 + tag @s remove TPStarInit +# リセット + data remove storage asset:teleporter TempDimension + data remove storage asset:teleporter IsOtherDimension diff --git a/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/tp/.mcfunction b/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/tp/.mcfunction index 157465278b..dd91810a57 100644 --- a/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/tp/.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/tp/.mcfunction @@ -11,6 +11,6 @@ execute unless data storage asset:teleporter TargetPos anchored eyes positioned ^0.03 ^ ^1 positioned ~ ~-0.4 ~ run function asset_manager:teleporter/tick/tp/find_target_star execute unless data storage asset:teleporter TargetPos anchored eyes positioned ^-.03 ^ ^1 positioned ~ ~-0.4 ~ run function asset_manager:teleporter/tick/tp/find_target_star # 視点先に星が存在する場合はテレポート処理 - execute if data storage asset:teleporter TargetPos as 0-0-0-0-0 run function asset_manager:teleporter/tick/tp/move + execute if data storage asset:teleporter TargetPos run function asset_manager:teleporter/tick/tp/move with storage asset:teleporter TargetPos # リセット - data remove storage asset:teleporter TargetPos \ No newline at end of file + data remove storage asset:teleporter TargetPos diff --git a/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/tp/find_target_star.mcfunction b/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/tp/find_target_star.mcfunction index bb34900f1b..c4a7e3c794 100644 --- a/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/tp/find_target_star.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/tp/find_target_star.mcfunction @@ -7,7 +7,7 @@ # asset_manager:teleporter/tick/tp/find_target_star # 付近に星がいる場合 - execute as @e[type=marker,tag=TPStar,distance=..0.1,limit=1] run function oh_my_dat:please - execute if entity @e[type=marker,tag=TPStar,distance=..0.1,limit=1] run data modify storage asset:teleporter TargetPos set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].TPStarData.TargetPos + execute as @e[type=item_display,tag=TPStar.Active,distance=..0.1,limit=1] run function oh_my_dat:please + execute if entity @e[type=item_display,tag=TPStar.Active,distance=..0.1,limit=1] run data modify storage asset:teleporter TargetPos set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].TPStarData.TargetPos # 居ない場合の再帰 - execute unless data storage asset:teleporter TargetPos positioned ^ ^ ^0.05 if entity @s[distance=..2.5] run function asset_manager:teleporter/tick/tp/find_target_star \ No newline at end of file + execute unless data storage asset:teleporter TargetPos positioned ^ ^ ^0.05 if entity @s[distance=..2.5] run function asset_manager:teleporter/tick/tp/find_target_star diff --git a/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/tp/move.mcfunction b/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/tp/move.mcfunction index 189f7f3541..a384972995 100644 --- a/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/tp/move.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/tp/move.mcfunction @@ -2,19 +2,19 @@ # # # +# @input args +# Dimension: string +# X: Numeric +# Y: Numeric +# Z: Numeric # @within function asset_manager:teleporter/tick/tp/ -# TP先へ移動 - data modify entity @s Pos set from storage asset:teleporter TargetPos -# プレイヤーを飛ばす - execute positioned as @s run tp @p[tag=this] ~ ~ ~ - tp @p[tag=this] @p[tag=this] +# TP + $execute in $(Dimension) run tp @s $(X) $(Y) $(Z) # VFX function asset_manager:teleporter/tick/vfx/teleport/from - execute positioned as @s run function asset_manager:teleporter/tick/vfx/teleport/to + execute at @s run function asset_manager:teleporter/tick/vfx/teleport/to # 盲目を消す - effect clear @p[tag=this] blindness + effect clear @s blindness # TP後タグ付与 - tag @p[tag=this] add SuppressTeleport -# 汎用entityを戻す - execute in overworld run tp @s 0.0 0.0 0.0 \ No newline at end of file + tag @s add SuppressTeleport diff --git a/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/vfx/star/.mcfunction b/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/vfx/star/.mcfunction index 5776743338..5839ef8b5f 100644 --- a/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/vfx/star/.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/vfx/star/.mcfunction @@ -4,5 +4,48 @@ # # @within function asset_manager:teleporter/tick/active -execute if entity @s[tag=TPStar.White] as @p[tag=this] run function asset_manager:teleporter/tick/vfx/star/white -execute if entity @s[tag=TPStar.Aqua] as @p[tag=this] run function asset_manager:teleporter/tick/vfx/star/aqua \ No newline at end of file +# 点滅の開始は確率 + execute unless score @s TeleporterStarBlinkTick matches 1.. if predicate lib:random_pass_per/3 if predicate lib:random_pass_per/50 run scoreboard players set @s TeleporterStarBlinkTick 1 +# 点滅が開始したら毎 tick インクリメントする + execute if score @s TeleporterStarBlinkTick matches 1.. run scoreboard players add @s TeleporterStarBlinkTick 1 + +# 2tick ごとに点滅をいい感じに行う +# ここで呼び出す先のマクロ function が同一の内容で 3 つに分かれているのは、 +# マクロのキャッシュが 8 パターンまでしか行われないことに由来する +execute if score @s TeleporterStarBlinkTick matches 00 run function asset_manager:teleporter/tick/vfx/star/blink/1.m {Percentage:0.95} +execute if score @s TeleporterStarBlinkTick matches 02 run function asset_manager:teleporter/tick/vfx/star/blink/1.m {Percentage:0.90} +execute if score @s TeleporterStarBlinkTick matches 04 run function asset_manager:teleporter/tick/vfx/star/blink/1.m {Percentage:0.85} +execute if score @s TeleporterStarBlinkTick matches 06 run function asset_manager:teleporter/tick/vfx/star/blink/1.m {Percentage:0.80} +execute if score @s TeleporterStarBlinkTick matches 08 run function asset_manager:teleporter/tick/vfx/star/blink/1.m {Percentage:0.75} +execute if score @s TeleporterStarBlinkTick matches 10 run function asset_manager:teleporter/tick/vfx/star/blink/1.m {Percentage:0.70} +execute if score @s TeleporterStarBlinkTick matches 12 run function asset_manager:teleporter/tick/vfx/star/blink/1.m {Percentage:0.65} +execute if score @s TeleporterStarBlinkTick matches 14 run function asset_manager:teleporter/tick/vfx/star/blink/2.m {Percentage:0.60} +execute if score @s TeleporterStarBlinkTick matches 16 run function asset_manager:teleporter/tick/vfx/star/blink/2.m {Percentage:0.55} +execute if score @s TeleporterStarBlinkTick matches 18 run function asset_manager:teleporter/tick/vfx/star/blink/2.m {Percentage:0.50} +execute if score @s TeleporterStarBlinkTick matches 20 run function asset_manager:teleporter/tick/vfx/star/blink/2.m {Percentage:0.45} +execute if score @s TeleporterStarBlinkTick matches 22 run function asset_manager:teleporter/tick/vfx/star/blink/2.m {Percentage:0.40} +execute if score @s TeleporterStarBlinkTick matches 24 run function asset_manager:teleporter/tick/vfx/star/blink/2.m {Percentage:0.35} +execute if score @s TeleporterStarBlinkTick matches 26 run function asset_manager:teleporter/tick/vfx/star/blink/2.m {Percentage:0.30} +execute if score @s TeleporterStarBlinkTick matches 28 run function asset_manager:teleporter/tick/vfx/star/blink/2.m {Percentage:0.25} +execute if score @s TeleporterStarBlinkTick matches 30 run function asset_manager:teleporter/tick/vfx/star/blink/3.m {Percentage:0.20} +execute if score @s TeleporterStarBlinkTick matches 32 run function asset_manager:teleporter/tick/vfx/star/blink/3.m {Percentage:0.15} +execute if score @s TeleporterStarBlinkTick matches 34 run function asset_manager:teleporter/tick/vfx/star/blink/3.m {Percentage:0.10} +execute if score @s TeleporterStarBlinkTick matches 36 run function asset_manager:teleporter/tick/vfx/star/blink/3.m {Percentage:0.15} +execute if score @s TeleporterStarBlinkTick matches 38 run function asset_manager:teleporter/tick/vfx/star/blink/3.m {Percentage:0.20} +execute if score @s TeleporterStarBlinkTick matches 40 run function asset_manager:teleporter/tick/vfx/star/blink/2.m {Percentage:0.25} +execute if score @s TeleporterStarBlinkTick matches 42 run function asset_manager:teleporter/tick/vfx/star/blink/2.m {Percentage:0.30} +execute if score @s TeleporterStarBlinkTick matches 44 run function asset_manager:teleporter/tick/vfx/star/blink/2.m {Percentage:0.35} +execute if score @s TeleporterStarBlinkTick matches 46 run function asset_manager:teleporter/tick/vfx/star/blink/2.m {Percentage:0.40} +execute if score @s TeleporterStarBlinkTick matches 48 run function asset_manager:teleporter/tick/vfx/star/blink/2.m {Percentage:0.45} +execute if score @s TeleporterStarBlinkTick matches 50 run function asset_manager:teleporter/tick/vfx/star/blink/2.m {Percentage:0.50} +execute if score @s TeleporterStarBlinkTick matches 52 run function asset_manager:teleporter/tick/vfx/star/blink/2.m {Percentage:0.55} +execute if score @s TeleporterStarBlinkTick matches 54 run function asset_manager:teleporter/tick/vfx/star/blink/2.m {Percentage:0.60} +execute if score @s TeleporterStarBlinkTick matches 56 run function asset_manager:teleporter/tick/vfx/star/blink/1.m {Percentage:0.65} +execute if score @s TeleporterStarBlinkTick matches 58 run function asset_manager:teleporter/tick/vfx/star/blink/1.m {Percentage:0.70} +execute if score @s TeleporterStarBlinkTick matches 60 run function asset_manager:teleporter/tick/vfx/star/blink/1.m {Percentage:0.75} +execute if score @s TeleporterStarBlinkTick matches 62 run function asset_manager:teleporter/tick/vfx/star/blink/1.m {Percentage:0.80} +execute if score @s TeleporterStarBlinkTick matches 64 run function asset_manager:teleporter/tick/vfx/star/blink/1.m {Percentage:0.85} +execute if score @s TeleporterStarBlinkTick matches 66 run function asset_manager:teleporter/tick/vfx/star/blink/1.m {Percentage:0.90} +execute if score @s TeleporterStarBlinkTick matches 68 run function asset_manager:teleporter/tick/vfx/star/blink/1.m {Percentage:0.95} +execute if score @s TeleporterStarBlinkTick matches 70 run function asset_manager:teleporter/tick/vfx/star/blink/1.m {Percentage:1.00} +execute if score @s TeleporterStarBlinkTick matches 140 run scoreboard players reset @s TeleporterStarBlinkTick diff --git a/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/vfx/star/aqua.mcfunction b/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/vfx/star/aqua.mcfunction deleted file mode 100644 index 2d119939be..0000000000 --- a/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/vfx/star/aqua.mcfunction +++ /dev/null @@ -1,181 +0,0 @@ -#> asset_manager:teleporter/tick/vfx/star/aqua -# -# -# -# @within function asset_manager:teleporter/tick/vfx/star/ - -# [ImportKey]: NobwRALgngDgpmAXGGB7ANlA5qgdgWgENcBjAC1QCcwAaMAV3oEsATJMElkgBgDZuAzAEZ8QgOwtu+ACyEAHADN8ATiHSARvl5iFAVj2F10lrwBMtMLkIBbBMkBYmoCXIwEb6gIoZAzwyBqhkA-DAAIhFjCElDYAzkjgJKj0uBBIQnQkcLFw1IjgAG6E6PR24AAeSNx0UEUAvmV0ISxM9OGI3AB03HJ0oRDBcQ10cOjoTDChdkLcxWCUqB0QdmNRlLipSLx0AFb01jDxdOpwAF5Mi92QwVhwXeAdlKddYIRCcLpChHAkWiQkyjK8JCJ3LLr4FimOBwFhwUymQjSVQWE7sCCoMCVMBMUIAUT6AyGaIAjvRspgAMpBJJsRAKbJDOiogBCewOlFx+L6UGJhFJSAp6CGFRoF1gdhQGGweCIpAo1DojFY7AECgUclMcqUYh0Smk3DEhCI3FM0hk6ghcjgCl4d1VFistnYTjcXj8IiiMFKdCCIWs9Ui0ViWw4yWmaUy2VyETAhSOpQavPGhBqdSKzVaYHanSKPUxg2Goyqk0I0zTHCoCzSyzAaw2vp2+0OY0u11DdbO7CEunUsaEJAEWn06t03Dg+B2LDE+AEffZnZI0jNulhV3hiORqIx-UzTIJrJJoM5lLg1NCdOrjLxG7ZHPJu95-Pg7H6Cws0rJt3uj2er2+Hy+PyIQn+gOBoLgpC0IBHQVqCoAW77+IEwRhKGUQxF0Ix0AoEzWKG1jEAM9DoHmdgQJQuQoWh7AmBoQgCCCKhwPwMiELoXZyHIraDtwLCEFCyh9qabB0FkOR2KAKJPmR6gUVRyg0VIsgMfgTEseobEcdC3G8CwcnsdOhojqYQjKNq0imMoXacVIxmEN8fDKPwXEWOGTTcEIci8AI0JiEIepiAIchqMoJRIPgDm8Fx068LoyjQqYPlGUIlTgDKyCieJA6SbRMmMcxmiKexnGqepFLcOy0hiJohjqLwXwCJoyjMSISpAXATFRco5h0PZzTBbooXhZF0WqP5iCBc0TkuW5HnFd5vlxcJpG8ORlEpVJdGyfJWVKbl3A8VoSklYQpiBfI6oCGFRDfJ8JBedIlHqGINU3XZCbcH2qhCLwTXSF1wiGQNDnPUIr3vZ9agttNCVgElC3UWl9EZQp60qZtan4KanDGsagWqgZcjcFlJBKoFciKcIra8N8YgPYNDkja5yjuZ5k1uT9HUhaTPUtX1sV8jNiVzWJkOpdJMNyZlrE5QjW1VU9CqbcLkIyAqI7qOVWW6Fq4ibRxF0U0NVldazEXsx5-VgJGVPOTTdMTT50hyNIoMibzyVQ4LK0i9lylcYj6kmGaAimMOo4412NtwFIbaSHJSksHp7F+3I2u-dwL1vYqH1XWoAgDTrf0A6nQPSLFAC6dAYGSBQFqb0YIhhWEwDheFIARRFgKhqDocgnA8PwwiiBIguKCoaiaNoegGEYJitWA-EhogQlg53fCCCI4gR7IA+qBoWg6PouiGMYZj4CasYKKYCjqXwCjSWIOODnABf4O5t2NYaphtpP9lZw5cj2+wC-d8vfc6LryHlvUeu9x4HzUgoOAAhYwAnCrbeWHYiDY2qmIXQLAFBXRIKaRqFMgrs1MIIJUup0HPU-s0DUoxqE0JoZzeKT4-5L17qvQ6g9N4jx3nvCe+BWxwCEHoXQ+0FDqCSDIFgqgVC031A8XgCgPgUl0Iqd+j1gpRSIX7AQpDdDkJNo9AQyhDFGOMcY7+XN55cEXj3Fe-clAb2HtvMe+99rDh0UnTsg4450U-OoAQYgByGCwaIiRSs2IU2UI0W6j8rrGXEE1XgA4nJMxaD-Dulj-4sNsewhxYDuEH2UEpIheMtBnyvuoT41k75yX0KoeiLQKTkzagFAh6jiFaNMGQloySqG0N6YIXgqSODpOYTYoBdiQGcKcTw8pkI5FwBHOxLqBpQ4qGMF2J4nspzsheCQBOzNWmaO0boyMOsel9LoWUYuYBS6hnDAkPRiBYrIlQPKIYXQxhVgZAWWk9JUjrhZGebcF5uRwCvJAAU7A0CYBwAQYg5AqAPmYA7eaEklrpWFnDMWnseKWhsIKW0HgfC+AEDBd0npCyIV9EkFIgYp7BjyGGCu5RkTVFqPUByYhTBtEuEhXQ6ZVxDHiNmcYuZ8xHDmMWJYqx1ibEedsX5aRawnCbOkY4VwVXPgeE8F4bxPzTm-H8AEQIQRgghJxUCtx5zIFbuhJc6IMzYhPACrcZIuRUhRAeBV-yiQup3CCsF0AbzIChSKWF4oEVSiReweZ0h5RPH2qfcEMgPJmX0F2f2fAWwdOcrG3F1oHAuEJX4LsToXQoFgh6eC3okKJH9IcIMAlblMqjCy2MbLHqcu5amQaLZ+VYizGMCYUwZiJCLIcUs5ZZX3M+TWOgjZzhqvrMgFs4cOxdjCvKGQfYBxDhHGOQq7wBBThnHOLA7AbVIn3Cuft3rNzbNdbufch4GS3sBQ+-101A2CjvAgSNYMV3tg8Ru3s-Zb4B33ROI9056J5sgr4Sebo4KqoQj6R5YwL2qswrgbCuExVNz3C3EiyAY1xr2vgRN+0C5EJUGm8jkheBZrEDmhQFhp6CQYdGsQsaFDxvI9AyjKaaMKHTfRxjzHTrQNfOfUm6ljAkABHcKEgVo7KEwRg0mts9mOXNmNem1s-IPJ1p1bqBsopG3odzMAJGeNkYo8m6jXFhN0czUIpjc0lAgheOoOQVVxFGBkD8fachJAiB2Cm+4ul5m-sZQ0ZoOcU56nzr2wzidk6A3ToZQZ1neN2ao6mpzGaGOufEwYjsLANCfBPnIT4xgb6KRuvgD4wJqugkMbvfBzM9ZhVMxzZJ1NdNWxBuYp82XbP8fs-lkTLns3ucaxoLjqoRzKDPiIaQNt9qSRGEQBiWizAgkeNwDr2nRq03Gl5HyjxknGf1r1I2WWuOkYTeNvLQmptFZm7G5GEJVRqca-I2TXUzLea7AIVyJ8kioy41p+L6WvrJdNnFpO-0Etpy+gIe73GcvPcE45t7YnZuuTlMZJRo4nhHTYqxS+clDTsWE+8G6jSYtGZZt127RlM4peGjp07em1ADKuTc1VH8HncCroiTDtd654cIgRjDYBlSKmVA-NUMhNTakILqfUGgjQmjNOIRnbGkBzyfArpUm7VSbo1FqHUeoDQ69NOaRWhAxBzT9okjBAJiqfmcoTOSHEiswKEGF-BFCUnDdlPKRX5uVdW-V5ru3UVdeO+Rj56BDPtpqBkKYEgcgfy6QftwEgDHpDyaMKYXgR21GKjaUcpOoeznnNGBZsGpulcW-VGrm3WuX7Ggd-rxrkImN6QBCQZ4ufY2qkHt8RrN1Y1cXViwdQlfCE146W4gzCPBAmO30YsxHHkCt+j5bzvGvbfa8T33yfekXc032mpHgMgC6fAslFQcug74fV-Og7g0hwmRNO1xgYsIExoqAkqIEmJvnvpZofiqDHifvHufr3nrpPp5ErNCAOMJgoCONCC1CgoQCWnICVAoMZMxHcIdk0pTPstXocmvn2BAY9A3o3sdIMjAcrsftbqft3vbsgSONoMIHoMYKIKPKrkeoONCJoLoGYAXMFq-B5EvhQczgciQrQXXpzj-o3rQkXCXOgGXDFvcpGE8iXK8iqh8gqt8p6keK+r6sCjyJ+hCsGsKDCoimDOxOVhSJ9vKBdMmqMIOMoP5jwKoHHK-ECCxmBHijaC4MSqSkhl6JSogAZtSgGKGIbkLs2qLq2nGOypQl2pQO8n2pmEKoOqKiOoWPMOOtKhWHKmADOoqleg6nAFYfen6u6j8pYU6j6k0TYaCpckAA_3 -particle dust 0 1 1 0.05 ^0 ^-0.04 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.00385 ^-0.03778 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.0077 ^-0.03556 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.01155 ^-0.03333 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.0154 ^-0.03111 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.01925 ^-0.02889 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.02309 ^-0.02667 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.02694 ^-0.02444 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.03079 ^-0.02222 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.03464 ^-0.02 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.03464 ^-0.01556 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.03464 ^-0.01111 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.03464 ^-0.00667 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.03464 ^-0.00222 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.03464 ^0.00222 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.03464 ^0.00667 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.03464 ^0.01111 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.03464 ^0.01556 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.03464 ^0.02 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.03079 ^0.02222 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.02694 ^0.02444 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.02309 ^0.02667 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.01925 ^0.02889 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.0154 ^0.03111 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.01155 ^0.03333 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.0077 ^0.03556 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.00385 ^0.03778 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0 ^0.04 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.00385 ^0.03778 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.0077 ^0.03556 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.01155 ^0.03333 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.0154 ^0.03111 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.01925 ^0.02889 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.02309 ^0.02667 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.02694 ^0.02444 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.03079 ^0.02222 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.03464 ^0.02 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.03464 ^0.01556 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.03464 ^0.01111 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.03464 ^0.00667 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.03464 ^0.00222 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.03464 ^-0.00222 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.03464 ^-0.00667 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.03464 ^-0.01111 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.03464 ^-0.01556 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.03464 ^-0.02 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.03079 ^-0.02222 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.02694 ^-0.02444 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.02309 ^-0.02667 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.01925 ^-0.02889 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.0154 ^-0.03111 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.01155 ^-0.03333 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.0077 ^-0.03556 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.00385 ^-0.03778 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.01863 ^-0.06955 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.01656 ^-0.07071 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.01449 ^-0.07187 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.01242 ^-0.07303 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.01035 ^-0.07419 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.00828 ^-0.07535 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.00621 ^-0.07652 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.00414 ^-0.07768 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.00207 ^-0.07884 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0 ^-0.08 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.06955 ^-0.01863 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.06952 ^-0.02101 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.06949 ^-0.02338 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.06946 ^-0.02576 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.06943 ^-0.02813 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.0694 ^-0.0305 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.06937 ^-0.03288 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.06934 ^-0.03525 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.06931 ^-0.03763 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.06928 ^-0.04 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.05091 ^0.05091 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.05295 ^0.0497 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.05499 ^0.04849 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.05704 ^0.04727 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.05908 ^0.04606 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.06112 ^0.04485 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.06316 ^0.04364 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.0652 ^0.04242 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.06724 ^0.04121 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.06928 ^0.04 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.01863 ^0.06955 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.01656 ^0.07071 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.01449 ^0.07187 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.01242 ^0.07303 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.01035 ^0.07419 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.00828 ^0.07535 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.00621 ^0.07652 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.00414 ^0.07768 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.00207 ^0.07884 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0 ^0.08 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.06955 ^0.01863 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.06952 ^0.02101 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.06949 ^0.02338 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.06946 ^0.02576 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.06943 ^0.02813 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.0694 ^0.0305 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.06937 ^0.03288 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.06934 ^0.03525 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.06931 ^0.03763 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.06928 ^0.04 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.05091 ^-0.05091 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.05295 ^-0.0497 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.05499 ^-0.04849 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.05704 ^-0.04727 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.05908 ^-0.04606 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.06112 ^-0.04485 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.06316 ^-0.04364 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.0652 ^-0.04242 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.06724 ^-0.04121 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.06928 ^-0.04 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.01863 ^-0.06955 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.01656 ^-0.07071 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.01449 ^-0.07187 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.01242 ^-0.07303 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.01035 ^-0.07419 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.00828 ^-0.07535 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.00621 ^-0.07652 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.00414 ^-0.07768 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.00207 ^-0.07884 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0 ^-0.08 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.05091 ^-0.05091 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.05295 ^-0.0497 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.05499 ^-0.04849 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.05704 ^-0.04727 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.05908 ^-0.04606 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.06112 ^-0.04485 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.06316 ^-0.04364 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.0652 ^-0.04242 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.06724 ^-0.04121 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.06928 ^-0.04 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.06955 ^0.01863 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.06952 ^0.02101 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.06949 ^0.02338 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.06946 ^0.02576 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.06943 ^0.02813 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.0694 ^0.0305 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.06937 ^0.03288 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.06934 ^0.03525 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.06931 ^0.03763 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.06928 ^0.04 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.01863 ^0.06955 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.01656 ^0.07071 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.01449 ^0.07187 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.01242 ^0.07303 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.01035 ^0.07419 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.00828 ^0.07535 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.00621 ^0.07652 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.00414 ^0.07768 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0.00207 ^0.07884 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^0 ^0.08 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.05091 ^0.05091 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.05295 ^0.0497 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.05499 ^0.04849 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.05704 ^0.04727 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.05908 ^0.04606 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.06112 ^0.04485 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.06316 ^0.04364 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.0652 ^0.04242 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.06724 ^0.04121 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.06928 ^0.04 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.06955 ^-0.01863 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.06952 ^-0.02101 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.06949 ^-0.02338 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.06946 ^-0.02576 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.06943 ^-0.02813 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.0694 ^-0.0305 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.06937 ^-0.03288 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.06934 ^-0.03525 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.06931 ^-0.03763 ^ 0 0 0 0 1 normal @s -particle dust 0 1 1 0.05 ^-0.06928 ^-0.04 ^ 0 0 0 0 1 normal @s \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/vfx/star/blink/1.m.mcfunction b/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/vfx/star/blink/1.m.mcfunction new file mode 100644 index 0000000000..be81c507a1 --- /dev/null +++ b/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/vfx/star/blink/1.m.mcfunction @@ -0,0 +1,34 @@ +#> asset_manager:teleporter/tick/vfx/star/blink/1.m +# +# +# +# @within function asset_manager:teleporter/tick/vfx/star/ + +#> Private +# @private + #declare score_holder $R + #declare score_holder $G + #declare score_holder $B + #declare score_holder $Color + +# EntityStorage 呼び出し + function oh_my_dat:please + +# 色情報取得 + $execute store result score $R Temporary run data get storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].TPStarData.ColorPart[0] $(Percentage) + $execute store result score $G Temporary run data get storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].TPStarData.ColorPart[1] $(Percentage) + $execute store result score $B Temporary run data get storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].TPStarData.ColorPart[2] $(Percentage) +# カラーコード(10) を計算する + scoreboard players operation $Color Temporary = $R Temporary + scoreboard players operation $Color Temporary *= $256 Const + scoreboard players operation $Color Temporary += $G Temporary + scoreboard players operation $Color Temporary *= $256 Const + scoreboard players operation $Color Temporary += $B Temporary +# display に適用 + execute store result entity @s item.tag.display.color int 1 run scoreboard players get $Color Temporary + +# リセット + scoreboard players reset $R Temporary + scoreboard players reset $G Temporary + scoreboard players reset $B Temporary + scoreboard players reset $Color Temporary diff --git a/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/vfx/star/blink/2.m.mcfunction b/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/vfx/star/blink/2.m.mcfunction new file mode 100644 index 0000000000..b8366bd70b --- /dev/null +++ b/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/vfx/star/blink/2.m.mcfunction @@ -0,0 +1,34 @@ +#> asset_manager:teleporter/tick/vfx/star/blink/2.m +# +# +# +# @within function asset_manager:teleporter/tick/vfx/star/ + +#> Private +# @private + #declare score_holder $R + #declare score_holder $G + #declare score_holder $B + #declare score_holder $Color + +# EntityStorage 呼び出し + function oh_my_dat:please + +# 色情報取得 + $execute store result score $R Temporary run data get storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].TPStarData.ColorPart[0] $(Percentage) + $execute store result score $G Temporary run data get storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].TPStarData.ColorPart[1] $(Percentage) + $execute store result score $B Temporary run data get storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].TPStarData.ColorPart[2] $(Percentage) +# カラーコード(10) を計算する + scoreboard players operation $Color Temporary = $R Temporary + scoreboard players operation $Color Temporary *= $256 Const + scoreboard players operation $Color Temporary += $G Temporary + scoreboard players operation $Color Temporary *= $256 Const + scoreboard players operation $Color Temporary += $B Temporary +# display に適用 + execute store result entity @s item.tag.display.color int 1 run scoreboard players get $Color Temporary + +# リセット + scoreboard players reset $R Temporary + scoreboard players reset $G Temporary + scoreboard players reset $B Temporary + scoreboard players reset $Color Temporary diff --git a/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/vfx/star/blink/3.m.mcfunction b/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/vfx/star/blink/3.m.mcfunction new file mode 100644 index 0000000000..b8366bd70b --- /dev/null +++ b/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/vfx/star/blink/3.m.mcfunction @@ -0,0 +1,34 @@ +#> asset_manager:teleporter/tick/vfx/star/blink/2.m +# +# +# +# @within function asset_manager:teleporter/tick/vfx/star/ + +#> Private +# @private + #declare score_holder $R + #declare score_holder $G + #declare score_holder $B + #declare score_holder $Color + +# EntityStorage 呼び出し + function oh_my_dat:please + +# 色情報取得 + $execute store result score $R Temporary run data get storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].TPStarData.ColorPart[0] $(Percentage) + $execute store result score $G Temporary run data get storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].TPStarData.ColorPart[1] $(Percentage) + $execute store result score $B Temporary run data get storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].TPStarData.ColorPart[2] $(Percentage) +# カラーコード(10) を計算する + scoreboard players operation $Color Temporary = $R Temporary + scoreboard players operation $Color Temporary *= $256 Const + scoreboard players operation $Color Temporary += $G Temporary + scoreboard players operation $Color Temporary *= $256 Const + scoreboard players operation $Color Temporary += $B Temporary +# display に適用 + execute store result entity @s item.tag.display.color int 1 run scoreboard players get $Color Temporary + +# リセット + scoreboard players reset $R Temporary + scoreboard players reset $G Temporary + scoreboard players reset $B Temporary + scoreboard players reset $Color Temporary diff --git a/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/vfx/star/white.mcfunction b/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/vfx/star/white.mcfunction deleted file mode 100644 index 3d31216a4f..0000000000 --- a/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/vfx/star/white.mcfunction +++ /dev/null @@ -1,181 +0,0 @@ -#> asset_manager:teleporter/tick/vfx/star/white -# -# -# -# @within function asset_manager:teleporter/tick/vfx/star/ - -# [ImportKey]: NobwRALgngDgpmAXGGB7ANlA5qgdgWgENcBjAC1QCcwAaMAV3oEsATJMElkgBgDZuAzAEZ8QgOwtu+ACyEAHADN8ATiHSARvl5iFAVj2F10lrwBMtMLkIBbBMkBYmoCXIwEb6gIoZAzwyBqhkA-DAAIhFjCElDYAzkjgJKj0uBBIQnQkcLFw1IjgAG6E6PR24AAeSNx0UEUAvmV0ISxM9OGI3AB03HJ0oRDBcQ10cOjoTDChdkLcxWCUqB0QdmNRlLipSLx0AFb01jDxdOpwAF5Mi92QwVhwXeAdlKddYIRCcLpChHAkWiQkyjK8JCJ3LLr4FimOBwFhwUymQjSVQWE7sCCoMCVMBMUIAUT6AyGaIAjvRspgAMpBJJsRAKbJDOiogBCewOlFx+L6UGJhFJSAp6CGFRoF1gdhQGGweCIpAo1DojFY7AECgUclMcqUYh0Smk3DEhCI3FM0hk6ghcjgCl4d1VFistnYTjcXj8IiiMFKdCCIWs9Ui0ViWw4yWmaUy2VyETAhSOpQavPGhBqdSKzVaYHanSKPUxg2Goyqk0I0zTHCoCzSyzAaw2vp2+0OY0u11DdbO7CEunUsaEJAEWn06t03Dg+B2LDE+AEffZnZI0jNulhV3hiORqIx-UzTIJrJJoM5lLg1NCdOrjLxG7ZHPJu95-Pg7H6Cws0rJt3uj2er2+Hy+PyIQn+gOBoLgpC0IBHQVqCoAW77+IEwRhKGUQxF0Ix0AoEzWKG1jEAM9DoHmdgQJQuQoWh7AmBoQgCCCKhwPwMiELoXZyHIraDtwLCEFCyh9qabB0FkOR2KAKJPmR6gUVRyg0VIsgMfgTEseobEcdC3G8CwcnsdOhojqYQjKNq0imMoXacVIxmEN8fDKPwXEWOGTTcEIci8AI0JiEIepiAIchqMoJRIPgDm8Fx068LoyjQqYPlGUIlTgDKyCieJA6SbRMmMcxmiKexnGqepFLcOy0hiJohjqLwXwCJoyjMSISpAXATFRco5h0PZzTBbooXhZF0WqP5iCBc0TkuW5HnFd5vlxcJpG8ORlEpVJdGyfJWVKbl3A8VoSklYQpiBfI6oCGFRDfJ8JBedIlHqGINU3XZCbcH2qhCLwTXSF1wiGQNDnPUIr3vZ9agttNCVgElC3UWl9EZQp60qZtan4KanDGsagWqgZcjcFlJBKoFciKcIra8N8YgPYNDkja5yjuZ5k1uT9HUhaTPUtX1sV8jNiVzWJkOpdJMNyZlrE5QjW1VU9CqbcLkIyAqI7qOVWW6Fq4ibRxF0U0NVldazEXsx5-VgJGVPOTTdMTT50hyNIoMibzyVQ4LK0i9lylcYj6kmGaAimMOo4412NtwFIbaSHJSksHp7F+3I2u-dwL1vYqH1XWoAgDTrf0A6nQPSLFAC6dAYGSBQFqb0YIhhWEwDheFIARRFgKhqDocgnA8PwwiiBIguKCoaiaNoegGEYJitWA-EhogQlg53fCCCI4gR7IA+qBoWg6PouiGMYZj4CasYKKYCjqXwCjSWIOODnABf4O5t2NYaphtpP9lZw5cj2+wC-d8vfc6LryHlvUeu9x4HzUgoOAAhYwAnCrbeWHYiDY2qmIXQLAFBXRIKaRqFMgrs1MIIJUup0HPU-s0DUoxqE0JoZzeKT4-5L17qvQ6g9N4jx3nvCe+BWxwCEHoXQ+0FDqCSDIFgqgVC031A8XgCgPgUl0Iqd+j1gpRSIX7AQpDdDkJNo9AQyhDFGOMcY7+XN55cEXj3Fe-clAb2HtvMe+99rDh0UnTsg4450U-OoAQYgByGCwaIiRSs2IU2UI0W6j8rrGXEE1XgA4nJMxaD-Dulj-4sNsewhxYDuEH2UEpIheMtBnyvuoT41k75yX0KoeiLQKTkzagFAh6jiFaNMGQloySqG0N6YIXgqSODpOYTYoBdiQGcKcTw8pkI5FwBHOxLqBpQ4qGMF2J4nspzsheCQBOzNWmaO0boyMOsel9LoWUYuYBS6hnDAkPRiBYrIlQPKIYXQxhVgZAWWk9JUjrhZGebcF5uRwCvJAAU7A0CYBwAQYg5AqAPmYA7eaEklrpWFnDMWnseKWhsIKW0HgfC+AEDBd0npCyIV9EkFIgYp7BjyGGCu5RkTVFqPUByYhTBtEuEhXQ6ZVxDHiNmcYuZ8xHDmMWJYqx1ibEedsX5aRawnCbOkY4VwVXPgeE8F4bxPzTm-H8AEQIQRgghJxUCtx5zIFbuhJc6IMzYhPACrcZIuRUhRAeBV-yiQup3CCsF0AbzIChSKWF4oEVSiReweZ0h5RPH2qfcEMgPJmX0F2f2fAWwdOcrG3F1oHAuEJX4LsToXQoFgh6eC3okKJH9IcIMAlblMqjCy2MbLHqcu5amQaLZ+VYizGMCYUwZiJCLIcUs5ZZX3M+TWOgjZzhqvrMgFs4cOxdjCvKGQfYBxDhHGOQq7wBBThnHOLA7AbVIn3Cuft3rNzbNdbufch4GS3sBQ+-101A2CjvAgSNYMV3tg8Ru3s-Zb4B33ROI9056J5sgr4Sebo4KqoQj6R5YwL2qswrgbCuExVNz3C3EiyAY1xr2vgRN+0C5EJUGm8jkheBZrEDmhQFhp6CQYdGsQsaFDxvI9AyjKaaMKHTfRxjzHTrQNfOfUm6ljAkABHcKEgVo7KEwRg0mts9mOXNmNem1s-IPJ1p1bqBsopG3odzMAJGeNkYo8m6jXFhN0czUIpjc0lAgheOoOQVVxFGBkD8fachJAiB2Cm+4ul5m-sZQ0ZoOcU56nzr2wzidk6A3ToZQZ1neN2ao6mpzGaGOufEwYjsLANCfBPnIT4xgb6KRuvgD4wJqugkMbvfBzM9ZhVMxzZJ1NdNWxBuYp82XbP8fs-lkTLns3ucaxoLjqoRzKDPiIaQNt9qSRGEQBiWizAgkeNwDr2nRq03Gl5HyjxknGf1r1I2WWuOkYTeNvLQmptFZm7G5GEJVRqca-I2TXUzLea7AIVyJ8kioy41p+L6WvrJdNnFpO-0Etpy+gIe73GcvPcE45t7YnZuuTlMZJRo4nhHTYqxS+clDTsWE+8G6jSYtGZZt127RlM4peGjp07em1ADKuTc1VH8HncCroiTDtd654cIgRjDYBlSKmVA-NUMhNTakILqfUGgjQmjNOIRnbGkBzyfArpUm7VSbo1FqHUeoDQ69NOaRWhAxBzT9okjBAJiqfmcoTOSHEiswKEGF-BFCUnDdlPKRX5uVdW-V5ru3UVdeO+Rj56BDPtpqBkKYEgcgfy6QftwEgDHpDyaMKYXgR21GKjaUcpOoeznnNGBZsGpulcW-VGrm3WuX7Ggd-rxrkImN6QBCQZ4ufY2qkHt8RrN1Y1cXViwdQlfCE146W4gzCPBAmO30YsxHHkCt+j5bzvGvbfa8T33yfekXc032mpHgMgC6fAslFQcug74fV-Og7g0hwmRNO1xgYsIExoqAkqIEmJvnvpZofiqDHifvHufr3nrpPp5ErNCAOMJgoCONCC1CgoQCWnICVAoMZMxHcIdk0pTPstXocmvn2BAY9A3o3sdIMjAcrsftbqft3vbsgSONoMIHoMYKIKPKrkeoONCJoLoGYAXMFq-B5EvhQczgciQrQXXpzj-o3rQkXCXOgGXDFvcpGE8iXK8iqh8gqt8p6keK+r6sCjyJ+hCsGsKDCoimDOxOVhSJ9vKBdMmqMIOMoP5jwKoHHK-ECCxmBHijaC4MSqSkhl6JSogAZtSgGKGIbkLs2qLq2nGOypQl2pQO8n2pmEKoOqKiOoWPMOOtKhWHKmADOoqleg6nAFYfen6u6j8pYU6j6k0TYaCpckAA_3 -particle dust 1 1 1 0.05 ^0 ^-0.04 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.00385 ^-0.03778 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.0077 ^-0.03556 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.01155 ^-0.03333 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.0154 ^-0.03111 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.01925 ^-0.02889 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.02309 ^-0.02667 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.02694 ^-0.02444 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.03079 ^-0.02222 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.03464 ^-0.02 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.03464 ^-0.01556 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.03464 ^-0.01111 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.03464 ^-0.00667 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.03464 ^-0.00222 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.03464 ^0.00222 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.03464 ^0.00667 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.03464 ^0.01111 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.03464 ^0.01556 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.03464 ^0.02 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.03079 ^0.02222 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.02694 ^0.02444 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.02309 ^0.02667 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.01925 ^0.02889 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.0154 ^0.03111 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.01155 ^0.03333 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.0077 ^0.03556 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.00385 ^0.03778 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0 ^0.04 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.00385 ^0.03778 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.0077 ^0.03556 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.01155 ^0.03333 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.0154 ^0.03111 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.01925 ^0.02889 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.02309 ^0.02667 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.02694 ^0.02444 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.03079 ^0.02222 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.03464 ^0.02 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.03464 ^0.01556 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.03464 ^0.01111 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.03464 ^0.00667 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.03464 ^0.00222 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.03464 ^-0.00222 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.03464 ^-0.00667 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.03464 ^-0.01111 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.03464 ^-0.01556 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.03464 ^-0.02 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.03079 ^-0.02222 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.02694 ^-0.02444 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.02309 ^-0.02667 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.01925 ^-0.02889 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.0154 ^-0.03111 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.01155 ^-0.03333 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.0077 ^-0.03556 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.00385 ^-0.03778 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.01863 ^-0.06955 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.01656 ^-0.07071 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.01449 ^-0.07187 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.01242 ^-0.07303 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.01035 ^-0.07419 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.00828 ^-0.07535 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.00621 ^-0.07652 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.00414 ^-0.07768 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.00207 ^-0.07884 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0 ^-0.08 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.06955 ^-0.01863 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.06952 ^-0.02101 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.06949 ^-0.02338 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.06946 ^-0.02576 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.06943 ^-0.02813 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.0694 ^-0.0305 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.06937 ^-0.03288 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.06934 ^-0.03525 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.06931 ^-0.03763 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.06928 ^-0.04 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.05091 ^0.05091 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.05295 ^0.0497 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.05499 ^0.04849 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.05704 ^0.04727 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.05908 ^0.04606 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.06112 ^0.04485 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.06316 ^0.04364 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.0652 ^0.04242 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.06724 ^0.04121 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.06928 ^0.04 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.01863 ^0.06955 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.01656 ^0.07071 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.01449 ^0.07187 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.01242 ^0.07303 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.01035 ^0.07419 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.00828 ^0.07535 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.00621 ^0.07652 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.00414 ^0.07768 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.00207 ^0.07884 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0 ^0.08 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.06955 ^0.01863 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.06952 ^0.02101 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.06949 ^0.02338 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.06946 ^0.02576 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.06943 ^0.02813 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.0694 ^0.0305 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.06937 ^0.03288 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.06934 ^0.03525 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.06931 ^0.03763 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.06928 ^0.04 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.05091 ^-0.05091 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.05295 ^-0.0497 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.05499 ^-0.04849 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.05704 ^-0.04727 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.05908 ^-0.04606 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.06112 ^-0.04485 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.06316 ^-0.04364 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.0652 ^-0.04242 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.06724 ^-0.04121 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.06928 ^-0.04 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.01863 ^-0.06955 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.01656 ^-0.07071 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.01449 ^-0.07187 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.01242 ^-0.07303 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.01035 ^-0.07419 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.00828 ^-0.07535 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.00621 ^-0.07652 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.00414 ^-0.07768 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.00207 ^-0.07884 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0 ^-0.08 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.05091 ^-0.05091 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.05295 ^-0.0497 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.05499 ^-0.04849 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.05704 ^-0.04727 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.05908 ^-0.04606 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.06112 ^-0.04485 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.06316 ^-0.04364 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.0652 ^-0.04242 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.06724 ^-0.04121 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.06928 ^-0.04 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.06955 ^0.01863 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.06952 ^0.02101 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.06949 ^0.02338 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.06946 ^0.02576 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.06943 ^0.02813 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.0694 ^0.0305 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.06937 ^0.03288 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.06934 ^0.03525 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.06931 ^0.03763 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.06928 ^0.04 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.01863 ^0.06955 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.01656 ^0.07071 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.01449 ^0.07187 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.01242 ^0.07303 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.01035 ^0.07419 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.00828 ^0.07535 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.00621 ^0.07652 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.00414 ^0.07768 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0.00207 ^0.07884 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^0 ^0.08 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.05091 ^0.05091 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.05295 ^0.0497 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.05499 ^0.04849 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.05704 ^0.04727 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.05908 ^0.04606 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.06112 ^0.04485 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.06316 ^0.04364 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.0652 ^0.04242 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.06724 ^0.04121 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.06928 ^0.04 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.06955 ^-0.01863 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.06952 ^-0.02101 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.06949 ^-0.02338 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.06946 ^-0.02576 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.06943 ^-0.02813 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.0694 ^-0.0305 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.06937 ^-0.03288 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.06934 ^-0.03525 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.06931 ^-0.03763 ^ 0 0 0 0 1 normal @s -particle dust 1 1 1 0.05 ^-0.06928 ^-0.04 ^ 0 0 0 0 1 normal @s \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/vfx/teleporter/.mcfunction b/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/vfx/teleporter/.mcfunction index eea6f950e1..1b685b8460 100644 --- a/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/vfx/teleporter/.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/vfx/teleporter/.mcfunction @@ -4,10 +4,8 @@ # # @within function asset_manager:teleporter/tick/global -# rotate - tp @s ~ ~ ~ ~2 ~ -# get entity storage - function oh_my_dat:please -# show particle - execute if data storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].TeleporterData{ActivationState:"Activate"} positioned ~ ~0.05 ~ run function asset_manager:teleporter/tick/vfx/teleporter/active/ - execute if data storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].TeleporterData{ActivationState:"VisibleDeactivate"} positioned ~ ~0.05 ~ run function asset_manager:teleporter/tick/vfx/teleporter/deactive/ \ No newline at end of file +# 回転 + execute unless data storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].TeleporterData{AngelProtection:true} run tp @s ~ ~ ~ ~2 ~ + +# アクティブ時のパーティクル + execute if data storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].TeleporterData{ActivationState:"Activate"} unless data storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].TeleporterData{AngelProtection:true} run function asset_manager:teleporter/tick/vfx/teleporter/on_active diff --git a/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/vfx/teleporter/active/.mcfunction b/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/vfx/teleporter/active/.mcfunction deleted file mode 100644 index 6ed540f1f0..0000000000 --- a/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/vfx/teleporter/active/.mcfunction +++ /dev/null @@ -1,72 +0,0 @@ -#> asset_manager:teleporter/tick/vfx/teleporter/active/ -# -# -# -# @within function asset_manager:teleporter/tick/vfx/teleporter/ - -execute as @a[distance=..5] run function asset_manager:teleporter/tick/vfx/teleporter/active/nearby_player - -# [ImportKey]: NobwRALgngDgpmAXGAxgSwE4oDZwLQCGAdigBYD2GYANGAK51oAmSYAbAOwBGADDwKwAWfnn4BmMVzyC4XNngAcYtgEY8XQQCYAZmyYBOQao00wRAgFsEyQGGKgIoZAzwyBqhkA-DAAIVpmAQyWAzkjgKOR0RBBIbLQocGFwVIjgAG4E2HTW4AAeSDy0UNkAvvm0vkxodAGIKrR+ED7hiDlgcNjYaDB+1ip8xeS1ENaNtRgA5nD14EOj9WA8mmI8+iqC2oT8CoLS-FxqBGz8TNKC0V1MBvpsXKY+w6zRsVRFYGh+AKItbR0vAI50KdhQAGVvNEWIhtCkOoVqBNYNYwDByP9huQiKYGMxWLN5otlqt1pttoQ9gdBEc4CczhdTOYrKxAFiagCXIwBG+m5NF4fP5AqgQmEkIIojF+vFwBZiG06NgCP0kBAMGlaNoMOQLKxOLwBMJRBIpDI5IplGoNDo9IZjIJTMlUtZQGAsg1ckg8CoiplsgA6BRsNizIQ8MQcdaCMSeh2IPA8N38PjRmOx53Q23uz3ezS+-2B4McUMRwT6PP5gsFhQuxOVN2aTRGIwcPNLDhicSafAqSJgPKVEt28Mer0+wR+gOk4P8bOR2Pj6OCTuOiPJvsDjMhtszscT8fOgC6tERoNd9uXDShYBKZQqEbE1SG9UazVa7U63WPvSlAyilCIcQitAAVnQLDAkCqMAuDgAAvNBP33Z43jvT4fj+QFgTgUFwWwDpaGeAAhMCIIwb5fhaRCCBBGU5TgKEYXgVgESRFE0UYUEwAUBR9DEbR-RWAhtH0FBDjgeR9B4JheODWslAIJgtg4alLDhRkWTEdlfAsCogh5eoVCzVBBUgpIUjSLk7UadseCPE9ykAt0LzAGo6myWhbw+B9GiVPpX25DAP3iVtf3-QDaBA8DIMaaD3nvfCEKBYjkKQVD0KePxsKCvD4MIqKSLBCFyJLaAqOQGioGRVFaHRRiVCYUkCGUfAFA4FAxGkb0OEILhCQ4bgUH0IQxBQTQVBQGTaWQeS3HNWhvGU1TuVCep9AFe4uUtAyElLYyCkecyzzdLTbIwa8HLCjpAMfVyX3sjyvK-MBfIAyoApw4KMNeQ64AitKkJQrKnqS3C3v+dKYsQWU0goyBYWoxFCrokqGNYT0li4NZmv6lAREEDhczwfQmDYBQsc0HgVDEFQCfYvhBrhQBaOUAOk1FPGjkVK5YIZr5eahUW-T0lW7MzIk093Ws3b9qaF7jpc59pX3YJPMgny-1uoDAtw87Qtg17Uv+j7Yq+hKfriP6iIyuLsoTXK4QKor6IxZB+NmBRtGicMAzRyseEUP0pAIbZNAIes9kkHgKdYGnPHpyamfU-ztIWlalq5oyeY2vmLIaN0gKF87HPvMWejc87pcuxA5b8u7gIe+IQuetWDYBz60Lgb7y5rrXMvr0GzduTAcHwYgyEoK3GKEOQMbEA4OB9jZBAUfgCHUU4Gp4Ukln4Nh9Cq5Qg9sRxXA8JTORW5neSLtndLAOPDPOkzedKFPZzmmyr0ArSs6OyoTol9zJjGLkv+mVHBAIHwVGeBOrnGkHMFYXU4AiEErVHgXo4AKAMGyWg1xWCKmVGAR4qsnLN2inXSEOVwbIHQFgXAhASAUCoDDa2YByqaA4NoB28hAEcFnv2fgKwuAEGQiAgg4gOD8AxvVbQCBaA0jhPYZw7gUHwgZlNQ+9RWx3HZrHTmF99xXyTjfLaLFLx2UQEGA6asc5PjzvuX+P9rjfxIUIQBPBgGgPkFoNiWN+DQKxjwOBCCkH6FkWg5AEByBYKejBXBGtDaA2Nu3YhYBWgfgHrcOxQCRBOPAa4qBMCvEcHgWwRByDN5gEAFu+u8w77zUizRAWkMEqhWqKIg4pJSS2Bg3MANTWBD04EGMeE9pDT1nlwee4Yl7CFXuvNgFp1GIBtLQ7QuYFAEzAdoH2aMCBHCxgQe24YVD2yDJoJgrUhJYyYFVLg9V5AqHOM1IwnpCC6DUPwQwjDaprI4HAAgpgjLlhTF0BQmkCZiDmEI-kB5uzTxUBCkmgKFA8A4F0FQ-ASyzPmYs+Qyz+HSDWbxNeWzCa7MBQc3gY8OCr20O1A42hmIkgEAcLiFxRCMJQLCrgyyhKh1Wj2OFLEGwkrWNPQwoZuwE1mPAoMShexiH0O1JFjE5n6AWQsNFKzMXrJxSsPFcyCWHNpb1EC0Q8YExXtIfQcANiCRZeoLgfi+AYzth82gXzvSr2dv2YQK85haRMm6PYCxF41lJIILoqhiwJmRfK1FeB0WrNVZs9VOzNX7O1YQNeqMkHNX4Aw-AghWpSD1W7dqJKlhBn7Ewz5K5NA-K8f8v0QKMajnBZCuYmgYVwsJoi0NsqUWKsjcqgBMbcXxr2YSo5Qj-Ze30E6CQzjmGEAUAQTQeBNBrzgOCDNPE4B01LGCzgOzWKjr5Y86yXrhUEzYGK5Q3p+ywplegrtSze1Yo2QO-FiaiV4A4EwBYOzZiRv0KI6QnVeL8MlYoGF-AUBcE0KjQmY0t0RidVK6err+DuobIK+DUZBLo0MEveBlz8hbjADuDRa1DyPCCVyepjSzpAzIgqJUtS6FMAYUwlALDYXsIEFwnhBwUDAcEcItiYiz5TJmYxCSM9+GCTwKaoQ0gQK5qULxN5PAuCiTYgYA4IFKzjzYEBxYDUyQNUg-ArGChEbgjYMoGewnHXwMQ76N1bA5itnbN2H1WH-W4eDTe5AEmCBSbdrJyeCn1BKffXAVT6ntCafDJwylYhcRsGWdcgMDVPTaFzb2FD2h+AthYmW1OnouV7t5cxR5ILj18FPeeiV8qQ3gFof5wLMnhAhdkGFnqEWovcpi9jPAyWYvaFmAuv5PB2HzHwKxMQ+BCYExJeJck-BCsRgrbMX51bAUNlc0mPLjboWwvhRwXzYBmuPKC21+THWuDhZU2p3rsXNJMI0EwBqPCIPSHBFp+YC7dj2zWCgNhaxYNdng-Zl1i8UPOeUKODzfqcOBrw-oE7Z3pPBau4prrd3ouxbGRoOAf7RB+OcTjZqeZxCLqjP6JgsgCd7EK9ukrPK9jlYFaC1b1XRXBgvX6KVx2O2sFRxduT2bru3ci-d1ifWDiVk0twel+gbvOLU27XglZRDMYrHMiDELN2g++etqt48a0GnQx6PbEKm0tvhVOQjxGVp2iAu2Z0jxyBMI6MLJWj1dZNwibXbWbcCNAA_3 -# 中央1 -particle dust 0 0.9 0.7 0.2 ^0 ^ ^-0.1 0 0 0 0 1 -particle dust 0 0.9 0.7 0.2 ^0.0866 ^ ^-0.05 0 0 0 0 1 -particle dust 0 0.9 0.7 0.2 ^0.0866 ^ ^0.05 0 0 0 0 1 -particle dust 0 0.9 0.7 0.2 ^0 ^ ^0.1 0 0 0 0 1 -particle dust 0 0.9 0.7 0.2 ^-0.0866 ^ ^0.05 0 0 0 0 1 -particle dust 0 0.9 0.7 0.2 ^-0.0866 ^ ^-0.05 0 0 0 0 1 -# 中央3 -particle dust 0 0.9 0.7 0.2 ^0 ^ ^-0.3 0 0 0 0 1 -particle dust 0 0.9 0.7 0.2 ^0.06495 ^ ^-0.2625 0 0 0 0 1 -particle dust 0 0.9 0.7 0.2 ^0.1299 ^ ^-0.225 0 0 0 0 1 -particle dust 0 0.9 0.7 0.2 ^0.19486 ^ ^-0.1875 0 0 0 0 1 -particle dust 0 0.9 0.7 0.2 ^0.25981 ^ ^-0.15 0 0 0 0 1 -particle dust 0 0.9 0.7 0.2 ^0.25981 ^ ^-0.075 0 0 0 0 1 -particle dust 0 0.9 0.7 0.2 ^0.25981 ^ ^0 0 0 0 0 1 -particle dust 0 0.9 0.7 0.2 ^0.25981 ^ ^0.075 0 0 0 0 1 -particle dust 0 0.9 0.7 0.2 ^0.25981 ^ ^0.15 0 0 0 0 1 -particle dust 0 0.9 0.7 0.2 ^0.19486 ^ ^0.1875 0 0 0 0 1 -particle dust 0 0.9 0.7 0.2 ^0.1299 ^ ^0.225 0 0 0 0 1 -particle dust 0 0.9 0.7 0.2 ^0.06495 ^ ^0.2625 0 0 0 0 1 -particle dust 0 0.9 0.7 0.2 ^0 ^ ^0.3 0 0 0 0 1 -particle dust 0 0.9 0.7 0.2 ^-0.06495 ^ ^0.2625 0 0 0 0 1 -particle dust 0 0.9 0.7 0.2 ^-0.1299 ^ ^0.225 0 0 0 0 1 -particle dust 0 0.9 0.7 0.2 ^-0.19486 ^ ^0.1875 0 0 0 0 1 -particle dust 0 0.9 0.7 0.2 ^-0.25981 ^ ^0.15 0 0 0 0 1 -particle dust 0 0.9 0.7 0.2 ^-0.25981 ^ ^0.075 0 0 0 0 1 -particle dust 0 0.9 0.7 0.2 ^-0.25981 ^ ^0 0 0 0 0 1 -particle dust 0 0.9 0.7 0.2 ^-0.25981 ^ ^-0.075 0 0 0 0 1 -particle dust 0 0.9 0.7 0.2 ^-0.25981 ^ ^-0.15 0 0 0 0 1 -particle dust 0 0.9 0.7 0.2 ^-0.19486 ^ ^-0.1875 0 0 0 0 1 -particle dust 0 0.9 0.7 0.2 ^-0.1299 ^ ^-0.225 0 0 0 0 1 -particle dust 0 0.9 0.7 0.2 ^-0.06495 ^ ^-0.2625 0 0 0 0 1 -# 線 1 -particle dust 0 0.9 0.7 0.2 ^0.31801 ^ ^-0.81774 0 0 0 0 1 -particle dust 0 0.9 0.7 0.2 ^0.3758 ^ ^-0.78438 0 0 0 0 1 -particle dust 0 0.9 0.7 0.2 ^0.43359 ^ ^-0.75101 0 0 0 0 1 -particle dust 0 0.9 0.7 0.2 ^0.49139 ^ ^-0.71764 0 0 0 0 1 -particle dust 0 0.9 0.7 0.2 ^0.54918 ^ ^-0.68427 0 0 0 0 1 -particle dust 0 0.9 0.7 0.2 ^0.86719 ^ ^-0.13347 0 0 0 0 1 -particle dust 0 0.9 0.7 0.2 ^0.86719 ^ ^-0.06674 0 0 0 0 1 -particle dust 0 0.9 0.7 0.2 ^0.86719 ^ ^0 0 0 0 0 1 -particle dust 0 0.9 0.7 0.2 ^0.86719 ^ ^0.06674 0 0 0 0 1 -particle dust 0 0.9 0.7 0.2 ^0.86719 ^ ^0.13347 0 0 0 0 1 -particle dust 0 0.9 0.7 0.2 ^0.54918 ^ ^0.68427 0 0 0 0 1 -particle dust 0 0.9 0.7 0.2 ^0.49139 ^ ^0.71764 0 0 0 0 1 -particle dust 0 0.9 0.7 0.2 ^0.43359 ^ ^0.75101 0 0 0 0 1 -particle dust 0 0.9 0.7 0.2 ^0.3758 ^ ^0.78438 0 0 0 0 1 -particle dust 0 0.9 0.7 0.2 ^0.31801 ^ ^0.81774 0 0 0 0 1 -particle dust 0 0.9 0.7 0.2 ^-0.31801 ^ ^0.81774 0 0 0 0 1 -particle dust 0 0.9 0.7 0.2 ^-0.3758 ^ ^0.78438 0 0 0 0 1 -particle dust 0 0.9 0.7 0.2 ^-0.43359 ^ ^0.75101 0 0 0 0 1 -particle dust 0 0.9 0.7 0.2 ^-0.49139 ^ ^0.71764 0 0 0 0 1 -particle dust 0 0.9 0.7 0.2 ^-0.54918 ^ ^0.68427 0 0 0 0 1 -particle dust 0 0.9 0.7 0.2 ^-0.86719 ^ ^0.13347 0 0 0 0 1 -particle dust 0 0.9 0.7 0.2 ^-0.86719 ^ ^0.06674 0 0 0 0 1 -particle dust 0 0.9 0.7 0.2 ^-0.86719 ^ ^0 0 0 0 0 1 -particle dust 0 0.9 0.7 0.2 ^-0.86719 ^ ^-0.06674 0 0 0 0 1 -particle dust 0 0.9 0.7 0.2 ^-0.86719 ^ ^-0.13347 0 0 0 0 1 -particle dust 0 0.9 0.7 0.2 ^-0.54918 ^ ^-0.68427 0 0 0 0 1 -particle dust 0 0.9 0.7 0.2 ^-0.49139 ^ ^-0.71764 0 0 0 0 1 -particle dust 0 0.9 0.7 0.2 ^-0.43359 ^ ^-0.75101 0 0 0 0 1 -particle dust 0 0.9 0.7 0.2 ^-0.3758 ^ ^-0.78438 0 0 0 0 1 -particle dust 0 0.9 0.7 0.2 ^-0.31801 ^ ^-0.81774 0 0 0 0 1 \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/vfx/teleporter/active/nearby_player.mcfunction b/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/vfx/teleporter/active/nearby_player.mcfunction deleted file mode 100644 index a458322137..0000000000 --- a/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/vfx/teleporter/active/nearby_player.mcfunction +++ /dev/null @@ -1,255 +0,0 @@ -#> asset_manager:teleporter/tick/vfx/teleporter/active/nearby_player -# -# -# -# @within function asset_manager:teleporter/tick/vfx/teleporter/active/ - -particle dust 1 1 1 0.6 ^0 ^ ^-1 0 0 0 0 1 normal @s -particle dust 1 1 1 0.6 ^0.86603 ^ ^-0.5 0 0 0 0 1 normal @s -particle dust 1 1 1 0.6 ^0.86603 ^ ^0.5 0 0 0 0 1 normal @s -particle dust 1 1 1 0.6 ^0 ^ ^1 0 0 0 0 1 normal @s -particle dust 1 1 1 0.6 ^-0.86603 ^ ^0.5 0 0 0 0 1 normal @s -particle dust 1 1 1 0.6 ^-0.86603 ^ ^-0.5 0 0 0 0 1 normal @s -# 多角形 2 -particle dust 0 0.9 0.7 0.2 ^0 ^ ^-1.3 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.06495 ^ ^-1.2625 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.1299 ^ ^-1.225 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.19486 ^ ^-1.1875 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.25981 ^ ^-1.15 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.25981 ^ ^-1.075 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.25981 ^ ^-1 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.25981 ^ ^-0.925 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.25981 ^ ^-0.85 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.19486 ^ ^-0.8125 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.1299 ^ ^-0.775 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.06495 ^ ^-0.7375 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0 ^ ^-0.7 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.06495 ^ ^-0.7375 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.1299 ^ ^-0.775 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.19486 ^ ^-0.8125 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.25981 ^ ^-0.85 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.25981 ^ ^-0.925 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.25981 ^ ^-1 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.25981 ^ ^-1.075 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.25981 ^ ^-1.15 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.19486 ^ ^-1.1875 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.1299 ^ ^-1.225 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.06495 ^ ^-1.2625 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.86603 ^ ^-0.8 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.93098 ^ ^-0.7625 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.99593 ^ ^-0.725 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^1.06088 ^ ^-0.6875 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^1.12583 ^ ^-0.65 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^1.12583 ^ ^-0.575 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^1.12583 ^ ^-0.5 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^1.12583 ^ ^-0.425 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^1.12583 ^ ^-0.35 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^1.06088 ^ ^-0.3125 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.99593 ^ ^-0.275 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.93098 ^ ^-0.2375 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.86603 ^ ^-0.2 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.80107 ^ ^-0.2375 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.73612 ^ ^-0.275 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.67117 ^ ^-0.3125 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.60622 ^ ^-0.35 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.60622 ^ ^-0.425 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.60622 ^ ^-0.5 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.60622 ^ ^-0.575 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.60622 ^ ^-0.65 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.67117 ^ ^-0.6875 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.73612 ^ ^-0.725 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.80107 ^ ^-0.7625 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.86603 ^ ^0.2 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.93098 ^ ^0.2375 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.99593 ^ ^0.275 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^1.06088 ^ ^0.3125 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^1.12583 ^ ^0.35 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^1.12583 ^ ^0.425 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^1.12583 ^ ^0.5 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^1.12583 ^ ^0.575 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^1.12583 ^ ^0.65 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^1.06088 ^ ^0.6875 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.99593 ^ ^0.725 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.93098 ^ ^0.7625 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.86603 ^ ^0.8 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.80107 ^ ^0.7625 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.73612 ^ ^0.725 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.67117 ^ ^0.6875 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.60622 ^ ^0.65 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.60622 ^ ^0.575 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.60622 ^ ^0.5 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.60622 ^ ^0.425 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.60622 ^ ^0.35 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.67117 ^ ^0.3125 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.73612 ^ ^0.275 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.80107 ^ ^0.2375 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0 ^ ^0.7 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.06495 ^ ^0.7375 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.1299 ^ ^0.775 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.19486 ^ ^0.8125 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.25981 ^ ^0.85 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.25981 ^ ^0.925 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.25981 ^ ^1 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.25981 ^ ^1.075 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.25981 ^ ^1.15 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.19486 ^ ^1.1875 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.1299 ^ ^1.225 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.06495 ^ ^1.2625 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0 ^ ^1.3 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.06495 ^ ^1.2625 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.1299 ^ ^1.225 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.19486 ^ ^1.1875 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.25981 ^ ^1.15 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.25981 ^ ^1.075 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.25981 ^ ^1 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.25981 ^ ^0.925 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.25981 ^ ^0.85 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.19486 ^ ^0.8125 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.1299 ^ ^0.775 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.06495 ^ ^0.7375 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.86603 ^ ^0.2 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.80107 ^ ^0.2375 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.73612 ^ ^0.275 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.67117 ^ ^0.3125 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.60622 ^ ^0.35 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.60622 ^ ^0.425 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.60622 ^ ^0.5 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.60622 ^ ^0.575 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.60622 ^ ^0.65 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.67117 ^ ^0.6875 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.73612 ^ ^0.725 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.80107 ^ ^0.7625 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.86603 ^ ^0.8 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.93098 ^ ^0.7625 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.99593 ^ ^0.725 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-1.06088 ^ ^0.6875 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-1.12583 ^ ^0.65 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-1.12583 ^ ^0.575 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-1.12583 ^ ^0.5 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-1.12583 ^ ^0.425 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-1.12583 ^ ^0.35 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-1.06088 ^ ^0.3125 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.99593 ^ ^0.275 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.93098 ^ ^0.2375 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.86603 ^ ^-0.8 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.80107 ^ ^-0.7625 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.73612 ^ ^-0.725 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.67117 ^ ^-0.6875 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.60622 ^ ^-0.65 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.60622 ^ ^-0.575 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.60622 ^ ^-0.5 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.60622 ^ ^-0.425 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.60622 ^ ^-0.35 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.67117 ^ ^-0.3125 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.73612 ^ ^-0.275 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.80107 ^ ^-0.2375 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.86603 ^ ^-0.2 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.93098 ^ ^-0.2375 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.99593 ^ ^-0.275 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-1.06088 ^ ^-0.3125 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-1.12583 ^ ^-0.35 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-1.12583 ^ ^-0.425 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-1.12583 ^ ^-0.5 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-1.12583 ^ ^-0.575 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-1.12583 ^ ^-0.65 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-1.06088 ^ ^-0.6875 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.99593 ^ ^-0.725 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.93098 ^ ^-0.7625 0 0 0 0 1 normal @s -# 多角形 3 -particle dust 0 0.9 0.7 0.2 ^0.33113 ^ ^-1.10882 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.39735 ^ ^-1.07059 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.46358 ^ ^-1.03235 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.5298 ^ ^-0.99412 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.59603 ^ ^-0.95588 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.66225 ^ ^-0.91765 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.72848 ^ ^-0.87941 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.79471 ^ ^-0.84118 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^1.12583 ^ ^-0.26765 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^1.12583 ^ ^-0.19118 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^1.12583 ^ ^-0.11471 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^1.12583 ^ ^-0.03824 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^1.12583 ^ ^0.03824 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^1.12583 ^ ^0.11471 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^1.12583 ^ ^0.19118 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^1.12583 ^ ^0.26765 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.79471 ^ ^0.84118 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.72848 ^ ^0.87941 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.66225 ^ ^0.91765 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.59603 ^ ^0.95588 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.5298 ^ ^0.99412 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.46358 ^ ^1.03235 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.39735 ^ ^1.07059 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.33113 ^ ^1.10882 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.33113 ^ ^1.10882 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.39735 ^ ^1.07059 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.46358 ^ ^1.03235 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.5298 ^ ^0.99412 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.59603 ^ ^0.95588 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.66225 ^ ^0.91765 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.72848 ^ ^0.87941 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.79471 ^ ^0.84118 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-1.12583 ^ ^0.26765 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-1.12583 ^ ^0.19118 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-1.12583 ^ ^0.11471 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-1.12583 ^ ^0.03824 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-1.12583 ^ ^-0.03824 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-1.12583 ^ ^-0.11471 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-1.12583 ^ ^-0.19118 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-1.12583 ^ ^-0.26765 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.79471 ^ ^-0.84118 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.72848 ^ ^-0.87941 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.66225 ^ ^-0.91765 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.59603 ^ ^-0.95588 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.5298 ^ ^-0.99412 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.46358 ^ ^-1.03235 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.39735 ^ ^-1.07059 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.33113 ^ ^-1.10882 0 0 0 0 1 normal @s -# 多角形 4 -particle dust 0 0.9 0.7 0.2 ^0.06736 ^ ^-0.66111 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.13472 ^ ^-0.62222 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.20207 ^ ^-0.58333 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.26943 ^ ^-0.54444 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.33679 ^ ^-0.50556 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.40415 ^ ^-0.46667 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.4715 ^ ^-0.42778 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.53886 ^ ^-0.38889 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.60622 ^ ^-0.27222 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.60622 ^ ^-0.19444 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.60622 ^ ^-0.11667 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.60622 ^ ^-0.03889 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.60622 ^ ^0.03889 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.60622 ^ ^0.11667 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.60622 ^ ^0.19444 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.60622 ^ ^0.27222 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.53886 ^ ^0.38889 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.4715 ^ ^0.42778 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.40415 ^ ^0.46667 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.33679 ^ ^0.50556 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.26943 ^ ^0.54444 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.20207 ^ ^0.58333 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.13472 ^ ^0.62222 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^0.06736 ^ ^0.66111 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.06736 ^ ^0.66111 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.13472 ^ ^0.62222 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.20207 ^ ^0.58333 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.26943 ^ ^0.54444 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.33679 ^ ^0.50556 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.40415 ^ ^0.46667 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.4715 ^ ^0.42778 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.53886 ^ ^0.38889 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.60622 ^ ^0.27222 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.60622 ^ ^0.19444 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.60622 ^ ^0.11667 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.60622 ^ ^0.03889 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.60622 ^ ^-0.03889 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.60622 ^ ^-0.11667 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.60622 ^ ^-0.19444 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.60622 ^ ^-0.27222 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.53886 ^ ^-0.38889 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.4715 ^ ^-0.42778 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.40415 ^ ^-0.46667 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.33679 ^ ^-0.50556 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.26943 ^ ^-0.54444 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.20207 ^ ^-0.58333 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.13472 ^ ^-0.62222 0 0 0 0 1 normal @s -particle dust 0 0.9 0.7 0.2 ^-0.06736 ^ ^-0.66111 0 0 0 0 1 normal @s \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/vfx/teleporter/deactive/.mcfunction b/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/vfx/teleporter/deactive/.mcfunction deleted file mode 100644 index 0d07fc8788..0000000000 --- a/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/vfx/teleporter/deactive/.mcfunction +++ /dev/null @@ -1,72 +0,0 @@ -#> asset_manager:teleporter/tick/vfx/teleporter/deactive/ -# -# -# -# @within function asset_manager:teleporter/tick/vfx/teleporter/ - -execute as @a[distance=..5] run function asset_manager:teleporter/tick/vfx/teleporter/deactive/nearby_player - -# [ImportKey]: NobwRALgngDgpmAXGAxgSwE4oDZwLQCGAdigBYD2GYANGAK51oAmSYAbAOwBGADDwKwAWfnn4BmMVzyC4XNngAcYtgEY8XQQCYAZmyYBOQao00wRAgFsEyQGGKgIoZAzwyBqhkA-DAAIVpmAQyWAzkjgKOR0RBBIbLQocGFwVIjgAG4E2HTW4AAeSDy0UNkAvvm0vkxodAGIKrR+ED7hiDlgcNjYaDB+1ip8xeS1ENaNtRgA5nD14EOj9WA8mmI8+iqC2oT8CoLS-FxqBGz8TNKC0V1MBvpsXKY+w6zRsVRFYGh+AKItbR0vAI50KdhQAGVvNEWIhtCkOoVqBNYNYwDByP9huQiKYGMxWLN5otlqt1pttoQ9gdBEc4CczhdTOYrKxAFiagCXIwBG+m5NF4fP5AqgQmEkIIojF+vFwBZiG06NgCP0kBAMGlaNoMOQLKxOLwBMJRBIpDI5IplGoNDo9IZjIJTMlUtZQGAsg1ckg8CoiplsgA6BRsNizIQ8MQcdaCMSeh2IPA8N38PjRmOx53Q23uz3ezS+-2B4McUMRwT6PP5gsFhQuxOVN2aTRGIwcPNLDhicSafAqSJgPKVEt28Mer0+wR+gOk4P8bOR2Pj6OCTuOiPJvsDjMhtszscT8fOgC6tERoNd9uXDShYBKZQqEbE1SG9UazVa7U63WPvSlAyilCIcQitAAVnQLDAkCqMAuDgAAvNBP33Z43jvT4fj+QFgTgUFwWwDpaGeAAhMCIIwb5fhaRCCBBGU5TgKEYXgVgESRFE0UYUEwAUBR9DEbR-RWAhtH0FBDjgeR9B4JheODWslAIJgtg4alLDhRkWTEdlfAsCogh5eoVCzVBBUgpIUjSLk7UadseCPE9ykAt0LzAGo6myWhbw+B9GiVPpX25DAP3iVtf3-QDaBA8DIMaaD3nvfCEKBYjkKQVD0KePxsKCvD4MIqKSLBCFyJLaAqOQGioGRVFaHRRiVCYUkCGUfAFA4FAxGkb0OEILhCQ4bgUH0IQxBQTQVBQGTaWQeS3HNWhvGU1TuVCep9AFe4uUtAyElLYyCkecyzzdLTbIwa8HLCjpAMfVyX3sjyvK-MBfIAyoApw4KMNeQ64AitKkJQrKnqS3C3v+dKYsQWU0goyBYWoxFCrokqGNYT0li4NZmv6lAREEDhczwfQmDYBQsc0HgVDEFQCfYvhBrhQBaOUAOk1FPGjkVK5YIZr5eahUW-T0lW7MzIk093Ws3b9qaF7jpc59pX3YJPMgny-1uoDAtw87Qtg17Uv+j7Yq+hKfriP6iIyuLsoTXK4QKor6IxZB+NmBRtGicMAzRyseEUP0pAIbZNAIes9kkHgKdYGnPHpyamfU-ztIWlalq5oyeY2vmLIaN0gKF87HPvMWejc87pcuxA5b8u7gIe+IQuetWDYBz60Lgb7y5rrXMvr0GzduTAcHwYgyEoK3GKEOQMbEA4OB9jZBAUfgCHUU4Gp4Ukln4Nh9Cq5Qg9sRxXA8JTORW5neSLtndLAOPDPOkzedKFPZzmmyr0ArSs6OyoTol9zJjGLkv+mVHBAIHwVGeBOrnGkHMFYXU4AiEErVHgXo4AKAMGyWg1xWCKmVGAR4qsnLN2inXSEOVwbIHQFgXAhASAUCoDDa2YByqaA4NoB28hAEcFnv2fgKwuAEGQiAgg4gOD8AxvVbQCBaA0jhPYZw7gUHwgZlNQ+9RWx3HZrHTmF99xXyTjfLaLFLx2UQEGA6asc5PjzvuX+P9rjfxIUIQBPBgGgPkFoNiWN+DQKxjwOBCCkH6FkWg5AEByBYKejBXBGtDaA2Nu3YhYBWgfgHrcOxQCRBOPAa4qBMCvEcHgWwRByDN5gEAFu+u8w77zUizRAWkMEqhWqKIg4pJSS2Bg3MANTWBD04EGMeE9pDT1nlwee4Yl7CFXuvNgFp1GIBtLQ7QuYFAEzAdoH2aMCBHCxgQe24YVD2yDJoJgrUhJYyYFVLg9V5AqHOM1IwnpCC6DUPwQwjDaprI4HAAgpgjLlhTF0BQmkCZiDmEI-kB5uzTxUBCkmgKFA8A4F0FQ-ASyzPmYs+Qyz+HSDWbxNeWzCa7MBQc3gY8OCr20O1A42hmIkgEAcLiFxRCMJQLCrgyyhKh1Wj2OFLEGwkrWNPQwoZuwE1mPAoMShexiH0O1JFjE5n6AWQsNFKzMXrJxSsPFcyCWHNpb1EC0Q8YExXtIfQcANiCRZeoLgfi+AYzth82gXzvSr2dv2YQK85haRMm6PYCxF41lJIILoqhiwJmRfK1FeB0WrNVZs9VOzNX7O1YQNeqMkHNX4Aw-AghWpSD1W7dqJKlhBn7Ewz5K5NA-K8f8v0QKMajnBZCuYmgYVwsJoi0NsqUWKsjcqgBMbcXxr2YSo5Qj-Ze30E6CQzjmGEAUAQTQeBNBrzgOCDNPE4B01LGCzgOzWKjr5Y86yXrhUEzYGK5Q3p+ywplegrtSze1Yo2QO-FiaiV4A4EwBYOzZiRv0KI6QnVeL8MlYoGF-AUBcE0KjQmY0t0RidVK6err+DuobIK+DUZBLo0MEveBlz8hbjADuDRa1DyPCCVyepjSzpAzIgqJUtS6FMAYUwlALDYXsIEFwnhBwUDAcEcItiYiz5TJmYxCSM9+GCTwKaoQ0gQK5qULxN5PAuCiTYgYA4IFKzjzYEBxYDUyQNUg-ArGChEbgjYMoGewnHXwMQ76N1bA5itnbN2H1WH-W4eDTe5AEmCBSbdrJyeCn1BKffXAVT6ntCafDJwylYhcRsGWdcgMDVPTaFzb2FD2h+AthYmW1OnouV7t5cxR5ILj18FPeeiV8qQ3gFof5wLMnhAhdkGFnqEWovcpi9jPAyWYvaFmAuv5PB2HzHwKxMQ+BCYExJeJck-BCsRgrbMX51bAUNlc0mPLjboWwvhRwXzYBmuPKC21+THWuDhZU2p3rsXNJMI0EwBqPCIPSHBFp+YC7dj2zWCgNhaxYNdng-Zl1i8UPOeUKODzfqcOBrw-oE7Z3pPBau4prrd3ouxbGRoOAf7RB+OcTjZqeZxCLqjP6JgsgCd7EK9ukrPK9jlYFaC1b1XRXBgvX6KVx2O2sFRxduT2bru3ci-d1ifWDiVk0twel+gbvOLU27XglZRDMYrHMiDELN2g++etqt48a0GnQx6PbEKm0tvhVOQjxGVp2iAu2Z0jxyBMI6MLJWj1dZNwibXbWbcCNAA_3 -# 中央1 -particle dust 0.3 0.4 0.3 0.2 ^0 ^ ^-0.1 0 0 0 0 1 -particle dust 0.3 0.4 0.3 0.2 ^0.0866 ^ ^-0.05 0 0 0 0 1 -particle dust 0.3 0.4 0.3 0.2 ^0.0866 ^ ^0.05 0 0 0 0 1 -particle dust 0.3 0.4 0.3 0.2 ^0 ^ ^0.1 0 0 0 0 1 -particle dust 0.3 0.4 0.3 0.2 ^-0.0866 ^ ^0.05 0 0 0 0 1 -particle dust 0.3 0.4 0.3 0.2 ^-0.0866 ^ ^-0.05 0 0 0 0 1 -# 中央3 -particle dust 0.3 0.4 0.3 0.2 ^0 ^ ^-0.3 0 0 0 0 1 -particle dust 0.3 0.4 0.3 0.2 ^0.06495 ^ ^-0.2625 0 0 0 0 1 -particle dust 0.3 0.4 0.3 0.2 ^0.1299 ^ ^-0.225 0 0 0 0 1 -particle dust 0.3 0.4 0.3 0.2 ^0.19486 ^ ^-0.1875 0 0 0 0 1 -particle dust 0.3 0.4 0.3 0.2 ^0.25981 ^ ^-0.15 0 0 0 0 1 -particle dust 0.3 0.4 0.3 0.2 ^0.25981 ^ ^-0.075 0 0 0 0 1 -particle dust 0.3 0.4 0.3 0.2 ^0.25981 ^ ^0 0 0 0 0 1 -particle dust 0.3 0.4 0.3 0.2 ^0.25981 ^ ^0.075 0 0 0 0 1 -particle dust 0.3 0.4 0.3 0.2 ^0.25981 ^ ^0.15 0 0 0 0 1 -particle dust 0.3 0.4 0.3 0.2 ^0.19486 ^ ^0.1875 0 0 0 0 1 -particle dust 0.3 0.4 0.3 0.2 ^0.1299 ^ ^0.225 0 0 0 0 1 -particle dust 0.3 0.4 0.3 0.2 ^0.06495 ^ ^0.2625 0 0 0 0 1 -particle dust 0.3 0.4 0.3 0.2 ^0 ^ ^0.3 0 0 0 0 1 -particle dust 0.3 0.4 0.3 0.2 ^-0.06495 ^ ^0.2625 0 0 0 0 1 -particle dust 0.3 0.4 0.3 0.2 ^-0.1299 ^ ^0.225 0 0 0 0 1 -particle dust 0.3 0.4 0.3 0.2 ^-0.19486 ^ ^0.1875 0 0 0 0 1 -particle dust 0.3 0.4 0.3 0.2 ^-0.25981 ^ ^0.15 0 0 0 0 1 -particle dust 0.3 0.4 0.3 0.2 ^-0.25981 ^ ^0.075 0 0 0 0 1 -particle dust 0.3 0.4 0.3 0.2 ^-0.25981 ^ ^0 0 0 0 0 1 -particle dust 0.3 0.4 0.3 0.2 ^-0.25981 ^ ^-0.075 0 0 0 0 1 -particle dust 0.3 0.4 0.3 0.2 ^-0.25981 ^ ^-0.15 0 0 0 0 1 -particle dust 0.3 0.4 0.3 0.2 ^-0.19486 ^ ^-0.1875 0 0 0 0 1 -particle dust 0.3 0.4 0.3 0.2 ^-0.1299 ^ ^-0.225 0 0 0 0 1 -particle dust 0.3 0.4 0.3 0.2 ^-0.06495 ^ ^-0.2625 0 0 0 0 1 -# 線 1 -particle dust 0.3 0.4 0.3 0.2 ^0.31801 ^ ^-0.81774 0 0 0 0 1 -particle dust 0.3 0.4 0.3 0.2 ^0.3758 ^ ^-0.78438 0 0 0 0 1 -particle dust 0.3 0.4 0.3 0.2 ^0.43359 ^ ^-0.75101 0 0 0 0 1 -particle dust 0.3 0.4 0.3 0.2 ^0.49139 ^ ^-0.71764 0 0 0 0 1 -particle dust 0.3 0.4 0.3 0.2 ^0.54918 ^ ^-0.68427 0 0 0 0 1 -particle dust 0.3 0.4 0.3 0.2 ^0.86719 ^ ^-0.13347 0 0 0 0 1 -particle dust 0.3 0.4 0.3 0.2 ^0.86719 ^ ^-0.06674 0 0 0 0 1 -particle dust 0.3 0.4 0.3 0.2 ^0.86719 ^ ^0 0 0 0 0 1 -particle dust 0.3 0.4 0.3 0.2 ^0.86719 ^ ^0.06674 0 0 0 0 1 -particle dust 0.3 0.4 0.3 0.2 ^0.86719 ^ ^0.13347 0 0 0 0 1 -particle dust 0.3 0.4 0.3 0.2 ^0.54918 ^ ^0.68427 0 0 0 0 1 -particle dust 0.3 0.4 0.3 0.2 ^0.49139 ^ ^0.71764 0 0 0 0 1 -particle dust 0.3 0.4 0.3 0.2 ^0.43359 ^ ^0.75101 0 0 0 0 1 -particle dust 0.3 0.4 0.3 0.2 ^0.3758 ^ ^0.78438 0 0 0 0 1 -particle dust 0.3 0.4 0.3 0.2 ^0.31801 ^ ^0.81774 0 0 0 0 1 -particle dust 0.3 0.4 0.3 0.2 ^-0.31801 ^ ^0.81774 0 0 0 0 1 -particle dust 0.3 0.4 0.3 0.2 ^-0.3758 ^ ^0.78438 0 0 0 0 1 -particle dust 0.3 0.4 0.3 0.2 ^-0.43359 ^ ^0.75101 0 0 0 0 1 -particle dust 0.3 0.4 0.3 0.2 ^-0.49139 ^ ^0.71764 0 0 0 0 1 -particle dust 0.3 0.4 0.3 0.2 ^-0.54918 ^ ^0.68427 0 0 0 0 1 -particle dust 0.3 0.4 0.3 0.2 ^-0.86719 ^ ^0.13347 0 0 0 0 1 -particle dust 0.3 0.4 0.3 0.2 ^-0.86719 ^ ^0.06674 0 0 0 0 1 -particle dust 0.3 0.4 0.3 0.2 ^-0.86719 ^ ^0 0 0 0 0 1 -particle dust 0.3 0.4 0.3 0.2 ^-0.86719 ^ ^-0.06674 0 0 0 0 1 -particle dust 0.3 0.4 0.3 0.2 ^-0.86719 ^ ^-0.13347 0 0 0 0 1 -particle dust 0.3 0.4 0.3 0.2 ^-0.54918 ^ ^-0.68427 0 0 0 0 1 -particle dust 0.3 0.4 0.3 0.2 ^-0.49139 ^ ^-0.71764 0 0 0 0 1 -particle dust 0.3 0.4 0.3 0.2 ^-0.43359 ^ ^-0.75101 0 0 0 0 1 -particle dust 0.3 0.4 0.3 0.2 ^-0.3758 ^ ^-0.78438 0 0 0 0 1 -particle dust 0.3 0.4 0.3 0.2 ^-0.31801 ^ ^-0.81774 0 0 0 0 1 \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/vfx/teleporter/deactive/nearby_player.mcfunction b/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/vfx/teleporter/deactive/nearby_player.mcfunction deleted file mode 100644 index e860a43b27..0000000000 --- a/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/vfx/teleporter/deactive/nearby_player.mcfunction +++ /dev/null @@ -1,255 +0,0 @@ -#> asset_manager:teleporter/tick/vfx/teleporter/deactive/nearby_player -# -# -# -# @within function asset_manager:teleporter/tick/vfx/teleporter/deactive/ - -particle dust 0.4 0.4 0.4 0.6 ^0 ^ ^-1 0 0 0 0 1 normal @s -particle dust 0.4 0.4 0.4 0.6 ^0.86603 ^ ^-0.5 0 0 0 0 1 normal @s -particle dust 0.4 0.4 0.4 0.6 ^0.86603 ^ ^0.5 0 0 0 0 1 normal @s -particle dust 0.4 0.4 0.4 0.6 ^0 ^ ^1 0 0 0 0 1 normal @s -particle dust 0.4 0.4 0.4 0.6 ^-0.86603 ^ ^0.5 0 0 0 0 1 normal @s -particle dust 0.4 0.4 0.4 0.6 ^-0.86603 ^ ^-0.5 0 0 0 0 1 normal @s -# 多角形 2 -particle dust 0.3 0.4 0.3 0.2 ^0 ^ ^-1.3 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.06495 ^ ^-1.2625 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.1299 ^ ^-1.225 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.19486 ^ ^-1.1875 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.25981 ^ ^-1.15 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.25981 ^ ^-1.075 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.25981 ^ ^-1 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.25981 ^ ^-0.925 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.25981 ^ ^-0.85 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.19486 ^ ^-0.8125 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.1299 ^ ^-0.775 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.06495 ^ ^-0.7375 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0 ^ ^-0.7 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.06495 ^ ^-0.7375 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.1299 ^ ^-0.775 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.19486 ^ ^-0.8125 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.25981 ^ ^-0.85 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.25981 ^ ^-0.925 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.25981 ^ ^-1 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.25981 ^ ^-1.075 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.25981 ^ ^-1.15 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.19486 ^ ^-1.1875 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.1299 ^ ^-1.225 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.06495 ^ ^-1.2625 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.86603 ^ ^-0.8 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.93098 ^ ^-0.7625 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.99593 ^ ^-0.725 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^1.06088 ^ ^-0.6875 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^1.12583 ^ ^-0.65 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^1.12583 ^ ^-0.575 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^1.12583 ^ ^-0.5 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^1.12583 ^ ^-0.425 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^1.12583 ^ ^-0.35 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^1.06088 ^ ^-0.3125 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.99593 ^ ^-0.275 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.93098 ^ ^-0.2375 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.86603 ^ ^-0.2 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.80107 ^ ^-0.2375 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.73612 ^ ^-0.275 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.67117 ^ ^-0.3125 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.60622 ^ ^-0.35 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.60622 ^ ^-0.425 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.60622 ^ ^-0.5 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.60622 ^ ^-0.575 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.60622 ^ ^-0.65 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.67117 ^ ^-0.6875 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.73612 ^ ^-0.725 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.80107 ^ ^-0.7625 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.86603 ^ ^0.2 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.93098 ^ ^0.2375 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.99593 ^ ^0.275 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^1.06088 ^ ^0.3125 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^1.12583 ^ ^0.35 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^1.12583 ^ ^0.425 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^1.12583 ^ ^0.5 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^1.12583 ^ ^0.575 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^1.12583 ^ ^0.65 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^1.06088 ^ ^0.6875 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.99593 ^ ^0.725 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.93098 ^ ^0.7625 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.86603 ^ ^0.8 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.80107 ^ ^0.7625 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.73612 ^ ^0.725 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.67117 ^ ^0.6875 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.60622 ^ ^0.65 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.60622 ^ ^0.575 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.60622 ^ ^0.5 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.60622 ^ ^0.425 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.60622 ^ ^0.35 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.67117 ^ ^0.3125 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.73612 ^ ^0.275 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.80107 ^ ^0.2375 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0 ^ ^0.7 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.06495 ^ ^0.7375 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.1299 ^ ^0.775 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.19486 ^ ^0.8125 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.25981 ^ ^0.85 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.25981 ^ ^0.925 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.25981 ^ ^1 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.25981 ^ ^1.075 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.25981 ^ ^1.15 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.19486 ^ ^1.1875 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.1299 ^ ^1.225 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.06495 ^ ^1.2625 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0 ^ ^1.3 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.06495 ^ ^1.2625 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.1299 ^ ^1.225 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.19486 ^ ^1.1875 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.25981 ^ ^1.15 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.25981 ^ ^1.075 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.25981 ^ ^1 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.25981 ^ ^0.925 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.25981 ^ ^0.85 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.19486 ^ ^0.8125 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.1299 ^ ^0.775 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.06495 ^ ^0.7375 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.86603 ^ ^0.2 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.80107 ^ ^0.2375 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.73612 ^ ^0.275 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.67117 ^ ^0.3125 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.60622 ^ ^0.35 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.60622 ^ ^0.425 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.60622 ^ ^0.5 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.60622 ^ ^0.575 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.60622 ^ ^0.65 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.67117 ^ ^0.6875 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.73612 ^ ^0.725 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.80107 ^ ^0.7625 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.86603 ^ ^0.8 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.93098 ^ ^0.7625 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.99593 ^ ^0.725 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-1.06088 ^ ^0.6875 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-1.12583 ^ ^0.65 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-1.12583 ^ ^0.575 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-1.12583 ^ ^0.5 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-1.12583 ^ ^0.425 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-1.12583 ^ ^0.35 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-1.06088 ^ ^0.3125 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.99593 ^ ^0.275 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.93098 ^ ^0.2375 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.86603 ^ ^-0.8 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.80107 ^ ^-0.7625 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.73612 ^ ^-0.725 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.67117 ^ ^-0.6875 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.60622 ^ ^-0.65 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.60622 ^ ^-0.575 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.60622 ^ ^-0.5 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.60622 ^ ^-0.425 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.60622 ^ ^-0.35 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.67117 ^ ^-0.3125 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.73612 ^ ^-0.275 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.80107 ^ ^-0.2375 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.86603 ^ ^-0.2 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.93098 ^ ^-0.2375 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.99593 ^ ^-0.275 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-1.06088 ^ ^-0.3125 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-1.12583 ^ ^-0.35 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-1.12583 ^ ^-0.425 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-1.12583 ^ ^-0.5 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-1.12583 ^ ^-0.575 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-1.12583 ^ ^-0.65 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-1.06088 ^ ^-0.6875 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.99593 ^ ^-0.725 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.93098 ^ ^-0.7625 0 0 0 0 1 normal @s -# 多角形 3 -particle dust 0.3 0.4 0.3 0.2 ^0.33113 ^ ^-1.10882 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.39735 ^ ^-1.07059 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.46358 ^ ^-1.03235 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.5298 ^ ^-0.99412 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.59603 ^ ^-0.95588 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.66225 ^ ^-0.91765 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.72848 ^ ^-0.87941 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.79471 ^ ^-0.84118 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^1.12583 ^ ^-0.26765 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^1.12583 ^ ^-0.19118 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^1.12583 ^ ^-0.11471 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^1.12583 ^ ^-0.03824 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^1.12583 ^ ^0.03824 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^1.12583 ^ ^0.11471 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^1.12583 ^ ^0.19118 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^1.12583 ^ ^0.26765 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.79471 ^ ^0.84118 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.72848 ^ ^0.87941 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.66225 ^ ^0.91765 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.59603 ^ ^0.95588 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.5298 ^ ^0.99412 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.46358 ^ ^1.03235 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.39735 ^ ^1.07059 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.33113 ^ ^1.10882 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.33113 ^ ^1.10882 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.39735 ^ ^1.07059 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.46358 ^ ^1.03235 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.5298 ^ ^0.99412 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.59603 ^ ^0.95588 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.66225 ^ ^0.91765 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.72848 ^ ^0.87941 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.79471 ^ ^0.84118 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-1.12583 ^ ^0.26765 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-1.12583 ^ ^0.19118 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-1.12583 ^ ^0.11471 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-1.12583 ^ ^0.03824 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-1.12583 ^ ^-0.03824 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-1.12583 ^ ^-0.11471 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-1.12583 ^ ^-0.19118 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-1.12583 ^ ^-0.26765 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.79471 ^ ^-0.84118 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.72848 ^ ^-0.87941 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.66225 ^ ^-0.91765 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.59603 ^ ^-0.95588 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.5298 ^ ^-0.99412 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.46358 ^ ^-1.03235 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.39735 ^ ^-1.07059 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.33113 ^ ^-1.10882 0 0 0 0 1 normal @s -# 多角形 4 -particle dust 0.3 0.4 0.3 0.2 ^0.06736 ^ ^-0.66111 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.13472 ^ ^-0.62222 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.20207 ^ ^-0.58333 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.26943 ^ ^-0.54444 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.33679 ^ ^-0.50556 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.40415 ^ ^-0.46667 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.4715 ^ ^-0.42778 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.53886 ^ ^-0.38889 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.60622 ^ ^-0.27222 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.60622 ^ ^-0.19444 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.60622 ^ ^-0.11667 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.60622 ^ ^-0.03889 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.60622 ^ ^0.03889 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.60622 ^ ^0.11667 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.60622 ^ ^0.19444 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.60622 ^ ^0.27222 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.53886 ^ ^0.38889 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.4715 ^ ^0.42778 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.40415 ^ ^0.46667 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.33679 ^ ^0.50556 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.26943 ^ ^0.54444 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.20207 ^ ^0.58333 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.13472 ^ ^0.62222 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^0.06736 ^ ^0.66111 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.06736 ^ ^0.66111 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.13472 ^ ^0.62222 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.20207 ^ ^0.58333 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.26943 ^ ^0.54444 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.33679 ^ ^0.50556 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.40415 ^ ^0.46667 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.4715 ^ ^0.42778 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.53886 ^ ^0.38889 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.60622 ^ ^0.27222 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.60622 ^ ^0.19444 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.60622 ^ ^0.11667 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.60622 ^ ^0.03889 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.60622 ^ ^-0.03889 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.60622 ^ ^-0.11667 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.60622 ^ ^-0.19444 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.60622 ^ ^-0.27222 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.53886 ^ ^-0.38889 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.4715 ^ ^-0.42778 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.40415 ^ ^-0.46667 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.33679 ^ ^-0.50556 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.26943 ^ ^-0.54444 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.20207 ^ ^-0.58333 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.13472 ^ ^-0.62222 0 0 0 0 1 normal @s -particle dust 0.3 0.4 0.3 0.2 ^-0.06736 ^ ^-0.66111 0 0 0 0 1 normal @s \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/vfx/teleporter/on_active.mcfunction b/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/vfx/teleporter/on_active.mcfunction new file mode 100644 index 0000000000..1e015cfde5 --- /dev/null +++ b/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/vfx/teleporter/on_active.mcfunction @@ -0,0 +1,12 @@ +#> asset_manager:teleporter/tick/vfx/teleporter/on_active +# +# +# +# @within function asset_manager:teleporter/tick/vfx/teleporter/ + +particle dust 1 1 1 0.6 ^0 ^-1 ^0.1 0 0 0 0 1 normal +particle dust 1 1 1 0.6 ^0.86603 ^-0.5 ^0.1 0 0 0 0 1 normal +particle dust 1 1 1 0.6 ^0.86603 ^0.5 ^0.1 0 0 0 0 1 normal +particle dust 1 1 1 0.6 ^0 ^1 ^0.1 0 0 0 0 1 normal +particle dust 1 1 1 0.6 ^-0.86603 ^-0.5 ^0.1 0 0 0 0 1 normal +particle dust 1 1 1 0.6 ^-0.86603 ^0.5 ^0.1 0 0 0 0 1 normal diff --git a/TheSkyBlessing/data/asset_manager/functions/teleporter/update_activation_state/.mcfunction b/TheSkyBlessing/data/asset_manager/functions/teleporter/update_activation_state/.mcfunction index aabfe2b2a7..590d455eae 100644 --- a/TheSkyBlessing/data/asset_manager/functions/teleporter/update_activation_state/.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/teleporter/update_activation_state/.mcfunction @@ -10,20 +10,29 @@ # @within function api:teleporter/set_activation_state/from_id # テレポーターのIDから対象テレポーターのEntityStorageのIDの取得を試みる - function asset_manager:teleporter/update_activation_state/try_get_storage_id_from_teleporter + data modify storage asset:teleporter Args.ID set from storage api: Argument.ID + function asset_manager:teleporter/update_activation_state/try_get_storage_id_from_teleporter.m with storage asset:teleporter Args + data remove storage asset:teleporter Args.ID + +# テレポーターが存在しなければ return + execute unless score $ OhMyDatID matches -2147483648..2147483647 run return 0 # テレポーターのEntityStorageを取得する - execute if score $TeleporterExists Temporary matches 1 run function oh_its_dat:please -# 状態を更新する - execute if score $TeleporterExists Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].TeleporterData.ActivationState set from storage api: Argument.ActivationState + function oh_its_dat:please + +# ActivationState を更新する + data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].TeleporterData.ActivationState set from storage api: Argument.ActivationState +# バージョンを更新する + function asset_manager:teleporter/common/increment_activation_state_version # IDから対象テレポーターのマスタデータを取得する - execute if score $TeleporterExists Temporary matches 1 run function asset_manager:teleporter/update_activation_state/pop_master_data_from_teleporter_id + data modify storage asset:teleporter Args.ID set from storage api: Argument.ID + function asset_manager:teleporter/update_activation_state/pop_master_data_from_teleporter_id.m with storage asset:teleporter Args + data remove storage asset:teleporter Args.ID # 状態を更新する - execute if score $TeleporterExists Temporary matches 1 run data modify storage asset:teleporter TargetTeleporterData.Data.ActivationState set from storage api: Argument.ActivationState + data modify storage asset:teleporter TargetTeleporterData.Data.ActivationState set from storage api: Argument.ActivationState # 元に戻す - execute if score $TeleporterExists Temporary matches 1 run data modify storage asset:teleporter Teleporters append from storage asset:teleporter TargetTeleporterData + data modify storage asset:teleporter Teleporters append from storage asset:teleporter TargetTeleporterData # リセット - scoreboard players reset $TeleporterExists Temporary - data remove storage asset:teleporter TargetTeleporterData \ No newline at end of file + data remove storage asset:teleporter TargetTeleporterData diff --git a/TheSkyBlessing/data/asset_manager/functions/teleporter/update_activation_state/pop_master_data_from_teleporter_id.m.mcfunction b/TheSkyBlessing/data/asset_manager/functions/teleporter/update_activation_state/pop_master_data_from_teleporter_id.m.mcfunction new file mode 100644 index 0000000000..aa9edb2552 --- /dev/null +++ b/TheSkyBlessing/data/asset_manager/functions/teleporter/update_activation_state/pop_master_data_from_teleporter_id.m.mcfunction @@ -0,0 +1,13 @@ +#> asset_manager:teleporter/update_activation_state/pop_master_data_from_teleporter_id.m +# +# IDの一致するテレポーターのデータをマスタより取り出す +# +# @input args +# ID: int +# @output storage asset:teleporter +# TargetTeleporterData : compound GroupData +# Teleporters : Teleporters - Teleporters[id=Argument.ID] +# @within function asset_manager:teleporter/update_activation_state/ + +$data modify storage asset:teleporter TargetTeleporterData set from storage asset:teleporter Teleporters[{ID:$(ID)}] +$data remove storage asset:teleporter Teleporters[{ID:$(ID)}] diff --git a/TheSkyBlessing/data/asset_manager/functions/teleporter/update_activation_state/pop_master_data_from_teleporter_id.mcfunction b/TheSkyBlessing/data/asset_manager/functions/teleporter/update_activation_state/pop_master_data_from_teleporter_id.mcfunction deleted file mode 100644 index 80693a22ab..0000000000 --- a/TheSkyBlessing/data/asset_manager/functions/teleporter/update_activation_state/pop_master_data_from_teleporter_id.mcfunction +++ /dev/null @@ -1,31 +0,0 @@ -#> asset_manager:teleporter/update_activation_state/pop_master_data_from_teleporter_id -# -# IDの一致するテレポーターのデータをマスタより取り出す -# -# @input storage api: Argument.ID : int -# @output storage asset:teleporter -# TargetTeleporterData : compound GroupData -# Teleporters : Teleporters - Teleporters[id=Argument.ID] -# @within function asset_manager:teleporter/update_activation_state/ - -# セッション開く - function lib:array/session/open -# 対象テレポーターのGroupIDと、同一のIDを持つ配列の要素のIndex のみがtrueになる配列(CompareResult)を作る -# CompareResult = Teleporters.map(v => v.ID ==Argument.ID) - data modify storage lib: Array append from storage asset:teleporter Teleporters[].ID - data modify storage lib: CompareTarget set from storage api: Argument.ID - function lib:array/compare_single -# CompareResultを元に同一のIDの要素を取り出す -# TargetTeleporterData = Teleporters.filter((v, i) => CompareResult[i]).head - data modify storage lib: Array set from storage asset:teleporter Teleporters - data modify storage lib: Masks set from storage lib: CompareResult - function lib:array/mask_inverted - data modify storage asset:teleporter TargetTeleporterData set from storage lib: Array[0] -# TeleportersからTargetデータを消した状態にする -# Teleporters = Teleporters.filter((v, i) => !CompareResult[i]) - data modify storage lib: Array set from storage asset:teleporter Teleporters - data modify storage lib: Masks set from storage lib: CompareResult - function lib:array/mask - data modify storage asset:teleporter Teleporters set from storage lib: Array -# セッション閉じる - function lib:array/session/close \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/teleporter/update_activation_state/try_get_storage_id_from_teleporter.m.mcfunction b/TheSkyBlessing/data/asset_manager/functions/teleporter/update_activation_state/try_get_storage_id_from_teleporter.m.mcfunction new file mode 100644 index 0000000000..61f85563d2 --- /dev/null +++ b/TheSkyBlessing/data/asset_manager/functions/teleporter/update_activation_state/try_get_storage_id_from_teleporter.m.mcfunction @@ -0,0 +1,11 @@ +#> asset_manager:teleporter/update_activation_state/try_get_storage_id_from_teleporter.m +# +# IDの一致するテレポーターのOhMyDatIDを検索し、存在するかと、存在する場合はそのIDを返す +# +# @input args +# ID: int +# @output score $ OhMyDatID +# @within function asset_manager:teleporter/update_activation_state/ + +scoreboard players reset $ OhMyDatID +$execute store result score $ OhMyDatID run data get storage asset:teleporter TeleporterOMDMap[{TeleporterID:$(ID)}].OhMyDatID diff --git a/TheSkyBlessing/data/asset_manager/functions/teleporter/update_activation_state/try_get_storage_id_from_teleporter.mcfunction b/TheSkyBlessing/data/asset_manager/functions/teleporter/update_activation_state/try_get_storage_id_from_teleporter.mcfunction deleted file mode 100644 index 664c83b3b1..0000000000 --- a/TheSkyBlessing/data/asset_manager/functions/teleporter/update_activation_state/try_get_storage_id_from_teleporter.mcfunction +++ /dev/null @@ -1,26 +0,0 @@ -#> asset_manager:teleporter/update_activation_state/try_get_storage_id_from_teleporter -# -# IDの一致するテレポーターのOhMyDatIDを検索し、存在するかと、存在する場合はそのIDを返す -# -# @input storage api: Argument.ID : int -# @output score -# $ OhMyDatID -# $TeleporterExists Temporary : int @ 0..1 -# @within function asset_manager:teleporter/update_activation_state/ - -# セッション開く - function lib:array/session/open -# CompareResult = TeleporterOMDMap.map(v => v.TeleporterID == Argument.ID) - data modify storage lib: Array append from storage asset:teleporter TeleporterOMDMap[].TeleporterID - data modify storage lib: CompareTarget set from storage api: Argument.ID - function lib:array/compare_single -# CompareResultを元に同一のIDの要素を取り出す -# OyMyDatID = TeleporterOMDMap.map(v => v.OyMyDatID).filter((v, i) => CompareResult[i]).head - data modify storage lib: Array append from storage asset:teleporter TeleporterOMDMap[].OhMyDatID - data modify storage lib: Masks set from storage lib: CompareResult - function lib:array/mask_inverted - execute store result score $ OhMyDatID run data get storage lib: Array[0] -# EntityStorage取得 - execute store success score $TeleporterExists Temporary if data storage lib: Array[0] -# リセット - function lib:array/session/close \ No newline at end of file diff --git a/TheSkyBlessing/data/core/functions/load_once.mcfunction b/TheSkyBlessing/data/core/functions/load_once.mcfunction index 59d5ef9146..217810205e 100644 --- a/TheSkyBlessing/data/core/functions/load_once.mcfunction +++ b/TheSkyBlessing/data/core/functions/load_once.mcfunction @@ -200,6 +200,8 @@ team modify NoCollision collisionRule never #> AssetManager: Teleporter # @within function # asset_manager:teleporter/** + scoreboard objectives add TeleporterActivationStateVersion dummy {"text":"テレポーターの更新がどこまで反映されているか"} + scoreboard objectives add TeleporterStarBlinkTick dummy {"text":"テレポーターのの星の点滅状況"} scoreboard objectives add TeleporterLogCD dummy {"text":"他のテレポーターが発見できなかった際のログのクールダウン"} #> AssetManager: Island diff --git a/TheSkyBlessing/data/core/functions/tick/.mcfunction b/TheSkyBlessing/data/core/functions/tick/.mcfunction index db1a1be9a7..41e9b7e299 100644 --- a/TheSkyBlessing/data/core/functions/tick/.mcfunction +++ b/TheSkyBlessing/data/core/functions/tick/.mcfunction @@ -48,7 +48,7 @@ execute as @e[type=snowball,tag=Spawner,tag=!BreakSpawner] at @s if entity @p[distance=..40] run function asset_manager:spawner/tick/ # テレポーター - function asset_manager:teleporter/tick/global + execute as @e[type=item_display,tag=Teleporter] at @s if entity @p[distance=..50] run function asset_manager:teleporter/tick/global # ワールドギミック function world_manager:gimmick/ diff --git a/TheSkyBlessing/data/minecraft/functions/tests/summon_teleporters/.mcfunction b/TheSkyBlessing/data/minecraft/functions/tests/summon_teleporters/.mcfunction new file mode 100644 index 0000000000..59a41b10c3 --- /dev/null +++ b/TheSkyBlessing/data/minecraft/functions/tests/summon_teleporters/.mcfunction @@ -0,0 +1,253 @@ +#> minecraft:tests/summon_teleporters/ +# @within function minecraft:test + +#> Private +# @private + #declare function asset:teleporter/002/register + #declare function asset:teleporter/004/register + #declare function asset:teleporter/005/register + #declare function asset:teleporter/006/register + #declare function asset:teleporter/007/register + #declare function asset:teleporter/008/register + #declare function asset:teleporter/009/register + #declare function asset:teleporter/010/register + #declare function asset:teleporter/011/register + #declare function asset:teleporter/012/register + #declare function asset:teleporter/013/register + #declare function asset:teleporter/014/register + #declare function asset:teleporter/015/register + #declare function asset:teleporter/016/register + #declare function asset:teleporter/017/register + #declare function asset:teleporter/018/register + #declare function asset:teleporter/019/register + #declare function asset:teleporter/020/register + #declare function asset:teleporter/021/register + #declare function asset:teleporter/022/register + #declare function asset:teleporter/023/register + #declare function asset:teleporter/024/register + #declare function asset:teleporter/025/register + #declare function asset:teleporter/026/register + #declare function asset:teleporter/028/register + #declare function asset:teleporter/030/register + #declare function asset:teleporter/031/register + #declare function asset:teleporter/032/register + #declare function asset:teleporter/033/register + #declare function asset:teleporter/034/register + #declare function asset:teleporter/035/register + #declare function asset:teleporter/036/register + #declare function asset:teleporter/037/register + #declare function asset:teleporter/038/register + #declare function asset:teleporter/039/register + #declare function asset:teleporter/040/register + #declare function asset:teleporter/041/register + #declare function asset:teleporter/042/register + #declare function asset:teleporter/043/register + #declare function asset:teleporter/044/register + #declare function asset:teleporter/045/register + #declare function asset:teleporter/046/register + #declare function asset:teleporter/047/register + #declare function asset:teleporter/048/register + #declare function asset:teleporter/050/register + #declare function asset:teleporter/051/register + #declare function asset:teleporter/052/register + #declare function asset:teleporter/053/register + #declare function asset:teleporter/054/register + #declare tag Teleporter + #declare storage asset:teleporter + +kill @e[type=item_display,tag=Teleporter] + +data remove storage asset:teleporter DPR +data remove storage asset:teleporter Teleporters +data remove storage asset:teleporter TeleporterOMDMap + +execute align xz run tp @s ~0.5 ~ ~0.5 0 0 + +execute at @s run tp @s ~ ~ ~ ~9 ~ +execute at @s positioned ^ ^ ^30 align xz positioned ~0.5 ~ ~0.5 run function asset:teleporter/002/register +execute at @s positioned ^ ^ ^30 align xz run setblock ~0.5 ~-1 ~0.5 diamond_block keep + +execute at @s run tp @s ~ ~ ~ ~9 ~ +execute at @s positioned ^ ^ ^30 align xz positioned ~0.5 ~ ~0.5 run function asset:teleporter/004/register +execute at @s positioned ^ ^ ^30 align xz run setblock ~0.5 ~-1 ~0.5 glass keep + +execute at @s run tp @s ~ ~ ~ ~9 ~ +execute at @s positioned ^ ^ ^30 align xz positioned ~0.5 ~ ~0.5 run function asset:teleporter/005/register +execute at @s positioned ^ ^ ^30 align xz run setblock ~0.5 ~-1 ~0.5 glass keep + +execute at @s run tp @s ~ ~ ~ ~9 ~ +execute at @s positioned ^ ^ ^30 align xz positioned ~0.5 ~ ~0.5 run function asset:teleporter/006/register +execute at @s positioned ^ ^ ^30 align xz run setblock ~0.5 ~-1 ~0.5 glass keep + +execute at @s run tp @s ~ ~ ~ ~9 ~ +execute at @s positioned ^ ^ ^30 align xz positioned ~0.5 ~ ~0.5 run function asset:teleporter/007/register +execute at @s positioned ^ ^ ^30 align xz run setblock ~0.5 ~-1 ~0.5 glass keep + +execute at @s run tp @s ~ ~ ~ ~9 ~ +execute at @s positioned ^ ^ ^30 align xz positioned ~0.5 ~ ~0.5 run function asset:teleporter/008/register +execute at @s positioned ^ ^ ^30 align xz run setblock ~0.5 ~-1 ~0.5 glass keep + +execute at @s run tp @s ~ ~ ~ ~9 ~ +execute at @s positioned ^ ^ ^30 align xz positioned ~0.5 ~ ~0.5 run function asset:teleporter/009/register +execute at @s positioned ^ ^ ^30 align xz run setblock ~0.5 ~-1 ~0.5 glass keep + +execute at @s run tp @s ~ ~ ~ ~9 ~ +execute at @s positioned ^ ^ ^30 align xz positioned ~0.5 ~ ~0.5 run function asset:teleporter/010/register +execute at @s positioned ^ ^ ^30 align xz run setblock ~0.5 ~-1 ~0.5 glass keep + +execute at @s run tp @s ~ ~ ~ ~9 ~ +execute at @s positioned ^ ^ ^30 align xz positioned ~0.5 ~ ~0.5 run function asset:teleporter/011/register +execute at @s positioned ^ ^ ^30 align xz run setblock ~0.5 ~-1 ~0.5 glass keep + +execute at @s run tp @s ~ ~ ~ ~9 ~ +execute at @s positioned ^ ^ ^30 align xz positioned ~0.5 ~ ~0.5 run function asset:teleporter/012/register +execute at @s positioned ^ ^ ^30 align xz run setblock ~0.5 ~-1 ~0.5 glass keep + +execute at @s run tp @s ~ ~ ~ ~9 ~ +execute at @s positioned ^ ^ ^30 align xz positioned ~0.5 ~ ~0.5 run function asset:teleporter/013/register +execute at @s positioned ^ ^ ^30 align xz run setblock ~0.5 ~-1 ~0.5 glass keep + +execute at @s run tp @s ~ ~ ~ ~9 ~ +execute at @s positioned ^ ^ ^30 align xz positioned ~0.5 ~ ~0.5 run function asset:teleporter/014/register +execute at @s positioned ^ ^ ^30 align xz run setblock ~0.5 ~-1 ~0.5 glass keep + +execute at @s run tp @s ~ ~ ~ ~9 ~ +execute at @s positioned ^ ^ ^30 align xz positioned ~0.5 ~ ~0.5 run function asset:teleporter/015/register +execute at @s positioned ^ ^ ^30 align xz run setblock ~0.5 ~-1 ~0.5 glass keep + +execute at @s run tp @s ~ ~ ~ ~9 ~ +execute at @s positioned ^ ^ ^30 align xz positioned ~0.5 ~ ~0.5 run function asset:teleporter/016/register +execute at @s positioned ^ ^ ^30 align xz run setblock ~0.5 ~-1 ~0.5 glass keep + +execute at @s run tp @s ~ ~ ~ ~9 ~ +execute at @s positioned ^ ^ ^30 align xz positioned ~0.5 ~ ~0.5 run function asset:teleporter/017/register +execute at @s positioned ^ ^ ^30 align xz run setblock ~0.5 ~-1 ~0.5 glass keep + +execute at @s run tp @s ~ ~ ~ ~9 ~ +execute at @s positioned ^ ^ ^30 align xz positioned ~0.5 ~ ~0.5 run function asset:teleporter/018/register +execute at @s positioned ^ ^ ^30 align xz run setblock ~0.5 ~-1 ~0.5 glass keep + +execute at @s run tp @s ~ ~ ~ ~9 ~ +execute at @s positioned ^ ^ ^30 align xz positioned ~0.5 ~ ~0.5 run function asset:teleporter/019/register +execute at @s positioned ^ ^ ^30 align xz run setblock ~0.5 ~-1 ~0.5 glass keep + +execute at @s run tp @s ~ ~ ~ ~9 ~ +execute at @s positioned ^ ^ ^30 align xz positioned ~0.5 ~ ~0.5 run function asset:teleporter/020/register +execute at @s positioned ^ ^ ^30 align xz run setblock ~0.5 ~-1 ~0.5 glass keep + +execute at @s run tp @s ~ ~ ~ ~9 ~ +execute at @s positioned ^ ^ ^30 align xz positioned ~0.5 ~ ~0.5 run function asset:teleporter/021/register +execute at @s positioned ^ ^ ^30 align xz run setblock ~0.5 ~-1 ~0.5 glass keep + +execute at @s run tp @s ~ ~ ~ ~9 ~ +execute at @s positioned ^ ^ ^30 align xz positioned ~0.5 ~ ~0.5 run function asset:teleporter/022/register +execute at @s positioned ^ ^ ^30 align xz run setblock ~0.5 ~-1 ~0.5 glass keep + +execute at @s run tp @s ~ ~ ~ ~9 ~ +execute at @s positioned ^ ^ ^30 align xz positioned ~0.5 ~ ~0.5 run function asset:teleporter/023/register +execute at @s positioned ^ ^ ^30 align xz run setblock ~0.5 ~-1 ~0.5 glass keep + +execute at @s run tp @s ~ ~ ~ ~9 ~ +execute at @s positioned ^ ^ ^30 align xz positioned ~0.5 ~ ~0.5 run function asset:teleporter/024/register +execute at @s positioned ^ ^ ^30 align xz run setblock ~0.5 ~-1 ~0.5 glass keep + +execute at @s run tp @s ~ ~ ~ ~9 ~ +execute at @s positioned ^ ^ ^30 align xz positioned ~0.5 ~ ~0.5 run function asset:teleporter/025/register +execute at @s positioned ^ ^ ^30 align xz run setblock ~0.5 ~-1 ~0.5 glass keep + +execute at @s run tp @s ~ ~ ~ ~9 ~ +execute at @s positioned ^ ^ ^30 align xz positioned ~0.5 ~ ~0.5 run function asset:teleporter/026/register +execute at @s positioned ^ ^ ^30 align xz run setblock ~0.5 ~-1 ~0.5 glass keep + +execute at @s run tp @s ~ ~ ~ ~9 ~ +execute at @s positioned ^ ^ ^30 align xz positioned ~0.5 ~ ~0.5 run function asset:teleporter/028/register +execute at @s positioned ^ ^ ^30 align xz run setblock ~0.5 ~-1 ~0.5 glass keep + +execute at @s run tp @s ~ ~ ~ ~9 ~ +execute at @s positioned ^ ^ ^30 align xz positioned ~0.5 ~ ~0.5 run function asset:teleporter/030/register +execute at @s positioned ^ ^ ^30 align xz run setblock ~0.5 ~-1 ~0.5 glass keep + +execute at @s run tp @s ~ ~ ~ ~9 ~ +execute at @s positioned ^ ^ ^30 align xz positioned ~0.5 ~ ~0.5 run function asset:teleporter/031/register +execute at @s positioned ^ ^ ^30 align xz run setblock ~0.5 ~-1 ~0.5 glass keep + +execute at @s run tp @s ~ ~ ~ ~9 ~ +execute at @s positioned ^ ^ ^30 align xz positioned ~0.5 ~ ~0.5 run function asset:teleporter/032/register +execute at @s positioned ^ ^ ^30 align xz run setblock ~0.5 ~-1 ~0.5 glass keep + +execute at @s run tp @s ~ ~ ~ ~9 ~ +execute at @s positioned ^ ^ ^30 align xz positioned ~0.5 ~ ~0.5 run function asset:teleporter/033/register +execute at @s positioned ^ ^ ^30 align xz run setblock ~0.5 ~-1 ~0.5 glass keep + +execute at @s run tp @s ~ ~ ~ ~9 ~ +execute at @s positioned ^ ^ ^30 align xz positioned ~0.5 ~ ~0.5 run function asset:teleporter/034/register +execute at @s positioned ^ ^ ^30 align xz run setblock ~0.5 ~-1 ~0.5 glass keep + +execute at @s run tp @s ~ ~ ~ ~9 ~ +execute at @s positioned ^ ^ ^30 align xz positioned ~0.5 ~ ~0.5 run function asset:teleporter/035/register +execute at @s positioned ^ ^ ^30 align xz run setblock ~0.5 ~-1 ~0.5 glass keep + +execute at @s run tp @s ~ ~ ~ ~9 ~ +execute at @s positioned ^ ^ ^30 align xz positioned ~0.5 ~ ~0.5 run function asset:teleporter/036/register +execute at @s positioned ^ ^ ^30 align xz run setblock ~0.5 ~-1 ~0.5 glass keep + +execute at @s run tp @s ~ ~ ~ ~9 ~ +execute at @s positioned ^ ^ ^30 align xz positioned ~0.5 ~ ~0.5 run function asset:teleporter/037/register +execute at @s positioned ^ ^ ^30 align xz run setblock ~0.5 ~-1 ~0.5 glass keep + +execute at @s run tp @s ~ ~ ~ ~9 ~ +execute at @s positioned ^ ^ ^30 align xz positioned ~0.5 ~ ~0.5 run function asset:teleporter/038/register +execute at @s positioned ^ ^ ^30 align xz run setblock ~0.5 ~-1 ~0.5 glass keep + +execute at @s run tp @s ~ ~ ~ ~9 ~ +execute at @s positioned ^ ^ ^30 align xz positioned ~0.5 ~ ~0.5 run function asset:teleporter/039/register +execute at @s positioned ^ ^ ^30 align xz run setblock ~0.5 ~-1 ~0.5 glass keep + +execute at @s run tp @s ~ ~ ~ ~9 ~ +execute at @s positioned ^ ^ ^30 align xz positioned ~0.5 ~ ~0.5 run function asset:teleporter/040/register +execute at @s positioned ^ ^ ^30 align xz run setblock ~0.5 ~-1 ~0.5 glass keep + +execute at @s run tp @s ~ ~ ~ ~9 ~ +execute at @s positioned ^ ^ ^30 align xz positioned ~0.5 ~ ~0.5 run function asset:teleporter/041/register +execute at @s positioned ^ ^ ^30 align xz run setblock ~0.5 ~-1 ~0.5 glass keep + +execute at @s run tp @s ~ ~ ~ ~9 ~ +execute at @s positioned ^ ^ ^30 align xz positioned ~0.5 ~ ~0.5 run function asset:teleporter/042/register +execute at @s positioned ^ ^ ^30 align xz run setblock ~0.5 ~-1 ~0.5 glass keep + +execute at @s run tp @s ~ ~ ~ ~9 ~ +execute at @s positioned ^ ^ ^30 align xz positioned ~0.5 ~ ~0.5 run function asset:teleporter/043/register +execute at @s positioned ^ ^ ^30 align xz run setblock ~0.5 ~-1 ~0.5 glass keep + +execute at @s run tp @s ~ ~ ~ ~9 ~ +execute at @s positioned ^ ^ ^30 align xz positioned ~0.5 ~ ~0.5 run function asset:teleporter/044/register +execute at @s positioned ^ ^ ^30 align xz run setblock ~0.5 ~-1 ~0.5 glass keep + + +data modify storage api: Argument.ID set value 7 +data modify storage api: Argument.ActivationState set value "Activate" +function api:teleporter/set_activation_state/from_id +data modify storage api: Argument.ID set value 13 +data modify storage api: Argument.ActivationState set value "Activate" +function api:teleporter/set_activation_state/from_id +data modify storage api: Argument.ID set value 23 +data modify storage api: Argument.ActivationState set value "Activate" +function api:teleporter/set_activation_state/from_id +data modify storage api: Argument.ID set value 28 +data modify storage api: Argument.ActivationState set value "Activate" +function api:teleporter/set_activation_state/from_id +data modify storage api: Argument.ID set value 32 +data modify storage api: Argument.ActivationState set value "Activate" +function api:teleporter/set_activation_state/from_id +data modify storage api: Argument.ID set value 36 +data modify storage api: Argument.ActivationState set value "Activate" +function api:teleporter/set_activation_state/from_id +data modify storage api: Argument.ID set value 37 +data modify storage api: Argument.ActivationState set value "Activate" +function api:teleporter/set_activation_state/from_id +data modify storage api: Argument.ID set value 38 +data modify storage api: Argument.ActivationState set value "Activate" +function api:teleporter/set_activation_state/from_id +data modify storage api: Argument.ID set value 42 +data modify storage api: Argument.ActivationState set value "Activate" +function api:teleporter/set_activation_state/from_id diff --git a/TheSkyBlessing/data/minecraft/functions/tests/summon_teleporters/active.mcfunction b/TheSkyBlessing/data/minecraft/functions/tests/summon_teleporters/active.mcfunction new file mode 100644 index 0000000000..ff2c4d1783 --- /dev/null +++ b/TheSkyBlessing/data/minecraft/functions/tests/summon_teleporters/active.mcfunction @@ -0,0 +1,5 @@ +#> minecraft:tests/summon_teleporters/active +# @private + +data modify storage api: Argument.ActivationState set value Activate +function api:teleporter/set_activation_state/from_nearest diff --git a/TheSkyBlessing/data/minecraft/functions/tests/summon_teleporters/for-end.mcfunction b/TheSkyBlessing/data/minecraft/functions/tests/summon_teleporters/for-end.mcfunction new file mode 100644 index 0000000000..3cd19b26e9 --- /dev/null +++ b/TheSkyBlessing/data/minecraft/functions/tests/summon_teleporters/for-end.mcfunction @@ -0,0 +1,30 @@ +#> minecraft:tests/summon_teleporters/for-end +# +# +# +# @private + +#> Private +# @private + #declare function asset:teleporter/300/register + #declare function asset:teleporter/301/register + #declare function asset:teleporter/302/register + #declare function asset:teleporter/303/register + +execute align xz run tp @s ~0.5 ~ ~0.5 0 0 + +execute at @s run tp @s ~ ~ ~ ~90 ~ +execute at @s positioned ^ ^ ^30 align xz positioned ~0.5 ~ ~0.5 run function asset:teleporter/300/register +execute at @s positioned ^ ^ ^30 align xz run setblock ~0.5 ~-1 ~0.5 glass keep + +execute at @s run tp @s ~ ~ ~ ~90 ~ +execute at @s positioned ^ ^ ^30 align xz positioned ~0.5 ~ ~0.5 run function asset:teleporter/301/register +execute at @s positioned ^ ^ ^30 align xz run setblock ~0.5 ~-1 ~0.5 glass keep + +execute at @s run tp @s ~ ~ ~ ~90 ~ +execute at @s positioned ^ ^ ^30 align xz positioned ~0.5 ~ ~0.5 run function asset:teleporter/302/register +execute at @s positioned ^ ^ ^30 align xz run setblock ~0.5 ~-1 ~0.5 glass keep + +execute at @s run tp @s ~ ~ ~ ~90 ~ +execute at @s positioned ^ ^ ^30 align xz positioned ~0.5 ~ ~0.5 run function asset:teleporter/303/register +execute at @s positioned ^ ^ ^30 align xz run setblock ~0.5 ~-1 ~0.5 glass keep diff --git a/TheSkyBlessing/data/minecraft/functions/tests/summon_teleporters/reset.mcfunction b/TheSkyBlessing/data/minecraft/functions/tests/summon_teleporters/reset.mcfunction new file mode 100644 index 0000000000..4afc4983c4 --- /dev/null +++ b/TheSkyBlessing/data/minecraft/functions/tests/summon_teleporters/reset.mcfunction @@ -0,0 +1,16 @@ +#> minecraft:tests/summon_teleporters/reset +# +# +# +# @private + +#> Private +# @private + #declare tag Teleporter + #declare storage asset:teleporter + +kill @e[type=item_display,tag=Teleporter] + +data remove storage asset:teleporter DPR +data remove storage asset:teleporter Teleporters +data remove storage asset:teleporter TeleporterOMDMap