From 1cea7c4548aa7d1947e28acf2b266c0a3110169e Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Sat, 30 May 2026 01:13:38 +0900 Subject: [PATCH 1/6] =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1421.toaster/give/1.trigger.mcfunction | 7 ++ .../1421.toaster/give/2.give.mcfunction | 68 +++++++++++++++++++ .../artifact/1421.toaster/register.mcfunction | 7 ++ .../1421.toaster/trigger/1.trigger.mcfunction | 8 +++ .../trigger/2.check_condition.mcfunction | 31 +++++++++ .../1421.toaster/trigger/3.main.mcfunction | 22 ++++++ .../1421.toaster/trigger/charge.mcfunction | 10 +++ .../effect/0362.baking/_/re-given.mcfunction | 7 ++ .../effect/0362.baking/_/register.mcfunction | 7 ++ .../effect/0362.baking/_/tick.mcfunction | 7 ++ .../effect/0362.baking/re-given/.mcfunction | 31 +++++++++ .../effect/0362.baking/register.mcfunction | 39 +++++++++++ .../effect/0362.baking/tick/.mcfunction | 12 ++++ .../effect/0362.baking/tick/shoot.mcfunction | 20 ++++++ .../effect/0362.baking/tick/sound.mcfunction | 11 +++ .../1159.bread/detect_hit_entity/.mcfunction | 8 +++ .../object/1159.bread/hit_entity/.mcfunction | 29 ++++++++ .../object/1159.bread/kill/.mcfunction | 11 +++ .../object/1159.bread/recursive/.mcfunction | 9 +++ .../object/1159.bread/register.mcfunction | 23 +++++++ .../object/1159.bread/summon/.mcfunction | 11 +++ .../object/1159.bread/summon/m.mcfunction | 7 ++ .../alias/1159/detect_hit_entity.mcfunction | 8 +++ .../object/alias/1159/hit_entity.mcfunction | 8 +++ .../object/alias/1159/kill.mcfunction | 8 +++ .../object/alias/1159/recursive.mcfunction | 8 +++ .../object/alias/1159/register.mcfunction | 8 +++ .../object/alias/1159/summon.mcfunction | 8 +++ .../asset/tags/functions/artifact/give.json | 3 +- .../tags/functions/artifact/register.json | 3 +- .../tags/functions/artifact/using_item.json | 3 +- .../asset/tags/functions/effect/re-given.json | 3 +- .../asset/tags/functions/effect/register.json | 3 +- .../asset/tags/functions/effect/tick.json | 3 +- 34 files changed, 445 insertions(+), 6 deletions(-) create mode 100644 Asset/data/asset/functions/artifact/1421.toaster/give/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1421.toaster/give/2.give.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1421.toaster/register.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1421.toaster/trigger/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1421.toaster/trigger/2.check_condition.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1421.toaster/trigger/3.main.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1421.toaster/trigger/charge.mcfunction create mode 100644 Asset/data/asset/functions/effect/0362.baking/_/re-given.mcfunction create mode 100644 Asset/data/asset/functions/effect/0362.baking/_/register.mcfunction create mode 100644 Asset/data/asset/functions/effect/0362.baking/_/tick.mcfunction create mode 100644 Asset/data/asset/functions/effect/0362.baking/re-given/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0362.baking/register.mcfunction create mode 100644 Asset/data/asset/functions/effect/0362.baking/tick/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0362.baking/tick/shoot.mcfunction create mode 100644 Asset/data/asset/functions/effect/0362.baking/tick/sound.mcfunction create mode 100644 Asset/data/asset/functions/object/1159.bread/detect_hit_entity/.mcfunction create mode 100644 Asset/data/asset/functions/object/1159.bread/hit_entity/.mcfunction create mode 100644 Asset/data/asset/functions/object/1159.bread/kill/.mcfunction create mode 100644 Asset/data/asset/functions/object/1159.bread/recursive/.mcfunction create mode 100644 Asset/data/asset/functions/object/1159.bread/register.mcfunction create mode 100644 Asset/data/asset/functions/object/1159.bread/summon/.mcfunction create mode 100644 Asset/data/asset/functions/object/1159.bread/summon/m.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1159/detect_hit_entity.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1159/hit_entity.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1159/kill.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1159/recursive.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1159/register.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1159/summon.mcfunction diff --git a/Asset/data/asset/functions/artifact/1421.toaster/give/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1421.toaster/give/1.trigger.mcfunction new file mode 100644 index 0000000000..9d42252070 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1421.toaster/give/1.trigger.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1421.toaster/give/1.trigger +# +# 神器の取得処理の呼び出し時に実行されるfunction +# +# @within tag/function asset:artifact/give + +execute if data storage asset:context {id:1421} run function asset:artifact/1421.toaster/give/2.give \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1421.toaster/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1421.toaster/give/2.give.mcfunction new file mode 100644 index 0000000000..079414b4dd --- /dev/null +++ b/Asset/data/asset/functions/artifact/1421.toaster/give/2.give.mcfunction @@ -0,0 +1,68 @@ +#> asset:artifact/1421.toaster/give/2.give +# +# 神器の作成部 ここでID等を定義する +# +# @user +# @within function asset:artifact/1421.toaster/give/1.trigger + +# 神器の説明や消費MPなどをここで設定する。 +# 最後にasset:artifact/common/giveを実行することで入手可能。 + +# 神器のID (int) スプレッドシートの値を入れる + data modify storage asset:artifact ID set value 1421 +# 神器のベースアイテム + 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段階のチャージを行う"}','[{"translate":"%1$sを離すことで","with":[{"keybind":"key.use"}]}]','{"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 + # 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-120x2" +# 攻撃に関する情報 -攻撃タイプ (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 +# 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.AttackRange set value +# 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/1421.toaster/register.mcfunction b/Asset/data/asset/functions/artifact/1421.toaster/register.mcfunction new file mode 100644 index 0000000000..1b75233ba9 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1421.toaster/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1421.toaster/register +# +# 神器プールへの登録処理 +# +# @within tag/function asset:artifact/register + +data modify storage asset:artifact RarityRegistry[2] append value [1421] \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1421.toaster/trigger/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1421.toaster/trigger/1.trigger.mcfunction new file mode 100644 index 0000000000..22adee6e84 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1421.toaster/trigger/1.trigger.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1421.toaster/trigger/1.trigger +# +# 指定したイベントタイミングで実行されるfunction +# +# @within tag/function asset:artifact/** + +# storage asset:idのmainhandに装備している神器のIDが入っているので比較し、~/2.check_condition.mcfunctionを実行する + execute if data storage asset:context id{mainhand:1421} run function asset:artifact/1421.toaster/trigger/2.check_condition \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1421.toaster/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1421.toaster/trigger/2.check_condition.mcfunction new file mode 100644 index 0000000000..ce7468f4c8 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1421.toaster/trigger/2.check_condition.mcfunction @@ -0,0 +1,31 @@ +#> asset:artifact/1421.toaster/trigger/2.check_condition +# +# 神器の発動条件をチェックします +# +# @within function asset:artifact/1421.toaster/trigger/1.trigger + +#> Private +# @private + #declare score_holder $Count + +# チャージ用Effectがあれば強制的にチャージ続行 + data modify storage api: Argument.ID set value 362 + function api:entity/mob/effect/get/from_id + execute if data storage api: Return.Effect run return run function asset:artifact/1421.toaster/trigger/charge + +# 神器の基本的な条件の確認を行う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/1421.toaster/trigger/3.main diff --git a/Asset/data/asset/functions/artifact/1421.toaster/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1421.toaster/trigger/3.main.mcfunction new file mode 100644 index 0000000000..86e6265d8d --- /dev/null +++ b/Asset/data/asset/functions/artifact/1421.toaster/trigger/3.main.mcfunction @@ -0,0 +1,22 @@ +#> asset:artifact/1421.toaster/trigger/3.main +# +# 神器のメイン処理部 +# +# @within function asset:artifact/1421.toaster/trigger/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.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/1421.toaster/trigger/charge.mcfunction b/Asset/data/asset/functions/artifact/1421.toaster/trigger/charge.mcfunction new file mode 100644 index 0000000000..b2cf0a0cf9 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1421.toaster/trigger/charge.mcfunction @@ -0,0 +1,10 @@ +#> asset:artifact/1421.toaster/trigger/charge +# +# +# +# @within function asset:artifact/1421.toaster/trigger/2.check_condition + +# チャージ + data modify storage api: Argument.ID set value 362 + function api:entity/mob/effect/give + function api:entity/mob/effect/reset diff --git a/Asset/data/asset/functions/effect/0362.baking/_/re-given.mcfunction b/Asset/data/asset/functions/effect/0362.baking/_/re-given.mcfunction new file mode 100644 index 0000000000..6e553c9729 --- /dev/null +++ b/Asset/data/asset/functions/effect/0362.baking/_/re-given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0362.baking/_/re-given +# +# Effectが上書きされた時に実行されるfunction +# +# @within tag/function asset:effect/re-given + +execute if data storage asset:context {id:362} run function asset:effect/0362.baking/re-given/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0362.baking/_/register.mcfunction b/Asset/data/asset/functions/effect/0362.baking/_/register.mcfunction new file mode 100644 index 0000000000..2a9934824b --- /dev/null +++ b/Asset/data/asset/functions/effect/0362.baking/_/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0362.baking/_/register +# +# +# +# @within tag/function asset:effect/register + +execute if data storage asset:context {id:362} run function asset:effect/0362.baking/register \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0362.baking/_/tick.mcfunction b/Asset/data/asset/functions/effect/0362.baking/_/tick.mcfunction new file mode 100644 index 0000000000..dc23a77453 --- /dev/null +++ b/Asset/data/asset/functions/effect/0362.baking/_/tick.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0362.baking/_/tick +# +# Effectが発動している間毎tick実行されるfunction +# +# @within tag/function asset:effect/tick + +execute if data storage asset:context {id:362} run function asset:effect/0362.baking/tick/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0362.baking/re-given/.mcfunction b/Asset/data/asset/functions/effect/0362.baking/re-given/.mcfunction new file mode 100644 index 0000000000..7dc4ebc8eb --- /dev/null +++ b/Asset/data/asset/functions/effect/0362.baking/re-given/.mcfunction @@ -0,0 +1,31 @@ +#> asset:effect/0362.baking/re-given/ +# +# Effectが上書きされた時の処理 +# +# @within function asset:effect/0362.baking/_/re-given + +#> Private +# @private + #declare score_holder $Charge + +# 常時の音 + playsound block.furnace.fire_crackle player @a ~ ~ ~ 1 0.8 + +# ダメージのデータ引き継ぎ + data modify storage asset:context this.Damage set from storage asset:context PreviousField.Damage + +# チャージ段階取得 + execute store result score $Charge Temporary run data get storage asset:context PreviousField.Charge + +# Field.Chargeを+1 + execute store result storage asset:context this.Charge int 1 run scoreboard players add $Charge Temporary 1 + +# チャージ段階に比例して演出とスタックを変える + execute if score $Charge Temporary matches 12 run playsound minecraft:block.note_block.chime player @a ~ ~ ~ 1 1.9 + execute if score $Charge Temporary matches 12 run data modify storage asset:context Stack set value 2 + + execute if score $Charge Temporary matches 24 run playsound minecraft:block.note_block.chime player @a ~ ~ ~ 1 2.0 + execute if score $Charge Temporary matches 24 run data modify storage asset:context Stack set value 3 + +# リセット + scoreboard players reset $Charge Temporary diff --git a/Asset/data/asset/functions/effect/0362.baking/register.mcfunction b/Asset/data/asset/functions/effect/0362.baking/register.mcfunction new file mode 100644 index 0000000000..9ff85e4615 --- /dev/null +++ b/Asset/data/asset/functions/effect/0362.baking/register.mcfunction @@ -0,0 +1,39 @@ +#> asset:effect/0362.baking/register +# +# Effectのデータを指定 +# +# @within function asset:effect/0362.baking/_/register + +# ExtendsSafe (boolean) (default = false) + # data modify storage asset:effect ExtendsSafe set value true +# ID (int) + data modify storage asset:effect ID set value 362 +# 名前 (TextComponentString) + data modify storage asset:effect Name set value '{"text":"加熱中...","color":"#d7a657"}' +# 説明文 (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 +# エフェクトのスタックををUIに表示するか (boolean) (default = true) + # data modify storage asset:effect StackVisible set value + +# フィールド + data modify storage asset:effect Field.Charge set value 0 diff --git a/Asset/data/asset/functions/effect/0362.baking/tick/.mcfunction b/Asset/data/asset/functions/effect/0362.baking/tick/.mcfunction new file mode 100644 index 0000000000..196ebd2758 --- /dev/null +++ b/Asset/data/asset/functions/effect/0362.baking/tick/.mcfunction @@ -0,0 +1,12 @@ +#> asset:effect/0362.baking/tick/ +# +# Effectのtick処理 +# +# @within function asset:effect/0362.baking/_/tick + +# 発射直前の音 + execute if data storage asset:context {Duration:1} run function asset:effect/0362.baking/tick/sound + +# 残りDurationが1と0の時に発射 + execute if data storage asset:context {Duration:1} anchored eyes positioned ^-0.35 ^-0.1 ^ run function asset:effect/0362.baking/tick/shoot + execute if data storage asset:context {Duration:0} anchored eyes positioned ^-0.35 ^-0.2 ^ run function asset:effect/0362.baking/tick/shoot diff --git a/Asset/data/asset/functions/effect/0362.baking/tick/shoot.mcfunction b/Asset/data/asset/functions/effect/0362.baking/tick/shoot.mcfunction new file mode 100644 index 0000000000..96c1c80eed --- /dev/null +++ b/Asset/data/asset/functions/effect/0362.baking/tick/shoot.mcfunction @@ -0,0 +1,20 @@ +#> asset:effect/0362.baking/tick/shoot +# +# +# +# @within function asset:effect/0362.baking/tick/ + +# スタックに応じて弾速を調整 + execute if data storage asset:context {Stack:1} run data modify storage api: Argument.FieldOverride.Speed set value 1 + execute if data storage asset:context {Stack:2} run data modify storage api: Argument.FieldOverride.Speed set value 2 + execute if data storage asset:context {Stack:3} run data modify storage api: Argument.FieldOverride.Speed set value 3 + +# ダメージ設定 + 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 + 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/0362.baking/tick/sound.mcfunction b/Asset/data/asset/functions/effect/0362.baking/tick/sound.mcfunction new file mode 100644 index 0000000000..476dbb9608 --- /dev/null +++ b/Asset/data/asset/functions/effect/0362.baking/tick/sound.mcfunction @@ -0,0 +1,11 @@ +#> asset:effect/0362.baking/tick/sound +# +# 音 +# +# @within function asset:effect/0362.baking/tick/ + + playsound block.piston.contract player @a ~ ~ ~ 1 1.2 + playsound block.fire.ambient player @a ~ ~ ~ 1 1.3 + #playsound minecraft:block.bell.use player @a ~ ~ ~ 1 2 + #playsound block.amethyst_block.break player @a ~ ~ ~ 1 0.9 + #playsound block.amethyst_block.break player @a ~ ~ ~ 1 0.5 diff --git a/Asset/data/asset/functions/object/1159.bread/detect_hit_entity/.mcfunction b/Asset/data/asset/functions/object/1159.bread/detect_hit_entity/.mcfunction new file mode 100644 index 0000000000..8a00e33b74 --- /dev/null +++ b/Asset/data/asset/functions/object/1159.bread/detect_hit_entity/.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/1159.bread/detect_hit_entity/ +# +# 継承先などから実行される処理 +# +# @within asset:object/alias/1159/detect_hit_entity + +# + execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living_without_player,tag=Enemy,dx=0,limit=1] run data modify storage asset:context IsHitEntity set value true diff --git a/Asset/data/asset/functions/object/1159.bread/hit_entity/.mcfunction b/Asset/data/asset/functions/object/1159.bread/hit_entity/.mcfunction new file mode 100644 index 0000000000..467e668c88 --- /dev/null +++ b/Asset/data/asset/functions/object/1159.bread/hit_entity/.mcfunction @@ -0,0 +1,29 @@ +#> asset:object/1159.bread/hit_entity/ +# +# 継承先などから実行される処理 +# +# @within asset:object/alias/1159/hit_entity + +#> Private +# @private + #declare score_holder $UserID + +# 演出 + playsound minecraft:block.fire.extinguish neutral @a ~ ~ ~ 1 2 + +# User特定 + execute store result score $UserID Temporary run data get storage asset:context this.UserID + +# ダメージ + data modify storage api: Argument.Damage set from storage asset:context this.Damage + data modify storage api: Argument.AttackType set value "Physical" + data modify storage api: Argument.ElementType set value "Fire" + execute as @a if score @s UserID = $UserID Temporary run function api:damage/modifier + execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0,sort=random,limit=1] run function api:damage/ + function api:damage/reset + +# リセット + scoreboard players reset $UserID Temporary + +# 消滅 + function asset:object/call.m {method:"kill"} diff --git a/Asset/data/asset/functions/object/1159.bread/kill/.mcfunction b/Asset/data/asset/functions/object/1159.bread/kill/.mcfunction new file mode 100644 index 0000000000..9bce619cf1 --- /dev/null +++ b/Asset/data/asset/functions/object/1159.bread/kill/.mcfunction @@ -0,0 +1,11 @@ +#> asset:object/1159.bread/kill/ +# +# 継承先などから実行される処理 +# +# @within asset:object/alias/1159/kill + +# 演出 + particle item stick{CustomModelData:20603} ~ ~ ~ 0 0 0 0.1 15 normal @a + +# 消滅 + kill @s diff --git a/Asset/data/asset/functions/object/1159.bread/recursive/.mcfunction b/Asset/data/asset/functions/object/1159.bread/recursive/.mcfunction new file mode 100644 index 0000000000..0af1a6ef66 --- /dev/null +++ b/Asset/data/asset/functions/object/1159.bread/recursive/.mcfunction @@ -0,0 +1,9 @@ +#> asset:object/1159.bread/recursive/ +# +# 継承先などから実行される処理 +# +# @within asset:object/alias/1159/recursive + +# 演出 + particle dust 1 0.886 0.522 0.3 ~ ~ ~ 0.05 0.05 0.05 0 1 normal @a + particle dust 1 0.886 0.522 0.3 ^ ^ ^-0.25 0.05 0.05 0.05 0 1 normal @a diff --git a/Asset/data/asset/functions/object/1159.bread/register.mcfunction b/Asset/data/asset/functions/object/1159.bread/register.mcfunction new file mode 100644 index 0000000000..44926bab74 --- /dev/null +++ b/Asset/data/asset/functions/object/1159.bread/register.mcfunction @@ -0,0 +1,23 @@ +#> asset:object/1159.bread/register +# +# Objectのデータを指定 +# +# @within function asset:object/alias/1159/register + +# 継承(オプション) + data modify storage asset:object Extends append value 1 + function asset:object/extends +# 他のObjectに継承されることを許可するか (boolean) (オプション) + # data modify storage asset:object ExtendsSafe set value +# 継承されることを前提とした、抽象的なObjectであるかどうか(boolean) + data modify storage asset:object IsAbstract set value false +# Tickするかどうか(boolean) (オプション) + # data modify storage asset:object IsTicking set value + +# ID (int) + data modify storage asset:object ID set value 1159 +# フィールド(オプション) + data modify storage asset:object Field.Speed set value 1 + data modify storage asset:object Field.Range set value 40 + data modify storage asset:object Field.MovePerStep set value 0.5 + data modify storage asset:object Field.Damage set value 1d diff --git a/Asset/data/asset/functions/object/1159.bread/summon/.mcfunction b/Asset/data/asset/functions/object/1159.bread/summon/.mcfunction new file mode 100644 index 0000000000..bea14969aa --- /dev/null +++ b/Asset/data/asset/functions/object/1159.bread/summon/.mcfunction @@ -0,0 +1,11 @@ +#> asset:object/1159.bread/summon/ +# +# Object召喚処理の呼び出し時に実行されるfunction +# +# @within asset:object/alias/1159/summon + +# 元となるEntityを召喚する + execute as 0-0-0-0-0 in minecraft:overworld positioned as @s run tp @s ~ ~ ~ ~ ~ + data modify storage asset:temp Args.Rotation set from entity 0-0-0-0-0 Rotation + function asset:object/1159.bread/summon/m with storage asset:temp Args + data remove storage asset:temp Args diff --git a/Asset/data/asset/functions/object/1159.bread/summon/m.mcfunction b/Asset/data/asset/functions/object/1159.bread/summon/m.mcfunction new file mode 100644 index 0000000000..268b29e67f --- /dev/null +++ b/Asset/data/asset/functions/object/1159.bread/summon/m.mcfunction @@ -0,0 +1,7 @@ +#> asset:object/1159.bread/summon/m +# +# +# +# @within function asset:object/1159.bread/summon/ + + $summon item_display ~ ~ ~ {Rotation:$(Rotation),teleport_duration:1,Tags:["ObjectInit"],transformation:{translation:[0.0f,0.0f,0.0f],left_rotation:[0.0f,0.0f,0.7071f,0.7071f],scale:[1.0f,1.0f,1.0f],right_rotation:[0.0f,0.0f,0.0f,1.0f]},item:{id:"minecraft:stick",Count:1b,tag:{CustomModelData:20603}}} diff --git a/Asset/data/asset/functions/object/alias/1159/detect_hit_entity.mcfunction b/Asset/data/asset/functions/object/alias/1159/detect_hit_entity.mcfunction new file mode 100644 index 0000000000..dddeca00c5 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1159/detect_hit_entity.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1159/detect_hit_entity +# +# メソッド処理のエイリアス +# +# @within asset_manager:object/call_method/run_method.m + +# 元のメソッド処理を呼び出す + function asset:object/1159.bread/detect_hit_entity/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1159/hit_entity.mcfunction b/Asset/data/asset/functions/object/alias/1159/hit_entity.mcfunction new file mode 100644 index 0000000000..382b04ce2a --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1159/hit_entity.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1159/hit_entity +# +# メソッド処理のエイリアス +# +# @within asset_manager:object/call_method/run_method.m + +# 元のメソッド処理を呼び出す + function asset:object/1159.bread/hit_entity/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1159/kill.mcfunction b/Asset/data/asset/functions/object/alias/1159/kill.mcfunction new file mode 100644 index 0000000000..3f5c88b2e8 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1159/kill.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1159/kill +# +# メソッド処理のエイリアス +# +# @within asset_manager:object/call_method/run_method.m + +# 元のメソッド処理を呼び出す + function asset:object/1159.bread/kill/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1159/recursive.mcfunction b/Asset/data/asset/functions/object/alias/1159/recursive.mcfunction new file mode 100644 index 0000000000..118e6a8b28 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1159/recursive.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1159/recursive +# +# メソッド処理のエイリアス +# +# @within asset_manager:object/call_method/run_method.m + +# 元のメソッド処理を呼び出す + function asset:object/1159.bread/recursive/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1159/register.mcfunction b/Asset/data/asset/functions/object/alias/1159/register.mcfunction new file mode 100644 index 0000000000..f7b4982750 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1159/register.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1159/register +# +# Objectのデータ指定処理のエイリアス +# +# @within asset_manager:object/summon/register.m + +# 元の登録処理を呼び出す + function asset:object/1159.bread/register \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1159/summon.mcfunction b/Asset/data/asset/functions/object/alias/1159/summon.mcfunction new file mode 100644 index 0000000000..5eac0a19bf --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1159/summon.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1159/summon +# +# Object召喚処理のエイリアス +# +# @within asset_manager:object/summon/summon.m + +# 元の召喚処理を呼び出す + function asset:object/1159.bread/summon/ \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/artifact/give.json b/Asset/data/asset/tags/functions/artifact/give.json index 16715fe3c7..c195fcf3fe 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/1421.toaster/give/1.trigger", "asset:artifact/1252.fox_candle/give/1.trigger", "asset:artifact/1343.coffee_milk_pack/give/1.trigger", "asset:artifact/1342.fruit_milk_pack/give/1.trigger", @@ -530,4 +531,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 7e92660e5a..855bb840ff 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/1421.toaster/register", "asset:artifact/1252.fox_candle/register", "asset:artifact/1343.coffee_milk_pack/register", "asset:artifact/1342.fruit_milk_pack/register", @@ -308,4 +309,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.json b/Asset/data/asset/tags/functions/artifact/using_item.json index 499dc901af..962512e01a 100644 --- a/Asset/data/asset/tags/functions/artifact/using_item.json +++ b/Asset/data/asset/tags/functions/artifact/using_item.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1421.toaster/trigger/1.trigger", "asset:artifact/1220.sacred_hardener/trigger/1.trigger", "asset:artifact/1269.apocalypse/using_item/1.trigger", "asset:artifact/1228.fatalerror/trigger/1.trigger", @@ -16,4 +17,4 @@ "asset:artifact/0948.ft_139_rifle/trigger/1.trigger", "asset:artifact/0876.uni/trigger/1.trigger" ] -} +} \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/effect/re-given.json b/Asset/data/asset/tags/functions/effect/re-given.json index d3650bf09a..06ccfe24c5 100644 --- a/Asset/data/asset/tags/functions/effect/re-given.json +++ b/Asset/data/asset/tags/functions/effect/re-given.json @@ -1,5 +1,6 @@ { "values": [ + "asset:effect/0362.baking/_/re-given", "asset:effect/0352.kitsunebi/_/re-given", "asset:effect/0345.topaz_protection/_/re-given", "asset:effect/0029.poison/_/re-given", @@ -60,4 +61,4 @@ "asset:effect/0007.defense_base_debuff/_/re-given", "asset:effect/0258.spirit_melody/_/re-given" ] -} +} \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/effect/register.json b/Asset/data/asset/tags/functions/effect/register.json index 2a88625f93..8743b77a76 100644 --- a/Asset/data/asset/tags/functions/effect/register.json +++ b/Asset/data/asset/tags/functions/effect/register.json @@ -1,5 +1,6 @@ { "values": [ + "asset:effect/0362.baking/_/register", "asset:effect/0352.kitsunebi/_/register", "asset:effect/0351.nectar_regeneration/_/register", "asset:effect/0117.slowness/_/register", @@ -175,4 +176,4 @@ "asset:effect/0007.defense_base_debuff/_/register", "asset:effect/0258.spirit_melody/_/register" ] -} +} \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/effect/tick.json b/Asset/data/asset/tags/functions/effect/tick.json index c055726179..dcd29ef138 100644 --- a/Asset/data/asset/tags/functions/effect/tick.json +++ b/Asset/data/asset/tags/functions/effect/tick.json @@ -1,5 +1,6 @@ { "values": [ + "asset:effect/0362.baking/_/tick", "asset:effect/0352.kitsunebi/_/tick", "asset:effect/0351.nectar_regeneration/_/tick", "asset:effect/0360.calamity_bind/_/tick", @@ -103,4 +104,4 @@ "asset:effect/0279.poison_of_vinderre/_/tick", "asset:effect/0258.spirit_melody/_/tick" ] -} +} \ No newline at end of file From ca818b53e2eadb2ab8bf824dfb55a18194c40bf9 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Sat, 30 May 2026 01:31:10 +0900 Subject: [PATCH 2/6] =?UTF-8?q?=E9=9F=B3=E3=81=8C=E9=B3=B4=E3=82=8B?= =?UTF-8?q?=E3=83=A1=E3=82=BD=E3=83=83=E3=83=89=E3=82=92=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../asset/functions/object/1159.bread/hit_entity/.mcfunction | 3 --- Asset/data/asset/functions/object/1159.bread/kill/.mcfunction | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Asset/data/asset/functions/object/1159.bread/hit_entity/.mcfunction b/Asset/data/asset/functions/object/1159.bread/hit_entity/.mcfunction index 467e668c88..de269cdaca 100644 --- a/Asset/data/asset/functions/object/1159.bread/hit_entity/.mcfunction +++ b/Asset/data/asset/functions/object/1159.bread/hit_entity/.mcfunction @@ -8,9 +8,6 @@ # @private #declare score_holder $UserID -# 演出 - playsound minecraft:block.fire.extinguish neutral @a ~ ~ ~ 1 2 - # User特定 execute store result score $UserID Temporary run data get storage asset:context this.UserID diff --git a/Asset/data/asset/functions/object/1159.bread/kill/.mcfunction b/Asset/data/asset/functions/object/1159.bread/kill/.mcfunction index 9bce619cf1..5ea50ac1e7 100644 --- a/Asset/data/asset/functions/object/1159.bread/kill/.mcfunction +++ b/Asset/data/asset/functions/object/1159.bread/kill/.mcfunction @@ -6,6 +6,7 @@ # 演出 particle item stick{CustomModelData:20603} ~ ~ ~ 0 0 0 0.1 15 normal @a + playsound minecraft:block.fire.extinguish neutral @a ~ ~ ~ 1 2 # 消滅 kill @s From 0e7b4d7e45276b5da8d36df0dc8eb2ad7d78b8f0 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Sat, 30 May 2026 01:52:24 +0900 Subject: [PATCH 3/6] =?UTF-8?q?=E5=BC=BE=E9=80=9F=E3=82=92=E7=A5=9E?= =?UTF-8?q?=E5=99=A8=E5=81=B4=E3=81=A7=E8=A8=AD=E5=AE=9A=E3=81=A7=E3=81=8D?= =?UTF-8?q?=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifact/1421.toaster/trigger/3.main.mcfunction | 2 ++ .../functions/effect/0362.baking/re-given/.mcfunction | 4 ++-- .../functions/effect/0362.baking/tick/shoot.mcfunction | 7 ++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1421.toaster/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1421.toaster/trigger/3.main.mcfunction index 86e6265d8d..1de5269967 100644 --- a/Asset/data/asset/functions/artifact/1421.toaster/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1421.toaster/trigger/3.main.mcfunction @@ -17,6 +17,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/effect/0362.baking/re-given/.mcfunction b/Asset/data/asset/functions/effect/0362.baking/re-given/.mcfunction index 7dc4ebc8eb..dfbc502134 100644 --- a/Asset/data/asset/functions/effect/0362.baking/re-given/.mcfunction +++ b/Asset/data/asset/functions/effect/0362.baking/re-given/.mcfunction @@ -11,8 +11,8 @@ # 常時の音 playsound block.furnace.fire_crackle player @a ~ ~ ~ 1 0.8 -# ダメージのデータ引き継ぎ - data modify storage asset:context this.Damage set from storage asset:context PreviousField.Damage +# データ引き継ぎ + data modify storage asset:context this set from storage asset:context PreviousField # チャージ段階取得 execute store result score $Charge Temporary run data get storage asset:context PreviousField.Charge diff --git a/Asset/data/asset/functions/effect/0362.baking/tick/shoot.mcfunction b/Asset/data/asset/functions/effect/0362.baking/tick/shoot.mcfunction index 96c1c80eed..0ac52e1291 100644 --- a/Asset/data/asset/functions/effect/0362.baking/tick/shoot.mcfunction +++ b/Asset/data/asset/functions/effect/0362.baking/tick/shoot.mcfunction @@ -5,9 +5,9 @@ # @within function asset:effect/0362.baking/tick/ # スタックに応じて弾速を調整 - execute if data storage asset:context {Stack:1} run data modify storage api: Argument.FieldOverride.Speed set value 1 - execute if data storage asset:context {Stack:2} run data modify storage api: Argument.FieldOverride.Speed set value 2 - execute if data storage asset:context {Stack:3} run data modify storage api: Argument.FieldOverride.Speed set value 3 + 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 @@ -16,5 +16,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 From b0dfb5917245e86539d2dbd9d22e4c73a00e4b08 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Sat, 30 May 2026 11:56:56 +0900 Subject: [PATCH 4/6] =?UTF-8?q?=E7=99=BA=E5=B0=84=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 --- .../data/asset/functions/effect/0362.baking/tick/.mcfunction | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Asset/data/asset/functions/effect/0362.baking/tick/.mcfunction b/Asset/data/asset/functions/effect/0362.baking/tick/.mcfunction index 196ebd2758..089545d649 100644 --- a/Asset/data/asset/functions/effect/0362.baking/tick/.mcfunction +++ b/Asset/data/asset/functions/effect/0362.baking/tick/.mcfunction @@ -8,5 +8,5 @@ execute if data storage asset:context {Duration:1} run function asset:effect/0362.baking/tick/sound # 残りDurationが1と0の時に発射 - execute if data storage asset:context {Duration:1} anchored eyes positioned ^-0.35 ^-0.1 ^ run function asset:effect/0362.baking/tick/shoot - execute if data storage asset:context {Duration:0} anchored eyes positioned ^-0.35 ^-0.2 ^ run function asset:effect/0362.baking/tick/shoot + execute if data storage asset:context {Duration:1} anchored eyes positioned ^-0.35 ^-0.25 ^ run function asset:effect/0362.baking/tick/shoot + execute if data storage asset:context {Duration:0} anchored eyes positioned ^-0.35 ^-0.35 ^ run function asset:effect/0362.baking/tick/shoot From 66d7d3d697d16981ba4e449367bf5f603d7816c2 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Sat, 30 May 2026 11:57:14 +0900 Subject: [PATCH 5/6] =?UTF-8?q?=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88?= =?UTF-8?q?=E3=82=A2=E3=82=A6=E3=83=88=E3=81=95=E3=82=8C=E3=81=9F=E3=82=B3?= =?UTF-8?q?=E3=83=9E=E3=83=B3=E3=83=89=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../asset/functions/effect/0362.baking/tick/sound.mcfunction | 3 --- 1 file changed, 3 deletions(-) diff --git a/Asset/data/asset/functions/effect/0362.baking/tick/sound.mcfunction b/Asset/data/asset/functions/effect/0362.baking/tick/sound.mcfunction index 476dbb9608..4e74231664 100644 --- a/Asset/data/asset/functions/effect/0362.baking/tick/sound.mcfunction +++ b/Asset/data/asset/functions/effect/0362.baking/tick/sound.mcfunction @@ -6,6 +6,3 @@ playsound block.piston.contract player @a ~ ~ ~ 1 1.2 playsound block.fire.ambient player @a ~ ~ ~ 1 1.3 - #playsound minecraft:block.bell.use player @a ~ ~ ~ 1 2 - #playsound block.amethyst_block.break player @a ~ ~ ~ 1 0.9 - #playsound block.amethyst_block.break player @a ~ ~ ~ 1 0.5 From 3967c5ff854972465770063f7ffe0fde7574efd6 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Sat, 30 May 2026 12:37:37 +0900 Subject: [PATCH 6/6] =?UTF-8?q?=E5=B0=84=E7=A8=8B=E3=81=A8=E5=8D=98?= =?UTF-8?q?=E4=BD=93=E6=94=BB=E6=92=83=E3=81=A7=E3=81=82=E3=82=8B=E3=81=93?= =?UTF-8?q?=E3=81=A8=E3=82=92=E6=98=8E=E8=A8=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/artifact/1421.toaster/give/2.give.mcfunction | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1421.toaster/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1421.toaster/give/2.give.mcfunction index 079414b4dd..fffff49a8d 100644 --- a/Asset/data/asset/functions/artifact/1421.toaster/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1421.toaster/give/2.give.mcfunction @@ -37,9 +37,9 @@ # 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) # data modify storage asset:artifact AttackInfo.BypassResist set value # 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.IsRangeAttack set value + data modify storage asset:artifact AttackInfo.IsRangeAttack set value "never" # 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.AttackRange set value + data modify storage asset:artifact AttackInfo.AttackRange set value 20 # MP消費量 (int) data modify storage asset:artifact MPCost set value 20 # MP必要量 (int) (オプション)