From f90809822e8d84fb507020d91d4ae6d64138e4a2 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Wed, 18 Feb 2026 00:39:49 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../give/1.trigger.mcfunction | 7 ++ .../1370.matcha_latte/give/2.give.mcfunction | 68 +++++++++++++++++++ .../1370.matcha_latte/register.mcfunction | 8 +++ .../trigger/1.trigger.mcfunction | 8 +++ .../trigger/2.check_condition.mcfunction | 12 ++++ .../trigger/3.main.mcfunction | 34 ++++++++++ .../asset/tags/functions/artifact/give.json | 3 +- .../tags/functions/artifact/register.json | 3 +- .../tags/functions/artifact/use_item.json | 1 + 9 files changed, 142 insertions(+), 2 deletions(-) create mode 100644 Asset/data/asset/functions/artifact/1370.matcha_latte/give/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1370.matcha_latte/give/2.give.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1370.matcha_latte/register.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1370.matcha_latte/trigger/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1370.matcha_latte/trigger/2.check_condition.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1370.matcha_latte/trigger/3.main.mcfunction diff --git a/Asset/data/asset/functions/artifact/1370.matcha_latte/give/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1370.matcha_latte/give/1.trigger.mcfunction new file mode 100644 index 00000000000..3f52e1471e1 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1370.matcha_latte/give/1.trigger.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1370.matcha_latte/give/1.trigger +# +# 神器の取得処理の呼び出し時に実行されるfunction +# +# @within tag/function asset:artifact/give + +execute if data storage asset:context {id:1370} run function asset:artifact/1370.matcha_latte/give/2.give \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1370.matcha_latte/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1370.matcha_latte/give/2.give.mcfunction new file mode 100644 index 00000000000..bd883219d49 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1370.matcha_latte/give/2.give.mcfunction @@ -0,0 +1,68 @@ +#> asset:artifact/1370.matcha_latte/give/2.give +# +# 神器の作成部 ここでID等を定義する +# +# @user +# @within function asset:artifact/1370.matcha_latte/give/1.trigger + +# 神器の説明や消費MPなどをここで設定する。 +# 最後にasset:artifact/common/giveを実行することで入手可能。 + +# 神器のID (int) スプレッドシートの値を入れる + data modify storage asset:artifact ID set value 1370 +# 神器のベースアイテム + data modify storage asset:artifact Item set value "minecraft:honey_bottle" +# 神器の名前 (TextComponentString) + data modify storage asset:artifact Name set value '{"text":"抹茶ラテ","color":"#6e9937"}' +# 神器の説明文 (TextComponentString[]) + data modify storage asset:artifact Lore set value ['{"text":"MPを20~30%回復する","color":"white"}','{"text":"この利休にまっ茶ラテを作れと！","color":"gray"}'] +# 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション) + # data modify storage asset:artifact ConsumeItem.Item set value '{"translate":"item.minecraft.stick"}' + # data modify storage asset:artifact ConsumeItem.Count set value 1 + # data modify storage asset:artifact ConsumeItem.Extra set value +# 使用回数 (int) (オプション) + data modify storage asset:artifact RemainingCount set value 3 +# 神器を発動できるスロット (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 "heal" + data modify storage asset:artifact TypeCooldown.Duration set value 60 +# グローバルクールダウン (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 true +# 扱える神 (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/1370.matcha_latte/register.mcfunction b/Asset/data/asset/functions/artifact/1370.matcha_latte/register.mcfunction new file mode 100644 index 00000000000..d573c32100c --- /dev/null +++ b/Asset/data/asset/functions/artifact/1370.matcha_latte/register.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1370.matcha_latte/register +# +# 神器プールへの登録処理 +# +# @within tag/function asset:artifact/register + +# 日替わり商人に突っ込む予定 +# data modify storage asset:artifact RarityRegistry[1] append value [1370] diff --git a/Asset/data/asset/functions/artifact/1370.matcha_latte/trigger/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1370.matcha_latte/trigger/1.trigger.mcfunction new file mode 100644 index 00000000000..a5c0612ad61 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1370.matcha_latte/trigger/1.trigger.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1370.matcha_latte/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:1370} run function asset:artifact/1370.matcha_latte/trigger/2.check_condition \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1370.matcha_latte/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1370.matcha_latte/trigger/2.check_condition.mcfunction new file mode 100644 index 00000000000..9ff05099556 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1370.matcha_latte/trigger/2.check_condition.mcfunction @@ -0,0 +1,12 @@ +#> asset:artifact/1370.matcha_latte/trigger/2.check_condition +# +# 神器の発動条件をチェックします +# +# @within function asset:artifact/1370.matcha_latte/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/1370.matcha_latte/trigger/3.main \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1370.matcha_latte/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1370.matcha_latte/trigger/3.main.mcfunction new file mode 100644 index 00000000000..ea113350b61 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1370.matcha_latte/trigger/3.main.mcfunction @@ -0,0 +1,34 @@ +#> asset:artifact/1370.matcha_latte/trigger/3.main +# +# 神器のメイン処理部 +# +# @within function asset:artifact/1370.matcha_latte/trigger/2.check_condition + +# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う + function asset:artifact/common/use/auto + +# ここから先は神器側の効果の処理を書く + +#> Private +# @private + #declare score_holder $Random + #declare score_holder $MaxMP + +# 演出 + particle dust 0.4 0.6 0.2 1 ~ ~1.2 ~ 0.4 0.4 0.4 0 20 + playsound disabled_sounds:entity.player.levelup player @a ~ ~ ~ 1 2 + +# 乱数 + execute store result score $Random Temporary run random value 20..30 + +# 最大MPを取得 + function api:mp/get_max + execute store result score $MaxMP Temporary run data get storage api: Return.MaxMP + +# MP割合回復 + execute store result storage api: Argument.Fluctuation float 0.01 run scoreboard players operation $Random Temporary *= $MaxMP Temporary + function api:mp/fluctuation + +# リセット + scoreboard players reset $Random Temporary + scoreboard players reset $MaxMP Temporary diff --git a/Asset/data/asset/tags/functions/artifact/give.json b/Asset/data/asset/tags/functions/artifact/give.json index f3eb0088574..7469c814c50 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/1370.matcha_latte/give/1.trigger", "asset:artifact/1140.over_pulse_booster/give/1.trigger", "asset:artifact/1139.over_pulse_legframe/give/1.trigger", "asset:artifact/1138.over_pulse_bodyarmor/give/1.trigger", @@ -517,4 +518,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 deba1661508..5eabbbb7a1c 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/1370.matcha_latte/register", "asset:artifact/1137.over_pulse_headgear/register", "asset:artifact/1228.fatalerror/register", "asset:artifact/1273.maidchan_plush/register", @@ -295,4 +296,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 1550db24f21..f5be4c15c58 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/1370.matcha_latte/trigger/1.trigger", "asset:artifact/0185.increased_cookie/trigger/1.trigger", "asset:artifact/1116.honey_tart/trigger/1.trigger", "asset:artifact/1115.pain_chocolate/trigger/1.trigger", From 11c8b0d9a6b4226f61ac2d466d7dc200aa88a4d1 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Wed, 18 Feb 2026 00:55:40 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=E8=AA=BF=E6=95=B4=E7=94=A8=E3=83=A1?= =?UTF-8?q?=E3=83=A2=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifact/1370.matcha_latte/trigger/3.main.mcfunction | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Asset/data/asset/functions/artifact/1370.matcha_latte/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1370.matcha_latte/trigger/3.main.mcfunction index ea113350b61..e50c4df0076 100644 --- a/Asset/data/asset/functions/artifact/1370.matcha_latte/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1370.matcha_latte/trigger/3.main.mcfunction @@ -14,6 +14,8 @@ #declare score_holder $Random #declare score_holder $MaxMP +# そこそこ回復のブレでかくして安定しないMP回復的な感じでもいい + # 演出 particle dust 0.4 0.6 0.2 1 ~ ~1.2 ~ 0.4 0.4 0.4 0 20 playsound disabled_sounds:entity.player.levelup player @a ~ ~ ~ 1 2