From 7f75aada9f8d8a20621f6bf34a73af7d035ac3b9 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Sat, 13 Jun 2026 04:43:50 +0900 Subject: [PATCH 1/5] =?UTF-8?q?=E9=80=94=E4=B8=AD=E7=B5=8C=E9=81=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../give/1.trigger.mcfunction | 7 ++ .../1562.tsukimi_dango/give/2.give.mcfunction | 68 +++++++++++++++++++ .../1562.tsukimi_dango/register.mcfunction | 7 ++ .../trigger/1.trigger.mcfunction | 8 +++ .../trigger/2.check_condition.mcfunction | 12 ++++ .../trigger/3.main.mcfunction | 11 +++ .../asset/tags/functions/artifact/give.json | 3 +- .../tags/functions/artifact/register.json | 3 +- .../tags/functions/artifact/use_item.json | 3 +- 9 files changed, 119 insertions(+), 3 deletions(-) create mode 100644 Asset/data/asset/functions/artifact/1562.tsukimi_dango/give/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1562.tsukimi_dango/give/2.give.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1562.tsukimi_dango/register.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1562.tsukimi_dango/trigger/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1562.tsukimi_dango/trigger/2.check_condition.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1562.tsukimi_dango/trigger/3.main.mcfunction diff --git a/Asset/data/asset/functions/artifact/1562.tsukimi_dango/give/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1562.tsukimi_dango/give/1.trigger.mcfunction new file mode 100644 index 0000000000..04cdc3f8c0 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1562.tsukimi_dango/give/1.trigger.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1562.tsukimi_dango/give/1.trigger +# +# 神器の取得処理の呼び出し時に実行されるfunction +# +# @within tag/function asset:artifact/give + +execute if data storage asset:context {id:1562} run function asset:artifact/1562.tsukimi_dango/give/2.give \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1562.tsukimi_dango/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1562.tsukimi_dango/give/2.give.mcfunction new file mode 100644 index 0000000000..741c37b02c --- /dev/null +++ b/Asset/data/asset/functions/artifact/1562.tsukimi_dango/give/2.give.mcfunction @@ -0,0 +1,68 @@ +#> asset:artifact/1562.tsukimi_dango/give/2.give +# +# 神器の作成部 ここでID等を定義する +# +# @user +# @within function asset:artifact/1562.tsukimi_dango/give/1.trigger + +# 神器の説明や消費MPなどをここで設定する。 +# 最後にasset:artifact/common/giveを実行することで入手可能。 + +# 神器のID (int) スプレッドシートの値を入れる + data modify storage asset:artifact ID set value 1562 +# 神器のベースアイテム + data modify storage asset:artifact Item set value "minecraft:bread" +# 神器の名前 (TextComponentString) + data modify storage asset:artifact Name set value '{"text":"月見団子","color":"#faf0b1"}' +# 神器の説明文 (TextComponentString[]) + data modify storage asset:artifact Lore set value ['{"text":"自身に付与されたバリア量の30%分のバリアを得る"}','{"text":"(最大20、この神器の効果で得たバリアは含まない)"}'] +# 消費アイテム ({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 1 +# 神器を発動できるスロット (string) Wikiを参照 + data modify storage asset:artifact Slot set value "auto" +# 神器のトリガー (string) Wikiを参照 + data modify storage asset:artifact Trigger set value "itemUse" +# 神器の発動条件 (TextComponentString) (オプション) + # data modify storage asset:artifact Condition set value +# 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.Damage set value [0,0] +# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.AttackType set value [Physical,Magic] +# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.ElementType set value [Fire,Water,Thunder,None] +# 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.BypassResist set value +# 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.IsRangeAttack set value +# 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.AttackRange set value +# MP消費量 (int) + data modify storage asset:artifact MPCost set value 0 +# MP必要量 (int) (オプション) + # data modify storage asset:artifact MPRequire set value +# MP回復量 (int) + # data modify storage asset:artifact MPHealWhenHit set value +# 神器のクールダウン (int) (オプション) + # data modify storage asset:artifact LocalCooldown set value +# 種別クールダウン ({Type: string, Duration: int}) (オプション) + # data modify storage asset:artifact TypeCooldown.Type set value + # data modify storage asset:artifact TypeCooldown.Duration set value +# グローバルクールダウン (int) (オプション) + # data modify storage asset:artifact SpecialCooldown set value +# クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) + # data modify storage asset:artifact DisableCooldownMessage set value +# MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) + # data modify storage asset:artifact DisableMPMessage set value +# 破壊時の音を鳴らさないかどうか (boolean) (オプション) + # data modify storage asset:artifact DisableBreakSound set value +# 扱える神 (string[]) Wikiを参照 + data modify storage asset:artifact CanUsedGod set value "ALL" +# カスタム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/1562.tsukimi_dango/register.mcfunction b/Asset/data/asset/functions/artifact/1562.tsukimi_dango/register.mcfunction new file mode 100644 index 0000000000..9512cf42a9 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1562.tsukimi_dango/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1562.tsukimi_dango/register +# +# 神器プールへの登録処理 +# +# @within tag/function asset:artifact/register + +data modify storage asset:artifact RarityRegistry[4] append value [1562] \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1562.tsukimi_dango/trigger/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1562.tsukimi_dango/trigger/1.trigger.mcfunction new file mode 100644 index 0000000000..081794bd17 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1562.tsukimi_dango/trigger/1.trigger.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1562.tsukimi_dango/trigger/1.trigger +# +# 指定したイベントタイミングで実行されるfunction +# +# @within tag/function asset:artifact/** + +# storage asset:idのautoに装備している神器のIDが入っているので比較し、~/2.check_condition.mcfunctionを実行する + execute if data storage asset:context id{auto:1562} run function asset:artifact/1562.tsukimi_dango/trigger/2.check_condition \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1562.tsukimi_dango/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1562.tsukimi_dango/trigger/2.check_condition.mcfunction new file mode 100644 index 0000000000..33b31767e0 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1562.tsukimi_dango/trigger/2.check_condition.mcfunction @@ -0,0 +1,12 @@ +#> asset:artifact/1562.tsukimi_dango/trigger/2.check_condition +# +# 神器の発動条件をチェックします +# +# @within function asset:artifact/1562.tsukimi_dango/trigger/1.trigger + +# 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く + function asset:artifact/common/check_condition/auto +# 他にアイテム等確認する場合はここに書く + +# CanUsedタグをチェックして3.main.mcfunctionを実行する + execute if entity @s[tag=CanUsed] run function asset:artifact/1562.tsukimi_dango/trigger/3.main \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1562.tsukimi_dango/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1562.tsukimi_dango/trigger/3.main.mcfunction new file mode 100644 index 0000000000..55f886e141 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1562.tsukimi_dango/trigger/3.main.mcfunction @@ -0,0 +1,11 @@ +#> asset:artifact/1562.tsukimi_dango/trigger/3.main +# +# 神器のメイン処理部 +# +# @within function asset:artifact/1562.tsukimi_dango/trigger/2.check_condition + +# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う + function asset:artifact/common/use/auto + +# ここから先は神器側の効果の処理を書く + say test: 1562.tsukimi_dango \ 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 53b8b4582a..b39654c702 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/1562.tsukimi_dango/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", @@ -536,4 +537,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 c302470223..ab3485b760 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/1562.tsukimi_dango/register", "asset:artifact/1365.shaved_ice_blue_hawaii/register", "asset:artifact/1366.shaved_ice_melon/register", "asset:artifact/1364.shaved_ice_strawberry/register", @@ -314,4 +315,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/use_item.json b/Asset/data/asset/tags/functions/artifact/use_item.json index 98a8f9ea5f..c9a0a6e0f0 100644 --- a/Asset/data/asset/tags/functions/artifact/use_item.json +++ b/Asset/data/asset/tags/functions/artifact/use_item.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1562.tsukimi_dango/trigger/1.trigger", "asset:artifact/1366.shaved_ice_melon/trigger/1.trigger", "asset:artifact/1365.shaved_ice_blue_hawaii/trigger/1.trigger", "asset:artifact/1364.shaved_ice_strawberry/trigger/1.trigger", @@ -41,4 +42,4 @@ "asset:artifact/0456.potion_of_stalling_power/trigger/1.trigger", "asset:artifact/0617.blue_jelly_fragment/trigger/1.trigger" ] -} +} \ No newline at end of file From 9a97b6d7066604e877774f8a1cc3d04af4fb6797 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Sat, 13 Jun 2026 12:20:04 +0900 Subject: [PATCH 2/5] =?UTF-8?q?=E5=80=8D=E7=8E=87=E3=81=A0=E3=81=91?= =?UTF-8?q?=E5=85=88=E3=81=AB=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1562.tsukimi_dango/give/2.give.mcfunction | 2 +- .../1562.tsukimi_dango/trigger/3.main.mcfunction | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1562.tsukimi_dango/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1562.tsukimi_dango/give/2.give.mcfunction index 741c37b02c..4ac53839a7 100644 --- a/Asset/data/asset/functions/artifact/1562.tsukimi_dango/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1562.tsukimi_dango/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"月見団子","color":"#faf0b1"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text":"自身に付与されたバリア量の30%分のバリアを得る"}','{"text":"(最大20、この神器の効果で得たバリアは含まない)"}'] + data modify storage asset:artifact Lore set value ['{"text":"自身に付与されたバリア量の33.3%分のバリアを得る"}','{"text":"(最大20、この神器の効果で得たバリアは含まない)"}'] # 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション) # data modify storage asset:artifact ConsumeItem.Item set value '{"translate":"item.minecraft.stick"}' # data modify storage asset:artifact ConsumeItem.Count set value 1 diff --git a/Asset/data/asset/functions/artifact/1562.tsukimi_dango/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1562.tsukimi_dango/trigger/3.main.mcfunction index 55f886e141..fee76d257b 100644 --- a/Asset/data/asset/functions/artifact/1562.tsukimi_dango/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1562.tsukimi_dango/trigger/3.main.mcfunction @@ -8,4 +8,15 @@ function asset:artifact/common/use/auto # ここから先は神器側の効果の処理を書く - say test: 1562.tsukimi_dango \ No newline at end of file + +# バリア量取得 + function api:entity/player/absorption/calc_amount + +# バリア量のN%をバリアとする + execute store result storage api: Argument.FieldOveeride.Barribar double 0.0333 run data get storage api: Return.Absorption.Amount 1000 + +# 付与 + data modify storage api: Argument.ID set value 371 + data modify storage api: Argument.Duration set value 600 + function api:entity/mob/effect/give + function api:entity/mob/effect/reset From 4c9c561a1d24cd0525bad62b27a8bcd8f696d102 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Fri, 19 Jun 2026 18:06:33 +0900 Subject: [PATCH 3/5] =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1562.tsukimi_dango/give/2.give.mcfunction | 2 +- .../1562.tsukimi_dango/register.mcfunction | 2 +- .../trigger/3.main.mcfunction | 37 ++++++++++++++--- .../effect/0371.tsukimi/_/end.mcfunction | 7 ++++ .../effect/0371.tsukimi/_/given.mcfunction | 7 ++++ .../effect/0371.tsukimi/_/re-given.mcfunction | 7 ++++ .../effect/0371.tsukimi/_/register.mcfunction | 7 ++++ .../effect/0371.tsukimi/_/remove.mcfunction | 7 ++++ .../0371.tsukimi/barrier/add.mcfunction | 16 ++++++++ .../0371.tsukimi/barrier/break.mcfunction | 10 +++++ .../0371.tsukimi/barrier/remove.mcfunction | 12 ++++++ .../effect/0371.tsukimi/end/.mcfunction | 8 ++++ .../effect/0371.tsukimi/given/.mcfunction | 8 ++++ .../effect/0371.tsukimi/re-given/.mcfunction | 10 +++++ .../effect/0371.tsukimi/register.mcfunction | 40 +++++++++++++++++++ .../effect/0371.tsukimi/remove/.mcfunction | 8 ++++ .../data/asset/tags/functions/effect/end.json | 3 +- .../asset/tags/functions/effect/given.json | 3 +- .../asset/tags/functions/effect/re-given.json | 3 +- .../asset/tags/functions/effect/register.json | 3 +- .../asset/tags/functions/effect/remove.json | 3 +- 21 files changed, 191 insertions(+), 12 deletions(-) create mode 100644 Asset/data/asset/functions/effect/0371.tsukimi/_/end.mcfunction create mode 100644 Asset/data/asset/functions/effect/0371.tsukimi/_/given.mcfunction create mode 100644 Asset/data/asset/functions/effect/0371.tsukimi/_/re-given.mcfunction create mode 100644 Asset/data/asset/functions/effect/0371.tsukimi/_/register.mcfunction create mode 100644 Asset/data/asset/functions/effect/0371.tsukimi/_/remove.mcfunction create mode 100644 Asset/data/asset/functions/effect/0371.tsukimi/barrier/add.mcfunction create mode 100644 Asset/data/asset/functions/effect/0371.tsukimi/barrier/break.mcfunction create mode 100644 Asset/data/asset/functions/effect/0371.tsukimi/barrier/remove.mcfunction create mode 100644 Asset/data/asset/functions/effect/0371.tsukimi/end/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0371.tsukimi/given/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0371.tsukimi/re-given/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0371.tsukimi/register.mcfunction create mode 100644 Asset/data/asset/functions/effect/0371.tsukimi/remove/.mcfunction diff --git a/Asset/data/asset/functions/artifact/1562.tsukimi_dango/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1562.tsukimi_dango/give/2.give.mcfunction index 4ac53839a7..d800f3bdac 100644 --- a/Asset/data/asset/functions/artifact/1562.tsukimi_dango/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1562.tsukimi_dango/give/2.give.mcfunction @@ -58,7 +58,7 @@ # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value # 破壊時の音を鳴らさないかどうか (boolean) (オプション) - # data modify storage asset:artifact DisableBreakSound set value + data modify storage asset:artifact DisableBreakSound set value true # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value "ALL" # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) diff --git a/Asset/data/asset/functions/artifact/1562.tsukimi_dango/register.mcfunction b/Asset/data/asset/functions/artifact/1562.tsukimi_dango/register.mcfunction index 9512cf42a9..cb54f40eca 100644 --- a/Asset/data/asset/functions/artifact/1562.tsukimi_dango/register.mcfunction +++ b/Asset/data/asset/functions/artifact/1562.tsukimi_dango/register.mcfunction @@ -4,4 +4,4 @@ # # @within tag/function asset:artifact/register -data modify storage asset:artifact RarityRegistry[4] append value [1562] \ No newline at end of file +# data modify storage asset:artifact RarityRegistry[4] append value [1562] diff --git a/Asset/data/asset/functions/artifact/1562.tsukimi_dango/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1562.tsukimi_dango/trigger/3.main.mcfunction index fee76d257b..4daa696961 100644 --- a/Asset/data/asset/functions/artifact/1562.tsukimi_dango/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1562.tsukimi_dango/trigger/3.main.mcfunction @@ -9,14 +9,41 @@ # ここから先は神器側の効果の処理を書く -# バリア量取得 - function api:entity/player/absorption/calc_amount +#> Private +# @private + #declare score_holder $Max + #declare score_holder $All + #declare score_holder $Exclude -# バリア量のN%をバリアとする - execute store result storage api: Argument.FieldOveeride.Barribar double 0.0333 run data get storage api: Return.Absorption.Amount 1000 +# 演出 + playsound ogg:random.levelup player @a ~ ~ ~ 1 2 + particle dust 1 1 0.65 1 ~ ~1.2 ~ 0.4 0.4 0.4 0 30 normal @a + +# この神器によるバリア量を除外 + # 全体のバリア量取得 + function api:entity/player/absorption/calc_amount + execute store result score $All Temporary run data get storage api: Return.Absorption.Amount 1000 + # この神器によるバリア量を取得 + data modify storage api: Argument.UUID set value [I;1,3,371,0] + function api:entity/player/absorption/get + execute store result score $Exclude Temporary run data get storage api: Return.Absorption.Amount 1000 + # 全体から除外分を減らす + scoreboard players operation $All Temporary -= $Exclude Temporary + +# 最大バリア量定義(1000倍) + scoreboard players set $Max Temporary 20000 + +# (全体バリア量 - この神器のバリア)のN%をバリアとする + data modify storage api: Argument.FieldOveeride.Barrier set value 0d + execute store result storage api: Argument.FieldOverride.Barrier double 0.000333 run scoreboard players operation $All Temporary < $Max Temporary # 付与 data modify storage api: Argument.ID set value 371 data modify storage api: Argument.Duration set value 600 - function api:entity/mob/effect/give + execute unless data storage api: Argument.FieldOveeride{Barrier:0d} run function api:entity/mob/effect/give function api:entity/mob/effect/reset + +# リセット + scoreboard players reset $Max Temporary + scoreboard players reset $All Temporary + scoreboard players reset $Exclude Temporary diff --git a/Asset/data/asset/functions/effect/0371.tsukimi/_/end.mcfunction b/Asset/data/asset/functions/effect/0371.tsukimi/_/end.mcfunction new file mode 100644 index 0000000000..12e3cadb04 --- /dev/null +++ b/Asset/data/asset/functions/effect/0371.tsukimi/_/end.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0371.tsukimi/_/end +# +# Effectの効果の終了時に実行されるfunction +# +# @within tag/function asset:effect/end + +execute if data storage asset:context {id:371} run function asset:effect/0371.tsukimi/end/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0371.tsukimi/_/given.mcfunction b/Asset/data/asset/functions/effect/0371.tsukimi/_/given.mcfunction new file mode 100644 index 0000000000..ba2248595b --- /dev/null +++ b/Asset/data/asset/functions/effect/0371.tsukimi/_/given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0371.tsukimi/_/given +# +# Effectが付与された時に実行されるfunction +# +# @within tag/function asset:effect/given + +execute if data storage asset:context {id:371} run function asset:effect/0371.tsukimi/given/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0371.tsukimi/_/re-given.mcfunction b/Asset/data/asset/functions/effect/0371.tsukimi/_/re-given.mcfunction new file mode 100644 index 0000000000..807f1a02c0 --- /dev/null +++ b/Asset/data/asset/functions/effect/0371.tsukimi/_/re-given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0371.tsukimi/_/re-given +# +# Effectが上書きされた時に実行されるfunction +# +# @within tag/function asset:effect/re-given + +execute if data storage asset:context {id:371} run function asset:effect/0371.tsukimi/re-given/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0371.tsukimi/_/register.mcfunction b/Asset/data/asset/functions/effect/0371.tsukimi/_/register.mcfunction new file mode 100644 index 0000000000..f9d1f4c7e0 --- /dev/null +++ b/Asset/data/asset/functions/effect/0371.tsukimi/_/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0371.tsukimi/_/register +# +# +# +# @within tag/function asset:effect/register + +execute if data storage asset:context {id:371} run function asset:effect/0371.tsukimi/register \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0371.tsukimi/_/remove.mcfunction b/Asset/data/asset/functions/effect/0371.tsukimi/_/remove.mcfunction new file mode 100644 index 0000000000..6932301da3 --- /dev/null +++ b/Asset/data/asset/functions/effect/0371.tsukimi/_/remove.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0371.tsukimi/_/remove +# +# Effectが神器や牛乳によって削除された時に実行されるfunction +# +# @within tag/function asset:effect/remove + +execute if data storage asset:context {id:371} run function asset:effect/0371.tsukimi/remove/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0371.tsukimi/barrier/add.mcfunction b/Asset/data/asset/functions/effect/0371.tsukimi/barrier/add.mcfunction new file mode 100644 index 0000000000..698651703b --- /dev/null +++ b/Asset/data/asset/functions/effect/0371.tsukimi/barrier/add.mcfunction @@ -0,0 +1,16 @@ +#> asset:effect/0371.tsukimi/barrier/add +# +# +# +# @within function +# asset:effect/0371.tsukimi/given/ +# asset:effect/0371.tsukimi/re-given/ + +# バリア設定 + data modify storage api: Argument.Amount set from storage asset:context this.Barrier + data modify storage api: Argument.UUID set from storage asset:context this.UUID + data modify storage api: Argument.Priority set value 1 + data modify storage api: Argument.WipedCallback set value "asset:effect/0371.tsukimi/barrier/break" + function api:entity/player/absorption/add + +tellraw @a {"storage":"asset:context","nbt":"this"} diff --git a/Asset/data/asset/functions/effect/0371.tsukimi/barrier/break.mcfunction b/Asset/data/asset/functions/effect/0371.tsukimi/barrier/break.mcfunction new file mode 100644 index 0000000000..7fb9ec882f --- /dev/null +++ b/Asset/data/asset/functions/effect/0371.tsukimi/barrier/break.mcfunction @@ -0,0 +1,10 @@ +#> asset:effect/0371.tsukimi/barrier/break +# +# +# +# @within function lib:score_to_health_wrapper/core/absorb_damage/call_wiped_callback.m + +# このエフェクトを削除 + data modify storage api: Argument.ID set value 371 + function api:entity/mob/effect/remove/from_id + function api:entity/mob/effect/reset diff --git a/Asset/data/asset/functions/effect/0371.tsukimi/barrier/remove.mcfunction b/Asset/data/asset/functions/effect/0371.tsukimi/barrier/remove.mcfunction new file mode 100644 index 0000000000..a52c7ba4d7 --- /dev/null +++ b/Asset/data/asset/functions/effect/0371.tsukimi/barrier/remove.mcfunction @@ -0,0 +1,12 @@ +#> asset:effect/0371.tsukimi/barrier/remove +# +# +# +# @within function +# asset:effect/0371.tsukimi/end/ +# asset:effect/0371.tsukimi/re-given/ +# asset:effect/0371.tsukimi/remove/ + +# バリアを削除する + data modify storage api: Argument.UUID set from storage asset:context this.UUID + function api:entity/player/absorption/remove diff --git a/Asset/data/asset/functions/effect/0371.tsukimi/end/.mcfunction b/Asset/data/asset/functions/effect/0371.tsukimi/end/.mcfunction new file mode 100644 index 0000000000..a646d60133 --- /dev/null +++ b/Asset/data/asset/functions/effect/0371.tsukimi/end/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0371.tsukimi/end/ +# +# Effectの効果が切れた時の処理 +# +# @within function asset:effect/0371.tsukimi/_/end + +# 削除 + function asset:effect/0371.tsukimi/barrier/remove diff --git a/Asset/data/asset/functions/effect/0371.tsukimi/given/.mcfunction b/Asset/data/asset/functions/effect/0371.tsukimi/given/.mcfunction new file mode 100644 index 0000000000..7567e6c868 --- /dev/null +++ b/Asset/data/asset/functions/effect/0371.tsukimi/given/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0371.tsukimi/given/ +# +# Effectが付与された時の処理 +# +# @within function asset:effect/0371.tsukimi/_/given + +# 付与 + function asset:effect/0371.tsukimi/barrier/add diff --git a/Asset/data/asset/functions/effect/0371.tsukimi/re-given/.mcfunction b/Asset/data/asset/functions/effect/0371.tsukimi/re-given/.mcfunction new file mode 100644 index 0000000000..9f231483d9 --- /dev/null +++ b/Asset/data/asset/functions/effect/0371.tsukimi/re-given/.mcfunction @@ -0,0 +1,10 @@ +#> asset:effect/0371.tsukimi/re-given/ +# +# Effectが上書きされた時の処理 +# +# @within function asset:effect/0371.tsukimi/_/re-given + +# 削除 + function asset:effect/0371.tsukimi/barrier/remove +# 付与 + function asset:effect/0371.tsukimi/barrier/add diff --git a/Asset/data/asset/functions/effect/0371.tsukimi/register.mcfunction b/Asset/data/asset/functions/effect/0371.tsukimi/register.mcfunction new file mode 100644 index 0000000000..ceb7c8df5e --- /dev/null +++ b/Asset/data/asset/functions/effect/0371.tsukimi/register.mcfunction @@ -0,0 +1,40 @@ +#> asset:effect/0371.tsukimi/register +# +# Effectのデータを指定 +# +# @within function asset:effect/0371.tsukimi/_/register + +# ExtendsSafe (boolean) (default = false) + # data modify storage asset:effect ExtendsSafe set value true +# ID (int) + data modify storage asset:effect ID set value 371 +# 名前 (TextComponentString) + data modify storage asset:effect Name set value '{"text":"お月見","color":"#faf0b1"}' +# 説明文 (TextComponentString[]) + data modify storage asset:effect Description set value ['{"text":"バリアを得る","color":"white"}'] +# 効果時間 (int) (default = API || error) + # data modify storage asset:effect Duration set value +# スタック (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 1 +# 悪い効果か否か (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 false + +# フィールド + data modify storage asset:effect Field.UUID set value [I;1,3,371,0] + data modify storage asset:effect Field.Barrier set value 1d diff --git a/Asset/data/asset/functions/effect/0371.tsukimi/remove/.mcfunction b/Asset/data/asset/functions/effect/0371.tsukimi/remove/.mcfunction new file mode 100644 index 0000000000..00391747c7 --- /dev/null +++ b/Asset/data/asset/functions/effect/0371.tsukimi/remove/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0371.tsukimi/remove/ +# +# Effectが削除された時の処理 +# +# @within function asset:effect/0371.tsukimi/_/remove + +# 削除 + function asset:effect/0371.tsukimi/barrier/remove diff --git a/Asset/data/asset/tags/functions/effect/end.json b/Asset/data/asset/tags/functions/effect/end.json index 1a5597bf84..a98b98ebc7 100644 --- a/Asset/data/asset/tags/functions/effect/end.json +++ b/Asset/data/asset/tags/functions/effect/end.json @@ -1,5 +1,6 @@ { "values": [ + "asset:effect/0371.tsukimi/_/end", "asset:effect/0348.cool_feeling/_/end", "asset:effect/0356.dolphin_blessing/_/end", "asset:effect/0302.safety_check_complete/_/end", @@ -109,4 +110,4 @@ "asset:effect/0007.defense_base_debuff/_/end", "asset:effect/0258.spirit_melody/_/end" ] -} +} \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/effect/given.json b/Asset/data/asset/tags/functions/effect/given.json index e777db47b0..c8cd8f0846 100644 --- a/Asset/data/asset/tags/functions/effect/given.json +++ b/Asset/data/asset/tags/functions/effect/given.json @@ -1,5 +1,6 @@ { "values": [ + "asset:effect/0371.tsukimi/_/given", "asset:effect/0348.cool_feeling/_/given", "asset:effect/0302.safety_check_complete/_/given", "asset:effect/0346.lunatic_time/_/given", @@ -103,4 +104,4 @@ "asset:effect/0007.defense_base_debuff/_/given", "asset:effect/0258.spirit_melody/_/given" ] -} +} \ 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 344d5ff7a5..1a963f5001 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/0371.tsukimi/_/re-given", "asset:effect/0348.cool_feeling/_/re-given", "asset:effect/0352.kitsunebi/_/re-given", "asset:effect/0345.topaz_protection/_/re-given", @@ -61,4 +62,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 6b9eed8b15..ac6f0f8144 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/0371.tsukimi/_/register", "asset:effect/0348.cool_feeling/_/register", "asset:effect/0356.dolphin_blessing/_/register", "asset:effect/0302.safety_check_complete/_/register", @@ -179,4 +180,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/remove.json b/Asset/data/asset/tags/functions/effect/remove.json index ab5facfcfd..8dd5210b10 100644 --- a/Asset/data/asset/tags/functions/effect/remove.json +++ b/Asset/data/asset/tags/functions/effect/remove.json @@ -1,5 +1,6 @@ { "values": [ + "asset:effect/0371.tsukimi/_/remove", "asset:effect/0348.cool_feeling/_/remove", "asset:effect/0356.dolphin_blessing/_/remove", "asset:effect/0302.safety_check_complete/_/remove", @@ -117,4 +118,4 @@ "asset:effect/0007.defense_base_debuff/_/remove", "asset:effect/0258.spirit_melody/_/remove" ] -} +} \ No newline at end of file From 1ad2ad919a27904bbf87d4cace936f9cea6d2510 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Sat, 20 Jun 2026 01:16:52 +0900 Subject: [PATCH 4/5] =?UTF-8?q?typo=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/1562.tsukimi_dango/trigger/3.main.mcfunction | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1562.tsukimi_dango/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1562.tsukimi_dango/trigger/3.main.mcfunction index 4daa696961..b21cc7b2ca 100644 --- a/Asset/data/asset/functions/artifact/1562.tsukimi_dango/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1562.tsukimi_dango/trigger/3.main.mcfunction @@ -34,13 +34,13 @@ scoreboard players set $Max Temporary 20000 # (全体バリア量 - この神器のバリア)のN%をバリアとする - data modify storage api: Argument.FieldOveeride.Barrier set value 0d + data modify storage api: Argument.FieldOverride.Barrier set value 0d execute store result storage api: Argument.FieldOverride.Barrier double 0.000333 run scoreboard players operation $All Temporary < $Max Temporary # 付与 data modify storage api: Argument.ID set value 371 data modify storage api: Argument.Duration set value 600 - execute unless data storage api: Argument.FieldOveeride{Barrier:0d} run function api:entity/mob/effect/give + execute unless data storage api: Argument.FieldOverride{Barrier:0d} run function api:entity/mob/effect/give function api:entity/mob/effect/reset # リセット From 4749266158fdf9745551af7cf2192a4f9ce4b789 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Sat, 20 Jun 2026 01:17:36 +0900 Subject: [PATCH 5/5] =?UTF-8?q?=E3=83=87=E3=83=90=E3=83=83=E3=82=B0?= =?UTF-8?q?=E7=94=A8=E3=82=B3=E3=83=9E=E3=83=B3=E3=83=89=E3=82=92=E5=89=8A?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../asset/functions/effect/0371.tsukimi/barrier/add.mcfunction | 2 -- 1 file changed, 2 deletions(-) diff --git a/Asset/data/asset/functions/effect/0371.tsukimi/barrier/add.mcfunction b/Asset/data/asset/functions/effect/0371.tsukimi/barrier/add.mcfunction index 698651703b..95fe13cb81 100644 --- a/Asset/data/asset/functions/effect/0371.tsukimi/barrier/add.mcfunction +++ b/Asset/data/asset/functions/effect/0371.tsukimi/barrier/add.mcfunction @@ -12,5 +12,3 @@ data modify storage api: Argument.Priority set value 1 data modify storage api: Argument.WipedCallback set value "asset:effect/0371.tsukimi/barrier/break" function api:entity/player/absorption/add - -tellraw @a {"storage":"asset:context","nbt":"this"}