From f7331805062c9b2ea0e2fe92c5fabf49029402ad Mon Sep 17 00:00:00 2001 From: ogachu0331 Date: Thu, 18 Jun 2026 03:57:07 +0900 Subject: [PATCH 1/7] =?UTF-8?q?=E7=A5=9E=E5=99=A8=E3=81=AE=E4=BD=9C?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1572.after_glow/give/1.trigger.mcfunction | 7 ++ .../1572.after_glow/give/2.give.mcfunction | 68 +++++++++++++++++++ .../trigger/1.trigger.mcfunction | 8 +++ .../trigger/2.check_condition.mcfunction | 12 ++++ .../1572.after_glow/trigger/3.main.mcfunction | 13 ++++ .../artifact/click.carrot_on_a_stick.json | 3 +- .../asset/tags/functions/artifact/give.json | 1 + 7 files changed, 111 insertions(+), 1 deletion(-) create mode 100644 Asset/data/asset/functions/artifact/1572.after_glow/give/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1572.after_glow/give/2.give.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1572.after_glow/trigger/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1572.after_glow/trigger/2.check_condition.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1572.after_glow/trigger/3.main.mcfunction diff --git a/Asset/data/asset/functions/artifact/1572.after_glow/give/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1572.after_glow/give/1.trigger.mcfunction new file mode 100644 index 0000000000..8aca8153c9 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1572.after_glow/give/1.trigger.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1572.after_glow/give/1.trigger +# +# 神器の取得処理の呼び出し時に実行されるfunction +# +# @within tag/function asset:artifact/give + +execute if data storage asset:context {id:1572} run function asset:artifact/1572.after_glow/give/2.give \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1572.after_glow/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1572.after_glow/give/2.give.mcfunction new file mode 100644 index 0000000000..75ff962539 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1572.after_glow/give/2.give.mcfunction @@ -0,0 +1,68 @@ +#> asset:artifact/1572.after_glow/give/2.give +# +# 神器の作成部 ここでID等を定義する +# +# @user +# @within function asset:artifact/1572.after_glow/give/1.trigger + +# 神器の説明や消費MPなどをここで設定する。 +# 最後にasset:artifact/common/giveを実行することで入手可能。 + +# 神器のID (int) スプレッドシートの値を入れる + data modify storage asset:artifact ID set value 1572 +# 神器のベースアイテム + data modify storage asset:artifact Item set value "minecraft:carrot_on_a_stick" +# 神器の名前 (TextComponentString) + data modify storage asset:artifact Name set value '{"text":"アフターグロウ","color":"#ffd712"}' +# 神器の説明文 (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.stick"}' + # data modify storage asset:artifact ConsumeItem.Count set value 1 + # data modify storage asset:artifact ConsumeItem.Extra set value +# 使用回数 (int) (オプション) + # data modify storage asset:artifact RemainingCount set value +# 神器を発動できるスロット (string) Wikiを参照 + data modify storage asset:artifact Slot set value "mainhand" +# 神器のトリガー (string) Wikiを参照 + data modify storage asset:artifact Trigger set value "onClick" +# 神器の発動条件 (TextComponentString) (オプション) + # data modify storage asset:artifact Condition set value +# 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.Damage set value [9999] +# 攻撃に関する情報 -攻撃タイプ (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 true +# 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.IsRangeAttack set value "every" +# 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) + #data modify storage asset:artifact AttackInfo.AttackRange set value +# MP消費量 (int) + data modify storage asset:artifact MPCost set value 120 +# MP必要量 (int) (オプション) + # data modify storage asset:artifact MPRequire set value +# MP回復量 (int) + # data modify storage asset:artifact MPHealWhenHit set value +# 神器のクールダウン (int) (オプション) + data modify storage asset:artifact LocalCooldown set value 600 +# 種別クールダウン ({Type: string, Duration: int}) (オプション) + data modify storage asset:artifact TypeCooldown.Type set value "longRange" + data modify storage asset:artifact TypeCooldown.Duration set value 50 +# グローバルクールダウン (int) (オプション) + # data modify storage asset:artifact SpecialCooldown set value +# クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) + # data modify storage asset:artifact DisableCooldownMessage set value +# MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) + # data modify storage asset:artifact DisableMPMessage set value +# 破壊時の音を鳴らさないかどうか (boolean) (オプション) + # data modify storage asset:artifact DisableBreakSound set value +# 扱える神 (string[]) Wikiを参照 + data modify storage asset:artifact CanUsedGod set value ["Flora", "Urban", "Nyaptov", "Wi-ki"] +# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) + # data modify storage asset:artifact CustomNBT set value {} + +# 神器の入手用function + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/1572.after_glow/trigger/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1572.after_glow/trigger/1.trigger.mcfunction new file mode 100644 index 0000000000..090ad4a2b1 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1572.after_glow/trigger/1.trigger.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1572.after_glow/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:1572} run function asset:artifact/1572.after_glow/trigger/2.check_condition \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1572.after_glow/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1572.after_glow/trigger/2.check_condition.mcfunction new file mode 100644 index 0000000000..4dda429aa7 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1572.after_glow/trigger/2.check_condition.mcfunction @@ -0,0 +1,12 @@ +#> asset:artifact/1572.after_glow/trigger/2.check_condition +# +# 神器の発動条件をチェックします +# +# @within function asset:artifact/1572.after_glow/trigger/1.trigger + +# 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く + function asset:artifact/common/check_condition/mainhand +# 他にアイテム等確認する場合はここに書く + +# CanUsedタグをチェックして3.main.mcfunctionを実行する + execute if entity @s[tag=CanUsed] run function asset:artifact/1572.after_glow/trigger/3.main \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1572.after_glow/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1572.after_glow/trigger/3.main.mcfunction new file mode 100644 index 0000000000..422ad96db8 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1572.after_glow/trigger/3.main.mcfunction @@ -0,0 +1,13 @@ +#> asset:artifact/1572.after_glow/trigger/3.main +# +# 神器のメイン処理部 +# +# @within function asset:artifact/1572.after_glow/trigger/2.check_condition + +# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う + function asset:artifact/common/use/mainhand + +# ここから先は神器側の効果の処理を書く + data modify storage api: Argument.ID set value 2168 + + function api:object/summon diff --git a/Asset/data/asset/tags/functions/artifact/click.carrot_on_a_stick.json b/Asset/data/asset/tags/functions/artifact/click.carrot_on_a_stick.json index 8b0fecd8b5..07b78704cb 100644 --- a/Asset/data/asset/tags/functions/artifact/click.carrot_on_a_stick.json +++ b/Asset/data/asset/tags/functions/artifact/click.carrot_on_a_stick.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1572.after_glow/trigger/1.trigger", "asset:artifact/1332.bebebeam/trigger/1.trigger", "asset:artifact/1306.will_o_wisp/trigger/1.trigger", "asset:artifact/1144.cradle_of_azure_moon/trigger/1.trigger", @@ -177,4 +178,4 @@ "asset:artifact/2001.staff_of_the_willless/trigger/1.trigger", "asset:artifact/0019.scripture/trigger/1.trigger" ] -} +} \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/artifact/give.json b/Asset/data/asset/tags/functions/artifact/give.json index 4b7dcacd81..933f6203b7 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/1572.after_glow/give/1.trigger", "asset:artifact/1453.frost_flake_bow/give/1.trigger", "asset:artifact/1534.drop_in_the_bucket/give/1.trigger", "asset:artifact/1366.shaved_ice_melon/give/1.trigger", From d7eb68fce783f0ed0069315deda6f354459846a1 Mon Sep 17 00:00:00 2001 From: ogachu0331 Date: Thu, 18 Jun 2026 16:01:03 +0900 Subject: [PATCH 2/7] =?UTF-8?q?=E3=83=AC=E3=83=BC=E3=82=B6=E3=83=BC?= =?UTF-8?q?=E3=81=AE=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifact/1572.after_glow/trigger/3.main.mcfunction | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1572.after_glow/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1572.after_glow/trigger/3.main.mcfunction index 422ad96db8..47502cdd4f 100644 --- a/Asset/data/asset/functions/artifact/1572.after_glow/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1572.after_glow/trigger/3.main.mcfunction @@ -9,5 +9,5 @@ # ここから先は神器側の効果の処理を書く data modify storage api: Argument.ID set value 2168 - - function api:object/summon + data modify storage api: Argument.FieldOverride set value {Color:16711680,Scale:[1f,10f,1f],Frames:[20335,20336,20337]} + execute at @s positioned ^ ^ ^3 rotated ~ -90 run function api:object/summon From ff3ee39b6e2d62c0d62406251732807eb6e9c70e Mon Sep 17 00:00:00 2001 From: ogachu0331 Date: Thu, 18 Jun 2026 21:56:27 +0900 Subject: [PATCH 3/7] =?UTF-8?q?=E3=83=93=E3=83=BC=E3=83=A0=E3=81=AE?= =?UTF-8?q?=E4=BD=9C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1572.after_glow/give/2.give.mcfunction | 6 +-- .../passeive/1.trigger.mcfunction | 8 ++++ .../passeive/2.check_condition.mcfunction | 12 +++++ .../passeive/3.main.mcfunction | 11 +++++ .../passeive/pointer.mcfunction | 16 +++++++ .../1572.after_glow/trigger/3.main.mcfunction | 5 +-- .../trigger/object_summon.mcfunction | 21 +++++++++ .../trigger/pointer.mcfunction | 15 +++++++ .../1166.after_glow/register.mcfunction | 20 +++++++++ .../object/1166.after_glow/summon/.mcfunction | 8 ++++ .../1166.after_glow/summon/debug.mcfunction | 10 +++++ .../object/1166.after_glow/tick/.mcfunction | 12 +++++ .../1166.after_glow/tick/beem.mcfunction | 45 +++++++++++++++++++ .../1166.after_glow/tick/preview.mcfunction | 32 +++++++++++++ .../object/alias/1166/register.mcfunction | 8 ++++ .../object/alias/1166/summon.mcfunction | 8 ++++ .../object/alias/1166/tick.mcfunction | 8 ++++ .../asset/tags/functions/artifact/tick.json | 1 + 18 files changed, 240 insertions(+), 6 deletions(-) create mode 100644 Asset/data/asset/functions/artifact/1572.after_glow/passeive/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1572.after_glow/passeive/2.check_condition.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1572.after_glow/passeive/3.main.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1572.after_glow/passeive/pointer.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1572.after_glow/trigger/object_summon.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1572.after_glow/trigger/pointer.mcfunction create mode 100644 Asset/data/asset/functions/object/1166.after_glow/register.mcfunction create mode 100644 Asset/data/asset/functions/object/1166.after_glow/summon/.mcfunction create mode 100644 Asset/data/asset/functions/object/1166.after_glow/summon/debug.mcfunction create mode 100644 Asset/data/asset/functions/object/1166.after_glow/tick/.mcfunction create mode 100644 Asset/data/asset/functions/object/1166.after_glow/tick/beem.mcfunction create mode 100644 Asset/data/asset/functions/object/1166.after_glow/tick/preview.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1166/register.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1166/summon.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1166/tick.mcfunction diff --git a/Asset/data/asset/functions/artifact/1572.after_glow/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1572.after_glow/give/2.give.mcfunction index 75ff962539..47fb80cd5e 100644 --- a/Asset/data/asset/functions/artifact/1572.after_glow/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1572.after_glow/give/2.give.mcfunction @@ -13,7 +13,7 @@ # 神器のベースアイテム data modify storage asset:artifact Item set value "minecraft:carrot_on_a_stick" # 神器の名前 (TextComponentString) - data modify storage asset:artifact Name set value '{"text":"アフターグロウ","color":"#ffd712"}' + data modify storage asset:artifact Name set value '[{"text":"アフ","color":"#ff9900"},{"text":"ター","color":"#ff6600"},{"text":"グロ","color":"#ff3300"},{"text":"ウ","color":"#ff0000"}]' # 神器の説明文 (TextComponentString[]) data modify storage asset:artifact Lore set value [] # 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション) @@ -35,11 +35,11 @@ # 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) data modify storage asset:artifact AttackInfo.ElementType set value [Thunder] # 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) - data modify storage asset:artifact AttackInfo.BypassResist set value true + #data modify storage asset:artifact AttackInfo.BypassResist set value true # 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) data modify storage asset:artifact AttackInfo.IsRangeAttack set value "every" # 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) - #data modify storage asset:artifact AttackInfo.AttackRange set value + data modify storage asset:artifact AttackInfo.AttackRange set value 5 # MP消費量 (int) data modify storage asset:artifact MPCost set value 120 # MP必要量 (int) (オプション) diff --git a/Asset/data/asset/functions/artifact/1572.after_glow/passeive/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1572.after_glow/passeive/1.trigger.mcfunction new file mode 100644 index 0000000000..a4d7b2a037 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1572.after_glow/passeive/1.trigger.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1572.after_glow/passeive/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:1572} run function asset:artifact/1572.after_glow/passeive/2.check_condition diff --git a/Asset/data/asset/functions/artifact/1572.after_glow/passeive/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1572.after_glow/passeive/2.check_condition.mcfunction new file mode 100644 index 0000000000..5375fe0c78 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1572.after_glow/passeive/2.check_condition.mcfunction @@ -0,0 +1,12 @@ +#> asset:artifact/1572.after_glow/passeive/2.check_condition +# +# 神器の発動条件をチェックします +# +# @within function asset:artifact/1572.after_glow/passeive/1.trigger + +# 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く + #function asset:artifact/common/check_condition/mainhand +# 他にアイテム等確認する場合はここに書く + +# CanUsedタグをチェックして3.main.mcfunctionを実行する + function asset:artifact/1572.after_glow/passeive/3.main diff --git a/Asset/data/asset/functions/artifact/1572.after_glow/passeive/3.main.mcfunction b/Asset/data/asset/functions/artifact/1572.after_glow/passeive/3.main.mcfunction new file mode 100644 index 0000000000..f11551ac23 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1572.after_glow/passeive/3.main.mcfunction @@ -0,0 +1,11 @@ +#> asset:artifact/1572.after_glow/passeive/3.main +# +# 神器のメイン処理部 +# +# @within function asset:artifact/1572.after_glow/passeive/2.check_condition + +# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う + #function asset:artifact/common/use/mainhand + +# ここから先は神器側の効果の処理を書く + execute anchored eyes positioned ^ ^ ^0.5 run function asset:artifact/1572.after_glow/passeive/pointer diff --git a/Asset/data/asset/functions/artifact/1572.after_glow/passeive/pointer.mcfunction b/Asset/data/asset/functions/artifact/1572.after_glow/passeive/pointer.mcfunction new file mode 100644 index 0000000000..4e379cd29c --- /dev/null +++ b/Asset/data/asset/functions/artifact/1572.after_glow/passeive/pointer.mcfunction @@ -0,0 +1,16 @@ +#> asset:artifact/1572.after_glow/passeive/pointer +# +# 神器のメイン処理部 +# +# @within function +# asset:artifact/1572.after_glow/passeive/3.main +# asset:artifact/1572.after_glow/passeive/pointer + + +# 視点方向に赤い点 + # ブロックに当たったら + execute unless block ^ ^ ^ #lib:no_collision/ run return run particle minecraft:dust 1.0 0.0 0.0 0.5 ^ ^ ^-0.5 0 0 0 0 1 normal + # 射程限界でも(ついでに無限再起防止) + execute unless entity @s[distance=..5] run return run particle minecraft:dust 1.0 0.0 0.0 0.5 ~ ~ ~ 0 0 0 0 1 normal + # どちらも満たさないなら再起 + execute positioned ^ ^ ^0.5 run function asset:artifact/1572.after_glow/passeive/pointer diff --git a/Asset/data/asset/functions/artifact/1572.after_glow/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1572.after_glow/trigger/3.main.mcfunction index 47502cdd4f..143a32fa97 100644 --- a/Asset/data/asset/functions/artifact/1572.after_glow/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1572.after_glow/trigger/3.main.mcfunction @@ -8,6 +8,5 @@ function asset:artifact/common/use/mainhand # ここから先は神器側の効果の処理を書く - data modify storage api: Argument.ID set value 2168 - data modify storage api: Argument.FieldOverride set value {Color:16711680,Scale:[1f,10f,1f],Frames:[20335,20336,20337]} - execute at @s positioned ^ ^ ^3 rotated ~ -90 run function api:object/summon +# 召喚位置を視点方向に + execute anchored eyes positioned ^ ^ ^0.5 run function asset:artifact/1572.after_glow/trigger/pointer diff --git a/Asset/data/asset/functions/artifact/1572.after_glow/trigger/object_summon.mcfunction b/Asset/data/asset/functions/artifact/1572.after_glow/trigger/object_summon.mcfunction new file mode 100644 index 0000000000..b2fcee79ef --- /dev/null +++ b/Asset/data/asset/functions/artifact/1572.after_glow/trigger/object_summon.mcfunction @@ -0,0 +1,21 @@ +#> asset:artifact/1572.after_glow/trigger/object_summon +# +# ビーム召喚 +# +# @within function asset:artifact/1572.after_glow/trigger/pointer + +# ビーム召喚(真上向く) + data modify storage api: Argument.ID set value 2168 + data modify storage api: Argument.FieldOverride set value {Color:16711680,Scale:[0.5f,100f,0.5f],Frames:[20335,20336,20337]} + execute rotated ~ ~-90 run function api:object/summon +# 効果音 + playsound minecraft:entity.allay.death player @a ~ ~ ~ 1 2 + playsound minecraft:entity.allay.hurt player @a ~ ~ ~ 1 2 + playsound minecraft:block.respawn_anchor.charge player @a ~ ~ ~ 1 1.2 + +# Object召喚 + data modify storage api: Argument.ID set value 1166 +# ダメージセット + data modify storage api: Argument.FieldOverride.Damage set value 9999 + execute store result storage api: Argument.FieldOverride.UserID int 1 run scoreboard players get @s UserID + function api:object/summon diff --git a/Asset/data/asset/functions/artifact/1572.after_glow/trigger/pointer.mcfunction b/Asset/data/asset/functions/artifact/1572.after_glow/trigger/pointer.mcfunction new file mode 100644 index 0000000000..9f91ea4520 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1572.after_glow/trigger/pointer.mcfunction @@ -0,0 +1,15 @@ +#> asset:artifact/1572.after_glow/trigger/pointer +# +# 神器のメイン処理部 +# +# @within function +# asset:artifact/1572.after_glow/trigger/3.main +# asset:artifact/1572.after_glow/trigger/pointer + +# 視点方向にビーム召喚 + # ブロックに当たったらビーム + execute unless block ^ ^ ^ #lib:no_collision/ rotated ~ -90 run return run function asset:artifact/1572.after_glow/trigger/object_summon + # 射程限界でビーム(ついでに無限再起防止) + execute unless entity @s[distance=..5] rotated ~ -90 run return run function asset:artifact/1572.after_glow/trigger/object_summon + # どちらも満たさないなら再起 + execute positioned ^ ^ ^0.5 run function asset:artifact/1572.after_glow/trigger/pointer diff --git a/Asset/data/asset/functions/object/1166.after_glow/register.mcfunction b/Asset/data/asset/functions/object/1166.after_glow/register.mcfunction new file mode 100644 index 0000000000..41479f56d6 --- /dev/null +++ b/Asset/data/asset/functions/object/1166.after_glow/register.mcfunction @@ -0,0 +1,20 @@ +#> asset:object/1166.after_glow/register +# +# Objectのデータを指定 +# +# @within function asset:object/alias/1166/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 1166 +# フィールド(オプション) + # data modify storage asset:object Field.myValue set value \ No newline at end of file diff --git a/Asset/data/asset/functions/object/1166.after_glow/summon/.mcfunction b/Asset/data/asset/functions/object/1166.after_glow/summon/.mcfunction new file mode 100644 index 0000000000..8a6ca96968 --- /dev/null +++ b/Asset/data/asset/functions/object/1166.after_glow/summon/.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/1166.after_glow/summon/ +# +# Object召喚処理の呼び出し時に実行されるfunction +# +# @within asset:object/alias/1166/summon + +# 元となるEntityを召喚する + summon marker ~ ~ ~ {Tags:["ObjectInit"]} diff --git a/Asset/data/asset/functions/object/1166.after_glow/summon/debug.mcfunction b/Asset/data/asset/functions/object/1166.after_glow/summon/debug.mcfunction new file mode 100644 index 0000000000..f405b7b7c4 --- /dev/null +++ b/Asset/data/asset/functions/object/1166.after_glow/summon/debug.mcfunction @@ -0,0 +1,10 @@ +#> asset:object/1166.after_glow/summon/debug +# +# 動作チェック用の召喚処理 使い終わったら消してもいいかも +# +# @user +# @private + +# 召喚 + data modify storage api: Argument.ID set value 1166 + function api:object/summon \ No newline at end of file diff --git a/Asset/data/asset/functions/object/1166.after_glow/tick/.mcfunction b/Asset/data/asset/functions/object/1166.after_glow/tick/.mcfunction new file mode 100644 index 0000000000..6032838d32 --- /dev/null +++ b/Asset/data/asset/functions/object/1166.after_glow/tick/.mcfunction @@ -0,0 +1,12 @@ +#> asset:object/1166.after_glow/tick/ +# +# Objectのtick時の処理 +# +# @within asset:object/alias/1166/tick + +# Tick加算 + scoreboard players add @s General.Object.Tick 1 + function asset:object/1166.after_glow/tick/preview + execute if score @s General.Object.Tick matches 600.. run function asset:object/1166.after_glow/tick/beem +# 消滅処理 + kill @s[scores={General.Object.Tick=600..}] diff --git a/Asset/data/asset/functions/object/1166.after_glow/tick/beem.mcfunction b/Asset/data/asset/functions/object/1166.after_glow/tick/beem.mcfunction new file mode 100644 index 0000000000..6d21069a86 --- /dev/null +++ b/Asset/data/asset/functions/object/1166.after_glow/tick/beem.mcfunction @@ -0,0 +1,45 @@ +#> asset:object/1166.after_glow/tick/beem +# +# Objectのビームの攻撃処理 +# +# @within asset:object/1166.after_glow/tick/ +#> Private +# @private + #declare score_holder $UserID + #declare tag WF.Hit + +# ビーム召喚(真上向く) + data modify storage api: Argument.ID set value 2168 + data modify storage api: Argument.FieldOverride set value {Color:16711680,Scale:[2f,100f,2f],Frames:[20335,20336,20337]} + execute rotated ~ ~-90 run function api:object/summon +# 音 + playsound minecraft:entity.generic.explode player @a ~ ~ ~ 2.0 0.6 + playsound minecraft:entity.lightning_bolt.impact player @a ~ ~ ~ 2.0 1.5 + playsound minecraft:block.beacon.deactivate player @a ~ ~ ~ 1.5 0.5 + playsound minecraft:entity.dragon_fireball.explode player @a ~ ~ ~ 2.0 0.6 + playsound minecraft:block.glass.break player @a ~ ~ ~ 1.5 0.5 + playsound minecraft:block.lava.extinguish player @a ~ ~ ~ 1.5 0.5 + playsound minecraft:block.respawn_anchor.deplete player @a ~ ~ ~ 2 1.4 + +# ダメージ + 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" + 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 + tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..2] add WF.Hit + execute positioned ~ ~1 ~ run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..2] add WF.Hit + execute positioned ~ ~2 ~ run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..2] add WF.Hit + execute positioned ~ ~3 ~ run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..2] add WF.Hit + execute positioned ~ ~4 ~ run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..2] add WF.Hit + execute positioned ~ ~5 ~ run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..2] add WF.Hit + execute positioned ~ ~6 ~ run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..2] add WF.Hit + execute positioned ~ ~7 ~ run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..2] add WF.Hit + execute positioned ~ ~8 ~ run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..2] add WF.Hit + execute positioned ~ ~9 ~ run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..2] add WF.Hit + execute positioned ~ ~10 ~ run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..2] add WF.Hit + + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=WF.Hit,tag=!Uninterferable] run function api:damage/ + function api:damage/reset + scoreboard players reset $UserID Temporary + tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable] remove WF.Hit diff --git a/Asset/data/asset/functions/object/1166.after_glow/tick/preview.mcfunction b/Asset/data/asset/functions/object/1166.after_glow/tick/preview.mcfunction new file mode 100644 index 0000000000..7a2d094633 --- /dev/null +++ b/Asset/data/asset/functions/object/1166.after_glow/tick/preview.mcfunction @@ -0,0 +1,32 @@ +#> asset:object/1166.after_glow/tick/beem +# +# Objectのビームの予告円 +# +# @within asset:object/1166.after_glow/tick/ + + +# X, Z座標を円形（半径2m）にずらして24個のパーティクルを同時生成 + particle minecraft:dust 1.0 0.0 0.0 0.7 ~1.00 ~0.1 ~0.00 0 0 0 0 1 normal + particle minecraft:dust 1.0 0.0 0.0 0.7 ~0.97 ~0.1 ~0.26 0 0 0 0 1 normal + particle minecraft:dust 1.0 0.0 0.0 0.7 ~0.87 ~0.1 ~0.50 0 0 0 0 1 normal + particle minecraft:dust 1.0 0.0 0.0 0.7 ~0.71 ~0.1 ~0.71 0 0 0 0 1 normal + particle minecraft:dust 1.0 0.0 0.0 0.7 ~0.50 ~0.1 ~0.87 0 0 0 0 1 normal + particle minecraft:dust 1.0 0.0 0.0 0.7 ~0.26 ~0.1 ~0.97 0 0 0 0 1 normal + particle minecraft:dust 1.0 0.0 0.0 0.7 ~0.00 ~0.1 ~1.00 0 0 0 0 1 normal + particle minecraft:dust 1.0 0.0 0.0 0.7 ~-0.26 ~0.1 ~0.97 0 0 0 0 1 normal + particle minecraft:dust 1.0 0.0 0.0 0.7 ~-0.50 ~0.1 ~0.87 0 0 0 0 1 normal + particle minecraft:dust 1.0 0.0 0.0 0.7 ~-0.71 ~0.1 ~0.71 0 0 0 0 1 normal + particle minecraft:dust 1.0 0.0 0.0 0.7 ~-0.87 ~0.1 ~0.50 0 0 0 0 1 normal + particle minecraft:dust 1.0 0.0 0.0 0.7 ~-0.97 ~0.1 ~0.26 0 0 0 0 1 normal + particle minecraft:dust 1.0 0.0 0.0 0.7 ~-1.00 ~0.1 ~0.00 0 0 0 0 1 normal + particle minecraft:dust 1.0 0.0 0.0 0.7 ~-0.97 ~0.1 ~-0.26 0 0 0 0 1 normal + particle minecraft:dust 1.0 0.0 0.0 0.7 ~-0.87 ~0.1 ~-0.50 0 0 0 0 1 normal + particle minecraft:dust 1.0 0.0 0.0 0.7 ~-0.71 ~0.1 ~-0.71 0 0 0 0 1 normal + particle minecraft:dust 1.0 0.0 0.0 0.7 ~-0.50 ~0.1 ~-0.87 0 0 0 0 1 normal + particle minecraft:dust 1.0 0.0 0.0 0.7 ~-0.26 ~0.1 ~-0.97 0 0 0 0 1 normal + particle minecraft:dust 1.0 0.0 0.0 0.7 ~0.00 ~0.1 ~-1.00 0 0 0 0 1 normal + particle minecraft:dust 1.0 0.0 0.0 0.7 ~0.26 ~0.1 ~-0.97 0 0 0 0 1 normal + particle minecraft:dust 1.0 0.0 0.0 0.7 ~0.50 ~0.1 ~-0.87 0 0 0 0 1 normal + particle minecraft:dust 1.0 0.0 0.0 0.7 ~0.71 ~0.1 ~-0.71 0 0 0 0 1 normal + particle minecraft:dust 1.0 0.0 0.0 0.7 ~0.87 ~0.1 ~-0.50 0 0 0 0 1 normal + particle minecraft:dust 1.0 0.0 0.0 0.7 ~0.97 ~0.1 ~-0.26 0 0 0 0 1 normal diff --git a/Asset/data/asset/functions/object/alias/1166/register.mcfunction b/Asset/data/asset/functions/object/alias/1166/register.mcfunction new file mode 100644 index 0000000000..264734327a --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1166/register.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1166/register +# +# Objectのデータ指定処理のエイリアス +# +# @within asset_manager:object/summon/register.m + +# 元の登録処理を呼び出す + function asset:object/1166.after_glow/register \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1166/summon.mcfunction b/Asset/data/asset/functions/object/alias/1166/summon.mcfunction new file mode 100644 index 0000000000..c7f4f8e3f5 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1166/summon.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1166/summon +# +# Object召喚処理のエイリアス +# +# @within asset_manager:object/summon/summon.m + +# 元の召喚処理を呼び出す + function asset:object/1166.after_glow/summon/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1166/tick.mcfunction b/Asset/data/asset/functions/object/alias/1166/tick.mcfunction new file mode 100644 index 0000000000..43d0fdf70c --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1166/tick.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1166/tick +# +# Tick時処理のエイリアス +# +# @within asset_manager:object/tick/tick.m + +# 元のTick処理を呼び出す + function asset:object/1166.after_glow/tick/ \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/artifact/tick.json b/Asset/data/asset/tags/functions/artifact/tick.json index e96dcb04e6..ed309b967e 100644 --- a/Asset/data/asset/tags/functions/artifact/tick.json +++ b/Asset/data/asset/tags/functions/artifact/tick.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1572.after_glow/passeive/1.trigger", "asset:artifact/1324.balance_star/trigger/1.trigger", "asset:artifact/0237.schrodingers_cat/trigger/1.trigger", "asset:artifact/1057.great_demon_head/tick/1.trigger", From 80f97e96f8607d2635029364ba4b48e7fe7bcd68 Mon Sep 17 00:00:00 2001 From: ogachu0331 Date: Thu, 18 Jun 2026 22:40:21 +0900 Subject: [PATCH 4/7] =?UTF-8?q?=E8=AA=AC=E6=98=8E=E6=96=87=E3=81=AE?= =?UTF-8?q?=E4=BD=9C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1572.after_glow/give/2.give.mcfunction | 2 +- .../1166.after_glow/tick/beem.mcfunction | 22 +++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1572.after_glow/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1572.after_glow/give/2.give.mcfunction index 47fb80cd5e..2a6bee2df4 100644 --- a/Asset/data/asset/functions/artifact/1572.after_glow/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1572.after_glow/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '[{"text":"アフ","color":"#ff9900"},{"text":"ター","color":"#ff6600"},{"text":"グロ","color":"#ff3300"},{"text":"ウ","color":"#ff0000"}]' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value [] + data modify storage asset:artifact Lore set value ['{"text":"きわめて強力なレーザーを上空に向けて射出する","color":"white"}','{"text":"レーザーは30秒後に着弾し、敵に致命的なダメージを与える","color":"white"}','{"text":"希望をのせた一筋の光","color":"gray"}'] # 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション) # data modify storage asset:artifact ConsumeItem.Item set value '{"translate":"item.minecraft.stick"}' # data modify storage asset:artifact ConsumeItem.Count set value 1 diff --git a/Asset/data/asset/functions/object/1166.after_glow/tick/beem.mcfunction b/Asset/data/asset/functions/object/1166.after_glow/tick/beem.mcfunction index 6d21069a86..6f7edd4523 100644 --- a/Asset/data/asset/functions/object/1166.after_glow/tick/beem.mcfunction +++ b/Asset/data/asset/functions/object/1166.after_glow/tick/beem.mcfunction @@ -27,17 +27,17 @@ data modify storage api: Argument.ElementType set value "Thunder" 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 - tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..2] add WF.Hit - execute positioned ~ ~1 ~ run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..2] add WF.Hit - execute positioned ~ ~2 ~ run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..2] add WF.Hit - execute positioned ~ ~3 ~ run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..2] add WF.Hit - execute positioned ~ ~4 ~ run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..2] add WF.Hit - execute positioned ~ ~5 ~ run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..2] add WF.Hit - execute positioned ~ ~6 ~ run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..2] add WF.Hit - execute positioned ~ ~7 ~ run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..2] add WF.Hit - execute positioned ~ ~8 ~ run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..2] add WF.Hit - execute positioned ~ ~9 ~ run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..2] add WF.Hit - execute positioned ~ ~10 ~ run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..2] add WF.Hit + tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..1] add WF.Hit + execute positioned ~ ~1 ~ run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..1] add WF.Hit + execute positioned ~ ~2 ~ run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..1] add WF.Hit + execute positioned ~ ~3 ~ run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..1] add WF.Hit + execute positioned ~ ~4 ~ run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..1] add WF.Hit + execute positioned ~ ~5 ~ run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..1] add WF.Hit + execute positioned ~ ~6 ~ run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..1] add WF.Hit + execute positioned ~ ~7 ~ run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..1] add WF.Hit + execute positioned ~ ~8 ~ run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..1] add WF.Hit + execute positioned ~ ~9 ~ run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..1] add WF.Hit + execute positioned ~ ~10 ~ run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..1] add WF.Hit execute as @e[type=#lib:living_without_player,tag=Enemy,tag=WF.Hit,tag=!Uninterferable] run function api:damage/ function api:damage/reset From 860e7c8cd150777e630a638a5024e503e39a1d41 Mon Sep 17 00:00:00 2001 From: ogachu0331 Date: Fri, 19 Jun 2026 17:35:21 +0900 Subject: [PATCH 5/7] =?UTF-8?q?=E6=AD=A3=E3=81=97=E3=81=84=E4=BD=8D?= =?UTF-8?q?=E7=BD=AE=E3=81=AB=E3=83=AC=E3=83=BC=E3=82=B6=E3=83=BC=E3=81=8C?= =?UTF-8?q?=E8=90=BD=E3=81=A1=E3=81=AA=E3=81=84=E3=83=90=E3=82=B0=E3=81=AE?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/artifact/1572.after_glow/give/2.give.mcfunction | 4 ++-- .../artifact/1572.after_glow/passeive/pointer.mcfunction | 2 +- .../artifact/1572.after_glow/trigger/pointer.mcfunction | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1572.after_glow/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1572.after_glow/give/2.give.mcfunction index 2a6bee2df4..9dd9612bc2 100644 --- a/Asset/data/asset/functions/artifact/1572.after_glow/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1572.after_glow/give/2.give.mcfunction @@ -13,9 +13,9 @@ # 神器のベースアイテム data modify storage asset:artifact Item set value "minecraft:carrot_on_a_stick" # 神器の名前 (TextComponentString) - data modify storage asset:artifact Name set value '[{"text":"アフ","color":"#ff9900"},{"text":"ター","color":"#ff6600"},{"text":"グロ","color":"#ff3300"},{"text":"ウ","color":"#ff0000"}]' + data modify storage asset:artifact Name set value '[{"text":"ア","color":"#ff9900"},{"text":"フ","color":"#ff8000"},{"text":"タ","color":"#ff6600"},{"text":"ー","color":"#ff4d00"},{"text":"グ","color":"#ff3300"},{"text":"ロ","color":"#ff1a00"},{"text":"ウ","color":"#ff0000"}]' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text":"きわめて強力なレーザーを上空に向けて射出する","color":"white"}','{"text":"レーザーは30秒後に着弾し、敵に致命的なダメージを与える","color":"white"}','{"text":"希望をのせた一筋の光","color":"gray"}'] + data modify storage asset:artifact Lore set value ['{"text":"きわめて強力なレーザーを上空に向けて射出する","color":"white"}','{"text":"レーザーは30秒後に着弾し、敵に致命的なダメージを与える","color":"white"}','{"text":"“希望がある限り、奇跡は起こる”","color":"gray"}'] # 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション) # data modify storage asset:artifact ConsumeItem.Item set value '{"translate":"item.minecraft.stick"}' # data modify storage asset:artifact ConsumeItem.Count set value 1 diff --git a/Asset/data/asset/functions/artifact/1572.after_glow/passeive/pointer.mcfunction b/Asset/data/asset/functions/artifact/1572.after_glow/passeive/pointer.mcfunction index 4e379cd29c..da59ff3be0 100644 --- a/Asset/data/asset/functions/artifact/1572.after_glow/passeive/pointer.mcfunction +++ b/Asset/data/asset/functions/artifact/1572.after_glow/passeive/pointer.mcfunction @@ -9,7 +9,7 @@ # 視点方向に赤い点 # ブロックに当たったら - execute unless block ^ ^ ^ #lib:no_collision/ run return run particle minecraft:dust 1.0 0.0 0.0 0.5 ^ ^ ^-0.5 0 0 0 0 1 normal + execute unless block ^ ^ ^ #lib:no_collision/ positioned ^ ^ ^-0.5 run return run particle minecraft:dust 1.0 0.0 0.0 0.5 ~ ~ ~ 0 0 0 0 1 normal # 射程限界でも(ついでに無限再起防止) execute unless entity @s[distance=..5] run return run particle minecraft:dust 1.0 0.0 0.0 0.5 ~ ~ ~ 0 0 0 0 1 normal # どちらも満たさないなら再起 diff --git a/Asset/data/asset/functions/artifact/1572.after_glow/trigger/pointer.mcfunction b/Asset/data/asset/functions/artifact/1572.after_glow/trigger/pointer.mcfunction index 9f91ea4520..01d10c0e1f 100644 --- a/Asset/data/asset/functions/artifact/1572.after_glow/trigger/pointer.mcfunction +++ b/Asset/data/asset/functions/artifact/1572.after_glow/trigger/pointer.mcfunction @@ -8,7 +8,7 @@ # 視点方向にビーム召喚 # ブロックに当たったらビーム - execute unless block ^ ^ ^ #lib:no_collision/ rotated ~ -90 run return run function asset:artifact/1572.after_glow/trigger/object_summon + execute unless block ^ ^ ^ #lib:no_collision/ positioned ^ ^ ^-0.5 rotated ~ -90 run return run function asset:artifact/1572.after_glow/trigger/object_summon # 射程限界でビーム(ついでに無限再起防止) execute unless entity @s[distance=..5] rotated ~ -90 run return run function asset:artifact/1572.after_glow/trigger/object_summon # どちらも満たさないなら再起 From 5e485dea95711d28e0392c795a52e1ed168a7fc1 Mon Sep 17 00:00:00 2001 From: ogachu0331 Date: Fri, 19 Jun 2026 18:33:34 +0900 Subject: [PATCH 6/7] =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E6=A9=9F=E3=81=AB?= =?UTF-8?q?=E7=99=BB=E9=8C=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifact/1572.after_glow/register.mcfunction | 8 ++++++++ Asset/data/asset/tags/functions/artifact/register.json | 1 + 2 files changed, 9 insertions(+) create mode 100644 Asset/data/asset/functions/artifact/1572.after_glow/register.mcfunction diff --git a/Asset/data/asset/functions/artifact/1572.after_glow/register.mcfunction b/Asset/data/asset/functions/artifact/1572.after_glow/register.mcfunction new file mode 100644 index 0000000000..347b18b236 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1572.after_glow/register.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1572.after_glow/register +# +# 神器プールへの登録処理 +# +# @within tag/function asset:artifact/register + +data modify storage asset:artifact RarityRegistry[4] append value [1572] +data modify storage asset:artifact RarityRegistryWithColor.Red[4] append value [1572] diff --git a/Asset/data/asset/tags/functions/artifact/register.json b/Asset/data/asset/tags/functions/artifact/register.json index 98587f21f2..dfcf42b32f 100644 --- a/Asset/data/asset/tags/functions/artifact/register.json +++ b/Asset/data/asset/tags/functions/artifact/register.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1572.after_glow/register", "asset:artifact/1534.drop_in_the_bucket/register", "asset:artifact/1365.shaved_ice_blue_hawaii/register", "asset:artifact/1366.shaved_ice_melon/register", From f532106ec8e6c0e9942dde8a50d48faaeaa06ce8 Mon Sep 17 00:00:00 2001 From: ogachu0331 Date: Fri, 19 Jun 2026 23:40:27 +0900 Subject: [PATCH 7/7] =?UTF-8?q?=E6=8C=87=E6=91=98=E7=82=B9=E3=81=AE?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1572.after_glow/give/2.give.mcfunction | 2 +- .../1.trigger.mcfunction | 4 ++-- .../2.check_condition.mcfunction | 6 ++--- .../{passeive => passive}/3.main.mcfunction | 6 ++--- .../{passeive => passive}/pointer.mcfunction | 8 +++---- .../trigger/object_summon.mcfunction | 4 +++- .../object/1166.after_glow/tick/.mcfunction | 7 +++--- .../1166.after_glow/tick/beem.mcfunction | 24 +++++++------------ .../asset/tags/functions/artifact/tick.json | 2 +- 9 files changed, 29 insertions(+), 34 deletions(-) rename Asset/data/asset/functions/artifact/1572.after_glow/{passeive => passive}/1.trigger.mcfunction (72%) rename Asset/data/asset/functions/artifact/1572.after_glow/{passeive => passive}/2.check_condition.mcfunction (64%) rename Asset/data/asset/functions/artifact/1572.after_glow/{passeive => passive}/3.main.mcfunction (62%) rename Asset/data/asset/functions/artifact/1572.after_glow/{passeive => passive}/pointer.mcfunction (75%) diff --git a/Asset/data/asset/functions/artifact/1572.after_glow/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1572.after_glow/give/2.give.mcfunction index 9dd9612bc2..162ba3d13b 100644 --- a/Asset/data/asset/functions/artifact/1572.after_glow/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1572.after_glow/give/2.give.mcfunction @@ -29,7 +29,7 @@ # 神器の発動条件 (TextComponentString) (オプション) # data modify storage asset:artifact Condition set value # 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) - data modify storage asset:artifact AttackInfo.Damage set value [9999] + data modify storage asset:artifact AttackInfo.Damage set value "9999.9" # 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) data modify storage asset:artifact AttackInfo.AttackType set value [Magic] # 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) diff --git a/Asset/data/asset/functions/artifact/1572.after_glow/passeive/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1572.after_glow/passive/1.trigger.mcfunction similarity index 72% rename from Asset/data/asset/functions/artifact/1572.after_glow/passeive/1.trigger.mcfunction rename to Asset/data/asset/functions/artifact/1572.after_glow/passive/1.trigger.mcfunction index a4d7b2a037..b2d083b2f7 100644 --- a/Asset/data/asset/functions/artifact/1572.after_glow/passeive/1.trigger.mcfunction +++ b/Asset/data/asset/functions/artifact/1572.after_glow/passive/1.trigger.mcfunction @@ -1,8 +1,8 @@ -#> asset:artifact/1572.after_glow/passeive/1.trigger +#> asset:artifact/1572.after_glow/passive/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:1572} run function asset:artifact/1572.after_glow/passeive/2.check_condition + execute if data storage asset:context id{mainhand:1572} run function asset:artifact/1572.after_glow/passive/2.check_condition diff --git a/Asset/data/asset/functions/artifact/1572.after_glow/passeive/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1572.after_glow/passive/2.check_condition.mcfunction similarity index 64% rename from Asset/data/asset/functions/artifact/1572.after_glow/passeive/2.check_condition.mcfunction rename to Asset/data/asset/functions/artifact/1572.after_glow/passive/2.check_condition.mcfunction index 5375fe0c78..eaeefb8d5f 100644 --- a/Asset/data/asset/functions/artifact/1572.after_glow/passeive/2.check_condition.mcfunction +++ b/Asset/data/asset/functions/artifact/1572.after_glow/passive/2.check_condition.mcfunction @@ -1,12 +1,12 @@ -#> asset:artifact/1572.after_glow/passeive/2.check_condition +#> asset:artifact/1572.after_glow/passive/2.check_condition # # 神器の発動条件をチェックします # -# @within function asset:artifact/1572.after_glow/passeive/1.trigger +# @within function asset:artifact/1572.after_glow/passive/1.trigger # 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く #function asset:artifact/common/check_condition/mainhand # 他にアイテム等確認する場合はここに書く # CanUsedタグをチェックして3.main.mcfunctionを実行する - function asset:artifact/1572.after_glow/passeive/3.main + function asset:artifact/1572.after_glow/passive/3.main diff --git a/Asset/data/asset/functions/artifact/1572.after_glow/passeive/3.main.mcfunction b/Asset/data/asset/functions/artifact/1572.after_glow/passive/3.main.mcfunction similarity index 62% rename from Asset/data/asset/functions/artifact/1572.after_glow/passeive/3.main.mcfunction rename to Asset/data/asset/functions/artifact/1572.after_glow/passive/3.main.mcfunction index f11551ac23..c053deceeb 100644 --- a/Asset/data/asset/functions/artifact/1572.after_glow/passeive/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1572.after_glow/passive/3.main.mcfunction @@ -1,11 +1,11 @@ -#> asset:artifact/1572.after_glow/passeive/3.main +#> asset:artifact/1572.after_glow/passive/3.main # # 神器のメイン処理部 # -# @within function asset:artifact/1572.after_glow/passeive/2.check_condition +# @within function asset:artifact/1572.after_glow/passive/2.check_condition # 基本的な使用時の処理(MP消費や使用回数の処理など)を行う #function asset:artifact/common/use/mainhand # ここから先は神器側の効果の処理を書く - execute anchored eyes positioned ^ ^ ^0.5 run function asset:artifact/1572.after_glow/passeive/pointer + execute anchored eyes positioned ^ ^ ^0.5 run function asset:artifact/1572.after_glow/passive/pointer diff --git a/Asset/data/asset/functions/artifact/1572.after_glow/passeive/pointer.mcfunction b/Asset/data/asset/functions/artifact/1572.after_glow/passive/pointer.mcfunction similarity index 75% rename from Asset/data/asset/functions/artifact/1572.after_glow/passeive/pointer.mcfunction rename to Asset/data/asset/functions/artifact/1572.after_glow/passive/pointer.mcfunction index da59ff3be0..c493cb5d9a 100644 --- a/Asset/data/asset/functions/artifact/1572.after_glow/passeive/pointer.mcfunction +++ b/Asset/data/asset/functions/artifact/1572.after_glow/passive/pointer.mcfunction @@ -1,10 +1,10 @@ -#> asset:artifact/1572.after_glow/passeive/pointer +#> asset:artifact/1572.after_glow/passive/pointer # # 神器のメイン処理部 # # @within function -# asset:artifact/1572.after_glow/passeive/3.main -# asset:artifact/1572.after_glow/passeive/pointer +# asset:artifact/1572.after_glow/passive/3.main +# asset:artifact/1572.after_glow/passive/pointer # 視点方向に赤い点 @@ -13,4 +13,4 @@ # 射程限界でも(ついでに無限再起防止) execute unless entity @s[distance=..5] run return run particle minecraft:dust 1.0 0.0 0.0 0.5 ~ ~ ~ 0 0 0 0 1 normal # どちらも満たさないなら再起 - execute positioned ^ ^ ^0.5 run function asset:artifact/1572.after_glow/passeive/pointer + execute positioned ^ ^ ^0.5 run function asset:artifact/1572.after_glow/passive/pointer diff --git a/Asset/data/asset/functions/artifact/1572.after_glow/trigger/object_summon.mcfunction b/Asset/data/asset/functions/artifact/1572.after_glow/trigger/object_summon.mcfunction index b2fcee79ef..f155b82483 100644 --- a/Asset/data/asset/functions/artifact/1572.after_glow/trigger/object_summon.mcfunction +++ b/Asset/data/asset/functions/artifact/1572.after_glow/trigger/object_summon.mcfunction @@ -16,6 +16,8 @@ # Object召喚 data modify storage api: Argument.ID set value 1166 # ダメージセット - data modify storage api: Argument.FieldOverride.Damage set value 9999 + data modify storage api: Argument.FieldOverride.Damage set value 9999.9 +# 着弾までの時間 + data modify storage api: Argument.FieldOverride.Tick set value 600 execute store result storage api: Argument.FieldOverride.UserID int 1 run scoreboard players get @s UserID function api:object/summon diff --git a/Asset/data/asset/functions/object/1166.after_glow/tick/.mcfunction b/Asset/data/asset/functions/object/1166.after_glow/tick/.mcfunction index 6032838d32..3b8d91b714 100644 --- a/Asset/data/asset/functions/object/1166.after_glow/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1166.after_glow/tick/.mcfunction @@ -5,8 +5,7 @@ # @within asset:object/alias/1166/tick # Tick加算 - scoreboard players add @s General.Object.Tick 1 + execute store result storage asset:context this.Tick int 0.9999999999 run data get storage asset:context this.Tick 1 + execute if data storage asset:context this{Tick:0} run function asset:object/1166.after_glow/tick/beem +# 着弾地点表示 function asset:object/1166.after_glow/tick/preview - execute if score @s General.Object.Tick matches 600.. run function asset:object/1166.after_glow/tick/beem -# 消滅処理 - kill @s[scores={General.Object.Tick=600..}] diff --git a/Asset/data/asset/functions/object/1166.after_glow/tick/beem.mcfunction b/Asset/data/asset/functions/object/1166.after_glow/tick/beem.mcfunction index 6f7edd4523..19aa2c3325 100644 --- a/Asset/data/asset/functions/object/1166.after_glow/tick/beem.mcfunction +++ b/Asset/data/asset/functions/object/1166.after_glow/tick/beem.mcfunction @@ -6,7 +6,6 @@ #> Private # @private #declare score_holder $UserID - #declare tag WF.Hit # ビーム召喚(真上向く) data modify storage api: Argument.ID set value 2168 @@ -21,25 +20,20 @@ playsound minecraft:block.lava.extinguish player @a ~ ~ ~ 1.5 0.5 playsound minecraft:block.respawn_anchor.deplete player @a ~ ~ ~ 2 1.4 +# 半径1高さ100の円柱型範囲内 + data modify storage lib: Argument.BoundingCylinder.Radius set value 1 + data modify storage lib: Argument.BoundingCylinder.Height set value 101 + data modify storage lib: Argument.BoundingCylinder.Selector set value "@e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable]" + execute positioned ~ ~-1 ~ run function lib:bounding_cylinder/ # ダメージ 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" 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 - tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..1] add WF.Hit - execute positioned ~ ~1 ~ run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..1] add WF.Hit - execute positioned ~ ~2 ~ run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..1] add WF.Hit - execute positioned ~ ~3 ~ run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..1] add WF.Hit - execute positioned ~ ~4 ~ run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..1] add WF.Hit - execute positioned ~ ~5 ~ run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..1] add WF.Hit - execute positioned ~ ~6 ~ run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..1] add WF.Hit - execute positioned ~ ~7 ~ run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..1] add WF.Hit - execute positioned ~ ~8 ~ run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..1] add WF.Hit - execute positioned ~ ~9 ~ run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..1] add WF.Hit - execute positioned ~ ~10 ~ run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..1] add WF.Hit - - execute as @e[type=#lib:living_without_player,tag=Enemy,tag=WF.Hit,tag=!Uninterferable] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=BoundingCylinder,tag=!Uninterferable] run function api:damage/ function api:damage/reset scoreboard players reset $UserID Temporary - tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable] remove WF.Hit + # tagリセット + tag @e[type=#lib:living_without_player,tag=Enemy,tag=BoundingCylinder,tag=!Uninterferable] remove BoundingCylinder + kill @s diff --git a/Asset/data/asset/tags/functions/artifact/tick.json b/Asset/data/asset/tags/functions/artifact/tick.json index ed309b967e..1468a6f576 100644 --- a/Asset/data/asset/tags/functions/artifact/tick.json +++ b/Asset/data/asset/tags/functions/artifact/tick.json @@ -1,6 +1,6 @@ { "values": [ - "asset:artifact/1572.after_glow/passeive/1.trigger", + "asset:artifact/1572.after_glow/passive/1.trigger", "asset:artifact/1324.balance_star/trigger/1.trigger", "asset:artifact/0237.schrodingers_cat/trigger/1.trigger", "asset:artifact/1057.great_demon_head/tick/1.trigger",