From 40570422e05f7227a2a8bef6fb4ca9771f3f77dd Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Mon, 7 Sep 2026 20:36:02 +0200 Subject: [PATCH 01/32] =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E3=81=AEArtifact?= =?UTF-8?q?=E3=82=92=E4=BD=9C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1598.banisher/give/1.trigger.mcfunction | 7 ++ .../1598.banisher/give/2.give.mcfunction | 68 +++++++++++++++++++ .../trigger/1.trigger.mcfunction | 8 +++ .../trigger/2.check_condition.mcfunction | 12 ++++ .../1598.banisher/trigger/3.main.mcfunction | 29 ++++++++ .../1598.banisher/trigger/damage.mcfunction | 16 +++++ .../1598.banisher/trigger/rec.mcfunction | 21 ++++++ .../1598.banisher/trigger/reload.mcfunction | 13 ++++ .../give/1.trigger.mcfunction | 7 ++ .../give/2.give.mcfunction | 68 +++++++++++++++++++ .../trigger/1.trigger.mcfunction | 8 +++ .../trigger/2.check_condition.mcfunction | 14 ++++ .../trigger/3.main.mcfunction | 14 ++++ .../artifact/click.carrot_on_a_stick.json | 3 +- .../asset/tags/functions/artifact/give.json | 4 +- .../tags/functions/artifact/sneak/keep/.json | 1 + 16 files changed, 291 insertions(+), 2 deletions(-) create mode 100644 Asset/data/asset/functions/artifact/1598.banisher/give/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1598.banisher/give/2.give.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1598.banisher/trigger/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1598.banisher/trigger/2.check_condition.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1598.banisher/trigger/3.main.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1598.banisher/trigger/damage.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1598.banisher/trigger/rec.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1598.banisher/trigger/reload.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1599.banisher_empty/give/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1599.banisher_empty/give/2.give.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1599.banisher_empty/trigger/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1599.banisher_empty/trigger/2.check_condition.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1599.banisher_empty/trigger/3.main.mcfunction diff --git a/Asset/data/asset/functions/artifact/1598.banisher/give/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1598.banisher/give/1.trigger.mcfunction new file mode 100644 index 00000000000..6ef185f0ae2 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1598.banisher/give/1.trigger.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1598.banisher/give/1.trigger +# +# 神器の取得処理の呼び出し時に実行されるfunction +# +# @within tag/function asset:artifact/give + +execute if data storage asset:context {id:1598} run function asset:artifact/1598.banisher/give/2.give \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1598.banisher/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1598.banisher/give/2.give.mcfunction new file mode 100644 index 00000000000..88dbf7899c5 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1598.banisher/give/2.give.mcfunction @@ -0,0 +1,68 @@ +#> asset:artifact/1598.banisher/give/2.give +# +# 神器の作成部 ここでID等を定義する +# +# @user +# @within function asset:artifact/1598.banisher/give/1.trigger + +# 神器の説明や消費MPなどをここで設定する。 +# 最後にasset:artifact/common/giveを実行することで入手可能。 + +# 神器のID (int) スプレッドシートの値を入れる + data modify storage asset:artifact ID set value 1598 +# 神器のベースアイテム + data modify storage asset:artifact Item set value "minecraft:carrot_on_a_stick" +# 神器の名前 (TextComponentString) + data modify storage asset:artifact Name set value '{"text": "堕天", "color": "#e1c6f5"}' +# 神器の説明文 (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 4 +# 神器を発動できるスロット (string) Wikiを参照 + data modify storage asset:artifact Slot set value "mainhand" +# 神器のトリガー (string) Wikiを参照 + data modify storage asset:artifact Trigger set value "onClick" +# 神器の発動条件 (TextComponentString) (オプション) + # data modify storage asset:artifact Condition set value +# 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.Damage set value "200 / 2000" +# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.AttackType set value [Magic] +# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.ElementType set value [None] +# 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.BypassResist set value +# 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.IsRangeAttack set value "never" +# 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.AttackRange set value "30.0" +# MP消費量 (int) + data modify storage asset:artifact MPCost set value 15 +# MP必要量 (int) (オプション) + # data modify storage asset:artifact MPRequire set value +# MP回復量 (int) + # data modify storage asset:artifact MPHealWhenHit set value +# 神器のクールダウン (int) (オプション) + # data modify storage asset:artifact LocalCooldown set value +# 種別クールダウン ({Type: string, Duration: int}) (オプション) + data modify storage asset:artifact TypeCooldown.Type set value "longRange" + data modify storage asset:artifact TypeCooldown.Duration set value 4 +# グローバルクールダウン (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 ["Wi-ki", "Rumor"] +# カスタム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/1598.banisher/trigger/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1598.banisher/trigger/1.trigger.mcfunction new file mode 100644 index 00000000000..9a9e3c05b58 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1598.banisher/trigger/1.trigger.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1598.banisher/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:1598} run function asset:artifact/1598.banisher/trigger/2.check_condition \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1598.banisher/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1598.banisher/trigger/2.check_condition.mcfunction new file mode 100644 index 00000000000..1bb079c2aef --- /dev/null +++ b/Asset/data/asset/functions/artifact/1598.banisher/trigger/2.check_condition.mcfunction @@ -0,0 +1,12 @@ +#> asset:artifact/1598.banisher/trigger/2.check_condition +# +# 神器の発動条件をチェックします +# +# @within function asset:artifact/1598.banisher/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/1598.banisher/trigger/3.main \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1598.banisher/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1598.banisher/trigger/3.main.mcfunction new file mode 100644 index 00000000000..68111145710 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1598.banisher/trigger/3.main.mcfunction @@ -0,0 +1,29 @@ +#> asset:artifact/1598.banisher/trigger/3.main +# +# 神器のメイン処理部 +# +# @within function asset:artifact/1598.banisher/trigger/2.check_condition + +#> SpreadLib +# @private + #declare tag SpreadMarker + +# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う + function asset:artifact/common/use/mainhand + +# ここから先は神器側の効果の処理を書く +# 前方拡散 + summon marker ~ ~ ~ {Tags:["SpreadMarker"]} + data modify storage lib: Argument.Distance set value 0.8 + data modify storage lib: Argument.Spread set value 0.1 + execute as @e[type=marker,tag=SpreadMarker,distance=..0.01,limit=1] run function lib:forward_spreader/circle + +# 発射 + execute facing entity @e[type=marker,tag=SpreadMarker,distance=..1,limit=1] feet anchored eyes positioned ^ ^ ^ run function asset:artifact/1598.banisher/trigger/rec + +# 消費時の処理 + function asset:artifact/1598.banisher/trigger/reload + +# リセット + kill @e[type=marker,tag=SpreadMarker,distance=..1,limit=1] + data remove storage lib: Argument diff --git a/Asset/data/asset/functions/artifact/1598.banisher/trigger/damage.mcfunction b/Asset/data/asset/functions/artifact/1598.banisher/trigger/damage.mcfunction new file mode 100644 index 00000000000..135c85c38e7 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1598.banisher/trigger/damage.mcfunction @@ -0,0 +1,16 @@ +#> asset:artifact/1598.banisher/trigger/damage +# +# +# +# @within function asset:artifact/1598.banisher/trigger/rec + +# 攻撃情報設定 + #通常 + execute if entity @s[tag=!Enemy.Boss] run data modify storage api: Argument.Damage set value 200 + #天使 + execute if entity @s[tag=Enemy.Boss] run data modify storage api: Argument.Damage set value 2000 + + data modify storage api: Argument.AttackType set value "Magic" + execute as @p[tag=this] run function api:damage/modifier + function api:damage/ + function api:damage/reset diff --git a/Asset/data/asset/functions/artifact/1598.banisher/trigger/rec.mcfunction b/Asset/data/asset/functions/artifact/1598.banisher/trigger/rec.mcfunction new file mode 100644 index 00000000000..6e1d0ffb76f --- /dev/null +++ b/Asset/data/asset/functions/artifact/1598.banisher/trigger/rec.mcfunction @@ -0,0 +1,21 @@ +#> asset:artifact/1598.banisher/trigger/rec +# +# +# +# @within function asset:artifact/1598.banisher/trigger/** + +#> Private +# @within function asset:artifact/1598.banisher/trigger/** + #declare tag 1598.Target + +# 着弾検知 + execute as @e[type=#lib:living_without_player,tag=!Uninterferable,distance=..2] run tag @s add 1598.Target + execute unless block ^ ^ ^0.5 #lib:no_collision/ run return 0 +# ダメージ処理 + execute as @e[type=#lib:living_without_player,tag=1598.Target,distance=..2,limit=1] run return run function asset:artifact/1598.banisher/trigger/damage + +# 演出 + particle dust 0.973 0.769 0.973 0.5 ~ ~ ~ 0.0 0.0 0.0 0 3 + +# 再帰 + execute positioned ^ ^ ^0.5 if entity @s[distance=..30] run function asset:artifact/1598.banisher/trigger/rec diff --git a/Asset/data/asset/functions/artifact/1598.banisher/trigger/reload.mcfunction b/Asset/data/asset/functions/artifact/1598.banisher/trigger/reload.mcfunction new file mode 100644 index 00000000000..3c598611c90 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1598.banisher/trigger/reload.mcfunction @@ -0,0 +1,13 @@ +#> asset:artifact/1598.banisher/trigger/reload +# +# +# +# @within function asset:artifact/1598.banisher/trigger/3.main + +# 使用回数が残っているならキャンセル + execute if data storage asset:context Items.mainhand.id run return fail + +# アイテム置き換え + data modify storage api: Argument.ID set value 1599 + data modify storage api: Argument.Slot set value "mainhand" + function api:artifact/replace/from_id diff --git a/Asset/data/asset/functions/artifact/1599.banisher_empty/give/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1599.banisher_empty/give/1.trigger.mcfunction new file mode 100644 index 00000000000..9a32bdabc55 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1599.banisher_empty/give/1.trigger.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1599.banisher_empty/give/1.trigger +# +# 神器の取得処理の呼び出し時に実行されるfunction +# +# @within tag/function asset:artifact/give + +execute if data storage asset:context {id:1599} run function asset:artifact/1599.banisher_empty/give/2.give \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1599.banisher_empty/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1599.banisher_empty/give/2.give.mcfunction new file mode 100644 index 00000000000..aa1dc4d2733 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1599.banisher_empty/give/2.give.mcfunction @@ -0,0 +1,68 @@ +#> asset:artifact/1599.banisher_empty/give/2.give +# +# 神器の作成部 ここでID等を定義する +# +# @user +# @within function asset:artifact/1599.banisher_empty/give/1.trigger + +# 神器の説明や消費MPなどをここで設定する。 +# 最後にasset:artifact/common/giveを実行することで入手可能。 + +# 神器のID (int) スプレッドシートの値を入れる + data modify storage asset:artifact ID set value 1599 +# 神器のベースアイテム + data modify storage asset:artifact Item set value "minecraft:stick" +# 神器の名前 (TextComponentString) + data modify storage asset:artifact Name set value '{"text": "堕天 ", "color": "#635671"}' +# 神器の説明文 (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 "keepSneak" +# 神器の発動条件 (TextComponentString) (オプション) + data modify storage asset:artifact Condition set value "非戦闘時" +# 攻撃に関する情報 -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 [Physical,Magic] +# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.ElementType set value [Fire,Water,Thunder,None] +# 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.BypassResist set value +# 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.IsRangeAttack set value +# 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.AttackRange set value +# MP消費量 (int) + data modify storage asset:artifact MPCost set value 50 +# MP必要量 (int) (オプション) + # data modify storage asset:artifact MPRequire set value +# MP回復量 (int) + # data modify storage asset:artifact MPHealWhenHit set value +# 神器のクールダウン (int) (オプション) + # data modify storage asset:artifact LocalCooldown set value +# 種別クールダウン ({Type: string, Duration: int}) (オプション) + # data modify storage asset:artifact TypeCooldown.Type set value + # 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 ["Wi-ki", "Rumor"] +# カスタム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/1599.banisher_empty/trigger/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1599.banisher_empty/trigger/1.trigger.mcfunction new file mode 100644 index 00000000000..66e9b286a47 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1599.banisher_empty/trigger/1.trigger.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1599.banisher_empty/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:1599} run function asset:artifact/1599.banisher_empty/trigger/2.check_condition \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1599.banisher_empty/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1599.banisher_empty/trigger/2.check_condition.mcfunction new file mode 100644 index 00000000000..ab758223e38 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1599.banisher_empty/trigger/2.check_condition.mcfunction @@ -0,0 +1,14 @@ +#> asset:artifact/1599.banisher_empty/trigger/2.check_condition +# +# 神器の発動条件をチェックします +# +# @within function asset:artifact/1599.banisher_empty/trigger/1.trigger + +# 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く + function asset:artifact/common/check_condition/mainhand +# 他にアイテム等確認する場合はここに書く +# 戦闘時ならCanUsed剝奪 + execute if predicate lib:in_battle run tag @s remove CanUsed + +# CanUsedタグをチェックして3.main.mcfunctionを実行する + execute if entity @s[tag=CanUsed] run function asset:artifact/1599.banisher_empty/trigger/3.main diff --git a/Asset/data/asset/functions/artifact/1599.banisher_empty/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1599.banisher_empty/trigger/3.main.mcfunction new file mode 100644 index 00000000000..5731c266664 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1599.banisher_empty/trigger/3.main.mcfunction @@ -0,0 +1,14 @@ +#> asset:artifact/1599.banisher_empty/trigger/3.main +# +# 神器のメイン処理部 +# +# @within function asset:artifact/1599.banisher_empty/trigger/2.check_condition + +# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う + function asset:artifact/common/use/mainhand + +# ここから先は神器側の効果の処理を書く +# リロード + data modify storage api: Argument.ID set value 1598 + data modify storage api: Argument.Slot set value "mainhand" + function api:artifact/replace/from_id 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 8b0fecd8b5f..3fe41094d44 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/1598.banisher/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 fdb7a26c475..5a1f4c0acd2 100644 --- a/Asset/data/asset/tags/functions/artifact/give.json +++ b/Asset/data/asset/tags/functions/artifact/give.json @@ -1,5 +1,7 @@ { "values": [ + "asset:artifact/1599.banisher_empty/give/1.trigger", + "asset:artifact/1598.banisher/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 +542,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/sneak/keep/.json b/Asset/data/asset/tags/functions/artifact/sneak/keep/.json index a4082b5ea7b..2c3387a8f80 100644 --- a/Asset/data/asset/tags/functions/artifact/sneak/keep/.json +++ b/Asset/data/asset/tags/functions/artifact/sneak/keep/.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1599.banisher_empty/trigger/1.trigger", "asset:artifact/0770.shaking_splash_empty/trigger/1.trigger", "asset:artifact/0759.sina_tk_empty/trigger/1.trigger", "asset:artifact/0971.laser_eye_helmet/charge/1.trigger", From f33764569e90f16f58060df1608659e5fc8aaad4 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Mon, 7 Sep 2026 20:42:36 +0200 Subject: [PATCH 02/32] =?UTF-8?q?=E3=83=AA=E3=83=AD=E3=83=BC=E3=83=89?= =?UTF-8?q?=E3=81=AE=E3=83=88=E3=83=AA=E3=82=AC=E3=83=BC=E3=82=92=E5=A4=89?= =?UTF-8?q?=E6=9B=B4&=E4=BD=BF=E7=94=A8=E4=B8=8D=E5=8F=AF=E3=81=AE?= =?UTF-8?q?=E3=81=A8=E3=81=8D=E3=81=AB=E3=83=A1=E3=83=83=E3=82=BB=E3=83=BC?= =?UTF-8?q?=E3=82=B8=E3=82=92=E8=A1=A8=E7=A4=BA=E3=81=99=E3=82=8B=E3=82=88?= =?UTF-8?q?=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifact/1599.banisher_empty/give/2.give.mcfunction | 2 +- .../1599.banisher_empty/trigger/2.check_condition.mcfunction | 1 + Asset/data/asset/tags/functions/artifact/sneak/.json | 3 ++- Asset/data/asset/tags/functions/artifact/sneak/keep/.json | 3 +-- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1599.banisher_empty/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1599.banisher_empty/give/2.give.mcfunction index aa1dc4d2733..9dbbf1253ee 100644 --- a/Asset/data/asset/functions/artifact/1599.banisher_empty/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1599.banisher_empty/give/2.give.mcfunction @@ -25,7 +25,7 @@ # 神器を発動できるスロット (string) Wikiを参照 data modify storage asset:artifact Slot set value "mainhand" # 神器のトリガー (string) Wikiを参照 - data modify storage asset:artifact Trigger set value "keepSneak" + data modify storage asset:artifact Trigger set value "sneak" # 神器の発動条件 (TextComponentString) (オプション) data modify storage asset:artifact Condition set value "非戦闘時" # 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) diff --git a/Asset/data/asset/functions/artifact/1599.banisher_empty/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1599.banisher_empty/trigger/2.check_condition.mcfunction index ab758223e38..f14b98b0b9c 100644 --- a/Asset/data/asset/functions/artifact/1599.banisher_empty/trigger/2.check_condition.mcfunction +++ b/Asset/data/asset/functions/artifact/1599.banisher_empty/trigger/2.check_condition.mcfunction @@ -8,6 +8,7 @@ function asset:artifact/common/check_condition/mainhand # 他にアイテム等確認する場合はここに書く # 戦闘時ならCanUsed剝奪 + execute if predicate lib:in_battle run tellraw @s {"text":"戦闘中はリロードができない！","color":"red"} execute if predicate lib:in_battle run tag @s remove CanUsed # CanUsedタグをチェックして3.main.mcfunctionを実行する diff --git a/Asset/data/asset/tags/functions/artifact/sneak/.json b/Asset/data/asset/tags/functions/artifact/sneak/.json index f345cb5af80..57dfe7201ac 100644 --- a/Asset/data/asset/tags/functions/artifact/sneak/.json +++ b/Asset/data/asset/tags/functions/artifact/sneak/.json @@ -1,4 +1,5 @@ { "values": [ + "asset:artifact/1599.banisher_empty/trigger/1.trigger" ] -} \ No newline at end of file +} diff --git a/Asset/data/asset/tags/functions/artifact/sneak/keep/.json b/Asset/data/asset/tags/functions/artifact/sneak/keep/.json index 2c3387a8f80..b232f8f09d7 100644 --- a/Asset/data/asset/tags/functions/artifact/sneak/keep/.json +++ b/Asset/data/asset/tags/functions/artifact/sneak/keep/.json @@ -1,9 +1,8 @@ { "values": [ - "asset:artifact/1599.banisher_empty/trigger/1.trigger", "asset:artifact/0770.shaking_splash_empty/trigger/1.trigger", "asset:artifact/0759.sina_tk_empty/trigger/1.trigger", "asset:artifact/0971.laser_eye_helmet/charge/1.trigger", "asset:artifact/0573.final_prism/trigger/1.trigger" ] -} \ No newline at end of file +} From 7e6f3f37d4dd0033eaa2428117c9764c83a28bce Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Mon, 7 Sep 2026 21:19:38 +0200 Subject: [PATCH 03/32] =?UTF-8?q?=E6=BC=94=E5=87=BA=E3=82=92=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/artifact/1598.banisher/give/2.give.mcfunction | 2 +- .../artifact/1598.banisher/trigger/3.main.mcfunction | 5 +++++ .../artifact/1598.banisher/trigger/damage.mcfunction | 6 ++++++ .../functions/artifact/1598.banisher/trigger/rec.mcfunction | 4 +++- .../artifact/1599.banisher_empty/trigger/3.main.mcfunction | 4 ++++ 5 files changed, 19 insertions(+), 2 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1598.banisher/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1598.banisher/give/2.give.mcfunction index 88dbf7899c5..88d44497355 100644 --- a/Asset/data/asset/functions/artifact/1598.banisher/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1598.banisher/give/2.give.mcfunction @@ -58,7 +58,7 @@ # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value # 破壊時の音を鳴らさないかどうか (boolean) (オプション) - # data modify storage asset:artifact DisableBreakSound set value + data modify storage asset:artifact DisableBreakSound set value true # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Wi-ki", "Rumor"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) diff --git a/Asset/data/asset/functions/artifact/1598.banisher/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1598.banisher/trigger/3.main.mcfunction index 68111145710..f619ceb2fe2 100644 --- a/Asset/data/asset/functions/artifact/1598.banisher/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1598.banisher/trigger/3.main.mcfunction @@ -21,6 +21,11 @@ # 発射 execute facing entity @e[type=marker,tag=SpreadMarker,distance=..1,limit=1] feet anchored eyes positioned ^ ^ ^ run function asset:artifact/1598.banisher/trigger/rec +# 演出 + playsound entity.firework_rocket.blast player @a ~ ~ ~ 1.0 0.7 + playsound entity.evoker.cast_spell player @a ~ ~ ~ 1.0 1.75 + playsound entity.illusioner.prepare_mirror player @a ~ ~ ~ 1.0 2.0 + # 消費時の処理 function asset:artifact/1598.banisher/trigger/reload diff --git a/Asset/data/asset/functions/artifact/1598.banisher/trigger/damage.mcfunction b/Asset/data/asset/functions/artifact/1598.banisher/trigger/damage.mcfunction index 135c85c38e7..b01b1f3660a 100644 --- a/Asset/data/asset/functions/artifact/1598.banisher/trigger/damage.mcfunction +++ b/Asset/data/asset/functions/artifact/1598.banisher/trigger/damage.mcfunction @@ -14,3 +14,9 @@ execute as @p[tag=this] run function api:damage/modifier function api:damage/ function api:damage/reset + +# 演出 + particle crit ~ ~ ~ 0.2 0.5 0.2 1.0 25 + particle enchanted_hit ~ ~ ~ 0.2 0.5 0.2 1.0 20 + playsound item.trident.return player @a ~ ~ ~ 1.0 2.0 + playsound block.enchantment_table.use player @a ~ ~ ~ 1.0 1.2 diff --git a/Asset/data/asset/functions/artifact/1598.banisher/trigger/rec.mcfunction b/Asset/data/asset/functions/artifact/1598.banisher/trigger/rec.mcfunction index 6e1d0ffb76f..7a5dc0fb3d5 100644 --- a/Asset/data/asset/functions/artifact/1598.banisher/trigger/rec.mcfunction +++ b/Asset/data/asset/functions/artifact/1598.banisher/trigger/rec.mcfunction @@ -15,7 +15,9 @@ execute as @e[type=#lib:living_without_player,tag=1598.Target,distance=..2,limit=1] run return run function asset:artifact/1598.banisher/trigger/damage # 演出 - particle dust 0.973 0.769 0.973 0.5 ~ ~ ~ 0.0 0.0 0.0 0 3 + particle dust 0.22 0.082 0.345 0.2 ~ ~ ~ 0.1 0.1 0.1 0 7 + particle dust 0.478 0.176 0.553 0.2 ~ ~ ~ 0.1 0.1 0.1 0 5 + particle dust 0.973 0.769 0.973 0.5 ~ ~ ~ 0.0 0.0 0.0 0 1 # 再帰 execute positioned ^ ^ ^0.5 if entity @s[distance=..30] run function asset:artifact/1598.banisher/trigger/rec diff --git a/Asset/data/asset/functions/artifact/1599.banisher_empty/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1599.banisher_empty/trigger/3.main.mcfunction index 5731c266664..9dbe1c8a097 100644 --- a/Asset/data/asset/functions/artifact/1599.banisher_empty/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1599.banisher_empty/trigger/3.main.mcfunction @@ -12,3 +12,7 @@ data modify storage api: Argument.ID set value 1598 data modify storage api: Argument.Slot set value "mainhand" function api:artifact/replace/from_id + +# 演出 + playsound block.iron_door.open player @a ~ ~ ~ 2.0 1.7 + playsound block.amethyst_block.break player @a ~ ~ ~ 1.0 0.5 From ddc246cdd38262f6312a015c39eec121fde5752b Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Tue, 8 Sep 2026 17:25:50 +0200 Subject: [PATCH 04/32] =?UTF-8?q?=E7=89=B9=E6=AE=8Avfx=E3=82=92=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifact/1598.banisher/trigger/3.main.mcfunction | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/artifact/1598.banisher/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1598.banisher/trigger/3.main.mcfunction index f619ceb2fe2..6806a31112e 100644 --- a/Asset/data/asset/functions/artifact/1598.banisher/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1598.banisher/trigger/3.main.mcfunction @@ -19,12 +19,20 @@ execute as @e[type=marker,tag=SpreadMarker,distance=..0.01,limit=1] run function lib:forward_spreader/circle # 発射 - execute facing entity @e[type=marker,tag=SpreadMarker,distance=..1,limit=1] feet anchored eyes positioned ^ ^ ^ run function asset:artifact/1598.banisher/trigger/rec + execute facing entity @e[type=marker,tag=SpreadMarker,distance=..1,limit=1] feet anchored eyes positioned ^-0.14 ^-0.05 ^0.35 run function asset:artifact/1598.banisher/trigger/rec # 演出 playsound entity.firework_rocket.blast player @a ~ ~ ~ 1.0 0.7 playsound entity.evoker.cast_spell player @a ~ ~ ~ 1.0 1.75 playsound entity.illusioner.prepare_mirror player @a ~ ~ ~ 1.0 2.0 + # 特殊vfx + data modify storage api: Argument.FieldOverride.Item set value {id:"minecraft:stick",Count:1b} + data modify storage api: Argument.FieldOverride.Scale set value [0.5f,0.5f,0.0f] + data modify storage api: Argument.FieldOverride.Frames set value [20640,20641,20642,20643,20644,20645,20646] + data modify storage api: Argument.FieldOverride.LockRotation set value false + data modify storage api: Argument.FieldOverride.Transformation.left_rotation set value {axis:[1.0f, 0.0f, 0.0f], angle:1.577f} + data modify storage api: Argument.ID set value 2001 + execute anchored eyes positioned ^-0.14 ^-0.05 ^0.35 run function api:object/summon # 消費時の処理 function asset:artifact/1598.banisher/trigger/reload From 81c9501868c1ab23a4a05e536990edf19017ea67 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Tue, 8 Sep 2026 17:44:20 +0200 Subject: [PATCH 05/32] =?UTF-8?q?=E5=9B=9E=E5=BE=A9=E5=8A=B9=E6=9E=9C?= =?UTF-8?q?=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{damage.mcfunction => damage/.mcfunction} | 4 ++-- .../1598.banisher/trigger/damage/boss.mcfunction | 14 ++++++++++++++ .../artifact/1598.banisher/trigger/rec.mcfunction | 2 +- 3 files changed, 17 insertions(+), 3 deletions(-) rename Asset/data/asset/functions/artifact/1598.banisher/trigger/{damage.mcfunction => damage/.mcfunction} (78%) create mode 100644 Asset/data/asset/functions/artifact/1598.banisher/trigger/damage/boss.mcfunction diff --git a/Asset/data/asset/functions/artifact/1598.banisher/trigger/damage.mcfunction b/Asset/data/asset/functions/artifact/1598.banisher/trigger/damage/.mcfunction similarity index 78% rename from Asset/data/asset/functions/artifact/1598.banisher/trigger/damage.mcfunction rename to Asset/data/asset/functions/artifact/1598.banisher/trigger/damage/.mcfunction index b01b1f3660a..b3ad59abed9 100644 --- a/Asset/data/asset/functions/artifact/1598.banisher/trigger/damage.mcfunction +++ b/Asset/data/asset/functions/artifact/1598.banisher/trigger/damage/.mcfunction @@ -1,4 +1,4 @@ -#> asset:artifact/1598.banisher/trigger/damage +#> asset:artifact/1598.banisher/trigger/damage/ # # # @@ -8,7 +8,7 @@ #通常 execute if entity @s[tag=!Enemy.Boss] run data modify storage api: Argument.Damage set value 200 #天使 - execute if entity @s[tag=Enemy.Boss] run data modify storage api: Argument.Damage set value 2000 + execute if entity @s[tag=Enemy.Boss] as @p[tag=this] run function asset:artifact/1598.banisher/trigger/damage/boss data modify storage api: Argument.AttackType set value "Magic" execute as @p[tag=this] run function api:damage/modifier diff --git a/Asset/data/asset/functions/artifact/1598.banisher/trigger/damage/boss.mcfunction b/Asset/data/asset/functions/artifact/1598.banisher/trigger/damage/boss.mcfunction new file mode 100644 index 00000000000..fff4237e1ff --- /dev/null +++ b/Asset/data/asset/functions/artifact/1598.banisher/trigger/damage/boss.mcfunction @@ -0,0 +1,14 @@ +#> asset:artifact/1598.banisher/trigger/damage/boss +# +# +# +# @within function asset:artifact/1598.banisher/trigger/damage/ + +# 先に回復 + data modify storage api: Argument.Heal set value 20.0f + function api:heal/modifier + function api:heal/ + function api:heal/reset + +# ダメージ値を設定 + data modify storage api: Argument.Damage set value 2000 diff --git a/Asset/data/asset/functions/artifact/1598.banisher/trigger/rec.mcfunction b/Asset/data/asset/functions/artifact/1598.banisher/trigger/rec.mcfunction index 7a5dc0fb3d5..a38decbf320 100644 --- a/Asset/data/asset/functions/artifact/1598.banisher/trigger/rec.mcfunction +++ b/Asset/data/asset/functions/artifact/1598.banisher/trigger/rec.mcfunction @@ -12,7 +12,7 @@ execute as @e[type=#lib:living_without_player,tag=!Uninterferable,distance=..2] run tag @s add 1598.Target execute unless block ^ ^ ^0.5 #lib:no_collision/ run return 0 # ダメージ処理 - execute as @e[type=#lib:living_without_player,tag=1598.Target,distance=..2,limit=1] run return run function asset:artifact/1598.banisher/trigger/damage + execute as @e[type=#lib:living_without_player,tag=1598.Target,distance=..2,limit=1] run return run function asset:artifact/1598.banisher/trigger/damage/ # 演出 particle dust 0.22 0.082 0.345 0.2 ~ ~ ~ 0.1 0.1 0.1 0 7 From dd9dcbf0b187352a33297e653e5e25b27a76f079 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Tue, 8 Sep 2026 17:54:56 +0200 Subject: [PATCH 06/32] =?UTF-8?q?Lore=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/artifact/1598.banisher/give/2.give.mcfunction | 2 +- .../artifact/1599.banisher_empty/give/2.give.mcfunction | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1598.banisher/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1598.banisher/give/2.give.mcfunction index 88d44497355..c206e987728 100644 --- a/Asset/data/asset/functions/artifact/1598.banisher/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1598.banisher/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text": "堕天", "color": "#e1c6f5"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value [] + data modify storage asset:artifact Lore set value ['{"text": "天使を攻撃すると、威力が", "extra": [{"text": "10倍", "color": "#9c81d3"}, {"text": "になり、体力を", "color": "white"}, {"text": "20", "color": "green"}, {"text": "回復する。", "color": "white"}]}', '{"text": "弾が尽きても、非戦闘時ならリロードが可能だ。"}', '{"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/1599.banisher_empty/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1599.banisher_empty/give/2.give.mcfunction index 9dbbf1253ee..81873de866b 100644 --- a/Asset/data/asset/functions/artifact/1599.banisher_empty/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1599.banisher_empty/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text": "堕天 ", "color": "#635671"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value [] + data modify storage asset:artifact Lore set value ['{"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.stick"}' # data modify storage asset:artifact ConsumeItem.Count set value 1 From 2df3806197af152f1db77fb20a11779ccf120168 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Tue, 8 Sep 2026 18:15:55 +0200 Subject: [PATCH 07/32] =?UTF-8?q?=E3=82=AF=E3=83=BC=E3=83=AB=E3=83=80?= =?UTF-8?q?=E3=82=A6=E3=83=B3=E3=82=92=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/artifact/1598.banisher/give/2.give.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/artifact/1598.banisher/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1598.banisher/give/2.give.mcfunction index c206e987728..8dbbef4f6da 100644 --- a/Asset/data/asset/functions/artifact/1598.banisher/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1598.banisher/give/2.give.mcfunction @@ -50,7 +50,7 @@ # data modify storage asset:artifact LocalCooldown set value # 種別クールダウン ({Type: string, Duration: int}) (オプション) data modify storage asset:artifact TypeCooldown.Type set value "longRange" - data modify storage asset:artifact TypeCooldown.Duration set value 4 + data modify storage asset:artifact TypeCooldown.Duration set value 8 # グローバルクールダウン (int) (オプション) # data modify storage asset:artifact SpecialCooldown set value # クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) From 811a9832fa02e15bd28d08567473c819269c50d5 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Tue, 15 Sep 2026 18:01:17 +0200 Subject: [PATCH 08/32] =?UTF-8?q?=E5=9B=9E=E5=BE=A9=E5=8A=B9=E6=9E=9C?= =?UTF-8?q?=E3=82=92=E6=AE=8B=E7=95=99=E3=83=80=E3=83=A1=E3=83=BC=E3=82=B8?= =?UTF-8?q?=E3=81=AB=E5=B7=AE=E3=81=97=E6=9B=BF=E3=81=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1598.banisher/trigger/damage/.mcfunction | 4 ++-- .../trigger/damage/boss.mcfunction | 15 ++++++------ .../1188.banishing_ring/init/.mcfunction | 7 ++++++ .../1188.banishing_ring/register.mcfunction | 24 +++++++++++++++++++ .../1188.banishing_ring/summon/.mcfunction | 8 +++++++ .../summon/debug.mcfunction | 10 ++++++++ .../1188.banishing_ring/tick/.mcfunction | 15 ++++++++++++ .../tick/damage.mcfunction | 24 +++++++++++++++++++ .../object/alias/1188/init.mcfunction | 8 +++++++ .../object/alias/1188/register.mcfunction | 8 +++++++ .../object/alias/1188/summon.mcfunction | 8 +++++++ .../object/alias/1188/tick.mcfunction | 8 +++++++ 12 files changed, 130 insertions(+), 9 deletions(-) create mode 100644 Asset/data/asset/functions/object/1188.banishing_ring/init/.mcfunction create mode 100644 Asset/data/asset/functions/object/1188.banishing_ring/register.mcfunction create mode 100644 Asset/data/asset/functions/object/1188.banishing_ring/summon/.mcfunction create mode 100644 Asset/data/asset/functions/object/1188.banishing_ring/summon/debug.mcfunction create mode 100644 Asset/data/asset/functions/object/1188.banishing_ring/tick/.mcfunction create mode 100644 Asset/data/asset/functions/object/1188.banishing_ring/tick/damage.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1188/init.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1188/register.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1188/summon.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1188/tick.mcfunction diff --git a/Asset/data/asset/functions/artifact/1598.banisher/trigger/damage/.mcfunction b/Asset/data/asset/functions/artifact/1598.banisher/trigger/damage/.mcfunction index b3ad59abed9..11031c94473 100644 --- a/Asset/data/asset/functions/artifact/1598.banisher/trigger/damage/.mcfunction +++ b/Asset/data/asset/functions/artifact/1598.banisher/trigger/damage/.mcfunction @@ -6,8 +6,8 @@ # 攻撃情報設定 #通常 - execute if entity @s[tag=!Enemy.Boss] run data modify storage api: Argument.Damage set value 200 - #天使 + data modify storage api: Argument.Damage set value 200 + #天使が対象の場合は残留攻撃を召喚 execute if entity @s[tag=Enemy.Boss] as @p[tag=this] run function asset:artifact/1598.banisher/trigger/damage/boss data modify storage api: Argument.AttackType set value "Magic" diff --git a/Asset/data/asset/functions/artifact/1598.banisher/trigger/damage/boss.mcfunction b/Asset/data/asset/functions/artifact/1598.banisher/trigger/damage/boss.mcfunction index fff4237e1ff..2e14a363330 100644 --- a/Asset/data/asset/functions/artifact/1598.banisher/trigger/damage/boss.mcfunction +++ b/Asset/data/asset/functions/artifact/1598.banisher/trigger/damage/boss.mcfunction @@ -4,11 +4,12 @@ # # @within function asset:artifact/1598.banisher/trigger/damage/ -# 先に回復 - data modify storage api: Argument.Heal set value 20.0f - function api:heal/modifier - function api:heal/ - function api:heal/reset +# 残留攻撃(Object 1188)を召喚 + data modify storage api: Argument.ID set value 1188 + execute store result storage api: Argument.UserID int 1 run scoreboard players get @s UserID + #攻撃情報を持たせる + data modify storage api: Argument.FieldOverride.Damage set value 200 + data modify storage api: Argument.FieldOverride.AttackType set value "Magic" + data modify storage api: Argument.FieldOverride.AttackElement set value "None" -# ダメージ値を設定 - data modify storage api: Argument.Damage set value 2000 + function api:object/summon diff --git a/Asset/data/asset/functions/object/1188.banishing_ring/init/.mcfunction b/Asset/data/asset/functions/object/1188.banishing_ring/init/.mcfunction new file mode 100644 index 00000000000..e9358b68214 --- /dev/null +++ b/Asset/data/asset/functions/object/1188.banishing_ring/init/.mcfunction @@ -0,0 +1,7 @@ +#> asset:object/1188.banishing_ring/init/ +# +# Objectのinit時の処理 +# +# @within asset:object/alias/1188/init + +# とりあえず空 diff --git a/Asset/data/asset/functions/object/1188.banishing_ring/register.mcfunction b/Asset/data/asset/functions/object/1188.banishing_ring/register.mcfunction new file mode 100644 index 00000000000..97746107263 --- /dev/null +++ b/Asset/data/asset/functions/object/1188.banishing_ring/register.mcfunction @@ -0,0 +1,24 @@ +#> asset:object/1188.banishing_ring/register +# +# Objectのデータを指定 +# +# @within function asset:object/alias/1188/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 1188 +# フィールド(オプション) + data modify storage asset:object Field.Damage set value 0 + data modify storage asset:object Field.DamageType set value "" + data modify storage asset:object Field.ElementType set value "" + data modify storage asset:object Field.Interval set value 20 + data modify storage asset:object Field.UserID set value 0 diff --git a/Asset/data/asset/functions/object/1188.banishing_ring/summon/.mcfunction b/Asset/data/asset/functions/object/1188.banishing_ring/summon/.mcfunction new file mode 100644 index 00000000000..510a41f804c --- /dev/null +++ b/Asset/data/asset/functions/object/1188.banishing_ring/summon/.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/1188.banishing_ring/summon/ +# +# Object召喚処理の呼び出し時に実行されるfunction +# +# @within asset:object/alias/1188/summon + +# 元となるEntityを召喚する + summon item_display ~ ~ ~ {Tags:["ObjectInit"],item:{id:"minecraft:stick", Count:1b, tag:{CustomModelData:20650}}} diff --git a/Asset/data/asset/functions/object/1188.banishing_ring/summon/debug.mcfunction b/Asset/data/asset/functions/object/1188.banishing_ring/summon/debug.mcfunction new file mode 100644 index 00000000000..ef784603f09 --- /dev/null +++ b/Asset/data/asset/functions/object/1188.banishing_ring/summon/debug.mcfunction @@ -0,0 +1,10 @@ +#> asset:object/1188.banishing_ring/summon/debug +# +# 動作チェック用の召喚処理 使い終わったら消してもいいかも +# +# @user +# @private + +# 召喚 + data modify storage api: Argument.ID set value 1188 + function api:object/summon \ No newline at end of file diff --git a/Asset/data/asset/functions/object/1188.banishing_ring/tick/.mcfunction b/Asset/data/asset/functions/object/1188.banishing_ring/tick/.mcfunction new file mode 100644 index 00000000000..1f30b6875e7 --- /dev/null +++ b/Asset/data/asset/functions/object/1188.banishing_ring/tick/.mcfunction @@ -0,0 +1,15 @@ +#> asset:object/1188.banishing_ring/tick/ +# +# Objectのtick時の処理 +# +# @within asset:object/alias/1188/tick + +# Tick加算 + scoreboard players add @s General.Object.Tick 1 + +# Interval減算 + 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/1188.banishing_ring/tick/damage + +# 消滅処理 + kill @s[scores={General.Object.Tick=160..}] diff --git a/Asset/data/asset/functions/object/1188.banishing_ring/tick/damage.mcfunction b/Asset/data/asset/functions/object/1188.banishing_ring/tick/damage.mcfunction new file mode 100644 index 00000000000..b7fc858b54e --- /dev/null +++ b/Asset/data/asset/functions/object/1188.banishing_ring/tick/damage.mcfunction @@ -0,0 +1,24 @@ +#> asset:object/1188.banishing_ring/tick/damage +# +# +# +# @within function asset:object/1188.banishing_ring/tick/ + +#> Private +# @private + #declare score_holder $UserID + +# 半径4ブロックに攻撃 + #攻撃情報はFieldから + 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 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 as @e[type=#lib:living_without_player,tag=Enemy.Boss,distance=..2] run function api:damage/ + +# リセット + data modify storage asset:context this.Interval set value 20 + scoreboard players reset $UserID Temporary diff --git a/Asset/data/asset/functions/object/alias/1188/init.mcfunction b/Asset/data/asset/functions/object/alias/1188/init.mcfunction new file mode 100644 index 00000000000..fb56f31623a --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1188/init.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1188/init +# +# Init処理のエイリアス +# +# @within asset_manager:object/init/init.m + +# 元のInit処理を呼び出す + function asset:object/1188.banishing_ring/init/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1188/register.mcfunction b/Asset/data/asset/functions/object/alias/1188/register.mcfunction new file mode 100644 index 00000000000..1f186ff7a87 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1188/register.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1188/register +# +# Objectのデータ指定処理のエイリアス +# +# @within asset_manager:object/summon/register.m + +# 元の登録処理を呼び出す + function asset:object/1188.banishing_ring/register \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1188/summon.mcfunction b/Asset/data/asset/functions/object/alias/1188/summon.mcfunction new file mode 100644 index 00000000000..718340da7f3 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1188/summon.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1188/summon +# +# Object召喚処理のエイリアス +# +# @within asset_manager:object/summon/summon.m + +# 元の召喚処理を呼び出す + function asset:object/1188.banishing_ring/summon/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1188/tick.mcfunction b/Asset/data/asset/functions/object/alias/1188/tick.mcfunction new file mode 100644 index 00000000000..444ffa9b301 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1188/tick.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1188/tick +# +# Tick時処理のエイリアス +# +# @within asset_manager:object/tick/tick.m + +# 元のTick処理を呼び出す + function asset:object/1188.banishing_ring/tick/ \ No newline at end of file From d78e14cdf7c0507a6ec1bd066703b6d70ee7773f Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Tue, 15 Sep 2026 20:18:52 +0200 Subject: [PATCH 09/32] =?UTF-8?q?Lore=E3=82=84=E6=94=BB=E6=92=83=E6=83=85?= =?UTF-8?q?=E5=A0=B1=E3=82=92=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/artifact/1598.banisher/give/2.give.mcfunction | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1598.banisher/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1598.banisher/give/2.give.mcfunction index 8dbbef4f6da..ed191b7aa8c 100644 --- a/Asset/data/asset/functions/artifact/1598.banisher/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1598.banisher/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text": "堕天", "color": "#e1c6f5"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text": "天使を攻撃すると、威力が", "extra": [{"text": "10倍", "color": "#9c81d3"}, {"text": "になり、体力を", "color": "white"}, {"text": "20", "color": "green"}, {"text": "回復する。", "color": "white"}]}', '{"text": "弾が尽きても、非戦闘時ならリロードが可能だ。"}', '{"text": "「力ある者、天より堕とされる運命にあり」", "color": "gray"}'] + data modify storage asset:artifact Lore set value ['{"text": "天使を攻撃すると、命中した場所に天使の輪を召喚する。"}', '{"text": "輪は8秒の間、1秒に200ダメージを与え続ける。"}', '{"text": "弾が尽きても、非戦闘時ならリロードが可能だ。"}', '{"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 @@ -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 "200 / 2000" + data modify storage asset:artifact AttackInfo.Damage set value "200 / 200x8" # 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) data modify storage asset:artifact AttackInfo.AttackType set value [Magic] # 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) From 7c282d5d0ce1b9d861a355a8dc1d47cdcb217aa4 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Wed, 16 Sep 2026 18:33:21 +0200 Subject: [PATCH 10/32] =?UTF-8?q?=E6=AE=8B=E7=95=99=E6=94=BB=E6=92=83?= =?UTF-8?q?=E3=81=AEtransformation=E3=82=92=E3=83=86=E3=82=AF=E3=82=B9?= =?UTF-8?q?=E3=83=81=E3=83=A3=E3=81=AB=E5=90=88=E3=82=8F=E3=81=9B=E3=81=A6?= =?UTF-8?q?=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifact/1598.banisher/trigger/damage/boss.mcfunction | 2 +- .../functions/object/1188.banishing_ring/init/.mcfunction | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/artifact/1598.banisher/trigger/damage/boss.mcfunction b/Asset/data/asset/functions/artifact/1598.banisher/trigger/damage/boss.mcfunction index 2e14a363330..a6940d66b42 100644 --- a/Asset/data/asset/functions/artifact/1598.banisher/trigger/damage/boss.mcfunction +++ b/Asset/data/asset/functions/artifact/1598.banisher/trigger/damage/boss.mcfunction @@ -12,4 +12,4 @@ data modify storage api: Argument.FieldOverride.AttackType set value "Magic" data modify storage api: Argument.FieldOverride.AttackElement set value "None" - function api:object/summon + execute positioned ^ ^ ^0.5 run function api:object/summon diff --git a/Asset/data/asset/functions/object/1188.banishing_ring/init/.mcfunction b/Asset/data/asset/functions/object/1188.banishing_ring/init/.mcfunction index e9358b68214..261427d8619 100644 --- a/Asset/data/asset/functions/object/1188.banishing_ring/init/.mcfunction +++ b/Asset/data/asset/functions/object/1188.banishing_ring/init/.mcfunction @@ -5,3 +5,6 @@ # @within asset:object/alias/1188/init # とりあえず空 + data modify entity @s transformation.scale set value [4.5f,4.5f,0.0f] + data modify entity @s transformation.translation set value [0.0f,0.01f,0.0f] + data modify entity @s transformation.left_rotation set value {axis:[1.0f, 0.0f, 0.0f], angle:1.5708f} From 0194b29f4868218d47ec389f7ffd71925a8510b5 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Wed, 16 Sep 2026 18:37:57 +0200 Subject: [PATCH 11/32] =?UTF-8?q?Lore=E3=82=92=E5=BE=AE=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/artifact/1598.banisher/give/2.give.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/artifact/1598.banisher/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1598.banisher/give/2.give.mcfunction index ed191b7aa8c..99fcb9c75f0 100644 --- a/Asset/data/asset/functions/artifact/1598.banisher/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1598.banisher/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text": "堕天", "color": "#e1c6f5"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text": "天使を攻撃すると、命中した場所に天使の輪を召喚する。"}', '{"text": "輪は8秒の間、1秒に200ダメージを与え続ける。"}', '{"text": "弾が尽きても、非戦闘時ならリロードが可能だ。"}', '{"text": "「力ある者、天より堕とされる運命にあり」", "color": "gray"}'] + data modify storage asset:artifact Lore set value ['{"text": "天使を攻撃すると、命中した場所に天使の輪を召喚する。"}', '{"text": "輪は8秒間残り、内側にいる天使に毎秒200のダメージを与え続ける。"}', '{"text": "弾が尽きても、非戦闘時ならリロードが可能だ。"}', '{"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 From e0b8c904e17096207adca328734da314a9e379fe Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Wed, 16 Sep 2026 18:43:41 +0200 Subject: [PATCH 12/32] =?UTF-8?q?=E6=AE=8B=E7=95=99=E6=94=BB=E6=92=83?= =?UTF-8?q?=E3=81=AE=E6=8C=99=E5=8B=95=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifact/1598.banisher/trigger/damage/boss.mcfunction | 2 +- .../functions/object/1188.banishing_ring/tick/damage.mcfunction | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1598.banisher/trigger/damage/boss.mcfunction b/Asset/data/asset/functions/artifact/1598.banisher/trigger/damage/boss.mcfunction index a6940d66b42..bd7f3346aad 100644 --- a/Asset/data/asset/functions/artifact/1598.banisher/trigger/damage/boss.mcfunction +++ b/Asset/data/asset/functions/artifact/1598.banisher/trigger/damage/boss.mcfunction @@ -6,7 +6,7 @@ # 残留攻撃(Object 1188)を召喚 data modify storage api: Argument.ID set value 1188 - execute store result storage api: Argument.UserID int 1 run scoreboard players get @s UserID + execute store result storage api: Argument.FieldOverride.UserID int 1 run scoreboard players get @s UserID #攻撃情報を持たせる data modify storage api: Argument.FieldOverride.Damage set value 200 data modify storage api: Argument.FieldOverride.AttackType set value "Magic" diff --git a/Asset/data/asset/functions/object/1188.banishing_ring/tick/damage.mcfunction b/Asset/data/asset/functions/object/1188.banishing_ring/tick/damage.mcfunction index b7fc858b54e..4533eb87e1c 100644 --- a/Asset/data/asset/functions/object/1188.banishing_ring/tick/damage.mcfunction +++ b/Asset/data/asset/functions/object/1188.banishing_ring/tick/damage.mcfunction @@ -16,8 +16,8 @@ #召喚したプレイヤー取得 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 as @e[type=#lib:living_without_player,tag=Enemy.Boss,distance=..2] run function api:damage/ + function api:damage/reset # リセット data modify storage asset:context this.Interval set value 20 From ccc886d2247d5fad80381025759041e975978222 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Wed, 16 Sep 2026 21:21:01 +0200 Subject: [PATCH 13/32] =?UTF-8?q?=E6=BC=94=E5=87=BA=E3=82=92=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../object/1188.banishing_ring/tick/damage.mcfunction | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Asset/data/asset/functions/object/1188.banishing_ring/tick/damage.mcfunction b/Asset/data/asset/functions/object/1188.banishing_ring/tick/damage.mcfunction index 4533eb87e1c..5fb468e13ff 100644 --- a/Asset/data/asset/functions/object/1188.banishing_ring/tick/damage.mcfunction +++ b/Asset/data/asset/functions/object/1188.banishing_ring/tick/damage.mcfunction @@ -19,6 +19,13 @@ execute as @e[type=#lib:living_without_player,tag=Enemy.Boss,distance=..2] run function api:damage/ function api:damage/reset +# 演出 + particle flash ~ ~ ~ 0 0 0 1 1 + particle end_rod ~ ~2 ~ 0 2 0 0.1 30 + particle witch ~ ~ ~ 0.5 0.5 0.5 0.15 60 + playsound block.amethyst_cluster.break player @a ~ ~ ~ 1 0.5 + playsound entity.evoker.prepare_summon player @a ~ ~ ~ 1 1.75 + # リセット data modify storage asset:context this.Interval set value 20 scoreboard players reset $UserID Temporary From c7b9ebbdf757fca6f047b5cce61b84a1f7c311af Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Wed, 16 Sep 2026 21:21:15 +0200 Subject: [PATCH 14/32] =?UTF-8?q?=E6=AE=8B=E7=95=99=E6=94=BB=E6=92=83?= =?UTF-8?q?=E3=81=AEbrightness=E3=82=92=E6=9C=80=E5=A4=A7=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/object/1188.banishing_ring/summon/.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/object/1188.banishing_ring/summon/.mcfunction b/Asset/data/asset/functions/object/1188.banishing_ring/summon/.mcfunction index 510a41f804c..952243864de 100644 --- a/Asset/data/asset/functions/object/1188.banishing_ring/summon/.mcfunction +++ b/Asset/data/asset/functions/object/1188.banishing_ring/summon/.mcfunction @@ -5,4 +5,4 @@ # @within asset:object/alias/1188/summon # 元となるEntityを召喚する - summon item_display ~ ~ ~ {Tags:["ObjectInit"],item:{id:"minecraft:stick", Count:1b, tag:{CustomModelData:20650}}} + summon item_display ~ ~ ~ {Tags:["ObjectInit"],item:{id:"minecraft:stick", Count:1b, tag:{CustomModelData:20650}}, brightness:{block:15,sky:15}} From 75bed70de07f281c0bcaff5c4a0e4781e89a9932 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Thu, 1 Oct 2026 18:15:28 +0200 Subject: [PATCH 15/32] =?UTF-8?q?=E6=AE=8B=E7=95=99=E6=94=BB=E6=92=83?= =?UTF-8?q?=E3=81=AB=E5=87=BA=E7=8F=BE=E6=BC=94=E5=87=BA=E3=82=92=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/object/1188.banishing_ring/init/.mcfunction | 6 ++++-- .../functions/object/1188.banishing_ring/summon/.mcfunction | 2 +- .../functions/object/1188.banishing_ring/tick/.mcfunction | 3 +++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Asset/data/asset/functions/object/1188.banishing_ring/init/.mcfunction b/Asset/data/asset/functions/object/1188.banishing_ring/init/.mcfunction index 261427d8619..400d2ad6c32 100644 --- a/Asset/data/asset/functions/object/1188.banishing_ring/init/.mcfunction +++ b/Asset/data/asset/functions/object/1188.banishing_ring/init/.mcfunction @@ -4,7 +4,9 @@ # # @within asset:object/alias/1188/init -# とりあえず空 - data modify entity @s transformation.scale set value [4.5f,4.5f,0.0f] +# transformationを設定 + data modify entity @s transformation.scale set value [0.0f,0.0f,0.0f] data modify entity @s transformation.translation set value [0.0f,0.01f,0.0f] data modify entity @s transformation.left_rotation set value {axis:[1.0f, 0.0f, 0.0f], angle:1.5708f} + + data modify entity @s start_interpolation set value 2 diff --git a/Asset/data/asset/functions/object/1188.banishing_ring/summon/.mcfunction b/Asset/data/asset/functions/object/1188.banishing_ring/summon/.mcfunction index 952243864de..7ef404dbf59 100644 --- a/Asset/data/asset/functions/object/1188.banishing_ring/summon/.mcfunction +++ b/Asset/data/asset/functions/object/1188.banishing_ring/summon/.mcfunction @@ -5,4 +5,4 @@ # @within asset:object/alias/1188/summon # 元となるEntityを召喚する - summon item_display ~ ~ ~ {Tags:["ObjectInit"],item:{id:"minecraft:stick", Count:1b, tag:{CustomModelData:20650}}, brightness:{block:15,sky:15}} + summon item_display ~ ~ ~ {Tags:["ObjectInit"],item:{id:"minecraft:stick", Count:1b, tag:{CustomModelData:20650}}, brightness:{block:15,sky:15}, interpolation_duration:2} diff --git a/Asset/data/asset/functions/object/1188.banishing_ring/tick/.mcfunction b/Asset/data/asset/functions/object/1188.banishing_ring/tick/.mcfunction index 1f30b6875e7..797fe21e07d 100644 --- a/Asset/data/asset/functions/object/1188.banishing_ring/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1188.banishing_ring/tick/.mcfunction @@ -7,6 +7,9 @@ # Tick加算 scoreboard players add @s General.Object.Tick 1 +# 最初のtickだけ展開アニメーション + execute if score @s General.Object.Tick matches 2 run data modify entity @s transformation.scale set value [4.5f,4.5f,0.0f] + # Interval減算 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/1188.banishing_ring/tick/damage From 10f8b88cf6b205f4fbfac9ee3d5c501a80b84912 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Sat, 3 Oct 2026 11:15:38 +0200 Subject: [PATCH 16/32] =?UTF-8?q?Lore=E3=82=92=E5=BE=AE=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/artifact/1598.banisher/give/2.give.mcfunction | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1598.banisher/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1598.banisher/give/2.give.mcfunction index 99fcb9c75f0..3b67829583a 100644 --- a/Asset/data/asset/functions/artifact/1598.banisher/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1598.banisher/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text": "堕天", "color": "#e1c6f5"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text": "天使を攻撃すると、命中した場所に天使の輪を召喚する。"}', '{"text": "輪は8秒間残り、内側にいる天使に毎秒200のダメージを与え続ける。"}', '{"text": "弾が尽きても、非戦闘時ならリロードが可能だ。"}', '{"text": "「力ある者、天より堕とされる運命にあり」", "color": "gray"}'] + data modify storage asset:artifact Lore set value ['{"text": "天使を攻撃すると、命中した場所に天使の輪を召喚する。"}', '{"text": "輪は8秒間残り、内側にいる天使に毎秒ダメージを与え続ける。"}', '{"text": "弾が尽きても、非戦闘時ならリロードが可能だ。"}', '{"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 @@ -39,7 +39,7 @@ # 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) data modify storage asset:artifact AttackInfo.IsRangeAttack set value "never" # 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) - data modify storage asset:artifact AttackInfo.AttackRange set value "30.0" + data modify storage asset:artifact AttackInfo.AttackRange set value 30 # MP消費量 (int) data modify storage asset:artifact MPCost set value 15 # MP必要量 (int) (オプション) From f803370b5c88ace90e26c503ad462c2fc658b53c Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Sat, 3 Oct 2026 11:20:43 +0200 Subject: [PATCH 17/32] =?UTF-8?q?tag=E3=81=AE=E6=B6=88=E3=81=97=E5=BF=98?= =?UTF-8?q?=E3=82=8C=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifact/1598.banisher/trigger/damage/.mcfunction | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Asset/data/asset/functions/artifact/1598.banisher/trigger/damage/.mcfunction b/Asset/data/asset/functions/artifact/1598.banisher/trigger/damage/.mcfunction index 11031c94473..1d92df8c977 100644 --- a/Asset/data/asset/functions/artifact/1598.banisher/trigger/damage/.mcfunction +++ b/Asset/data/asset/functions/artifact/1598.banisher/trigger/damage/.mcfunction @@ -20,3 +20,6 @@ particle enchanted_hit ~ ~ ~ 0.2 0.5 0.2 1.0 20 playsound item.trident.return player @a ~ ~ ~ 1.0 2.0 playsound block.enchantment_table.use player @a ~ ~ ~ 1.0 1.2 + +# リセット + tag @s remove 1598.Target From 5d87391c24147de05feccc8ffc8bd062d9574fdb Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Sat, 3 Oct 2026 11:39:47 +0200 Subject: [PATCH 18/32] =?UTF-8?q?init=E5=87=A6=E7=90=86=E3=82=92summon?= =?UTF-8?q?=E3=81=AB=E7=A7=BB=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../object/1188.banishing_ring/init/.mcfunction | 12 ------------ .../object/1188.banishing_ring/summon/.mcfunction | 2 +- .../functions/object/alias/1188/init.mcfunction | 8 -------- 3 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 Asset/data/asset/functions/object/1188.banishing_ring/init/.mcfunction delete mode 100644 Asset/data/asset/functions/object/alias/1188/init.mcfunction diff --git a/Asset/data/asset/functions/object/1188.banishing_ring/init/.mcfunction b/Asset/data/asset/functions/object/1188.banishing_ring/init/.mcfunction deleted file mode 100644 index 400d2ad6c32..00000000000 --- a/Asset/data/asset/functions/object/1188.banishing_ring/init/.mcfunction +++ /dev/null @@ -1,12 +0,0 @@ -#> asset:object/1188.banishing_ring/init/ -# -# Objectのinit時の処理 -# -# @within asset:object/alias/1188/init - -# transformationを設定 - data modify entity @s transformation.scale set value [0.0f,0.0f,0.0f] - data modify entity @s transformation.translation set value [0.0f,0.01f,0.0f] - data modify entity @s transformation.left_rotation set value {axis:[1.0f, 0.0f, 0.0f], angle:1.5708f} - - data modify entity @s start_interpolation set value 2 diff --git a/Asset/data/asset/functions/object/1188.banishing_ring/summon/.mcfunction b/Asset/data/asset/functions/object/1188.banishing_ring/summon/.mcfunction index 7ef404dbf59..fbc3539186d 100644 --- a/Asset/data/asset/functions/object/1188.banishing_ring/summon/.mcfunction +++ b/Asset/data/asset/functions/object/1188.banishing_ring/summon/.mcfunction @@ -5,4 +5,4 @@ # @within asset:object/alias/1188/summon # 元となるEntityを召喚する - summon item_display ~ ~ ~ {Tags:["ObjectInit"],item:{id:"minecraft:stick", Count:1b, tag:{CustomModelData:20650}}, brightness:{block:15,sky:15}, interpolation_duration:2} + summon item_display ~ ~ ~ {Tags:["ObjectInit"],item:{id:"minecraft:stick", Count:1b, tag:{CustomModelData:20650}}, brightness:{block:15,sky:15}, interpolation_duration:2, transformation:{scale:[0.0f, 0.0f, 0.0f], translation: [0.0f, 0.01f, 0.0f], right_rotation: {axis:[0.0f, 0.0f, 0.0f], angle:0.0f}, left_rotation:{axis:[1.0f, 0.0f, 0.0f], angle:1.5708f}}, start_interpolation:2} diff --git a/Asset/data/asset/functions/object/alias/1188/init.mcfunction b/Asset/data/asset/functions/object/alias/1188/init.mcfunction deleted file mode 100644 index fb56f31623a..00000000000 --- a/Asset/data/asset/functions/object/alias/1188/init.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset:object/alias/1188/init -# -# Init処理のエイリアス -# -# @within asset_manager:object/init/init.m - -# 元のInit処理を呼び出す - function asset:object/1188.banishing_ring/init/ \ No newline at end of file From 78c9acc3addaefb56e08aa4a2e261189aa454ec6 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Sat, 3 Oct 2026 11:43:09 +0200 Subject: [PATCH 19/32] =?UTF-8?q?=E3=82=A2=E3=83=8B=E3=83=A1=E3=83=BC?= =?UTF-8?q?=E3=82=B7=E3=83=A7=E3=83=B3=E3=81=AE=E9=96=8B=E5=A7=8B=E3=82=BF?= =?UTF-8?q?=E3=82=A4=E3=83=9F=E3=83=B3=E3=82=B0=E3=82=92=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/object/1188.banishing_ring/summon/.mcfunction | 2 +- .../asset/functions/object/1188.banishing_ring/tick/.mcfunction | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Asset/data/asset/functions/object/1188.banishing_ring/summon/.mcfunction b/Asset/data/asset/functions/object/1188.banishing_ring/summon/.mcfunction index fbc3539186d..89f2f564007 100644 --- a/Asset/data/asset/functions/object/1188.banishing_ring/summon/.mcfunction +++ b/Asset/data/asset/functions/object/1188.banishing_ring/summon/.mcfunction @@ -5,4 +5,4 @@ # @within asset:object/alias/1188/summon # 元となるEntityを召喚する - summon item_display ~ ~ ~ {Tags:["ObjectInit"],item:{id:"minecraft:stick", Count:1b, tag:{CustomModelData:20650}}, brightness:{block:15,sky:15}, interpolation_duration:2, transformation:{scale:[0.0f, 0.0f, 0.0f], translation: [0.0f, 0.01f, 0.0f], right_rotation: {axis:[0.0f, 0.0f, 0.0f], angle:0.0f}, left_rotation:{axis:[1.0f, 0.0f, 0.0f], angle:1.5708f}}, start_interpolation:2} + summon item_display ~ ~ ~ {Tags:["ObjectInit"],item:{id:"minecraft:stick", Count:1b, tag:{CustomModelData:20650}}, brightness:{block:15,sky:15}, interpolation_duration:2, transformation:{scale:[0.0f, 0.0f, 0.0f], translation: [0.0f, 0.01f, 0.0f], right_rotation: {axis:[0.0f, 0.0f, 0.0f], angle:0.0f}, left_rotation:{axis:[1.0f, 0.0f, 0.0f], angle:1.5708f}}, start_interpolation:3} diff --git a/Asset/data/asset/functions/object/1188.banishing_ring/tick/.mcfunction b/Asset/data/asset/functions/object/1188.banishing_ring/tick/.mcfunction index 797fe21e07d..93bcb9be799 100644 --- a/Asset/data/asset/functions/object/1188.banishing_ring/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1188.banishing_ring/tick/.mcfunction @@ -8,7 +8,7 @@ scoreboard players add @s General.Object.Tick 1 # 最初のtickだけ展開アニメーション - execute if score @s General.Object.Tick matches 2 run data modify entity @s transformation.scale set value [4.5f,4.5f,0.0f] + execute if score @s General.Object.Tick matches 3 run data modify entity @s transformation.scale set value [4.5f,4.5f,0.0f] # Interval減算 execute store result storage asset:context this.Interval int 0.9999999999 run data get storage asset:context this.Interval From ff202d9a4e2dc46e8105981cd31194b57bfc1f2d Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Thu, 22 Oct 2026 12:17:07 +0200 Subject: [PATCH 20/32] =?UTF-8?q?=E6=94=BB=E6=92=83=E6=83=85=E5=A0=B1?= =?UTF-8?q?=E3=82=92=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/artifact/1598.banisher/give/2.give.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/artifact/1598.banisher/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1598.banisher/give/2.give.mcfunction index 3b67829583a..c7944c136b2 100644 --- a/Asset/data/asset/functions/artifact/1598.banisher/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1598.banisher/give/2.give.mcfunction @@ -37,7 +37,7 @@ # 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) # data modify storage asset:artifact AttackInfo.BypassResist set value # 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) - data modify storage asset:artifact AttackInfo.IsRangeAttack set value "never" + data modify storage asset:artifact AttackInfo.IsRangeAttack set value "condition" # 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) data modify storage asset:artifact AttackInfo.AttackRange set value 30 # MP消費量 (int) From 51d0dd2b6aac91154c86f80451a9153600e9aff3 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Thu, 22 Oct 2026 12:19:45 +0200 Subject: [PATCH 21/32] =?UTF-8?q?=E3=83=80=E3=83=A1=E3=83=BC=E3=82=B8?= =?UTF-8?q?=E5=87=A6=E7=90=86=E3=82=92=E3=82=B7=E3=83=B3=E3=82=B0=E3=83=AB?= =?UTF-8?q?=E3=83=80=E3=83=A1=E3=83=BC=E3=82=B8=E3=82=BB=E3=83=83=E3=82=B7?= =?UTF-8?q?=E3=83=A7=E3=83=B3=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../object/1188.banishing_ring/tick/damage.mcfunction | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/object/1188.banishing_ring/tick/damage.mcfunction b/Asset/data/asset/functions/object/1188.banishing_ring/tick/damage.mcfunction index 5fb468e13ff..cb92dc04250 100644 --- a/Asset/data/asset/functions/object/1188.banishing_ring/tick/damage.mcfunction +++ b/Asset/data/asset/functions/object/1188.banishing_ring/tick/damage.mcfunction @@ -8,16 +8,19 @@ # @private #declare score_holder $UserID -# 半径4ブロックに攻撃 +# 半径2ブロックに攻撃 #攻撃情報はFieldから 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 store result score $UserID Temporary run data get storage asset:context this.UserID + #シングルダメージセッション + function api:damage/single_damage_session/open execute as @a if score @s UserID = $UserID Temporary run function api:damage/modifier execute as @e[type=#lib:living_without_player,tag=Enemy.Boss,distance=..2] run function api:damage/ function api:damage/reset + function api:damage/single_damage_session/close # 演出 particle flash ~ ~ ~ 0 0 0 1 1 From e24d0b5c6d24023a6f918cb828aeb344bee062b7 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Tue, 27 Oct 2026 15:08:58 +0100 Subject: [PATCH 22/32] =?UTF-8?q?=E5=86=8D=E5=B8=B0=E5=87=A6=E7=90=86?= =?UTF-8?q?=E3=81=AB=E3=82=BF=E3=82=B0=E3=82=92=E4=BD=BF=E3=82=8F=E3=81=AA?= =?UTF-8?q?=E3=81=84=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifact/1598.banisher/trigger/damage/.mcfunction | 3 --- .../artifact/1598.banisher/trigger/rec.mcfunction | 7 +------ 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1598.banisher/trigger/damage/.mcfunction b/Asset/data/asset/functions/artifact/1598.banisher/trigger/damage/.mcfunction index 1d92df8c977..11031c94473 100644 --- a/Asset/data/asset/functions/artifact/1598.banisher/trigger/damage/.mcfunction +++ b/Asset/data/asset/functions/artifact/1598.banisher/trigger/damage/.mcfunction @@ -20,6 +20,3 @@ particle enchanted_hit ~ ~ ~ 0.2 0.5 0.2 1.0 20 playsound item.trident.return player @a ~ ~ ~ 1.0 2.0 playsound block.enchantment_table.use player @a ~ ~ ~ 1.0 1.2 - -# リセット - tag @s remove 1598.Target diff --git a/Asset/data/asset/functions/artifact/1598.banisher/trigger/rec.mcfunction b/Asset/data/asset/functions/artifact/1598.banisher/trigger/rec.mcfunction index a38decbf320..90d2583339c 100644 --- a/Asset/data/asset/functions/artifact/1598.banisher/trigger/rec.mcfunction +++ b/Asset/data/asset/functions/artifact/1598.banisher/trigger/rec.mcfunction @@ -4,15 +4,10 @@ # # @within function asset:artifact/1598.banisher/trigger/** -#> Private -# @within function asset:artifact/1598.banisher/trigger/** - #declare tag 1598.Target - # 着弾検知 - execute as @e[type=#lib:living_without_player,tag=!Uninterferable,distance=..2] run tag @s add 1598.Target execute unless block ^ ^ ^0.5 #lib:no_collision/ run return 0 # ダメージ処理 - execute as @e[type=#lib:living_without_player,tag=1598.Target,distance=..2,limit=1] run return run function asset:artifact/1598.banisher/trigger/damage/ + execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0,limit=1] run return run function asset:artifact/1598.banisher/trigger/damage/ # 演出 particle dust 0.22 0.082 0.345 0.2 ~ ~ ~ 0.1 0.1 0.1 0 7 From f6a079690d9814629c2440900e49c9aadc3fd72f Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Tue, 27 Oct 2026 15:09:21 +0100 Subject: [PATCH 23/32] =?UTF-8?q?=E6=94=BB=E6=92=83=E6=83=85=E5=A0=B1?= =?UTF-8?q?=E3=82=92=E6=98=8E=E8=A8=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/artifact/1598.banisher/trigger/damage/.mcfunction | 1 + 1 file changed, 1 insertion(+) diff --git a/Asset/data/asset/functions/artifact/1598.banisher/trigger/damage/.mcfunction b/Asset/data/asset/functions/artifact/1598.banisher/trigger/damage/.mcfunction index 11031c94473..faa7f726602 100644 --- a/Asset/data/asset/functions/artifact/1598.banisher/trigger/damage/.mcfunction +++ b/Asset/data/asset/functions/artifact/1598.banisher/trigger/damage/.mcfunction @@ -11,6 +11,7 @@ execute if entity @s[tag=Enemy.Boss] as @p[tag=this] run function asset:artifact/1598.banisher/trigger/damage/boss data modify storage api: Argument.AttackType set value "Magic" + data modify storage api: Argument.ElementType set value "None" execute as @p[tag=this] run function api:damage/modifier function api:damage/ function api:damage/reset From bb35b334ce236b10f041f87d5e7f09d9b9a71bb1 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Tue, 27 Oct 2026 15:09:46 +0100 Subject: [PATCH 24/32] =?UTF-8?q?Field=E5=90=8D=E3=81=AE=E8=AA=A4=E6=A4=8D?= =?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 --- .../artifact/1598.banisher/trigger/damage/boss.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/artifact/1598.banisher/trigger/damage/boss.mcfunction b/Asset/data/asset/functions/artifact/1598.banisher/trigger/damage/boss.mcfunction index bd7f3346aad..8fe4e92f2a4 100644 --- a/Asset/data/asset/functions/artifact/1598.banisher/trigger/damage/boss.mcfunction +++ b/Asset/data/asset/functions/artifact/1598.banisher/trigger/damage/boss.mcfunction @@ -10,6 +10,6 @@ #攻撃情報を持たせる data modify storage api: Argument.FieldOverride.Damage set value 200 data modify storage api: Argument.FieldOverride.AttackType set value "Magic" - data modify storage api: Argument.FieldOverride.AttackElement set value "None" + data modify storage api: Argument.FieldOverride.ElementType set value "None" execute positioned ^ ^ ^0.5 run function api:object/summon From 1f2e7e981749c11b175e6ab511bf696be32a27a8 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Fri, 30 Oct 2026 18:54:13 +0100 Subject: [PATCH 25/32] =?UTF-8?q?=E5=90=84=E7=A8=AE=E3=83=91=E3=83=A9?= =?UTF-8?q?=E3=83=A1=E3=83=BC=E3=82=BF=E3=83=BC=E3=82=92=E7=A5=9E=E5=99=A8?= =?UTF-8?q?=E3=81=8B=E3=82=89=E8=A8=AD=E5=AE=9A=E3=81=A7=E3=81=8D=E3=82=8B?= =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1598.banisher/trigger/damage/boss.mcfunction | 15 +++++++++++---- .../object/1188.banishing_ring/init/.mcfunction | 11 +++++++++++ .../1188.banishing_ring/register.mcfunction | 6 +++--- .../object/1188.banishing_ring/tick/.mcfunction | 6 +++--- .../1188.banishing_ring/tick/damage.mcfunction | 2 +- .../functions/object/alias/1188/init.mcfunction | 8 ++++++++ 6 files changed, 37 insertions(+), 11 deletions(-) create mode 100644 Asset/data/asset/functions/object/1188.banishing_ring/init/.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1188/init.mcfunction diff --git a/Asset/data/asset/functions/artifact/1598.banisher/trigger/damage/boss.mcfunction b/Asset/data/asset/functions/artifact/1598.banisher/trigger/damage/boss.mcfunction index 8fe4e92f2a4..032683f0660 100644 --- a/Asset/data/asset/functions/artifact/1598.banisher/trigger/damage/boss.mcfunction +++ b/Asset/data/asset/functions/artifact/1598.banisher/trigger/damage/boss.mcfunction @@ -7,9 +7,16 @@ # 残留攻撃(Object 1188)を召喚 data modify storage api: Argument.ID set value 1188 execute store result storage api: Argument.FieldOverride.UserID int 1 run scoreboard players get @s UserID - #攻撃情報を持たせる - data modify storage api: Argument.FieldOverride.Damage set value 200 - data modify storage api: Argument.FieldOverride.AttackType set value "Magic" - data modify storage api: Argument.FieldOverride.ElementType set value "None" + + # 攻撃情報 + data modify storage api: Argument.FieldOverride.Damage set value 200 + data modify storage api: Argument.FieldOverride.AttackType set value "Magic" + data modify storage api: Argument.FieldOverride.ElementType set value "None" + + # 存在時間 + data modify storage api: Argument.FieldOverride.Tick set value 160 + + # 攻撃間隔 + data modify storage api: Argument.FieldOverride.AttackInterval set value 20 execute positioned ^ ^ ^0.5 run function api:object/summon diff --git a/Asset/data/asset/functions/object/1188.banishing_ring/init/.mcfunction b/Asset/data/asset/functions/object/1188.banishing_ring/init/.mcfunction new file mode 100644 index 00000000000..d4edf3b7c3b --- /dev/null +++ b/Asset/data/asset/functions/object/1188.banishing_ring/init/.mcfunction @@ -0,0 +1,11 @@ +#> asset:object/1188.banishing_ring/init/ +# +# Objectのinit時の処理 +# +# @within asset:object/alias/1188/init + +# 存在時間 + execute store result score @s General.Object.Tick run data get storage asset:context this.Tick + +# Intervalに規定値を代入 + data modify storage asset:context this.Interval set from storage asset:context this.AttackInterval diff --git a/Asset/data/asset/functions/object/1188.banishing_ring/register.mcfunction b/Asset/data/asset/functions/object/1188.banishing_ring/register.mcfunction index 97746107263..03ee14c4a45 100644 --- a/Asset/data/asset/functions/object/1188.banishing_ring/register.mcfunction +++ b/Asset/data/asset/functions/object/1188.banishing_ring/register.mcfunction @@ -17,8 +17,8 @@ # ID (int) data modify storage asset:object ID set value 1188 # フィールド(オプション) - data modify storage asset:object Field.Damage set value 0 + data modify storage asset:object Field.Damage set value -1 data modify storage asset:object Field.DamageType set value "" data modify storage asset:object Field.ElementType set value "" - data modify storage asset:object Field.Interval set value 20 - data modify storage asset:object Field.UserID set value 0 + data modify storage asset:object Field.Interval set value -1 + data modify storage asset:object Field.UserID set value -1 diff --git a/Asset/data/asset/functions/object/1188.banishing_ring/tick/.mcfunction b/Asset/data/asset/functions/object/1188.banishing_ring/tick/.mcfunction index 93bcb9be799..e6e706bd089 100644 --- a/Asset/data/asset/functions/object/1188.banishing_ring/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1188.banishing_ring/tick/.mcfunction @@ -4,8 +4,8 @@ # # @within asset:object/alias/1188/tick -# Tick加算 - scoreboard players add @s General.Object.Tick 1 +# Tick減算 + scoreboard players remove @s General.Object.Tick 1 # 最初のtickだけ展開アニメーション execute if score @s General.Object.Tick matches 3 run data modify entity @s transformation.scale set value [4.5f,4.5f,0.0f] @@ -15,4 +15,4 @@ execute if data storage asset:context this{Interval:0} run function asset:object/1188.banishing_ring/tick/damage # 消滅処理 - kill @s[scores={General.Object.Tick=160..}] + kill @s[scores={General.Object.Tick=..0}] diff --git a/Asset/data/asset/functions/object/1188.banishing_ring/tick/damage.mcfunction b/Asset/data/asset/functions/object/1188.banishing_ring/tick/damage.mcfunction index cb92dc04250..65199651ebc 100644 --- a/Asset/data/asset/functions/object/1188.banishing_ring/tick/damage.mcfunction +++ b/Asset/data/asset/functions/object/1188.banishing_ring/tick/damage.mcfunction @@ -30,5 +30,5 @@ playsound entity.evoker.prepare_summon player @a ~ ~ ~ 1 1.75 # リセット - data modify storage asset:context this.Interval set value 20 + data modify storage asset:context this.Interval set from storage asset:context this.AttackInterval scoreboard players reset $UserID Temporary diff --git a/Asset/data/asset/functions/object/alias/1188/init.mcfunction b/Asset/data/asset/functions/object/alias/1188/init.mcfunction new file mode 100644 index 00000000000..fb56f31623a --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1188/init.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1188/init +# +# Init処理のエイリアス +# +# @within asset_manager:object/init/init.m + +# 元のInit処理を呼び出す + function asset:object/1188.banishing_ring/init/ \ No newline at end of file From 017bea745b2a539add1ad2120cb2703df54c258a Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Sat, 31 Oct 2026 13:49:59 +0100 Subject: [PATCH 26/32] =?UTF-8?q?=E5=A4=89=E6=95=B0=E9=A1=9E=E3=81=AB?= =?UTF-8?q?=E5=91=BD=E5=90=8D=E8=A6=8F=E5=89=87=E3=82=92=E9=81=A9=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifact/1598.banisher/trigger/3.main.mcfunction | 10 +++++----- .../object/1188.banishing_ring/tick/damage.mcfunction | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1598.banisher/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1598.banisher/trigger/3.main.mcfunction index 6806a31112e..608b93724ad 100644 --- a/Asset/data/asset/functions/artifact/1598.banisher/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1598.banisher/trigger/3.main.mcfunction @@ -6,20 +6,20 @@ #> SpreadLib # @private - #declare tag SpreadMarker + #declare tag A1598.SpreadMarker # 基本的な使用時の処理(MP消費や使用回数の処理など)を行う function asset:artifact/common/use/mainhand # ここから先は神器側の効果の処理を書く # 前方拡散 - summon marker ~ ~ ~ {Tags:["SpreadMarker"]} + summon marker ~ ~ ~ {Tags:["A1598.SpreadMarker"]} data modify storage lib: Argument.Distance set value 0.8 data modify storage lib: Argument.Spread set value 0.1 - execute as @e[type=marker,tag=SpreadMarker,distance=..0.01,limit=1] run function lib:forward_spreader/circle + execute as @e[type=marker,tag=A1598.SpreadMarker,distance=..0.01,limit=1] run function lib:forward_spreader/circle # 発射 - execute facing entity @e[type=marker,tag=SpreadMarker,distance=..1,limit=1] feet anchored eyes positioned ^-0.14 ^-0.05 ^0.35 run function asset:artifact/1598.banisher/trigger/rec + execute facing entity @e[type=marker,tag=A1598.SpreadMarker,distance=..1,limit=1] feet anchored eyes positioned ^-0.14 ^-0.05 ^0.35 run function asset:artifact/1598.banisher/trigger/rec # 演出 playsound entity.firework_rocket.blast player @a ~ ~ ~ 1.0 0.7 @@ -38,5 +38,5 @@ function asset:artifact/1598.banisher/trigger/reload # リセット - kill @e[type=marker,tag=SpreadMarker,distance=..1,limit=1] + kill @e[type=marker,tag=A1598.SpreadMarker,distance=..1,limit=1] data remove storage lib: Argument diff --git a/Asset/data/asset/functions/object/1188.banishing_ring/tick/damage.mcfunction b/Asset/data/asset/functions/object/1188.banishing_ring/tick/damage.mcfunction index 65199651ebc..01a780e143c 100644 --- a/Asset/data/asset/functions/object/1188.banishing_ring/tick/damage.mcfunction +++ b/Asset/data/asset/functions/object/1188.banishing_ring/tick/damage.mcfunction @@ -6,7 +6,7 @@ #> Private # @private - #declare score_holder $UserID + #declare score_holder $O1188.UserID # 半径2ブロックに攻撃 #攻撃情報はFieldから @@ -14,10 +14,10 @@ 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 store result score $UserID Temporary run data get storage asset:context this.UserID + execute store result score $O1188.UserID Temporary run data get storage asset:context this.UserID #シングルダメージセッション function api:damage/single_damage_session/open - execute as @a if score @s UserID = $UserID Temporary run function api:damage/modifier + execute as @a if score @s UserID = $O1188.UserID Temporary run function api:damage/modifier execute as @e[type=#lib:living_without_player,tag=Enemy.Boss,distance=..2] run function api:damage/ function api:damage/reset function api:damage/single_damage_session/close @@ -31,4 +31,4 @@ # リセット data modify storage asset:context this.Interval set from storage asset:context this.AttackInterval - scoreboard players reset $UserID Temporary + scoreboard players reset $O1188.UserID Temporary From 087295bf7167ae229eaff4a9f21d3712fc5f3594 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Sat, 31 Oct 2026 14:43:18 +0100 Subject: [PATCH 27/32] =?UTF-8?q?=E3=82=A2=E3=83=8B=E3=83=A1=E3=83=BC?= =?UTF-8?q?=E3=82=B7=E3=83=A7=E3=83=B3=E3=81=8C=E6=AD=A3=E3=81=97=E3=81=8F?= =?UTF-8?q?=E5=86=8D=E7=94=9F=E3=81=95=E3=82=8C=E3=82=8B=E3=82=88=E3=81=86?= =?UTF-8?q?=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../object/1188.banishing_ring/init/.mcfunction | 4 ++++ .../functions/object/1188.banishing_ring/load.mcfunction | 9 +++++++++ .../object/1188.banishing_ring/tick/.mcfunction | 4 ++-- Asset/data/asset/tags/functions/object/load.json | 3 ++- 4 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 Asset/data/asset/functions/object/1188.banishing_ring/load.mcfunction diff --git a/Asset/data/asset/functions/object/1188.banishing_ring/init/.mcfunction b/Asset/data/asset/functions/object/1188.banishing_ring/init/.mcfunction index d4edf3b7c3b..9604bdf4443 100644 --- a/Asset/data/asset/functions/object/1188.banishing_ring/init/.mcfunction +++ b/Asset/data/asset/functions/object/1188.banishing_ring/init/.mcfunction @@ -7,5 +7,9 @@ # 存在時間 execute store result score @s General.Object.Tick run data get storage asset:context this.Tick +# アニメーション開始(存在時間 - 3) + scoreboard players operation @s O1188.InterpolationTick = @s General.Object.Tick + scoreboard players remove @s O1188.InterpolationTick 3 + # Intervalに規定値を代入 data modify storage asset:context this.Interval set from storage asset:context this.AttackInterval diff --git a/Asset/data/asset/functions/object/1188.banishing_ring/load.mcfunction b/Asset/data/asset/functions/object/1188.banishing_ring/load.mcfunction new file mode 100644 index 00000000000..036d48f0b51 --- /dev/null +++ b/Asset/data/asset/functions/object/1188.banishing_ring/load.mcfunction @@ -0,0 +1,9 @@ +#> asset:object/1188.banishing_ring/load +# +# Objectに利用するスコアボード等の初期化処理 +# +# @within tag/function asset:object/load + +#> 定義類はここに +# @within function asset:object/1188.banishing_ring/** + scoreboard objectives add O1188.InterpolationTick dummy diff --git a/Asset/data/asset/functions/object/1188.banishing_ring/tick/.mcfunction b/Asset/data/asset/functions/object/1188.banishing_ring/tick/.mcfunction index e6e706bd089..b98ec9c0792 100644 --- a/Asset/data/asset/functions/object/1188.banishing_ring/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1188.banishing_ring/tick/.mcfunction @@ -7,8 +7,8 @@ # Tick減算 scoreboard players remove @s General.Object.Tick 1 -# 最初のtickだけ展開アニメーション - execute if score @s General.Object.Tick matches 3 run data modify entity @s transformation.scale set value [4.5f,4.5f,0.0f] +# 召喚から3tick後だけ展開アニメーション + execute if score @s General.Object.Tick = @s O1188.InterpolationTick run data modify entity @s transformation.scale set value [4.5f,4.5f,0.0f] # Interval減算 execute store result storage asset:context this.Interval int 0.9999999999 run data get storage asset:context this.Interval diff --git a/Asset/data/asset/tags/functions/object/load.json b/Asset/data/asset/tags/functions/object/load.json index 370cd7f01be..30e0703133b 100644 --- a/Asset/data/asset/tags/functions/object/load.json +++ b/Asset/data/asset/tags/functions/object/load.json @@ -1,5 +1,6 @@ { "values": [ + "asset:object/1188.banishing_ring/load", "asset:object/1061.azure_jelly/load", "asset:object/2251.wall_laser_clock/load", "asset:object/2212.eclael_upper_shot/load", @@ -58,4 +59,4 @@ "asset:object/1059.book_of_hero/load", "asset:object/2031.giant_pumpkin/load" ] -} +} \ No newline at end of file From 15a6eff328104209257ece94753fb003e7d5a5a0 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Sun, 1 Nov 2026 11:26:16 +0100 Subject: [PATCH 28/32] =?UTF-8?q?=E3=83=80=E3=83=A1=E3=83=BC=E3=82=B8?= =?UTF-8?q?=E3=82=92double=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/artifact/1598.banisher/trigger/damage/.mcfunction | 2 +- .../artifact/1598.banisher/trigger/damage/boss.mcfunction | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1598.banisher/trigger/damage/.mcfunction b/Asset/data/asset/functions/artifact/1598.banisher/trigger/damage/.mcfunction index faa7f726602..d3d2433d8c7 100644 --- a/Asset/data/asset/functions/artifact/1598.banisher/trigger/damage/.mcfunction +++ b/Asset/data/asset/functions/artifact/1598.banisher/trigger/damage/.mcfunction @@ -6,7 +6,7 @@ # 攻撃情報設定 #通常 - data modify storage api: Argument.Damage set value 200 + data modify storage api: Argument.Damage set value 200.0d #天使が対象の場合は残留攻撃を召喚 execute if entity @s[tag=Enemy.Boss] as @p[tag=this] run function asset:artifact/1598.banisher/trigger/damage/boss diff --git a/Asset/data/asset/functions/artifact/1598.banisher/trigger/damage/boss.mcfunction b/Asset/data/asset/functions/artifact/1598.banisher/trigger/damage/boss.mcfunction index 032683f0660..62e92b3115e 100644 --- a/Asset/data/asset/functions/artifact/1598.banisher/trigger/damage/boss.mcfunction +++ b/Asset/data/asset/functions/artifact/1598.banisher/trigger/damage/boss.mcfunction @@ -9,7 +9,7 @@ execute store result storage api: Argument.FieldOverride.UserID int 1 run scoreboard players get @s UserID # 攻撃情報 - data modify storage api: Argument.FieldOverride.Damage set value 200 + data modify storage api: Argument.FieldOverride.Damage set value 200.0d data modify storage api: Argument.FieldOverride.AttackType set value "Magic" data modify storage api: Argument.FieldOverride.ElementType set value "None" From e1a03d5d4a874297740c31671b1bd6d088997343 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Sun, 1 Nov 2026 11:28:33 +0100 Subject: [PATCH 29/32] =?UTF-8?q?=E7=89=B9=E6=AE=8A=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E3=81=8C=E5=89=8D=E6=8F=90=E3=82=92=E6=BA=80=E3=81=9F=E3=81=97?= =?UTF-8?q?=E3=81=A6=E3=81=84=E3=82=8B=E3=81=A8=E3=81=8D=E3=81=AB=E3=81=AE?= =?UTF-8?q?=E3=81=BF=E3=83=81=E3=82=A7=E3=83=83=E3=82=AF=E3=81=95=E3=82=8C?= =?UTF-8?q?=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1599.banisher_empty/trigger/2.check_condition.mcfunction | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1599.banisher_empty/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1599.banisher_empty/trigger/2.check_condition.mcfunction index f14b98b0b9c..5f92e77f9bc 100644 --- a/Asset/data/asset/functions/artifact/1599.banisher_empty/trigger/2.check_condition.mcfunction +++ b/Asset/data/asset/functions/artifact/1599.banisher_empty/trigger/2.check_condition.mcfunction @@ -8,8 +8,8 @@ function asset:artifact/common/check_condition/mainhand # 他にアイテム等確認する場合はここに書く # 戦闘時ならCanUsed剝奪 - execute if predicate lib:in_battle run tellraw @s {"text":"戦闘中はリロードができない！","color":"red"} - execute if predicate lib:in_battle run tag @s remove CanUsed + execute if entity @s[tag=CanUsed] if predicate lib:in_battle run tellraw @s {"text":"戦闘中はリロードができない！","color":"red"} + execute if entity @s[tag=CanUsed] if predicate lib:in_battle run tag @s remove CanUsed # CanUsedタグをチェックして3.main.mcfunctionを実行する execute if entity @s[tag=CanUsed] run function asset:artifact/1599.banisher_empty/trigger/3.main From c3087c55e6f8e246adf35c3f7c6aaa245f5bef9f Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Sun, 1 Nov 2026 12:45:23 +0100 Subject: [PATCH 30/32] =?UTF-8?q?=E3=82=B7=E3=83=B3=E3=82=B0=E3=83=AB?= =?UTF-8?q?=E3=83=80=E3=83=A1=E3=83=BC=E3=82=B8=E3=82=BB=E3=83=83=E3=82=B7?= =?UTF-8?q?=E3=83=A7=E3=83=B3=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../object/1188.banishing_ring/tick/damage.mcfunction | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Asset/data/asset/functions/object/1188.banishing_ring/tick/damage.mcfunction b/Asset/data/asset/functions/object/1188.banishing_ring/tick/damage.mcfunction index 01a780e143c..c396145ae8d 100644 --- a/Asset/data/asset/functions/object/1188.banishing_ring/tick/damage.mcfunction +++ b/Asset/data/asset/functions/object/1188.banishing_ring/tick/damage.mcfunction @@ -15,12 +15,10 @@ data modify storage api: Argument.ElementType set from storage asset:context this.ElementType #召喚したプレイヤー取得 execute store result score $O1188.UserID Temporary run data get storage asset:context this.UserID - #シングルダメージセッション - function api:damage/single_damage_session/open + execute as @a if score @s UserID = $O1188.UserID Temporary run function api:damage/modifier execute as @e[type=#lib:living_without_player,tag=Enemy.Boss,distance=..2] run function api:damage/ function api:damage/reset - function api:damage/single_damage_session/close # 演出 particle flash ~ ~ ~ 0 0 0 1 1 @@ -31,4 +29,4 @@ # リセット data modify storage asset:context this.Interval set from storage asset:context this.AttackInterval - scoreboard players reset $O1188.UserID Temporary + scoreboard players reset $O1188.UserID From a6c300e515e214ca95cdaf5226fefb0ee28f7966 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Sun, 1 Nov 2026 12:50:21 +0100 Subject: [PATCH 31/32] =?UTF-8?q?=E5=85=A8=E4=BF=A1=E4=BB=B0=E3=81=A7?= =?UTF-8?q?=E4=BD=BF=E3=81=88=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/artifact/1598.banisher/give/2.give.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/artifact/1598.banisher/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1598.banisher/give/2.give.mcfunction index c7944c136b2..be1090081d9 100644 --- a/Asset/data/asset/functions/artifact/1598.banisher/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1598.banisher/give/2.give.mcfunction @@ -60,7 +60,7 @@ # 破壊時の音を鳴らさないかどうか (boolean) (オプション) data modify storage asset:artifact DisableBreakSound set value true # 扱える神 (string[]) Wikiを参照 - data modify storage asset:artifact CanUsedGod set value ["Wi-ki", "Rumor"] + data modify storage asset:artifact CanUsedGod set value "ALL" # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) # data modify storage asset:artifact CustomNBT set value {} From 9a64b6f91cd538ff8e440d6ee6e08f505fbab36c Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Fri, 6 Nov 2026 15:28:39 +0100 Subject: [PATCH 32/32] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=8F=AF=E8=83=BD?= =?UTF-8?q?=E4=BF=A1=E4=BB=B0=E3=82=92=E7=B5=B1=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifact/1599.banisher_empty/give/2.give.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/artifact/1599.banisher_empty/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1599.banisher_empty/give/2.give.mcfunction index 81873de866b..7dcbad3293d 100644 --- a/Asset/data/asset/functions/artifact/1599.banisher_empty/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1599.banisher_empty/give/2.give.mcfunction @@ -60,7 +60,7 @@ # 破壊時の音を鳴らさないかどうか (boolean) (オプション) # data modify storage asset:artifact DisableBreakSound set value # 扱える神 (string[]) Wikiを参照 - data modify storage asset:artifact CanUsedGod set value ["Wi-ki", "Rumor"] + data modify storage asset:artifact CanUsedGod set value "ALL" # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) # data modify storage asset:artifact CustomNBT set value {}