From 6c6954d1068b2a376b17271b6278403350e7ae76 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Wed, 31 Dec 2025 10:31:09 +0900 Subject: [PATCH 1/9] =?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 ++ .../1360.vintage_wine/give/2.give.mcfunction | 68 +++++++++++++++++++ .../1360.vintage_wine/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/1360.vintage_wine/give/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1360.vintage_wine/give/2.give.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1360.vintage_wine/register.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1360.vintage_wine/trigger/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1360.vintage_wine/trigger/2.check_condition.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1360.vintage_wine/trigger/3.main.mcfunction diff --git a/Asset/data/asset/functions/artifact/1360.vintage_wine/give/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1360.vintage_wine/give/1.trigger.mcfunction new file mode 100644 index 0000000000..afa78e5b83 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1360.vintage_wine/give/1.trigger.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1360.vintage_wine/give/1.trigger +# +# 神器の取得処理の呼び出し時に実行されるfunction +# +# @within tag/function asset:artifact/give + +execute if data storage asset:context {id:1360} run function asset:artifact/1360.vintage_wine/give/2.give \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1360.vintage_wine/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1360.vintage_wine/give/2.give.mcfunction new file mode 100644 index 0000000000..d0960b0cf2 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1360.vintage_wine/give/2.give.mcfunction @@ -0,0 +1,68 @@ +#> asset:artifact/1360.vintage_wine/give/2.give +# +# 神器の作成部 ここでID等を定義する +# +# @user +# @within function asset:artifact/1360.vintage_wine/give/1.trigger + +# 神器の説明や消費MPなどをここで設定する。 +# 最後にasset:artifact/common/giveを実行することで入手可能。 + +# 神器のID (int) スプレッドシートの値を入れる + data modify storage asset:artifact ID set value 1360 +# 神器のベースアイテム + data modify storage asset:artifact Item set value "minecraft:honey_bottle" +# 神器の名前 (TextComponentString) + data modify storage asset:artifact Name set value '{"text":"ヴィンテージ・ワイン","color":"#b33e5c"}' +# 神器の説明文 (TextComponentString[]) + data modify storage asset:artifact Lore set value ['{"text":"体力を失った体力の30%分回復する","color":"white"}'] +# 消費アイテム ({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 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/1360.vintage_wine/register.mcfunction b/Asset/data/asset/functions/artifact/1360.vintage_wine/register.mcfunction new file mode 100644 index 0000000000..6b06f264c0 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1360.vintage_wine/register.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1360.vintage_wine/register +# +# 神器プールへの登録処理 +# +# @within tag/function asset:artifact/register + +# 日替わり商人に売らせる予定(Lv2?) +# data modify storage asset:artifact RarityRegistry[1] append value [1360] diff --git a/Asset/data/asset/functions/artifact/1360.vintage_wine/trigger/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1360.vintage_wine/trigger/1.trigger.mcfunction new file mode 100644 index 0000000000..70c3d2cbcc --- /dev/null +++ b/Asset/data/asset/functions/artifact/1360.vintage_wine/trigger/1.trigger.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1360.vintage_wine/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:1360} run function asset:artifact/1360.vintage_wine/trigger/2.check_condition diff --git a/Asset/data/asset/functions/artifact/1360.vintage_wine/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1360.vintage_wine/trigger/2.check_condition.mcfunction new file mode 100644 index 0000000000..8105c9f7a7 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1360.vintage_wine/trigger/2.check_condition.mcfunction @@ -0,0 +1,12 @@ +#> asset:artifact/1360.vintage_wine/trigger/2.check_condition +# +# 神器の発動条件をチェックします +# +# @within function asset:artifact/1360.vintage_wine/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/1360.vintage_wine/trigger/3.main diff --git a/Asset/data/asset/functions/artifact/1360.vintage_wine/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1360.vintage_wine/trigger/3.main.mcfunction new file mode 100644 index 0000000000..635e767f99 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1360.vintage_wine/trigger/3.main.mcfunction @@ -0,0 +1,34 @@ +#> asset:artifact/1360.vintage_wine/trigger/3.main +# +# 神器のメイン処理部 +# +# @within function asset:artifact/1360.vintage_wine/trigger/2.check_condition + +# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う + function asset:artifact/common/use/auto + +# ここから先は神器側の効果の処理を書く + +#> Val +# @private + #declare score_holder $MaxHealth + #declare score_holder $CurHealth + +# 失った体力の5%分回復 + +# 現在/最大体力を取得する(100倍) + function api:data_get/health + execute store result score $CurHealth Temporary run data get storage api: Health 100 + function api:modifier/max_health/get + execute store result score $MaxHealth Temporary run data get storage api: Return.MaxHealth 100 + +# 失った体力(100倍)を計算し回復する +# 失った体力(100倍)のN%を回復量にする + scoreboard players operation $MaxHealth Temporary -= $CurHealth Temporary + execute store result storage api: Argument.Heal double 0.003 run scoreboard players get $MaxHealth Temporary + function api:heal/ + function api:heal/reset + +# リセット + scoreboard players reset $MaxHealth Temporary + scoreboard players reset $CurHealth Temporary diff --git a/Asset/data/asset/tags/functions/artifact/give.json b/Asset/data/asset/tags/functions/artifact/give.json index f3eb008857..ee53eb004e 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/1360.vintage_wine/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 deba166150..697c04bb15 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/1360.vintage_wine/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 1550db24f2..b4b8c5b252 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/1360.vintage_wine/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 4491f3dfd5ce2d198ea24c1337f951f9aadb30ac Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Thu, 1 Jan 2026 15:18:34 +0900 Subject: [PATCH 2/9] =?UTF-8?q?=E6=9A=AB=E5=AE=9A=E7=9A=84=E3=81=ABLore?= =?UTF-8?q?=E3=82=92=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/artifact/1360.vintage_wine/give/2.give.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/artifact/1360.vintage_wine/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1360.vintage_wine/give/2.give.mcfunction index d0960b0cf2..89402a87cb 100644 --- a/Asset/data/asset/functions/artifact/1360.vintage_wine/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1360.vintage_wine/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"ヴィンテージ・ワイン","color":"#b33e5c"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text":"体力を失った体力の30%分回復する","color":"white"}'] + data modify storage asset:artifact Lore set value ['{"text":"失った体力の30%分体力を回復する","color":"white"}'] # 消費アイテム ({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 From 5c3951dfbee6fcb9f26f32de350c9bec535682e9 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Sat, 23 May 2026 01:15:35 +0900 Subject: [PATCH 3/9] =?UTF-8?q?=E6=B6=88=E3=81=88=E3=81=9FAPI=E3=82=92?= =?UTF-8?q?=E7=94=A8=E3=81=84=E3=81=AA=E3=81=84=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/1360.vintage_wine/trigger/3.main.mcfunction | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1360.vintage_wine/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1360.vintage_wine/trigger/3.main.mcfunction index 635e767f99..4b58f8b23f 100644 --- a/Asset/data/asset/functions/artifact/1360.vintage_wine/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1360.vintage_wine/trigger/3.main.mcfunction @@ -19,8 +19,7 @@ # 現在/最大体力を取得する(100倍) function api:data_get/health execute store result score $CurHealth Temporary run data get storage api: Health 100 - function api:modifier/max_health/get - execute store result score $MaxHealth Temporary run data get storage api: Return.MaxHealth 100 + execute store result score $MaxHealth Temporary run attribute @s generic.max_health get 100 # 失った体力(100倍)を計算し回復する # 失った体力(100倍)のN%を回復量にする From 1a4966a46fc6c59b93e64983784fa0ab62544f28 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Sat, 23 May 2026 01:15:49 +0900 Subject: [PATCH 4/9] =?UTF-8?q?=E4=B8=8D=E8=A6=81=E3=81=AA=E3=82=B3?= =?UTF-8?q?=E3=83=A1=E3=83=B3=E3=83=88=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifact/1360.vintage_wine/trigger/3.main.mcfunction | 2 -- 1 file changed, 2 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1360.vintage_wine/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1360.vintage_wine/trigger/3.main.mcfunction index 4b58f8b23f..dfe26081de 100644 --- a/Asset/data/asset/functions/artifact/1360.vintage_wine/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1360.vintage_wine/trigger/3.main.mcfunction @@ -14,8 +14,6 @@ #declare score_holder $MaxHealth #declare score_holder $CurHealth -# 失った体力の5%分回復 - # 現在/最大体力を取得する(100倍) function api:data_get/health execute store result score $CurHealth Temporary run data get storage api: Health 100 From 154f07ece01718120a4ce1a81d374b860d1de077 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Tue, 9 Jun 2026 00:22:57 +0900 Subject: [PATCH 5/9] =?UTF-8?q?Lore=E3=82=92=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/artifact/1360.vintage_wine/give/2.give.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/artifact/1360.vintage_wine/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1360.vintage_wine/give/2.give.mcfunction index 89402a87cb..d0960b0cf2 100644 --- a/Asset/data/asset/functions/artifact/1360.vintage_wine/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1360.vintage_wine/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"ヴィンテージ・ワイン","color":"#b33e5c"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text":"失った体力の30%分体力を回復する","color":"white"}'] + data modify storage asset:artifact Lore set value ['{"text":"体力を失った体力の30%分回復する","color":"white"}'] # 消費アイテム ({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 From 422209a6a363dbe3738aaa93774abf0ebb94511e Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Tue, 9 Jun 2026 00:50:30 +0900 Subject: [PATCH 6/9] =?UTF-8?q?=E5=90=8D=E5=89=8D=E3=81=AE=E8=89=B2?= =?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 --- .../functions/artifact/1360.vintage_wine/give/2.give.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/artifact/1360.vintage_wine/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1360.vintage_wine/give/2.give.mcfunction index d0960b0cf2..8244de1217 100644 --- a/Asset/data/asset/functions/artifact/1360.vintage_wine/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1360.vintage_wine/give/2.give.mcfunction @@ -13,7 +13,7 @@ # 神器のベースアイテム data modify storage asset:artifact Item set value "minecraft:honey_bottle" # 神器の名前 (TextComponentString) - data modify storage asset:artifact Name set value '{"text":"ヴィンテージ・ワイン","color":"#b33e5c"}' + data modify storage asset:artifact Name set value '{"text":"ヴィンテージ・ワイン","color":"#d93d64"}' # 神器の説明文 (TextComponentString[]) data modify storage asset:artifact Lore set value ['{"text":"体力を失った体力の30%分回復する","color":"white"}'] # 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション) From 451d98810770ed8a23fa99bd0e773e483308552f Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Tue, 9 Jun 2026 02:05:14 +0900 Subject: [PATCH 7/9] =?UTF-8?q?[Effect=20369]=20=C3=89levage=E3=82=92?= =?UTF-8?q?=E4=BD=9C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../effect/0369.elevage/_/register.mcfunction | 7 ++++ .../effect/0369.elevage/register.mcfunction | 39 +++++++++++++++++++ .../asset/tags/functions/effect/register.json | 3 +- 3 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 Asset/data/asset/functions/effect/0369.elevage/_/register.mcfunction create mode 100644 Asset/data/asset/functions/effect/0369.elevage/register.mcfunction diff --git a/Asset/data/asset/functions/effect/0369.elevage/_/register.mcfunction b/Asset/data/asset/functions/effect/0369.elevage/_/register.mcfunction new file mode 100644 index 0000000000..5e22fac181 --- /dev/null +++ b/Asset/data/asset/functions/effect/0369.elevage/_/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0369.elevage/_/register +# +# +# +# @within tag/function asset:effect/register + +execute if data storage asset:context {id:369} run function asset:effect/0369.elevage/register \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0369.elevage/register.mcfunction b/Asset/data/asset/functions/effect/0369.elevage/register.mcfunction new file mode 100644 index 0000000000..049c511206 --- /dev/null +++ b/Asset/data/asset/functions/effect/0369.elevage/register.mcfunction @@ -0,0 +1,39 @@ +#> asset:effect/0369.elevage/register +# +# Effectのデータを指定 +# +# @within function asset:effect/0369.elevage/_/register + +# ExtendsSafe (boolean) (default = false) + # data modify storage asset:effect ExtendsSafe set value true +# ID (int) + data modify storage asset:effect ID set value 369 +# 名前 (TextComponentString) + data modify storage asset:effect Name set value '{"text":"Élevage","color":"#d93d64"}' +# 説明文 (TextComponentString[]) + data modify storage asset:effect Description set value ['{"text":"ヴィンテージ・ワインの回復量が上昇する"}'] +# 効果時間 (int) (default = API || error) + data modify storage asset:effect Duration set value 1 +# スタック (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 set value {} diff --git a/Asset/data/asset/tags/functions/effect/register.json b/Asset/data/asset/tags/functions/effect/register.json index 6b88781689..38fe395d59 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/0369.elevage/_/register", "asset:effect/0302.safety_check_complete/_/register", "asset:effect/0346.lunatic_time/_/register", "asset:effect/0352.kitsunebi/_/register", @@ -177,4 +178,4 @@ "asset:effect/0007.defense_base_debuff/_/register", "asset:effect/0258.spirit_melody/_/register" ] -} +} \ No newline at end of file From 49aaf578d73b1473e7d8e99d4f529bf78ac2c9b0 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Tue, 9 Jun 2026 03:02:58 +0900 Subject: [PATCH 8/9] =?UTF-8?q?=E6=80=A7=E8=83=BD=E3=82=92=E5=88=A5?= =?UTF-8?q?=E7=89=A9=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1360.vintage_wine/give/2.give.mcfunction | 4 +- .../tick/1.trigger.mcfunction | 8 ++++ .../tick/2.check_condition.mcfunction | 15 +++++++ .../1360.vintage_wine/tick/3.main.mcfunction | 37 ++++++++++++++++++ .../trigger/1.trigger.mcfunction | 8 ---- .../trigger/3.main.mcfunction | 31 --------------- .../use_item/1.trigger.mcfunction | 8 ++++ .../2.check_condition.mcfunction | 8 ++-- .../use_item/3.main.mcfunction | 39 +++++++++++++++++++ .../asset/tags/functions/artifact/tick.json | 1 + .../tags/functions/artifact/use_item.json | 2 +- 11 files changed, 115 insertions(+), 46 deletions(-) create mode 100644 Asset/data/asset/functions/artifact/1360.vintage_wine/tick/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1360.vintage_wine/tick/2.check_condition.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1360.vintage_wine/tick/3.main.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/1360.vintage_wine/trigger/1.trigger.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/1360.vintage_wine/trigger/3.main.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1360.vintage_wine/use_item/1.trigger.mcfunction rename Asset/data/asset/functions/artifact/1360.vintage_wine/{trigger => use_item}/2.check_condition.mcfunction (60%) create mode 100644 Asset/data/asset/functions/artifact/1360.vintage_wine/use_item/3.main.mcfunction diff --git a/Asset/data/asset/functions/artifact/1360.vintage_wine/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1360.vintage_wine/give/2.give.mcfunction index 8244de1217..83da352664 100644 --- a/Asset/data/asset/functions/artifact/1360.vintage_wine/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1360.vintage_wine/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"ヴィンテージ・ワイン","color":"#d93d64"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text":"体力を失った体力の30%分回復する","color":"white"}'] + data modify storage asset:artifact Lore set value ['{"text":"体力を10回復する","color":"white"}','{"text":"手に所持していた時間が2秒につき回復量が増加する","color":"white"}','{"text":"(最大回復量:90、所持時間18秒で効果最大)","color":"white"}'] # 消費アイテム ({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 @@ -23,7 +23,7 @@ # 使用回数 (int) (オプション) data modify storage asset:artifact RemainingCount set value 1 # 神器を発動できるスロット (string) Wikiを参照 - data modify storage asset:artifact Slot set value "auto" + data modify storage asset:artifact Slot set value "offhand" # 神器のトリガー (string) Wikiを参照 data modify storage asset:artifact Trigger set value "itemUse" # 神器の発動条件 (TextComponentString) (オプション) diff --git a/Asset/data/asset/functions/artifact/1360.vintage_wine/tick/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1360.vintage_wine/tick/1.trigger.mcfunction new file mode 100644 index 0000000000..a236e1636f --- /dev/null +++ b/Asset/data/asset/functions/artifact/1360.vintage_wine/tick/1.trigger.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1360.vintage_wine/tick/1.trigger +# +# +# +# @within tag/function asset:artifact/tick + +# + execute if data storage asset:context id{offhand:1360} run function asset:artifact/1360.vintage_wine/tick/2.check_condition diff --git a/Asset/data/asset/functions/artifact/1360.vintage_wine/tick/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1360.vintage_wine/tick/2.check_condition.mcfunction new file mode 100644 index 0000000000..7364e3443b --- /dev/null +++ b/Asset/data/asset/functions/artifact/1360.vintage_wine/tick/2.check_condition.mcfunction @@ -0,0 +1,15 @@ +#> asset:artifact/1360.vintage_wine/tick/2.check_condition +# +# +# +# @within function asset:artifact/1360.vintage_wine/tick/1.trigger + +# 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く + function asset:artifact/common/check_condition/offhand +# 他にアイテム等確認する場合はここに書く + +# CanUsedタグをチェックして3.main.mcfunctionを実行する + execute if entity @s[tag=CanUsed] run function asset:artifact/1360.vintage_wine/tick/3.main + +# CanUsedを削除 + tag @s remove CanUsed diff --git a/Asset/data/asset/functions/artifact/1360.vintage_wine/tick/3.main.mcfunction b/Asset/data/asset/functions/artifact/1360.vintage_wine/tick/3.main.mcfunction new file mode 100644 index 0000000000..8987bd3898 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1360.vintage_wine/tick/3.main.mcfunction @@ -0,0 +1,37 @@ +#> asset:artifact/1360.vintage_wine/tick/3.main +# +# +# +# @within function asset:artifact/1360.vintage_wine/tick/2.check_condition + +#> Private +# @private + #declare score_holder $Stack + +# 固有バフチェック + data modify storage api: Argument.ID set value 369 + function api:entity/mob/effect/get/from_id + +# チャージ+1 + execute store result storage api: Argument.FieldOverride.Charge int -1 run data get storage api: Return.Effect.Field.Charge -1.000000001 + +# チャージが0なら1に初期化 + execute if data storage api: Argument.FieldOverride{Charge:0} run data modify storage api: Argument.FieldOverride.Charge set value 1 + +# (チャージ / N) + 1をスタックとする + execute store result score $Stack Temporary run data get storage api: Argument.FieldOverride.Charge + scoreboard players operation $Stack Temporary /= $40 Const + scoreboard players add $Stack Temporary 1 +# 最大スタック + scoreboard players operation $Stack Temporary < $10 Const + +# tellraw @a {"storage":"api:","nbt":"Argument.FieldOverride.Charge"} + +# 固有バフを付与 + data modify storage api: Argument.ID set value 369 + execute store result storage api: Argument.Stack int 1 run scoreboard players get $Stack Temporary + function api:entity/mob/effect/give + function api:entity/mob/effect/reset + +# リセマラ + scoreboard players reset $Stack Temporary diff --git a/Asset/data/asset/functions/artifact/1360.vintage_wine/trigger/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1360.vintage_wine/trigger/1.trigger.mcfunction deleted file mode 100644 index 70c3d2cbcc..0000000000 --- a/Asset/data/asset/functions/artifact/1360.vintage_wine/trigger/1.trigger.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset:artifact/1360.vintage_wine/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:1360} run function asset:artifact/1360.vintage_wine/trigger/2.check_condition diff --git a/Asset/data/asset/functions/artifact/1360.vintage_wine/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1360.vintage_wine/trigger/3.main.mcfunction deleted file mode 100644 index dfe26081de..0000000000 --- a/Asset/data/asset/functions/artifact/1360.vintage_wine/trigger/3.main.mcfunction +++ /dev/null @@ -1,31 +0,0 @@ -#> asset:artifact/1360.vintage_wine/trigger/3.main -# -# 神器のメイン処理部 -# -# @within function asset:artifact/1360.vintage_wine/trigger/2.check_condition - -# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う - function asset:artifact/common/use/auto - -# ここから先は神器側の効果の処理を書く - -#> Val -# @private - #declare score_holder $MaxHealth - #declare score_holder $CurHealth - -# 現在/最大体力を取得する(100倍) - function api:data_get/health - execute store result score $CurHealth Temporary run data get storage api: Health 100 - execute store result score $MaxHealth Temporary run attribute @s generic.max_health get 100 - -# 失った体力(100倍)を計算し回復する -# 失った体力(100倍)のN%を回復量にする - scoreboard players operation $MaxHealth Temporary -= $CurHealth Temporary - execute store result storage api: Argument.Heal double 0.003 run scoreboard players get $MaxHealth Temporary - function api:heal/ - function api:heal/reset - -# リセット - scoreboard players reset $MaxHealth Temporary - scoreboard players reset $CurHealth Temporary diff --git a/Asset/data/asset/functions/artifact/1360.vintage_wine/use_item/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1360.vintage_wine/use_item/1.trigger.mcfunction new file mode 100644 index 0000000000..d555aaf4df --- /dev/null +++ b/Asset/data/asset/functions/artifact/1360.vintage_wine/use_item/1.trigger.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1360.vintage_wine/use_item/1.trigger +# +# 指定したイベントタイミングで実行されるfunction +# +# @within tag/function asset:artifact/** + +# storage asset:idのoffhandに装備している神器のIDが入っているので比較し、~/2.check_condition.mcfunctionを実行する + execute if data storage asset:context id{offhand:1360} run function asset:artifact/1360.vintage_wine/use_item/2.check_condition diff --git a/Asset/data/asset/functions/artifact/1360.vintage_wine/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1360.vintage_wine/use_item/2.check_condition.mcfunction similarity index 60% rename from Asset/data/asset/functions/artifact/1360.vintage_wine/trigger/2.check_condition.mcfunction rename to Asset/data/asset/functions/artifact/1360.vintage_wine/use_item/2.check_condition.mcfunction index 8105c9f7a7..2a716ac3a1 100644 --- a/Asset/data/asset/functions/artifact/1360.vintage_wine/trigger/2.check_condition.mcfunction +++ b/Asset/data/asset/functions/artifact/1360.vintage_wine/use_item/2.check_condition.mcfunction @@ -1,12 +1,12 @@ -#> asset:artifact/1360.vintage_wine/trigger/2.check_condition +#> asset:artifact/1360.vintage_wine/use_item/2.check_condition # # 神器の発動条件をチェックします # -# @within function asset:artifact/1360.vintage_wine/trigger/1.trigger +# @within function asset:artifact/1360.vintage_wine/use_item/1.trigger # 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く - function asset:artifact/common/check_condition/auto + function asset:artifact/common/check_condition/offhand # 他にアイテム等確認する場合はここに書く # CanUsedタグをチェックして3.main.mcfunctionを実行する - execute if entity @s[tag=CanUsed] run function asset:artifact/1360.vintage_wine/trigger/3.main + execute if entity @s[tag=CanUsed] run function asset:artifact/1360.vintage_wine/use_item/3.main diff --git a/Asset/data/asset/functions/artifact/1360.vintage_wine/use_item/3.main.mcfunction b/Asset/data/asset/functions/artifact/1360.vintage_wine/use_item/3.main.mcfunction new file mode 100644 index 0000000000..c06e045d54 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1360.vintage_wine/use_item/3.main.mcfunction @@ -0,0 +1,39 @@ +#> asset:artifact/1360.vintage_wine/use_item/3.main +# +# 神器のメイン処理部 +# +# @within function asset:artifact/1360.vintage_wine/use_item/2.check_condition + +# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う + function asset:artifact/common/use/offhand + +# ここから先は神器側の効果の処理を書く + +# 演出 + particle dust 1 0.278 0.459 1 ~ ~1.2 ~ 0.4 0.4 0.4 1 10 normal + +# 固有バフチェック + data modify storage api: Argument.ID set value 369 + function api:entity/mob/effect/get/from_id + +# スタックにつき回復量を変更 + execute if data storage api: Return.Effect{Stack: 1} run data modify storage api: Argument.Heal set value 10d + execute if data storage api: Return.Effect{Stack: 2} run data modify storage api: Argument.Heal set value 12d + execute if data storage api: Return.Effect{Stack: 3} run data modify storage api: Argument.Heal set value 15d + execute if data storage api: Return.Effect{Stack: 4} run data modify storage api: Argument.Heal set value 19d + execute if data storage api: Return.Effect{Stack: 5} run data modify storage api: Argument.Heal set value 25d + execute if data storage api: Return.Effect{Stack: 6} run data modify storage api: Argument.Heal set value 33d + execute if data storage api: Return.Effect{Stack: 7} run data modify storage api: Argument.Heal set value 43d + execute if data storage api: Return.Effect{Stack: 8} run data modify storage api: Argument.Heal set value 56d + execute if data storage api: Return.Effect{Stack: 9} run data modify storage api: Argument.Heal set value 71d + execute if data storage api: Return.Effect{Stack:10} run data modify storage api: Argument.Heal set value 90d + +# 回復 + function api:heal/modifier + function api:heal/ + function api:heal/reset + +# 念のため固有バフ解除 + data modify storage api: Argument.ID set value 369 + function api:entity/mob/effect/remove/from_id + function api:entity/mob/effect/reset diff --git a/Asset/data/asset/tags/functions/artifact/tick.json b/Asset/data/asset/tags/functions/artifact/tick.json index 878334fd80..2827700446 100644 --- a/Asset/data/asset/tags/functions/artifact/tick.json +++ b/Asset/data/asset/tags/functions/artifact/tick.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1360.vintage_wine/tick/1.trigger", "asset:artifact/1324.balance_star/trigger/1.trigger", "asset:artifact/0237.schrodingers_cat/trigger/1.trigger", "asset:artifact/1057.great_demon_head/tick/1.trigger", diff --git a/Asset/data/asset/tags/functions/artifact/use_item.json b/Asset/data/asset/tags/functions/artifact/use_item.json index 2fa98bc452..ae494f7d53 100644 --- a/Asset/data/asset/tags/functions/artifact/use_item.json +++ b/Asset/data/asset/tags/functions/artifact/use_item.json @@ -1,6 +1,6 @@ { "values": [ - "asset:artifact/1360.vintage_wine/trigger/1.trigger", + "asset:artifact/1360.vintage_wine/use_item/1.trigger", "asset:artifact/1343.coffee_milk_pack/trigger/1.trigger", "asset:artifact/1342.fruit_milk_pack/trigger/1.trigger", "asset:artifact/1401.yuzu/trigger/1.trigger", From 1089e8c4304fc664b15be36d49e25b5c6e87a258 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Tue, 9 Jun 2026 03:04:58 +0900 Subject: [PATCH 9/9] =?UTF-8?q?Lore=E3=82=92=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/artifact/1360.vintage_wine/give/2.give.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/artifact/1360.vintage_wine/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1360.vintage_wine/give/2.give.mcfunction index 83da352664..acf9fd6ba7 100644 --- a/Asset/data/asset/functions/artifact/1360.vintage_wine/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1360.vintage_wine/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"ヴィンテージ・ワイン","color":"#d93d64"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text":"体力を10回復する","color":"white"}','{"text":"手に所持していた時間が2秒につき回復量が増加する","color":"white"}','{"text":"(最大回復量:90、所持時間18秒で効果最大)","color":"white"}'] + data modify storage asset:artifact Lore set value ['{"text":"体力を10回復する","color":"white"}','{"text":"オフハンドに所持していた時間が2秒につき回復量が増加する","color":"white"}','{"text":"(最大回復量:90、所持時間18秒で効果最大)","color":"white"}'] # 消費アイテム ({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