From 2d5b52123c5dba328ba6db1fbd73c1dea769d374 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Sun, 11 Oct 2026 04:17:37 +0900 Subject: [PATCH 01/20] =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../give/1.trigger.mcfunction | 7 ++ .../give/2.give.mcfunction | 68 +++++++++++++++++++ .../1661.starlight_tome/register.mcfunction | 7 ++ .../trigger/1.trigger.mcfunction | 8 +++ .../trigger/2.check_condition.mcfunction | 12 ++++ .../trigger/3.main.mcfunction | 38 +++++++++++ .../1200.starlight_circle/register.mcfunction | 20 ++++++ .../1200.starlight_circle/summon/.mcfunction | 11 +++ .../1200.starlight_circle/summon/m.mcfunction | 7 ++ .../1200.starlight_circle/tick/.mcfunction | 23 +++++++ .../tick/expand.mcfunction | 10 +++ .../tick/kill.mcfunction | 9 +++ .../tick/reduct.mcfunction | 10 +++ .../object/alias/1200/register.mcfunction | 8 +++ .../object/alias/1200/summon.mcfunction | 8 +++ .../object/alias/1200/tick.mcfunction | 8 +++ .../artifact/click.carrot_on_a_stick.json | 3 +- .../asset/tags/functions/artifact/give.json | 3 +- .../tags/functions/artifact/register.json | 3 +- 19 files changed, 260 insertions(+), 3 deletions(-) create mode 100644 Asset/data/asset/functions/artifact/1661.starlight_tome/give/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1661.starlight_tome/give/2.give.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1661.starlight_tome/register.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1661.starlight_tome/trigger/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1661.starlight_tome/trigger/2.check_condition.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1661.starlight_tome/trigger/3.main.mcfunction create mode 100644 Asset/data/asset/functions/object/1200.starlight_circle/register.mcfunction create mode 100644 Asset/data/asset/functions/object/1200.starlight_circle/summon/.mcfunction create mode 100644 Asset/data/asset/functions/object/1200.starlight_circle/summon/m.mcfunction create mode 100644 Asset/data/asset/functions/object/1200.starlight_circle/tick/.mcfunction create mode 100644 Asset/data/asset/functions/object/1200.starlight_circle/tick/expand.mcfunction create mode 100644 Asset/data/asset/functions/object/1200.starlight_circle/tick/kill.mcfunction create mode 100644 Asset/data/asset/functions/object/1200.starlight_circle/tick/reduct.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1200/register.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1200/summon.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1200/tick.mcfunction diff --git a/Asset/data/asset/functions/artifact/1661.starlight_tome/give/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1661.starlight_tome/give/1.trigger.mcfunction new file mode 100644 index 0000000000..6ad48dbfd7 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1661.starlight_tome/give/1.trigger.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1661.starlight_tome/give/1.trigger +# +# 神器の取得処理の呼び出し時に実行されるfunction +# +# @within tag/function asset:artifact/give + +execute if data storage asset:context {id:1661} run function asset:artifact/1661.starlight_tome/give/2.give \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1661.starlight_tome/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1661.starlight_tome/give/2.give.mcfunction new file mode 100644 index 0000000000..ff6bada8be --- /dev/null +++ b/Asset/data/asset/functions/artifact/1661.starlight_tome/give/2.give.mcfunction @@ -0,0 +1,68 @@ +#> asset:artifact/1661.starlight_tome/give/2.give +# +# 神器の作成部 ここでID等を定義する +# +# @user +# @within function asset:artifact/1661.starlight_tome/give/1.trigger + +# 神器の説明や消費MPなどをここで設定する。 +# 最後にasset:artifact/common/giveを実行することで入手可能。 + +# 神器のID (int) スプレッドシートの値を入れる + data modify storage asset:artifact ID set value 1661 +# 神器のベースアイテム + data modify storage asset:artifact Item set value "minecraft:carrot_on_a_stick" +# 神器の名前 (TextComponentString) + data modify storage asset:artifact Name set value '{"text":"スターライトサークル","color":"#bdd7ff"}' +# 神器の説明文 (TextComponentString[]) + data modify storage asset:artifact Lore set value ['{"text":"星の光を宿す魔法陣を展開し、周囲の敵にダメージを与える","color":"white"}'] +# 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション) + # data modify storage asset:artifact ConsumeItem.Item set value '{"translate":"item.minecraft.stick"}' + # data modify storage asset:artifact ConsumeItem.Count set value 1 + # data modify storage asset:artifact ConsumeItem.Extra set value +# 使用回数 (int) (オプション) + # data modify storage asset:artifact RemainingCount set value +# 神器を発動できるスロット (string) Wikiを参照 + data modify storage asset:artifact Slot set value "mainhand" +# 神器のトリガー (string) Wikiを参照 + data modify storage asset:artifact Trigger set value "onClick" +# 神器の発動条件 (TextComponentString) (オプション) + # data modify storage asset:artifact Condition set value +# 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.Damage set value [200] +# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.AttackType set value [Magic] +# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.ElementType set value [None] +# 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.BypassResist set value +# 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.IsRangeAttack set value "every" +# 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.AttackRange set value 5 +# MP消費量 (int) + data modify storage asset:artifact MPCost set value 60 +# MP必要量 (int) (オプション) + # data modify storage asset:artifact MPRequire set value +# MP回復量 (int) + # data modify storage asset:artifact MPHealWhenHit set value +# 神器のクールダウン (int) (オプション) + # data modify storage asset:artifact LocalCooldown set value +# 種別クールダウン ({Type: string, Duration: int}) (オプション) + data modify storage asset:artifact TypeCooldown.Type set value "shortRange" + data modify storage asset:artifact TypeCooldown.Duration set value 60 +# グローバルクールダウン (int) (オプション) + # data modify storage asset:artifact SpecialCooldown set value +# クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) + # data modify storage asset:artifact DisableCooldownMessage set value +# MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) + # data modify storage asset:artifact DisableMPMessage set value +# 破壊時の音を鳴らさないかどうか (boolean) (オプション) + # data modify storage asset:artifact DisableBreakSound set value +# 扱える神 (string[]) Wikiを参照 + data modify storage asset:artifact CanUsedGod set value ["Flora", "Nyaptov", "Wi-ki"] +# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) + # data modify storage asset:artifact CustomNBT set value {} + +# 神器の入手用function + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/1661.starlight_tome/register.mcfunction b/Asset/data/asset/functions/artifact/1661.starlight_tome/register.mcfunction new file mode 100644 index 0000000000..a158050953 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1661.starlight_tome/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1661.starlight_tome/register +# +# 神器プールへの登録処理 +# +# @within tag/function asset:artifact/register + +data modify storage asset:artifact RarityRegistry[2] append value [1661] \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1661.starlight_tome/trigger/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1661.starlight_tome/trigger/1.trigger.mcfunction new file mode 100644 index 0000000000..1942d8cc95 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1661.starlight_tome/trigger/1.trigger.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1661.starlight_tome/trigger/1.trigger +# +# 指定したイベントタイミングで実行されるfunction +# +# @within tag/function asset:artifact/** + +# storage asset:idのmainhandに装備している神器のIDが入っているので比較し、~/2.check_condition.mcfunctionを実行する + execute if data storage asset:context id{mainhand:1661} run function asset:artifact/1661.starlight_tome/trigger/2.check_condition \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1661.starlight_tome/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1661.starlight_tome/trigger/2.check_condition.mcfunction new file mode 100644 index 0000000000..20420c52dd --- /dev/null +++ b/Asset/data/asset/functions/artifact/1661.starlight_tome/trigger/2.check_condition.mcfunction @@ -0,0 +1,12 @@ +#> asset:artifact/1661.starlight_tome/trigger/2.check_condition +# +# 神器の発動条件をチェックします +# +# @within function asset:artifact/1661.starlight_tome/trigger/1.trigger + +# 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く + function asset:artifact/common/check_condition/mainhand +# 他にアイテム等確認する場合はここに書く + +# CanUsedタグをチェックして3.main.mcfunctionを実行する + execute if entity @s[tag=CanUsed] run function asset:artifact/1661.starlight_tome/trigger/3.main \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1661.starlight_tome/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1661.starlight_tome/trigger/3.main.mcfunction new file mode 100644 index 0000000000..798cc88966 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1661.starlight_tome/trigger/3.main.mcfunction @@ -0,0 +1,38 @@ +#> asset:artifact/1661.starlight_tome/trigger/3.main +# +# 神器のメイン処理部 +# +# @within function asset:artifact/1661.starlight_tome/trigger/2.check_condition + +# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う + function asset:artifact/common/use/mainhand + +# ここから先は神器側の効果の処理を書く + +# 適当に演出 + particle end_rod ~ ~0.2 ~ 0 0 0 0.3 30 normal @a + particle dust 0.541 0.78 1 1 ~ ~1.2 ~ 3 1.2 3 0 40 normal @a + playsound block.beacon.power_select player @a ~ ~ ~ 1 1.8 + playsound block.beacon.power_select player @a ~ ~ ~ 1 1.9 + playsound block.enchantment_table.use player @a ~ ~ ~ 1 1.75 + +# 演出用Object + data modify storage api: Argument.ID set value 1200 + function api:object/summon + +# ダメージ範囲 + data modify storage lib: Argument.BoundingCylinder.Radius set value 5.0d + data modify storage lib: Argument.BoundingCylinder.Height set value 3.25d + data modify storage lib: Argument.BoundingCylinder.Selector set value "@e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..10]" + execute positioned ~ ~-2.25 ~ run function lib:bounding_cylinder/ + +# ダメージ + data modify storage api: Argument.Damage set value 200d + data modify storage api: Argument.AttackType set value "Magic" + data modify storage api: Argument.ElementType set value "None" + function api:damage/modifier + execute positioned ~ ~-0.25 ~ as @e[type=#lib:living_without_player,tag=BoundingCylinder,distance=..15] run function api:damage/ + function api:damage/reset + +# リセット + tag @e[type=#lib:living_without_player,tag=BoundingCylinder,distance=..15] remove BoundingCylinder diff --git a/Asset/data/asset/functions/object/1200.starlight_circle/register.mcfunction b/Asset/data/asset/functions/object/1200.starlight_circle/register.mcfunction new file mode 100644 index 0000000000..6e476167f1 --- /dev/null +++ b/Asset/data/asset/functions/object/1200.starlight_circle/register.mcfunction @@ -0,0 +1,20 @@ +#> asset:object/1200.starlight_circle/register +# +# Objectのデータを指定 +# +# @within function asset:object/alias/1200/register + +# 継承(オプション) + # data modify storage asset:object Extends append value + # function asset:object/extends +# 他のObjectに継承されることを許可するか (boolean) (オプション) + # data modify storage asset:object ExtendsSafe set value +# 継承されることを前提とした、抽象的なObjectであるかどうか(boolean) + data modify storage asset:object IsAbstract set value false +# Tickするかどうか(boolean) (オプション) + # data modify storage asset:object IsTicking set value + +# ID (int) + data modify storage asset:object ID set value 1200 +# フィールド(オプション) + # data modify storage asset:object Field.myValue set value diff --git a/Asset/data/asset/functions/object/1200.starlight_circle/summon/.mcfunction b/Asset/data/asset/functions/object/1200.starlight_circle/summon/.mcfunction new file mode 100644 index 0000000000..11628019d8 --- /dev/null +++ b/Asset/data/asset/functions/object/1200.starlight_circle/summon/.mcfunction @@ -0,0 +1,11 @@ +#> asset:object/1200.starlight_circle/summon/ +# +# Object召喚処理の呼び出し時に実行されるfunction +# +# @within asset:object/alias/1200/summon + +# 元となるEntityを召喚する + execute as 0-0-0-0-0 in minecraft:overworld positioned as @s run tp @s ~ ~ ~ ~ -90 + data modify storage asset:temp Args.Rotation set from entity 0-0-0-0-0 Rotation + function asset:object/1200.starlight_circle/summon/m with storage asset:temp Args + data remove storage asset:temp Args diff --git a/Asset/data/asset/functions/object/1200.starlight_circle/summon/m.mcfunction b/Asset/data/asset/functions/object/1200.starlight_circle/summon/m.mcfunction new file mode 100644 index 0000000000..aa855d0039 --- /dev/null +++ b/Asset/data/asset/functions/object/1200.starlight_circle/summon/m.mcfunction @@ -0,0 +1,7 @@ +#> asset:object/1200.starlight_circle/summon/m +# +# +# +# @within function asset:object/1200.starlight_circle/summon/ + +$summon text_display ~ ~ ~ {Tags:["ObjectInit"],Rotation:$(Rotation),background:16711680,text:'{"text":"0","font":"object/1200"}',brightness:{sky:15,block:15},teleport_duration:1,transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],scale:[0f,0f,0f],translation:[0f,-0.4f,0f]},Passengers:[{id:"text_display",Rotation:$(Rotation),background:16711680,text:'{"text":"0","font":"object/1200"}',brightness:{sky:15,block:15},teleport_duration:1,transformation:{left_rotation:[0f,1f,0f,0f],right_rotation:[0f,0f,0f,1f],scale:[0f,0f,0f],translation:[0f,-0.4f,0f]}}]} diff --git a/Asset/data/asset/functions/object/1200.starlight_circle/tick/.mcfunction b/Asset/data/asset/functions/object/1200.starlight_circle/tick/.mcfunction new file mode 100644 index 0000000000..0c72946018 --- /dev/null +++ b/Asset/data/asset/functions/object/1200.starlight_circle/tick/.mcfunction @@ -0,0 +1,23 @@ +#> asset:object/1200.starlight_circle/tick/ +# +# Objectのtick時の処理 +# +# @within asset:object/alias/1200/tick + +# Tick加算 + scoreboard players add @s General.Object.Tick 1 + +# + execute if score @s General.Object.Tick matches 3 run function asset:object/1200.starlight_circle/tick/expand + execute if score @s General.Object.Tick matches 3 on passengers run function asset:object/1200.starlight_circle/tick/expand + +# 回転 + tp @s ~ ~ ~ ~4.5 ~ + execute on passengers run tp @s ~ ~ ~ ~4.5 ~ + +# 消える + execute if score @s General.Object.Tick matches 20 run function asset:object/1200.starlight_circle/tick/reduct + execute if score @s General.Object.Tick matches 20 on passengers run function asset:object/1200.starlight_circle/tick/reduct + +# 消滅処理 + execute if score @s General.Object.Tick matches 32.. run function asset:object/1200.starlight_circle/tick/kill diff --git a/Asset/data/asset/functions/object/1200.starlight_circle/tick/expand.mcfunction b/Asset/data/asset/functions/object/1200.starlight_circle/tick/expand.mcfunction new file mode 100644 index 0000000000..ac38c424c1 --- /dev/null +++ b/Asset/data/asset/functions/object/1200.starlight_circle/tick/expand.mcfunction @@ -0,0 +1,10 @@ +#> asset:object/1200.starlight_circle/tick/expand +# +# +# +# @within function asset:object/1200.starlight_circle/tick/ + +# + data modify entity @s start_interpolation set value 0 + data modify entity @s interpolation_duration set value 5 + data modify entity @s transformation.scale set value [5f,5f,0f] diff --git a/Asset/data/asset/functions/object/1200.starlight_circle/tick/kill.mcfunction b/Asset/data/asset/functions/object/1200.starlight_circle/tick/kill.mcfunction new file mode 100644 index 0000000000..1bc5a8af35 --- /dev/null +++ b/Asset/data/asset/functions/object/1200.starlight_circle/tick/kill.mcfunction @@ -0,0 +1,9 @@ +#> asset:object/1200.starlight_circle/tick/kill +# +# +# +# @within function asset:object/1200.starlight_circle/tick/ + +# kill + execute on passengers run kill @s + kill @s diff --git a/Asset/data/asset/functions/object/1200.starlight_circle/tick/reduct.mcfunction b/Asset/data/asset/functions/object/1200.starlight_circle/tick/reduct.mcfunction new file mode 100644 index 0000000000..ae538f8b6f --- /dev/null +++ b/Asset/data/asset/functions/object/1200.starlight_circle/tick/reduct.mcfunction @@ -0,0 +1,10 @@ +#> asset:object/1200.starlight_circle/tick/reduct +# +# +# +# @within function asset:object/1200.starlight_circle/tick/ + +# 消える + data modify entity @s start_interpolation set value 0 + data modify entity @s interpolation_duration set value 12 + data modify entity @s transformation.scale set value [0f,0f,0f] diff --git a/Asset/data/asset/functions/object/alias/1200/register.mcfunction b/Asset/data/asset/functions/object/alias/1200/register.mcfunction new file mode 100644 index 0000000000..550e41749d --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1200/register.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1200/register +# +# Objectのデータ指定処理のエイリアス +# +# @within asset_manager:object/summon/register.m + +# 元の登録処理を呼び出す + function asset:object/1200.starlight_circle/register \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1200/summon.mcfunction b/Asset/data/asset/functions/object/alias/1200/summon.mcfunction new file mode 100644 index 0000000000..ddfde6ee77 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1200/summon.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1200/summon +# +# Object召喚処理のエイリアス +# +# @within asset_manager:object/summon/summon.m + +# 元の召喚処理を呼び出す + function asset:object/1200.starlight_circle/summon/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1200/tick.mcfunction b/Asset/data/asset/functions/object/alias/1200/tick.mcfunction new file mode 100644 index 0000000000..72de7ce784 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1200/tick.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1200/tick +# +# Tick時処理のエイリアス +# +# @within asset_manager:object/tick/tick.m + +# 元のTick処理を呼び出す + function asset:object/1200.starlight_circle/tick/ \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/artifact/click.carrot_on_a_stick.json b/Asset/data/asset/tags/functions/artifact/click.carrot_on_a_stick.json index 5586d3767c..164a375a43 100644 --- a/Asset/data/asset/tags/functions/artifact/click.carrot_on_a_stick.json +++ b/Asset/data/asset/tags/functions/artifact/click.carrot_on_a_stick.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1661.starlight_tome/trigger/1.trigger", "asset:artifact/1555.shift_change/trigger/1.trigger", "asset:artifact/1636.mana_controller/trigger/1.trigger", "asset:artifact/1606.dimension_knife/click/1.trigger", @@ -180,4 +181,4 @@ "asset:artifact/2001.staff_of_the_willless/trigger/1.trigger", "asset:artifact/0019.scripture/trigger/1.trigger" ] -} +} \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/artifact/give.json b/Asset/data/asset/tags/functions/artifact/give.json index 3f770e5a44..710a786cee 100644 --- a/Asset/data/asset/tags/functions/artifact/give.json +++ b/Asset/data/asset/tags/functions/artifact/give.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1661.starlight_tome/give/1.trigger", "asset:artifact/1392.yellow_refraction_prism/give/1.trigger", "asset:artifact/1421.toaster/give/1.trigger", "asset:artifact/1555.shift_change/give/1.trigger", @@ -559,4 +560,4 @@ "asset:artifact/0735.collision_plate/give/1.trigger", "asset:artifact/0745.blade_of_whirlwind/give/1.trigger" ] -} +} \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/artifact/register.json b/Asset/data/asset/tags/functions/artifact/register.json index fb738d0354..af39970075 100644 --- a/Asset/data/asset/tags/functions/artifact/register.json +++ b/Asset/data/asset/tags/functions/artifact/register.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1661.starlight_tome/register", "asset:artifact/1421.toaster/register", "asset:artifact/1555.shift_change/register", "asset:artifact/1466.insulator_helmet/register", @@ -330,4 +331,4 @@ "asset:artifact/1027.fire_of_rebirth/register", "asset:artifact/1111.rod_o_redeem/register" ] -} +} \ No newline at end of file From a90f97ebe07ef8bb17f709d03e21fe2192f4cae1 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Sun, 11 Oct 2026 04:50:09 +0900 Subject: [PATCH 02/20] =?UTF-8?q?=E3=83=87=E3=82=A3=E3=83=AC=E3=82=AF?= =?UTF-8?q?=E3=83=88=E3=83=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1200.starlight_circle/tick/.mcfunction | 16 ++++++++++------ .../0.mcfunction} | 4 ++-- .../1.mcfunction} | 2 +- 3 files changed, 13 insertions(+), 9 deletions(-) rename Asset/data/asset/functions/object/1200.starlight_circle/tick/{expand.mcfunction => transform/0.mcfunction} (62%) rename Asset/data/asset/functions/object/1200.starlight_circle/tick/{reduct.mcfunction => transform/1.mcfunction} (82%) diff --git a/Asset/data/asset/functions/object/1200.starlight_circle/tick/.mcfunction b/Asset/data/asset/functions/object/1200.starlight_circle/tick/.mcfunction index 0c72946018..851a9712cb 100644 --- a/Asset/data/asset/functions/object/1200.starlight_circle/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1200.starlight_circle/tick/.mcfunction @@ -8,16 +8,20 @@ scoreboard players add @s General.Object.Tick 1 # - execute if score @s General.Object.Tick matches 3 run function asset:object/1200.starlight_circle/tick/expand - execute if score @s General.Object.Tick matches 3 on passengers run function asset:object/1200.starlight_circle/tick/expand + execute if score @s General.Object.Tick matches 3 run function asset:object/1200.starlight_circle/tick/transform/0 + execute if score @s General.Object.Tick matches 3 on passengers run function asset:object/1200.starlight_circle/tick/transform/0 -# 回転 +# spin tp @s ~ ~ ~ ~4.5 ~ execute on passengers run tp @s ~ ~ ~ ~4.5 ~ +# 回転 + execute if score @s General.Object.Tick matches ..11 run function asset:object/1200.starlight_circle/tick/tp/0 + execute if score @s General.Object.Tick matches 12.. run function asset:object/1200.starlight_circle/tick/tp/1 + # 消える - execute if score @s General.Object.Tick matches 20 run function asset:object/1200.starlight_circle/tick/reduct - execute if score @s General.Object.Tick matches 20 on passengers run function asset:object/1200.starlight_circle/tick/reduct + execute if score @s General.Object.Tick matches 25 run function asset:object/1200.starlight_circle/tick/transform/1 + execute if score @s General.Object.Tick matches 25 on passengers run function asset:object/1200.starlight_circle/tick/transform/1 # 消滅処理 - execute if score @s General.Object.Tick matches 32.. run function asset:object/1200.starlight_circle/tick/kill + execute if score @s General.Object.Tick matches 37.. run function asset:object/1200.starlight_circle/tick/kill diff --git a/Asset/data/asset/functions/object/1200.starlight_circle/tick/expand.mcfunction b/Asset/data/asset/functions/object/1200.starlight_circle/tick/transform/0.mcfunction similarity index 62% rename from Asset/data/asset/functions/object/1200.starlight_circle/tick/expand.mcfunction rename to Asset/data/asset/functions/object/1200.starlight_circle/tick/transform/0.mcfunction index ac38c424c1..7e2a5cea3e 100644 --- a/Asset/data/asset/functions/object/1200.starlight_circle/tick/expand.mcfunction +++ b/Asset/data/asset/functions/object/1200.starlight_circle/tick/transform/0.mcfunction @@ -1,4 +1,4 @@ -#> asset:object/1200.starlight_circle/tick/expand +#> asset:object/1200.starlight_circle/tick/transform/0 # # # @@ -6,5 +6,5 @@ # data modify entity @s start_interpolation set value 0 - data modify entity @s interpolation_duration set value 5 + data modify entity @s interpolation_duration set value 10 data modify entity @s transformation.scale set value [5f,5f,0f] diff --git a/Asset/data/asset/functions/object/1200.starlight_circle/tick/reduct.mcfunction b/Asset/data/asset/functions/object/1200.starlight_circle/tick/transform/1.mcfunction similarity index 82% rename from Asset/data/asset/functions/object/1200.starlight_circle/tick/reduct.mcfunction rename to Asset/data/asset/functions/object/1200.starlight_circle/tick/transform/1.mcfunction index ae538f8b6f..cab40e579c 100644 --- a/Asset/data/asset/functions/object/1200.starlight_circle/tick/reduct.mcfunction +++ b/Asset/data/asset/functions/object/1200.starlight_circle/tick/transform/1.mcfunction @@ -1,4 +1,4 @@ -#> asset:object/1200.starlight_circle/tick/reduct +#> asset:object/1200.starlight_circle/tick/transform/1 # # # From cd8f8c32340c228e2f0123c0e8e43c5f884a9f62 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Sun, 11 Oct 2026 04:51:46 +0900 Subject: [PATCH 03/20] =?UTF-8?q?=E5=9B=9E=E8=BB=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/object/1200.starlight_circle/tick/.mcfunction | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Asset/data/asset/functions/object/1200.starlight_circle/tick/.mcfunction b/Asset/data/asset/functions/object/1200.starlight_circle/tick/.mcfunction index 851a9712cb..70bc79461b 100644 --- a/Asset/data/asset/functions/object/1200.starlight_circle/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1200.starlight_circle/tick/.mcfunction @@ -15,10 +15,6 @@ tp @s ~ ~ ~ ~4.5 ~ execute on passengers run tp @s ~ ~ ~ ~4.5 ~ -# 回転 - execute if score @s General.Object.Tick matches ..11 run function asset:object/1200.starlight_circle/tick/tp/0 - execute if score @s General.Object.Tick matches 12.. run function asset:object/1200.starlight_circle/tick/tp/1 - # 消える execute if score @s General.Object.Tick matches 25 run function asset:object/1200.starlight_circle/tick/transform/1 execute if score @s General.Object.Tick matches 25 on passengers run function asset:object/1200.starlight_circle/tick/transform/1 From 74145131defc79335ac51591f5dae659a24d8848 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Sun, 11 Oct 2026 07:49:32 +0900 Subject: [PATCH 04/20] =?UTF-8?q?:recycle:=20=E3=82=B9=E3=82=BF=E3=83=BC?= =?UTF-8?q?=E3=83=A9=E3=82=A4=E3=83=88=E3=82=B5=E3=83=BC=E3=82=AF=E3=83=AB?= =?UTF-8?q?=E3=81=AE=E3=83=8D=E3=83=BC=E3=83=A0=E3=82=B9=E3=83=9A=E3=83=BC?= =?UTF-8?q?=E3=82=B9=E3=82=92=E7=A5=9E=E5=99=A8=E5=90=8D=E3=81=AB=E7=B5=B1?= =?UTF-8?q?=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../give/1.trigger.mcfunction | 4 ++-- .../give/2.give.mcfunction | 4 ++-- .../register.mcfunction | 2 +- .../trigger/1.trigger.mcfunction | 4 ++-- .../trigger/2.check_condition.mcfunction | 6 +++--- .../trigger/3.main.mcfunction | 4 ++-- .../tags/functions/artifact/click.carrot_on_a_stick.json | 2 +- Asset/data/asset/tags/functions/artifact/give.json | 2 +- Asset/data/asset/tags/functions/artifact/register.json | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) rename Asset/data/asset/functions/artifact/{1661.starlight_tome => 1661.starlight_circle}/give/1.trigger.mcfunction (64%) rename Asset/data/asset/functions/artifact/{1661.starlight_tome => 1661.starlight_circle}/give/2.give.mcfunction (97%) rename Asset/data/asset/functions/artifact/{1661.starlight_tome => 1661.starlight_circle}/register.mcfunction (76%) rename Asset/data/asset/functions/artifact/{1661.starlight_tome => 1661.starlight_circle}/trigger/1.trigger.mcfunction (71%) rename Asset/data/asset/functions/artifact/{1661.starlight_tome => 1661.starlight_circle}/trigger/2.check_condition.mcfunction (70%) rename Asset/data/asset/functions/artifact/{1661.starlight_tome => 1661.starlight_circle}/trigger/3.main.mcfunction (92%) diff --git a/Asset/data/asset/functions/artifact/1661.starlight_tome/give/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1661.starlight_circle/give/1.trigger.mcfunction similarity index 64% rename from Asset/data/asset/functions/artifact/1661.starlight_tome/give/1.trigger.mcfunction rename to Asset/data/asset/functions/artifact/1661.starlight_circle/give/1.trigger.mcfunction index 6ad48dbfd7..c8b21c29aa 100644 --- a/Asset/data/asset/functions/artifact/1661.starlight_tome/give/1.trigger.mcfunction +++ b/Asset/data/asset/functions/artifact/1661.starlight_circle/give/1.trigger.mcfunction @@ -1,7 +1,7 @@ -#> asset:artifact/1661.starlight_tome/give/1.trigger +#> asset:artifact/1661.starlight_circle/give/1.trigger # # 神器の取得処理の呼び出し時に実行されるfunction # # @within tag/function asset:artifact/give -execute if data storage asset:context {id:1661} run function asset:artifact/1661.starlight_tome/give/2.give \ No newline at end of file +execute if data storage asset:context {id:1661} run function asset:artifact/1661.starlight_circle/give/2.give \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1661.starlight_tome/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1661.starlight_circle/give/2.give.mcfunction similarity index 97% rename from Asset/data/asset/functions/artifact/1661.starlight_tome/give/2.give.mcfunction rename to Asset/data/asset/functions/artifact/1661.starlight_circle/give/2.give.mcfunction index ff6bada8be..fca7f8607d 100644 --- a/Asset/data/asset/functions/artifact/1661.starlight_tome/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1661.starlight_circle/give/2.give.mcfunction @@ -1,9 +1,9 @@ -#> asset:artifact/1661.starlight_tome/give/2.give +#> asset:artifact/1661.starlight_circle/give/2.give # # 神器の作成部 ここでID等を定義する # # @user -# @within function asset:artifact/1661.starlight_tome/give/1.trigger +# @within function asset:artifact/1661.starlight_circle/give/1.trigger # 神器の説明や消費MPなどをここで設定する。 # 最後にasset:artifact/common/giveを実行することで入手可能。 diff --git a/Asset/data/asset/functions/artifact/1661.starlight_tome/register.mcfunction b/Asset/data/asset/functions/artifact/1661.starlight_circle/register.mcfunction similarity index 76% rename from Asset/data/asset/functions/artifact/1661.starlight_tome/register.mcfunction rename to Asset/data/asset/functions/artifact/1661.starlight_circle/register.mcfunction index a158050953..6117a6fbb8 100644 --- a/Asset/data/asset/functions/artifact/1661.starlight_tome/register.mcfunction +++ b/Asset/data/asset/functions/artifact/1661.starlight_circle/register.mcfunction @@ -1,4 +1,4 @@ -#> asset:artifact/1661.starlight_tome/register +#> asset:artifact/1661.starlight_circle/register # # 神器プールへの登録処理 # diff --git a/Asset/data/asset/functions/artifact/1661.starlight_tome/trigger/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1661.starlight_circle/trigger/1.trigger.mcfunction similarity index 71% rename from Asset/data/asset/functions/artifact/1661.starlight_tome/trigger/1.trigger.mcfunction rename to Asset/data/asset/functions/artifact/1661.starlight_circle/trigger/1.trigger.mcfunction index 1942d8cc95..ace8d2ad1a 100644 --- a/Asset/data/asset/functions/artifact/1661.starlight_tome/trigger/1.trigger.mcfunction +++ b/Asset/data/asset/functions/artifact/1661.starlight_circle/trigger/1.trigger.mcfunction @@ -1,8 +1,8 @@ -#> asset:artifact/1661.starlight_tome/trigger/1.trigger +#> asset:artifact/1661.starlight_circle/trigger/1.trigger # # 指定したイベントタイミングで実行されるfunction # # @within tag/function asset:artifact/** # storage asset:idのmainhandに装備している神器のIDが入っているので比較し、~/2.check_condition.mcfunctionを実行する - execute if data storage asset:context id{mainhand:1661} run function asset:artifact/1661.starlight_tome/trigger/2.check_condition \ No newline at end of file + execute if data storage asset:context id{mainhand:1661} run function asset:artifact/1661.starlight_circle/trigger/2.check_condition \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1661.starlight_tome/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1661.starlight_circle/trigger/2.check_condition.mcfunction similarity index 70% rename from Asset/data/asset/functions/artifact/1661.starlight_tome/trigger/2.check_condition.mcfunction rename to Asset/data/asset/functions/artifact/1661.starlight_circle/trigger/2.check_condition.mcfunction index 20420c52dd..c7208e8362 100644 --- a/Asset/data/asset/functions/artifact/1661.starlight_tome/trigger/2.check_condition.mcfunction +++ b/Asset/data/asset/functions/artifact/1661.starlight_circle/trigger/2.check_condition.mcfunction @@ -1,12 +1,12 @@ -#> asset:artifact/1661.starlight_tome/trigger/2.check_condition +#> asset:artifact/1661.starlight_circle/trigger/2.check_condition # # 神器の発動条件をチェックします # -# @within function asset:artifact/1661.starlight_tome/trigger/1.trigger +# @within function asset:artifact/1661.starlight_circle/trigger/1.trigger # 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く function asset:artifact/common/check_condition/mainhand # 他にアイテム等確認する場合はここに書く # CanUsedタグをチェックして3.main.mcfunctionを実行する - execute if entity @s[tag=CanUsed] run function asset:artifact/1661.starlight_tome/trigger/3.main \ No newline at end of file + execute if entity @s[tag=CanUsed] run function asset:artifact/1661.starlight_circle/trigger/3.main \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1661.starlight_tome/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1661.starlight_circle/trigger/3.main.mcfunction similarity index 92% rename from Asset/data/asset/functions/artifact/1661.starlight_tome/trigger/3.main.mcfunction rename to Asset/data/asset/functions/artifact/1661.starlight_circle/trigger/3.main.mcfunction index 798cc88966..3ccd6c2b55 100644 --- a/Asset/data/asset/functions/artifact/1661.starlight_tome/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1661.starlight_circle/trigger/3.main.mcfunction @@ -1,8 +1,8 @@ -#> asset:artifact/1661.starlight_tome/trigger/3.main +#> asset:artifact/1661.starlight_circle/trigger/3.main # # 神器のメイン処理部 # -# @within function asset:artifact/1661.starlight_tome/trigger/2.check_condition +# @within function asset:artifact/1661.starlight_circle/trigger/2.check_condition # 基本的な使用時の処理(MP消費や使用回数の処理など)を行う function asset:artifact/common/use/mainhand diff --git a/Asset/data/asset/tags/functions/artifact/click.carrot_on_a_stick.json b/Asset/data/asset/tags/functions/artifact/click.carrot_on_a_stick.json index 164a375a43..7d96197bc7 100644 --- a/Asset/data/asset/tags/functions/artifact/click.carrot_on_a_stick.json +++ b/Asset/data/asset/tags/functions/artifact/click.carrot_on_a_stick.json @@ -1,6 +1,6 @@ { "values": [ - "asset:artifact/1661.starlight_tome/trigger/1.trigger", + "asset:artifact/1661.starlight_circle/trigger/1.trigger", "asset:artifact/1555.shift_change/trigger/1.trigger", "asset:artifact/1636.mana_controller/trigger/1.trigger", "asset:artifact/1606.dimension_knife/click/1.trigger", diff --git a/Asset/data/asset/tags/functions/artifact/give.json b/Asset/data/asset/tags/functions/artifact/give.json index 710a786cee..ae19240873 100644 --- a/Asset/data/asset/tags/functions/artifact/give.json +++ b/Asset/data/asset/tags/functions/artifact/give.json @@ -1,6 +1,6 @@ { "values": [ - "asset:artifact/1661.starlight_tome/give/1.trigger", + "asset:artifact/1661.starlight_circle/give/1.trigger", "asset:artifact/1392.yellow_refraction_prism/give/1.trigger", "asset:artifact/1421.toaster/give/1.trigger", "asset:artifact/1555.shift_change/give/1.trigger", diff --git a/Asset/data/asset/tags/functions/artifact/register.json b/Asset/data/asset/tags/functions/artifact/register.json index af39970075..66d3af0370 100644 --- a/Asset/data/asset/tags/functions/artifact/register.json +++ b/Asset/data/asset/tags/functions/artifact/register.json @@ -1,6 +1,6 @@ { "values": [ - "asset:artifact/1661.starlight_tome/register", + "asset:artifact/1661.starlight_circle/register", "asset:artifact/1421.toaster/register", "asset:artifact/1555.shift_change/register", "asset:artifact/1466.insulator_helmet/register", From f93261cf24d41ed6a5b1fa24b3827ff13710216f Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Sun, 11 Oct 2026 07:52:22 +0900 Subject: [PATCH 05/20] =?UTF-8?q?=E3=83=AC=E3=83=83=E3=83=89=E3=82=B7?= =?UTF-8?q?=E3=83=A3=E3=83=BC=E3=83=89=E3=81=AB=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifact/1661.starlight_circle/register.mcfunction | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/artifact/1661.starlight_circle/register.mcfunction b/Asset/data/asset/functions/artifact/1661.starlight_circle/register.mcfunction index 6117a6fbb8..383691b3bb 100644 --- a/Asset/data/asset/functions/artifact/1661.starlight_circle/register.mcfunction +++ b/Asset/data/asset/functions/artifact/1661.starlight_circle/register.mcfunction @@ -4,4 +4,5 @@ # # @within tag/function asset:artifact/register -data modify storage asset:artifact RarityRegistry[2] append value [1661] \ No newline at end of file +data modify storage asset:artifact RarityRegistry[2] append value [1661] +data modify storage asset:artifact RarityRegistryWithColor.Red[2] append value [1661] From 425abfcb34d1e8bcdfe7f67639f1dffc3d697cd8 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Sun, 11 Oct 2026 20:23:54 +0900 Subject: [PATCH 06/20] =?UTF-8?q?transformation=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../object/1200.starlight_circle/tick/transform/0.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/object/1200.starlight_circle/tick/transform/0.mcfunction b/Asset/data/asset/functions/object/1200.starlight_circle/tick/transform/0.mcfunction index 7e2a5cea3e..0ddd8f8125 100644 --- a/Asset/data/asset/functions/object/1200.starlight_circle/tick/transform/0.mcfunction +++ b/Asset/data/asset/functions/object/1200.starlight_circle/tick/transform/0.mcfunction @@ -6,5 +6,5 @@ # data modify entity @s start_interpolation set value 0 - data modify entity @s interpolation_duration set value 10 + data modify entity @s interpolation_duration set value 7 data modify entity @s transformation.scale set value [5f,5f,0f] From 2b2bd8b382a2fd6c22ecd4c26e4138ec51433206 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Sun, 11 Oct 2026 21:02:13 +0900 Subject: [PATCH 07/20] =?UTF-8?q?:bug:=20=E3=82=B9=E3=82=BF=E3=83=BC?= =?UTF-8?q?=E3=83=A9=E3=82=A4=E3=83=88=E3=82=B5=E3=83=BC=E3=82=AF=E3=83=AB?= =?UTF-8?q?=E3=81=AE=E5=9B=9E=E8=BB=A2=E4=B8=AD=E5=BF=83=E3=81=A8=E5=88=9D?= =?UTF-8?q?=E6=9C=9F=E8=A7=92=E5=BA=A6=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/object/1200.starlight_circle/summon/.mcfunction | 2 +- .../functions/object/1200.starlight_circle/summon/m.mcfunction | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Asset/data/asset/functions/object/1200.starlight_circle/summon/.mcfunction b/Asset/data/asset/functions/object/1200.starlight_circle/summon/.mcfunction index 11628019d8..d5514f2351 100644 --- a/Asset/data/asset/functions/object/1200.starlight_circle/summon/.mcfunction +++ b/Asset/data/asset/functions/object/1200.starlight_circle/summon/.mcfunction @@ -5,7 +5,7 @@ # @within asset:object/alias/1200/summon # 元となるEntityを召喚する - execute as 0-0-0-0-0 in minecraft:overworld positioned as @s run tp @s ~ ~ ~ ~ -90 + execute as 0-0-0-0-0 in minecraft:overworld positioned as @s run tp @s ~ ~ ~ ~ 0 data modify storage asset:temp Args.Rotation set from entity 0-0-0-0-0 Rotation function asset:object/1200.starlight_circle/summon/m with storage asset:temp Args data remove storage asset:temp Args diff --git a/Asset/data/asset/functions/object/1200.starlight_circle/summon/m.mcfunction b/Asset/data/asset/functions/object/1200.starlight_circle/summon/m.mcfunction index aa855d0039..397d6b29de 100644 --- a/Asset/data/asset/functions/object/1200.starlight_circle/summon/m.mcfunction +++ b/Asset/data/asset/functions/object/1200.starlight_circle/summon/m.mcfunction @@ -4,4 +4,4 @@ # # @within function asset:object/1200.starlight_circle/summon/ -$summon text_display ~ ~ ~ {Tags:["ObjectInit"],Rotation:$(Rotation),background:16711680,text:'{"text":"0","font":"object/1200"}',brightness:{sky:15,block:15},teleport_duration:1,transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],scale:[0f,0f,0f],translation:[0f,-0.4f,0f]},Passengers:[{id:"text_display",Rotation:$(Rotation),background:16711680,text:'{"text":"0","font":"object/1200"}',brightness:{sky:15,block:15},teleport_duration:1,transformation:{left_rotation:[0f,1f,0f,0f],right_rotation:[0f,0f,0f,1f],scale:[0f,0f,0f],translation:[0f,-0.4f,0f]}}]} +$summon text_display ~ ~ ~ {Tags:["ObjectInit"],Rotation:$(Rotation),background:16711680,text:'[{"text":"0","font":"object/1200"},{"text":"\\u0001","font":"space"}]',brightness:{sky:15,block:15},teleport_duration:1,transformation:{left_rotation:[0.7071f,0.0f,0.0f,-0.7071f],right_rotation:[0f,0f,0f,1f],scale:[0f,0f,0f],translation:[0f,-0.4f,0f]},Passengers:[{id:"text_display",Rotation:$(Rotation),background:16711680,text:'[{"text":"0","font":"object/1200"},{"text":"\\u0001","font":"space"}]',brightness:{sky:15,block:15},teleport_duration:1,transformation:{left_rotation:[0.7071f,0.0f,0.0f,0.7071f],right_rotation:[0f,0f,0f,1f],scale:[0f,0f,0f],translation:[0f,-0.4f,0f]}}]} From ed6f87fafc4f9fe6f520a2624b82d7053913db67 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Sun, 11 Oct 2026 21:07:10 +0900 Subject: [PATCH 08/20] =?UTF-8?q?=E8=89=B2=E3=80=85=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/object/1200.starlight_circle/summon/.mcfunction | 2 +- .../functions/object/1200.starlight_circle/summon/m.mcfunction | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Asset/data/asset/functions/object/1200.starlight_circle/summon/.mcfunction b/Asset/data/asset/functions/object/1200.starlight_circle/summon/.mcfunction index d5514f2351..aa40e93d14 100644 --- a/Asset/data/asset/functions/object/1200.starlight_circle/summon/.mcfunction +++ b/Asset/data/asset/functions/object/1200.starlight_circle/summon/.mcfunction @@ -5,7 +5,7 @@ # @within asset:object/alias/1200/summon # 元となるEntityを召喚する - execute as 0-0-0-0-0 in minecraft:overworld positioned as @s run tp @s ~ ~ ~ ~ 0 + execute as 0-0-0-0-0 in minecraft:overworld positioned as @s run tp @s ~ ~ ~ ~180 0 data modify storage asset:temp Args.Rotation set from entity 0-0-0-0-0 Rotation function asset:object/1200.starlight_circle/summon/m with storage asset:temp Args data remove storage asset:temp Args diff --git a/Asset/data/asset/functions/object/1200.starlight_circle/summon/m.mcfunction b/Asset/data/asset/functions/object/1200.starlight_circle/summon/m.mcfunction index 397d6b29de..44f11a48c0 100644 --- a/Asset/data/asset/functions/object/1200.starlight_circle/summon/m.mcfunction +++ b/Asset/data/asset/functions/object/1200.starlight_circle/summon/m.mcfunction @@ -4,4 +4,4 @@ # # @within function asset:object/1200.starlight_circle/summon/ -$summon text_display ~ ~ ~ {Tags:["ObjectInit"],Rotation:$(Rotation),background:16711680,text:'[{"text":"0","font":"object/1200"},{"text":"\\u0001","font":"space"}]',brightness:{sky:15,block:15},teleport_duration:1,transformation:{left_rotation:[0.7071f,0.0f,0.0f,-0.7071f],right_rotation:[0f,0f,0f,1f],scale:[0f,0f,0f],translation:[0f,-0.4f,0f]},Passengers:[{id:"text_display",Rotation:$(Rotation),background:16711680,text:'[{"text":"0","font":"object/1200"},{"text":"\\u0001","font":"space"}]',brightness:{sky:15,block:15},teleport_duration:1,transformation:{left_rotation:[0.7071f,0.0f,0.0f,0.7071f],right_rotation:[0f,0f,0f,1f],scale:[0f,0f,0f],translation:[0f,-0.4f,0f]}}]} +$summon text_display ~ ~ ~ {Tags:["ObjectInit"],Rotation:$(Rotation),background:16711680,text:'[{"text":"0","font":"object/1200"},{"text":"\\u0001","font":"space"}]',brightness:{sky:15,block:15},teleport_duration:1,transformation:{left_rotation:[0.7071f,0.0f,0.0f,-0.7071f],right_rotation:[0f,0f,0f,1f],scale:[0f,0f,0f],translation:[0f,0f,0f]},Passengers:[{id:"text_display",Rotation:$(Rotation),background:16711680,text:'[{"text":"0","font":"object/1200"},{"text":"\\u0001","font":"space"}]',brightness:{sky:15,block:15},teleport_duration:1,transformation:{left_rotation:[0.7071f,0.0f,0.0f,0.7071f],right_rotation:[0f,0f,0f,1f],scale:[0f,0f,0f],translation:[0f,0f,0f]}}]} From 29a79dfe1beb358437c34d77e566bc0e6d0c59bf Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Sun, 11 Oct 2026 21:10:35 +0900 Subject: [PATCH 09/20] =?UTF-8?q?:sparkles:=20=E3=82=B9=E3=82=BF=E3=83=BC?= =?UTF-8?q?=E3=83=A9=E3=82=A4=E3=83=88=E3=82=B5=E3=83=BC=E3=82=AF=E3=83=AB?= =?UTF-8?q?=E3=81=AB=E9=AD=94=E5=BC=BE=E3=81=AE=E5=9B=9E=E8=BB=A2=E5=87=A6?= =?UTF-8?q?=E7=90=86=E3=82=92=E7=A7=BB=E6=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1200.starlight_circle/register.mcfunction | 3 ++- .../object/1200.starlight_circle/tick/.mcfunction | 7 ++++--- .../1200.starlight_circle/tick/spin.mcfunction | 15 +++++++++++++++ .../tick/spin/apply.mcfunction | 15 +++++++++++++++ 4 files changed, 36 insertions(+), 4 deletions(-) create mode 100644 Asset/data/asset/functions/object/1200.starlight_circle/tick/spin.mcfunction create mode 100644 Asset/data/asset/functions/object/1200.starlight_circle/tick/spin/apply.mcfunction diff --git a/Asset/data/asset/functions/object/1200.starlight_circle/register.mcfunction b/Asset/data/asset/functions/object/1200.starlight_circle/register.mcfunction index 6e476167f1..4882615ab7 100644 --- a/Asset/data/asset/functions/object/1200.starlight_circle/register.mcfunction +++ b/Asset/data/asset/functions/object/1200.starlight_circle/register.mcfunction @@ -17,4 +17,5 @@ # ID (int) data modify storage asset:object ID set value 1200 # フィールド(オプション) - # data modify storage asset:object Field.myValue set value + data modify storage asset:object Field.Spin set value 4 + data modify storage asset:object Field.SpinInterval set value 2 diff --git a/Asset/data/asset/functions/object/1200.starlight_circle/tick/.mcfunction b/Asset/data/asset/functions/object/1200.starlight_circle/tick/.mcfunction index 70bc79461b..5a74f11e8f 100644 --- a/Asset/data/asset/functions/object/1200.starlight_circle/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1200.starlight_circle/tick/.mcfunction @@ -11,9 +11,10 @@ execute if score @s General.Object.Tick matches 3 run function asset:object/1200.starlight_circle/tick/transform/0 execute if score @s General.Object.Tick matches 3 on passengers run function asset:object/1200.starlight_circle/tick/transform/0 -# spin - tp @s ~ ~ ~ ~4.5 ~ - execute on passengers run tp @s ~ ~ ~ ~4.5 ~ +# 回転させる + execute if score @s General.Object.Tick matches 10..24 store result storage asset:context this.SpinInterval int 0.9999999999 run data get storage asset:context this.SpinInterval + execute if data storage asset:context this{SpinInterval:0} run function asset:object/1200.starlight_circle/tick/spin + execute if data storage asset:context this{SpinInterval:0} run data modify storage asset:context this.SpinInterval set value 16 # 消える execute if score @s General.Object.Tick matches 25 run function asset:object/1200.starlight_circle/tick/transform/1 diff --git a/Asset/data/asset/functions/object/1200.starlight_circle/tick/spin.mcfunction b/Asset/data/asset/functions/object/1200.starlight_circle/tick/spin.mcfunction new file mode 100644 index 0000000000..6abeb3c662 --- /dev/null +++ b/Asset/data/asset/functions/object/1200.starlight_circle/tick/spin.mcfunction @@ -0,0 +1,15 @@ +#> asset:object/1200.starlight_circle/tick/spin +# +# 親とPassengerを90度回転させる +# +# @within function asset:object/1200.starlight_circle/tick/ + +# 回転段階を進める + execute store result storage asset:context this.Spin int 0.9999999999 run data get storage asset:context this.Spin + +# 親とPassengerに回転を適用する + function asset:object/1200.starlight_circle/tick/spin/apply + execute on passengers run function asset:object/1200.starlight_circle/tick/spin/apply + +# 回転段階をリセットする + execute if data storage asset:context this{Spin:0} run data modify storage asset:context this.Spin set value 4 diff --git a/Asset/data/asset/functions/object/1200.starlight_circle/tick/spin/apply.mcfunction b/Asset/data/asset/functions/object/1200.starlight_circle/tick/spin/apply.mcfunction new file mode 100644 index 0000000000..ec4d8442b1 --- /dev/null +++ b/Asset/data/asset/functions/object/1200.starlight_circle/tick/spin/apply.mcfunction @@ -0,0 +1,15 @@ +#> asset:object/1200.starlight_circle/tick/spin/apply +# +# 回転段階に対応する角度へ補間する +# +# @within function asset:object/1200.starlight_circle/tick/spin + +# 回転を補間する + data modify entity @s start_interpolation set value 0 + data modify entity @s interpolation_duration set value 16 + +# 水平な姿勢を保ち、画像の面内で回転させる + execute if data storage asset:context this{Spin:3} run data modify entity @s transformation.right_rotation set value [0.0f,0.0f,0.7071f,0.7071f] + execute if data storage asset:context this{Spin:2} run data modify entity @s transformation.right_rotation set value [0.0f,0.0f,1.0f,0.0f] + execute if data storage asset:context this{Spin:1} run data modify entity @s transformation.right_rotation set value [0.0f,0.0f,-0.7071f,0.7071f] + execute if data storage asset:context this{Spin:0} run data modify entity @s transformation.right_rotation set value [0.0f,0.0f,0.0f,1.0f] From 5ccf14de56e81c76db55b14d762e969bf31b4bd1 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Sun, 11 Oct 2026 21:13:03 +0900 Subject: [PATCH 10/20] =?UTF-8?q?:sparkles:=20=E3=82=B9=E3=82=BF=E3=83=BC?= =?UTF-8?q?=E3=83=A9=E3=82=A4=E3=83=88=E3=82=B5=E3=83=BC=E3=82=AF=E3=83=AB?= =?UTF-8?q?=E3=82=92=E5=9B=9E=E8=BB=A2=E3=81=97=E3=81=AA=E3=81=8C=E3=82=89?= =?UTF-8?q?=E5=87=BA=E7=8F=BE=E3=81=95=E3=81=9B=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../object/1200.starlight_circle/register.mcfunction | 2 +- .../object/1200.starlight_circle/tick/.mcfunction | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Asset/data/asset/functions/object/1200.starlight_circle/register.mcfunction b/Asset/data/asset/functions/object/1200.starlight_circle/register.mcfunction index 4882615ab7..df3b51ccc3 100644 --- a/Asset/data/asset/functions/object/1200.starlight_circle/register.mcfunction +++ b/Asset/data/asset/functions/object/1200.starlight_circle/register.mcfunction @@ -18,4 +18,4 @@ data modify storage asset:object ID set value 1200 # フィールド(オプション) data modify storage asset:object Field.Spin set value 4 - data modify storage asset:object Field.SpinInterval set value 2 + data modify storage asset:object Field.SpinInterval set value 1 diff --git a/Asset/data/asset/functions/object/1200.starlight_circle/tick/.mcfunction b/Asset/data/asset/functions/object/1200.starlight_circle/tick/.mcfunction index 5a74f11e8f..13fd3c0400 100644 --- a/Asset/data/asset/functions/object/1200.starlight_circle/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1200.starlight_circle/tick/.mcfunction @@ -7,15 +7,16 @@ # Tick加算 scoreboard players add @s General.Object.Tick 1 -# - execute if score @s General.Object.Tick matches 3 run function asset:object/1200.starlight_circle/tick/transform/0 - execute if score @s General.Object.Tick matches 3 on passengers run function asset:object/1200.starlight_circle/tick/transform/0 - # 回転させる - execute if score @s General.Object.Tick matches 10..24 store result storage asset:context this.SpinInterval int 0.9999999999 run data get storage asset:context this.SpinInterval + execute if score @s General.Object.Tick matches 3..24 store result storage asset:context this.SpinInterval int 0.9999999999 run data get storage asset:context this.SpinInterval execute if data storage asset:context this{SpinInterval:0} run function asset:object/1200.starlight_circle/tick/spin execute if data storage asset:context this{SpinInterval:0} run data modify storage asset:context this.SpinInterval set value 16 +# 拡大と最初の回転を同じ7tickで補間する + execute if score @s General.Object.Tick matches 3 run function asset:object/1200.starlight_circle/tick/transform/0 + execute if score @s General.Object.Tick matches 3 on passengers run function asset:object/1200.starlight_circle/tick/transform/0 + execute if score @s General.Object.Tick matches 3 run data modify storage asset:context this.SpinInterval set value 7 + # 消える execute if score @s General.Object.Tick matches 25 run function asset:object/1200.starlight_circle/tick/transform/1 execute if score @s General.Object.Tick matches 25 on passengers run function asset:object/1200.starlight_circle/tick/transform/1 From 0738665678907863122000fc3b9646f5aed5fc26 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Sun, 11 Oct 2026 21:19:17 +0900 Subject: [PATCH 11/20] =?UTF-8?q?:recycle:=20=E3=82=B9=E3=82=BF=E3=83=BC?= =?UTF-8?q?=E3=83=A9=E3=82=A4=E3=83=88=E3=82=B5=E3=83=BC=E3=82=AF=E3=83=AB?= =?UTF-8?q?=E3=81=AE=E6=8B=A1=E5=A4=A7=E7=B8=AE=E5=B0=8F=E3=82=92=E5=9B=9E?= =?UTF-8?q?=E8=BB=A2=E5=9B=9E=E6=95=B0=E3=81=A7=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1200.starlight_circle/register.mcfunction | 1 + .../1200.starlight_circle/tick/.mcfunction | 16 +++------------- .../1200.starlight_circle/tick/spin.mcfunction | 16 ++++++++++++++-- .../tick/transform/0.mcfunction | 2 +- .../tick/transform/1.mcfunction | 2 +- 5 files changed, 20 insertions(+), 17 deletions(-) diff --git a/Asset/data/asset/functions/object/1200.starlight_circle/register.mcfunction b/Asset/data/asset/functions/object/1200.starlight_circle/register.mcfunction index df3b51ccc3..fdcfb27590 100644 --- a/Asset/data/asset/functions/object/1200.starlight_circle/register.mcfunction +++ b/Asset/data/asset/functions/object/1200.starlight_circle/register.mcfunction @@ -18,4 +18,5 @@ data modify storage asset:object ID set value 1200 # フィールド(オプション) data modify storage asset:object Field.Spin set value 4 + data modify storage asset:object Field.SpinCount set value 4 data modify storage asset:object Field.SpinInterval set value 1 diff --git a/Asset/data/asset/functions/object/1200.starlight_circle/tick/.mcfunction b/Asset/data/asset/functions/object/1200.starlight_circle/tick/.mcfunction index 13fd3c0400..bff4ca2424 100644 --- a/Asset/data/asset/functions/object/1200.starlight_circle/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1200.starlight_circle/tick/.mcfunction @@ -8,18 +8,8 @@ scoreboard players add @s General.Object.Tick 1 # 回転させる - execute if score @s General.Object.Tick matches 3..24 store result storage asset:context this.SpinInterval int 0.9999999999 run data get storage asset:context this.SpinInterval + execute unless data storage asset:context this{SpinCount:0} if score @s General.Object.Tick matches 3.. store result storage asset:context this.SpinInterval int 0.9999999999 run data get storage asset:context this.SpinInterval execute if data storage asset:context this{SpinInterval:0} run function asset:object/1200.starlight_circle/tick/spin - execute if data storage asset:context this{SpinInterval:0} run data modify storage asset:context this.SpinInterval set value 16 -# 拡大と最初の回転を同じ7tickで補間する - execute if score @s General.Object.Tick matches 3 run function asset:object/1200.starlight_circle/tick/transform/0 - execute if score @s General.Object.Tick matches 3 on passengers run function asset:object/1200.starlight_circle/tick/transform/0 - execute if score @s General.Object.Tick matches 3 run data modify storage asset:context this.SpinInterval set value 7 - -# 消える - execute if score @s General.Object.Tick matches 25 run function asset:object/1200.starlight_circle/tick/transform/1 - execute if score @s General.Object.Tick matches 25 on passengers run function asset:object/1200.starlight_circle/tick/transform/1 - -# 消滅処理 - execute if score @s General.Object.Tick matches 37.. run function asset:object/1200.starlight_circle/tick/kill +# 縮小が完了したら消滅させる + execute if data storage asset:context this{SpinCount:0} if score @s General.Object.Tick matches 12.. run function asset:object/1200.starlight_circle/tick/kill diff --git a/Asset/data/asset/functions/object/1200.starlight_circle/tick/spin.mcfunction b/Asset/data/asset/functions/object/1200.starlight_circle/tick/spin.mcfunction index 6abeb3c662..f1765d4c0e 100644 --- a/Asset/data/asset/functions/object/1200.starlight_circle/tick/spin.mcfunction +++ b/Asset/data/asset/functions/object/1200.starlight_circle/tick/spin.mcfunction @@ -1,15 +1,27 @@ #> asset:object/1200.starlight_circle/tick/spin # -# 親とPassengerを90度回転させる +# 親とPassengerを90度回転させ、最初に拡大、最後に縮小する # # @within function asset:object/1200.starlight_circle/tick/ -# 回転段階を進める +# 残り回転回数と回転段階を進める + execute store result storage asset:context this.SpinCount int 0.9999999999 run data get storage asset:context this.SpinCount execute store result storage asset:context this.Spin int 0.9999999999 run data get storage asset:context this.Spin + data modify storage asset:context this.SpinInterval set value 16 # 親とPassengerに回転を適用する function asset:object/1200.starlight_circle/tick/spin/apply execute on passengers run function asset:object/1200.starlight_circle/tick/spin/apply +# 最初の回転に合わせて拡大する + execute if data storage asset:context this{SpinCount:3} run function asset:object/1200.starlight_circle/tick/transform/0 + execute if data storage asset:context this{SpinCount:3} on passengers run function asset:object/1200.starlight_circle/tick/transform/0 + execute if data storage asset:context this{SpinCount:3} run data modify storage asset:context this.SpinInterval set value 7 + +# 最後の回転に合わせて縮小する + execute if data storage asset:context this{SpinCount:0} run function asset:object/1200.starlight_circle/tick/transform/1 + execute if data storage asset:context this{SpinCount:0} on passengers run function asset:object/1200.starlight_circle/tick/transform/1 + execute if data storage asset:context this{SpinCount:0} run scoreboard players set @s General.Object.Tick 0 + # 回転段階をリセットする execute if data storage asset:context this{Spin:0} run data modify storage asset:context this.Spin set value 4 diff --git a/Asset/data/asset/functions/object/1200.starlight_circle/tick/transform/0.mcfunction b/Asset/data/asset/functions/object/1200.starlight_circle/tick/transform/0.mcfunction index 0ddd8f8125..8eb56c3733 100644 --- a/Asset/data/asset/functions/object/1200.starlight_circle/tick/transform/0.mcfunction +++ b/Asset/data/asset/functions/object/1200.starlight_circle/tick/transform/0.mcfunction @@ -2,7 +2,7 @@ # # # -# @within function asset:object/1200.starlight_circle/tick/ +# @within function asset:object/1200.starlight_circle/tick/spin # data modify entity @s start_interpolation set value 0 diff --git a/Asset/data/asset/functions/object/1200.starlight_circle/tick/transform/1.mcfunction b/Asset/data/asset/functions/object/1200.starlight_circle/tick/transform/1.mcfunction index cab40e579c..4da407f4f9 100644 --- a/Asset/data/asset/functions/object/1200.starlight_circle/tick/transform/1.mcfunction +++ b/Asset/data/asset/functions/object/1200.starlight_circle/tick/transform/1.mcfunction @@ -2,7 +2,7 @@ # # # -# @within function asset:object/1200.starlight_circle/tick/ +# @within function asset:object/1200.starlight_circle/tick/spin # 消える data modify entity @s start_interpolation set value 0 From 84261c38acfc8deb853ba60ae770feb360d96a38 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Sun, 11 Oct 2026 21:22:59 +0900 Subject: [PATCH 12/20] =?UTF-8?q?:sparkles:=20=E3=82=B9=E3=82=BF=E3=83=BC?= =?UTF-8?q?=E3=83=A9=E3=82=A4=E3=83=88=E3=82=B5=E3=83=BC=E3=82=AF=E3=83=AB?= =?UTF-8?q?=E3=81=AE=E5=9B=9E=E8=BB=A2=E6=99=82=E9=96=93=E3=82=92Field?= =?UTF-8?q?=E3=81=A7=E8=A8=AD=E5=AE=9A=E5=8F=AF=E8=83=BD=E3=81=AB=E3=81=99?= =?UTF-8?q?=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1200.starlight_circle/register.mcfunction | 10 +++++++++- .../object/1200.starlight_circle/tick/.mcfunction | 9 ++++----- .../1200.starlight_circle/tick/spin.mcfunction | 13 ++++++++----- .../tick/spin/apply.mcfunction | 2 +- .../tick/transform/0.mcfunction | 8 +++----- .../tick/transform/1.mcfunction | 6 ++---- 6 files changed, 27 insertions(+), 21 deletions(-) diff --git a/Asset/data/asset/functions/object/1200.starlight_circle/register.mcfunction b/Asset/data/asset/functions/object/1200.starlight_circle/register.mcfunction index fdcfb27590..e6727c2c4b 100644 --- a/Asset/data/asset/functions/object/1200.starlight_circle/register.mcfunction +++ b/Asset/data/asset/functions/object/1200.starlight_circle/register.mcfunction @@ -19,4 +19,12 @@ # フィールド(オプション) data modify storage asset:object Field.Spin set value 4 data modify storage asset:object Field.SpinCount set value 4 - data modify storage asset:object Field.SpinInterval set value 1 + data modify storage asset:object Field.FirstSpin set value true +# 表示開始までの待ち時間(tick、1以上) + data modify storage asset:object Field.SpinInterval set value 3 +# 最初・通常・最後の90度回転にかける時間(tick、1以上) + data modify storage asset:object Field.ExpandDuration set value 7 + data modify storage asset:object Field.SpinDuration set value 16 + data modify storage asset:object Field.ShrinkDuration set value 12 +# 拡大後のScale + data modify storage asset:object Field.Scale set value [5f,5f,0f] diff --git a/Asset/data/asset/functions/object/1200.starlight_circle/tick/.mcfunction b/Asset/data/asset/functions/object/1200.starlight_circle/tick/.mcfunction index bff4ca2424..8372081e76 100644 --- a/Asset/data/asset/functions/object/1200.starlight_circle/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1200.starlight_circle/tick/.mcfunction @@ -4,12 +4,11 @@ # # @within asset:object/alias/1200/tick -# Tick加算 - scoreboard players add @s General.Object.Tick 1 +# 次の回転または消滅までの待ち時間を進める + execute store result storage asset:context this.SpinInterval int 0.9999999999 run data get storage asset:context this.SpinInterval # 回転させる - execute unless data storage asset:context this{SpinCount:0} if score @s General.Object.Tick matches 3.. store result storage asset:context this.SpinInterval int 0.9999999999 run data get storage asset:context this.SpinInterval - execute if data storage asset:context this{SpinInterval:0} run function asset:object/1200.starlight_circle/tick/spin + execute unless data storage asset:context this{SpinCount:0} if data storage asset:context this{SpinInterval:0} run function asset:object/1200.starlight_circle/tick/spin # 縮小が完了したら消滅させる - execute if data storage asset:context this{SpinCount:0} if score @s General.Object.Tick matches 12.. run function asset:object/1200.starlight_circle/tick/kill + execute if data storage asset:context this{SpinCount:0,SpinInterval:0} run function asset:object/1200.starlight_circle/tick/kill diff --git a/Asset/data/asset/functions/object/1200.starlight_circle/tick/spin.mcfunction b/Asset/data/asset/functions/object/1200.starlight_circle/tick/spin.mcfunction index f1765d4c0e..3ccba3e082 100644 --- a/Asset/data/asset/functions/object/1200.starlight_circle/tick/spin.mcfunction +++ b/Asset/data/asset/functions/object/1200.starlight_circle/tick/spin.mcfunction @@ -7,21 +7,24 @@ # 残り回転回数と回転段階を進める execute store result storage asset:context this.SpinCount int 0.9999999999 run data get storage asset:context this.SpinCount execute store result storage asset:context this.Spin int 0.9999999999 run data get storage asset:context this.Spin - data modify storage asset:context this.SpinInterval set value 16 + +# 回転段階に応じた補間時間を設定する + data modify storage asset:context this.SpinInterval set from storage asset:context this.SpinDuration + execute if data storage asset:context this{FirstSpin:true} run data modify storage asset:context this.SpinInterval set from storage asset:context this.ExpandDuration + execute if data storage asset:context this{SpinCount:0} run data modify storage asset:context this.SpinInterval set from storage asset:context this.ShrinkDuration # 親とPassengerに回転を適用する function asset:object/1200.starlight_circle/tick/spin/apply execute on passengers run function asset:object/1200.starlight_circle/tick/spin/apply # 最初の回転に合わせて拡大する - execute if data storage asset:context this{SpinCount:3} run function asset:object/1200.starlight_circle/tick/transform/0 - execute if data storage asset:context this{SpinCount:3} on passengers run function asset:object/1200.starlight_circle/tick/transform/0 - execute if data storage asset:context this{SpinCount:3} run data modify storage asset:context this.SpinInterval set value 7 + execute if data storage asset:context this{FirstSpin:true} run function asset:object/1200.starlight_circle/tick/transform/0 + execute if data storage asset:context this{FirstSpin:true} on passengers run function asset:object/1200.starlight_circle/tick/transform/0 + data modify storage asset:context this.FirstSpin set value false # 最後の回転に合わせて縮小する execute if data storage asset:context this{SpinCount:0} run function asset:object/1200.starlight_circle/tick/transform/1 execute if data storage asset:context this{SpinCount:0} on passengers run function asset:object/1200.starlight_circle/tick/transform/1 - execute if data storage asset:context this{SpinCount:0} run scoreboard players set @s General.Object.Tick 0 # 回転段階をリセットする execute if data storage asset:context this{Spin:0} run data modify storage asset:context this.Spin set value 4 diff --git a/Asset/data/asset/functions/object/1200.starlight_circle/tick/spin/apply.mcfunction b/Asset/data/asset/functions/object/1200.starlight_circle/tick/spin/apply.mcfunction index ec4d8442b1..ac49888b74 100644 --- a/Asset/data/asset/functions/object/1200.starlight_circle/tick/spin/apply.mcfunction +++ b/Asset/data/asset/functions/object/1200.starlight_circle/tick/spin/apply.mcfunction @@ -6,7 +6,7 @@ # 回転を補間する data modify entity @s start_interpolation set value 0 - data modify entity @s interpolation_duration set value 16 + data modify entity @s interpolation_duration set from storage asset:context this.SpinInterval # 水平な姿勢を保ち、画像の面内で回転させる execute if data storage asset:context this{Spin:3} run data modify entity @s transformation.right_rotation set value [0.0f,0.0f,0.7071f,0.7071f] diff --git a/Asset/data/asset/functions/object/1200.starlight_circle/tick/transform/0.mcfunction b/Asset/data/asset/functions/object/1200.starlight_circle/tick/transform/0.mcfunction index 8eb56c3733..05fe87a6d1 100644 --- a/Asset/data/asset/functions/object/1200.starlight_circle/tick/transform/0.mcfunction +++ b/Asset/data/asset/functions/object/1200.starlight_circle/tick/transform/0.mcfunction @@ -1,10 +1,8 @@ #> asset:object/1200.starlight_circle/tick/transform/0 # -# +# 最初の回転に合わせて拡大する # # @within function asset:object/1200.starlight_circle/tick/spin -# - data modify entity @s start_interpolation set value 0 - data modify entity @s interpolation_duration set value 7 - data modify entity @s transformation.scale set value [5f,5f,0f] +# 指定のScaleに拡大する + data modify entity @s transformation.scale set from storage asset:context this.Scale diff --git a/Asset/data/asset/functions/object/1200.starlight_circle/tick/transform/1.mcfunction b/Asset/data/asset/functions/object/1200.starlight_circle/tick/transform/1.mcfunction index 4da407f4f9..5b18db6833 100644 --- a/Asset/data/asset/functions/object/1200.starlight_circle/tick/transform/1.mcfunction +++ b/Asset/data/asset/functions/object/1200.starlight_circle/tick/transform/1.mcfunction @@ -1,10 +1,8 @@ #> asset:object/1200.starlight_circle/tick/transform/1 # -# +# 最後の回転に合わせて縮小する # # @within function asset:object/1200.starlight_circle/tick/spin -# 消える - data modify entity @s start_interpolation set value 0 - data modify entity @s interpolation_duration set value 12 +# 縮小する data modify entity @s transformation.scale set value [0f,0f,0f] From 9853b842d9f749f9911f66b2fa29f6450fcb8644 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Sun, 11 Oct 2026 21:25:29 +0900 Subject: [PATCH 13/20] =?UTF-8?q?=E5=9B=9E=E8=BB=A2=E9=80=9F=E5=BA=A6?= =?UTF-8?q?=E3=82=92=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/object/1200.starlight_circle/register.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/object/1200.starlight_circle/register.mcfunction b/Asset/data/asset/functions/object/1200.starlight_circle/register.mcfunction index e6727c2c4b..7c0442f3cd 100644 --- a/Asset/data/asset/functions/object/1200.starlight_circle/register.mcfunction +++ b/Asset/data/asset/functions/object/1200.starlight_circle/register.mcfunction @@ -23,7 +23,7 @@ # 表示開始までの待ち時間(tick、1以上) data modify storage asset:object Field.SpinInterval set value 3 # 最初・通常・最後の90度回転にかける時間(tick、1以上) - data modify storage asset:object Field.ExpandDuration set value 7 + data modify storage asset:object Field.ExpandDuration set value 12 data modify storage asset:object Field.SpinDuration set value 16 data modify storage asset:object Field.ShrinkDuration set value 12 # 拡大後のScale From be7d7e2279b089dfb6445facbca7bc7eb30a9f1e Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Sun, 11 Oct 2026 21:27:24 +0900 Subject: [PATCH 14/20] =?UTF-8?q?:sparkles:=20=E3=82=B9=E3=82=BF=E3=83=BC?= =?UTF-8?q?=E3=83=A9=E3=82=A4=E3=83=88=E3=82=B5=E3=83=BC=E3=82=AF=E3=83=AB?= =?UTF-8?q?=E3=81=AE=E5=9B=9E=E8=BB=A2=E6=96=B9=E5=90=91=E3=82=92=E5=8F=AC?= =?UTF-8?q?=E5=96=9A=E6=99=82=E3=81=AB=E3=83=A9=E3=83=B3=E3=83=80=E3=83=A0?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../object/1200.starlight_circle/init/.mcfunction | 8 ++++++++ .../object/1200.starlight_circle/register.mcfunction | 1 + .../1200.starlight_circle/tick/spin/apply.mcfunction | 6 ++++-- .../asset/functions/object/alias/1200/init.mcfunction | 8 ++++++++ 4 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 Asset/data/asset/functions/object/1200.starlight_circle/init/.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1200/init.mcfunction diff --git a/Asset/data/asset/functions/object/1200.starlight_circle/init/.mcfunction b/Asset/data/asset/functions/object/1200.starlight_circle/init/.mcfunction new file mode 100644 index 0000000000..e7c7511851 --- /dev/null +++ b/Asset/data/asset/functions/object/1200.starlight_circle/init/.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/1200.starlight_circle/init/ +# +# Objectのinit時の処理 +# +# @within asset:object/alias/1200/init + +# 回転方向を50%の確率で反転する + execute store result storage asset:context this.LeftRotate byte 1 run random value 0..1 diff --git a/Asset/data/asset/functions/object/1200.starlight_circle/register.mcfunction b/Asset/data/asset/functions/object/1200.starlight_circle/register.mcfunction index e6727c2c4b..cd9626aa4d 100644 --- a/Asset/data/asset/functions/object/1200.starlight_circle/register.mcfunction +++ b/Asset/data/asset/functions/object/1200.starlight_circle/register.mcfunction @@ -20,6 +20,7 @@ data modify storage asset:object Field.Spin set value 4 data modify storage asset:object Field.SpinCount set value 4 data modify storage asset:object Field.FirstSpin set value true + data modify storage asset:object Field.LeftRotate set value false # 表示開始までの待ち時間(tick、1以上) data modify storage asset:object Field.SpinInterval set value 3 # 最初・通常・最後の90度回転にかける時間(tick、1以上) diff --git a/Asset/data/asset/functions/object/1200.starlight_circle/tick/spin/apply.mcfunction b/Asset/data/asset/functions/object/1200.starlight_circle/tick/spin/apply.mcfunction index ac49888b74..e11ddc6186 100644 --- a/Asset/data/asset/functions/object/1200.starlight_circle/tick/spin/apply.mcfunction +++ b/Asset/data/asset/functions/object/1200.starlight_circle/tick/spin/apply.mcfunction @@ -9,7 +9,9 @@ data modify entity @s interpolation_duration set from storage asset:context this.SpinInterval # 水平な姿勢を保ち、画像の面内で回転させる - execute if data storage asset:context this{Spin:3} run data modify entity @s transformation.right_rotation set value [0.0f,0.0f,0.7071f,0.7071f] + execute if data storage asset:context this{Spin:3} if data storage asset:context this{LeftRotate:true} run data modify entity @s transformation.right_rotation set value [0.0f,0.0f,-0.7071f,0.7071f] + execute if data storage asset:context this{Spin:3} unless data storage asset:context this{LeftRotate:true} run data modify entity @s transformation.right_rotation set value [0.0f,0.0f,0.7071f,0.7071f] execute if data storage asset:context this{Spin:2} run data modify entity @s transformation.right_rotation set value [0.0f,0.0f,1.0f,0.0f] - execute if data storage asset:context this{Spin:1} run data modify entity @s transformation.right_rotation set value [0.0f,0.0f,-0.7071f,0.7071f] + execute if data storage asset:context this{Spin:1} if data storage asset:context this{LeftRotate:true} run data modify entity @s transformation.right_rotation set value [0.0f,0.0f,0.7071f,0.7071f] + execute if data storage asset:context this{Spin:1} unless data storage asset:context this{LeftRotate:true} run data modify entity @s transformation.right_rotation set value [0.0f,0.0f,-0.7071f,0.7071f] execute if data storage asset:context this{Spin:0} run data modify entity @s transformation.right_rotation set value [0.0f,0.0f,0.0f,1.0f] diff --git a/Asset/data/asset/functions/object/alias/1200/init.mcfunction b/Asset/data/asset/functions/object/alias/1200/init.mcfunction new file mode 100644 index 0000000000..9b5c66d06b --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1200/init.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1200/init +# +# Init処理のエイリアス +# +# @within asset_manager:object/init/init.m + +# 元のInit処理を呼び出す + function asset:object/1200.starlight_circle/init/ \ No newline at end of file From 3947016db41b7594cc0e0cc93f819af4b6fe54f4 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Sun, 11 Oct 2026 21:30:32 +0900 Subject: [PATCH 15/20] =?UTF-8?q?:recycle:=20=E3=82=B9=E3=82=BF=E3=83=BC?= =?UTF-8?q?=E3=83=A9=E3=82=A4=E3=83=88=E3=82=B5=E3=83=BC=E3=82=AF=E3=83=AB?= =?UTF-8?q?=E3=81=AE=E9=96=A2=E6=95=B0=E6=A7=8B=E6=88=90=E3=81=A8=E3=83=95?= =?UTF-8?q?=E3=82=A1=E3=82=A4=E3=83=AB=E5=90=8D=E3=82=92=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../summon/{m.mcfunction => .m.mcfunction} | 2 +- .../object/1200.starlight_circle/summon/.mcfunction | 2 +- .../object/1200.starlight_circle/tick/.mcfunction | 2 +- .../tick/{spin.mcfunction => spin/.mcfunction} | 10 +++++----- .../1200.starlight_circle/tick/spin/apply.mcfunction | 2 +- .../{transform/0.mcfunction => spin/expand.mcfunction} | 4 ++-- .../{transform/1.mcfunction => spin/shrink.mcfunction} | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) rename Asset/data/asset/functions/object/1200.starlight_circle/summon/{m.mcfunction => .m.mcfunction} (93%) rename Asset/data/asset/functions/object/1200.starlight_circle/tick/{spin.mcfunction => spin/.mcfunction} (87%) rename Asset/data/asset/functions/object/1200.starlight_circle/tick/{transform/0.mcfunction => spin/expand.mcfunction} (58%) rename Asset/data/asset/functions/object/1200.starlight_circle/tick/{transform/1.mcfunction => spin/shrink.mcfunction} (52%) diff --git a/Asset/data/asset/functions/object/1200.starlight_circle/summon/m.mcfunction b/Asset/data/asset/functions/object/1200.starlight_circle/summon/.m.mcfunction similarity index 93% rename from Asset/data/asset/functions/object/1200.starlight_circle/summon/m.mcfunction rename to Asset/data/asset/functions/object/1200.starlight_circle/summon/.m.mcfunction index 44f11a48c0..ed6996ef11 100644 --- a/Asset/data/asset/functions/object/1200.starlight_circle/summon/m.mcfunction +++ b/Asset/data/asset/functions/object/1200.starlight_circle/summon/.m.mcfunction @@ -1,4 +1,4 @@ -#> asset:object/1200.starlight_circle/summon/m +#> asset:object/1200.starlight_circle/summon/.m # # # diff --git a/Asset/data/asset/functions/object/1200.starlight_circle/summon/.mcfunction b/Asset/data/asset/functions/object/1200.starlight_circle/summon/.mcfunction index aa40e93d14..947ec4e22f 100644 --- a/Asset/data/asset/functions/object/1200.starlight_circle/summon/.mcfunction +++ b/Asset/data/asset/functions/object/1200.starlight_circle/summon/.mcfunction @@ -7,5 +7,5 @@ # 元となるEntityを召喚する execute as 0-0-0-0-0 in minecraft:overworld positioned as @s run tp @s ~ ~ ~ ~180 0 data modify storage asset:temp Args.Rotation set from entity 0-0-0-0-0 Rotation - function asset:object/1200.starlight_circle/summon/m with storage asset:temp Args + function asset:object/1200.starlight_circle/summon/.m with storage asset:temp Args data remove storage asset:temp Args diff --git a/Asset/data/asset/functions/object/1200.starlight_circle/tick/.mcfunction b/Asset/data/asset/functions/object/1200.starlight_circle/tick/.mcfunction index 8372081e76..0af4fa4fda 100644 --- a/Asset/data/asset/functions/object/1200.starlight_circle/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1200.starlight_circle/tick/.mcfunction @@ -8,7 +8,7 @@ execute store result storage asset:context this.SpinInterval int 0.9999999999 run data get storage asset:context this.SpinInterval # 回転させる - execute unless data storage asset:context this{SpinCount:0} if data storage asset:context this{SpinInterval:0} run function asset:object/1200.starlight_circle/tick/spin + execute unless data storage asset:context this{SpinCount:0} if data storage asset:context this{SpinInterval:0} run function asset:object/1200.starlight_circle/tick/spin/ # 縮小が完了したら消滅させる execute if data storage asset:context this{SpinCount:0,SpinInterval:0} run function asset:object/1200.starlight_circle/tick/kill diff --git a/Asset/data/asset/functions/object/1200.starlight_circle/tick/spin.mcfunction b/Asset/data/asset/functions/object/1200.starlight_circle/tick/spin/.mcfunction similarity index 87% rename from Asset/data/asset/functions/object/1200.starlight_circle/tick/spin.mcfunction rename to Asset/data/asset/functions/object/1200.starlight_circle/tick/spin/.mcfunction index 3ccba3e082..ff91cb5170 100644 --- a/Asset/data/asset/functions/object/1200.starlight_circle/tick/spin.mcfunction +++ b/Asset/data/asset/functions/object/1200.starlight_circle/tick/spin/.mcfunction @@ -1,4 +1,4 @@ -#> asset:object/1200.starlight_circle/tick/spin +#> asset:object/1200.starlight_circle/tick/spin/ # # 親とPassengerを90度回転させ、最初に拡大、最後に縮小する # @@ -18,13 +18,13 @@ execute on passengers run function asset:object/1200.starlight_circle/tick/spin/apply # 最初の回転に合わせて拡大する - execute if data storage asset:context this{FirstSpin:true} run function asset:object/1200.starlight_circle/tick/transform/0 - execute if data storage asset:context this{FirstSpin:true} on passengers run function asset:object/1200.starlight_circle/tick/transform/0 + execute if data storage asset:context this{FirstSpin:true} run function asset:object/1200.starlight_circle/tick/spin/expand + execute if data storage asset:context this{FirstSpin:true} on passengers run function asset:object/1200.starlight_circle/tick/spin/expand data modify storage asset:context this.FirstSpin set value false # 最後の回転に合わせて縮小する - execute if data storage asset:context this{SpinCount:0} run function asset:object/1200.starlight_circle/tick/transform/1 - execute if data storage asset:context this{SpinCount:0} on passengers run function asset:object/1200.starlight_circle/tick/transform/1 + execute if data storage asset:context this{SpinCount:0} run function asset:object/1200.starlight_circle/tick/spin/shrink + execute if data storage asset:context this{SpinCount:0} on passengers run function asset:object/1200.starlight_circle/tick/spin/shrink # 回転段階をリセットする execute if data storage asset:context this{Spin:0} run data modify storage asset:context this.Spin set value 4 diff --git a/Asset/data/asset/functions/object/1200.starlight_circle/tick/spin/apply.mcfunction b/Asset/data/asset/functions/object/1200.starlight_circle/tick/spin/apply.mcfunction index e11ddc6186..b55e839091 100644 --- a/Asset/data/asset/functions/object/1200.starlight_circle/tick/spin/apply.mcfunction +++ b/Asset/data/asset/functions/object/1200.starlight_circle/tick/spin/apply.mcfunction @@ -2,7 +2,7 @@ # # 回転段階に対応する角度へ補間する # -# @within function asset:object/1200.starlight_circle/tick/spin +# @within function asset:object/1200.starlight_circle/tick/spin/ # 回転を補間する data modify entity @s start_interpolation set value 0 diff --git a/Asset/data/asset/functions/object/1200.starlight_circle/tick/transform/0.mcfunction b/Asset/data/asset/functions/object/1200.starlight_circle/tick/spin/expand.mcfunction similarity index 58% rename from Asset/data/asset/functions/object/1200.starlight_circle/tick/transform/0.mcfunction rename to Asset/data/asset/functions/object/1200.starlight_circle/tick/spin/expand.mcfunction index 05fe87a6d1..9379e2e091 100644 --- a/Asset/data/asset/functions/object/1200.starlight_circle/tick/transform/0.mcfunction +++ b/Asset/data/asset/functions/object/1200.starlight_circle/tick/spin/expand.mcfunction @@ -1,8 +1,8 @@ -#> asset:object/1200.starlight_circle/tick/transform/0 +#> asset:object/1200.starlight_circle/tick/spin/expand # # 最初の回転に合わせて拡大する # -# @within function asset:object/1200.starlight_circle/tick/spin +# @within function asset:object/1200.starlight_circle/tick/spin/ # 指定のScaleに拡大する data modify entity @s transformation.scale set from storage asset:context this.Scale diff --git a/Asset/data/asset/functions/object/1200.starlight_circle/tick/transform/1.mcfunction b/Asset/data/asset/functions/object/1200.starlight_circle/tick/spin/shrink.mcfunction similarity index 52% rename from Asset/data/asset/functions/object/1200.starlight_circle/tick/transform/1.mcfunction rename to Asset/data/asset/functions/object/1200.starlight_circle/tick/spin/shrink.mcfunction index 5b18db6833..56e1537d29 100644 --- a/Asset/data/asset/functions/object/1200.starlight_circle/tick/transform/1.mcfunction +++ b/Asset/data/asset/functions/object/1200.starlight_circle/tick/spin/shrink.mcfunction @@ -1,8 +1,8 @@ -#> asset:object/1200.starlight_circle/tick/transform/1 +#> asset:object/1200.starlight_circle/tick/spin/shrink # # 最後の回転に合わせて縮小する # -# @within function asset:object/1200.starlight_circle/tick/spin +# @within function asset:object/1200.starlight_circle/tick/spin/ # 縮小する data modify entity @s transformation.scale set value [0f,0f,0f] From 6f095d6a39c9d786a17b856acdaa73ab10674906 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Sun, 11 Oct 2026 21:34:10 +0900 Subject: [PATCH 16/20] =?UTF-8?q?:recycle:=20=E3=82=B9=E3=82=BF=E3=83=BC?= =?UTF-8?q?=E3=83=A9=E3=82=A4=E3=83=88=E3=82=B5=E3=83=BC=E3=82=AF=E3=83=AB?= =?UTF-8?q?=E3=81=AE=E5=9B=9E=E8=BB=A2=E6=96=B9=E5=90=91=E3=81=AENBT?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E3=82=92=E7=B5=B1=E5=90=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1200.starlight_circle/tick/spin/apply.mcfunction | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Asset/data/asset/functions/object/1200.starlight_circle/tick/spin/apply.mcfunction b/Asset/data/asset/functions/object/1200.starlight_circle/tick/spin/apply.mcfunction index b55e839091..d40cb5dbf2 100644 --- a/Asset/data/asset/functions/object/1200.starlight_circle/tick/spin/apply.mcfunction +++ b/Asset/data/asset/functions/object/1200.starlight_circle/tick/spin/apply.mcfunction @@ -9,9 +9,9 @@ data modify entity @s interpolation_duration set from storage asset:context this.SpinInterval # 水平な姿勢を保ち、画像の面内で回転させる - execute if data storage asset:context this{Spin:3} if data storage asset:context this{LeftRotate:true} run data modify entity @s transformation.right_rotation set value [0.0f,0.0f,-0.7071f,0.7071f] - execute if data storage asset:context this{Spin:3} unless data storage asset:context this{LeftRotate:true} run data modify entity @s transformation.right_rotation set value [0.0f,0.0f,0.7071f,0.7071f] + execute if data storage asset:context this{Spin:3,LeftRotate:true} run data modify entity @s transformation.right_rotation set value [0.0f,0.0f,-0.7071f,0.7071f] + execute if data storage asset:context this{Spin:3,LeftRotate:false} run data modify entity @s transformation.right_rotation set value [0.0f,0.0f,0.7071f,0.7071f] execute if data storage asset:context this{Spin:2} run data modify entity @s transformation.right_rotation set value [0.0f,0.0f,1.0f,0.0f] - execute if data storage asset:context this{Spin:1} if data storage asset:context this{LeftRotate:true} run data modify entity @s transformation.right_rotation set value [0.0f,0.0f,0.7071f,0.7071f] - execute if data storage asset:context this{Spin:1} unless data storage asset:context this{LeftRotate:true} run data modify entity @s transformation.right_rotation set value [0.0f,0.0f,-0.7071f,0.7071f] + execute if data storage asset:context this{Spin:1,LeftRotate:true} run data modify entity @s transformation.right_rotation set value [0.0f,0.0f,0.7071f,0.7071f] + execute if data storage asset:context this{Spin:1,LeftRotate:false} run data modify entity @s transformation.right_rotation set value [0.0f,0.0f,-0.7071f,0.7071f] execute if data storage asset:context this{Spin:0} run data modify entity @s transformation.right_rotation set value [0.0f,0.0f,0.0f,1.0f] From c7f84c71b2f99280f3f7b915af1a8bfa718032fe Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Sun, 11 Oct 2026 21:35:22 +0900 Subject: [PATCH 17/20] =?UTF-8?q?:recycle:=20=E5=9B=9E=E8=BB=A2=E6=96=B9?= =?UTF-8?q?=E5=90=91=E3=81=AE=E6=8A=BD=E9=81=B8=E3=81=AB50%=E5=88=A4?= =?UTF-8?q?=E5=AE=9Apredicate=E3=82=92=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/object/1200.starlight_circle/init/.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/object/1200.starlight_circle/init/.mcfunction b/Asset/data/asset/functions/object/1200.starlight_circle/init/.mcfunction index e7c7511851..091316be26 100644 --- a/Asset/data/asset/functions/object/1200.starlight_circle/init/.mcfunction +++ b/Asset/data/asset/functions/object/1200.starlight_circle/init/.mcfunction @@ -5,4 +5,4 @@ # @within asset:object/alias/1200/init # 回転方向を50%の確率で反転する - execute store result storage asset:context this.LeftRotate byte 1 run random value 0..1 + execute if predicate lib:random_pass_per/50 run data modify storage asset:context this.LeftRotate set value true From b65c5a09139fbcffc409cb1fec9f64368af29ba9 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Sun, 11 Oct 2026 21:36:58 +0900 Subject: [PATCH 18/20] =?UTF-8?q?=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88?= =?UTF-8?q?=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../object/1200.starlight_circle/tick/spin/apply.mcfunction | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Asset/data/asset/functions/object/1200.starlight_circle/tick/spin/apply.mcfunction b/Asset/data/asset/functions/object/1200.starlight_circle/tick/spin/apply.mcfunction index d40cb5dbf2..c13c4cb572 100644 --- a/Asset/data/asset/functions/object/1200.starlight_circle/tick/spin/apply.mcfunction +++ b/Asset/data/asset/functions/object/1200.starlight_circle/tick/spin/apply.mcfunction @@ -8,10 +8,10 @@ data modify entity @s start_interpolation set value 0 data modify entity @s interpolation_duration set from storage asset:context this.SpinInterval -# 水平な姿勢を保ち、画像の面内で回転させる - execute if data storage asset:context this{Spin:3,LeftRotate:true} run data modify entity @s transformation.right_rotation set value [0.0f,0.0f,-0.7071f,0.7071f] +# 回転させる LeftRotateによって回転方向を変える + execute if data storage asset:context this{Spin:3,LeftRotate: true} run data modify entity @s transformation.right_rotation set value [0.0f,0.0f,-0.7071f,0.7071f] execute if data storage asset:context this{Spin:3,LeftRotate:false} run data modify entity @s transformation.right_rotation set value [0.0f,0.0f,0.7071f,0.7071f] execute if data storage asset:context this{Spin:2} run data modify entity @s transformation.right_rotation set value [0.0f,0.0f,1.0f,0.0f] - execute if data storage asset:context this{Spin:1,LeftRotate:true} run data modify entity @s transformation.right_rotation set value [0.0f,0.0f,0.7071f,0.7071f] + execute if data storage asset:context this{Spin:1,LeftRotate: true} run data modify entity @s transformation.right_rotation set value [0.0f,0.0f,0.7071f,0.7071f] execute if data storage asset:context this{Spin:1,LeftRotate:false} run data modify entity @s transformation.right_rotation set value [0.0f,0.0f,-0.7071f,0.7071f] execute if data storage asset:context this{Spin:0} run data modify entity @s transformation.right_rotation set value [0.0f,0.0f,0.0f,1.0f] From 35e98f3d57bc7310689d34fe090bd9ae4b2571bf Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Mon, 12 Oct 2026 08:47:27 +0900 Subject: [PATCH 19/20] =?UTF-8?q?Lore=E3=82=92=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifact/1661.starlight_circle/give/2.give.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/artifact/1661.starlight_circle/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1661.starlight_circle/give/2.give.mcfunction index fca7f8607d..5353a507f5 100644 --- a/Asset/data/asset/functions/artifact/1661.starlight_circle/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1661.starlight_circle/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"スターライトサークル","color":"#bdd7ff"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text":"星の光を宿す魔法陣を展開し、周囲の敵にダメージを与える","color":"white"}'] + data modify storage asset:artifact Lore set value ['{"text":"星の光を宿す魔法を展開し、周囲の敵にダメージを与える","color":"white"}'] # 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション) # data modify storage asset:artifact ConsumeItem.Item set value '{"translate":"item.minecraft.stick"}' # data modify storage asset:artifact ConsumeItem.Count set value 1 From f7679be8d8aa219e855b1047a31b0a38d39a7d36 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Mon, 12 Oct 2026 08:56:22 +0900 Subject: [PATCH 20/20] =?UTF-8?q?=E6=BC=94=E5=87=BA=E3=82=92=E8=AA=BF?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifact/1661.starlight_circle/trigger/3.main.mcfunction | 1 + 1 file changed, 1 insertion(+) diff --git a/Asset/data/asset/functions/artifact/1661.starlight_circle/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1661.starlight_circle/trigger/3.main.mcfunction index 3ccd6c2b55..feba7f773e 100644 --- a/Asset/data/asset/functions/artifact/1661.starlight_circle/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1661.starlight_circle/trigger/3.main.mcfunction @@ -11,6 +11,7 @@ # 適当に演出 particle end_rod ~ ~0.2 ~ 0 0 0 0.3 30 normal @a + particle enchant ~ ~1.2 ~ 2 1 2 0 100 normal @a particle dust 0.541 0.78 1 1 ~ ~1.2 ~ 3 1.2 3 0 40 normal @a playsound block.beacon.power_select player @a ~ ~ ~ 1 1.8 playsound block.beacon.power_select player @a ~ ~ ~ 1 1.9