From 5802748f004db5ee04eecacab42890e962425ef9 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Wed, 28 Oct 2026 22:19:06 +0900 Subject: [PATCH 01/19] =?UTF-8?q?=E3=81=A0=E3=81=84=E3=81=9F=E3=81=84?= =?UTF-8?q?=E3=83=86=E3=83=B3=E3=83=97=E3=83=AC=E3=83=BC=E3=83=88=E3=81=BE?= =?UTF-8?q?=E3=81=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../give/1.trigger.mcfunction | 7 ++ .../give/2.give.mcfunction | 68 +++++++++++++++++++ .../register.mcfunction | 7 ++ .../using_item/1.trigger.mcfunction | 8 +++ .../using_item/2.check_condition.mcfunction | 37 ++++++++++ .../using_item/3.main.mcfunction | 24 +++++++ .../using_item/charge.mcfunction | 12 ++++ .../using_item/charge/2.mcfunction | 15 ++++ .../using_item/charge/3.mcfunction | 15 ++++ .../asset/tags/functions/artifact/give.json | 3 +- .../tags/functions/artifact/register.json | 3 +- .../functions/artifact/using_item/keep/.json | 1 + 12 files changed, 198 insertions(+), 2 deletions(-) create mode 100644 Asset/data/asset/functions/artifact/1422.overhauled_toaster/give/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1422.overhauled_toaster/give/2.give.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1422.overhauled_toaster/register.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/2.check_condition.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/3.main.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/2.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/3.mcfunction diff --git a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/give/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/give/1.trigger.mcfunction new file mode 100644 index 0000000000..1fb46c4790 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/give/1.trigger.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1422.overhauled_toaster/give/1.trigger +# +# 神器の取得処理の呼び出し時に実行されるfunction +# +# @within tag/function asset:artifact/give + +execute if data storage asset:context {id:1422} run function asset:artifact/1422.overhauled_toaster/give/2.give \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/give/2.give.mcfunction new file mode 100644 index 0000000000..b1c4414bcd --- /dev/null +++ b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/give/2.give.mcfunction @@ -0,0 +1,68 @@ +#> asset:artifact/1422.overhauled_toaster/give/2.give +# +# 神器の作成部 ここでID等を定義する +# +# @user +# @within function asset:artifact/1422.overhauled_toaster/give/1.trigger + +# 神器の説明や消費MPなどをここで設定する。 +# 最後にasset:artifact/common/giveを実行することで入手可能。 + +# 神器のID (int) スプレッドシートの値を入れる + data modify storage asset:artifact ID set value 1422 +# 神器のベースアイテム + data modify storage asset:artifact Item set value "minecraft:ender_eye" +# 神器の名前 (TextComponentString) + data modify storage asset:artifact Name set value '{"text":"魔改造トースター","color":"#d7a657"}' +# 神器の説明文 (TextComponentString[]) + data modify storage asset:artifact Lore set value ['{"text":"長押しで最大3段階のチャージを行い"}','{"text":"チャージ段階に応じたダメージと速度のパンを6枚射出する"}','{"text":"朝も昼も夜も、ずーっとパンですよね!","color":"gray"}'] +# 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション) + data modify storage asset:artifact ConsumeItem.Item set value '{"translate":"item.minecraft.bread"}' + data modify storage asset:artifact ConsumeItem.Count set value 1 + # data modify storage asset:artifact ConsumeItem.Extra set value +# 使用回数 (int) (オプション) + # data modify storage asset:artifact RemainingCount set value +# 神器を発動できるスロット (string) Wikiを参照 + data modify storage asset:artifact Slot set value "mainhand" +# 神器のトリガー (string) Wikiを参照 + data modify storage asset:artifact Trigger set value "onClick" +# 神器の発動条件 (TextComponentString) (オプション) + # data modify storage asset:artifact Condition set value +# 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.Damage set value "40-120x6" +# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.AttackType set value [Physical] +# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.ElementType set value [Fire] +# 攻撃に関する情報 -防御無視 (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 20 +# MP消費量 (int) + data modify storage asset:artifact MPCost set value 20 +# 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 70 +# グローバルクールダウン (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 ["Urban", "Nyaptov", "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/1422.overhauled_toaster/register.mcfunction b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/register.mcfunction new file mode 100644 index 0000000000..c2b0e00808 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1422.overhauled_toaster/register +# +# 神器プールへの登録処理 +# +# @within tag/function asset:artifact/register + +data modify storage asset:artifact RarityRegistry[4] append value [1422] \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/1.trigger.mcfunction new file mode 100644 index 0000000000..e580de18ac --- /dev/null +++ b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/1.trigger.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1422.overhauled_toaster/using_item/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:1422} run function asset:artifact/1422.overhauled_toaster/using_item/2.check_condition diff --git a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/2.check_condition.mcfunction new file mode 100644 index 0000000000..f1bb0cf5a9 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/2.check_condition.mcfunction @@ -0,0 +1,37 @@ +#> asset:artifact/1422.overhauled_toaster/using_item/2.check_condition +# +# 神器の発動条件をチェックします +# +# @within function asset:artifact/1422.overhauled_toaster/using_item/1.trigger + +#> Private +# @private + #declare score_holder $Count + +# チャージ中は開始時の消費とクールダウン判定を繰り返さない + data modify storage api: Argument.ID set value 415 + function api:entity/mob/effect/get/from_id + execute if data storage api: Return.Effect.Field.Shooting run return fail + execute if data storage api: Return.Effect run return run function asset:artifact/1422.overhauled_toaster/using_item/charge + +# 発射が終わるまで次のチャージを開始しない + data modify storage api: Argument.ID set value 416 + function api:entity/mob/effect/get/from_id + execute if data storage api: Return.Effect run return fail + +# 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く + function asset:artifact/common/check_condition/mainhand +# 他にアイテム等確認する場合はここに書く + +# CanUsedでなければreturn + execute if entity @s[tag=!CanUsed] run return fail + +# パンがn個以上か? + execute store result score $Count Temporary run clear @s bread 0 + execute unless score $Count Temporary matches 1.. run tag @s remove CanUsed + scoreboard players reset $Count Temporary + execute if entity @s[tag=!CanUsed] run function lib:message/artifact/dont_have_require_items + execute if entity @s[tag=!CanUsed] run return fail + +# CanUsedタグをチェックして3.main.mcfunctionを実行する + execute if entity @s[tag=CanUsed] run function asset:artifact/1422.overhauled_toaster/using_item/3.main diff --git a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/3.main.mcfunction b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/3.main.mcfunction new file mode 100644 index 0000000000..d3cb7acdb9 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/3.main.mcfunction @@ -0,0 +1,24 @@ +#> asset:artifact/1422.overhauled_toaster/using_item/3.main +# +# 神器のメイン処理部 +# +# @within function asset:artifact/1422.overhauled_toaster/using_item/2.check_condition + +# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う + function asset:artifact/common/use/mainhand + +# ここから先は神器側の効果の処理を書く + +# パンを1個消費 + clear @s bread 1 + +# 演出 + playsound minecraft:block.note_block.chime player @a ~ ~ ~ 1 1.8 + +# チャージ用エフェクト + data modify storage api: Argument.ID set value 362 + data modify storage api: Argument.FieldOverride.Range set value 40 + data modify storage api: Argument.FieldOverride.Speed set value {Charge1:1,Charge2:2,Charge3:3} + data modify storage api: Argument.FieldOverride.Damage set value {Charge1:40,Charge2:70,Charge3:120} + function api:entity/mob/effect/give + function api:entity/mob/effect/reset diff --git a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge.mcfunction b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge.mcfunction new file mode 100644 index 0000000000..a41889f301 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge.mcfunction @@ -0,0 +1,12 @@ +#> asset:artifact/1422.overhauled_toaster/using_item/charge +# +# +# +# @within function asset:artifact/1422.overhauled_toaster/using_item/2.check_condition + +# チャージ段階が変わるときだけEffectを更新する + execute if data storage asset:context UsingItemTime{mainhand:12} run function asset:artifact/1422.overhauled_toaster/using_item/charge/2 + execute if data storage asset:context UsingItemTime{mainhand:24} run function asset:artifact/1422.overhauled_toaster/using_item/charge/3 + +# 長押し中の音 + playsound block.furnace.fire_crackle player @a ~ ~ ~ 1 0.8 diff --git a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/2.mcfunction b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/2.mcfunction new file mode 100644 index 0000000000..716f9f3577 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/2.mcfunction @@ -0,0 +1,15 @@ +#> asset:artifact/1422.overhauled_toaster/using_item/charge/2 +# +# +# +# @within function asset:artifact/1422.overhauled_toaster/using_item/charge + +# チャージ段階の演出 + playsound minecraft:block.note_block.chime player @a ~ ~ ~ 1 1.9 + +# 発動時の情報を保ってスタックを更新する + data modify storage api: Argument.ID set value 415 + data modify storage api: Argument.Stack set value 2 + data modify storage api: Argument.FieldOverride set from storage api: Return.Effect.Field + function api:entity/mob/effect/give + function api:entity/mob/effect/reset diff --git a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/3.mcfunction b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/3.mcfunction new file mode 100644 index 0000000000..2140b8c422 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/3.mcfunction @@ -0,0 +1,15 @@ +#> asset:artifact/1422.overhauled_toaster/using_item/charge/3 +# +# +# +# @within function asset:artifact/1422.overhauled_toaster/using_item/charge + +# チャージ段階の演出 + playsound minecraft:block.note_block.chime player @a ~ ~ ~ 1 2.0 + +# 発動時の情報を保ってスタックを更新する + data modify storage api: Argument.ID set value 415 + data modify storage api: Argument.Stack set value 3 + data modify storage api: Argument.FieldOverride set from storage api: Return.Effect.Field + function api:entity/mob/effect/give + function api:entity/mob/effect/reset diff --git a/Asset/data/asset/tags/functions/artifact/give.json b/Asset/data/asset/tags/functions/artifact/give.json index 4d1d5891d9..39efecb978 100644 --- a/Asset/data/asset/tags/functions/artifact/give.json +++ b/Asset/data/asset/tags/functions/artifact/give.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1422.overhauled_toaster/give/1.trigger", "asset:artifact/1360.vintage_wine/give/1.trigger", "asset:artifact/1661.starlight_circle/give/1.trigger", "asset:artifact/1390.red_refraction_prism/give/1.trigger", @@ -569,4 +570,4 @@ "asset:artifact/0735.collision_plate/give/1.trigger", "asset:artifact/0745.blade_of_whirlwind/give/1.trigger" ] -} +} \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/artifact/register.json b/Asset/data/asset/tags/functions/artifact/register.json index 7c7788a92e..25d967450a 100644 --- a/Asset/data/asset/tags/functions/artifact/register.json +++ b/Asset/data/asset/tags/functions/artifact/register.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1422.overhauled_toaster/register", "asset:artifact/1360.vintage_wine/register", "asset:artifact/1661.starlight_circle/register", "asset:artifact/1662.salmon_canon/register", @@ -338,4 +339,4 @@ "asset:artifact/1027.fire_of_rebirth/register", "asset:artifact/1111.rod_o_redeem/register" ] -} +} \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/artifact/using_item/keep/.json b/Asset/data/asset/tags/functions/artifact/using_item/keep/.json index 5ad644a7dc..9a304c28aa 100644 --- a/Asset/data/asset/tags/functions/artifact/using_item/keep/.json +++ b/Asset/data/asset/tags/functions/artifact/using_item/keep/.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1422.overhauled_toaster/using_item/1.trigger", "asset:artifact/1421.toaster/trigger/1.trigger", "asset:artifact/1637.precise_mana_controller/trigger/1.trigger", "asset:artifact/1453.frost_flake_bow/using_item/1.trigger", From 3e6e73a206a412157f2302123f46a9a0d1a1a8e7 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Thu, 12 Nov 2026 22:21:56 +0900 Subject: [PATCH 02/19] =?UTF-8?q?=E3=83=9F=E3=82=B9=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Asset/data/asset/tags/functions/artifact/using_item/keep/.json | 1 - 1 file changed, 1 deletion(-) diff --git a/Asset/data/asset/tags/functions/artifact/using_item/keep/.json b/Asset/data/asset/tags/functions/artifact/using_item/keep/.json index 2cb3675a3d..4034aa2dee 100644 --- a/Asset/data/asset/tags/functions/artifact/using_item/keep/.json +++ b/Asset/data/asset/tags/functions/artifact/using_item/keep/.json @@ -1,7 +1,6 @@ { "values": [ "asset:artifact/1422.overhauled_toaster/using_item/1.trigger", - "asset:artifact/1421.toaster/trigger/1.trigger", "asset:artifact/0108.vacuum_hopper/trigger/1.trigger", "asset:artifact/1619.volt_rave/using_item/1.trigger", "asset:artifact/0224.onegai_muscle/using_item/1.trigger", From f29d7615499805c7bab0c89f3a8a076491bdaf1a Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Thu, 12 Nov 2026 22:28:58 +0900 Subject: [PATCH 03/19] =?UTF-8?q?=E3=83=95=E3=83=AC=E3=83=BC=E3=83=90?= =?UTF-8?q?=E3=83=BC=E3=83=86=E3=82=AD=E3=82=B9=E3=83=88=E3=82=92=E8=AA=BF?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifact/1422.overhauled_toaster/give/2.give.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/give/2.give.mcfunction index b1c4414bcd..760139c0aa 100644 --- a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"魔改造トースター","color":"#d7a657"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text":"長押しで最大3段階のチャージを行い"}','{"text":"チャージ段階に応じたダメージと速度のパンを6枚射出する"}','{"text":"朝も昼も夜も、ずーっとパンですよね!","color":"gray"}'] + data modify storage asset:artifact Lore set value ['{"text":"長押しで最大3段階のチャージを行い"}','{"text":"チャージ段階に応じたダメージと速度のパンを6枚射出する"}','{"text":"朝も昼も夜も、これから毎日永遠にパンですよね!","color":"gray"}'] # 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション) data modify storage asset:artifact ConsumeItem.Item set value '{"translate":"item.minecraft.bread"}' data modify storage asset:artifact ConsumeItem.Count set value 1 From c176f4ce66d1cbe9ee70f2f02c535c5a0f9d98a0 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Thu, 12 Nov 2026 22:37:43 +0900 Subject: [PATCH 04/19] =?UTF-8?q?:sparkles:=20=E9=AD=94=E6=94=B9=E9=80=A0?= =?UTF-8?q?=E3=83=88=E3=83=BC=E3=82=B9=E3=82=BF=E3=83=BC=E3=82=921421?= =?UTF-8?q?=E3=81=A8=E5=90=8C=E3=81=98=E5=87=A6=E7=90=86=E3=81=AB=E7=B5=B1?= =?UTF-8?q?=E4=B8=80=E3=81=97Effect434=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dis_equip/1.trigger.mcfunction | 8 ++++ .../dis_equip/2.main.mcfunction | 10 +++++ .../give/2.give.mcfunction | 4 +- .../release_using_item/1.trigger.mcfunction | 8 ++++ .../2.check_condition.mcfunction | 13 ++++++ .../release_using_item/3.main.mcfunction | 17 ++++++++ .../using_item/2.check_condition.mcfunction | 9 +--- .../using_item/3.main.mcfunction | 2 +- .../using_item/charge.mcfunction | 2 +- .../using_item/charge/2.mcfunction | 2 +- .../using_item/charge/3.mcfunction | 2 +- .../_/register.mcfunction | 7 ++++ .../_/tick.mcfunction | 7 ++++ .../register.mcfunction | 41 +++++++++++++++++++ .../tick/.mcfunction | 12 ++++++ .../tick/shoot.mcfunction | 21 ++++++++++ .../tick/sound.mcfunction | 8 ++++ .../tags/functions/artifact/dis_equip.json | 3 +- .../artifact/using_item/release/.json | 3 +- .../asset/tags/functions/effect/register.json | 3 +- .../asset/tags/functions/effect/tick.json | 3 +- 21 files changed, 167 insertions(+), 18 deletions(-) create mode 100644 Asset/data/asset/functions/artifact/1422.overhauled_toaster/dis_equip/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1422.overhauled_toaster/dis_equip/2.main.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1422.overhauled_toaster/release_using_item/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1422.overhauled_toaster/release_using_item/2.check_condition.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1422.overhauled_toaster/release_using_item/3.main.mcfunction create mode 100644 Asset/data/asset/functions/effect/0434.overhauled_toaster_shooting/_/register.mcfunction create mode 100644 Asset/data/asset/functions/effect/0434.overhauled_toaster_shooting/_/tick.mcfunction create mode 100644 Asset/data/asset/functions/effect/0434.overhauled_toaster_shooting/register.mcfunction create mode 100644 Asset/data/asset/functions/effect/0434.overhauled_toaster_shooting/tick/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0434.overhauled_toaster_shooting/tick/shoot.mcfunction create mode 100644 Asset/data/asset/functions/effect/0434.overhauled_toaster_shooting/tick/sound.mcfunction diff --git a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/dis_equip/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/dis_equip/1.trigger.mcfunction new file mode 100644 index 0000000000..b099e81c12 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/dis_equip/1.trigger.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1422.overhauled_toaster/dis_equip/1.trigger +# +# 指定したイベントタイミングで実行されるfunction +# +# @within tag/function asset:artifact/dis_equip + +# storage asset:contextのidに装備している神器のIDが入っているので比較し、~/2.main.mcfunctionを実行する +execute if data storage asset:context id{mainhand:1422} run function asset:artifact/1422.overhauled_toaster/dis_equip/2.main diff --git a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/dis_equip/2.main.mcfunction b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/dis_equip/2.main.mcfunction new file mode 100644 index 0000000000..1718481db7 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/dis_equip/2.main.mcfunction @@ -0,0 +1,10 @@ +#> asset:artifact/1422.overhauled_toaster/dis_equip/2.main +# +# 装備解除時にチャージを解除する +# +# @within function asset:artifact/1422.overhauled_toaster/dis_equip/1.trigger + +# チャージ用Effectを削除する + data modify storage api: Argument.ID set value 415 + function api:entity/mob/effect/remove/from_id + function api:entity/mob/effect/reset diff --git a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/give/2.give.mcfunction index b1c4414bcd..2ab20acb17 100644 --- a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"魔改造トースター","color":"#d7a657"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text":"長押しで最大3段階のチャージを行い"}','{"text":"チャージ段階に応じたダメージと速度のパンを6枚射出する"}','{"text":"朝も昼も夜も、ずーっとパンですよね!","color":"gray"}'] + data modify storage asset:artifact Lore set value ['{"text":"長押しで最大3段階のチャージを行い"}','{"text":"チャージ段階に応じたダメージと速度のパンを2枚射出する"}','{"text":"朝も昼も夜も、ずーっとパンですよね!","color":"gray"}'] # 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション) data modify storage asset:artifact ConsumeItem.Item set value '{"translate":"item.minecraft.bread"}' 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 "40-120x6" + data modify storage asset:artifact AttackInfo.Damage set value "40-120x2" # 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) data modify storage asset:artifact AttackInfo.AttackType set value [Physical] # 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) diff --git a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/release_using_item/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/release_using_item/1.trigger.mcfunction new file mode 100644 index 0000000000..0313bca297 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/release_using_item/1.trigger.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1422.overhauled_toaster/release_using_item/1.trigger +# +# 指定したイベントタイミングで実行されるfunction +# +# @within tag/function asset:artifact/using_item/release/ + +# storage asset:contextのidに装備している神器のIDが入っているので比較し、~/2.check_condition.mcfunctionを実行する +execute if data storage asset:context id{mainhand:1422} run function asset:artifact/1422.overhauled_toaster/release_using_item/2.check_condition diff --git a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/release_using_item/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/release_using_item/2.check_condition.mcfunction new file mode 100644 index 0000000000..986e3c884b --- /dev/null +++ b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/release_using_item/2.check_condition.mcfunction @@ -0,0 +1,13 @@ +#> asset:artifact/1422.overhauled_toaster/release_using_item/2.check_condition +# +# 神器の発動条件をチェックします +# +# @within function asset:artifact/1422.overhauled_toaster/release_using_item/1.trigger + +# チャージ用Effectを取得する + data modify storage api: Argument.ID set value 415 + function api:entity/mob/effect/get/from_id + execute unless data storage api: Return.Effect run return fail + +# 3.main.mcfunctionを実行する + function asset:artifact/1422.overhauled_toaster/release_using_item/3.main diff --git a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/release_using_item/3.main.mcfunction b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/release_using_item/3.main.mcfunction new file mode 100644 index 0000000000..8b006281f0 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/release_using_item/3.main.mcfunction @@ -0,0 +1,17 @@ +#> asset:artifact/1422.overhauled_toaster/release_using_item/3.main +# +# チャージ段階に応じたパンを射出する +# +# @within function asset:artifact/1422.overhauled_toaster/release_using_item/2.check_condition + +# 発射用Effectへチャージ段階と発動時の情報を渡す + data modify storage api: Argument.ID set value 434 + data modify storage api: Argument.Stack set from storage api: Return.Effect.Stack + data modify storage api: Argument.FieldOverride set from storage api: Return.Effect.Field + function api:entity/mob/effect/give + function api:entity/mob/effect/reset + +# チャージ用Effectを削除する + data modify storage api: Argument.ID set value 415 + function api:entity/mob/effect/remove/from_id + function api:entity/mob/effect/reset diff --git a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/2.check_condition.mcfunction index f1bb0cf5a9..8be3db7ee0 100644 --- a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/2.check_condition.mcfunction +++ b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/2.check_condition.mcfunction @@ -11,27 +11,20 @@ # チャージ中は開始時の消費とクールダウン判定を繰り返さない data modify storage api: Argument.ID set value 415 function api:entity/mob/effect/get/from_id - execute if data storage api: Return.Effect.Field.Shooting run return fail execute if data storage api: Return.Effect run return run function asset:artifact/1422.overhauled_toaster/using_item/charge # 発射が終わるまで次のチャージを開始しない - data modify storage api: Argument.ID set value 416 + data modify storage api: Argument.ID set value 434 function api:entity/mob/effect/get/from_id execute if data storage api: Return.Effect run return fail # 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く function asset:artifact/common/check_condition/mainhand -# 他にアイテム等確認する場合はここに書く - -# CanUsedでなければreturn execute if entity @s[tag=!CanUsed] run return fail - -# パンがn個以上か? execute store result score $Count Temporary run clear @s bread 0 execute unless score $Count Temporary matches 1.. run tag @s remove CanUsed scoreboard players reset $Count Temporary execute if entity @s[tag=!CanUsed] run function lib:message/artifact/dont_have_require_items - execute if entity @s[tag=!CanUsed] run return fail # CanUsedタグをチェックして3.main.mcfunctionを実行する execute if entity @s[tag=CanUsed] run function asset:artifact/1422.overhauled_toaster/using_item/3.main diff --git a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/3.main.mcfunction b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/3.main.mcfunction index d3cb7acdb9..15efdb916e 100644 --- a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/3.main.mcfunction @@ -16,7 +16,7 @@ playsound minecraft:block.note_block.chime player @a ~ ~ ~ 1 1.8 # チャージ用エフェクト - data modify storage api: Argument.ID set value 362 + data modify storage api: Argument.ID set value 415 data modify storage api: Argument.FieldOverride.Range set value 40 data modify storage api: Argument.FieldOverride.Speed set value {Charge1:1,Charge2:2,Charge3:3} data modify storage api: Argument.FieldOverride.Damage set value {Charge1:40,Charge2:70,Charge3:120} diff --git a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge.mcfunction b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge.mcfunction index a41889f301..255e20e67d 100644 --- a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge.mcfunction +++ b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/1422.overhauled_toaster/using_item/charge # -# +# 使用継続時間からチャージ段階を更新する # # @within function asset:artifact/1422.overhauled_toaster/using_item/2.check_condition diff --git a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/2.mcfunction b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/2.mcfunction index 716f9f3577..bbecae1adb 100644 --- a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/2.mcfunction +++ b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/2.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/1422.overhauled_toaster/using_item/charge/2 # -# +# チャージ段階を更新する # # @within function asset:artifact/1422.overhauled_toaster/using_item/charge diff --git a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/3.mcfunction b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/3.mcfunction index 2140b8c422..a1b3118d17 100644 --- a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/3.mcfunction +++ b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/3.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/1422.overhauled_toaster/using_item/charge/3 # -# +# チャージ段階を更新する # # @within function asset:artifact/1422.overhauled_toaster/using_item/charge diff --git a/Asset/data/asset/functions/effect/0434.overhauled_toaster_shooting/_/register.mcfunction b/Asset/data/asset/functions/effect/0434.overhauled_toaster_shooting/_/register.mcfunction new file mode 100644 index 0000000000..25ed157ee4 --- /dev/null +++ b/Asset/data/asset/functions/effect/0434.overhauled_toaster_shooting/_/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0434.overhauled_toaster_shooting/_/register +# +# Effectの定義を呼び出す +# +# @within tag/function asset:effect/register + +execute if data storage asset:context {id:434} run function asset:effect/0434.overhauled_toaster_shooting/register diff --git a/Asset/data/asset/functions/effect/0434.overhauled_toaster_shooting/_/tick.mcfunction b/Asset/data/asset/functions/effect/0434.overhauled_toaster_shooting/_/tick.mcfunction new file mode 100644 index 0000000000..90d0b19dc5 --- /dev/null +++ b/Asset/data/asset/functions/effect/0434.overhauled_toaster_shooting/_/tick.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0434.overhauled_toaster_shooting/_/tick +# +# Effectのtick処理を呼び出す +# +# @within tag/function asset:effect/tick + +execute if data storage asset:context {id:434} run function asset:effect/0434.overhauled_toaster_shooting/tick/ diff --git a/Asset/data/asset/functions/effect/0434.overhauled_toaster_shooting/register.mcfunction b/Asset/data/asset/functions/effect/0434.overhauled_toaster_shooting/register.mcfunction new file mode 100644 index 0000000000..183c95a787 --- /dev/null +++ b/Asset/data/asset/functions/effect/0434.overhauled_toaster_shooting/register.mcfunction @@ -0,0 +1,41 @@ +#> asset:effect/0434.overhauled_toaster_shooting/register +# +# Effectのデータを指定 +# +# @within function asset:effect/0434.overhauled_toaster_shooting/_/register + +# ExtendsSafe (boolean) (default = false) + # data modify storage asset:effect ExtendsSafe set value true +# ID (int) + data modify storage asset:effect ID set value 434 +# 名前 (TextComponentString) + data modify storage asset:effect Name set value '{"text":"パン発射!!!"}' +# 説明文 (TextComponentString[]) + data modify storage asset:effect Description set value ['{"text":"パンを連続して射出する"}'] +# 効果時間 (int) (default = API || error) + data modify storage asset:effect Duration set value 2 +# スタック (int) (default = API || 1) + # data modify storage asset:effect Stack set value +# 効果時間の操作方法 (default = API || "replace") + # data modify storage asset:effect DurationOperation set value +# スタックの操作方法 (default = API || "replace") + # data modify storage asset:effect StackOperation set value +# 最大効果時間 (int) (default = 2147483647) + # data modify storage asset:effect MaxDuration set value +# 最大スタック (int) (default = 2147483647) + # data modify storage asset:effect MaxStack set value +# 悪い効果か否か (boolean) + data modify storage asset:effect IsBadEffect set value false +# 死亡時のエフェクトの処理 (default = "remove") + # data modify storage asset:effect ProcessOnDied set value +# 消すのに必要なレベル (int) (default = 1) + data modify storage asset:effect RequireClearLv set value 3 +# エフェクトをUIに表示するか (boolean) (default = true) + data modify storage asset:effect Visible set value false +# エフェクトのスタックををUIに表示するか (boolean) (default = true) + # data modify storage asset:effect StackVisible set value + +# フィールド + data modify storage asset:effect Field.Damage set value {Charge1:1,Charge2:10,Charge3:100} + data modify storage asset:effect Field.Speed set value {Charge1:1,Charge2:2,Charge3:3} + data modify storage asset:effect Field.Range set value 40 diff --git a/Asset/data/asset/functions/effect/0434.overhauled_toaster_shooting/tick/.mcfunction b/Asset/data/asset/functions/effect/0434.overhauled_toaster_shooting/tick/.mcfunction new file mode 100644 index 0000000000..c938131f4d --- /dev/null +++ b/Asset/data/asset/functions/effect/0434.overhauled_toaster_shooting/tick/.mcfunction @@ -0,0 +1,12 @@ +#> asset:effect/0434.overhauled_toaster_shooting/tick/ +# +# Effectのtick処理 +# +# @within function asset:effect/0434.overhauled_toaster_shooting/_/tick + +# 発射直前の音 + execute if data storage asset:context {Duration:1} run function asset:effect/0434.overhauled_toaster_shooting/tick/sound + +# 残りDurationが1と0の時に発射 + execute if data storage asset:context {Duration:1} anchored eyes positioned ^-0.35 ^-0.25 ^ run function asset:effect/0434.overhauled_toaster_shooting/tick/shoot + execute if data storage asset:context {Duration:0} anchored eyes positioned ^-0.35 ^-0.35 ^ run function asset:effect/0434.overhauled_toaster_shooting/tick/shoot diff --git a/Asset/data/asset/functions/effect/0434.overhauled_toaster_shooting/tick/shoot.mcfunction b/Asset/data/asset/functions/effect/0434.overhauled_toaster_shooting/tick/shoot.mcfunction new file mode 100644 index 0000000000..d63e933608 --- /dev/null +++ b/Asset/data/asset/functions/effect/0434.overhauled_toaster_shooting/tick/shoot.mcfunction @@ -0,0 +1,21 @@ +#> asset:effect/0434.overhauled_toaster_shooting/tick/shoot +# +# +# +# @within function asset:effect/0434.overhauled_toaster_shooting/tick/ + +# スタックに応じて弾速を調整 + execute if data storage asset:context {Stack:1} run data modify storage api: Argument.FieldOverride.Speed set from storage asset:context this.Speed.Charge1 + execute if data storage asset:context {Stack:2} run data modify storage api: Argument.FieldOverride.Speed set from storage asset:context this.Speed.Charge2 + execute if data storage asset:context {Stack:3} run data modify storage api: Argument.FieldOverride.Speed set from storage asset:context this.Speed.Charge3 + +# ダメージ設定 + execute if data storage asset:context {Stack:1} run data modify storage api: Argument.FieldOverride.Damage set from storage asset:context this.Damage.Charge1 + execute if data storage asset:context {Stack:2} run data modify storage api: Argument.FieldOverride.Damage set from storage asset:context this.Damage.Charge2 + execute if data storage asset:context {Stack:3} run data modify storage api: Argument.FieldOverride.Damage set from storage asset:context this.Damage.Charge3 + +# 召喚 + data modify storage api: Argument.ID set value 1159 + data modify storage api: Argument.FieldOverride.Range set from storage asset:context this.Range + execute store result storage api: Argument.FieldOverride.UserID int 1 run scoreboard players get @s UserID + function api:object/summon diff --git a/Asset/data/asset/functions/effect/0434.overhauled_toaster_shooting/tick/sound.mcfunction b/Asset/data/asset/functions/effect/0434.overhauled_toaster_shooting/tick/sound.mcfunction new file mode 100644 index 0000000000..71de9e9d3b --- /dev/null +++ b/Asset/data/asset/functions/effect/0434.overhauled_toaster_shooting/tick/sound.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0434.overhauled_toaster_shooting/tick/sound +# +# 音 +# +# @within function asset:effect/0434.overhauled_toaster_shooting/tick/ + + playsound block.piston.contract player @a ~ ~ ~ 1 1.2 + playsound block.fire.ambient player @a ~ ~ ~ 1 1.3 diff --git a/Asset/data/asset/tags/functions/artifact/dis_equip.json b/Asset/data/asset/tags/functions/artifact/dis_equip.json index 5c6326ca50..3c9d55dca0 100644 --- a/Asset/data/asset/tags/functions/artifact/dis_equip.json +++ b/Asset/data/asset/tags/functions/artifact/dis_equip.json @@ -76,6 +76,7 @@ "asset:artifact/1227.aurora_scythe/dis_equip/1.trigger", "asset:artifact/1228.fatalerror/dis_equip/1.trigger", "asset:artifact/1256.deep_azure/dis_equip/1.trigger", - "asset:artifact/1421.toaster/dis_equip/1.trigger" + "asset:artifact/1421.toaster/dis_equip/1.trigger", + "asset:artifact/1422.overhauled_toaster/dis_equip/1.trigger" ] } diff --git a/Asset/data/asset/tags/functions/artifact/using_item/release/.json b/Asset/data/asset/tags/functions/artifact/using_item/release/.json index b626e40d6c..fb0e9f2b9d 100644 --- a/Asset/data/asset/tags/functions/artifact/using_item/release/.json +++ b/Asset/data/asset/tags/functions/artifact/using_item/release/.json @@ -4,6 +4,7 @@ "asset:artifact/1227.aurora_scythe/release_using_item/1.trigger", "asset:artifact/1228.fatalerror/release_using_item/1.trigger", "asset:artifact/1256.deep_azure/release_using_item/1.trigger", - "asset:artifact/1421.toaster/release_using_item/1.trigger" + "asset:artifact/1421.toaster/release_using_item/1.trigger", + "asset:artifact/1422.overhauled_toaster/release_using_item/1.trigger" ] } diff --git a/Asset/data/asset/tags/functions/effect/register.json b/Asset/data/asset/tags/functions/effect/register.json index e7443943ec..7c945d015c 100644 --- a/Asset/data/asset/tags/functions/effect/register.json +++ b/Asset/data/asset/tags/functions/effect/register.json @@ -202,6 +202,7 @@ "asset:effect/0258.spirit_melody/_/register", "asset:effect/0406.ocean_grace/_/register", "asset:effect/0415.baking/_/register", - "asset:effect/0416.toaster_shooting/_/register" + "asset:effect/0416.toaster_shooting/_/register", + "asset:effect/0434.overhauled_toaster_shooting/_/register" ] } diff --git a/Asset/data/asset/tags/functions/effect/tick.json b/Asset/data/asset/tags/functions/effect/tick.json index f09aa762be..823e443d01 100644 --- a/Asset/data/asset/tags/functions/effect/tick.json +++ b/Asset/data/asset/tags/functions/effect/tick.json @@ -117,6 +117,7 @@ "asset:effect/0279.poison_of_vinderre/_/tick", "asset:effect/0258.spirit_melody/_/tick", "asset:effect/0406.ocean_grace/_/tick", - "asset:effect/0416.toaster_shooting/_/tick" + "asset:effect/0416.toaster_shooting/_/tick", + "asset:effect/0434.overhauled_toaster_shooting/_/tick" ] } From ee5aec81f47d5554d86327cdc11b0b9b3666b6ca Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Thu, 12 Nov 2026 22:49:25 +0900 Subject: [PATCH 05/19] =?UTF-8?q?=E7=B4=B0=E3=81=8B=E3=81=84=E3=81=A8?= =?UTF-8?q?=E3=81=93=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../register.mcfunction | 2 +- .../tick/.mcfunction | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Asset/data/asset/functions/effect/0434.overhauled_toaster_shooting/register.mcfunction b/Asset/data/asset/functions/effect/0434.overhauled_toaster_shooting/register.mcfunction index 183c95a787..0a1265c518 100644 --- a/Asset/data/asset/functions/effect/0434.overhauled_toaster_shooting/register.mcfunction +++ b/Asset/data/asset/functions/effect/0434.overhauled_toaster_shooting/register.mcfunction @@ -13,7 +13,7 @@ # 説明文 (TextComponentString[]) data modify storage asset:effect Description set value ['{"text":"パンを連続して射出する"}'] # 効果時間 (int) (default = API || error) - data modify storage asset:effect Duration set value 2 + data modify storage asset:effect Duration set value 6 # スタック (int) (default = API || 1) # data modify storage asset:effect Stack set value # 効果時間の操作方法 (default = API || "replace") diff --git a/Asset/data/asset/functions/effect/0434.overhauled_toaster_shooting/tick/.mcfunction b/Asset/data/asset/functions/effect/0434.overhauled_toaster_shooting/tick/.mcfunction index c938131f4d..e20200c96e 100644 --- a/Asset/data/asset/functions/effect/0434.overhauled_toaster_shooting/tick/.mcfunction +++ b/Asset/data/asset/functions/effect/0434.overhauled_toaster_shooting/tick/.mcfunction @@ -4,9 +4,13 @@ # # @within function asset:effect/0434.overhauled_toaster_shooting/_/tick -# 発射直前の音 - execute if data storage asset:context {Duration:1} run function asset:effect/0434.overhauled_toaster_shooting/tick/sound +# 発射直前・発射中の音 + execute anchored eyes positioned ^-0.35 ^ ^0.5 run function asset:effect/0434.overhauled_toaster_shooting/tick/sound # 残りDurationが1と0の時に発射 - execute if data storage asset:context {Duration:1} anchored eyes positioned ^-0.35 ^-0.25 ^ run function asset:effect/0434.overhauled_toaster_shooting/tick/shoot - execute if data storage asset:context {Duration:0} anchored eyes positioned ^-0.35 ^-0.35 ^ run function asset:effect/0434.overhauled_toaster_shooting/tick/shoot + execute if data storage asset:context {Duration:5} anchored eyes positioned ^-0.35 ^-0.05 ^ run function asset:effect/0434.overhauled_toaster_shooting/tick/shoot + execute if data storage asset:context {Duration:4} anchored eyes positioned ^-0.35 ^-0.15 ^ run function asset:effect/0434.overhauled_toaster_shooting/tick/shoot + execute if data storage asset:context {Duration:3} anchored eyes positioned ^-0.35 ^-0.25 ^ run function asset:effect/0434.overhauled_toaster_shooting/tick/shoot + execute if data storage asset:context {Duration:2} anchored eyes positioned ^-0.35 ^-0.35 ^ run function asset:effect/0434.overhauled_toaster_shooting/tick/shoot + execute if data storage asset:context {Duration:1} anchored eyes positioned ^-0.35 ^-0.45 ^ run function asset:effect/0434.overhauled_toaster_shooting/tick/shoot + execute if data storage asset:context {Duration:0} anchored eyes positioned ^-0.35 ^-0.55 ^ run function asset:effect/0434.overhauled_toaster_shooting/tick/shoot From b2436fc79495cfa3826e85ee1dbc8f1be153ba56 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Thu, 12 Nov 2026 22:52:14 +0900 Subject: [PATCH 06/19] =?UTF-8?q?:recycle:=20=E9=AD=94=E6=94=B9=E9=80=A0?= =?UTF-8?q?=E3=83=88=E3=83=BC=E3=82=B9=E3=82=BF=E3=83=BC=E3=81=AE=E6=AE=B5?= =?UTF-8?q?=E9=9A=8E=E5=88=A5Speed=E8=A8=AD=E5=AE=9A=E3=82=92=E5=80=8B?= =?UTF-8?q?=E5=88=A5=E3=81=AB=E5=88=86=E9=9B=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1422.overhauled_toaster/using_item/3.main.mcfunction | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/3.main.mcfunction b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/3.main.mcfunction index 15efdb916e..8421531de0 100644 --- a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/3.main.mcfunction @@ -18,7 +18,9 @@ # チャージ用エフェクト data modify storage api: Argument.ID set value 415 data modify storage api: Argument.FieldOverride.Range set value 40 - data modify storage api: Argument.FieldOverride.Speed set value {Charge1:1,Charge2:2,Charge3:3} + data modify storage api: Argument.FieldOverride.Speed.Charge1 set value 1 + data modify storage api: Argument.FieldOverride.Speed.Charge2 set value 2 + data modify storage api: Argument.FieldOverride.Speed.Charge3 set value 3 data modify storage api: Argument.FieldOverride.Damage set value {Charge1:40,Charge2:70,Charge3:120} function api:entity/mob/effect/give function api:entity/mob/effect/reset From 1493ca9d7513430408b2284bbbddf19b1dfdcdf0 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Thu, 12 Nov 2026 22:56:49 +0900 Subject: [PATCH 07/19] =?UTF-8?q?=E4=B8=80=E9=83=A8=E5=A4=89=E6=9B=B4?= =?UTF-8?q?=E3=82=92=E6=92=92=E3=81=8D=E6=88=BB=E3=81=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1422.overhauled_toaster/using_item/3.main.mcfunction | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/3.main.mcfunction b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/3.main.mcfunction index 8421531de0..15efdb916e 100644 --- a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/3.main.mcfunction @@ -18,9 +18,7 @@ # チャージ用エフェクト data modify storage api: Argument.ID set value 415 data modify storage api: Argument.FieldOverride.Range set value 40 - data modify storage api: Argument.FieldOverride.Speed.Charge1 set value 1 - data modify storage api: Argument.FieldOverride.Speed.Charge2 set value 2 - data modify storage api: Argument.FieldOverride.Speed.Charge3 set value 3 + data modify storage api: Argument.FieldOverride.Speed set value {Charge1:1,Charge2:2,Charge3:3} data modify storage api: Argument.FieldOverride.Damage set value {Charge1:40,Charge2:70,Charge3:120} function api:entity/mob/effect/give function api:entity/mob/effect/reset From d86d8c3028bd73c84b5d7c1eb9c7e8ab8c38d70d Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Thu, 12 Nov 2026 23:25:49 +0900 Subject: [PATCH 08/19] =?UTF-8?q?score=20holder=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../using_item/2.check_condition.mcfunction | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/2.check_condition.mcfunction index 8be3db7ee0..cf37219340 100644 --- a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/2.check_condition.mcfunction +++ b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/2.check_condition.mcfunction @@ -6,7 +6,7 @@ #> Private # @private - #declare score_holder $Count + #declare score_holder $A1422.Count # チャージ中は開始時の消費とクールダウン判定を繰り返さない data modify storage api: Argument.ID set value 415 @@ -21,9 +21,9 @@ # 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く function asset:artifact/common/check_condition/mainhand execute if entity @s[tag=!CanUsed] run return fail - execute store result score $Count Temporary run clear @s bread 0 - execute unless score $Count Temporary matches 1.. run tag @s remove CanUsed - scoreboard players reset $Count Temporary + execute store result score $A1422.Count Temporary run clear @s bread 0 + execute unless score $A1422.Count Temporary matches 1.. run tag @s remove CanUsed + scoreboard players reset $A1422.Count execute if entity @s[tag=!CanUsed] run function lib:message/artifact/dont_have_require_items # CanUsedタグをチェックして3.main.mcfunctionを実行する From a54c72bc13d2b6e6b28f400ed770a39336e1ef42 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Fri, 13 Nov 2026 00:53:29 +0900 Subject: [PATCH 09/19] =?UTF-8?q?:sparkles:=20=E9=AD=94=E6=94=B9=E9=80=A0?= =?UTF-8?q?=E3=83=88=E3=83=BC=E3=82=B9=E3=82=BF=E3=83=BC=E3=82=927?= =?UTF-8?q?=E6=AE=B5=E9=9A=8E=E3=83=81=E3=83=A3=E3=83=BC=E3=82=B8=E3=81=A8?= =?UTF-8?q?=E9=85=8D=E5=88=97=E8=A8=AD=E5=AE=9A=E3=81=AB=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../give/2.give.mcfunction | 4 ++-- .../using_item/3.main.mcfunction | 4 ++-- .../using_item/charge.mcfunction | 8 ++++++-- .../using_item/charge/4.mcfunction | 15 ++++++++++++++ .../using_item/charge/5.mcfunction | 15 ++++++++++++++ .../using_item/charge/6.mcfunction | 15 ++++++++++++++ .../using_item/charge/7.mcfunction | 15 ++++++++++++++ .../register.mcfunction | 4 ++-- .../tick/shoot.mcfunction | 20 +++++++++++++------ docs/knowledge/artifact.md | 2 ++ 10 files changed, 88 insertions(+), 14 deletions(-) create mode 100644 Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/4.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/5.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/6.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/7.mcfunction diff --git a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/give/2.give.mcfunction index 3d354ae20e..e112898ce5 100644 --- a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"魔改造トースター","color":"#d7a657"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text":"長押しで最大3段階のチャージを行い"}','{"text":"チャージ段階に応じたダメージと速度のパンを6枚射出する"}','{"text":"朝も昼も夜も、これから毎日永遠にパンですよね!","color":"gray"}'] + data modify storage asset:artifact Lore set value ['{"text":"長押しで最大7段階のチャージを行い"}','{"text":"チャージ段階に応じたダメージと速度のパンを6枚射出する"}','{"text":"朝も昼も夜も、これから毎日永遠にパンですよね!","color":"gray"}'] # 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション) data modify storage asset:artifact ConsumeItem.Item set value '{"translate":"item.minecraft.bread"}' 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 "40-120x2" + data modify storage asset:artifact AttackInfo.Damage set value "40-120x6" # 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) data modify storage asset:artifact AttackInfo.AttackType set value [Physical] # 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) diff --git a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/3.main.mcfunction b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/3.main.mcfunction index 15efdb916e..c3df5d9fa9 100644 --- a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/3.main.mcfunction @@ -18,7 +18,7 @@ # チャージ用エフェクト data modify storage api: Argument.ID set value 415 data modify storage api: Argument.FieldOverride.Range set value 40 - data modify storage api: Argument.FieldOverride.Speed set value {Charge1:1,Charge2:2,Charge3:3} - data modify storage api: Argument.FieldOverride.Damage set value {Charge1:40,Charge2:70,Charge3:120} + data modify storage api: Argument.FieldOverride.Speed set value [1,2,3,4,5,6,7] + data modify storage api: Argument.FieldOverride.Damage set value [40,70,120,120,120,120,120] function api:entity/mob/effect/give function api:entity/mob/effect/reset diff --git a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge.mcfunction b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge.mcfunction index 255e20e67d..636fd87290 100644 --- a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge.mcfunction +++ b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge.mcfunction @@ -5,8 +5,12 @@ # @within function asset:artifact/1422.overhauled_toaster/using_item/2.check_condition # チャージ段階が変わるときだけEffectを更新する - execute if data storage asset:context UsingItemTime{mainhand:12} run function asset:artifact/1422.overhauled_toaster/using_item/charge/2 - execute if data storage asset:context UsingItemTime{mainhand:24} run function asset:artifact/1422.overhauled_toaster/using_item/charge/3 + execute if data storage asset:context UsingItemTime{mainhand:2} run function asset:artifact/1422.overhauled_toaster/using_item/charge/2 + execute if data storage asset:context UsingItemTime{mainhand:4} run function asset:artifact/1422.overhauled_toaster/using_item/charge/3 + execute if data storage asset:context UsingItemTime{mainhand:6} run function asset:artifact/1422.overhauled_toaster/using_item/charge/4 + execute if data storage asset:context UsingItemTime{mainhand:8} run function asset:artifact/1422.overhauled_toaster/using_item/charge/5 + execute if data storage asset:context UsingItemTime{mainhand:10} run function asset:artifact/1422.overhauled_toaster/using_item/charge/6 + execute if data storage asset:context UsingItemTime{mainhand:12} run function asset:artifact/1422.overhauled_toaster/using_item/charge/7 # 長押し中の音 playsound block.furnace.fire_crackle player @a ~ ~ ~ 1 0.8 diff --git a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/4.mcfunction b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/4.mcfunction new file mode 100644 index 0000000000..77f1564920 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/4.mcfunction @@ -0,0 +1,15 @@ +#> asset:artifact/1422.overhauled_toaster/using_item/charge/4 +# +# チャージ段階を更新する +# +# @within function asset:artifact/1422.overhauled_toaster/using_item/charge + +# チャージ段階の演出 + playsound minecraft:block.note_block.chime player @a ~ ~ ~ 1 2.0 + +# 発動時の情報を保ってスタックを更新する + data modify storage api: Argument.ID set value 415 + data modify storage api: Argument.Stack set value 4 + data modify storage api: Argument.FieldOverride set from storage api: Return.Effect.Field + function api:entity/mob/effect/give + function api:entity/mob/effect/reset diff --git a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/5.mcfunction b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/5.mcfunction new file mode 100644 index 0000000000..cd30cc172e --- /dev/null +++ b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/5.mcfunction @@ -0,0 +1,15 @@ +#> asset:artifact/1422.overhauled_toaster/using_item/charge/5 +# +# チャージ段階を更新する +# +# @within function asset:artifact/1422.overhauled_toaster/using_item/charge + +# チャージ段階の演出 + playsound minecraft:block.note_block.chime player @a ~ ~ ~ 1 2.0 + +# 発動時の情報を保ってスタックを更新する + data modify storage api: Argument.ID set value 415 + data modify storage api: Argument.Stack set value 5 + data modify storage api: Argument.FieldOverride set from storage api: Return.Effect.Field + function api:entity/mob/effect/give + function api:entity/mob/effect/reset diff --git a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/6.mcfunction b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/6.mcfunction new file mode 100644 index 0000000000..ed30fce46f --- /dev/null +++ b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/6.mcfunction @@ -0,0 +1,15 @@ +#> asset:artifact/1422.overhauled_toaster/using_item/charge/6 +# +# チャージ段階を更新する +# +# @within function asset:artifact/1422.overhauled_toaster/using_item/charge + +# チャージ段階の演出 + playsound minecraft:block.note_block.chime player @a ~ ~ ~ 1 2.0 + +# 発動時の情報を保ってスタックを更新する + data modify storage api: Argument.ID set value 415 + data modify storage api: Argument.Stack set value 6 + data modify storage api: Argument.FieldOverride set from storage api: Return.Effect.Field + function api:entity/mob/effect/give + function api:entity/mob/effect/reset diff --git a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/7.mcfunction b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/7.mcfunction new file mode 100644 index 0000000000..4fb49a4bc6 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/7.mcfunction @@ -0,0 +1,15 @@ +#> asset:artifact/1422.overhauled_toaster/using_item/charge/7 +# +# チャージ段階を更新する +# +# @within function asset:artifact/1422.overhauled_toaster/using_item/charge + +# チャージ段階の演出 + playsound minecraft:block.note_block.chime player @a ~ ~ ~ 1 2.0 + +# 発動時の情報を保ってスタックを更新する + data modify storage api: Argument.ID set value 415 + data modify storage api: Argument.Stack set value 7 + data modify storage api: Argument.FieldOverride set from storage api: Return.Effect.Field + function api:entity/mob/effect/give + function api:entity/mob/effect/reset diff --git a/Asset/data/asset/functions/effect/0434.overhauled_toaster_shooting/register.mcfunction b/Asset/data/asset/functions/effect/0434.overhauled_toaster_shooting/register.mcfunction index 0a1265c518..1f69982471 100644 --- a/Asset/data/asset/functions/effect/0434.overhauled_toaster_shooting/register.mcfunction +++ b/Asset/data/asset/functions/effect/0434.overhauled_toaster_shooting/register.mcfunction @@ -36,6 +36,6 @@ # data modify storage asset:effect StackVisible set value # フィールド - data modify storage asset:effect Field.Damage set value {Charge1:1,Charge2:10,Charge3:100} - data modify storage asset:effect Field.Speed set value {Charge1:1,Charge2:2,Charge3:3} + data modify storage asset:effect Field.Damage set value [40,70,120,120,120,120,120] + data modify storage asset:effect Field.Speed set value [1,2,3,4,5,6,7] data modify storage asset:effect Field.Range set value 40 diff --git a/Asset/data/asset/functions/effect/0434.overhauled_toaster_shooting/tick/shoot.mcfunction b/Asset/data/asset/functions/effect/0434.overhauled_toaster_shooting/tick/shoot.mcfunction index d63e933608..db463c187a 100644 --- a/Asset/data/asset/functions/effect/0434.overhauled_toaster_shooting/tick/shoot.mcfunction +++ b/Asset/data/asset/functions/effect/0434.overhauled_toaster_shooting/tick/shoot.mcfunction @@ -5,14 +5,22 @@ # @within function asset:effect/0434.overhauled_toaster_shooting/tick/ # スタックに応じて弾速を調整 - execute if data storage asset:context {Stack:1} run data modify storage api: Argument.FieldOverride.Speed set from storage asset:context this.Speed.Charge1 - execute if data storage asset:context {Stack:2} run data modify storage api: Argument.FieldOverride.Speed set from storage asset:context this.Speed.Charge2 - execute if data storage asset:context {Stack:3} run data modify storage api: Argument.FieldOverride.Speed set from storage asset:context this.Speed.Charge3 + execute if data storage asset:context {Stack:1} run data modify storage api: Argument.FieldOverride.Speed set from storage asset:context this.Speed[0] + execute if data storage asset:context {Stack:2} run data modify storage api: Argument.FieldOverride.Speed set from storage asset:context this.Speed[1] + execute if data storage asset:context {Stack:3} run data modify storage api: Argument.FieldOverride.Speed set from storage asset:context this.Speed[2] + execute if data storage asset:context {Stack:4} run data modify storage api: Argument.FieldOverride.Speed set from storage asset:context this.Speed[3] + execute if data storage asset:context {Stack:5} run data modify storage api: Argument.FieldOverride.Speed set from storage asset:context this.Speed[4] + execute if data storage asset:context {Stack:6} run data modify storage api: Argument.FieldOverride.Speed set from storage asset:context this.Speed[5] + execute if data storage asset:context {Stack:7} run data modify storage api: Argument.FieldOverride.Speed set from storage asset:context this.Speed[6] # ダメージ設定 - execute if data storage asset:context {Stack:1} run data modify storage api: Argument.FieldOverride.Damage set from storage asset:context this.Damage.Charge1 - execute if data storage asset:context {Stack:2} run data modify storage api: Argument.FieldOverride.Damage set from storage asset:context this.Damage.Charge2 - execute if data storage asset:context {Stack:3} run data modify storage api: Argument.FieldOverride.Damage set from storage asset:context this.Damage.Charge3 + execute if data storage asset:context {Stack:1} run data modify storage api: Argument.FieldOverride.Damage set from storage asset:context this.Damage[0] + execute if data storage asset:context {Stack:2} run data modify storage api: Argument.FieldOverride.Damage set from storage asset:context this.Damage[1] + execute if data storage asset:context {Stack:3} run data modify storage api: Argument.FieldOverride.Damage set from storage asset:context this.Damage[2] + execute if data storage asset:context {Stack:4} run data modify storage api: Argument.FieldOverride.Damage set from storage asset:context this.Damage[3] + execute if data storage asset:context {Stack:5} run data modify storage api: Argument.FieldOverride.Damage set from storage asset:context this.Damage[4] + execute if data storage asset:context {Stack:6} run data modify storage api: Argument.FieldOverride.Damage set from storage asset:context this.Damage[5] + execute if data storage asset:context {Stack:7} run data modify storage api: Argument.FieldOverride.Damage set from storage asset:context this.Damage[6] # 召喚 data modify storage api: Argument.ID set value 1159 diff --git a/docs/knowledge/artifact.md b/docs/knowledge/artifact.md index 4fe426c22b..fbb58fe1b0 100644 --- a/docs/knowledge/artifact.md +++ b/docs/knowledge/artifact.md @@ -64,6 +64,8 @@ DeathMessageの書式例は [Thunder の命中処理](../../Asset/data/asset/fun トースターはチャージ表示用のEffect 415と、使用解除後の発射用Effect 416を分ける。装備解除では415だけを削除し、発射開始後は416が2枚のパンを1tickずつずらして射出する。416が残る間は次のチャージを開始しない。チャージ表示の寿命と発射処理の寿命を同じEffectで管理しない実例である。 +魔改造トースター1422は、開始時を1段階とし、使用時間が2・4・6・8・10・12tickに達すると2〜7段階へ更新する。神器の `using_item/3.main` でSpeedとDamageを7要素の配列として指定し、段階更新と使用解除ではField全体を引き継ぐ。発射用Effect434は `Stack:N` の条件分岐で配列の `N-1` 番目を取得し、マクロを使わず各段階の弾速と威力を選ぶ。共有するチャージ表示用Effect415の既定Fieldは1421の形式を保ち、1422の配列は付与時に上書きする。 + ### 持ち替えでチャージを引き継がせない チャージを使用中の神器に限定する場合、発射時だけでなく装備解除時にもチャージ用Effectを削除する。[Volt-Raveの装備解除](../../Asset/data/asset/functions/artifact/1619.volt_rave/dis_equip/2.main.mcfunction) はmainhandから外したときにEffect 394の削除を要求し、発射処理は呼ばない。同IDの別個体へ持ち替える場合もチャージを解除する。持ち替え検出とdis_equipのcontextは、依存先TheSkyBlessingの `architecture.md`「装備は前回との差から有効状態を組み直す」を参照する。 From d3a5e2ddc18ddd32fdab1384332cc8a30b06f5ad Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Fri, 13 Nov 2026 01:04:20 +0900 Subject: [PATCH 10/19] =?UTF-8?q?:recycle:=20=E9=AD=94=E6=94=B9=E9=80=A0?= =?UTF-8?q?=E3=83=88=E3=83=BC=E3=82=B9=E3=82=BF=E3=83=BC=E3=81=AE=E3=83=81?= =?UTF-8?q?=E3=83=A3=E3=83=BC=E3=82=B8=E6=9B=B4=E6=96=B0=E3=82=92=E3=83=9E?= =?UTF-8?q?=E3=82=AF=E3=83=AD=E3=81=B8=E7=B5=B1=E5=90=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../using_item/2.check_condition.mcfunction | 2 +- .../using_item/3.main.mcfunction | 7 +----- .../{charge.mcfunction => charge/.mcfunction} | 14 +++++------ .../using_item/charge/2.mcfunction | 15 ------------ .../using_item/charge/3.mcfunction | 15 ------------ .../using_item/charge/4.mcfunction | 15 ------------ .../using_item/charge/5.mcfunction | 15 ------------ .../using_item/charge/6.mcfunction | 15 ------------ .../using_item/charge/7.mcfunction | 15 ------------ .../using_item/charge/update.m.mcfunction | 24 +++++++++++++++++++ docs/knowledge/artifact.md | 2 +- 11 files changed, 34 insertions(+), 105 deletions(-) rename Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/{charge.mcfunction => charge/.mcfunction} (78%) delete mode 100644 Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/2.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/3.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/4.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/5.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/6.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/7.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/update.m.mcfunction diff --git a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/2.check_condition.mcfunction index cf37219340..179898200f 100644 --- a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/2.check_condition.mcfunction +++ b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/2.check_condition.mcfunction @@ -11,7 +11,7 @@ # チャージ中は開始時の消費とクールダウン判定を繰り返さない data modify storage api: Argument.ID set value 415 function api:entity/mob/effect/get/from_id - execute if data storage api: Return.Effect run return run function asset:artifact/1422.overhauled_toaster/using_item/charge + execute if data storage api: Return.Effect run return run function asset:artifact/1422.overhauled_toaster/using_item/charge/ # 発射が終わるまで次のチャージを開始しない data modify storage api: Argument.ID set value 434 diff --git a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/3.main.mcfunction b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/3.main.mcfunction index c3df5d9fa9..eaad55f6da 100644 --- a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/3.main.mcfunction @@ -12,13 +12,8 @@ # パンを1個消費 clear @s bread 1 -# 演出 - playsound minecraft:block.note_block.chime player @a ~ ~ ~ 1 1.8 - # チャージ用エフェクト - data modify storage api: Argument.ID set value 415 data modify storage api: Argument.FieldOverride.Range set value 40 data modify storage api: Argument.FieldOverride.Speed set value [1,2,3,4,5,6,7] data modify storage api: Argument.FieldOverride.Damage set value [40,70,120,120,120,120,120] - function api:entity/mob/effect/give - function api:entity/mob/effect/reset + function asset:artifact/1422.overhauled_toaster/using_item/charge/update.m {Stack:1,Pitch:1.8} diff --git a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge.mcfunction b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/.mcfunction similarity index 78% rename from Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge.mcfunction rename to Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/.mcfunction index 636fd87290..7f58c2392c 100644 --- a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge.mcfunction +++ b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/.mcfunction @@ -1,16 +1,16 @@ -#> asset:artifact/1422.overhauled_toaster/using_item/charge +#> asset:artifact/1422.overhauled_toaster/using_item/charge/ # # 使用継続時間からチャージ段階を更新する # # @within function asset:artifact/1422.overhauled_toaster/using_item/2.check_condition # チャージ段階が変わるときだけEffectを更新する - execute if data storage asset:context UsingItemTime{mainhand:2} run function asset:artifact/1422.overhauled_toaster/using_item/charge/2 - execute if data storage asset:context UsingItemTime{mainhand:4} run function asset:artifact/1422.overhauled_toaster/using_item/charge/3 - execute if data storage asset:context UsingItemTime{mainhand:6} run function asset:artifact/1422.overhauled_toaster/using_item/charge/4 - execute if data storage asset:context UsingItemTime{mainhand:8} run function asset:artifact/1422.overhauled_toaster/using_item/charge/5 - execute if data storage asset:context UsingItemTime{mainhand:10} run function asset:artifact/1422.overhauled_toaster/using_item/charge/6 - execute if data storage asset:context UsingItemTime{mainhand:12} run function asset:artifact/1422.overhauled_toaster/using_item/charge/7 + execute if data storage asset:context UsingItemTime{mainhand:2} run function asset:artifact/1422.overhauled_toaster/using_item/charge/update.m {Stack:2,Pitch:1.9} + execute if data storage asset:context UsingItemTime{mainhand:4} run function asset:artifact/1422.overhauled_toaster/using_item/charge/update.m {Stack:3,Pitch:2.0} + execute if data storage asset:context UsingItemTime{mainhand:6} run function asset:artifact/1422.overhauled_toaster/using_item/charge/update.m {Stack:4,Pitch:2.0} + execute if data storage asset:context UsingItemTime{mainhand:8} run function asset:artifact/1422.overhauled_toaster/using_item/charge/update.m {Stack:5,Pitch:2.0} + execute if data storage asset:context UsingItemTime{mainhand:10} run function asset:artifact/1422.overhauled_toaster/using_item/charge/update.m {Stack:6,Pitch:2.0} + execute if data storage asset:context UsingItemTime{mainhand:12} run function asset:artifact/1422.overhauled_toaster/using_item/charge/update.m {Stack:7,Pitch:2.0} # 長押し中の音 playsound block.furnace.fire_crackle player @a ~ ~ ~ 1 0.8 diff --git a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/2.mcfunction b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/2.mcfunction deleted file mode 100644 index bbecae1adb..0000000000 --- a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/2.mcfunction +++ /dev/null @@ -1,15 +0,0 @@ -#> asset:artifact/1422.overhauled_toaster/using_item/charge/2 -# -# チャージ段階を更新する -# -# @within function asset:artifact/1422.overhauled_toaster/using_item/charge - -# チャージ段階の演出 - playsound minecraft:block.note_block.chime player @a ~ ~ ~ 1 1.9 - -# 発動時の情報を保ってスタックを更新する - data modify storage api: Argument.ID set value 415 - data modify storage api: Argument.Stack set value 2 - data modify storage api: Argument.FieldOverride set from storage api: Return.Effect.Field - function api:entity/mob/effect/give - function api:entity/mob/effect/reset diff --git a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/3.mcfunction b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/3.mcfunction deleted file mode 100644 index a1b3118d17..0000000000 --- a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/3.mcfunction +++ /dev/null @@ -1,15 +0,0 @@ -#> asset:artifact/1422.overhauled_toaster/using_item/charge/3 -# -# チャージ段階を更新する -# -# @within function asset:artifact/1422.overhauled_toaster/using_item/charge - -# チャージ段階の演出 - playsound minecraft:block.note_block.chime player @a ~ ~ ~ 1 2.0 - -# 発動時の情報を保ってスタックを更新する - data modify storage api: Argument.ID set value 415 - data modify storage api: Argument.Stack set value 3 - data modify storage api: Argument.FieldOverride set from storage api: Return.Effect.Field - function api:entity/mob/effect/give - function api:entity/mob/effect/reset diff --git a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/4.mcfunction b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/4.mcfunction deleted file mode 100644 index 77f1564920..0000000000 --- a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/4.mcfunction +++ /dev/null @@ -1,15 +0,0 @@ -#> asset:artifact/1422.overhauled_toaster/using_item/charge/4 -# -# チャージ段階を更新する -# -# @within function asset:artifact/1422.overhauled_toaster/using_item/charge - -# チャージ段階の演出 - playsound minecraft:block.note_block.chime player @a ~ ~ ~ 1 2.0 - -# 発動時の情報を保ってスタックを更新する - data modify storage api: Argument.ID set value 415 - data modify storage api: Argument.Stack set value 4 - data modify storage api: Argument.FieldOverride set from storage api: Return.Effect.Field - function api:entity/mob/effect/give - function api:entity/mob/effect/reset diff --git a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/5.mcfunction b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/5.mcfunction deleted file mode 100644 index cd30cc172e..0000000000 --- a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/5.mcfunction +++ /dev/null @@ -1,15 +0,0 @@ -#> asset:artifact/1422.overhauled_toaster/using_item/charge/5 -# -# チャージ段階を更新する -# -# @within function asset:artifact/1422.overhauled_toaster/using_item/charge - -# チャージ段階の演出 - playsound minecraft:block.note_block.chime player @a ~ ~ ~ 1 2.0 - -# 発動時の情報を保ってスタックを更新する - data modify storage api: Argument.ID set value 415 - data modify storage api: Argument.Stack set value 5 - data modify storage api: Argument.FieldOverride set from storage api: Return.Effect.Field - function api:entity/mob/effect/give - function api:entity/mob/effect/reset diff --git a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/6.mcfunction b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/6.mcfunction deleted file mode 100644 index ed30fce46f..0000000000 --- a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/6.mcfunction +++ /dev/null @@ -1,15 +0,0 @@ -#> asset:artifact/1422.overhauled_toaster/using_item/charge/6 -# -# チャージ段階を更新する -# -# @within function asset:artifact/1422.overhauled_toaster/using_item/charge - -# チャージ段階の演出 - playsound minecraft:block.note_block.chime player @a ~ ~ ~ 1 2.0 - -# 発動時の情報を保ってスタックを更新する - data modify storage api: Argument.ID set value 415 - data modify storage api: Argument.Stack set value 6 - data modify storage api: Argument.FieldOverride set from storage api: Return.Effect.Field - function api:entity/mob/effect/give - function api:entity/mob/effect/reset diff --git a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/7.mcfunction b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/7.mcfunction deleted file mode 100644 index 4fb49a4bc6..0000000000 --- a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/7.mcfunction +++ /dev/null @@ -1,15 +0,0 @@ -#> asset:artifact/1422.overhauled_toaster/using_item/charge/7 -# -# チャージ段階を更新する -# -# @within function asset:artifact/1422.overhauled_toaster/using_item/charge - -# チャージ段階の演出 - playsound minecraft:block.note_block.chime player @a ~ ~ ~ 1 2.0 - -# 発動時の情報を保ってスタックを更新する - data modify storage api: Argument.ID set value 415 - data modify storage api: Argument.Stack set value 7 - data modify storage api: Argument.FieldOverride set from storage api: Return.Effect.Field - function api:entity/mob/effect/give - function api:entity/mob/effect/reset diff --git a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/update.m.mcfunction b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/update.m.mcfunction new file mode 100644 index 0000000000..22ccb3a784 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/update.m.mcfunction @@ -0,0 +1,24 @@ +#> asset:artifact/1422.overhauled_toaster/using_item/charge/update.m +# +# チャージ段階を更新して音を再生する +# +# @input +# macro: +# Stack: int +# Pitch: double +# storage api: +# Argument.FieldOverride: compound (開始時の設定) +# Return.Effect.Field: compound (段階更新時の設定) +# @within function +# asset:artifact/1422.overhauled_toaster/using_item/3.main +# asset:artifact/1422.overhauled_toaster/using_item/charge/ + +# チャージ段階の演出 + $playsound minecraft:block.note_block.chime player @a ~ ~ ~ 1 $(Pitch) + +# 開始時の設定を保ち、2段階目以降は取得したFieldを引き継ぐ + data modify storage api: Argument.ID set value 415 + $data modify storage api: Argument.Stack set value $(Stack) + execute unless data storage api: Argument{Stack:1} run data modify storage api: Argument.FieldOverride set from storage api: Return.Effect.Field + function api:entity/mob/effect/give + function api:entity/mob/effect/reset diff --git a/docs/knowledge/artifact.md b/docs/knowledge/artifact.md index fbb58fe1b0..a623de87b0 100644 --- a/docs/knowledge/artifact.md +++ b/docs/knowledge/artifact.md @@ -64,7 +64,7 @@ DeathMessageの書式例は [Thunder の命中処理](../../Asset/data/asset/fun トースターはチャージ表示用のEffect 415と、使用解除後の発射用Effect 416を分ける。装備解除では415だけを削除し、発射開始後は416が2枚のパンを1tickずつずらして射出する。416が残る間は次のチャージを開始しない。チャージ表示の寿命と発射処理の寿命を同じEffectで管理しない実例である。 -魔改造トースター1422は、開始時を1段階とし、使用時間が2・4・6・8・10・12tickに達すると2〜7段階へ更新する。神器の `using_item/3.main` でSpeedとDamageを7要素の配列として指定し、段階更新と使用解除ではField全体を引き継ぐ。発射用Effect434は `Stack:N` の条件分岐で配列の `N-1` 番目を取得し、マクロを使わず各段階の弾速と威力を選ぶ。共有するチャージ表示用Effect415の既定Fieldは1421の形式を保ち、1422の配列は付与時に上書きする。 +魔改造トースター1422は、開始時を1段階とし、使用時間が2・4・6・8・10・12tickに達すると2〜7段階へ更新する。神器の `using_item/3.main` でSpeedとDamageを7要素の配列として指定し、段階更新と使用解除ではField全体を引き継ぐ。開始と継続の `using_item/charge/` は、StackとPitchを引数に共通の `charge/update.m` を呼ぶ。1段階目は開始時のFieldOverrideを使い、2段階目以降は取得したEffectのFieldを引き継ぐ。発射用Effect434は `Stack:N` の条件分岐で配列の `N-1` 番目を取得し、マクロを使わず各段階の弾速と威力を選ぶ。共有するチャージ表示用Effect415の既定Fieldは1421の形式を保ち、1422の配列は付与時に上書きする。 ### 持ち替えでチャージを引き継がせない From b232a43f884fc6b47aadbf326d16e031a1c8d08b Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Fri, 13 Nov 2026 01:05:07 +0900 Subject: [PATCH 11/19] =?UTF-8?q?=E9=80=9F=E5=BA=A6=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1422.overhauled_toaster/using_item/3.main.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/3.main.mcfunction b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/3.main.mcfunction index c3df5d9fa9..0c7ab7fda6 100644 --- a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/3.main.mcfunction @@ -18,7 +18,7 @@ # チャージ用エフェクト data modify storage api: Argument.ID set value 415 data modify storage api: Argument.FieldOverride.Range set value 40 - data modify storage api: Argument.FieldOverride.Speed set value [1,2,3,4,5,6,7] + data modify storage api: Argument.FieldOverride.Speed set value [1,1,1,2,2,2,4] data modify storage api: Argument.FieldOverride.Damage set value [40,70,120,120,120,120,120] function api:entity/mob/effect/give function api:entity/mob/effect/reset From 4f80953520b353943af003029a44ee51ad3dbd50 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Fri, 13 Nov 2026 01:37:27 +0900 Subject: [PATCH 12/19] =?UTF-8?q?=E8=89=B2=E3=80=85=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../using_item/3.main.mcfunction | 2 +- .../using_item/charge/.mcfunction | 12 ++++++------ .../using_item/charge/update.m.mcfunction | 3 +-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/3.main.mcfunction b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/3.main.mcfunction index a8576da94b..3b66ed1f82 100644 --- a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/3.main.mcfunction @@ -16,4 +16,4 @@ data modify storage api: Argument.FieldOverride.Range set value 40 data modify storage api: Argument.FieldOverride.Speed set value [1,1,1,2,2,2,4] data modify storage api: Argument.FieldOverride.Damage set value [40,70,120,120,120,120,120] - function asset:artifact/1422.overhauled_toaster/using_item/charge/update.m {Stack:1,Pitch:1.8} + function asset:artifact/1422.overhauled_toaster/using_item/charge/update.m {Stack:1,Pitch:1.7} diff --git a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/.mcfunction b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/.mcfunction index 7f58c2392c..d12d387b68 100644 --- a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/.mcfunction +++ b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/.mcfunction @@ -5,12 +5,12 @@ # @within function asset:artifact/1422.overhauled_toaster/using_item/2.check_condition # チャージ段階が変わるときだけEffectを更新する - execute if data storage asset:context UsingItemTime{mainhand:2} run function asset:artifact/1422.overhauled_toaster/using_item/charge/update.m {Stack:2,Pitch:1.9} - execute if data storage asset:context UsingItemTime{mainhand:4} run function asset:artifact/1422.overhauled_toaster/using_item/charge/update.m {Stack:3,Pitch:2.0} - execute if data storage asset:context UsingItemTime{mainhand:6} run function asset:artifact/1422.overhauled_toaster/using_item/charge/update.m {Stack:4,Pitch:2.0} - execute if data storage asset:context UsingItemTime{mainhand:8} run function asset:artifact/1422.overhauled_toaster/using_item/charge/update.m {Stack:5,Pitch:2.0} - execute if data storage asset:context UsingItemTime{mainhand:10} run function asset:artifact/1422.overhauled_toaster/using_item/charge/update.m {Stack:6,Pitch:2.0} - execute if data storage asset:context UsingItemTime{mainhand:12} run function asset:artifact/1422.overhauled_toaster/using_item/charge/update.m {Stack:7,Pitch:2.0} + execute if data storage asset:context UsingItemTime{mainhand:3} run function asset:artifact/1422.overhauled_toaster/using_item/charge/update.m {Stack:2,Pitch:1.75} + execute if data storage asset:context UsingItemTime{mainhand:5} run function asset:artifact/1422.overhauled_toaster/using_item/charge/update.m {Stack:3,Pitch:1.8} + execute if data storage asset:context UsingItemTime{mainhand:7} run function asset:artifact/1422.overhauled_toaster/using_item/charge/update.m {Stack:4,Pitch:1.85} + execute if data storage asset:context UsingItemTime{mainhand:9} run function asset:artifact/1422.overhauled_toaster/using_item/charge/update.m {Stack:5,Pitch:1.9} + execute if data storage asset:context UsingItemTime{mainhand:11} run function asset:artifact/1422.overhauled_toaster/using_item/charge/update.m {Stack:6,Pitch:1.95} + execute if data storage asset:context UsingItemTime{mainhand:13} run function asset:artifact/1422.overhauled_toaster/using_item/charge/update.m {Stack:7,Pitch:2.0} # 長押し中の音 playsound block.furnace.fire_crackle player @a ~ ~ ~ 1 0.8 diff --git a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/update.m.mcfunction b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/update.m.mcfunction index 22ccb3a784..bae1325b31 100644 --- a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/update.m.mcfunction +++ b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/update.m.mcfunction @@ -2,8 +2,7 @@ # # チャージ段階を更新して音を再生する # -# @input -# macro: +# @input args: # Stack: int # Pitch: double # storage api: From 1c134f5027977e07374b84d316ccb6cb68443038 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Fri, 13 Nov 2026 01:40:36 +0900 Subject: [PATCH 13/19] =?UTF-8?q?:recycle:=20=E3=83=91=E3=83=B3=E7=99=BA?= =?UTF-8?q?=E5=B0=84=E3=81=AE=E6=AE=B5=E9=9A=8E=E5=88=A5=E3=83=91=E3=83=A9?= =?UTF-8?q?=E3=83=A1=E3=83=BC=E3=82=BF=E3=83=BC=E5=8F=96=E5=BE=97=E3=82=92?= =?UTF-8?q?=E3=83=9E=E3=82=AF=E3=83=AD=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tick/.mcfunction | 23 ++++++++++----- .../tick/shoot.m.mcfunction | 17 +++++++++++ .../tick/shoot.mcfunction | 29 ------------------- docs/knowledge/artifact.md | 2 +- 4 files changed, 34 insertions(+), 37 deletions(-) create mode 100644 Asset/data/asset/functions/effect/0434.overhauled_toaster_shooting/tick/shoot.m.mcfunction delete mode 100644 Asset/data/asset/functions/effect/0434.overhauled_toaster_shooting/tick/shoot.mcfunction diff --git a/Asset/data/asset/functions/effect/0434.overhauled_toaster_shooting/tick/.mcfunction b/Asset/data/asset/functions/effect/0434.overhauled_toaster_shooting/tick/.mcfunction index e20200c96e..e2970f8b11 100644 --- a/Asset/data/asset/functions/effect/0434.overhauled_toaster_shooting/tick/.mcfunction +++ b/Asset/data/asset/functions/effect/0434.overhauled_toaster_shooting/tick/.mcfunction @@ -4,13 +4,22 @@ # # @within function asset:effect/0434.overhauled_toaster_shooting/_/tick +#> Private +# @private + #declare storage asset:temp E434 + +# Stackの1..7を配列の添字の0..6へ変換する + execute store result storage asset:temp E434.Index int 0.9999999999 run data get storage asset:context Stack + # 発射直前・発射中の音 execute anchored eyes positioned ^-0.35 ^ ^0.5 run function asset:effect/0434.overhauled_toaster_shooting/tick/sound -# 残りDurationが1と0の時に発射 - execute if data storage asset:context {Duration:5} anchored eyes positioned ^-0.35 ^-0.05 ^ run function asset:effect/0434.overhauled_toaster_shooting/tick/shoot - execute if data storage asset:context {Duration:4} anchored eyes positioned ^-0.35 ^-0.15 ^ run function asset:effect/0434.overhauled_toaster_shooting/tick/shoot - execute if data storage asset:context {Duration:3} anchored eyes positioned ^-0.35 ^-0.25 ^ run function asset:effect/0434.overhauled_toaster_shooting/tick/shoot - execute if data storage asset:context {Duration:2} anchored eyes positioned ^-0.35 ^-0.35 ^ run function asset:effect/0434.overhauled_toaster_shooting/tick/shoot - execute if data storage asset:context {Duration:1} anchored eyes positioned ^-0.35 ^-0.45 ^ run function asset:effect/0434.overhauled_toaster_shooting/tick/shoot - execute if data storage asset:context {Duration:0} anchored eyes positioned ^-0.35 ^-0.55 ^ run function asset:effect/0434.overhauled_toaster_shooting/tick/shoot +# 残りDurationが5から0の間に1枚ずつ発射する + execute if data storage asset:context {Duration:5} anchored eyes positioned ^-0.35 ^-0.05 ^ run function asset:effect/0434.overhauled_toaster_shooting/tick/shoot.m with storage asset:temp E434 + execute if data storage asset:context {Duration:4} anchored eyes positioned ^-0.35 ^-0.15 ^ run function asset:effect/0434.overhauled_toaster_shooting/tick/shoot.m with storage asset:temp E434 + execute if data storage asset:context {Duration:3} anchored eyes positioned ^-0.35 ^-0.25 ^ run function asset:effect/0434.overhauled_toaster_shooting/tick/shoot.m with storage asset:temp E434 + execute if data storage asset:context {Duration:2} anchored eyes positioned ^-0.35 ^-0.35 ^ run function asset:effect/0434.overhauled_toaster_shooting/tick/shoot.m with storage asset:temp E434 + execute if data storage asset:context {Duration:1} anchored eyes positioned ^-0.35 ^-0.45 ^ run function asset:effect/0434.overhauled_toaster_shooting/tick/shoot.m with storage asset:temp E434 + execute if data storage asset:context {Duration:0} anchored eyes positioned ^-0.35 ^-0.55 ^ run function asset:effect/0434.overhauled_toaster_shooting/tick/shoot.m with storage asset:temp E434 + + data remove storage asset:temp E434 diff --git a/Asset/data/asset/functions/effect/0434.overhauled_toaster_shooting/tick/shoot.m.mcfunction b/Asset/data/asset/functions/effect/0434.overhauled_toaster_shooting/tick/shoot.m.mcfunction new file mode 100644 index 0000000000..d3c94d2e17 --- /dev/null +++ b/Asset/data/asset/functions/effect/0434.overhauled_toaster_shooting/tick/shoot.m.mcfunction @@ -0,0 +1,17 @@ +#> asset:effect/0434.overhauled_toaster_shooting/tick/shoot.m +# +# チャージ段階の弾速と威力でパンを射出する +# +# @input args: +# Index: int (0..6) +# @within function asset:effect/0434.overhauled_toaster_shooting/tick/ + +# チャージ段階の弾速とダメージを取得する + $data modify storage api: Argument.FieldOverride.Speed set from storage asset:context this.Speed[$(Index)] + $data modify storage api: Argument.FieldOverride.Damage set from storage asset:context this.Damage[$(Index)] + +# 召喚 + data modify storage api: Argument.ID set value 1159 + data modify storage api: Argument.FieldOverride.Range set from storage asset:context this.Range + execute store result storage api: Argument.FieldOverride.UserID int 1 run scoreboard players get @s UserID + function api:object/summon diff --git a/Asset/data/asset/functions/effect/0434.overhauled_toaster_shooting/tick/shoot.mcfunction b/Asset/data/asset/functions/effect/0434.overhauled_toaster_shooting/tick/shoot.mcfunction deleted file mode 100644 index db463c187a..0000000000 --- a/Asset/data/asset/functions/effect/0434.overhauled_toaster_shooting/tick/shoot.mcfunction +++ /dev/null @@ -1,29 +0,0 @@ -#> asset:effect/0434.overhauled_toaster_shooting/tick/shoot -# -# -# -# @within function asset:effect/0434.overhauled_toaster_shooting/tick/ - -# スタックに応じて弾速を調整 - execute if data storage asset:context {Stack:1} run data modify storage api: Argument.FieldOverride.Speed set from storage asset:context this.Speed[0] - execute if data storage asset:context {Stack:2} run data modify storage api: Argument.FieldOverride.Speed set from storage asset:context this.Speed[1] - execute if data storage asset:context {Stack:3} run data modify storage api: Argument.FieldOverride.Speed set from storage asset:context this.Speed[2] - execute if data storage asset:context {Stack:4} run data modify storage api: Argument.FieldOverride.Speed set from storage asset:context this.Speed[3] - execute if data storage asset:context {Stack:5} run data modify storage api: Argument.FieldOverride.Speed set from storage asset:context this.Speed[4] - execute if data storage asset:context {Stack:6} run data modify storage api: Argument.FieldOverride.Speed set from storage asset:context this.Speed[5] - execute if data storage asset:context {Stack:7} run data modify storage api: Argument.FieldOverride.Speed set from storage asset:context this.Speed[6] - -# ダメージ設定 - execute if data storage asset:context {Stack:1} run data modify storage api: Argument.FieldOverride.Damage set from storage asset:context this.Damage[0] - execute if data storage asset:context {Stack:2} run data modify storage api: Argument.FieldOverride.Damage set from storage asset:context this.Damage[1] - execute if data storage asset:context {Stack:3} run data modify storage api: Argument.FieldOverride.Damage set from storage asset:context this.Damage[2] - execute if data storage asset:context {Stack:4} run data modify storage api: Argument.FieldOverride.Damage set from storage asset:context this.Damage[3] - execute if data storage asset:context {Stack:5} run data modify storage api: Argument.FieldOverride.Damage set from storage asset:context this.Damage[4] - execute if data storage asset:context {Stack:6} run data modify storage api: Argument.FieldOverride.Damage set from storage asset:context this.Damage[5] - execute if data storage asset:context {Stack:7} run data modify storage api: Argument.FieldOverride.Damage set from storage asset:context this.Damage[6] - -# 召喚 - data modify storage api: Argument.ID set value 1159 - data modify storage api: Argument.FieldOverride.Range set from storage asset:context this.Range - execute store result storage api: Argument.FieldOverride.UserID int 1 run scoreboard players get @s UserID - function api:object/summon diff --git a/docs/knowledge/artifact.md b/docs/knowledge/artifact.md index a623de87b0..aad83c96bb 100644 --- a/docs/knowledge/artifact.md +++ b/docs/knowledge/artifact.md @@ -64,7 +64,7 @@ DeathMessageの書式例は [Thunder の命中処理](../../Asset/data/asset/fun トースターはチャージ表示用のEffect 415と、使用解除後の発射用Effect 416を分ける。装備解除では415だけを削除し、発射開始後は416が2枚のパンを1tickずつずらして射出する。416が残る間は次のチャージを開始しない。チャージ表示の寿命と発射処理の寿命を同じEffectで管理しない実例である。 -魔改造トースター1422は、開始時を1段階とし、使用時間が2・4・6・8・10・12tickに達すると2〜7段階へ更新する。神器の `using_item/3.main` でSpeedとDamageを7要素の配列として指定し、段階更新と使用解除ではField全体を引き継ぐ。開始と継続の `using_item/charge/` は、StackとPitchを引数に共通の `charge/update.m` を呼ぶ。1段階目は開始時のFieldOverrideを使い、2段階目以降は取得したEffectのFieldを引き継ぐ。発射用Effect434は `Stack:N` の条件分岐で配列の `N-1` 番目を取得し、マクロを使わず各段階の弾速と威力を選ぶ。共有するチャージ表示用Effect415の既定Fieldは1421の形式を保ち、1422の配列は付与時に上書きする。 +魔改造トースター1422は、開始時を1段階とし、使用時間が3・5・7・9・11・13tickに達すると2〜7段階へ更新する。神器の `using_item/3.main` でSpeedとDamageを7要素の配列として指定し、段階更新と使用解除ではField全体を引き継ぐ。開始時の `using_item/3.main` と継続時の `using_item/charge/` は、StackとPitchを引数に共通の `charge/update.m` を呼ぶ。1段階目は開始時のFieldOverrideを使い、2段階目以降は取得したEffectのFieldを引き継ぐ。発射用Effect434は `Stack - 1` をIndexに変換し、`tick/shoot.m` へ渡してSpeedとDamageの配列から弾速と威力を取得する。共有するチャージ表示用Effect415の既定Fieldは1421の形式を保ち、1422の配列は付与時に上書きする。 ### 持ち替えでチャージを引き継がせない From a0c192f706ebf9ac55041d92d3876c4f63b103d9 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Fri, 13 Nov 2026 01:57:06 +0900 Subject: [PATCH 14/19] =?UTF-8?q?=E3=82=AB=E3=83=A9=E3=83=BC=E3=82=B7?= =?UTF-8?q?=E3=83=A3=E3=83=BC=E3=83=89=E3=81=AB=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifact/1422.overhauled_toaster/register.mcfunction | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/register.mcfunction b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/register.mcfunction index c2b0e00808..d693cfd891 100644 --- a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/register.mcfunction +++ b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/register.mcfunction @@ -4,4 +4,5 @@ # # @within tag/function asset:artifact/register -data modify storage asset:artifact RarityRegistry[4] append value [1422] \ No newline at end of file +data modify storage asset:artifact RarityRegistry[4] append value [1422] +data modify storage asset:artifact RarityRegistryWithColor.Red[4] append value [1422] From c3614d2c94edd8f228c66371bfe85e80a1ddabe8 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Fri, 13 Nov 2026 05:19:26 +0900 Subject: [PATCH 15/19] =?UTF-8?q?=E6=BC=94=E5=87=BA=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=E3=82=92=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../using_item/charge/update.m.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/update.m.mcfunction b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/update.m.mcfunction index bae1325b31..744ddedb07 100644 --- a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/update.m.mcfunction +++ b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/update.m.mcfunction @@ -13,7 +13,7 @@ # asset:artifact/1422.overhauled_toaster/using_item/charge/ # チャージ段階の演出 - $playsound minecraft:block.note_block.chime player @a ~ ~ ~ 1 $(Pitch) + $execute anchored eyes positioned ^ ^ ^0.5 run playsound minecraft:block.note_block.chime player @a ~ ~ ~ 1 $(Pitch) # 開始時の設定を保ち、2段階目以降は取得したFieldを引き継ぐ data modify storage api: Argument.ID set value 415 From 6e64487ecd9bbddcd768bf4b6d54a33a38e5debb Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Fri, 13 Nov 2026 05:20:28 +0900 Subject: [PATCH 16/19] =?UTF-8?q?:recycle:=20=E7=99=BA=E5=B0=84=E3=83=91?= =?UTF-8?q?=E3=83=A9=E3=83=A1=E3=83=BC=E3=82=BF=E3=83=BC=E3=82=92Effect434?= =?UTF-8?q?=E3=81=B8=E7=9B=B4=E6=8E=A5=E8=A8=AD=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../release_using_item/3.main.mcfunction | 6 ++++-- .../1422.overhauled_toaster/using_item/3.main.mcfunction | 3 --- .../using_item/charge/update.m.mcfunction | 6 +----- docs/knowledge/artifact.md | 2 +- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/release_using_item/3.main.mcfunction b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/release_using_item/3.main.mcfunction index 8b006281f0..bd1127b9be 100644 --- a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/release_using_item/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/release_using_item/3.main.mcfunction @@ -4,10 +4,12 @@ # # @within function asset:artifact/1422.overhauled_toaster/release_using_item/2.check_condition -# 発射用Effectへチャージ段階と発動時の情報を渡す +# 発射用Effectへチャージ段階と弾速・威力・射程を渡す data modify storage api: Argument.ID set value 434 data modify storage api: Argument.Stack set from storage api: Return.Effect.Stack - data modify storage api: Argument.FieldOverride set from storage api: Return.Effect.Field + data modify storage api: Argument.FieldOverride.Range set value 40 + data modify storage api: Argument.FieldOverride.Speed set value [1,1,1,2,2,2,4] + data modify storage api: Argument.FieldOverride.Damage set value [40,70,120,120,120,120,120] function api:entity/mob/effect/give function api:entity/mob/effect/reset diff --git a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/3.main.mcfunction b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/3.main.mcfunction index 3b66ed1f82..61ea495b9c 100644 --- a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/3.main.mcfunction @@ -13,7 +13,4 @@ clear @s bread 1 # チャージ用エフェクト - data modify storage api: Argument.FieldOverride.Range set value 40 - data modify storage api: Argument.FieldOverride.Speed set value [1,1,1,2,2,2,4] - data modify storage api: Argument.FieldOverride.Damage set value [40,70,120,120,120,120,120] function asset:artifact/1422.overhauled_toaster/using_item/charge/update.m {Stack:1,Pitch:1.7} diff --git a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/update.m.mcfunction b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/update.m.mcfunction index bae1325b31..3853451942 100644 --- a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/update.m.mcfunction +++ b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/using_item/charge/update.m.mcfunction @@ -5,9 +5,6 @@ # @input args: # Stack: int # Pitch: double -# storage api: -# Argument.FieldOverride: compound (開始時の設定) -# Return.Effect.Field: compound (段階更新時の設定) # @within function # asset:artifact/1422.overhauled_toaster/using_item/3.main # asset:artifact/1422.overhauled_toaster/using_item/charge/ @@ -15,9 +12,8 @@ # チャージ段階の演出 $playsound minecraft:block.note_block.chime player @a ~ ~ ~ 1 $(Pitch) -# 開始時の設定を保ち、2段階目以降は取得したFieldを引き継ぐ +# 表示用Effectのスタックを更新する data modify storage api: Argument.ID set value 415 $data modify storage api: Argument.Stack set value $(Stack) - execute unless data storage api: Argument{Stack:1} run data modify storage api: Argument.FieldOverride set from storage api: Return.Effect.Field function api:entity/mob/effect/give function api:entity/mob/effect/reset diff --git a/docs/knowledge/artifact.md b/docs/knowledge/artifact.md index aad83c96bb..1b5984ec44 100644 --- a/docs/knowledge/artifact.md +++ b/docs/knowledge/artifact.md @@ -64,7 +64,7 @@ DeathMessageの書式例は [Thunder の命中処理](../../Asset/data/asset/fun トースターはチャージ表示用のEffect 415と、使用解除後の発射用Effect 416を分ける。装備解除では415だけを削除し、発射開始後は416が2枚のパンを1tickずつずらして射出する。416が残る間は次のチャージを開始しない。チャージ表示の寿命と発射処理の寿命を同じEffectで管理しない実例である。 -魔改造トースター1422は、開始時を1段階とし、使用時間が3・5・7・9・11・13tickに達すると2〜7段階へ更新する。神器の `using_item/3.main` でSpeedとDamageを7要素の配列として指定し、段階更新と使用解除ではField全体を引き継ぐ。開始時の `using_item/3.main` と継続時の `using_item/charge/` は、StackとPitchを引数に共通の `charge/update.m` を呼ぶ。1段階目は開始時のFieldOverrideを使い、2段階目以降は取得したEffectのFieldを引き継ぐ。発射用Effect434は `Stack - 1` をIndexに変換し、`tick/shoot.m` へ渡してSpeedとDamageの配列から弾速と威力を取得する。共有するチャージ表示用Effect415の既定Fieldは1421の形式を保ち、1422の配列は付与時に上書きする。 +魔改造トースター1422は、開始時を1段階とし、使用時間が3・5・7・9・11・13tickに達すると2〜7段階へ更新する。開始時の `using_item/3.main` と継続時の `using_item/charge/` は、StackとPitchを引数に共通の `charge/update.m` を呼び、表示用Effect415のStackを更新する。弾速・威力・射程はチャージ表示に不要なため415へ渡さず、`release_using_item/3.main` で発射用Effect434へ直接設定する。SpeedとDamageは7要素の配列、Rangeは射程の値を指定し、415からはStackだけを引き継ぐ。434は `Stack - 1` をIndexに変換し、`tick/shoot.m` へ渡して配列から弾速と威力を取得する。共有する415の既定Fieldは1421の実装に合わせて残すが、1422では参照しない。 ### 持ち替えでチャージを引き継がせない From 791568b71c97507a95ab2a8e065df88edccc5e72 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Fri, 13 Nov 2026 18:23:45 +0900 Subject: [PATCH 17/19] =?UTF-8?q?:recycle:=20=E3=83=81=E3=83=A3=E3=83=BC?= =?UTF-8?q?=E3=82=B8=E6=AE=B5=E9=9A=8E=E3=81=94=E3=81=A8=E3=81=AE=E5=BC=BE?= =?UTF-8?q?=E9=80=9F=E3=81=A8=E5=A8=81=E5=8A=9B=E3=82=92=E7=99=BA=E5=B0=84?= =?UTF-8?q?=E6=99=82=E3=81=AB=E7=9B=B4=E6=8E=A5=E8=A8=AD=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../release_using_item/3.main.mcfunction | 19 +++++++++++++---- .../register.mcfunction | 4 ++-- .../tick/.mcfunction | 21 ++++++------------- .../{shoot.m.mcfunction => shoot.mcfunction} | 8 +++---- docs/knowledge/artifact.md | 2 +- 5 files changed, 27 insertions(+), 27 deletions(-) rename Asset/data/asset/functions/effect/0434.overhauled_toaster_shooting/tick/{shoot.m.mcfunction => shoot.mcfunction} (61%) diff --git a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/release_using_item/3.main.mcfunction b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/release_using_item/3.main.mcfunction index bd1127b9be..e40dd616b4 100644 --- a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/release_using_item/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/release_using_item/3.main.mcfunction @@ -4,12 +4,23 @@ # # @within function asset:artifact/1422.overhauled_toaster/release_using_item/2.check_condition -# 発射用Effectへチャージ段階と弾速・威力・射程を渡す +# 発射用Effectへ弾速・威力・射程を渡す data modify storage api: Argument.ID set value 434 - data modify storage api: Argument.Stack set from storage api: Return.Effect.Stack data modify storage api: Argument.FieldOverride.Range set value 40 - data modify storage api: Argument.FieldOverride.Speed set value [1,1,1,2,2,2,4] - data modify storage api: Argument.FieldOverride.Damage set value [40,70,120,120,120,120,120] + execute if data storage api: Return.Effect{Stack:1} run data modify storage api: Argument.FieldOverride.Speed set value 1 + execute if data storage api: Return.Effect{Stack:2} run data modify storage api: Argument.FieldOverride.Speed set value 1 + execute if data storage api: Return.Effect{Stack:3} run data modify storage api: Argument.FieldOverride.Speed set value 1 + execute if data storage api: Return.Effect{Stack:4} run data modify storage api: Argument.FieldOverride.Speed set value 2 + execute if data storage api: Return.Effect{Stack:5} run data modify storage api: Argument.FieldOverride.Speed set value 2 + execute if data storage api: Return.Effect{Stack:6} run data modify storage api: Argument.FieldOverride.Speed set value 2 + execute if data storage api: Return.Effect{Stack:7} run data modify storage api: Argument.FieldOverride.Speed set value 4 + execute if data storage api: Return.Effect{Stack:1} run data modify storage api: Argument.FieldOverride.Damage set value 40 + execute if data storage api: Return.Effect{Stack:2} run data modify storage api: Argument.FieldOverride.Damage set value 70 + execute if data storage api: Return.Effect{Stack:3} run data modify storage api: Argument.FieldOverride.Damage set value 120 + execute if data storage api: Return.Effect{Stack:4} run data modify storage api: Argument.FieldOverride.Damage set value 120 + execute if data storage api: Return.Effect{Stack:5} run data modify storage api: Argument.FieldOverride.Damage set value 120 + execute if data storage api: Return.Effect{Stack:6} run data modify storage api: Argument.FieldOverride.Damage set value 120 + execute if data storage api: Return.Effect{Stack:7} run data modify storage api: Argument.FieldOverride.Damage set value 120 function api:entity/mob/effect/give function api:entity/mob/effect/reset diff --git a/Asset/data/asset/functions/effect/0434.overhauled_toaster_shooting/register.mcfunction b/Asset/data/asset/functions/effect/0434.overhauled_toaster_shooting/register.mcfunction index 1f69982471..78cf974956 100644 --- a/Asset/data/asset/functions/effect/0434.overhauled_toaster_shooting/register.mcfunction +++ b/Asset/data/asset/functions/effect/0434.overhauled_toaster_shooting/register.mcfunction @@ -36,6 +36,6 @@ # data modify storage asset:effect StackVisible set value # フィールド - data modify storage asset:effect Field.Damage set value [40,70,120,120,120,120,120] - data modify storage asset:effect Field.Speed set value [1,2,3,4,5,6,7] + data modify storage asset:effect Field.Damage set value 40 + data modify storage asset:effect Field.Speed set value 1 data modify storage asset:effect Field.Range set value 40 diff --git a/Asset/data/asset/functions/effect/0434.overhauled_toaster_shooting/tick/.mcfunction b/Asset/data/asset/functions/effect/0434.overhauled_toaster_shooting/tick/.mcfunction index e2970f8b11..e67916cea4 100644 --- a/Asset/data/asset/functions/effect/0434.overhauled_toaster_shooting/tick/.mcfunction +++ b/Asset/data/asset/functions/effect/0434.overhauled_toaster_shooting/tick/.mcfunction @@ -4,22 +4,13 @@ # # @within function asset:effect/0434.overhauled_toaster_shooting/_/tick -#> Private -# @private - #declare storage asset:temp E434 - -# Stackの1..7を配列の添字の0..6へ変換する - execute store result storage asset:temp E434.Index int 0.9999999999 run data get storage asset:context Stack - # 発射直前・発射中の音 execute anchored eyes positioned ^-0.35 ^ ^0.5 run function asset:effect/0434.overhauled_toaster_shooting/tick/sound # 残りDurationが5から0の間に1枚ずつ発射する - execute if data storage asset:context {Duration:5} anchored eyes positioned ^-0.35 ^-0.05 ^ run function asset:effect/0434.overhauled_toaster_shooting/tick/shoot.m with storage asset:temp E434 - execute if data storage asset:context {Duration:4} anchored eyes positioned ^-0.35 ^-0.15 ^ run function asset:effect/0434.overhauled_toaster_shooting/tick/shoot.m with storage asset:temp E434 - execute if data storage asset:context {Duration:3} anchored eyes positioned ^-0.35 ^-0.25 ^ run function asset:effect/0434.overhauled_toaster_shooting/tick/shoot.m with storage asset:temp E434 - execute if data storage asset:context {Duration:2} anchored eyes positioned ^-0.35 ^-0.35 ^ run function asset:effect/0434.overhauled_toaster_shooting/tick/shoot.m with storage asset:temp E434 - execute if data storage asset:context {Duration:1} anchored eyes positioned ^-0.35 ^-0.45 ^ run function asset:effect/0434.overhauled_toaster_shooting/tick/shoot.m with storage asset:temp E434 - execute if data storage asset:context {Duration:0} anchored eyes positioned ^-0.35 ^-0.55 ^ run function asset:effect/0434.overhauled_toaster_shooting/tick/shoot.m with storage asset:temp E434 - - data remove storage asset:temp E434 + execute if data storage asset:context {Duration:5} anchored eyes positioned ^-0.35 ^-0.05 ^ run function asset:effect/0434.overhauled_toaster_shooting/tick/shoot + execute if data storage asset:context {Duration:4} anchored eyes positioned ^-0.35 ^-0.15 ^ run function asset:effect/0434.overhauled_toaster_shooting/tick/shoot + execute if data storage asset:context {Duration:3} anchored eyes positioned ^-0.35 ^-0.25 ^ run function asset:effect/0434.overhauled_toaster_shooting/tick/shoot + execute if data storage asset:context {Duration:2} anchored eyes positioned ^-0.35 ^-0.35 ^ run function asset:effect/0434.overhauled_toaster_shooting/tick/shoot + execute if data storage asset:context {Duration:1} anchored eyes positioned ^-0.35 ^-0.45 ^ run function asset:effect/0434.overhauled_toaster_shooting/tick/shoot + execute if data storage asset:context {Duration:0} anchored eyes positioned ^-0.35 ^-0.55 ^ run function asset:effect/0434.overhauled_toaster_shooting/tick/shoot diff --git a/Asset/data/asset/functions/effect/0434.overhauled_toaster_shooting/tick/shoot.m.mcfunction b/Asset/data/asset/functions/effect/0434.overhauled_toaster_shooting/tick/shoot.mcfunction similarity index 61% rename from Asset/data/asset/functions/effect/0434.overhauled_toaster_shooting/tick/shoot.m.mcfunction rename to Asset/data/asset/functions/effect/0434.overhauled_toaster_shooting/tick/shoot.mcfunction index d3c94d2e17..ddd5db50ee 100644 --- a/Asset/data/asset/functions/effect/0434.overhauled_toaster_shooting/tick/shoot.m.mcfunction +++ b/Asset/data/asset/functions/effect/0434.overhauled_toaster_shooting/tick/shoot.mcfunction @@ -1,14 +1,12 @@ -#> asset:effect/0434.overhauled_toaster_shooting/tick/shoot.m +#> asset:effect/0434.overhauled_toaster_shooting/tick/shoot # # チャージ段階の弾速と威力でパンを射出する # -# @input args: -# Index: int (0..6) # @within function asset:effect/0434.overhauled_toaster_shooting/tick/ # チャージ段階の弾速とダメージを取得する - $data modify storage api: Argument.FieldOverride.Speed set from storage asset:context this.Speed[$(Index)] - $data modify storage api: Argument.FieldOverride.Damage set from storage asset:context this.Damage[$(Index)] + data modify storage api: Argument.FieldOverride.Speed set from storage asset:context this.Speed + data modify storage api: Argument.FieldOverride.Damage set from storage asset:context this.Damage # 召喚 data modify storage api: Argument.ID set value 1159 diff --git a/docs/knowledge/artifact.md b/docs/knowledge/artifact.md index 1b5984ec44..747a30459c 100644 --- a/docs/knowledge/artifact.md +++ b/docs/knowledge/artifact.md @@ -64,7 +64,7 @@ DeathMessageの書式例は [Thunder の命中処理](../../Asset/data/asset/fun トースターはチャージ表示用のEffect 415と、使用解除後の発射用Effect 416を分ける。装備解除では415だけを削除し、発射開始後は416が2枚のパンを1tickずつずらして射出する。416が残る間は次のチャージを開始しない。チャージ表示の寿命と発射処理の寿命を同じEffectで管理しない実例である。 -魔改造トースター1422は、開始時を1段階とし、使用時間が3・5・7・9・11・13tickに達すると2〜7段階へ更新する。開始時の `using_item/3.main` と継続時の `using_item/charge/` は、StackとPitchを引数に共通の `charge/update.m` を呼び、表示用Effect415のStackを更新する。弾速・威力・射程はチャージ表示に不要なため415へ渡さず、`release_using_item/3.main` で発射用Effect434へ直接設定する。SpeedとDamageは7要素の配列、Rangeは射程の値を指定し、415からはStackだけを引き継ぐ。434は `Stack - 1` をIndexに変換し、`tick/shoot.m` へ渡して配列から弾速と威力を取得する。共有する415の既定Fieldは1421の実装に合わせて残すが、1422では参照しない。 +魔改造トースター1422は、開始時を1段階とし、使用時間が3・5・7・9・11・13tickに達すると2〜7段階へ更新する。開始時の `using_item/3.main` と継続時の `using_item/charge/` は、StackとPitchを引数に共通の `charge/update.m` を呼び、表示用Effect415のStackを更新する。弾速・威力・射程はチャージ表示に不要なため415へ渡さず、`release_using_item/3.main` で `api: Return.Effect.Stack` を判定して発射用Effect434へ直接設定する。SpeedとDamageは段階に応じた単一の数値、Rangeは射程の値を渡す。434は受け取った値でパンを発射し、Stackによる分岐や配列・マクロでの取得を行わない。共有する415の既定Fieldは1421の実装に合わせて残すが、1422では参照しない。 ### 持ち替えでチャージを引き継がせない From 3c8e8f89555c33b2434516856cfa6590d827f1ee Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Fri, 13 Nov 2026 18:26:07 +0900 Subject: [PATCH 18/19] =?UTF-8?q?:recycle:=20=E6=AE=B5=E9=9A=8E=E5=88=A5?= =?UTF-8?q?=E3=81=AE=E5=BC=BE=E9=80=9F=E3=81=A8=E5=A8=81=E5=8A=9B=E3=82=92?= =?UTF-8?q?compound=E3=81=A7=E3=81=BE=E3=81=A8=E3=82=81=E3=81=A6=E8=A8=AD?= =?UTF-8?q?=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../release_using_item/3.main.mcfunction | 21 +++++++------------ 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/release_using_item/3.main.mcfunction b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/release_using_item/3.main.mcfunction index e40dd616b4..0fc51e77b0 100644 --- a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/release_using_item/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/release_using_item/3.main.mcfunction @@ -6,21 +6,14 @@ # 発射用Effectへ弾速・威力・射程を渡す data modify storage api: Argument.ID set value 434 + execute if data storage api: Return.Effect{Stack:1} run data modify storage api: Argument.FieldOverride set value {Speed:1,Damage:40} + execute if data storage api: Return.Effect{Stack:2} run data modify storage api: Argument.FieldOverride set value {Speed:1,Damage:70} + execute if data storage api: Return.Effect{Stack:3} run data modify storage api: Argument.FieldOverride set value {Speed:1,Damage:120} + execute if data storage api: Return.Effect{Stack:4} run data modify storage api: Argument.FieldOverride set value {Speed:2,Damage:120} + execute if data storage api: Return.Effect{Stack:5} run data modify storage api: Argument.FieldOverride set value {Speed:2,Damage:120} + execute if data storage api: Return.Effect{Stack:6} run data modify storage api: Argument.FieldOverride set value {Speed:2,Damage:120} + execute if data storage api: Return.Effect{Stack:7} run data modify storage api: Argument.FieldOverride set value {Speed:4,Damage:120} data modify storage api: Argument.FieldOverride.Range set value 40 - execute if data storage api: Return.Effect{Stack:1} run data modify storage api: Argument.FieldOverride.Speed set value 1 - execute if data storage api: Return.Effect{Stack:2} run data modify storage api: Argument.FieldOverride.Speed set value 1 - execute if data storage api: Return.Effect{Stack:3} run data modify storage api: Argument.FieldOverride.Speed set value 1 - execute if data storage api: Return.Effect{Stack:4} run data modify storage api: Argument.FieldOverride.Speed set value 2 - execute if data storage api: Return.Effect{Stack:5} run data modify storage api: Argument.FieldOverride.Speed set value 2 - execute if data storage api: Return.Effect{Stack:6} run data modify storage api: Argument.FieldOverride.Speed set value 2 - execute if data storage api: Return.Effect{Stack:7} run data modify storage api: Argument.FieldOverride.Speed set value 4 - execute if data storage api: Return.Effect{Stack:1} run data modify storage api: Argument.FieldOverride.Damage set value 40 - execute if data storage api: Return.Effect{Stack:2} run data modify storage api: Argument.FieldOverride.Damage set value 70 - execute if data storage api: Return.Effect{Stack:3} run data modify storage api: Argument.FieldOverride.Damage set value 120 - execute if data storage api: Return.Effect{Stack:4} run data modify storage api: Argument.FieldOverride.Damage set value 120 - execute if data storage api: Return.Effect{Stack:5} run data modify storage api: Argument.FieldOverride.Damage set value 120 - execute if data storage api: Return.Effect{Stack:6} run data modify storage api: Argument.FieldOverride.Damage set value 120 - execute if data storage api: Return.Effect{Stack:7} run data modify storage api: Argument.FieldOverride.Damage set value 120 function api:entity/mob/effect/give function api:entity/mob/effect/reset From 24b990b5e1d6d559ad9868d99aa264ce9afc6ba7 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Fri, 13 Nov 2026 18:45:53 +0900 Subject: [PATCH 19/19] =?UTF-8?q?=E3=83=88=E3=83=AA=E3=82=AC=E3=83=BC?= =?UTF-8?q?=E8=A1=A8=E8=A8=98=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/1422.overhauled_toaster/give/2.give.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/give/2.give.mcfunction index e112898ce5..c3b47b5dcb 100644 --- a/Asset/data/asset/functions/artifact/1422.overhauled_toaster/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1422.overhauled_toaster/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 "onClick" + data modify storage asset:artifact Trigger set value "releaseUsingItem" # 神器の発動条件 (TextComponentString) (オプション) # data modify storage asset:artifact Condition set value # 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション)