From cb0e2fd2614b36e5b6d93deccbb51cf9d6fa33ed Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Wed, 15 Jul 2026 08:46:12 +0900 Subject: [PATCH 1/9] =?UTF-8?q?=E3=81=A8=E3=82=8A=E3=81=82=E3=81=88?= =?UTF-8?q?=E3=81=9A=E9=80=9A=E5=B8=B8=E6=94=BB=E6=92=83=E3=82=92=E5=AE=9F?= =?UTF-8?q?=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1307.yumeori/give/1.trigger.mcfunction | 7 ++ .../1307.yumeori/give/2.give.mcfunction | 68 +++++++++++++++++++ .../1307.yumeori/trigger/1.trigger.mcfunction | 8 +++ .../trigger/2.check_condition.mcfunction | 20 ++++++ .../1307.yumeori/trigger/3.main.mcfunction | 18 +++++ .../1307.yumeori/trigger/_index.d.mcfunction | 6 ++ .../trigger/neutral_arrow.mcfunction | 18 +++++ .../1176.arrow_of_yumeori/_index.d.mcfunction | 6 ++ .../1176.arrow_of_yumeori/pre_hit/.mcfunction | 5 ++ .../recursive/.mcfunction | 48 +++++++++++++ .../recursive/vfx/pink.mcfunction | 36 ++++++++++ .../recursive/vfx/red.mcfunction | 36 ++++++++++ .../recursive/vfx/yellow.mcfunction | 37 ++++++++++ .../1176.arrow_of_yumeori/register.mcfunction | 34 ++++++++++ .../1176.arrow_of_yumeori/tick/.mcfunction | 16 +++++ .../functions/object/alias/1176/.mcfunction | 8 +++ .../object/alias/1176/pre_hit.mcfunction | 8 +++ .../object/alias/1176/recursive.mcfunction | 8 +++ .../object/alias/1176/register.mcfunction | 8 +++ .../object/alias/1176/tick.mcfunction | 8 +++ .../asset/tags/functions/artifact/give.json | 3 +- .../asset/tags/functions/artifact/shot.json | 1 + 22 files changed, 406 insertions(+), 1 deletion(-) create mode 100644 Asset/data/asset/functions/artifact/1307.yumeori/give/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1307.yumeori/give/2.give.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1307.yumeori/trigger/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1307.yumeori/trigger/2.check_condition.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1307.yumeori/trigger/3.main.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1307.yumeori/trigger/_index.d.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1307.yumeori/trigger/neutral_arrow.mcfunction create mode 100644 Asset/data/asset/functions/object/1176.arrow_of_yumeori/_index.d.mcfunction create mode 100644 Asset/data/asset/functions/object/1176.arrow_of_yumeori/pre_hit/.mcfunction create mode 100644 Asset/data/asset/functions/object/1176.arrow_of_yumeori/recursive/.mcfunction create mode 100644 Asset/data/asset/functions/object/1176.arrow_of_yumeori/recursive/vfx/pink.mcfunction create mode 100644 Asset/data/asset/functions/object/1176.arrow_of_yumeori/recursive/vfx/red.mcfunction create mode 100644 Asset/data/asset/functions/object/1176.arrow_of_yumeori/recursive/vfx/yellow.mcfunction create mode 100644 Asset/data/asset/functions/object/1176.arrow_of_yumeori/register.mcfunction create mode 100644 Asset/data/asset/functions/object/1176.arrow_of_yumeori/tick/.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1176/.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1176/pre_hit.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1176/recursive.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1176/register.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1176/tick.mcfunction diff --git a/Asset/data/asset/functions/artifact/1307.yumeori/give/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1307.yumeori/give/1.trigger.mcfunction new file mode 100644 index 0000000000..c77897caec --- /dev/null +++ b/Asset/data/asset/functions/artifact/1307.yumeori/give/1.trigger.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1307.yumeori/give/1.trigger +# +# 神器の取得処理の呼び出し時に実行されるfunction +# +# @within tag/function asset:artifact/give + +execute if data storage asset:context {id:1307} run function asset:artifact/1307.yumeori/give/2.give \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1307.yumeori/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1307.yumeori/give/2.give.mcfunction new file mode 100644 index 0000000000..9feb214f31 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1307.yumeori/give/2.give.mcfunction @@ -0,0 +1,68 @@ +#> asset:artifact/1307.yumeori/give/2.give +# +# 神器の作成部 ここでID等を定義する +# +# @user +# @within function asset:artifact/1307.yumeori/give/1.trigger + +# 神器の説明や消費MPなどをここで設定する。 +# 最後にasset:artifact/common/giveを実行することで入手可能。 + +# 神器のID (int) スプレッドシートの値を入れる + data modify storage asset:artifact ID set value 1307 +# 神器のベースアイテム + data modify storage asset:artifact Item set value "minecraft:bow" +# 神器の名前 (TextComponentString) + data modify storage asset:artifact Name set value '{"text":"極光弓 夢織","color":"#91f9ab"}' +# 神器の説明文 (TextComponentString[]) + data modify storage asset:artifact Lore set value [] +# 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション) + data modify storage asset:artifact ConsumeItem.Item set value '{"translate":"item.minecraft.arrow"}' + 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 "shot" +# 神器の発動条件 (TextComponentString) (オプション) + data modify storage asset:artifact Condition set value '{"text":"最大まで引き絞る"}' +# 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.Damage set value [0,0] +# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.AttackType set value [Magic] +# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.ElementType set value [Thunder] +# 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.BypassResist set value +# 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.IsRangeAttack set value "condition" +# 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.AttackRange set value 20 +# MP消費量 (int) + # data modify storage asset:artifact MPCost set value +# MP必要量 (int) (オプション) + # data modify storage asset:artifact MPRequire set value +# MP回復量 (int) + data modify storage asset:artifact MPHealWhenHit set value 20 +# 神器のクールダウン (int) (オプション) + # data modify storage asset:artifact LocalCooldown set value +# 種別クールダウン ({Type: string, Duration: int}) (オプション) + # data modify storage asset:artifact TypeCooldown.Type set value + # data modify storage asset:artifact TypeCooldown.Duration set value +# グローバルクールダウン (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 "ALL" +# カスタム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/1307.yumeori/trigger/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1307.yumeori/trigger/1.trigger.mcfunction new file mode 100644 index 0000000000..60380a85ad --- /dev/null +++ b/Asset/data/asset/functions/artifact/1307.yumeori/trigger/1.trigger.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1307.yumeori/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:1307} run function asset:artifact/1307.yumeori/trigger/2.check_condition \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1307.yumeori/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1307.yumeori/trigger/2.check_condition.mcfunction new file mode 100644 index 0000000000..683246e749 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1307.yumeori/trigger/2.check_condition.mcfunction @@ -0,0 +1,20 @@ +#> asset:artifact/1307.yumeori/trigger/2.check_condition +# +# 神器の発動条件をチェックします +# +# @within function asset:artifact/1307.yumeori/trigger/1.trigger + +# 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く + function asset:artifact/common/check_condition/mainhand +# 他にアイテム等確認する場合はここに書く + +# 矢がクリティカルでないならCanUsedを削除 + execute unless entity @e[type=#arrows,tag=ShotArrow,nbt={crit:1b},distance=..5,sort=nearest,limit=1] run tag @s remove CanUsed + kill @e[type=#arrows,tag=ShotArrow,distance=..5] + +# 発動しなかったら矢を返してreturn + execute if entity @s[tag=!CanUsed] run summon item ~ ~ ~ {PickupDelay:0s,Item:{id:"minecraft:arrow",Count:1b}} + execute if entity @s[tag=!CanUsed] run return fail + +# 3.main.mcfunctionを実行する + function asset:artifact/1307.yumeori/trigger/3.main diff --git a/Asset/data/asset/functions/artifact/1307.yumeori/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1307.yumeori/trigger/3.main.mcfunction new file mode 100644 index 0000000000..e5c613dd80 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1307.yumeori/trigger/3.main.mcfunction @@ -0,0 +1,18 @@ +#> asset:artifact/1307.yumeori/trigger/3.main +# +# 神器のメイン処理部 +# +# @within function asset:artifact/1307.yumeori/trigger/2.check_condition + +# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う + function asset:artifact/common/use/mainhand + +# ここから先は神器側の効果の処理を書く + +# 演出 + playsound entity.wither.shoot player @a ~ ~ ~ 1 1.8 + playsound item.trident.riptide_1 player @a ~ ~ ~ 1 1.8 + # particle flash ~ ~ ~ 0 0 0 0 1 + +# 何もなければ普通の矢を発射 + function asset:artifact/1307.yumeori/trigger/neutral_arrow diff --git a/Asset/data/asset/functions/artifact/1307.yumeori/trigger/_index.d.mcfunction b/Asset/data/asset/functions/artifact/1307.yumeori/trigger/_index.d.mcfunction new file mode 100644 index 0000000000..5378df81f0 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1307.yumeori/trigger/_index.d.mcfunction @@ -0,0 +1,6 @@ +#> asset:artifact/1307.yumeori/trigger/_index.d +# @private + +#> tag +# @within function asset:artifact/1307.yumeori/trigger/** + #declare tag diff --git a/Asset/data/asset/functions/artifact/1307.yumeori/trigger/neutral_arrow.mcfunction b/Asset/data/asset/functions/artifact/1307.yumeori/trigger/neutral_arrow.mcfunction new file mode 100644 index 0000000000..3f73a4f75b --- /dev/null +++ b/Asset/data/asset/functions/artifact/1307.yumeori/trigger/neutral_arrow.mcfunction @@ -0,0 +1,18 @@ +#> asset:artifact/1307.yumeori/trigger/neutral_arrow +# +# +# +# @within function asset:artifact/1307.yumeori/trigger/3.main + +# 矢を召喚する + # ダメージ + data modify storage api: Argument.FieldOverride.Damage set value 800 + # 射程 + data modify storage api: Argument.FieldOverride.Range set value 50 + # 弾速 + data modify storage api: Argument.FieldOverride.Speed set value 8 + # 召喚 + data modify storage api: Argument.ID set value 1176 + execute store result storage api: Argument.FieldOverride.UserID int 1 run scoreboard players get @s UserID + data modify storage api: Argument.FieldOverride.AdditionalMPHeal set from storage api: PersistentArgument.AdditionalMPHeal + execute anchored eyes positioned ^ ^ ^ run function api:object/summon diff --git a/Asset/data/asset/functions/object/1176.arrow_of_yumeori/_index.d.mcfunction b/Asset/data/asset/functions/object/1176.arrow_of_yumeori/_index.d.mcfunction new file mode 100644 index 0000000000..ac28c1b016 --- /dev/null +++ b/Asset/data/asset/functions/object/1176.arrow_of_yumeori/_index.d.mcfunction @@ -0,0 +1,6 @@ +#> asset:object/1176.arrow_of_yumeori/_index.d +# @private + +#> tag +# @within function asset:object/1176.arrow_of_yumeori/** + #declare \ No newline at end of file diff --git a/Asset/data/asset/functions/object/1176.arrow_of_yumeori/pre_hit/.mcfunction b/Asset/data/asset/functions/object/1176.arrow_of_yumeori/pre_hit/.mcfunction new file mode 100644 index 0000000000..39a8bc90fd --- /dev/null +++ b/Asset/data/asset/functions/object/1176.arrow_of_yumeori/pre_hit/.mcfunction @@ -0,0 +1,5 @@ +#> asset:object/1176.arrow_of_yumeori/pre_hit/ +# +# 継承先などから実行される処理 +# +# @within asset:object/alias/1176/pre_hit diff --git a/Asset/data/asset/functions/object/1176.arrow_of_yumeori/recursive/.mcfunction b/Asset/data/asset/functions/object/1176.arrow_of_yumeori/recursive/.mcfunction new file mode 100644 index 0000000000..645fbb3b05 --- /dev/null +++ b/Asset/data/asset/functions/object/1176.arrow_of_yumeori/recursive/.mcfunction @@ -0,0 +1,48 @@ +#> asset:object/1176.arrow_of_yumeori/recursive/ +# +# 継承先などから実行される処理 +# +# @within asset:object/alias/1176/recursive + +#> Private +# @private + #declare score_holder $Step + +# インクリメント + execute store result storage asset:context this.StepCount int -1 run data get storage asset:context this.StepCount -1.00000000001 + +# 0なら1にする + execute if data storage asset:context this{StepCount:0} run data modify storage asset:context this.StepCount set value 1 + +# 軌跡 + #execute store result score $Step Temporary run data get storage asset:context this.StepCount + #execute if score $Step Temporary matches ..20 run particle dust 1 0.973 0.573 1.3 ^ ^ ^ 0 0 0 0 1 normal @a + #execute if score $Step Temporary matches ..20 run particle dust 1 0.973 0.573 1.3 ^ ^ ^-0.25 0 0 0 0 1 normal @a + #execute if score $Step Temporary matches 21..40 run particle dust 1 0.624 0.573 1.3 ^ ^ ^ 0 0 0 0 1 normal @a + #execute if score $Step Temporary matches 21..40 run particle dust 1 0.624 0.573 1.3 ^ ^ ^-0.25 0 0 0 0 1 normal @a + #execute if score $Step Temporary matches 41.. run particle dust 0.988 0.663 1 1.3 ^ ^ ^ 0 0 0 0 1 normal @a + #execute if score $Step Temporary matches 41.. run particle dust 0.988 0.663 1 1.3 ^ ^ ^-0.25 0 0 0 0 1 normal @a + #scoreboard players reset $Step Temporary + + # particle wax_off ^ ^ ^0.25 0 0 0 0 1 + # particle wax_off ^ ^ ^0.00 0 0 0 0 1 + + execute store result score $Step Temporary run data get storage asset:context this.StepCount + execute if score $Step Temporary matches ..20 run particle dust 100000000 100000000 1 1.3 ^ ^ ^ 0 0 0 0 1 normal @a + execute if score $Step Temporary matches ..20 run particle dust 100000000 100000000 1 1.3 ^ ^ ^-0.25 0 0 0 0 1 normal @a + execute if score $Step Temporary matches 21..40 run particle dust 100000000 1 1 1.3 ^ ^ ^ 0 0 0 0 1 normal @a + execute if score $Step Temporary matches 21..40 run particle dust 100000000 1 1 1.3 ^ ^ ^-0.25 0 0 0 0 1 normal @a + execute if score $Step Temporary matches 41.. run particle dust 100000000 1 100000000 1.3 ^ ^ ^ 0 0 0 0 1 normal @a + execute if score $Step Temporary matches 41.. run particle dust 100000000 1 100000000 1.3 ^ ^ ^-0.25 0 0 0 0 1 normal @a + scoreboard players reset $Step Temporary + +# 色を変える + execute if data storage asset:context this{StepCount:20} run data modify entity @s item.tag.display.color set value 16745353 + execute if data storage asset:context this{StepCount:40} run data modify entity @s item.tag.display.color set value 16760318 + +# 演出 (仮) + execute if data storage asset:context this{StepCount: 0} run function asset:object/1176.arrow_of_yumeori/recursive/vfx/yellow + execute if data storage asset:context this{StepCount:10} run function asset:object/1176.arrow_of_yumeori/recursive/vfx/yellow + execute if data storage asset:context this{StepCount:20} run function asset:object/1176.arrow_of_yumeori/recursive/vfx/red + execute if data storage asset:context this{StepCount:30} run function asset:object/1176.arrow_of_yumeori/recursive/vfx/red + execute if data storage asset:context this{StepCount:40} run function asset:object/1176.arrow_of_yumeori/recursive/vfx/pink diff --git a/Asset/data/asset/functions/object/1176.arrow_of_yumeori/recursive/vfx/pink.mcfunction b/Asset/data/asset/functions/object/1176.arrow_of_yumeori/recursive/vfx/pink.mcfunction new file mode 100644 index 0000000000..24b37243d6 --- /dev/null +++ b/Asset/data/asset/functions/object/1176.arrow_of_yumeori/recursive/vfx/pink.mcfunction @@ -0,0 +1,36 @@ +#> asset:object/1176.arrow_of_yumeori/recursive/vfx/pink +# +# +# +# @within function asset:object/1176.arrow_of_yumeori/recursive/ + +# [ImportKey]: NobwRALgngDgpmAXGAxgSwE4oDYIDRgCuhaAJkmAGYCsATLQEYCcAzNQLRMAsAHE+1xRwu7AIYB2UvwBsARlFdRtHgAZRq0WAIA7UQFsEyQGGKAAllawMURn0BnJOBQB7QtohJlBIW7gYHYADdRbEJDcAAPJBUCKCiAXziCG1I0QntEWQJbCGt3RGiwOGxsNBhbQ1kVAownHIhDArRbAFFi0vLmgEdCYOwoAGUrIXJESmDyhIBdIA_3 +# 円 1 +particle dust 100000000 1 100000000 2 ^0 ^-1 ^ 0 0 0 0 1 +particle dust 100000000 1 100000000 2 ^0.22252 ^-0.97493 ^ 0 0 0 0 1 +particle dust 100000000 1 100000000 2 ^0.43388 ^-0.90097 ^ 0 0 0 0 1 +particle dust 100000000 1 100000000 2 ^0.62349 ^-0.78183 ^ 0 0 0 0 1 +particle dust 100000000 1 100000000 2 ^0.78183 ^-0.62349 ^ 0 0 0 0 1 +particle dust 100000000 1 100000000 2 ^0.90097 ^-0.43388 ^ 0 0 0 0 1 +particle dust 100000000 1 100000000 2 ^0.97493 ^-0.22252 ^ 0 0 0 0 1 +particle dust 100000000 1 100000000 2 ^1 ^0 ^ 0 0 0 0 1 +particle dust 100000000 1 100000000 2 ^0.97493 ^0.22252 ^ 0 0 0 0 1 +particle dust 100000000 1 100000000 2 ^0.90097 ^0.43388 ^ 0 0 0 0 1 +particle dust 100000000 1 100000000 2 ^0.78183 ^0.62349 ^ 0 0 0 0 1 +particle dust 100000000 1 100000000 2 ^0.62349 ^0.78183 ^ 0 0 0 0 1 +particle dust 100000000 1 100000000 2 ^0.43388 ^0.90097 ^ 0 0 0 0 1 +particle dust 100000000 1 100000000 2 ^0.22252 ^0.97493 ^ 0 0 0 0 1 +particle dust 100000000 1 100000000 2 ^0 ^1 ^ 0 0 0 0 1 +particle dust 100000000 1 100000000 2 ^-0.22252 ^0.97493 ^ 0 0 0 0 1 +particle dust 100000000 1 100000000 2 ^-0.43388 ^0.90097 ^ 0 0 0 0 1 +particle dust 100000000 1 100000000 2 ^-0.62349 ^0.78183 ^ 0 0 0 0 1 +particle dust 100000000 1 100000000 2 ^-0.78183 ^0.62349 ^ 0 0 0 0 1 +particle dust 100000000 1 100000000 2 ^-0.90097 ^0.43388 ^ 0 0 0 0 1 +particle dust 100000000 1 100000000 2 ^-0.97493 ^0.22252 ^ 0 0 0 0 1 +particle dust 100000000 1 100000000 2 ^-1 ^0 ^ 0 0 0 0 1 +particle dust 100000000 1 100000000 2 ^-0.97493 ^-0.22252 ^ 0 0 0 0 1 +particle dust 100000000 1 100000000 2 ^-0.90097 ^-0.43388 ^ 0 0 0 0 1 +particle dust 100000000 1 100000000 2 ^-0.78183 ^-0.62349 ^ 0 0 0 0 1 +particle dust 100000000 1 100000000 2 ^-0.62349 ^-0.78183 ^ 0 0 0 0 1 +particle dust 100000000 1 100000000 2 ^-0.43388 ^-0.90097 ^ 0 0 0 0 1 +particle dust 100000000 1 100000000 2 ^-0.22252 ^-0.97493 ^ 0 0 0 0 1 diff --git a/Asset/data/asset/functions/object/1176.arrow_of_yumeori/recursive/vfx/red.mcfunction b/Asset/data/asset/functions/object/1176.arrow_of_yumeori/recursive/vfx/red.mcfunction new file mode 100644 index 0000000000..5f8cb624be --- /dev/null +++ b/Asset/data/asset/functions/object/1176.arrow_of_yumeori/recursive/vfx/red.mcfunction @@ -0,0 +1,36 @@ +#> asset:object/1176.arrow_of_yumeori/recursive/vfx/red +# +# +# +# @within function asset:object/1176.arrow_of_yumeori/recursive/ + +# [ImportKey]: NobwRALgngDgpmAXGAxgSwE4oDYIDRgCuhaAJkmAGYCsATLQEYCcAzNQLRMAsAHE+1xRwu7AIYB2UvwBsARlFdRtHgAZRq0WAIA7UQFsEyQGGKAAllawMURn0BnJOBQB7QtohJlBIW7gYHYADdRbEJDcAAPJBUCKCiAXziCG1I0QntEWQJbCGt3RGiwOGxsNBhbQ1kVAownHIhDArRbAFFi0vLmgEdCYOwoAGUrIXJESmDyhIBdIA_3 +# 円 1 +particle dust 100000000 1 1 2 ^0 ^-1 ^ 0 0 0 0 1 +particle dust 100000000 1 1 2 ^0.22252 ^-0.97493 ^ 0 0 0 0 1 +particle dust 100000000 1 1 2 ^0.43388 ^-0.90097 ^ 0 0 0 0 1 +particle dust 100000000 1 1 2 ^0.62349 ^-0.78183 ^ 0 0 0 0 1 +particle dust 100000000 1 1 2 ^0.78183 ^-0.62349 ^ 0 0 0 0 1 +particle dust 100000000 1 1 2 ^0.90097 ^-0.43388 ^ 0 0 0 0 1 +particle dust 100000000 1 1 2 ^0.97493 ^-0.22252 ^ 0 0 0 0 1 +particle dust 100000000 1 1 2 ^1 ^0 ^ 0 0 0 0 1 +particle dust 100000000 1 1 2 ^0.97493 ^0.22252 ^ 0 0 0 0 1 +particle dust 100000000 1 1 2 ^0.90097 ^0.43388 ^ 0 0 0 0 1 +particle dust 100000000 1 1 2 ^0.78183 ^0.62349 ^ 0 0 0 0 1 +particle dust 100000000 1 1 2 ^0.62349 ^0.78183 ^ 0 0 0 0 1 +particle dust 100000000 1 1 2 ^0.43388 ^0.90097 ^ 0 0 0 0 1 +particle dust 100000000 1 1 2 ^0.22252 ^0.97493 ^ 0 0 0 0 1 +particle dust 100000000 1 1 2 ^0 ^1 ^ 0 0 0 0 1 +particle dust 100000000 1 1 2 ^-0.22252 ^0.97493 ^ 0 0 0 0 1 +particle dust 100000000 1 1 2 ^-0.43388 ^0.90097 ^ 0 0 0 0 1 +particle dust 100000000 1 1 2 ^-0.62349 ^0.78183 ^ 0 0 0 0 1 +particle dust 100000000 1 1 2 ^-0.78183 ^0.62349 ^ 0 0 0 0 1 +particle dust 100000000 1 1 2 ^-0.90097 ^0.43388 ^ 0 0 0 0 1 +particle dust 100000000 1 1 2 ^-0.97493 ^0.22252 ^ 0 0 0 0 1 +particle dust 100000000 1 1 2 ^-1 ^0 ^ 0 0 0 0 1 +particle dust 100000000 1 1 2 ^-0.97493 ^-0.22252 ^ 0 0 0 0 1 +particle dust 100000000 1 1 2 ^-0.90097 ^-0.43388 ^ 0 0 0 0 1 +particle dust 100000000 1 1 2 ^-0.78183 ^-0.62349 ^ 0 0 0 0 1 +particle dust 100000000 1 1 2 ^-0.62349 ^-0.78183 ^ 0 0 0 0 1 +particle dust 100000000 1 1 2 ^-0.43388 ^-0.90097 ^ 0 0 0 0 1 +particle dust 100000000 1 1 2 ^-0.22252 ^-0.97493 ^ 0 0 0 0 1 diff --git a/Asset/data/asset/functions/object/1176.arrow_of_yumeori/recursive/vfx/yellow.mcfunction b/Asset/data/asset/functions/object/1176.arrow_of_yumeori/recursive/vfx/yellow.mcfunction new file mode 100644 index 0000000000..a3ed4b6ef0 --- /dev/null +++ b/Asset/data/asset/functions/object/1176.arrow_of_yumeori/recursive/vfx/yellow.mcfunction @@ -0,0 +1,37 @@ +#> asset:object/1176.arrow_of_yumeori/recursive/vfx/yellow +# +# +# +# @within function asset:object/1176.arrow_of_yumeori/recursive/ + + +# [ImportKey]: NobwRALgngDgpmAXGAxgSwE4oDYIDRgCuhaAJkmAGYCsATLQEYCcAzNQLRMAsAHE+1xRwu7AIYB2UvwBsARlFdRtHgAZRq0WAIA7UQFsEyQGGKAAllawMURn0BnJOBQB7QtohJlBIW7gYHYADdRbEJDcAAPJBUCKCiAXziCG1I0QntEWQJbCGt3RGiwOGxsNBhbQ1kVAownHIhDArRbAFFi0vLmgEdCYOwoAGUrIXJESmDyhIBdIA_3 +# 円 1 +particle dust 100000000 100000000 1 2 ^0 ^-1 ^ 0 0 0 0 1 +particle dust 100000000 100000000 1 2 ^0.22252 ^-0.97493 ^ 0 0 0 0 1 +particle dust 100000000 100000000 1 2 ^0.43388 ^-0.90097 ^ 0 0 0 0 1 +particle dust 100000000 100000000 1 2 ^0.62349 ^-0.78183 ^ 0 0 0 0 1 +particle dust 100000000 100000000 1 2 ^0.78183 ^-0.62349 ^ 0 0 0 0 1 +particle dust 100000000 100000000 1 2 ^0.90097 ^-0.43388 ^ 0 0 0 0 1 +particle dust 100000000 100000000 1 2 ^0.97493 ^-0.22252 ^ 0 0 0 0 1 +particle dust 100000000 100000000 1 2 ^1 ^0 ^ 0 0 0 0 1 +particle dust 100000000 100000000 1 2 ^0.97493 ^0.22252 ^ 0 0 0 0 1 +particle dust 100000000 100000000 1 2 ^0.90097 ^0.43388 ^ 0 0 0 0 1 +particle dust 100000000 100000000 1 2 ^0.78183 ^0.62349 ^ 0 0 0 0 1 +particle dust 100000000 100000000 1 2 ^0.62349 ^0.78183 ^ 0 0 0 0 1 +particle dust 100000000 100000000 1 2 ^0.43388 ^0.90097 ^ 0 0 0 0 1 +particle dust 100000000 100000000 1 2 ^0.22252 ^0.97493 ^ 0 0 0 0 1 +particle dust 100000000 100000000 1 2 ^0 ^1 ^ 0 0 0 0 1 +particle dust 100000000 100000000 1 2 ^-0.22252 ^0.97493 ^ 0 0 0 0 1 +particle dust 100000000 100000000 1 2 ^-0.43388 ^0.90097 ^ 0 0 0 0 1 +particle dust 100000000 100000000 1 2 ^-0.62349 ^0.78183 ^ 0 0 0 0 1 +particle dust 100000000 100000000 1 2 ^-0.78183 ^0.62349 ^ 0 0 0 0 1 +particle dust 100000000 100000000 1 2 ^-0.90097 ^0.43388 ^ 0 0 0 0 1 +particle dust 100000000 100000000 1 2 ^-0.97493 ^0.22252 ^ 0 0 0 0 1 +particle dust 100000000 100000000 1 2 ^-1 ^0 ^ 0 0 0 0 1 +particle dust 100000000 100000000 1 2 ^-0.97493 ^-0.22252 ^ 0 0 0 0 1 +particle dust 100000000 100000000 1 2 ^-0.90097 ^-0.43388 ^ 0 0 0 0 1 +particle dust 100000000 100000000 1 2 ^-0.78183 ^-0.62349 ^ 0 0 0 0 1 +particle dust 100000000 100000000 1 2 ^-0.62349 ^-0.78183 ^ 0 0 0 0 1 +particle dust 100000000 100000000 1 2 ^-0.43388 ^-0.90097 ^ 0 0 0 0 1 +particle dust 100000000 100000000 1 2 ^-0.22252 ^-0.97493 ^ 0 0 0 0 1 diff --git a/Asset/data/asset/functions/object/1176.arrow_of_yumeori/register.mcfunction b/Asset/data/asset/functions/object/1176.arrow_of_yumeori/register.mcfunction new file mode 100644 index 0000000000..14ceabe2e1 --- /dev/null +++ b/Asset/data/asset/functions/object/1176.arrow_of_yumeori/register.mcfunction @@ -0,0 +1,34 @@ +#> asset:object/1176.arrow_of_yumeori/register +# +# Objectのデータを指定 +# +# @within function asset:object/alias/1176/register + +# 継承(オプション) + data modify storage asset:object Extends append value 1009 + 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 1176 +# フィールド(オプション) + data modify storage asset:object Field.Color set value 16646013 + data modify storage asset:object Field.ShowCritParticle set value false + data modify storage asset:object Field.AttackType set value "Magic" + data modify storage asset:object Field.ElementType set value "Thunder" + data modify storage asset:object Field.Range set value 40 + data modify storage asset:object Field.Speed set value 4 + data modify storage asset:object Field.Damage set value 1 + data modify storage asset:object Field.PoisonDamage set value 1 + data modify storage asset:object Field.AdditionalMPHeal set value 1 + +# 何回進んだかを計測する + data modify storage asset:object Field.StepCount set value 0 + +# メモ +# 黄色:16646013, 赤:16745353 ピンク:16760318 diff --git a/Asset/data/asset/functions/object/1176.arrow_of_yumeori/tick/.mcfunction b/Asset/data/asset/functions/object/1176.arrow_of_yumeori/tick/.mcfunction new file mode 100644 index 0000000000..47be67633f --- /dev/null +++ b/Asset/data/asset/functions/object/1176.arrow_of_yumeori/tick/.mcfunction @@ -0,0 +1,16 @@ +#> asset:object/1176.arrow_of_yumeori/tick/ +# +# Objectのtick時の処理 +# +# @within asset:object/alias/1176/tick + +# Tick加算 + scoreboard players add @s General.Object.Tick 1 + +# 矢の色変える + # execute if score @s General.Object.Tick matches + + function asset:object/super.tick + +# 消滅処理 + kill @s[scores={General.Object.Tick=1000..}] diff --git a/Asset/data/asset/functions/object/alias/1176/.mcfunction b/Asset/data/asset/functions/object/alias/1176/.mcfunction new file mode 100644 index 0000000000..346b6dfc9c --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1176/.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1176/ +# +# メソッド処理のエイリアス +# +# @within asset_manager:object/call_method/run_method.m + +# 元のメソッド処理を呼び出す + function asset:object/1176.arrow_of_yumeori// \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1176/pre_hit.mcfunction b/Asset/data/asset/functions/object/alias/1176/pre_hit.mcfunction new file mode 100644 index 0000000000..9d0fe6013c --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1176/pre_hit.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1176/pre_hit +# +# メソッド処理のエイリアス +# +# @within asset_manager:object/call_method/run_method.m + +# 元のメソッド処理を呼び出す + function asset:object/1176.arrow_of_yumeori/pre_hit/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1176/recursive.mcfunction b/Asset/data/asset/functions/object/alias/1176/recursive.mcfunction new file mode 100644 index 0000000000..2949d31825 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1176/recursive.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1176/recursive +# +# メソッド処理のエイリアス +# +# @within asset_manager:object/call_method/run_method.m + +# 元のメソッド処理を呼び出す + function asset:object/1176.arrow_of_yumeori/recursive/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1176/register.mcfunction b/Asset/data/asset/functions/object/alias/1176/register.mcfunction new file mode 100644 index 0000000000..28f9577f0d --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1176/register.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1176/register +# +# Objectのデータ指定処理のエイリアス +# +# @within asset_manager:object/summon/register.m + +# 元の登録処理を呼び出す + function asset:object/1176.arrow_of_yumeori/register \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1176/tick.mcfunction b/Asset/data/asset/functions/object/alias/1176/tick.mcfunction new file mode 100644 index 0000000000..bcb42e95c5 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1176/tick.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1176/tick +# +# Tick時処理のエイリアス +# +# @within asset_manager:object/tick/tick.m + +# 元のTick処理を呼び出す + function asset:object/1176.arrow_of_yumeori/tick/ \ 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 fdb7a26c47..c29679634a 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/1307.yumeori/give/1.trigger", "asset:artifact/1562.tsukimi_dango/give/1.trigger", "asset:artifact/1430.shield_of_fate/give/1.trigger", "asset:artifact/1453.frost_flake_bow/give/1.trigger", @@ -540,4 +541,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/shot.json b/Asset/data/asset/tags/functions/artifact/shot.json index 6c4b2001af..03d38e9b9e 100644 --- a/Asset/data/asset/tags/functions/artifact/shot.json +++ b/Asset/data/asset/tags/functions/artifact/shot.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1307.yumeori/trigger/1.trigger", "asset:artifact/1453.frost_flake_bow/trigger/1.trigger", "asset:artifact/1061.hekireki/trigger/1.trigger", "asset:artifact/1262.honey_bee_stiring/trigger/1.trigger", From 5a5b26bbbb378981597c8cfc252fa471df0f20c0 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Wed, 15 Jul 2026 08:56:40 +0900 Subject: [PATCH 2/9] =?UTF-8?q?Metadata=E3=81=AB=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1009.arrow/hit_entity/from_non-player/as_target.mcfunction | 1 + .../1009.arrow/hit_entity/from_player/as_target.mcfunction | 3 +++ .../data/asset/functions/object/1009.arrow/register.mcfunction | 1 + 3 files changed, 5 insertions(+) diff --git a/Asset/data/asset/functions/object/1009.arrow/hit_entity/from_non-player/as_target.mcfunction b/Asset/data/asset/functions/object/1009.arrow/hit_entity/from_non-player/as_target.mcfunction index e59ef5b2c3..aa625c5493 100644 --- a/Asset/data/asset/functions/object/1009.arrow/hit_entity/from_non-player/as_target.mcfunction +++ b/Asset/data/asset/functions/object/1009.arrow/hit_entity/from_non-player/as_target.mcfunction @@ -14,6 +14,7 @@ data modify storage api: Argument.Damage set from storage asset:context this.Damage data modify storage api: Argument.AttackType set from storage asset:context this.AttackType data modify storage api: Argument.ElementType set from storage asset:context this.ElementType + execute if data storage asset:context this.Metadata run data modify storage api: Argument.Metadata set from storage asset:context this.Metadata # execute if data storage asset:context this.AdditionalMPHeal run data modify storage api: Argument.AdditionalMPHeal set from storage asset:context this.AdditionalMPHeal # modifier をかける data modify storage api: Argument.MobUUID set from storage asset:context this.MobUUID diff --git a/Asset/data/asset/functions/object/1009.arrow/hit_entity/from_player/as_target.mcfunction b/Asset/data/asset/functions/object/1009.arrow/hit_entity/from_player/as_target.mcfunction index 45cf9e608e..887e31360f 100644 --- a/Asset/data/asset/functions/object/1009.arrow/hit_entity/from_player/as_target.mcfunction +++ b/Asset/data/asset/functions/object/1009.arrow/hit_entity/from_player/as_target.mcfunction @@ -9,6 +9,8 @@ #declare score_holder $UserID #declare tag 1009.Player +tellraw @a {"storage":"asset:context","nbt":"this"} + # プレイヤー特定 execute store result score $UserID Temporary run data get storage asset:context this.UserID execute as @a if score @s UserID = $UserID Temporary run tag @s add 1009.Player @@ -19,6 +21,7 @@ data modify storage api: Argument.Damage set from storage asset:context this.Damage data modify storage api: Argument.AttackType set from storage asset:context this.AttackType data modify storage api: Argument.ElementType set from storage asset:context this.ElementType + execute if data storage asset:context this.Metadata run data modify storage api: Argument.Metadata set from storage asset:context this.Metadata execute if data storage asset:context this.AdditionalMPHeal run data modify storage api: Argument.AdditionalMPHeal set from storage asset:context this.AdditionalMPHeal # modifier をかける execute as @a[tag=1009.Player] run function api:damage/modifier diff --git a/Asset/data/asset/functions/object/1009.arrow/register.mcfunction b/Asset/data/asset/functions/object/1009.arrow/register.mcfunction index f589fccdb0..b841828ed5 100644 --- a/Asset/data/asset/functions/object/1009.arrow/register.mcfunction +++ b/Asset/data/asset/functions/object/1009.arrow/register.mcfunction @@ -24,6 +24,7 @@ data modify storage asset:object Field.Damage set value 1 data modify storage asset:object Field.AttackType set value "Physical" data modify storage asset:object Field.ElementType set value "None" + # data modify storage asset:object Field.Metadata set value # data modify storage asset:object Field.AdditionalMPHeal set value # data modify storage asset:object Field.UserID set value # data modify storage asset:object Field.MobUUID set value From e6930989c32738f5d77bb7face251cc1bfce36a0 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Wed, 15 Jul 2026 09:34:37 +0900 Subject: [PATCH 3/9] Revert "Merge branch 'fix/lapis_object1009_metadata' into dev/lapis_artifact1307" This reverts commit 3154dfb05ebd1dc5583fd5ccc21c6f1385a0c904, reversing changes made to cb0e2fd2614b36e5b6d93deccbb51cf9d6fa33ed. --- .../1009.arrow/hit_entity/from_non-player/as_target.mcfunction | 1 - .../1009.arrow/hit_entity/from_player/as_target.mcfunction | 3 --- .../data/asset/functions/object/1009.arrow/register.mcfunction | 1 - 3 files changed, 5 deletions(-) diff --git a/Asset/data/asset/functions/object/1009.arrow/hit_entity/from_non-player/as_target.mcfunction b/Asset/data/asset/functions/object/1009.arrow/hit_entity/from_non-player/as_target.mcfunction index aa625c5493..e59ef5b2c3 100644 --- a/Asset/data/asset/functions/object/1009.arrow/hit_entity/from_non-player/as_target.mcfunction +++ b/Asset/data/asset/functions/object/1009.arrow/hit_entity/from_non-player/as_target.mcfunction @@ -14,7 +14,6 @@ data modify storage api: Argument.Damage set from storage asset:context this.Damage data modify storage api: Argument.AttackType set from storage asset:context this.AttackType data modify storage api: Argument.ElementType set from storage asset:context this.ElementType - execute if data storage asset:context this.Metadata run data modify storage api: Argument.Metadata set from storage asset:context this.Metadata # execute if data storage asset:context this.AdditionalMPHeal run data modify storage api: Argument.AdditionalMPHeal set from storage asset:context this.AdditionalMPHeal # modifier をかける data modify storage api: Argument.MobUUID set from storage asset:context this.MobUUID diff --git a/Asset/data/asset/functions/object/1009.arrow/hit_entity/from_player/as_target.mcfunction b/Asset/data/asset/functions/object/1009.arrow/hit_entity/from_player/as_target.mcfunction index 887e31360f..45cf9e608e 100644 --- a/Asset/data/asset/functions/object/1009.arrow/hit_entity/from_player/as_target.mcfunction +++ b/Asset/data/asset/functions/object/1009.arrow/hit_entity/from_player/as_target.mcfunction @@ -9,8 +9,6 @@ #declare score_holder $UserID #declare tag 1009.Player -tellraw @a {"storage":"asset:context","nbt":"this"} - # プレイヤー特定 execute store result score $UserID Temporary run data get storage asset:context this.UserID execute as @a if score @s UserID = $UserID Temporary run tag @s add 1009.Player @@ -21,7 +19,6 @@ tellraw @a {"storage":"asset:context","nbt":"this"} data modify storage api: Argument.Damage set from storage asset:context this.Damage data modify storage api: Argument.AttackType set from storage asset:context this.AttackType data modify storage api: Argument.ElementType set from storage asset:context this.ElementType - execute if data storage asset:context this.Metadata run data modify storage api: Argument.Metadata set from storage asset:context this.Metadata execute if data storage asset:context this.AdditionalMPHeal run data modify storage api: Argument.AdditionalMPHeal set from storage asset:context this.AdditionalMPHeal # modifier をかける execute as @a[tag=1009.Player] run function api:damage/modifier diff --git a/Asset/data/asset/functions/object/1009.arrow/register.mcfunction b/Asset/data/asset/functions/object/1009.arrow/register.mcfunction index b841828ed5..f589fccdb0 100644 --- a/Asset/data/asset/functions/object/1009.arrow/register.mcfunction +++ b/Asset/data/asset/functions/object/1009.arrow/register.mcfunction @@ -24,7 +24,6 @@ data modify storage asset:object Field.Damage set value 1 data modify storage asset:object Field.AttackType set value "Physical" data modify storage asset:object Field.ElementType set value "None" - # data modify storage asset:object Field.Metadata set value # data modify storage asset:object Field.AdditionalMPHeal set value # data modify storage asset:object Field.UserID set value # data modify storage asset:object Field.MobUUID set value From b94f92f2107165ac2e45d7c20263bf7d6057c5cf Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Wed, 15 Jul 2026 15:30:26 +0900 Subject: [PATCH 4/9] =?UTF-8?q?=E6=9B=B2=E5=B0=84=E5=A4=A7=E4=BD=93?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1307.yumeori/trigger/3.main.mcfunction | 5 ++ .../trigger/curved_shot.mcfunction | 40 ++++++++++ .../trigger/neutral_arrow.mcfunction | 11 ++- .../0379.yumeori_count/_/register.mcfunction | 7 ++ .../0379.yumeori_count/register.mcfunction | 39 +++++++++ .../_/register.mcfunction | 7 ++ .../0380.yumeori_falling/register.mcfunction | 39 +++++++++ .../1176.arrow_of_yumeori/pre_hit/.mcfunction | 21 +++++ .../pre_hit/add_count.mcfunction | 11 +++ .../pre_hit/give_buff.mcfunction | 16 ++++ .../1176.arrow_of_yumeori/register.mcfunction | 2 +- .../detect_hit_entity/.mcfunction | 7 ++ .../range_over/.mcfunction | 18 +++++ .../register.mcfunction | 20 +++++ .../init/.mcfunction | 8 ++ .../register.mcfunction | 22 +++++ .../summon/.mcfunction | 8 ++ .../tick/.mcfunction | 13 +++ .../tick/set_pos/0.mcfunction | 17 ++++ .../tick/set_pos/1.set_y.m.mcfunction | 10 +++ .../tick/set_pos/2.select_target.mcfunction | 17 ++++ .../tick/set_pos/3.spread_pos.mcfunction | 22 +++++ .../set_pos/4.align_to_ground/.mcfunction | 9 +++ .../4.align_to_ground/recursive.mcfunction | 19 +++++ .../tick/set_pos/first/m.mcfunction | 8 ++ .../set_pos/first/select_target.mcfunction | 21 +++++ .../tick/summon.mcfunction | 13 +++ .../init/.mcfunction | 15 ++++ .../register.mcfunction | 21 +++++ .../summon/.mcfunction | 8 ++ .../tick/.mcfunction | 11 +++ .../tick/align_to_ground.mcfunction | 19 +++++ .../tick/attack.mcfunction | 33 ++++++++ .../tick/vfx.mcfunction | 80 +++++++++++++++++++ .../alias/1177/detect_hit_entity.mcfunction | 8 ++ .../object/alias/1177/range_over.mcfunction | 8 ++ .../object/alias/1177/register.mcfunction | 8 ++ .../object/alias/1178/init.mcfunction | 8 ++ .../object/alias/1178/register.mcfunction | 8 ++ .../object/alias/1178/summon.mcfunction | 8 ++ .../object/alias/1178/tick.mcfunction | 8 ++ .../object/alias/1179/init.mcfunction | 8 ++ .../object/alias/1179/register.mcfunction | 8 ++ .../object/alias/1179/summon.mcfunction | 8 ++ .../object/alias/1179/tick.mcfunction | 8 ++ .../asset/tags/functions/effect/register.json | 4 +- 46 files changed, 706 insertions(+), 3 deletions(-) create mode 100644 Asset/data/asset/functions/artifact/1307.yumeori/trigger/curved_shot.mcfunction create mode 100644 Asset/data/asset/functions/effect/0379.yumeori_count/_/register.mcfunction create mode 100644 Asset/data/asset/functions/effect/0379.yumeori_count/register.mcfunction create mode 100644 Asset/data/asset/functions/effect/0380.yumeori_falling/_/register.mcfunction create mode 100644 Asset/data/asset/functions/effect/0380.yumeori_falling/register.mcfunction create mode 100644 Asset/data/asset/functions/object/1176.arrow_of_yumeori/pre_hit/add_count.mcfunction create mode 100644 Asset/data/asset/functions/object/1176.arrow_of_yumeori/pre_hit/give_buff.mcfunction create mode 100644 Asset/data/asset/functions/object/1177.arrow_of_yumeori_upper/detect_hit_entity/.mcfunction create mode 100644 Asset/data/asset/functions/object/1177.arrow_of_yumeori_upper/range_over/.mcfunction create mode 100644 Asset/data/asset/functions/object/1177.arrow_of_yumeori_upper/register.mcfunction create mode 100644 Asset/data/asset/functions/object/1178.yumeori_falling_arrow_manager/init/.mcfunction create mode 100644 Asset/data/asset/functions/object/1178.yumeori_falling_arrow_manager/register.mcfunction create mode 100644 Asset/data/asset/functions/object/1178.yumeori_falling_arrow_manager/summon/.mcfunction create mode 100644 Asset/data/asset/functions/object/1178.yumeori_falling_arrow_manager/tick/.mcfunction create mode 100644 Asset/data/asset/functions/object/1178.yumeori_falling_arrow_manager/tick/set_pos/0.mcfunction create mode 100644 Asset/data/asset/functions/object/1178.yumeori_falling_arrow_manager/tick/set_pos/1.set_y.m.mcfunction create mode 100644 Asset/data/asset/functions/object/1178.yumeori_falling_arrow_manager/tick/set_pos/2.select_target.mcfunction create mode 100644 Asset/data/asset/functions/object/1178.yumeori_falling_arrow_manager/tick/set_pos/3.spread_pos.mcfunction create mode 100644 Asset/data/asset/functions/object/1178.yumeori_falling_arrow_manager/tick/set_pos/4.align_to_ground/.mcfunction create mode 100644 Asset/data/asset/functions/object/1178.yumeori_falling_arrow_manager/tick/set_pos/4.align_to_ground/recursive.mcfunction create mode 100644 Asset/data/asset/functions/object/1178.yumeori_falling_arrow_manager/tick/set_pos/first/m.mcfunction create mode 100644 Asset/data/asset/functions/object/1178.yumeori_falling_arrow_manager/tick/set_pos/first/select_target.mcfunction create mode 100644 Asset/data/asset/functions/object/1178.yumeori_falling_arrow_manager/tick/summon.mcfunction create mode 100644 Asset/data/asset/functions/object/1179.yumeori_falling_arrow/init/.mcfunction create mode 100644 Asset/data/asset/functions/object/1179.yumeori_falling_arrow/register.mcfunction create mode 100644 Asset/data/asset/functions/object/1179.yumeori_falling_arrow/summon/.mcfunction create mode 100644 Asset/data/asset/functions/object/1179.yumeori_falling_arrow/tick/.mcfunction create mode 100644 Asset/data/asset/functions/object/1179.yumeori_falling_arrow/tick/align_to_ground.mcfunction create mode 100644 Asset/data/asset/functions/object/1179.yumeori_falling_arrow/tick/attack.mcfunction create mode 100644 Asset/data/asset/functions/object/1179.yumeori_falling_arrow/tick/vfx.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1177/detect_hit_entity.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1177/range_over.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1177/register.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1178/init.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1178/register.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1178/summon.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1178/tick.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1179/init.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1179/register.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1179/summon.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1179/tick.mcfunction diff --git a/Asset/data/asset/functions/artifact/1307.yumeori/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1307.yumeori/trigger/3.main.mcfunction index e5c613dd80..6d7c619fa7 100644 --- a/Asset/data/asset/functions/artifact/1307.yumeori/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1307.yumeori/trigger/3.main.mcfunction @@ -14,5 +14,10 @@ playsound item.trident.riptide_1 player @a ~ ~ ~ 1 1.8 # particle flash ~ ~ ~ 0 0 0 0 1 +# 曲射用バフがあるかつ、上を向いているなら曲射 + data modify storage api: Argument.ID set value 380 + function api:entity/mob/effect/get/from_id + execute if data storage api: Return.Effect if entity @s[x_rotation=-90..-35] run return run function asset:artifact/1307.yumeori/trigger/curved_shot + # 何もなければ普通の矢を発射 function asset:artifact/1307.yumeori/trigger/neutral_arrow diff --git a/Asset/data/asset/functions/artifact/1307.yumeori/trigger/curved_shot.mcfunction b/Asset/data/asset/functions/artifact/1307.yumeori/trigger/curved_shot.mcfunction new file mode 100644 index 0000000000..da229afd90 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1307.yumeori/trigger/curved_shot.mcfunction @@ -0,0 +1,40 @@ +#> asset:artifact/1307.yumeori/trigger/curved_shot +# +# +# +# @within function asset:artifact/1307.yumeori/trigger/3.main + +# バフを消費 + data modify storage api: Argument.ID set value 380 + function api:entity/mob/effect/remove/from_id + function api:entity/mob/effect/reset + +# 曲射の仕様メモ +# 上向きに発射された矢が射程限界で消えると、曲射が発動し、周囲の敵に矢を降らす +# つまり、途中でブロックに当たると不発する +# ただし、上向きの矢はentityに対してはヒット判定がない + +# 曲射のデータ設定 + # 1発辺りのダメージ + data modify storage api: Argument.FieldOverride.Damage set value 100 + # 本数 + data modify storage api: Argument.FieldOverride.Count set value 6 + # ディレイ + data modify storage api: Argument.FieldOverride.Delay set value 20 + + # 射程 + data modify storage api: Argument.FieldOverride.Range set value 50 + # 弾速 + data modify storage api: Argument.FieldOverride.Speed set value 8 + + # 座標も入力しておく + function api:data_get/pos + data modify storage api: Argument.FieldOverride.Pos.X set from storage api: Pos[0] + data modify storage api: Argument.FieldOverride.Pos.Y set from storage api: Pos[1] + data modify storage api: Argument.FieldOverride.Pos.Z set from storage api: Pos[2] + +# 召喚 + data modify storage api: Argument.ID set value 1177 + execute store result storage api: Argument.FieldOverride.UserID int 1 run scoreboard players get @s UserID + data modify storage api: Argument.FieldOverride.AdditionalMPHeal set from storage api: PersistentArgument.AdditionalMPHeal + execute anchored eyes positioned ^ ^ ^ run function api:object/summon diff --git a/Asset/data/asset/functions/artifact/1307.yumeori/trigger/neutral_arrow.mcfunction b/Asset/data/asset/functions/artifact/1307.yumeori/trigger/neutral_arrow.mcfunction index 3f73a4f75b..ca4fc25717 100644 --- a/Asset/data/asset/functions/artifact/1307.yumeori/trigger/neutral_arrow.mcfunction +++ b/Asset/data/asset/functions/artifact/1307.yumeori/trigger/neutral_arrow.mcfunction @@ -6,11 +6,20 @@ # 矢を召喚する # ダメージ - data modify storage api: Argument.FieldOverride.Damage set value 800 + data modify storage api: Argument.FieldOverride.Damage set value 200 # 射程 data modify storage api: Argument.FieldOverride.Range set value 50 # 弾速 data modify storage api: Argument.FieldOverride.Speed set value 8 + + # 連続ヒットの猶予 + data modify storage api: Argument.FieldOverride.Effect.Count.Duration set value 80 + # 曲射するためには何連続のヒットが必要か？ + data modify storage api: Argument.FieldOverride.Effect.Count.MaxStack set value 3 + + # 曲射バフの効果時間 + data modify storage api: Argument.FieldOverride.Effect.CurveShot.Duration set value 200 + # 召喚 data modify storage api: Argument.ID set value 1176 execute store result storage api: Argument.FieldOverride.UserID int 1 run scoreboard players get @s UserID diff --git a/Asset/data/asset/functions/effect/0379.yumeori_count/_/register.mcfunction b/Asset/data/asset/functions/effect/0379.yumeori_count/_/register.mcfunction new file mode 100644 index 0000000000..b600eca597 --- /dev/null +++ b/Asset/data/asset/functions/effect/0379.yumeori_count/_/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0379.yumeori_count/_/register +# +# +# +# @within tag/function asset:effect/register + +execute if data storage asset:context {id:379} run function asset:effect/0379.yumeori_count/register \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0379.yumeori_count/register.mcfunction b/Asset/data/asset/functions/effect/0379.yumeori_count/register.mcfunction new file mode 100644 index 0000000000..d6c6d4aeed --- /dev/null +++ b/Asset/data/asset/functions/effect/0379.yumeori_count/register.mcfunction @@ -0,0 +1,39 @@ +#> asset:effect/0379.yumeori_count/register +# +# Effectのデータを指定 +# +# @within function asset:effect/0379.yumeori_count/_/register + +# ExtendsSafe (boolean) (default = false) + # data modify storage asset:effect ExtendsSafe set value true +# ID (int) + data modify storage asset:effect ID set value 379 +# 名前 (TextComponentString) + data modify storage asset:effect Name set value '{"text":"夢織・計測"}' +# 説明文 (TextComponentString[]) + data modify storage asset:effect Description set value [] +# 効果時間 (int) (default = API || error) + # data modify storage asset:effect Duration set value +# スタック (int) (default = API || 1) + # data modify storage asset:effect Stack set value +# 効果時間の操作方法 (default = API || "replace") + # data modify storage asset:effect DurationOperation set value +# スタックの操作方法 (default = API || "replace") + data modify storage asset:effect StackOperation set value "add" +# 最大効果時間 (int) (default = 2147483647) + # data modify storage asset:effect MaxDuration set value +# 最大スタック (int) (default = 2147483647) + # data modify storage asset:effect MaxStack set value +# 悪い効果か否か (boolean) + data modify storage asset:effect IsBadEffect set value false +# 死亡時のエフェクトの処理 (default = "remove") + # data modify storage asset:effect ProcessOnDied set value +# 消すのに必要なレベル (int) (default = 1) + data modify storage asset:effect RequireClearLv set value 3 +# エフェクトをUIに表示するか (boolean) (default = true) + data modify storage asset:effect Visible set value false +# エフェクトのスタックををUIに表示するか (boolean) (default = true) + # data modify storage asset:effect StackVisible set value + +# フィールド + # data modify storage asset:effect Field set value {} diff --git a/Asset/data/asset/functions/effect/0380.yumeori_falling/_/register.mcfunction b/Asset/data/asset/functions/effect/0380.yumeori_falling/_/register.mcfunction new file mode 100644 index 0000000000..b1e63d8026 --- /dev/null +++ b/Asset/data/asset/functions/effect/0380.yumeori_falling/_/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0380.yumeori_falling/_/register +# +# +# +# @within tag/function asset:effect/register + +execute if data storage asset:context {id:380} run function asset:effect/0380.yumeori_falling/register \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0380.yumeori_falling/register.mcfunction b/Asset/data/asset/functions/effect/0380.yumeori_falling/register.mcfunction new file mode 100644 index 0000000000..0e61bb6430 --- /dev/null +++ b/Asset/data/asset/functions/effect/0380.yumeori_falling/register.mcfunction @@ -0,0 +1,39 @@ +#> asset:effect/0380.yumeori_falling/register +# +# Effectのデータを指定 +# +# @within function asset:effect/0380.yumeori_falling/_/register + +# ExtendsSafe (boolean) (default = false) + # data modify storage asset:effect ExtendsSafe set value true +# ID (int) + data modify storage asset:effect ID set value 380 +# 名前 (TextComponentString) + data modify storage asset:effect Name set value '{"text":"降り注ぐ夢糸","color":"#91f9ab"}' +# 説明文 (TextComponentString[]) + data modify storage asset:effect Description set value ['{"text":"極光弓 夢織の曲射が使用可能になる","color":"white"}'] +# 効果時間 (int) (default = API || error) + # data modify storage asset:effect Duration set value +# スタック (int) (default = API || 1) + # data modify storage asset:effect Stack set value +# 効果時間の操作方法 (default = API || "replace") + # data modify storage asset:effect DurationOperation set value +# スタックの操作方法 (default = API || "replace") + # data modify storage asset:effect StackOperation set value +# 最大効果時間 (int) (default = 2147483647) + # data modify storage asset:effect MaxDuration set value +# 最大スタック (int) (default = 2147483647) + data modify storage asset:effect MaxStack set value 1 +# 悪い効果か否か (boolean) + data modify storage asset:effect IsBadEffect set value false +# 死亡時のエフェクトの処理 (default = "remove") + # data modify storage asset:effect ProcessOnDied set value +# 消すのに必要なレベル (int) (default = 1) + data modify storage asset:effect RequireClearLv set value 3 +# エフェクトをUIに表示するか (boolean) (default = true) + # data modify storage asset:effect Visible set value +# エフェクトのスタックををUIに表示するか (boolean) (default = true) + data modify storage asset:effect StackVisible set value false + +# フィールド + # data modify storage asset:effect Field set value {} diff --git a/Asset/data/asset/functions/object/1176.arrow_of_yumeori/pre_hit/.mcfunction b/Asset/data/asset/functions/object/1176.arrow_of_yumeori/pre_hit/.mcfunction index 39a8bc90fd..2ac8fc7eb8 100644 --- a/Asset/data/asset/functions/object/1176.arrow_of_yumeori/pre_hit/.mcfunction +++ b/Asset/data/asset/functions/object/1176.arrow_of_yumeori/pre_hit/.mcfunction @@ -3,3 +3,24 @@ # 継承先などから実行される処理 # # @within asset:object/alias/1176/pre_hit + +#> 継承元のtag +# @private + #declare tag 1009.Player + +# カウント用のエフェクトのスタックをチェック + data modify storage api: Argument.ID set value 379 + execute as @a[tag=1009.Player] run function api:entity/mob/effect/get/from_id + +# (Stack + 1 = MaxStack)か？ + execute store result storage api: Return.Effect.Stack int -1 run data get storage api: Return.Effect.Stack -1.0000000001 + execute store result storage asset:temp Success byte 1 run data modify storage api: Return.Effect.Stack set from storage asset:context this.Effect.Count.MaxStack + +# 最大値なら曲射ができるようになるバフを付与 + execute if data storage asset:temp {Success:0b} as @a[tag=1009.Player] run function asset:object/1176.arrow_of_yumeori/pre_hit/give_buff + +# 最大値でないならカウント+1 + execute if data storage asset:temp {Success:1b} as @a[tag=1009.Player] run function asset:object/1176.arrow_of_yumeori/pre_hit/add_count + +# リセット + data remove storage asset:temp Success diff --git a/Asset/data/asset/functions/object/1176.arrow_of_yumeori/pre_hit/add_count.mcfunction b/Asset/data/asset/functions/object/1176.arrow_of_yumeori/pre_hit/add_count.mcfunction new file mode 100644 index 0000000000..da6ebb0a87 --- /dev/null +++ b/Asset/data/asset/functions/object/1176.arrow_of_yumeori/pre_hit/add_count.mcfunction @@ -0,0 +1,11 @@ +#> asset:object/1176.arrow_of_yumeori/pre_hit/add_count +# +# +# +# @within function asset:object/1176.arrow_of_yumeori/pre_hit/ + +# カウント用のバフを付与 + data modify storage api: Argument.ID set value 379 + data modify storage api: Argument.Duration set from storage asset:context this.Effect.Count.Duration + function api:entity/mob/effect/give + function api:entity/mob/effect/reset diff --git a/Asset/data/asset/functions/object/1176.arrow_of_yumeori/pre_hit/give_buff.mcfunction b/Asset/data/asset/functions/object/1176.arrow_of_yumeori/pre_hit/give_buff.mcfunction new file mode 100644 index 0000000000..bbb73f47a8 --- /dev/null +++ b/Asset/data/asset/functions/object/1176.arrow_of_yumeori/pre_hit/give_buff.mcfunction @@ -0,0 +1,16 @@ +#> asset:object/1176.arrow_of_yumeori/pre_hit/give_buff +# +# +# +# @within function asset:object/1176.arrow_of_yumeori/pre_hit/ + +# 曲射用のバフを付与 + data modify storage api: Argument.ID set value 380 + data modify storage api: Argument.Duration set from storage asset:context this.Effect.CurveShot.Duration + function api:entity/mob/effect/give + function api:entity/mob/effect/reset + +# カウント用バフを削除 + data modify storage api: Argument.ID set value 379 + function api:entity/mob/effect/remove/from_id + function api:entity/mob/effect/reset diff --git a/Asset/data/asset/functions/object/1176.arrow_of_yumeori/register.mcfunction b/Asset/data/asset/functions/object/1176.arrow_of_yumeori/register.mcfunction index 14ceabe2e1..bc89b6a480 100644 --- a/Asset/data/asset/functions/object/1176.arrow_of_yumeori/register.mcfunction +++ b/Asset/data/asset/functions/object/1176.arrow_of_yumeori/register.mcfunction @@ -8,7 +8,7 @@ data modify storage asset:object Extends append value 1009 function asset:object/extends # 他のObjectに継承されることを許可するか (boolean) (オプション) - # data modify storage asset:object ExtendsSafe set value + data modify storage asset:object ExtendsSafe set value true # 継承されることを前提とした、抽象的なObjectであるかどうか(boolean) data modify storage asset:object IsAbstract set value false # Tickするかどうか(boolean) (オプション) diff --git a/Asset/data/asset/functions/object/1177.arrow_of_yumeori_upper/detect_hit_entity/.mcfunction b/Asset/data/asset/functions/object/1177.arrow_of_yumeori_upper/detect_hit_entity/.mcfunction new file mode 100644 index 0000000000..b09d2a999c --- /dev/null +++ b/Asset/data/asset/functions/object/1177.arrow_of_yumeori_upper/detect_hit_entity/.mcfunction @@ -0,0 +1,7 @@ +#> asset:object/1177.arrow_of_yumeori_upper/detect_hit_entity/ +# +# 継承先などから実行される処理 +# +# @within asset:object/alias/1177/detect_hit_entity + +# entityに対するヒット判定を消すために何もしない diff --git a/Asset/data/asset/functions/object/1177.arrow_of_yumeori_upper/range_over/.mcfunction b/Asset/data/asset/functions/object/1177.arrow_of_yumeori_upper/range_over/.mcfunction new file mode 100644 index 0000000000..e0ca1018d1 --- /dev/null +++ b/Asset/data/asset/functions/object/1177.arrow_of_yumeori_upper/range_over/.mcfunction @@ -0,0 +1,18 @@ +#> asset:object/1177.arrow_of_yumeori_upper/range_over/ +# +# 継承先などから実行される処理 +# +# @within asset:object/alias/1177/range_over + +# 消滅 + function asset:object/call.m {method:"kill"} + +# 矢を降らす用のentityを召喚 + data modify storage api: Argument.ID set value 1178 + data modify storage api: Argument.FieldOverride.Damage set from storage asset:context this.Damage + data modify storage api: Argument.FieldOverride.AdditionalMPHeal set from storage asset:context this.AdditionalMPHeal + data modify storage api: Argument.FieldOverride.UserID set from storage asset:context this.UserID + data modify storage api: Argument.FieldOverride.Count set from storage asset:context this.Count + data modify storage api: Argument.FieldOverride.Delay set from storage asset:context this.Delay + data modify storage api: Argument.FieldOverride.Pos set from storage asset:context this.Pos + function api:object/summon diff --git a/Asset/data/asset/functions/object/1177.arrow_of_yumeori_upper/register.mcfunction b/Asset/data/asset/functions/object/1177.arrow_of_yumeori_upper/register.mcfunction new file mode 100644 index 0000000000..4e3dee136b --- /dev/null +++ b/Asset/data/asset/functions/object/1177.arrow_of_yumeori_upper/register.mcfunction @@ -0,0 +1,20 @@ +#> asset:object/1177.arrow_of_yumeori_upper/register +# +# Objectのデータを指定 +# +# @within function asset:object/alias/1177/register + +# 継承(オプション) + data modify storage asset:object Extends append value 1176 + 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 1177 +# フィールド(オプション) + # data modify storage asset:object Field.myValue set value diff --git a/Asset/data/asset/functions/object/1178.yumeori_falling_arrow_manager/init/.mcfunction b/Asset/data/asset/functions/object/1178.yumeori_falling_arrow_manager/init/.mcfunction new file mode 100644 index 0000000000..c7e43d93c1 --- /dev/null +++ b/Asset/data/asset/functions/object/1178.yumeori_falling_arrow_manager/init/.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/1178.yumeori_falling_arrow_manager/init/ +# +# Objectのinit時の処理 +# +# @within asset:object/alias/1178/init + +# 向き調整 + tp @s ~ ~ ~ ~ ~ diff --git a/Asset/data/asset/functions/object/1178.yumeori_falling_arrow_manager/register.mcfunction b/Asset/data/asset/functions/object/1178.yumeori_falling_arrow_manager/register.mcfunction new file mode 100644 index 0000000000..cabc0587a0 --- /dev/null +++ b/Asset/data/asset/functions/object/1178.yumeori_falling_arrow_manager/register.mcfunction @@ -0,0 +1,22 @@ +#> asset:object/1178.yumeori_falling_arrow_manager/register +# +# Objectのデータを指定 +# +# @within function asset:object/alias/1178/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 1178 +# フィールド(オプション) + data modify storage asset:object Field.Interval._ set value 2 + data modify storage asset:object Field.Interval.Max set value 2 + data modify storage asset:object Field.FirstShot set value true diff --git a/Asset/data/asset/functions/object/1178.yumeori_falling_arrow_manager/summon/.mcfunction b/Asset/data/asset/functions/object/1178.yumeori_falling_arrow_manager/summon/.mcfunction new file mode 100644 index 0000000000..9f6dd4d3c5 --- /dev/null +++ b/Asset/data/asset/functions/object/1178.yumeori_falling_arrow_manager/summon/.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/1178.yumeori_falling_arrow_manager/summon/ +# +# Object召喚処理の呼び出し時に実行されるfunction +# +# @within asset:object/alias/1178/summon + +# 元となるEntityを召喚する + summon marker ~ ~ ~ {Tags:["ObjectInit"]} diff --git a/Asset/data/asset/functions/object/1178.yumeori_falling_arrow_manager/tick/.mcfunction b/Asset/data/asset/functions/object/1178.yumeori_falling_arrow_manager/tick/.mcfunction new file mode 100644 index 0000000000..33e1926415 --- /dev/null +++ b/Asset/data/asset/functions/object/1178.yumeori_falling_arrow_manager/tick/.mcfunction @@ -0,0 +1,13 @@ +#> asset:object/1178.yumeori_falling_arrow_manager/tick/ +# +# Objectのtick時の処理 +# +# @within asset:object/alias/1178/tick + +# 攻撃間隔 + execute store result storage asset:context this.Interval._ int 0.9999999999 run data get storage asset:context this.Interval._ + execute if data storage asset:context this.Interval{_:0} run function asset:object/1178.yumeori_falling_arrow_manager/tick/set_pos/0 + execute if data storage asset:context this.Interval{_:0} run data modify storage asset:context this.Interval._ set from storage asset:context this.Interval.Max + +# 0なら消える + execute if data storage asset:context this{Count:0} run kill @s diff --git a/Asset/data/asset/functions/object/1178.yumeori_falling_arrow_manager/tick/set_pos/0.mcfunction b/Asset/data/asset/functions/object/1178.yumeori_falling_arrow_manager/tick/set_pos/0.mcfunction new file mode 100644 index 0000000000..19dae6f865 --- /dev/null +++ b/Asset/data/asset/functions/object/1178.yumeori_falling_arrow_manager/tick/set_pos/0.mcfunction @@ -0,0 +1,17 @@ +#> asset:object/1178.yumeori_falling_arrow_manager/tick/set_pos/0 +# +# +# +# @within function asset:object/1178.yumeori_falling_arrow_manager/tick/ + +# デクリメント + execute store result storage asset:context this.Count int 0.9999999999 run data get storage asset:context this.Count + + # tellraw @a {"storage":"asset:context","nbt":"this"} + +# 1発目に限り、前方の敵を優先する + execute if data storage asset:context this{FirstShot:true} run function asset:object/1178.yumeori_falling_arrow_manager/tick/set_pos/first/m with storage asset:context this.Pos + execute if data storage asset:context this{FirstShot:true} run return run data modify storage asset:context this.FirstShot set value false + +# 範囲内のランダムな敵の位置で攻撃 + function asset:object/1178.yumeori_falling_arrow_manager/tick/set_pos/1.set_y.m with storage asset:context this.Pos diff --git a/Asset/data/asset/functions/object/1178.yumeori_falling_arrow_manager/tick/set_pos/1.set_y.m.mcfunction b/Asset/data/asset/functions/object/1178.yumeori_falling_arrow_manager/tick/set_pos/1.set_y.m.mcfunction new file mode 100644 index 0000000000..cddd5830f0 --- /dev/null +++ b/Asset/data/asset/functions/object/1178.yumeori_falling_arrow_manager/tick/set_pos/1.set_y.m.mcfunction @@ -0,0 +1,10 @@ +#> asset:object/1178.yumeori_falling_arrow_manager/tick/set_pos/1.set_y.m +# +# +# +# @within function +# asset:object/1178.yumeori_falling_arrow_manager/tick/set_pos/0 +# asset:object/1178.yumeori_falling_arrow_manager/tick/set_pos/first/select_target + +# 使用地点のy座標周辺でターゲットを選択する + $execute positioned ~ $(Y) ~ run function asset:object/1178.yumeori_falling_arrow_manager/tick/set_pos/2.select_target diff --git a/Asset/data/asset/functions/object/1178.yumeori_falling_arrow_manager/tick/set_pos/2.select_target.mcfunction b/Asset/data/asset/functions/object/1178.yumeori_falling_arrow_manager/tick/set_pos/2.select_target.mcfunction new file mode 100644 index 0000000000..d97db79716 --- /dev/null +++ b/Asset/data/asset/functions/object/1178.yumeori_falling_arrow_manager/tick/set_pos/2.select_target.mcfunction @@ -0,0 +1,17 @@ +#> asset:object/1178.yumeori_falling_arrow_manager/tick/set_pos/2.select_target +# +# +# +# @within function asset:object/1178.yumeori_falling_arrow_manager/tick/set_pos/1.set_y.m + +# 円柱範囲内からランダムな敵1体を選ぶ + data modify storage lib: Argument.BoundingCylinder.Radius set value 8.0d + data modify storage lib: Argument.BoundingCylinder.Height set value 16.25d + data modify storage lib: Argument.BoundingCylinder.Selector set value "@e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..16]" + execute positioned ~ ~-8.25 ~ run function lib:bounding_cylinder/ + +# + execute at @e[type=#lib:living_without_player,tag=BoundingCylinder,distance=..16,sort=random,limit=1] run function asset:object/1178.yumeori_falling_arrow_manager/tick/set_pos/3.spread_pos + +# リセット + tag @e[type=#lib:living_without_player,tag=BoundingCylinder,distance=..16] remove BoundingCylinder diff --git a/Asset/data/asset/functions/object/1178.yumeori_falling_arrow_manager/tick/set_pos/3.spread_pos.mcfunction b/Asset/data/asset/functions/object/1178.yumeori_falling_arrow_manager/tick/set_pos/3.spread_pos.mcfunction new file mode 100644 index 0000000000..e34aeb0433 --- /dev/null +++ b/Asset/data/asset/functions/object/1178.yumeori_falling_arrow_manager/tick/set_pos/3.spread_pos.mcfunction @@ -0,0 +1,22 @@ +#> asset:object/1178.yumeori_falling_arrow_manager/tick/set_pos/3.spread_pos +# +# +# +# @within function +# asset:object/1178.yumeori_falling_arrow_manager/tick/set_pos/2.select_target +# asset:object/1178.yumeori_falling_arrow_manager/tick/set_pos/first/select_target + +#> Private +# @private + #declare tag SpreadMarker + +# 拡散 + summon marker ~ ~ ~ {Tags:["SpreadMarker"]} + data modify storage lib: Argument.Bounds set value [[1.5d,1.5d],[0d,0d],[1.5d,1.5d]] + execute as @e[type=marker,tag=SpreadMarker,distance=..0.01] run function lib:spread_entity/ + +# マーカーの位置で出来る限り地面に近づける + execute at @e[type=marker,tag=SpreadMarker,distance=..10] run function asset:object/1178.yumeori_falling_arrow_manager/tick/set_pos/4.align_to_ground/ + +# リセット + kill @e[type=marker,tag=SpreadMarker,distance=..10] diff --git a/Asset/data/asset/functions/object/1178.yumeori_falling_arrow_manager/tick/set_pos/4.align_to_ground/.mcfunction b/Asset/data/asset/functions/object/1178.yumeori_falling_arrow_manager/tick/set_pos/4.align_to_ground/.mcfunction new file mode 100644 index 0000000000..753183cdd8 --- /dev/null +++ b/Asset/data/asset/functions/object/1178.yumeori_falling_arrow_manager/tick/set_pos/4.align_to_ground/.mcfunction @@ -0,0 +1,9 @@ +#> asset:object/1178.yumeori_falling_arrow_manager/tick/set_pos/4.align_to_ground/ +# +# +# +# @within function asset:object/1178.yumeori_falling_arrow_manager/tick/set_pos/3.spread_pos + +# + data modify storage asset:temp RecursiveLimit set value 10 + function asset:object/1178.yumeori_falling_arrow_manager/tick/set_pos/4.align_to_ground/recursive diff --git a/Asset/data/asset/functions/object/1178.yumeori_falling_arrow_manager/tick/set_pos/4.align_to_ground/recursive.mcfunction b/Asset/data/asset/functions/object/1178.yumeori_falling_arrow_manager/tick/set_pos/4.align_to_ground/recursive.mcfunction new file mode 100644 index 0000000000..f50044f256 --- /dev/null +++ b/Asset/data/asset/functions/object/1178.yumeori_falling_arrow_manager/tick/set_pos/4.align_to_ground/recursive.mcfunction @@ -0,0 +1,19 @@ +#> asset:object/1178.yumeori_falling_arrow_manager/tick/set_pos/4.align_to_ground/recursive +# +# +# +# @within function +# asset:object/1178.yumeori_falling_arrow_manager/tick/set_pos/4.align_to_ground/ +# asset:object/1178.yumeori_falling_arrow_manager/tick/set_pos/4.align_to_ground/recursive + +# デクリメント + execute store result storage asset:temp RecursiveLimit int 0.9999999999 run data get storage asset:temp RecursiveLimit + +# 各条件を満たした際、攻撃してreturnする + # 再帰上限 + execute if data storage asset:temp {RecursiveLimit:0} run return run function asset:object/1178.yumeori_falling_arrow_manager/tick/summon + # ブロックに接触 + execute unless block ~ ~-0.5 ~ #lib:no_collision/without_fluid run return run function asset:object/1178.yumeori_falling_arrow_manager/tick/summon + +# 再帰 + execute positioned ~ ~-0.5 ~ run function asset:object/1178.yumeori_falling_arrow_manager/tick/set_pos/4.align_to_ground/recursive diff --git a/Asset/data/asset/functions/object/1178.yumeori_falling_arrow_manager/tick/set_pos/first/m.mcfunction b/Asset/data/asset/functions/object/1178.yumeori_falling_arrow_manager/tick/set_pos/first/m.mcfunction new file mode 100644 index 0000000000..002091a2e0 --- /dev/null +++ b/Asset/data/asset/functions/object/1178.yumeori_falling_arrow_manager/tick/set_pos/first/m.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/1178.yumeori_falling_arrow_manager/tick/set_pos/first/m +# +# +# +# @within function asset:object/1178.yumeori_falling_arrow_manager/tick/set_pos/0 + +# 実行地点を使用時点の位置にする + $execute positioned $(X) $(Y) $(Z) run function asset:object/1178.yumeori_falling_arrow_manager/tick/set_pos/first/select_target diff --git a/Asset/data/asset/functions/object/1178.yumeori_falling_arrow_manager/tick/set_pos/first/select_target.mcfunction b/Asset/data/asset/functions/object/1178.yumeori_falling_arrow_manager/tick/set_pos/first/select_target.mcfunction new file mode 100644 index 0000000000..aa2824b1bd --- /dev/null +++ b/Asset/data/asset/functions/object/1178.yumeori_falling_arrow_manager/tick/set_pos/first/select_target.mcfunction @@ -0,0 +1,21 @@ +#> asset:object/1178.yumeori_falling_arrow_manager/tick/set_pos/first/select_target +# +# +# +# @within function asset:object/1178.yumeori_falling_arrow_manager/tick/set_pos/m + +# rotatableDXYZで判定(壁貫通は考慮しない) + data modify storage lib: Args.dx set value 3 + data modify storage lib: Args.dy set value 10 + data modify storage lib: Args.dz set value 20 + data modify storage lib: Args.selector set value "@e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..16]" + execute rotated ~ 0 positioned ^ ^5 ^10 run function lib:rotatable_dxyz/m with storage lib: Args + +# DXYZのtag持ちの中で一番近い奴をターゲットにする + execute at @e[type=#lib:living_without_player,tag=DXYZ,tag=!Uninterferable,distance=..32,sort=nearest,limit=1] run function asset:object/1178.yumeori_falling_arrow_manager/tick/set_pos/3.spread_pos + +# DXYZがいなければ通常通りターゲッティングする + execute unless entity @e[type=#lib:living_without_player,tag=DXYZ,tag=!Uninterferable,distance=..32,sort=nearest,limit=1] run function asset:object/1178.yumeori_falling_arrow_manager/tick/set_pos/1.set_y.m with storage asset:context this.Pos + +# リセット + tag @e[type=#lib:living_without_player,tag=DXYZ,tag=!Uninterferable,distance=..32] remove DXYZ diff --git a/Asset/data/asset/functions/object/1178.yumeori_falling_arrow_manager/tick/summon.mcfunction b/Asset/data/asset/functions/object/1178.yumeori_falling_arrow_manager/tick/summon.mcfunction new file mode 100644 index 0000000000..1aa4c83092 --- /dev/null +++ b/Asset/data/asset/functions/object/1178.yumeori_falling_arrow_manager/tick/summon.mcfunction @@ -0,0 +1,13 @@ +#> asset:object/1178.yumeori_falling_arrow_manager/tick/summon +# +# +# +# @within function asset:object/1178.yumeori_falling_arrow_manager/tick/set_pos/4.align_to_ground/recursive + +# 攻撃用Object召喚 + data modify storage api: Argument.ID set value 1179 + data modify storage api: Argument.FieldOverride.Damage set from storage asset:context this.Damage + data modify storage api: Argument.FieldOverride.AdditionalMPHeal set from storage asset:context this.AdditionalMPHeal + data modify storage api: Argument.FieldOverride.UserID set from storage asset:context this.UserID + data modify storage api: Argument.FieldOverride.Delay set from storage asset:context this.Delay + function api:object/summon diff --git a/Asset/data/asset/functions/object/1179.yumeori_falling_arrow/init/.mcfunction b/Asset/data/asset/functions/object/1179.yumeori_falling_arrow/init/.mcfunction new file mode 100644 index 0000000000..44315718c1 --- /dev/null +++ b/Asset/data/asset/functions/object/1179.yumeori_falling_arrow/init/.mcfunction @@ -0,0 +1,15 @@ +#> asset:object/1179.yumeori_falling_arrow/init/ +# +# Objectのinit時の処理 +# +# @within asset:object/alias/1179/init + + particle electric_spark ~ ~ ~ 0 0 0 1 50 + particle firework ~ ~1 ~ 0 0 0 0 1 + particle firework ~ ~2 ~ 0 0 0 0 1 + particle firework ~ ~3 ~ 0 0 0 0 1 + particle firework ~ ~4 ~ 0 0 0 0 1 + particle firework ~ ~5 ~ 0 0 0 0 1 + particle firework ~ ~6 ~ 0 0 0 0 1 + particle firework ~ ~7 ~ 0 0 0 0 1 + playsound entity.experience_orb.pickup neutral @a ~ ~ ~ 1 2 diff --git a/Asset/data/asset/functions/object/1179.yumeori_falling_arrow/register.mcfunction b/Asset/data/asset/functions/object/1179.yumeori_falling_arrow/register.mcfunction new file mode 100644 index 0000000000..2a84c8fc6c --- /dev/null +++ b/Asset/data/asset/functions/object/1179.yumeori_falling_arrow/register.mcfunction @@ -0,0 +1,21 @@ +#> asset:object/1179.yumeori_falling_arrow/register +# +# Objectのデータを指定 +# +# @within function asset:object/alias/1179/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 1179 +# フィールド(オプション) + data modify storage asset:object Field.Delay set value 20 + data modify storage asset:object Field.RecursiveLimit set value 10 diff --git a/Asset/data/asset/functions/object/1179.yumeori_falling_arrow/summon/.mcfunction b/Asset/data/asset/functions/object/1179.yumeori_falling_arrow/summon/.mcfunction new file mode 100644 index 0000000000..45ed3509ff --- /dev/null +++ b/Asset/data/asset/functions/object/1179.yumeori_falling_arrow/summon/.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/1179.yumeori_falling_arrow/summon/ +# +# Object召喚処理の呼び出し時に実行されるfunction +# +# @within asset:object/alias/1179/summon + +# 元となるEntityを召喚する + summon marker ~ ~ ~ {Tags:["ObjectInit"]} diff --git a/Asset/data/asset/functions/object/1179.yumeori_falling_arrow/tick/.mcfunction b/Asset/data/asset/functions/object/1179.yumeori_falling_arrow/tick/.mcfunction new file mode 100644 index 0000000000..0dcf90eb75 --- /dev/null +++ b/Asset/data/asset/functions/object/1179.yumeori_falling_arrow/tick/.mcfunction @@ -0,0 +1,11 @@ +#> asset:object/1179.yumeori_falling_arrow/tick/ +# +# Objectのtick時の処理 +# +# @within asset:object/alias/1179/tick + +# ディレイ + execute store result storage asset:context this.Delay int 0.9999999999 run data get storage asset:context this.Delay + +# + execute if data storage asset:context this{Delay:0} run function asset:object/1179.yumeori_falling_arrow/tick/align_to_ground diff --git a/Asset/data/asset/functions/object/1179.yumeori_falling_arrow/tick/align_to_ground.mcfunction b/Asset/data/asset/functions/object/1179.yumeori_falling_arrow/tick/align_to_ground.mcfunction new file mode 100644 index 0000000000..9149e985f3 --- /dev/null +++ b/Asset/data/asset/functions/object/1179.yumeori_falling_arrow/tick/align_to_ground.mcfunction @@ -0,0 +1,19 @@ +#> asset:object/1179.yumeori_falling_arrow/tick/align_to_ground +# +# +# +# @within function +# asset:object/1179.yumeori_falling_arrow/tick/ +# asset:object/1179.yumeori_falling_arrow/tick/align_to_ground + +# デクリメント + execute store result storage asset:context this.RecursiveLimit int 0.9999999999 run data get storage asset:context this.RecursiveLimit + +# 各条件を満たした際、攻撃してreturnする + # 再帰上限 + execute if data storage asset:context this{RecursiveLimit:0} run return run function asset:object/1179.yumeori_falling_arrow/tick/attack + # ブロックに接触 + execute unless block ~ ~-0.5 ~ #lib:no_collision/without_fluid run return run function asset:object/1179.yumeori_falling_arrow/tick/attack + +# 再帰 + execute positioned ~ ~-0.5 ~ run function asset:object/1179.yumeori_falling_arrow/tick/align_to_ground diff --git a/Asset/data/asset/functions/object/1179.yumeori_falling_arrow/tick/attack.mcfunction b/Asset/data/asset/functions/object/1179.yumeori_falling_arrow/tick/attack.mcfunction new file mode 100644 index 0000000000..3dfb15d7ea --- /dev/null +++ b/Asset/data/asset/functions/object/1179.yumeori_falling_arrow/tick/attack.mcfunction @@ -0,0 +1,33 @@ +#> asset:object/1179.yumeori_falling_arrow/tick/attack +# +# +# +# @within function asset:object/1179.yumeori_falling_arrow/tick/align_to_ground + +#> Private +# @private + #declare score_holder $UserID + +# 演出 + playsound entity.arrow.hit neutral @a ~ ~ ~ 1 1 + playsound item.trident.hit_ground neutral @a ~ ~ ~ 1 1 + playsound entity.evoker.prepare_summon neutral @a ~ ~ ~ 0.8 2 + execute rotated ~ -90 run function asset:object/1179.yumeori_falling_arrow/tick/vfx + +# どうせなら縦に広い判定をとっておく + +# ダメージ + data modify storage api: Argument.Damage set from storage asset:context this.Damage + data modify storage api: Argument.AttackType set value "Magic" + data modify storage api: Argument.ElementType set value "Thunder" + data modify storage api: Argument.AdditionalMPHeal set from storage asset:context this.AdditionalMPHeal + execute store result score $UserID Temporary run data get storage asset:context this.UserID + execute as @a if score @s UserID = $UserID Temporary run function api:damage/modifier + execute positioned ~-1 ~-0.5 ~-1 as @e[type=#lib:living_without_player,tag=!Uninterferable,dx=2,dy=2,dz=2,sort=random,limit=1] run function api:damage/ + function api:damage/reset + +# + scoreboard players reset $UserID Temporary + +# + kill @s diff --git a/Asset/data/asset/functions/object/1179.yumeori_falling_arrow/tick/vfx.mcfunction b/Asset/data/asset/functions/object/1179.yumeori_falling_arrow/tick/vfx.mcfunction new file mode 100644 index 0000000000..5c92123c48 --- /dev/null +++ b/Asset/data/asset/functions/object/1179.yumeori_falling_arrow/tick/vfx.mcfunction @@ -0,0 +1,80 @@ +#> asset:object/1179.yumeori_falling_arrow/tick/vfx +# +# +# +# @within function asset:object/1179.yumeori_falling_arrow/tick/attack + + # [ImportKey]: NobwRALgngDgpmAXGANgSwHYIDRgK55oAmSYAjAGxEAcZAnHQMYC01ADAExHMAsAhnR6sARnDbMA7AFYp1RhSlMpRKWFwY+AWwTJAW74ACMmrAw+AJy0BnJOEYB7PBghIpbXADMzdzTbAA3PhQ8HXAADyQ3MCgIgF8Y3Ag7XwCgkLBwxEjoxDIpONw7d3dLOGdM3FEALzQ4MwjcNEsAIThq2oBRAEc8QJQoAGVTRjgSRHdAkriAXSA_3 + # 線 1 + particle dust 100000000 1 100000000 2 ^0 ^ ^0 0.1 0.1 0.1 0 2 + particle dust 100000000 1 100000000 2 ^0 ^ ^0.30612 0.1 0.1 0.1 0 2 + particle dust 100000000 1 100000000 2 ^0 ^ ^0.61224 0.1 0.1 0.1 0 2 + particle dust 100000000 1 100000000 2 ^0 ^ ^0.91837 0.1 0.1 0.1 0 2 + particle dust 100000000 1 100000000 2 ^0 ^ ^1.22449 0.1 0.1 0.1 0 2 + particle dust 100000000 1 100000000 2 ^0 ^ ^1.53061 0.1 0.1 0.1 0 2 + particle dust 100000000 1 100000000 2 ^0 ^ ^1.83673 0.1 0.1 0.1 0 2 + particle dust 100000000 1 100000000 2 ^0 ^ ^2.14286 0.1 0.1 0.1 0 2 + particle dust 100000000 1 100000000 2 ^0 ^ ^2.44898 0.1 0.1 0.1 0 2 + particle dust 100000000 1 100000000 2 ^0 ^ ^2.7551 0.1 0.1 0.1 0 2 + particle dust 100000000 1 100000000 2 ^0 ^ ^3.06122 0.1 0.1 0.1 0 2 + particle dust 100000000 1 100000000 2 ^0 ^ ^3.36735 0.1 0.1 0.1 0 2 + particle dust 100000000 1 100000000 2 ^0 ^ ^3.67347 0.1 0.1 0.1 0 2 + particle dust 100000000 1 100000000 2 ^0 ^ ^3.97959 0.1 0.1 0.1 0 2 + particle dust 100000000 1 100000000 2 ^0 ^ ^4.28571 0.1 0.1 0.1 0 2 + particle dust 100000000 1 100000000 2 ^0 ^ ^4.59184 0.1 0.1 0.1 0 2 + particle dust 100000000 1 1 2 ^0 ^ ^4.89796 0.1 0.1 0.1 0 2 + particle dust 100000000 1 1 2 ^0 ^ ^5.20408 0.1 0.1 0.1 0 2 + particle dust 100000000 1 1 2 ^0 ^ ^5.5102 0.1 0.1 0.1 0 2 + particle dust 100000000 1 1 2 ^0 ^ ^5.81633 0.1 0.1 0.1 0 2 + particle dust 100000000 1 1 2 ^0 ^ ^6.12245 0.1 0.1 0.1 0 2 + particle dust 100000000 1 1 2 ^0 ^ ^6.42857 0.1 0.1 0.1 0 2 + particle dust 100000000 1 1 2 ^0 ^ ^6.73469 0.1 0.1 0.1 0 2 + particle dust 100000000 100000000 1 2 ^0 ^ ^7.04082 0.1 0.1 0.1 0 2 + particle dust 100000000 100000000 1 2 ^0 ^ ^7.34694 0.1 0.1 0.1 0 2 + particle dust 100000000 100000000 1 2 ^0 ^ ^7.65306 0.1 0.1 0.1 0 2 + particle dust 100000000 100000000 1 2 ^0 ^ ^7.95918 0.1 0.1 0.1 0 2 + particle dust 100000000 100000000 1 2 ^0 ^ ^8.26531 0.1 0.1 0.1 0 2 + particle dust 100000000 100000000 1 2 ^0 ^ ^8.57143 0.1 0.1 0.1 0 2 + particle dust 100000000 100000000 1 2 ^0 ^ ^8.87755 0.1 0.1 0.1 0 2 + particle dust 100000000 100000000 1 2 ^0 ^ ^9.18367 0.1 0.1 0.1 0 2 + particle dust 100000000 100000000 1 2 ^0 ^ ^9.4898 0.1 0.1 0.1 0 2 + particle dust 100000000 100000000 1 2 ^0 ^ ^9.79592 0.1 0.1 0.1 0 2 + particle dust 100000000 100000000 1 2 ^0 ^ ^10.10204 0.1 0.1 0.1 0 2 + particle dust 100000000 100000000 1 2 ^0 ^ ^10.40816 0.1 0.1 0.1 0 2 + particle dust 100000000 100000000 1 2 ^0 ^ ^10.71429 0.1 0.1 0.1 0 2 + particle dust 100000000 100000000 1 2 ^0 ^ ^11.02041 0.1 0.1 0.1 0 2 + particle dust 100000000 100000000 1 2 ^0 ^ ^11.32653 0.1 0.1 0.1 0 2 + particle dust 100000000 100000000 1 2 ^0 ^ ^11.63265 0.1 0.1 0.1 0 2 + particle dust 100000000 100000000 1 2 ^0 ^ ^11.93878 0.1 0.1 0.1 0 2 + particle dust 100000000 100000000 1 2 ^0 ^ ^12.2449 0.1 0.1 0.1 0 2 + particle dust 100000000 100000000 1 2 ^0 ^ ^12.55102 0.1 0.1 0.1 0 2 + particle dust 100000000 100000000 1 2 ^0 ^ ^12.85714 0.1 0.1 0.1 0 2 + particle dust 100000000 100000000 1 2 ^0 ^ ^13.16327 0.1 0.1 0.1 0 2 + particle dust 100000000 100000000 1 2 ^0 ^ ^13.46939 0.1 0.1 0.1 0 2 + particle dust 100000000 100000000 1 2 ^0 ^ ^13.77551 0.1 0.1 0.1 0 2 + particle dust 100000000 100000000 1 2 ^0 ^ ^14.08163 0.1 0.1 0.1 0 2 + particle dust 100000000 100000000 1 2 ^0 ^ ^14.38776 0.1 0.1 0.1 0 2 + particle dust 100000000 100000000 1 2 ^0 ^ ^14.69388 0.1 0.1 0.1 0 2 + particle dust 100000000 100000000 1 2 ^0 ^ ^15 0.1 0.1 0.1 0 2 + # [ImportKey]: NobwRALgngDgpmAXGAxgSwE4oDYIDRgCuhaAJkmAJykCGArDQCwAcA7ALQCMARnDe4wBspAMztuzThwAM05pW7SUNGgCZSqsAQB2NALYJkgMMUABJy1gYNDPoDOScCgD2hbRCSrpBFHDdwMDmAAbjTYhIbgAB5IXmBQMQC+CQQ2pGiE9oiqBLYQ1u6IsXDY2GgwtoacsilOeRCGsWi2AKIlZRXNAI6EodhQAMpWPuSIAGahFUkAukA_3 + # 円 1 + particle dust 100000000 1 100000000 2 ~0 ~ ~-2 0 0 0 0 1 + particle dust 100000000 1 100000000 2 ~0.61803 ~ ~-1.90211 0 0 0 0 1 + particle dust 100000000 1 100000000 2 ~1.17557 ~ ~-1.61803 0 0 0 0 1 + particle dust 100000000 1 100000000 2 ~1.61803 ~ ~-1.17557 0 0 0 0 1 + particle dust 100000000 1 100000000 2 ~1.90211 ~ ~-0.61803 0 0 0 0 1 + particle dust 100000000 1 100000000 2 ~2 ~ ~0 0 0 0 0 1 + particle dust 100000000 1 100000000 2 ~1.90211 ~ ~0.61803 0 0 0 0 1 + particle dust 100000000 1 100000000 2 ~1.61803 ~ ~1.17557 0 0 0 0 1 + particle dust 100000000 1 100000000 2 ~1.17557 ~ ~1.61803 0 0 0 0 1 + particle dust 100000000 1 100000000 2 ~0.61803 ~ ~1.90211 0 0 0 0 1 + particle dust 100000000 1 100000000 2 ~0 ~ ~2 0 0 0 0 1 + particle dust 100000000 1 100000000 2 ~-0.61803 ~ ~1.90211 0 0 0 0 1 + particle dust 100000000 1 100000000 2 ~-1.17557 ~ ~1.61803 0 0 0 0 1 + particle dust 100000000 1 100000000 2 ~-1.61803 ~ ~1.17557 0 0 0 0 1 + particle dust 100000000 1 100000000 2 ~-1.90211 ~ ~0.61803 0 0 0 0 1 + particle dust 100000000 1 100000000 2 ~-2 ~ ~0 0 0 0 0 1 + particle dust 100000000 1 100000000 2 ~-1.90211 ~ ~-0.61803 0 0 0 0 1 + particle dust 100000000 1 100000000 2 ~-1.61803 ~ ~-1.17557 0 0 0 0 1 + particle dust 100000000 1 100000000 2 ~-1.17557 ~ ~-1.61803 0 0 0 0 1 + particle dust 100000000 1 100000000 2 ~-0.61803 ~ ~-1.90211 0 0 0 0 1 diff --git a/Asset/data/asset/functions/object/alias/1177/detect_hit_entity.mcfunction b/Asset/data/asset/functions/object/alias/1177/detect_hit_entity.mcfunction new file mode 100644 index 0000000000..9180a98378 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1177/detect_hit_entity.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1177/detect_hit_entity +# +# メソッド処理のエイリアス +# +# @within asset_manager:object/call_method/run_method.m + +# 元のメソッド処理を呼び出す + function asset:object/1177.arrow_of_yumeori_upper/detect_hit_entity/ diff --git a/Asset/data/asset/functions/object/alias/1177/range_over.mcfunction b/Asset/data/asset/functions/object/alias/1177/range_over.mcfunction new file mode 100644 index 0000000000..ce59544ca6 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1177/range_over.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1177/range_over +# +# メソッド処理のエイリアス +# +# @within asset_manager:object/call_method/run_method.m + +# 元のメソッド処理を呼び出す + function asset:object/1177.arrow_of_yumeori_upper/range_over/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1177/register.mcfunction b/Asset/data/asset/functions/object/alias/1177/register.mcfunction new file mode 100644 index 0000000000..bde607c15c --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1177/register.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1177/register +# +# Objectのデータ指定処理のエイリアス +# +# @within asset_manager:object/summon/register.m + +# 元の登録処理を呼び出す + function asset:object/1177.arrow_of_yumeori_upper/register \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1178/init.mcfunction b/Asset/data/asset/functions/object/alias/1178/init.mcfunction new file mode 100644 index 0000000000..3aaaaaed60 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1178/init.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1178/init +# +# Init処理のエイリアス +# +# @within asset_manager:object/init/init.m + +# 元のInit処理を呼び出す + function asset:object/1178.yumeori_falling_arrow_manager/init/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1178/register.mcfunction b/Asset/data/asset/functions/object/alias/1178/register.mcfunction new file mode 100644 index 0000000000..36d5769dee --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1178/register.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1178/register +# +# Objectのデータ指定処理のエイリアス +# +# @within asset_manager:object/summon/register.m + +# 元の登録処理を呼び出す + function asset:object/1178.yumeori_falling_arrow_manager/register diff --git a/Asset/data/asset/functions/object/alias/1178/summon.mcfunction b/Asset/data/asset/functions/object/alias/1178/summon.mcfunction new file mode 100644 index 0000000000..f1951c7c39 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1178/summon.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1178/summon +# +# Object召喚処理のエイリアス +# +# @within asset_manager:object/summon/summon.m + +# 元の召喚処理を呼び出す + function asset:object/1178.yumeori_falling_arrow_manager/summon/ diff --git a/Asset/data/asset/functions/object/alias/1178/tick.mcfunction b/Asset/data/asset/functions/object/alias/1178/tick.mcfunction new file mode 100644 index 0000000000..03d185f82c --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1178/tick.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1178/tick +# +# Tick時処理のエイリアス +# +# @within asset_manager:object/tick/tick.m + +# 元のTick処理を呼び出す + function asset:object/1178.yumeori_falling_arrow_manager/tick/ diff --git a/Asset/data/asset/functions/object/alias/1179/init.mcfunction b/Asset/data/asset/functions/object/alias/1179/init.mcfunction new file mode 100644 index 0000000000..cac3b5215d --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1179/init.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1179/init +# +# Init処理のエイリアス +# +# @within asset_manager:object/init/init.m + +# 元のInit処理を呼び出す + function asset:object/1179.yumeori_falling_arrow/init/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1179/register.mcfunction b/Asset/data/asset/functions/object/alias/1179/register.mcfunction new file mode 100644 index 0000000000..12ab5d3017 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1179/register.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1179/register +# +# Objectのデータ指定処理のエイリアス +# +# @within asset_manager:object/summon/register.m + +# 元の登録処理を呼び出す + function asset:object/1179.yumeori_falling_arrow/register \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1179/summon.mcfunction b/Asset/data/asset/functions/object/alias/1179/summon.mcfunction new file mode 100644 index 0000000000..34f89df252 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1179/summon.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1179/summon +# +# Object召喚処理のエイリアス +# +# @within asset_manager:object/summon/summon.m + +# 元の召喚処理を呼び出す + function asset:object/1179.yumeori_falling_arrow/summon/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1179/tick.mcfunction b/Asset/data/asset/functions/object/alias/1179/tick.mcfunction new file mode 100644 index 0000000000..f9f505b21b --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1179/tick.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1179/tick +# +# Tick時処理のエイリアス +# +# @within asset_manager:object/tick/tick.m + +# 元のTick処理を呼び出す + function asset:object/1179.yumeori_falling_arrow/tick/ \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/effect/register.json b/Asset/data/asset/tags/functions/effect/register.json index 78c10d4140..75735e26f1 100644 --- a/Asset/data/asset/tags/functions/effect/register.json +++ b/Asset/data/asset/tags/functions/effect/register.json @@ -1,5 +1,7 @@ { "values": [ + "asset:effect/0380.yumeori_falling/_/register", + "asset:effect/0379.yumeori_count/_/register", "asset:effect/0371.tsukimi/_/register", "asset:effect/0355.heart_gap/_/register", "asset:effect/0354.protection_of_courage/_/register", @@ -182,4 +184,4 @@ "asset:effect/0007.defense_base_debuff/_/register", "asset:effect/0258.spirit_melody/_/register" ] -} +} \ No newline at end of file From 6ea661aa62efbaf1c96e4832626ffccb70434852 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Wed, 15 Jul 2026 16:51:40 +0900 Subject: [PATCH 5/9] =?UTF-8?q?=E8=AA=BF=E6=95=B4=E7=8F=AD=E5=90=91?= =?UTF-8?q?=E3=81=91=E3=83=A1=E3=83=A2=E3=82=92=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifact/1307.yumeori/trigger/curved_shot.mcfunction | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/artifact/1307.yumeori/trigger/curved_shot.mcfunction b/Asset/data/asset/functions/artifact/1307.yumeori/trigger/curved_shot.mcfunction index da229afd90..bf45d9e3bb 100644 --- a/Asset/data/asset/functions/artifact/1307.yumeori/trigger/curved_shot.mcfunction +++ b/Asset/data/asset/functions/artifact/1307.yumeori/trigger/curved_shot.mcfunction @@ -9,10 +9,11 @@ function api:entity/mob/effect/remove/from_id function api:entity/mob/effect/reset -# 曲射の仕様メモ +# 調整班への曲射の仕様メモ # 上向きに発射された矢が射程限界で消えると、曲射が発動し、周囲の敵に矢を降らす # つまり、途中でブロックに当たると不発する # ただし、上向きの矢はentityに対してはヒット判定がない +# 1発目は前方の敵を優先して狙うが、2発目以降は周囲のランダムな敵を狙う。要するに広域乱射 # 曲射のデータ設定 # 1発辺りのダメージ From 77f91de0daae643c0b955779f4fe17b79d4f2b3b Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Wed, 15 Jul 2026 16:51:47 +0900 Subject: [PATCH 6/9] =?UTF-8?q?=E3=83=86=E3=82=AD=E3=82=B9=E3=83=88?= =?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 --- .../artifact/1307.yumeori/give/2.give.mcfunction | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1307.yumeori/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1307.yumeori/give/2.give.mcfunction index 9feb214f31..8b764c5a91 100644 --- a/Asset/data/asset/functions/artifact/1307.yumeori/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1307.yumeori/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"極光弓 夢織","color":"#91f9ab"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value [] + data modify storage asset:artifact Lore set value ['{"text":"矢を3発命中させると曲射が可能になり"}','{"text":"その状態で上を向いて発射することで敵に矢の雨を降り注がせる"}','{"text":"オーロラの天使の持っていた弓","color":"gray"}','{"text":"その天衣の弦から放たれた矢は寒空を貫き降り注ぐ","color":"gray"}'] # 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション) data modify storage asset:artifact ConsumeItem.Item set value '{"translate":"item.minecraft.arrow"}' data modify storage asset:artifact ConsumeItem.Count set value 1 @@ -29,7 +29,7 @@ # 神器の発動条件 (TextComponentString) (オプション) data modify storage asset:artifact Condition set value '{"text":"最大まで引き絞る"}' # 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.Damage set value [0,0] + data modify storage asset:artifact AttackInfo.Damage set value "200 / 100x6" # 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) data modify storage asset:artifact AttackInfo.AttackType set value [Magic] # 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) @@ -37,9 +37,9 @@ # 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) # data modify storage asset:artifact AttackInfo.BypassResist set value # 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) - data modify storage asset:artifact AttackInfo.IsRangeAttack set value "condition" + data modify storage asset:artifact AttackInfo.IsRangeAttack set value "never" # 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) - data modify storage asset:artifact AttackInfo.AttackRange set value 20 + data modify storage asset:artifact AttackInfo.AttackRange set value 25 # MP消費量 (int) # data modify storage asset:artifact MPCost set value # MP必要量 (int) (オプション) @@ -49,8 +49,8 @@ # 神器のクールダウン (int) (オプション) # data modify storage asset:artifact LocalCooldown set value # 種別クールダウン ({Type: string, Duration: int}) (オプション) - # data modify storage asset:artifact TypeCooldown.Type set value - # data modify storage asset:artifact TypeCooldown.Duration set value + data modify storage asset:artifact TypeCooldown.Type set value "longRange" + data modify storage asset:artifact TypeCooldown.Duration set value 20 # グローバルクールダウン (int) (オプション) # data modify storage asset:artifact SpecialCooldown set value # クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) From 7fadde7698f9c2ee2f3f203660bfede2add733be Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Wed, 15 Jul 2026 16:55:58 +0900 Subject: [PATCH 7/9] =?UTF-8?q?=E8=AC=8E=E3=81=AEalias=E3=82=92=E5=89=8A?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Asset/data/asset/functions/object/alias/1176/.mcfunction | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 Asset/data/asset/functions/object/alias/1176/.mcfunction diff --git a/Asset/data/asset/functions/object/alias/1176/.mcfunction b/Asset/data/asset/functions/object/alias/1176/.mcfunction deleted file mode 100644 index 346b6dfc9c..0000000000 --- a/Asset/data/asset/functions/object/alias/1176/.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset:object/alias/1176/ -# -# メソッド処理のエイリアス -# -# @within asset_manager:object/call_method/run_method.m - -# 元のメソッド処理を呼び出す - function asset:object/1176.arrow_of_yumeori// \ No newline at end of file From 762f179162cda7a9dd795964aa7b56411de1081e Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Wed, 15 Jul 2026 17:09:31 +0900 Subject: [PATCH 8/9] =?UTF-8?q?=E3=82=A8=E3=82=AF=E3=83=AC=E3=83=BC?= =?UTF-8?q?=E3=83=AB=E3=81=AE=E3=83=89=E3=83=AD=E3=83=83=E3=83=97=E3=81=AB?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../object/2195.eclael_death_animation/tick/drop.mcfunction | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Asset/data/asset/functions/object/2195.eclael_death_animation/tick/drop.mcfunction b/Asset/data/asset/functions/object/2195.eclael_death_animation/tick/drop.mcfunction index 1e5d049059..3156d0f5df 100644 --- a/Asset/data/asset/functions/object/2195.eclael_death_animation/tick/drop.mcfunction +++ b/Asset/data/asset/functions/object/2195.eclael_death_animation/tick/drop.mcfunction @@ -8,3 +8,7 @@ data modify storage api: Argument.ID set value 1034 data modify storage api: Argument.Important set value true function api:artifact/spawn/from_id + + data modify storage api: Argument.ID set value 1307 + data modify storage api: Argument.Important set value true + function api:artifact/spawn/from_id From 849220440c51f7987521598a0f2e4fe941d17519 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Wed, 15 Jul 2026 17:14:04 +0900 Subject: [PATCH 9/9] =?UTF-8?q?=E9=99=8D=E4=B8=8B=E5=87=A6=E7=90=86?= =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tick/set_pos/3.spread_pos.mcfunction | 2 +- .../set_pos/4.align_to_ground/.mcfunction | 9 --------- .../4.align_to_ground/recursive.mcfunction | 19 ------------------- .../tick/summon.mcfunction | 2 +- 4 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 Asset/data/asset/functions/object/1178.yumeori_falling_arrow_manager/tick/set_pos/4.align_to_ground/.mcfunction delete mode 100644 Asset/data/asset/functions/object/1178.yumeori_falling_arrow_manager/tick/set_pos/4.align_to_ground/recursive.mcfunction diff --git a/Asset/data/asset/functions/object/1178.yumeori_falling_arrow_manager/tick/set_pos/3.spread_pos.mcfunction b/Asset/data/asset/functions/object/1178.yumeori_falling_arrow_manager/tick/set_pos/3.spread_pos.mcfunction index e34aeb0433..e9537bf680 100644 --- a/Asset/data/asset/functions/object/1178.yumeori_falling_arrow_manager/tick/set_pos/3.spread_pos.mcfunction +++ b/Asset/data/asset/functions/object/1178.yumeori_falling_arrow_manager/tick/set_pos/3.spread_pos.mcfunction @@ -16,7 +16,7 @@ execute as @e[type=marker,tag=SpreadMarker,distance=..0.01] run function lib:spread_entity/ # マーカーの位置で出来る限り地面に近づける - execute at @e[type=marker,tag=SpreadMarker,distance=..10] run function asset:object/1178.yumeori_falling_arrow_manager/tick/set_pos/4.align_to_ground/ + execute at @e[type=marker,tag=SpreadMarker,distance=..10] run function asset:object/1178.yumeori_falling_arrow_manager/tick/summon # リセット kill @e[type=marker,tag=SpreadMarker,distance=..10] diff --git a/Asset/data/asset/functions/object/1178.yumeori_falling_arrow_manager/tick/set_pos/4.align_to_ground/.mcfunction b/Asset/data/asset/functions/object/1178.yumeori_falling_arrow_manager/tick/set_pos/4.align_to_ground/.mcfunction deleted file mode 100644 index 753183cdd8..0000000000 --- a/Asset/data/asset/functions/object/1178.yumeori_falling_arrow_manager/tick/set_pos/4.align_to_ground/.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -#> asset:object/1178.yumeori_falling_arrow_manager/tick/set_pos/4.align_to_ground/ -# -# -# -# @within function asset:object/1178.yumeori_falling_arrow_manager/tick/set_pos/3.spread_pos - -# - data modify storage asset:temp RecursiveLimit set value 10 - function asset:object/1178.yumeori_falling_arrow_manager/tick/set_pos/4.align_to_ground/recursive diff --git a/Asset/data/asset/functions/object/1178.yumeori_falling_arrow_manager/tick/set_pos/4.align_to_ground/recursive.mcfunction b/Asset/data/asset/functions/object/1178.yumeori_falling_arrow_manager/tick/set_pos/4.align_to_ground/recursive.mcfunction deleted file mode 100644 index f50044f256..0000000000 --- a/Asset/data/asset/functions/object/1178.yumeori_falling_arrow_manager/tick/set_pos/4.align_to_ground/recursive.mcfunction +++ /dev/null @@ -1,19 +0,0 @@ -#> asset:object/1178.yumeori_falling_arrow_manager/tick/set_pos/4.align_to_ground/recursive -# -# -# -# @within function -# asset:object/1178.yumeori_falling_arrow_manager/tick/set_pos/4.align_to_ground/ -# asset:object/1178.yumeori_falling_arrow_manager/tick/set_pos/4.align_to_ground/recursive - -# デクリメント - execute store result storage asset:temp RecursiveLimit int 0.9999999999 run data get storage asset:temp RecursiveLimit - -# 各条件を満たした際、攻撃してreturnする - # 再帰上限 - execute if data storage asset:temp {RecursiveLimit:0} run return run function asset:object/1178.yumeori_falling_arrow_manager/tick/summon - # ブロックに接触 - execute unless block ~ ~-0.5 ~ #lib:no_collision/without_fluid run return run function asset:object/1178.yumeori_falling_arrow_manager/tick/summon - -# 再帰 - execute positioned ~ ~-0.5 ~ run function asset:object/1178.yumeori_falling_arrow_manager/tick/set_pos/4.align_to_ground/recursive diff --git a/Asset/data/asset/functions/object/1178.yumeori_falling_arrow_manager/tick/summon.mcfunction b/Asset/data/asset/functions/object/1178.yumeori_falling_arrow_manager/tick/summon.mcfunction index 1aa4c83092..761f2447c7 100644 --- a/Asset/data/asset/functions/object/1178.yumeori_falling_arrow_manager/tick/summon.mcfunction +++ b/Asset/data/asset/functions/object/1178.yumeori_falling_arrow_manager/tick/summon.mcfunction @@ -2,7 +2,7 @@ # # # -# @within function asset:object/1178.yumeori_falling_arrow_manager/tick/set_pos/4.align_to_ground/recursive +# @within function asset:object/1178.yumeori_falling_arrow_manager/tick/set_pos/3.spread_pos # 攻撃用Object召喚 data modify storage api: Argument.ID set value 1179