From a5e7419b1a5904e9e6e377265e718586c316a78f Mon Sep 17 00:00:00 2001 From: LeinelLacyulie Date: Sat, 11 Jul 2026 21:40:24 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=E9=A8=8E=E5=A3=AB=E3=81=AE=E3=81=9F?= =?UTF-8?q?=E3=82=81=E3=81=AE=E5=89=A3=E3=82=92=E4=BD=9C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../give/1.trigger.mcfunction | 7 ++ .../give/2.give.mcfunction | 72 +++++++++++++++++++ .../onclick/0.load.mcfunction | 8 +++ .../onclick/1.trigger.mcfunction | 5 ++ .../onclick/2.check_condition.mcfunction | 8 +++ .../onclick/3.main.mcfunction | 16 +++++ .../onclick/_index.d.mcfunction | 6 ++ .../1574.sword_for_knight/register.mcfunction | 7 ++ .../trigger/1.trigger.mcfunction | 8 +++ .../trigger/2.check_condition.mcfunction | 11 +++ .../trigger/3.main.mcfunction | 25 +++++++ .../_index.d.mcfunction | 6 ++ .../init/.mcfunction | 7 ++ .../load.mcfunction | 9 +++ .../register.mcfunction | 20 ++++++ .../summon/.mcfunction | 8 +++ .../summon/debug.mcfunction | 10 +++ .../tick/.mcfunction | 14 ++++ .../object/alias/1175/init.mcfunction | 8 +++ .../object/alias/1175/register.mcfunction | 8 +++ .../object/alias/1175/summon.mcfunction | 8 +++ .../object/alias/1175/tick.mcfunction | 8 +++ .../tags/functions/artifact/attack/melee.json | 1 + .../artifact/click.carrot_on_a_stick.json | 1 + .../asset/tags/functions/artifact/give.json | 1 + .../asset/tags/functions/artifact/load.json | 1 + .../tags/functions/artifact/register.json | 1 + .../asset/tags/functions/object/load.json | 3 +- 28 files changed, 286 insertions(+), 1 deletion(-) create mode 100644 Asset/data/asset/functions/artifact/1574.sword_for_knight/give/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1574.sword_for_knight/give/2.give.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1574.sword_for_knight/onclick/0.load.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1574.sword_for_knight/onclick/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1574.sword_for_knight/onclick/2.check_condition.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1574.sword_for_knight/onclick/3.main.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1574.sword_for_knight/onclick/_index.d.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1574.sword_for_knight/register.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1574.sword_for_knight/trigger/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1574.sword_for_knight/trigger/2.check_condition.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1574.sword_for_knight/trigger/3.main.mcfunction create mode 100644 Asset/data/asset/functions/object/1175.timer_of_sword_for_knight/_index.d.mcfunction create mode 100644 Asset/data/asset/functions/object/1175.timer_of_sword_for_knight/init/.mcfunction create mode 100644 Asset/data/asset/functions/object/1175.timer_of_sword_for_knight/load.mcfunction create mode 100644 Asset/data/asset/functions/object/1175.timer_of_sword_for_knight/register.mcfunction create mode 100644 Asset/data/asset/functions/object/1175.timer_of_sword_for_knight/summon/.mcfunction create mode 100644 Asset/data/asset/functions/object/1175.timer_of_sword_for_knight/summon/debug.mcfunction create mode 100644 Asset/data/asset/functions/object/1175.timer_of_sword_for_knight/tick/.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1175/init.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1175/register.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1175/summon.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1175/tick.mcfunction diff --git a/Asset/data/asset/functions/artifact/1574.sword_for_knight/give/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1574.sword_for_knight/give/1.trigger.mcfunction new file mode 100644 index 0000000000..56db2945aa --- /dev/null +++ b/Asset/data/asset/functions/artifact/1574.sword_for_knight/give/1.trigger.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1574.sword_for_knight/give/1.trigger +# +# 神器の取得処理の呼び出し時に実行されるfunction +# +# @within tag/function asset:artifact/give + +execute if data storage asset:context {id:1574} run function asset:artifact/1574.sword_for_knight/give/2.give diff --git a/Asset/data/asset/functions/artifact/1574.sword_for_knight/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1574.sword_for_knight/give/2.give.mcfunction new file mode 100644 index 0000000000..e2e37863f2 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1574.sword_for_knight/give/2.give.mcfunction @@ -0,0 +1,72 @@ +#> asset:artifact/1574.sword_for_knight/give/2.give +# +# 神器の作成部 ここでID等を定義する +# +# @user +# @within function asset:artifact/1574.sword_for_knight/give/1.trigger + +# 神器の説明や消費MPなどをここで設定する。 +# 最後にasset:artifact/common/giveを実行することで入手可能。 + +# 神器のID (int) スプレッドシートの値を入れる + data modify storage asset:artifact ID set value 1574 +# 神器のベースアイテム + data modify storage asset:artifact Item set value "minecraft:carrot_on_a_stick" +# 神器の名前 (TextComponentString) + data modify storage asset:artifact Name set value '{"text":"騎士のための剣","color":"aqua"}' +# 神器の説明文 (TextComponentString[]) + data modify storage asset:artifact Lore set value ['{"text":"使用後1秒の間に受けたダメージを80%カットする。"}','{"text":"もちろんこれで殴ったっていい。"}','{"text":"剣も使いこなしてこそ騎士である。","color":"dark_gray"}'] +# 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション) + # data modify storage asset:artifact ConsumeItem.Item set value '{"translate":"item.minecraft.stick"}' + # data modify storage asset:artifact ConsumeItem.Count set value 1 + # 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 "onAttackByMelee" +# 効果が重複可能か否か (boolean) (オプション) + # data modify storage asset:artifact EnableDuplication set value +# 神器の発動条件 (TextComponentString) (オプション) + # data modify storage asset:artifact Condition set value +# 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.Damage set value [700,900] +# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.AttackType set value [Physical] +# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.ElementType set value [None] +# 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.BypassResist set value 1b +# 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.IsRangeAttack set value 'never' +# 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.AttackRange set value 7 +# MP消費量 (int) + data modify storage asset:artifact MPCost set value 30 +# 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 40 +# 種別クールダウン ({Type: string, Duration: int}) (オプション) + data modify storage asset:artifact TypeCooldown.Type set value "shortRange" + data modify storage asset:artifact TypeCooldown.Duration set value 40 +# 第二種別クールダウン ({Type: string, Duration: int}) (オプション) + # data modify storage asset:artifact SecondaryTypeCooldown.Type set value + # data modify storage asset:artifact SecondaryTypeCooldown.Duration set value +# グローバルクールダウン (int) (オプション) + data modify storage asset:artifact SpecialCooldown set value 40 +# クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) + data modify storage asset:artifact DisableCooldownMessage set value 1b +# 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/1574.sword_for_knight/onclick/0.load.mcfunction b/Asset/data/asset/functions/artifact/1574.sword_for_knight/onclick/0.load.mcfunction new file mode 100644 index 0000000000..c956e3bfc8 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1574.sword_for_knight/onclick/0.load.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1574.sword_for_knight/onclick/0.load +# +# 神器に利用するスコアボード等の初期化処理 +# +# @within tag/function asset:artifact/load + +#> 定義類はここに +# @public diff --git a/Asset/data/asset/functions/artifact/1574.sword_for_knight/onclick/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1574.sword_for_knight/onclick/1.trigger.mcfunction new file mode 100644 index 0000000000..4226a7f4e3 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1574.sword_for_knight/onclick/1.trigger.mcfunction @@ -0,0 +1,5 @@ +#> asset:artifact/1574.sword_for_knight/onclick/1.trigger +# +# @within tag/function asset:artifact/click.carrot_on_a_stick + + execute if data storage asset:context id{mainhand:1574} run function asset:artifact/1574.sword_for_knight/onclick/2.check_condition diff --git a/Asset/data/asset/functions/artifact/1574.sword_for_knight/onclick/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1574.sword_for_knight/onclick/2.check_condition.mcfunction new file mode 100644 index 0000000000..fec720430b --- /dev/null +++ b/Asset/data/asset/functions/artifact/1574.sword_for_knight/onclick/2.check_condition.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1574.sword_for_knight/onclick/2.check_condition +# +# @within function asset:artifact/1574.sword_for_knight/onclick/1.trigger + +# 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く + function asset:artifact/common/check_condition/mainhand +# CanUsedタグをチェックして3.main.mcfunctionを実行する + execute if entity @s[tag=CanUsed] run function asset:artifact/1574.sword_for_knight/onclick/3.main diff --git a/Asset/data/asset/functions/artifact/1574.sword_for_knight/onclick/3.main.mcfunction b/Asset/data/asset/functions/artifact/1574.sword_for_knight/onclick/3.main.mcfunction new file mode 100644 index 0000000000..8601752ac2 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1574.sword_for_knight/onclick/3.main.mcfunction @@ -0,0 +1,16 @@ +#> asset:artifact/1574.sword_for_knight/onclick/3.main +# +# 神器のメイン処理部 +# +# @within function asset:artifact/1574.sword_for_knight/onclick/2.check_condition + +# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う + function asset:artifact/common/use/mainhand + +# ここから先は神器側の効果の処理を書く +#演出 + playsound minecraft:block.bell.use player @s ~ ~ ~ 1 2 +# 防御 + tag @s add 1574used + data modify storage api: Argument.ID set value 1175 + execute positioned ~ ~ ~ run function api:object/summon diff --git a/Asset/data/asset/functions/artifact/1574.sword_for_knight/onclick/_index.d.mcfunction b/Asset/data/asset/functions/artifact/1574.sword_for_knight/onclick/_index.d.mcfunction new file mode 100644 index 0000000000..b9c024e783 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1574.sword_for_knight/onclick/_index.d.mcfunction @@ -0,0 +1,6 @@ +#> asset:artifact/1574.sword_for_knight/onclick/_index.d +# @private + +#> tag +# @within function asset:artifact/1574.sword_for_knight/onclick/** + #declare tag 1574used diff --git a/Asset/data/asset/functions/artifact/1574.sword_for_knight/register.mcfunction b/Asset/data/asset/functions/artifact/1574.sword_for_knight/register.mcfunction new file mode 100644 index 0000000000..dda3331919 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1574.sword_for_knight/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1574.sword_for_knight/register +# +# 神器プールへの登録処理 +# +# @within tag/function asset:artifact/register + +data modify storage asset:artifact RarityRegistry[4] append value [1574] diff --git a/Asset/data/asset/functions/artifact/1574.sword_for_knight/trigger/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1574.sword_for_knight/trigger/1.trigger.mcfunction new file mode 100644 index 0000000000..6242dd91ef --- /dev/null +++ b/Asset/data/asset/functions/artifact/1574.sword_for_knight/trigger/1.trigger.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1574.sword_for_knight/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:1574} run function asset:artifact/1574.sword_for_knight/trigger/2.check_condition diff --git a/Asset/data/asset/functions/artifact/1574.sword_for_knight/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1574.sword_for_knight/trigger/2.check_condition.mcfunction new file mode 100644 index 0000000000..f70c4492f6 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1574.sword_for_knight/trigger/2.check_condition.mcfunction @@ -0,0 +1,11 @@ +#> asset:artifact/1574.sword_for_knight/trigger/2.check_condition +# +# 神器の発動条件をチェックします +# +# @within function asset:artifact/1574.sword_for_knight/trigger/1.trigger +# 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く + function asset:artifact/common/check_condition/mainhand +# 他にアイテム等確認する場合はここに書く + +# CanUsedタグをチェックして3.main.mcfunctionを実行する + execute if entity @s[tag=CanUsed] run function asset:artifact/1574.sword_for_knight/trigger/3.main diff --git a/Asset/data/asset/functions/artifact/1574.sword_for_knight/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1574.sword_for_knight/trigger/3.main.mcfunction new file mode 100644 index 0000000000..79bfca877b --- /dev/null +++ b/Asset/data/asset/functions/artifact/1574.sword_for_knight/trigger/3.main.mcfunction @@ -0,0 +1,25 @@ +#> asset:artifact/1574.sword_for_knight/trigger/3.main +# +# 神器のメイン処理部 +# +# @within function asset:artifact/1574.sword_for_knight/trigger/2.check_condition + +# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う + function asset:artifact/common/use/mainhand + +# ここから先は神器側の効果の処理を書く +# ダメージ + + # ダメージ代入 + execute store result storage api: Argument.Damage float 1 run random value 700..900 + # 属性 + data modify storage api: Argument.AttackType set value "Physical" + data modify storage api: Argument.ElementType set value "None" + data modify storage api: Argument.FixedDamage set value 1b + data modify storage asset:artifact AttackInfo.BypassResist set value 1b + function api:damage/modifier + # ダメージを与える + execute as @e[type=#lib:living_without_player,tag=Victim,distance=..7] run function api:damage/ + +# リセット + function api:damage/reset diff --git a/Asset/data/asset/functions/object/1175.timer_of_sword_for_knight/_index.d.mcfunction b/Asset/data/asset/functions/object/1175.timer_of_sword_for_knight/_index.d.mcfunction new file mode 100644 index 0000000000..fa8122de65 --- /dev/null +++ b/Asset/data/asset/functions/object/1175.timer_of_sword_for_knight/_index.d.mcfunction @@ -0,0 +1,6 @@ +#> asset:object/1175.timer_of_sword_for_knight/_index.d +# @private + +#> tag +# @within function asset:object/1175.timer_of_sword_for_knight/** + #declare tag 1574used diff --git a/Asset/data/asset/functions/object/1175.timer_of_sword_for_knight/init/.mcfunction b/Asset/data/asset/functions/object/1175.timer_of_sword_for_knight/init/.mcfunction new file mode 100644 index 0000000000..79cf5bc654 --- /dev/null +++ b/Asset/data/asset/functions/object/1175.timer_of_sword_for_knight/init/.mcfunction @@ -0,0 +1,7 @@ +#> asset:object/1175.timer_of_sword_for_knight/init/ +# +# Objectのinit時の処理 +# +# @within asset:object/alias/1175/init +#寿命 + scoreboard players set @s 1175.Timer 40 diff --git a/Asset/data/asset/functions/object/1175.timer_of_sword_for_knight/load.mcfunction b/Asset/data/asset/functions/object/1175.timer_of_sword_for_knight/load.mcfunction new file mode 100644 index 0000000000..f3f380503a --- /dev/null +++ b/Asset/data/asset/functions/object/1175.timer_of_sword_for_knight/load.mcfunction @@ -0,0 +1,9 @@ +#> asset:object/1175.timer_of_sword_for_knight/load +# +# Objectに利用するスコアボード等の初期化処理 +# +# @within tag/function asset:object/load + +#> 定義類はここに +# @within function asset:object/1175.timer_of_sword_for_knight/** + scoreboard objectives add 1175.Timer dummy diff --git a/Asset/data/asset/functions/object/1175.timer_of_sword_for_knight/register.mcfunction b/Asset/data/asset/functions/object/1175.timer_of_sword_for_knight/register.mcfunction new file mode 100644 index 0000000000..c7d0a768ca --- /dev/null +++ b/Asset/data/asset/functions/object/1175.timer_of_sword_for_knight/register.mcfunction @@ -0,0 +1,20 @@ +#> asset:object/1175.timer_of_sword_for_knight/register +# +# Objectのデータを指定 +# +# @within function asset:object/alias/1175/register + +# 継承(オプション) + # data modify storage asset:object Extends append value + # function asset:object/extends +# 他のObjectに継承されることを許可するか (boolean) (オプション) + # data modify storage asset:object ExtendsSafe set value +# 継承されることを前提とした、抽象的なObjectであるかどうか(boolean) + data modify storage asset:object IsAbstract set value false +# Tickするかどうか(boolean) (オプション) + data modify storage asset:object IsTicking set value true + +# ID (int) + data modify storage asset:object ID set value 1175 +# フィールド(オプション) + # data modify storage asset:object Field.myValue set value diff --git a/Asset/data/asset/functions/object/1175.timer_of_sword_for_knight/summon/.mcfunction b/Asset/data/asset/functions/object/1175.timer_of_sword_for_knight/summon/.mcfunction new file mode 100644 index 0000000000..738a21026e --- /dev/null +++ b/Asset/data/asset/functions/object/1175.timer_of_sword_for_knight/summon/.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/1175.timer_of_sword_for_knight/summon/ +# +# Object召喚処理の呼び出し時に実行されるfunction +# +# @within asset:object/alias/1175/summon + +# 元となるEntityを召喚する + summon item_display ~ ~ ~ {Tags:["ObjectInit"]} diff --git a/Asset/data/asset/functions/object/1175.timer_of_sword_for_knight/summon/debug.mcfunction b/Asset/data/asset/functions/object/1175.timer_of_sword_for_knight/summon/debug.mcfunction new file mode 100644 index 0000000000..26a0ff13cd --- /dev/null +++ b/Asset/data/asset/functions/object/1175.timer_of_sword_for_knight/summon/debug.mcfunction @@ -0,0 +1,10 @@ +#> asset:object/1175.timer_of_sword_for_knight/summon/debug +# +# 動作チェック用の召喚処理 使い終わったら消してもいいかも +# +# @user +# @private + +# 召喚 + data modify storage api: Argument.ID set value 1175 + function api:object/summon \ No newline at end of file diff --git a/Asset/data/asset/functions/object/1175.timer_of_sword_for_knight/tick/.mcfunction b/Asset/data/asset/functions/object/1175.timer_of_sword_for_knight/tick/.mcfunction new file mode 100644 index 0000000000..fbb385e220 --- /dev/null +++ b/Asset/data/asset/functions/object/1175.timer_of_sword_for_knight/tick/.mcfunction @@ -0,0 +1,14 @@ +#> asset:object/1175.timer_of_sword_for_knight/tick/ +# +# Objectのtick時の処理 +# +# @within asset:object/alias/1175/tick + +# 寿命カウント + scoreboard players remove @s 1175.Timer 1 + execute as @s at @a[distance=..0.5,tag=1574used] run tp @s ~ ~ ~ +#演出 + execute if score @s 1175.Timer matches 15 run playsound minecraft:block.bell.resonate player @a[distance=..0.5,tag=1574used] ~ ~ ~ 1 2 +# 消滅処理 + execute if score @s 1175.Timer matches 0 run tag @a[distance=..0.5,tag=1574used] remove 1574used + kill @s[scores={1175.Timer=..0}] diff --git a/Asset/data/asset/functions/object/alias/1175/init.mcfunction b/Asset/data/asset/functions/object/alias/1175/init.mcfunction new file mode 100644 index 0000000000..54dc8dd4d9 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1175/init.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1175/init +# +# Init処理のエイリアス +# +# @within asset_manager:object/init/init.m + +# 元のInit処理を呼び出す + function asset:object/1175.timer_of_sword_for_knight/init/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1175/register.mcfunction b/Asset/data/asset/functions/object/alias/1175/register.mcfunction new file mode 100644 index 0000000000..5de26ba4e4 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1175/register.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1175/register +# +# Objectのデータ指定処理のエイリアス +# +# @within asset_manager:object/summon/register.m + +# 元の登録処理を呼び出す + function asset:object/1175.timer_of_sword_for_knight/register \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1175/summon.mcfunction b/Asset/data/asset/functions/object/alias/1175/summon.mcfunction new file mode 100644 index 0000000000..8efb133f7a --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1175/summon.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1175/summon +# +# Object召喚処理のエイリアス +# +# @within asset_manager:object/summon/summon.m + +# 元の召喚処理を呼び出す + function asset:object/1175.timer_of_sword_for_knight/summon/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1175/tick.mcfunction b/Asset/data/asset/functions/object/alias/1175/tick.mcfunction new file mode 100644 index 0000000000..3e5f9984fc --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1175/tick.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1175/tick +# +# Tick時処理のエイリアス +# +# @within asset_manager:object/tick/tick.m + +# 元のTick処理を呼び出す + function asset:object/1175.timer_of_sword_for_knight/tick/ \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/artifact/attack/melee.json b/Asset/data/asset/tags/functions/artifact/attack/melee.json index befbe3d3d1..5ad1bba13e 100644 --- a/Asset/data/asset/tags/functions/artifact/attack/melee.json +++ b/Asset/data/asset/tags/functions/artifact/attack/melee.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1574.sword_for_knight/trigger/1.trigger", "asset:artifact/1269.apocalypse/trigger/1.trigger", "asset:artifact/1209.sinful_scythe/trigger/1.trigger", "asset:artifact/1282.ice_axe/trigger/1.trigger", diff --git a/Asset/data/asset/tags/functions/artifact/click.carrot_on_a_stick.json b/Asset/data/asset/tags/functions/artifact/click.carrot_on_a_stick.json index 8b0fecd8b5..2dd5d39dfb 100644 --- a/Asset/data/asset/tags/functions/artifact/click.carrot_on_a_stick.json +++ b/Asset/data/asset/tags/functions/artifact/click.carrot_on_a_stick.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1574.sword_for_knight/onclick/1.trigger", "asset:artifact/1332.bebebeam/trigger/1.trigger", "asset:artifact/1306.will_o_wisp/trigger/1.trigger", "asset:artifact/1144.cradle_of_azure_moon/trigger/1.trigger", diff --git a/Asset/data/asset/tags/functions/artifact/give.json b/Asset/data/asset/tags/functions/artifact/give.json index 53b8b4582a..3222c2922e 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/1574.sword_for_knight/give/1.trigger", "asset:artifact/1366.shaved_ice_melon/give/1.trigger", "asset:artifact/1365.shaved_ice_blue_hawaii/give/1.trigger", "asset:artifact/1364.shaved_ice_strawberry/give/1.trigger", diff --git a/Asset/data/asset/tags/functions/artifact/load.json b/Asset/data/asset/tags/functions/artifact/load.json index d92cfa15a9..88dca7d6f3 100644 --- a/Asset/data/asset/tags/functions/artifact/load.json +++ b/Asset/data/asset/tags/functions/artifact/load.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1574.sword_for_knight/onclick/0.load", "asset:artifact/1332.bebebeam/trigger/0.load", "asset:artifact/1252.fox_candle/trigger/0.load", "asset:artifact/1311.yearning_rose/damage_from_entity/0.load", diff --git a/Asset/data/asset/tags/functions/artifact/register.json b/Asset/data/asset/tags/functions/artifact/register.json index c302470223..ce810ff727 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/1574.sword_for_knight/register", "asset:artifact/1365.shaved_ice_blue_hawaii/register", "asset:artifact/1366.shaved_ice_melon/register", "asset:artifact/1364.shaved_ice_strawberry/register", diff --git a/Asset/data/asset/tags/functions/object/load.json b/Asset/data/asset/tags/functions/object/load.json index 370cd7f01b..90cf16b8ce 100644 --- a/Asset/data/asset/tags/functions/object/load.json +++ b/Asset/data/asset/tags/functions/object/load.json @@ -1,5 +1,6 @@ { "values": [ + "asset:object/1175.timer_of_sword_for_knight/load", "asset:object/1061.azure_jelly/load", "asset:object/2251.wall_laser_clock/load", "asset:object/2212.eclael_upper_shot/load", @@ -58,4 +59,4 @@ "asset:object/1059.book_of_hero/load", "asset:object/2031.giant_pumpkin/load" ] -} +} \ No newline at end of file From 4f56032e978478b872f95b9231be2cafbeed92ea Mon Sep 17 00:00:00 2001 From: LeinelLacyulie Date: Sat, 11 Jul 2026 22:17:12 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=E3=82=BD=E3=83=BC=E3=83=88=E3=81=AE?= =?UTF-8?q?=E3=82=A8=E3=83=A9=E3=83=BC=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../object/1175.timer_of_sword_for_knight/tick/.mcfunction | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Asset/data/asset/functions/object/1175.timer_of_sword_for_knight/tick/.mcfunction b/Asset/data/asset/functions/object/1175.timer_of_sword_for_knight/tick/.mcfunction index fbb385e220..ff7e4214ed 100644 --- a/Asset/data/asset/functions/object/1175.timer_of_sword_for_knight/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1175.timer_of_sword_for_knight/tick/.mcfunction @@ -6,9 +6,9 @@ # 寿命カウント scoreboard players remove @s 1175.Timer 1 - execute as @s at @a[distance=..0.5,tag=1574used] run tp @s ~ ~ ~ + execute as @s at @e[type=player,tag=1574used,distance=..0.25] run tp @s ~ ~ ~ #演出 - execute if score @s 1175.Timer matches 15 run playsound minecraft:block.bell.resonate player @a[distance=..0.5,tag=1574used] ~ ~ ~ 1 2 + execute if score @s 1175.Timer matches 15 run playsound minecraft:block.bell.resonate player @e[type=player,tag=1574used,distance=..0.25] ~ ~ ~ 1 2 # 消滅処理 - execute if score @s 1175.Timer matches 0 run tag @a[distance=..0.5,tag=1574used] remove 1574used + execute if score @s 1175.Timer matches 0 run tag @e[type=player,tag=1574used,distance=..0.25] remove 1574used kill @s[scores={1175.Timer=..0}] From ea64ec6403e66e00af9ace80e03fffd5736fc45a Mon Sep 17 00:00:00 2001 From: LeinelLacyulie Date: Sat, 11 Jul 2026 22:34:34 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=E8=A1=A8=E8=A8=98=E3=81=9A=E3=82=8C?= =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifact/1574.sword_for_knight/give/2.give.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/artifact/1574.sword_for_knight/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1574.sword_for_knight/give/2.give.mcfunction index e2e37863f2..f434be49d8 100644 --- a/Asset/data/asset/functions/artifact/1574.sword_for_knight/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1574.sword_for_knight/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"騎士のための剣","color":"aqua"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text":"使用後1秒の間に受けたダメージを80%カットする。"}','{"text":"もちろんこれで殴ったっていい。"}','{"text":"剣も使いこなしてこそ騎士である。","color":"dark_gray"}'] + data modify storage asset:artifact Lore set value ['{"text":"使用後2秒の間に受けたダメージを80%カットする。"}','{"text":"もちろんこれで殴ったっていい。"}','{"text":"剣も使いこなしてこそ騎士である。","color":"dark_gray"}'] # 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション) # data modify storage asset:artifact ConsumeItem.Item set value '{"translate":"item.minecraft.stick"}' # data modify storage asset:artifact ConsumeItem.Count set value 1