From fdfba0c5796dfe73874fce7c83960cfa69f21a25 Mon Sep 17 00:00:00 2001 From: k22992068-crypto <286215529+k22992068-crypto@users.noreply.github.com> Date: Mon, 8 Jun 2026 23:53:43 +0900 Subject: [PATCH 01/23] =?UTF-8?q?=E2=9C=A8=20[Artifact=201492]=20=E5=8F=A4?= =?UTF-8?q?=E3=81=8D=E6=83=B3=E3=81=84=E3=81=AE=E9=A1=8D=E7=B8=81=E3=81=AE?= =?UTF-8?q?=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 | 68 +++++++++++++++++++ .../register.mcfunction | 7 ++ .../trigger/1.trigger.mcfunction | 8 +++ .../trigger/2.check_condition.mcfunction | 17 +++++ .../trigger/3.main.mcfunction | 19 ++++++ .../trigger/summon.mcfunction | 13 ++++ .../1164.piece_of_creation/init/.mcfunction | 12 ++++ .../register.mcfunction | 20 ++++++ .../1164.piece_of_creation/summon/.mcfunction | 11 +++ .../summon/m.mcfunction | 7 ++ .../1164.piece_of_creation/tick/.mcfunction | 20 ++++++ .../tick/hit_player.mcfunction | 18 +++++ .../object/alias/1164/init.mcfunction | 8 +++ .../object/alias/1164/register.mcfunction | 8 +++ .../object/alias/1164/summon.mcfunction | 8 +++ .../object/alias/1164/tick.mcfunction | 8 +++ .../asset/tags/functions/artifact/attack.json | 3 +- .../asset/tags/functions/artifact/give.json | 3 +- .../tags/functions/artifact/register.json | 3 +- 20 files changed, 265 insertions(+), 3 deletions(-) create mode 100644 Asset/data/asset/functions/artifact/1492.your_thoughts_frames/give/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1492.your_thoughts_frames/give/2.give.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1492.your_thoughts_frames/register.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/2.check_condition.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/3.main.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/summon.mcfunction create mode 100644 Asset/data/asset/functions/object/1164.piece_of_creation/init/.mcfunction create mode 100644 Asset/data/asset/functions/object/1164.piece_of_creation/register.mcfunction create mode 100644 Asset/data/asset/functions/object/1164.piece_of_creation/summon/.mcfunction create mode 100644 Asset/data/asset/functions/object/1164.piece_of_creation/summon/m.mcfunction create mode 100644 Asset/data/asset/functions/object/1164.piece_of_creation/tick/.mcfunction create mode 100644 Asset/data/asset/functions/object/1164.piece_of_creation/tick/hit_player.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1164/init.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1164/register.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1164/summon.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1164/tick.mcfunction diff --git a/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/give/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/give/1.trigger.mcfunction new file mode 100644 index 00000000000..4762da41c00 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/give/1.trigger.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1492.your_thoughts_frames/give/1.trigger +# +# 神器の取得処理の呼び出し時に実行されるfunction +# +# @within tag/function asset:artifact/give + +execute if data storage asset:context {id:1492} run function asset:artifact/1492.your_thoughts_frames/give/2.give \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/give/2.give.mcfunction new file mode 100644 index 00000000000..12d147b2a65 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/give/2.give.mcfunction @@ -0,0 +1,68 @@ +#> asset:artifact/1492.your_thoughts_frames/give/2.give +# +# 神器の作成部 ここでID等を定義する +# +# @user +# @within function asset:artifact/1492.your_thoughts_frames/give/1.trigger + +# 神器の説明や消費MPなどをここで設定する。 +# 最後にasset:artifact/common/giveを実行することで入手可能。 + +# 神器のID (int) スプレッドシートの値を入れる + data modify storage asset:artifact ID set value 1492 +# 神器のベースアイテム + data modify storage asset:artifact Item set value "minecraft:stick" +# 神器の名前 (TextComponentString) + data modify storage asset:artifact Name set value '[{"text":"古","color":"#F3D2E5"},{"text":"き","color":"#F3D1E7"},{"text":"想","color":"#F3D1EA"},{"text":"い","color":"#F2CDEC"},{"text":"の","color":"#F3C9F0"},{"text":"額縁","color":"#F1B6F1"}]' +# 神器の説明文 (TextComponentString[]) + data modify storage asset:artifact Lore set value ['{"text":"発動時、敵が”気持ちの欠片”を近くに落とす"}','{"text":"気持ちの欠片に触れたプレイヤーはMPを20回復する。"}','{"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 +# 神器を発動できるスロット (string) Wikiを参照 + data modify storage asset:artifact Slot set value "offhand" +# 神器のトリガー (string) Wikiを参照 + data modify storage asset:artifact Trigger set value "onAttack" +# 神器の発動条件 (TextComponentString) (オプション) + data modify storage asset:artifact Condition set value '{"text":"5%の確率で発動"}' +# 攻撃に関する情報 -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 200 +# 種別クールダウン ({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 true +# 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 ["Flora","Nyaptov","wi-ki","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/1492.your_thoughts_frames/register.mcfunction b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/register.mcfunction new file mode 100644 index 00000000000..c79c1e0576c --- /dev/null +++ b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1492.your_thoughts_frames/register +# +# 神器プールへの登録処理 +# +# @within tag/function asset:artifact/register + +data modify storage asset:artifact RarityRegistry[2] append value [1492] \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/1.trigger.mcfunction new file mode 100644 index 00000000000..26ce2ad4e18 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/1.trigger.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1492.your_thoughts_frames/trigger/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:1492} run function asset:artifact/1492.your_thoughts_frames/trigger/2.check_condition \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/2.check_condition.mcfunction new file mode 100644 index 00000000000..ada7cdccdea --- /dev/null +++ b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/2.check_condition.mcfunction @@ -0,0 +1,17 @@ +#> asset:artifact/1492.your_thoughts_frames/trigger/2.check_condition +# +# 神器の発動条件をチェックします +# +# @within function asset:artifact/1492.your_thoughts_frames/trigger/1.trigger + +# 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く + function asset:artifact/common/check_condition/offhand + +# IsDoT:trueならCanUsedを削除 + execute if entity @s[tag=CanUsed] if data storage asset:context Attack{IsDoT:true} run tag @s remove CanUsed + +# 5%の確率でCanUsedを残す + execute unless predicate lib:random_pass_per/5 run tag @s remove CanUsed + +# CanUsedタグをチェックして3.main.mcfunctionを実行する + execute if entity @s[tag=CanUsed] run function asset:artifact/1492.your_thoughts_frames/trigger/3.main diff --git a/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/3.main.mcfunction new file mode 100644 index 00000000000..46174b352fc --- /dev/null +++ b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/3.main.mcfunction @@ -0,0 +1,19 @@ +#> asset:artifact/1492.your_thoughts_frames/trigger/3.main +# +# 神器のメイン処理部 +# +# @within function asset:artifact/1492.your_thoughts_frames/trigger/2.check_condition + +# 性能として、序盤の手数があるビルドか、上振れたときだとかなりMPの回復の足しになるくらいがうれしい + +# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う + function asset:artifact/common/use/offhand + +# 攻撃対象の近くにオーブを召喚 + execute at @e[type=#lib:living,type=!player,tag=Victim,limit=1] run function asset:artifact/1492.your_thoughts_frames/trigger/summon + +# 演出 + playsound block.amethyst_block.chime player @a ~ ~ ~ 5 0.8 + playsound minecraft:block.enchantment_table.use player @a ~ ~ ~ 0.9 1.4 0.0 + playsound minecraft:block.amethyst_cluster.hit player @a ~ ~ ~ 5.0 1.35 0.0 + playsound minecraft:block.amethyst_block.break player @a ~ ~ ~ 10 2 0.0 diff --git a/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/summon.mcfunction b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/summon.mcfunction new file mode 100644 index 00000000000..3a60a912fa3 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/summon.mcfunction @@ -0,0 +1,13 @@ +#> asset:artifact/1492.your_thoughts_frames/trigger/summon +# +# オーブの召喚 +# +# @within function asset:artifact/1492.your_thoughts_frames/trigger/3.main + +# 演出 + particle item pink_stained_glass ~ ~1 ~ 0.3 0.5 0.3 0.1 100 normal @a + +# 召喚 + data modify storage api: Argument.ID set value 1164 + data modify storage api: Argument.FieldOverride.MPHeal set value 20 + execute positioned ~ ~1 ~ run function api:object/summon diff --git a/Asset/data/asset/functions/object/1164.piece_of_creation/init/.mcfunction b/Asset/data/asset/functions/object/1164.piece_of_creation/init/.mcfunction new file mode 100644 index 00000000000..e6419b67105 --- /dev/null +++ b/Asset/data/asset/functions/object/1164.piece_of_creation/init/.mcfunction @@ -0,0 +1,12 @@ +#> asset:object/1164.piece_of_creation/init/ +# +# Objectのinit時の処理 +# +# @within asset:object/alias/1164/init + +# 召喚場所からランダムに少し拡散する + data modify storage lib: Argument.Bounds set value [[2d,2d],[0d,0d],[2d,2d]] + function lib:spread_entity/ + +# sound + playsound minecraft:entity.vex.charge player @a ~ ~ ~ 5.0 1.75 0.0 diff --git a/Asset/data/asset/functions/object/1164.piece_of_creation/register.mcfunction b/Asset/data/asset/functions/object/1164.piece_of_creation/register.mcfunction new file mode 100644 index 00000000000..4a32a8f1ac6 --- /dev/null +++ b/Asset/data/asset/functions/object/1164.piece_of_creation/register.mcfunction @@ -0,0 +1,20 @@ +#> asset:object/1164.piece_of_creation/register +# +# Objectのデータを指定 +# +# @within function asset:object/alias/1164/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 + +# ID (int) + data modify storage asset:object ID set value 1164 +# フィールド(オプション) + data modify storage asset:object Field.MPHeal set value 30 diff --git a/Asset/data/asset/functions/object/1164.piece_of_creation/summon/.mcfunction b/Asset/data/asset/functions/object/1164.piece_of_creation/summon/.mcfunction new file mode 100644 index 00000000000..30a5f349104 --- /dev/null +++ b/Asset/data/asset/functions/object/1164.piece_of_creation/summon/.mcfunction @@ -0,0 +1,11 @@ +#> asset:object/1164.piece_of_creation/summon/ +# +# Object召喚処理の呼び出し時に実行されるfunction +# +# @within asset:object/alias/1164/summon + +# 元となるEntityを召喚する + execute as 0-0-0-0-0 in minecraft:overworld positioned as @s run tp @s ~ ~ ~ ~ 0 + data modify storage asset:temp Args.Rotation set from entity 0-0-0-0-0 Rotation + function asset:object/1164.piece_of_creation/summon/m with storage asset:temp Args + data remove storage asset:temp Args diff --git a/Asset/data/asset/functions/object/1164.piece_of_creation/summon/m.mcfunction b/Asset/data/asset/functions/object/1164.piece_of_creation/summon/m.mcfunction new file mode 100644 index 00000000000..c7b24962d7e --- /dev/null +++ b/Asset/data/asset/functions/object/1164.piece_of_creation/summon/m.mcfunction @@ -0,0 +1,7 @@ +#> asset:object/1164.piece_of_creation/summon/m +# +# +# +# @within function asset:object/1164.piece_of_creation/summon/ + +$summon item_display ~ ~ ~ {Rotation:$(Rotation),teleport_duration:1,Tags:["ObjectInit","Uninterferable"],brightness:{sky:15,block:15},item:{id:"stick",Count:1b,tag:{CustomModelData:20620}}} diff --git a/Asset/data/asset/functions/object/1164.piece_of_creation/tick/.mcfunction b/Asset/data/asset/functions/object/1164.piece_of_creation/tick/.mcfunction new file mode 100644 index 00000000000..d01c6cbcff5 --- /dev/null +++ b/Asset/data/asset/functions/object/1164.piece_of_creation/tick/.mcfunction @@ -0,0 +1,20 @@ +#> asset:object/1164.piece_of_creation/tick/ +# +# Objectのtick時の処理 +# +# @within asset:object/alias/1164/tick + +# Tick加算 + scoreboard players add @s General.Object.Tick 1 + +# 下にゆっくり落ちる + execute if block ~ ~-0.4 ~ #lib:no_collision/ run tp @s ~ ~-0.03 ~ + +# 近くのプレイヤーに自身の向きを変えずに追尾 + execute at @s facing entity @a[distance=..2,limit=1] eyes positioned ^ ^ ^0.25 run tp @s ~ ~ ~ + +# playerに触れるとMPを回復して消滅 + execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @a[gamemode=!spectator,tag=!Death,dx=0,limit=1] run function asset:object/1164.piece_of_creation/tick/hit_player + +# 消滅処理 + kill @s[scores={General.Object.Tick=200..}] diff --git a/Asset/data/asset/functions/object/1164.piece_of_creation/tick/hit_player.mcfunction b/Asset/data/asset/functions/object/1164.piece_of_creation/tick/hit_player.mcfunction new file mode 100644 index 00000000000..e65426b220c --- /dev/null +++ b/Asset/data/asset/functions/object/1164.piece_of_creation/tick/hit_player.mcfunction @@ -0,0 +1,18 @@ +#> asset:object/1164.piece_of_creation/tick/hit_player +# +# playerにヒットしたときの処理 +# +# @within function asset:object/1164.piece_of_creation/tick/ + +# 演出 + playsound minecraft:entity.arrow.hit_player player @a ~0.5 ~0.5 ~0.5 0.6 2 0.0 + playsound minecraft:entity.allay.ambient_with_item player @a ~ ~ ~ 2.0 0.9 0.0 + playsound minecraft:block.glass.break player @a ~ ~ ~ 1.0 1.4 0.0 + particle end_rod ~0.5 ~0.5 ~0.5 0 0 0 0.2 20 + +# hitしたプレイヤーのMPを回復する + data modify storage api: Argument.Fluctuation set from storage asset:context this.MPHeal + execute as @a[gamemode=!spectator,tag=!Death,dx=0,limit=1] run function api:mp/fluctuation + +# 消滅処理 + kill @s diff --git a/Asset/data/asset/functions/object/alias/1164/init.mcfunction b/Asset/data/asset/functions/object/alias/1164/init.mcfunction new file mode 100644 index 00000000000..1a136a87c85 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1164/init.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1164/init +# +# Init処理のエイリアス +# +# @within asset_manager:object/init/init.m + +# 元のInit処理を呼び出す + function asset:object/1164.piece_of_creation/init/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1164/register.mcfunction b/Asset/data/asset/functions/object/alias/1164/register.mcfunction new file mode 100644 index 00000000000..714f725fccd --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1164/register.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1164/register +# +# Objectのデータ指定処理のエイリアス +# +# @within asset_manager:object/summon/register.m + +# 元の登録処理を呼び出す + function asset:object/1164.piece_of_creation/register \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1164/summon.mcfunction b/Asset/data/asset/functions/object/alias/1164/summon.mcfunction new file mode 100644 index 00000000000..d1cf575d18a --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1164/summon.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1164/summon +# +# Object召喚処理のエイリアス +# +# @within asset_manager:object/summon/summon.m + +# 元の召喚処理を呼び出す + function asset:object/1164.piece_of_creation/summon/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1164/tick.mcfunction b/Asset/data/asset/functions/object/alias/1164/tick.mcfunction new file mode 100644 index 00000000000..13a2d785173 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1164/tick.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1164/tick +# +# Tick時処理のエイリアス +# +# @within asset_manager:object/tick/tick.m + +# 元のTick処理を呼び出す + function asset:object/1164.piece_of_creation/tick/ \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/artifact/attack.json b/Asset/data/asset/tags/functions/artifact/attack.json index 095078cdab2..09e05a449b3 100644 --- a/Asset/data/asset/tags/functions/artifact/attack.json +++ b/Asset/data/asset/tags/functions/artifact/attack.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1492.your_thoughts_frames/trigger/1.trigger", "asset:artifact/1308.magnifier_of_detective_girl/trigger/1.trigger", "asset:artifact/1109.black_lily_of_priestess/trigger/1.trigger", "asset:artifact/1363.hydra_fang/trigger/1.trigger", @@ -11,4 +12,4 @@ "asset:artifact/0664.soul_fire_armor/attack/1.trigger", "asset:artifact/0724.oblivious_snow/attack/1.trigger" ] -} +} \ 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 16715fe3c74..8b7d45febda 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/1492.your_thoughts_frames/give/1.trigger", "asset:artifact/1252.fox_candle/give/1.trigger", "asset:artifact/1343.coffee_milk_pack/give/1.trigger", "asset:artifact/1342.fruit_milk_pack/give/1.trigger", @@ -530,4 +531,4 @@ "asset:artifact/0735.collision_plate/give/1.trigger", "asset:artifact/0745.blade_of_whirlwind/give/1.trigger" ] -} +} \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/artifact/register.json b/Asset/data/asset/tags/functions/artifact/register.json index 7e92660e5a2..be1b7b8cc36 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/1492.your_thoughts_frames/register", "asset:artifact/1252.fox_candle/register", "asset:artifact/1343.coffee_milk_pack/register", "asset:artifact/1342.fruit_milk_pack/register", @@ -308,4 +309,4 @@ "asset:artifact/1027.fire_of_rebirth/register", "asset:artifact/1111.rod_o_redeem/register" ] -} +} \ No newline at end of file From e06e2564fee168d0db46e2f55d840eb41d66b9a6 Mon Sep 17 00:00:00 2001 From: k22992068-crypto <286215529+k22992068-crypto@users.noreply.github.com> Date: Wed, 10 Jun 2026 19:49:10 +0900 Subject: [PATCH 02/23] =?UTF-8?q?=F0=9F=A9=B9=20[Artifact=201492]=20?= =?UTF-8?q?=E5=8F=A4=E3=81=8D=E6=83=B3=E3=81=84=E3=81=AE=E9=A1=8D=E7=B8=81?= =?UTF-8?q?=E3=81=AE=E8=AA=AC=E6=98=8E=E3=82=92=E5=BE=AE=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifact/1492.your_thoughts_frames/give/2.give.mcfunction | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/give/2.give.mcfunction index 12d147b2a65..bfcd173b823 100644 --- a/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/give/2.give.mcfunction @@ -13,9 +13,9 @@ # 神器のベースアイテム data modify storage asset:artifact Item set value "minecraft:stick" # 神器の名前 (TextComponentString) - data modify storage asset:artifact Name set value '[{"text":"古","color":"#F3D2E5"},{"text":"き","color":"#F3D1E7"},{"text":"想","color":"#F3D1EA"},{"text":"い","color":"#F2CDEC"},{"text":"の","color":"#F3C9F0"},{"text":"額縁","color":"#F1B6F1"}]' + data modify storage asset:artifact Name set value '[{"text":"古","color":"#E499FF"},{"text":"き","color":"#DAA1FF"},{"text":"想","color":"#DAA1FF"},{"text":"い","color":"#C5A5FF"},{"text":"の","color":"#B8A8FF"},{"text":"額縁","color":"#9EAEFF"}]' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text":"発動時、敵が”気持ちの欠片”を近くに落とす"}','{"text":"気持ちの欠片に触れたプレイヤーはMPを20回復する。"}','{"text":"「喉元に噛みつく牙はまだあるかい?」","color":"gray"}'] + data modify storage asset:artifact Lore set value ['{"text":"発動時、敵が”気持ちの欠片”を近くに落とす"}','{"text":"気持ちの欠片に触れたプレイヤーはMPを20回復する。"}','{"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 From d5ffa98f53390a3e28934c85b4ca774a3d06adb2 Mon Sep 17 00:00:00 2001 From: k22992068-crypto <286215529+k22992068-crypto@users.noreply.github.com> Date: Sat, 13 Jun 2026 23:21:50 +0900 Subject: [PATCH 03/23] =?UTF-8?q?=F0=9F=A9=B9=20[Artifact=201492]=20?= =?UTF-8?q?=E5=8F=A4=E3=81=8D=E6=83=B3=E3=81=84=E3=81=AE=E9=A1=8D=E7=B8=81?= =?UTF-8?q?=E3=81=AECD,=E7=99=BA=E5=8B=95=E7=8E=87=E3=80=81=E5=9B=9E?= =?UTF-8?q?=E5=BE=A9MP=E9=87=8F=E3=82=92=E3=82=88=E3=82=8A=E3=83=A2?= =?UTF-8?q?=E3=83=81=E3=83=BC=E3=83=95=E3=81=AB=E3=81=82=E3=81=86=E3=82=88?= =?UTF-8?q?=E3=81=86=E3=81=AB=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1492.your_thoughts_frames/give/2.give.mcfunction | 8 ++++---- .../trigger/2.check_condition.mcfunction | 4 ++-- .../1492.your_thoughts_frames/trigger/3.main.mcfunction | 2 +- .../1492.your_thoughts_frames/trigger/summon.mcfunction | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/give/2.give.mcfunction index bfcd173b823..6be581ac031 100644 --- a/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '[{"text":"古","color":"#E499FF"},{"text":"き","color":"#DAA1FF"},{"text":"想","color":"#DAA1FF"},{"text":"い","color":"#C5A5FF"},{"text":"の","color":"#B8A8FF"},{"text":"額縁","color":"#9EAEFF"}]' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text":"発動時、敵が”気持ちの欠片”を近くに落とす"}','{"text":"気持ちの欠片に触れたプレイヤーはMPを20回復する。"}','{"text":"「まだ喉元に噛みつく牙はある?」","color":"gray"}'] + data modify storage asset:artifact Lore set value ['{"text":"発動時、敵が”気持ちの欠片”を近くに落とす"}','{"text":"気持ちの欠片に触れたプレイヤーはMPを31.4回復する。"}','{"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 @@ -27,7 +27,7 @@ # 神器のトリガー (string) Wikiを参照 data modify storage asset:artifact Trigger set value "onAttack" # 神器の発動条件 (TextComponentString) (オプション) - data modify storage asset:artifact Condition set value '{"text":"5%の確率で発動"}' + data modify storage asset:artifact Condition set value '{"text":"3%の確率で発動"}' # 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) # data modify storage asset:artifact AttackInfo.Damage set value [0,0] # 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) @@ -46,8 +46,8 @@ # 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 200 +# 神器のクールダウン 黄金比(約)1:1.618にちなみ16.20s + data modify storage asset:artifact LocalCooldown set value 324 # 種別クールダウン ({Type: string, Duration: int}) (オプション) # data modify storage asset:artifact TypeCooldown.Type set value # data modify storage asset:artifact TypeCooldown.Duration set value diff --git a/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/2.check_condition.mcfunction index ada7cdccdea..660615448f3 100644 --- a/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/2.check_condition.mcfunction +++ b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/2.check_condition.mcfunction @@ -10,8 +10,8 @@ # IsDoT:trueならCanUsedを削除 execute if entity @s[tag=CanUsed] if data storage asset:context Attack{IsDoT:true} run tag @s remove CanUsed -# 5%の確率でCanUsedを残す - execute unless predicate lib:random_pass_per/5 run tag @s remove CanUsed +# 3%の確率でCanUsedを残す(MP回復量とクールダウンはモチーフがある故調整するならここを調整してほしい気持ちがある) + execute unless predicate lib:random_pass_per/3 run tag @s remove CanUsed # CanUsedタグをチェックして3.main.mcfunctionを実行する execute if entity @s[tag=CanUsed] run function asset:artifact/1492.your_thoughts_frames/trigger/3.main diff --git a/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/3.main.mcfunction index 46174b352fc..1bfd3e709c6 100644 --- a/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/3.main.mcfunction @@ -4,7 +4,7 @@ # # @within function asset:artifact/1492.your_thoughts_frames/trigger/2.check_condition -# 性能として、序盤の手数があるビルドか、上振れたときだとかなりMPの回復の足しになるくらいがうれしい +# 性能として、水属性のビルドで手数があるビルドか、上振れたときだとかなりMPの回復の足しになるくらいがうれしい # 基本的な使用時の処理(MP消費や使用回数の処理など)を行う function asset:artifact/common/use/offhand diff --git a/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/summon.mcfunction b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/summon.mcfunction index 3a60a912fa3..61bde18dced 100644 --- a/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/summon.mcfunction +++ b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/summon.mcfunction @@ -7,7 +7,7 @@ # 演出 particle item pink_stained_glass ~ ~1 ~ 0.3 0.5 0.3 0.1 100 normal @a -# 召喚 +# 召喚(MP回復量は円周率にちなみ31.4回復する。) data modify storage api: Argument.ID set value 1164 - data modify storage api: Argument.FieldOverride.MPHeal set value 20 + data modify storage api: Argument.FieldOverride.MPHeal set value 31.4 execute positioned ~ ~1 ~ run function api:object/summon From a512fe6de3a4f5ac4403426bd41b7eaecf6a6e86 Mon Sep 17 00:00:00 2001 From: k22992068-crypto <286215529+k22992068-crypto@users.noreply.github.com> Date: Sun, 14 Jun 2026 00:01:33 +0900 Subject: [PATCH 04/23] =?UTF-8?q?=F0=9F=90=9B=20[Artifact=201492]=20?= =?UTF-8?q?=E5=8F=A4=E3=81=8D=E6=83=B3=E3=81=84=E3=81=AE=E9=A1=8D=E7=B8=81?= =?UTF-8?q?=E3=81=8C=E3=83=8B=E3=83=A3=E3=83=97=E3=83=88=E3=83=95=E3=81=A7?= =?UTF-8?q?=E4=BD=BF=E3=81=88=E3=81=A6=E3=81=84=E3=81=9F=E5=95=8F=E9=A1=8C?= =?UTF-8?q?=E3=81=AE=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifact/1492.your_thoughts_frames/give/2.give.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/give/2.give.mcfunction index 6be581ac031..5d1039e125c 100644 --- a/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/give/2.give.mcfunction @@ -60,7 +60,7 @@ # 破壊時の音を鳴らさないかどうか (boolean) (オプション) # data modify storage asset:artifact DisableBreakSound set value # 扱える神 (string[]) Wikiを参照 - data modify storage asset:artifact CanUsedGod set value ["Flora","Nyaptov","wi-ki","Rumor"] + data modify storage asset:artifact CanUsedGod set value ["Flora","wi-ki","Rumor"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) # data modify storage asset:artifact CustomNBT set value {} From ccd0b2832ef3c8ca20956bbdfc4c909d43978284 Mon Sep 17 00:00:00 2001 From: k22992068-crypto <286215529+k22992068-crypto@users.noreply.github.com> Date: Sun, 14 Jun 2026 12:38:45 +0900 Subject: [PATCH 05/23] =?UTF-8?q?=E2=9C=A8=20[Artifact=201492]=20=E5=8F=A4?= =?UTF-8?q?=E3=81=8D=E6=83=B3=E3=81=84=E3=81=AE=E9=A1=8D=E7=B8=81=E3=81=AE?= =?UTF-8?q?=E5=8F=AC=E5=96=9A=E3=81=99=E3=82=8B=E3=82=AA=E3=83=96=E3=82=B8?= =?UTF-8?q?=E3=82=A7=E3=82=AF=E3=83=88=E3=81=AE=E8=A6=8B=E3=81=9F=E7=9B=AE?= =?UTF-8?q?=E3=82=92=E8=A8=AD=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../object/1164.piece_of_creation/summon/m.mcfunction | 2 +- .../functions/object/1164.piece_of_creation/tick/.mcfunction | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Asset/data/asset/functions/object/1164.piece_of_creation/summon/m.mcfunction b/Asset/data/asset/functions/object/1164.piece_of_creation/summon/m.mcfunction index c7b24962d7e..db5bf5d9a79 100644 --- a/Asset/data/asset/functions/object/1164.piece_of_creation/summon/m.mcfunction +++ b/Asset/data/asset/functions/object/1164.piece_of_creation/summon/m.mcfunction @@ -4,4 +4,4 @@ # # @within function asset:object/1164.piece_of_creation/summon/ -$summon item_display ~ ~ ~ {Rotation:$(Rotation),teleport_duration:1,Tags:["ObjectInit","Uninterferable"],brightness:{sky:15,block:15},item:{id:"stick",Count:1b,tag:{CustomModelData:20620}}} +$summon item_display ~ ~ ~ {Rotation:$(Rotation),teleport_duration:1,Tags:["ObjectInit","Uninterferable"],brightness:{sky:15,block:15},item:{id:"stick",Count:1b,tag:{CustomModelData:20620}},transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,0f,0f],scale:[1.4f,1.4f,1.4f]}} diff --git a/Asset/data/asset/functions/object/1164.piece_of_creation/tick/.mcfunction b/Asset/data/asset/functions/object/1164.piece_of_creation/tick/.mcfunction index d01c6cbcff5..bee65403564 100644 --- a/Asset/data/asset/functions/object/1164.piece_of_creation/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1164.piece_of_creation/tick/.mcfunction @@ -8,7 +8,9 @@ scoreboard players add @s General.Object.Tick 1 # 下にゆっくり落ちる - execute if block ~ ~-0.4 ~ #lib:no_collision/ run tp @s ~ ~-0.03 ~ + execute if block ~ ~-0.6 ~ #lib:no_collision/ run tp @s ~ ~-0.03 ~ +# ゆっくり回転 + execute at @s run tp @s ~ ~ ~ ~3 ~ # 近くのプレイヤーに自身の向きを変えずに追尾 execute at @s facing entity @a[distance=..2,limit=1] eyes positioned ^ ^ ^0.25 run tp @s ~ ~ ~ From 960a244085b05b1a5d322d6ac39b51804b226dbc Mon Sep 17 00:00:00 2001 From: k22992068-crypto <286215529+k22992068-crypto@users.noreply.github.com> Date: Sun, 14 Jun 2026 12:46:04 +0900 Subject: [PATCH 06/23] =?UTF-8?q?=E2=9C=A8=20[Artifact=201492]=20=E5=8F=A4?= =?UTF-8?q?=E3=81=8D=E6=83=B3=E3=81=84=E3=81=AE=E9=A1=8D=E7=B8=81=E3=81=8C?= =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E6=A9=9F=E3=81=8B=E3=82=89=E5=87=BA=E3=81=AA?= =?UTF-8?q?=E3=81=84=E3=82=88=E3=81=86=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifact/1492.your_thoughts_frames/register.mcfunction | 7 ------- Asset/data/asset/tags/functions/artifact/register.json | 1 - 2 files changed, 8 deletions(-) delete mode 100644 Asset/data/asset/functions/artifact/1492.your_thoughts_frames/register.mcfunction diff --git a/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/register.mcfunction b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/register.mcfunction deleted file mode 100644 index c79c1e0576c..00000000000 --- a/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/register.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> asset:artifact/1492.your_thoughts_frames/register -# -# 神器プールへの登録処理 -# -# @within tag/function asset:artifact/register - -data modify storage asset:artifact RarityRegistry[2] append value [1492] \ 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 be1b7b8cc36..2fbab09800e 100644 --- a/Asset/data/asset/tags/functions/artifact/register.json +++ b/Asset/data/asset/tags/functions/artifact/register.json @@ -1,6 +1,5 @@ { "values": [ - "asset:artifact/1492.your_thoughts_frames/register", "asset:artifact/1252.fox_candle/register", "asset:artifact/1343.coffee_milk_pack/register", "asset:artifact/1342.fruit_milk_pack/register", From aea503190d9ac0bc1ba0ca74ca6a2682dbb0b6fc Mon Sep 17 00:00:00 2001 From: k22992068-crypto <286215529+k22992068-crypto@users.noreply.github.com> Date: Sun, 14 Jun 2026 19:42:58 +0900 Subject: [PATCH 07/23] =?UTF-8?q?=E2=9C=A8=20[Artifact=201492]=20=E5=8F=A4?= =?UTF-8?q?=E3=81=8D=E6=83=B3=E3=81=84=E3=81=AE=E9=A1=8D=E7=B8=81=E3=81=AE?= =?UTF-8?q?=E6=BC=94=E5=87=BA=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../object/1164.piece_of_creation/tick/.mcfunction | 2 +- .../tick/hit_player.mcfunction | 2 ++ .../1164.piece_of_creation/tick/kill.mcfunction | 13 +++++++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 Asset/data/asset/functions/object/1164.piece_of_creation/tick/kill.mcfunction diff --git a/Asset/data/asset/functions/object/1164.piece_of_creation/tick/.mcfunction b/Asset/data/asset/functions/object/1164.piece_of_creation/tick/.mcfunction index bee65403564..0d0ff10b379 100644 --- a/Asset/data/asset/functions/object/1164.piece_of_creation/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1164.piece_of_creation/tick/.mcfunction @@ -19,4 +19,4 @@ execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @a[gamemode=!spectator,tag=!Death,dx=0,limit=1] run function asset:object/1164.piece_of_creation/tick/hit_player # 消滅処理 - kill @s[scores={General.Object.Tick=200..}] + execute if entity @s[scores={General.Object.Tick=200..}] run function asset:object/1164.piece_of_creation/tick/kill diff --git a/Asset/data/asset/functions/object/1164.piece_of_creation/tick/hit_player.mcfunction b/Asset/data/asset/functions/object/1164.piece_of_creation/tick/hit_player.mcfunction index e65426b220c..089ca60e102 100644 --- a/Asset/data/asset/functions/object/1164.piece_of_creation/tick/hit_player.mcfunction +++ b/Asset/data/asset/functions/object/1164.piece_of_creation/tick/hit_player.mcfunction @@ -8,6 +8,8 @@ playsound minecraft:entity.arrow.hit_player player @a ~0.5 ~0.5 ~0.5 0.6 2 0.0 playsound minecraft:entity.allay.ambient_with_item player @a ~ ~ ~ 2.0 0.9 0.0 playsound minecraft:block.glass.break player @a ~ ~ ~ 1.0 1.4 0.0 + particle minecraft:dust_color_transition 1 0.4 1 0.8 0.2 0.8 1 ~ ~ ~ 2 2 2 1 40 + particle minecraft:dust_color_transition 1 0.4 1 0.8 0.2 0.8 1 ~ ~ ~ 0.4 0.4 0.4 1 40 particle end_rod ~0.5 ~0.5 ~0.5 0 0 0 0.2 20 # hitしたプレイヤーのMPを回復する diff --git a/Asset/data/asset/functions/object/1164.piece_of_creation/tick/kill.mcfunction b/Asset/data/asset/functions/object/1164.piece_of_creation/tick/kill.mcfunction new file mode 100644 index 00000000000..9f05eb1fb48 --- /dev/null +++ b/Asset/data/asset/functions/object/1164.piece_of_creation/tick/kill.mcfunction @@ -0,0 +1,13 @@ +#> asset:object/1164.piece_of_creation/tick/kill +# +# 消滅処理 +# +# @within function asset:object/1164.piece_of_creation/tick/ + +# sound + playsound minecraft:entity.allay.ambient_with_item player @a ~ ~ ~ 1.0 0.9 0.0 + playsound minecraft:block.glass.break player @a ~ ~ ~ 0.6 1.8 0.0 + particle minecraft:dust_color_transition 1 0.4 1 0.8 0.2 0.8 1 ~ ~ ~ 0.4 0.4 0.4 1 40 + +# 消去 + kill @s From d79639a7d04d84c40a80955a36fd4a74ea2b9732 Mon Sep 17 00:00:00 2001 From: k22992068-crypto <286215529+k22992068-crypto@users.noreply.github.com> Date: Sun, 14 Jun 2026 19:43:31 +0900 Subject: [PATCH 08/23] =?UTF-8?q?[Artifact=201492]=20=E5=8F=A4=E3=81=8D?= =?UTF-8?q?=E6=83=B3=E3=81=84=E3=81=AE=E9=A1=8D=E7=B8=81=E3=81=AE=E5=AF=BE?= =?UTF-8?q?=E8=B1=A1=E7=B5=9E=E3=82=8A=E8=BE=BC=E3=81=BF=E6=99=82=E8=B7=9D?= =?UTF-8?q?=E9=9B=A2=E5=88=B6=E9=99=90=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1492.your_thoughts_frames/trigger/3.main.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/3.main.mcfunction index 1bfd3e709c6..33cc187a49c 100644 --- a/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/3.main.mcfunction @@ -10,7 +10,7 @@ function asset:artifact/common/use/offhand # 攻撃対象の近くにオーブを召喚 - execute at @e[type=#lib:living,type=!player,tag=Victim,limit=1] run function asset:artifact/1492.your_thoughts_frames/trigger/summon + execute at @e[type=#lib:living,type=!player,tag=Victim,limit=1,distance=..30] run function asset:artifact/1492.your_thoughts_frames/trigger/summon # 演出 playsound block.amethyst_block.chime player @a ~ ~ ~ 5 0.8 From 7bd33491cd4b3e6d7bf4d6ff23fa7f314e3b58b8 Mon Sep 17 00:00:00 2001 From: k22992068-crypto <286215529+k22992068-crypto@users.noreply.github.com> Date: Sun, 14 Jun 2026 19:45:58 +0900 Subject: [PATCH 09/23] =?UTF-8?q?=F0=9F=90=9B=20[Artifact=201492]=20?= =?UTF-8?q?=E5=8F=A4=E3=81=8D=E6=83=B3=E3=81=84=E3=81=AE=E9=A1=8D=E7=B8=81?= =?UTF-8?q?=E3=81=8C=E3=82=B9=E3=83=9A=E3=82=AF=E3=83=86=E3=82=A4=E3=82=BF?= =?UTF-8?q?=E3=83=BC=E3=81=AE=E3=83=97=E3=83=AC=E3=82=A4=E3=83=A4=E3=83=BC?= =?UTF-8?q?=E3=82=92=E8=BF=BD=E5=B0=BE=E3=81=97=E3=81=A6=E3=81=84=E3=81=9F?= =?UTF-8?q?=E5=95=8F=E9=A1=8C=E3=81=AE=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/object/1164.piece_of_creation/tick/.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/object/1164.piece_of_creation/tick/.mcfunction b/Asset/data/asset/functions/object/1164.piece_of_creation/tick/.mcfunction index 0d0ff10b379..06facb5a1c6 100644 --- a/Asset/data/asset/functions/object/1164.piece_of_creation/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1164.piece_of_creation/tick/.mcfunction @@ -13,7 +13,7 @@ execute at @s run tp @s ~ ~ ~ ~3 ~ # 近くのプレイヤーに自身の向きを変えずに追尾 - execute at @s facing entity @a[distance=..2,limit=1] eyes positioned ^ ^ ^0.25 run tp @s ~ ~ ~ + execute at @s facing entity @a[gamemode=!spectator,tag=!Death,distance=..2,limit=1] eyes positioned ^ ^ ^0.25 run tp @s ~ ~ ~ # playerに触れるとMPを回復して消滅 execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @a[gamemode=!spectator,tag=!Death,dx=0,limit=1] run function asset:object/1164.piece_of_creation/tick/hit_player From 89dd5a310465338a2f2c9c2b5d3613d0a43f4667 Mon Sep 17 00:00:00 2001 From: k22992068-crypto <286215529+k22992068-crypto@users.noreply.github.com> Date: Sun, 14 Jun 2026 20:00:22 +0900 Subject: [PATCH 10/23] =?UTF-8?q?=F0=9F=A9=B9=20[Artifact=201492]=20?= =?UTF-8?q?=E5=8F=A4=E3=81=8D=E6=83=B3=E3=81=84=E3=81=AE=E9=A1=8D=E7=B8=81?= =?UTF-8?q?=E3=81=AE=E3=82=BB=E3=83=AC=E3=82=AF=E3=82=BF=E3=83=BC=E3=81=AE?= =?UTF-8?q?selectorSortKeys=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1492.your_thoughts_frames/trigger/3.main.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/3.main.mcfunction index 33cc187a49c..6c19dae3b1b 100644 --- a/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/3.main.mcfunction @@ -10,7 +10,7 @@ function asset:artifact/common/use/offhand # 攻撃対象の近くにオーブを召喚 - execute at @e[type=#lib:living,type=!player,tag=Victim,limit=1,distance=..30] run function asset:artifact/1492.your_thoughts_frames/trigger/summon + execute at @e[type=#lib:living,type=!player,tag=Victim,distance=..30,limit=1] run function asset:artifact/1492.your_thoughts_frames/trigger/summon # 演出 playsound block.amethyst_block.chime player @a ~ ~ ~ 5 0.8 From 9261e2ab3c7ce2460bc4e202473983c91872fd87 Mon Sep 17 00:00:00 2001 From: k22992068-crypto <286215529+k22992068-crypto@users.noreply.github.com> Date: Mon, 15 Jun 2026 15:10:05 +0900 Subject: [PATCH 11/23] =?UTF-8?q?=E2=9C=A8=20[Artifact=201492]=20=E3=80=8C?= =?UTF-8?q?=E7=B9=8B=E5=89=B5=E3=82=92=E6=83=B3=E3=81=86=E9=A1=8D=E7=B8=81?= =?UTF-8?q?=E3=80=8D=E3=81=AB=E5=90=8D=E5=89=8D=E3=82=92=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifact/1492.your_thoughts_frames/give/2.give.mcfunction | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/give/2.give.mcfunction index 5d1039e125c..7acb303446b 100644 --- a/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/give/2.give.mcfunction @@ -13,9 +13,9 @@ # 神器のベースアイテム data modify storage asset:artifact Item set value "minecraft:stick" # 神器の名前 (TextComponentString) - data modify storage asset:artifact Name set value '[{"text":"古","color":"#E499FF"},{"text":"き","color":"#DAA1FF"},{"text":"想","color":"#DAA1FF"},{"text":"い","color":"#C5A5FF"},{"text":"の","color":"#B8A8FF"},{"text":"額縁","color":"#9EAEFF"}]' + data modify storage asset:artifact Name set value '[{"text":"「繋","color":"#E499FF"},{"text":"創","color":"#DAA1FF"},{"text":"を","color":"#DAA1FF"},{"text":"想","color":"#C5A5FF"},{"text":"う","color":"#B8A8FF"},{"text":"額","color":"#9EAEFF"},{"text":"縁」","color":"#93AAFE"}]' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text":"発動時、敵が”気持ちの欠片”を近くに落とす"}','{"text":"気持ちの欠片に触れたプレイヤーはMPを31.4回復する。"}','{"text":"「まだ喉元に噛みつく牙はある?」","color":"gray"}'] + data modify storage asset:artifact Lore set value ['{"text":"発動時、敵が”気持ちの欠片”を近くに落とす"}','{"text":"気持ちの欠片に触れたプレイヤーはMPを31.4回復する。"}','{"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 From cc805c347b46db82ae3e31c4f4c0b42e8aea2398 Mon Sep 17 00:00:00 2001 From: k22992068-crypto <286215529+k22992068-crypto@users.noreply.github.com> Date: Mon, 15 Jun 2026 15:52:43 +0900 Subject: [PATCH 12/23] =?UTF-8?q?=E2=9C=A8=20[Artifact=201492]=20=E3=80=8E?= =?UTF-8?q?=E7=B9=8B=E5=89=B5=E3=82=92=E6=83=B3=E3=81=86=E9=A1=8D=E7=B8=81?= =?UTF-8?q?=E3=80=8F=E3=81=AB=E5=90=8D=E5=89=8D=E3=82=92=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifact/1492.your_thoughts_frames/give/2.give.mcfunction | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/give/2.give.mcfunction index 7acb303446b..bc0884d8a75 100644 --- a/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/give/2.give.mcfunction @@ -13,9 +13,9 @@ # 神器のベースアイテム data modify storage asset:artifact Item set value "minecraft:stick" # 神器の名前 (TextComponentString) - data modify storage asset:artifact Name set value '[{"text":"「繋","color":"#E499FF"},{"text":"創","color":"#DAA1FF"},{"text":"を","color":"#DAA1FF"},{"text":"想","color":"#C5A5FF"},{"text":"う","color":"#B8A8FF"},{"text":"額","color":"#9EAEFF"},{"text":"縁」","color":"#93AAFE"}]' + data modify storage asset:artifact Name set value '[{"text":"『繋","color":"#E499FF"},{"text":"創","color":"#DAA1FF"},{"text":"を","color":"#DAA1FF"},{"text":"想","color":"#C5A5FF"},{"text":"う","color":"#B8A8FF"},{"text":"額","color":"#9EAEFF"},{"text":"縁』","color":"#93AAFE"}]' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text":"発動時、敵が”気持ちの欠片”を近くに落とす"}','{"text":"気持ちの欠片に触れたプレイヤーはMPを31.4回復する。"}','{"text":"-まだ喉元に噛みつく牙はある?","color":"gray"}'] + data modify storage asset:artifact Lore set value ['{"text":"発動時、敵が”気持ちの欠片”を近くに落とす"}','{"text":"気持ちの欠片に触れたプレイヤーはMPを31.4回復する。"}','{"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 From a9bdadfed51d5680dc5a4dbfe56ffd5a4556fffb Mon Sep 17 00:00:00 2001 From: k22992068-crypto <286215529+k22992068-crypto@users.noreply.github.com> Date: Tue, 23 Jun 2026 20:42:31 +0900 Subject: [PATCH 13/23] =?UTF-8?q?=E2=9C=A8=20[Artifact=201492]=20=E3=80=8E?= =?UTF-8?q?=E6=95=85=E6=83=B3=E3=81=AE=E9=A1=8D=E7=B8=81=E3=80=8F=E3=81=AE?= =?UTF-8?q?=E3=83=90=E3=83=95=E3=82=92MP=E5=9B=9E=E5=BE=A9=E9=87=8F?= =?UTF-8?q?=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../give/2.give.mcfunction | 12 +++--- .../trigger/2.check_condition.mcfunction | 6 ++- .../trigger/summon.mcfunction | 7 +++- .../_/end.mcfunction | 7 ++++ .../_/given.mcfunction | 7 ++++ .../_/re-given.mcfunction | 7 ++++ .../_/register.mcfunction | 7 ++++ .../_/tick.mcfunction | 7 ++++ .../effect/reset.mcfunction | 12 ++++++ .../effect/set.mcfunction | 28 +++++++++++++ .../end/.mcfunction | 8 ++++ .../given/.mcfunction | 10 +++++ .../re-given/.mcfunction | 10 +++++ .../register.mcfunction | 42 +++++++++++++++++++ .../tick/.mcfunction | 9 ++++ .../tick/set_modifier.mcfunction | 12 ++++++ .../tick/update_effect.mcfunction | 12 ++++++ .../register.mcfunction | 5 ++- .../tick/hit_player.mcfunction | 11 +++-- .../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/tick.json | 3 +- 24 files changed, 215 insertions(+), 19 deletions(-) create mode 100644 Asset/data/asset/functions/effect/0373.longevity_your_thoughts/_/end.mcfunction create mode 100644 Asset/data/asset/functions/effect/0373.longevity_your_thoughts/_/given.mcfunction create mode 100644 Asset/data/asset/functions/effect/0373.longevity_your_thoughts/_/re-given.mcfunction create mode 100644 Asset/data/asset/functions/effect/0373.longevity_your_thoughts/_/register.mcfunction create mode 100644 Asset/data/asset/functions/effect/0373.longevity_your_thoughts/_/tick.mcfunction create mode 100644 Asset/data/asset/functions/effect/0373.longevity_your_thoughts/effect/reset.mcfunction create mode 100644 Asset/data/asset/functions/effect/0373.longevity_your_thoughts/effect/set.mcfunction create mode 100644 Asset/data/asset/functions/effect/0373.longevity_your_thoughts/end/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0373.longevity_your_thoughts/given/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0373.longevity_your_thoughts/re-given/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0373.longevity_your_thoughts/register.mcfunction create mode 100644 Asset/data/asset/functions/effect/0373.longevity_your_thoughts/tick/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0373.longevity_your_thoughts/tick/set_modifier.mcfunction create mode 100644 Asset/data/asset/functions/effect/0373.longevity_your_thoughts/tick/update_effect.mcfunction diff --git a/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/give/2.give.mcfunction index bc0884d8a75..2dc5f38619b 100644 --- a/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/give/2.give.mcfunction @@ -13,9 +13,9 @@ # 神器のベースアイテム data modify storage asset:artifact Item set value "minecraft:stick" # 神器の名前 (TextComponentString) - data modify storage asset:artifact Name set value '[{"text":"『繋","color":"#E499FF"},{"text":"創","color":"#DAA1FF"},{"text":"を","color":"#DAA1FF"},{"text":"想","color":"#C5A5FF"},{"text":"う","color":"#B8A8FF"},{"text":"額","color":"#9EAEFF"},{"text":"縁』","color":"#93AAFE"}]' + data modify storage asset:artifact Name set value '[{"text":"『故","color":"#DAA1FF"},{"text":"想","color":"#DAA1FF"},{"text":"の","color":"#C5A5FF"},{"text":"額","color":"#B8A8FF"},{"text":"縁』","color":"#9EAEFF"}]' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text":"発動時、敵が”気持ちの欠片”を近くに落とす"}','{"text":"気持ちの欠片に触れたプレイヤーはMPを31.4回復する。"}','{"text":"「まだ喉元に噛みつく牙はある?」","color":"gray"}'] + data modify storage asset:artifact Lore set value ['{"text":"発動時、敵が”気持ちの欠片”を近くに落とす"}','{"text":"気持ちの欠片に触れたプレイヤーはMP回復量+25%を得る"}','{"text":"バフは2秒ごとに効果量が-5%され、10秒後に切れる"}','{"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 @@ -27,7 +27,7 @@ # 神器のトリガー (string) Wikiを参照 data modify storage asset:artifact Trigger set value "onAttack" # 神器の発動条件 (TextComponentString) (オプション) - data modify storage asset:artifact Condition set value '{"text":"3%の確率で発動"}' + data modify storage asset:artifact Condition set value '{"text":"3.1416%の確率で発動"}' # 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) # data modify storage asset:artifact AttackInfo.Damage set value [0,0] # 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) @@ -46,8 +46,8 @@ # data modify storage asset:artifact MPRequire set value # MP回復量 (int) # data modify storage asset:artifact MPHealWhenHit set value -# 神器のクールダウン 黄金比(約)1:1.618にちなみ16.20s - data modify storage asset:artifact LocalCooldown set value 324 +# 神器のクールダウン + data modify storage asset:artifact LocalCooldown set value 60 # 種別クールダウン ({Type: string, Duration: int}) (オプション) # data modify storage asset:artifact TypeCooldown.Type set value # data modify storage asset:artifact TypeCooldown.Duration set value @@ -60,7 +60,7 @@ # 破壊時の音を鳴らさないかどうか (boolean) (オプション) # data modify storage asset:artifact DisableBreakSound set value # 扱える神 (string[]) Wikiを参照 - data modify storage asset:artifact CanUsedGod set value ["Flora","wi-ki","Rumor"] + data modify storage asset:artifact CanUsedGod set value "ALL" # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) # data modify storage asset:artifact CustomNBT set value {} diff --git a/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/2.check_condition.mcfunction index 660615448f3..c21eba3fbc7 100644 --- a/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/2.check_condition.mcfunction +++ b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/2.check_condition.mcfunction @@ -10,8 +10,10 @@ # IsDoT:trueならCanUsedを削除 execute if entity @s[tag=CanUsed] if data storage asset:context Attack{IsDoT:true} run tag @s remove CanUsed -# 3%の確率でCanUsedを残す(MP回復量とクールダウンはモチーフがある故調整するならここを調整してほしい気持ちがある) - execute unless predicate lib:random_pass_per/3 run tag @s remove CanUsed +# 3.1416%の確率でCanUsedを残す(7%*51%*88%=3.1416%) + execute unless predicate lib:random_pass_per/7 run tag @s remove CanUsed + execute unless predicate lib:random_pass_per/51 run tag @s remove CanUsed + execute unless predicate lib:random_pass_per/88 run tag @s remove CanUsed # CanUsedタグをチェックして3.main.mcfunctionを実行する execute if entity @s[tag=CanUsed] run function asset:artifact/1492.your_thoughts_frames/trigger/3.main diff --git a/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/summon.mcfunction b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/summon.mcfunction index 61bde18dced..82debe80a60 100644 --- a/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/summon.mcfunction +++ b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/summon.mcfunction @@ -7,7 +7,10 @@ # 演出 particle item pink_stained_glass ~ ~1 ~ 0.3 0.5 0.3 0.1 100 normal @a -# 召喚(MP回復量は円周率にちなみ31.4回復する。) +# 召喚 data modify storage api: Argument.ID set value 1164 - data modify storage api: Argument.FieldOverride.MPHeal set value 31.4 + data modify storage api: Argument.FieldOverride.Stack set value 5 + data modify storage api: Argument.FieldOverride.Amount set value 0.05d + data modify storage api: Argument.FieldOverride.Duration set value 200 + data modify storage api: Argument.FieldOverride.DecreaInterval set value 40 execute positioned ~ ~1 ~ run function api:object/summon diff --git a/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/_/end.mcfunction b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/_/end.mcfunction new file mode 100644 index 00000000000..149dee12464 --- /dev/null +++ b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/_/end.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0373.longevity_your_thoughts/_/end +# +# Effectの効果の終了時に実行されるfunction +# +# @within tag/function asset:effect/end + +execute if data storage asset:context {id:373} run function asset:effect/0373.longevity_your_thoughts/end/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/_/given.mcfunction b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/_/given.mcfunction new file mode 100644 index 00000000000..a46b1f74f02 --- /dev/null +++ b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/_/given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0373.longevity_your_thoughts/_/given +# +# Effectが付与された時に実行されるfunction +# +# @within tag/function asset:effect/given + +execute if data storage asset:context {id:373} run function asset:effect/0373.longevity_your_thoughts/given/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/_/re-given.mcfunction b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/_/re-given.mcfunction new file mode 100644 index 00000000000..91393d7b68c --- /dev/null +++ b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/_/re-given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0373.longevity_your_thoughts/_/re-given +# +# Effectが上書きされた時に実行されるfunction +# +# @within tag/function asset:effect/re-given + +execute if data storage asset:context {id:373} run function asset:effect/0373.longevity_your_thoughts/re-given/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/_/register.mcfunction b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/_/register.mcfunction new file mode 100644 index 00000000000..0c32c07f6d9 --- /dev/null +++ b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/_/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0373.longevity_your_thoughts/_/register +# +# +# +# @within tag/function asset:effect/register + +execute if data storage asset:context {id:373} run function asset:effect/0373.longevity_your_thoughts/register \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/_/tick.mcfunction b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/_/tick.mcfunction new file mode 100644 index 00000000000..3324a200945 --- /dev/null +++ b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/_/tick.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0373.longevity_your_thoughts/_/tick +# +# Effectが発動している間毎tick実行されるfunction +# +# @within tag/function asset:effect/tick + +execute if data storage asset:context {id:373} run function asset:effect/0373.longevity_your_thoughts/tick/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/effect/reset.mcfunction b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/effect/reset.mcfunction new file mode 100644 index 00000000000..1dc18a09782 --- /dev/null +++ b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/effect/reset.mcfunction @@ -0,0 +1,12 @@ +#> asset:effect/0373.longevity_your_thoughts/effect/reset +# +# エフェクトのリセット処理 +# +# @within function +# asset:effect/0373.longevity_your_thoughts/end/ +# asset:effect/0373.longevity_your_thoughts/re-given/ +# asset:effect/0373.longevity_your_thoughts/tick/update_effect + +# 補正をリセット + data modify storage api: Argument.UUID set from storage asset:context this.UUID + function api:modifier/mp_heal/remove diff --git a/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/effect/set.mcfunction b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/effect/set.mcfunction new file mode 100644 index 00000000000..2758e7bdd5b --- /dev/null +++ b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/effect/set.mcfunction @@ -0,0 +1,28 @@ +#> asset:effect/0373.longevity_your_thoughts/effect/set +# +# 初期化処理 +# +# @within function +# asset:effect/0373.longevity_your_thoughts/given/ +# asset:effect/0373.longevity_your_thoughts/re-given/ +# asset:effect/0373.longevity_your_thoughts/tick/update_effect + +#> val +# @private + #declare score_holder $15G.Stack + #declare score_holder $15G.Amount + +# MP回復量バフの計算(Stack*Amount) + execute store result score $15G.Stack Temporary run data get storage asset:context Stack 1 + execute store result score $15G.Amount Temporary run data get storage asset:context this.Amount 100 + scoreboard players operation $15G.Amount Temporary *= $15G.Stack Temporary + +# MP回復量 + data modify storage api: Argument.UUID set from storage asset:context this.UUID + execute store result storage api: Argument.Amount double 0.01 run scoreboard players get $15G.Amount Temporary + data modify storage api: Argument.Operation set value "multiply" + function api:modifier/mp_heal/add + +# リセット + scoreboard players reset $15G.Stack Temporary + scoreboard players reset $15G.Amount Temporary diff --git a/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/end/.mcfunction b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/end/.mcfunction new file mode 100644 index 00000000000..809a054b3d8 --- /dev/null +++ b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/end/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0373.longevity_your_thoughts/end/ +# +# Effectの効果が切れた時の処理 +# +# @within function asset:effect/0373.longevity_your_thoughts/_/end + +# 補正をリセット + function asset:effect/0373.longevity_your_thoughts/effect/reset diff --git a/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/given/.mcfunction b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/given/.mcfunction new file mode 100644 index 00000000000..49d6dd24252 --- /dev/null +++ b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/given/.mcfunction @@ -0,0 +1,10 @@ +#> asset:effect/0373.longevity_your_thoughts/given/ +# +# Effectが付与された時の処理 +# +# @within function asset:effect/0373.longevity_your_thoughts/_/given + +# 初期化処理 + function asset:effect/0373.longevity_your_thoughts/effect/set +# TickにDecreaIntervalをセット + data modify storage asset:context this.Tick set from storage asset:context this.DecreaInterval diff --git a/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/re-given/.mcfunction b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/re-given/.mcfunction new file mode 100644 index 00000000000..c415f1094c0 --- /dev/null +++ b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/re-given/.mcfunction @@ -0,0 +1,10 @@ +#> asset:effect/0373.longevity_your_thoughts/re-given/ +# +# Effectが上書きされた時の処理 +# +# @within function asset:effect/0373.longevity_your_thoughts/_/re-given + +# 補正をリセット + function asset:effect/0373.longevity_your_thoughts/effect/reset +# 初期化処理 + function asset:effect/0373.longevity_your_thoughts/effect/set diff --git a/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/register.mcfunction b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/register.mcfunction new file mode 100644 index 00000000000..24c826c8631 --- /dev/null +++ b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/register.mcfunction @@ -0,0 +1,42 @@ +#> asset:effect/0373.longevity_your_thoughts/register +# +# Effectのデータを指定 +# +# @within function asset:effect/0373.longevity_your_thoughts/_/register + +# ExtendsSafe (boolean) (default = false) + # data modify storage asset:effect ExtendsSafe set value true +# ID (int) + data modify storage asset:effect ID set value 373 +# 名前 (TextComponentString) + data modify storage asset:effect Name set value '{"text":"遺るあなたの想い","color":"#DAA1FF"}' +# 説明文 (TextComponentString[]) + data modify storage asset:effect Description set value ['{"text":"MP回復量が上昇する"}','{"text":"効果は時間とともに減少する"}'] +# 効果時間 (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 "forceReplace" +# スタックの操作方法 (default = API || "replace") + data modify storage asset:effect StackOperation set value "forceReplace" +# 最大効果時間 (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.UUID set value [I;1,3,373,0] + data modify storage asset:effect Field.Amount set value 0.05d + data modify storage asset:effect Field.DecreaInterval set value 40 + data modify storage asset:effect Field.Tick set value 40 diff --git a/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/tick/.mcfunction b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/tick/.mcfunction new file mode 100644 index 00000000000..85944587a98 --- /dev/null +++ b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/tick/.mcfunction @@ -0,0 +1,9 @@ +#> asset:effect/0373.longevity_your_thoughts/tick/ +# +# Effectのtick処理 +# +# @within function asset:effect/0373.longevity_your_thoughts/_/tick + +# DecreaIntervalTickごとにスタックを減らし効果を更新する + execute store result storage asset:context this.Tick int 0.9999999999 run data get storage asset:context this.Tick 1 + execute if data storage asset:context this{Tick:0} run function asset:effect/0373.longevity_your_thoughts/tick/set_modifier diff --git a/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/tick/set_modifier.mcfunction b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/tick/set_modifier.mcfunction new file mode 100644 index 00000000000..442dfb1ce5a --- /dev/null +++ b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/tick/set_modifier.mcfunction @@ -0,0 +1,12 @@ +#> asset:effect/0373.longevity_your_thoughts/tick/set_modifier +# +# 効果の更新 +# +# @within function asset:effect/0373.longevity_your_thoughts/tick/ + +# TickにDecreaIntervalをセット + data modify storage asset:context this.Tick set from storage asset:context this.DecreaInterval + +# スタックを減らし効果量を更新 + # もしスタックが1より多いならスタックを減らし、効果を更新する + execute unless data storage asset:context this{Stack:..1} run function asset:effect/0373.longevity_your_thoughts/tick/update_effect diff --git a/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/tick/update_effect.mcfunction b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/tick/update_effect.mcfunction new file mode 100644 index 00000000000..e293e3e58a2 --- /dev/null +++ b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/tick/update_effect.mcfunction @@ -0,0 +1,12 @@ +#> asset:effect/0373.longevity_your_thoughts/tick/update_effect +# +# エフェクトの終了 +# +# @within function asset:effect/0373.longevity_your_thoughts/tick/set_modifier + +# スタックと効果量の更新 + execute store result storage asset:context Stack int 0.9999999999 run data get storage asset:context Stack + # 補正をリセット + function asset:effect/0373.longevity_your_thoughts/effect/reset + # 効果量の更新 + execute unless data storage asset:context this{Stack:0} run function asset:effect/0373.longevity_your_thoughts/effect/set diff --git a/Asset/data/asset/functions/object/1164.piece_of_creation/register.mcfunction b/Asset/data/asset/functions/object/1164.piece_of_creation/register.mcfunction index 4a32a8f1ac6..0739354e36c 100644 --- a/Asset/data/asset/functions/object/1164.piece_of_creation/register.mcfunction +++ b/Asset/data/asset/functions/object/1164.piece_of_creation/register.mcfunction @@ -17,4 +17,7 @@ # ID (int) data modify storage asset:object ID set value 1164 # フィールド(オプション) - data modify storage asset:object Field.MPHeal set value 30 + data modify storage asset:object Field.Stack set value 5 + data modify storage asset:object Field.Amount set value 0.05 + data modify storage asset:object Field.Duration set value 200 + data modify storage asset:object Field.DecreaTime set value 40 diff --git a/Asset/data/asset/functions/object/1164.piece_of_creation/tick/hit_player.mcfunction b/Asset/data/asset/functions/object/1164.piece_of_creation/tick/hit_player.mcfunction index 089ca60e102..c3a318f48a7 100644 --- a/Asset/data/asset/functions/object/1164.piece_of_creation/tick/hit_player.mcfunction +++ b/Asset/data/asset/functions/object/1164.piece_of_creation/tick/hit_player.mcfunction @@ -12,9 +12,14 @@ particle minecraft:dust_color_transition 1 0.4 1 0.8 0.2 0.8 1 ~ ~ ~ 0.4 0.4 0.4 1 40 particle end_rod ~0.5 ~0.5 ~0.5 0 0 0 0.2 20 -# hitしたプレイヤーのMPを回復する - data modify storage api: Argument.Fluctuation set from storage asset:context this.MPHeal - execute as @a[gamemode=!spectator,tag=!Death,dx=0,limit=1] run function api:mp/fluctuation +# hitしたプレイヤーにMP回復量バフを与える + data modify storage api: Argument.ID set value 373 + data modify storage api: Argument.Duration set from storage asset:context this.Duration + data modify storage api: Argument.Stack set from storage asset:context this.Stack + data modify storage api: Argument.FieldOverride.Amount set from storage asset:context this.Amount + data modify storage api: Argument.FieldOverride.DecreaInterval set from storage asset:context this.DecreaInterval + execute as @a[gamemode=!spectator,tag=!Death,dx=0,limit=1] run function api:entity/mob/effect/give + function api:entity/mob/effect/reset # 消滅処理 kill @s diff --git a/Asset/data/asset/tags/functions/effect/end.json b/Asset/data/asset/tags/functions/effect/end.json index 1a5597bf84c..cc42c63444a 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/0373.longevity_your_thoughts/_/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 e777db47b04..a2d012038e5 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/0373.longevity_your_thoughts/_/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 344d5ff7a53..f655d232c2b 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/0373.longevity_your_thoughts/_/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 6b9eed8b150..fc56e5eb537 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/0373.longevity_your_thoughts/_/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/tick.json b/Asset/data/asset/tags/functions/effect/tick.json index df897d71c37..99e756a9263 100644 --- a/Asset/data/asset/tags/functions/effect/tick.json +++ b/Asset/data/asset/tags/functions/effect/tick.json @@ -1,5 +1,6 @@ { "values": [ + "asset:effect/0373.longevity_your_thoughts/_/tick", "asset:effect/0348.cool_feeling/_/tick", "asset:effect/0356.dolphin_blessing/_/tick", "asset:effect/0346.lunatic_time/_/tick", @@ -106,4 +107,4 @@ "asset:effect/0279.poison_of_vinderre/_/tick", "asset:effect/0258.spirit_melody/_/tick" ] -} +} \ No newline at end of file From 743d4a5aa608a8515bdd5c56564c104f844c0cba Mon Sep 17 00:00:00 2001 From: k22992068-crypto <286215529+k22992068-crypto@users.noreply.github.com> Date: Wed, 1 Jul 2026 18:40:09 +0900 Subject: [PATCH 14/23] =?UTF-8?q?=E2=9C=A8=20[Artifact=201492]=20=E3=80=8E?= =?UTF-8?q?=E6=95=85=E6=83=B3=E3=81=AE=E9=A1=8D=E7=B8=81=E3=80=8F=E3=81=AE?= =?UTF-8?q?=E3=83=88=E3=83=AA=E3=82=AC=E3=83=BC=E3=81=A7=E3=83=90=E3=83=8B?= =?UTF-8?q?=E3=83=A9=E6=94=BB=E6=92=83=E3=82=92=E3=81=AF=E3=81=98=E3=81=8F?= =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifact/1492.your_thoughts_frames/give/2.give.mcfunction | 2 +- .../trigger/2.check_condition.mcfunction | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/give/2.give.mcfunction index 2dc5f38619b..c23428c68f5 100644 --- a/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/give/2.give.mcfunction @@ -27,7 +27,7 @@ # 神器のトリガー (string) Wikiを参照 data modify storage asset:artifact Trigger set value "onAttack" # 神器の発動条件 (TextComponentString) (オプション) - data modify storage asset:artifact Condition set value '{"text":"3.1416%の確率で発動"}' + data modify storage asset:artifact Condition set value '{"text":"属性攻撃時に3.1416%の確率で発動"}' # 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) # data modify storage asset:artifact AttackInfo.Damage set value [0,0] # 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) diff --git a/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/2.check_condition.mcfunction index c21eba3fbc7..3cf23f72a0e 100644 --- a/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/2.check_condition.mcfunction +++ b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/2.check_condition.mcfunction @@ -9,6 +9,8 @@ # IsDoT:trueならCanUsedを削除 execute if entity @s[tag=CanUsed] if data storage asset:context Attack{IsDoT:true} run tag @s remove CanUsed +# バニラ攻撃の場合はCanUsedを削除 + execute if data storage asset:context Attack{IsVanilla:1b} run tag @s remove CanUsed # 3.1416%の確率でCanUsedを残す(7%*51%*88%=3.1416%) execute unless predicate lib:random_pass_per/7 run tag @s remove CanUsed From e0efc2715289a7cd33f453cac716c1fbadd8fa77 Mon Sep 17 00:00:00 2001 From: k22992068-crypto <286215529+k22992068-crypto@users.noreply.github.com> Date: Wed, 1 Jul 2026 23:34:20 +0900 Subject: [PATCH 15/23] =?UTF-8?q?=F0=9F=A9=B9=20[Artifact=201492]=20?= =?UTF-8?q?=E3=80=8E=E6=95=85=E6=83=B3=E3=81=AE=E9=A1=8D=E7=B8=81=E3=80=8F?= =?UTF-8?q?=E3=81=AE=E7=99=BA=E5=8B=95=E6=9D=A1=E4=BB=B6=E3=81=AE=E8=AA=AC?= =?UTF-8?q?=E6=98=8E=E6=96=87=E3=82=92=E3=82=8F=E3=81=8B=E3=82=8A=E3=82=84?= =?UTF-8?q?=E3=81=99=E3=81=84=E3=82=88=E3=81=86=E3=81=AB=E5=BE=AE=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifact/1492.your_thoughts_frames/give/2.give.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/give/2.give.mcfunction index c23428c68f5..a6705d0fa4b 100644 --- a/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/give/2.give.mcfunction @@ -27,7 +27,7 @@ # 神器のトリガー (string) Wikiを参照 data modify storage asset:artifact Trigger set value "onAttack" # 神器の発動条件 (TextComponentString) (オプション) - data modify storage asset:artifact Condition set value '{"text":"属性攻撃時に3.1416%の確率で発動"}' + data modify storage asset:artifact Condition set value '{"text":"神器による攻撃時に3.1416%の確率で発動"}' # 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) # data modify storage asset:artifact AttackInfo.Damage set value [0,0] # 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) From c44de18cfece67622c55f4a48d7cb039ad53b844 Mon Sep 17 00:00:00 2001 From: k22992068-crypto <286215529+k22992068-crypto@users.noreply.github.com> Date: Sat, 18 Jul 2026 10:57:07 +0900 Subject: [PATCH 16/23] =?UTF-8?q?=F0=9F=A9=B9=20[Artifact=201492]=20?= =?UTF-8?q?=E3=80=8E=E6=95=85=E6=83=B3=E3=81=AE=E9=A1=8D=E7=B8=81=E3=80=8F?= =?UTF-8?q?=E3=81=AE=E5=B0=91=E3=81=97=E3=81=8A=E3=81=8B=E3=81=97=E3=81=AA?= =?UTF-8?q?=E3=83=95=E3=82=A3=E3=83=BC=E3=83=AB=E3=83=89=E5=90=8D=E3=82=92?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1492.your_thoughts_frames/trigger/summon.mcfunction | 2 +- .../effect/0373.longevity_your_thoughts/given/.mcfunction | 4 ++-- .../effect/0373.longevity_your_thoughts/register.mcfunction | 2 +- .../effect/0373.longevity_your_thoughts/tick/.mcfunction | 2 +- .../0373.longevity_your_thoughts/tick/set_modifier.mcfunction | 4 ++-- .../object/1164.piece_of_creation/tick/hit_player.mcfunction | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/summon.mcfunction b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/summon.mcfunction index 82debe80a60..d92b66591eb 100644 --- a/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/summon.mcfunction +++ b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/summon.mcfunction @@ -12,5 +12,5 @@ data modify storage api: Argument.FieldOverride.Stack set value 5 data modify storage api: Argument.FieldOverride.Amount set value 0.05d data modify storage api: Argument.FieldOverride.Duration set value 200 - data modify storage api: Argument.FieldOverride.DecreaInterval set value 40 + data modify storage api: Argument.FieldOverride.DecreaseInterval set value 40 execute positioned ~ ~1 ~ run function api:object/summon diff --git a/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/given/.mcfunction b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/given/.mcfunction index 49d6dd24252..1430a3947dc 100644 --- a/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/given/.mcfunction +++ b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/given/.mcfunction @@ -6,5 +6,5 @@ # 初期化処理 function asset:effect/0373.longevity_your_thoughts/effect/set -# TickにDecreaIntervalをセット - data modify storage asset:context this.Tick set from storage asset:context this.DecreaInterval +# TickにDecreaseIntervalをセット + data modify storage asset:context this.Tick set from storage asset:context this.DecreaseInterval diff --git a/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/register.mcfunction b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/register.mcfunction index 24c826c8631..a9a7ed38721 100644 --- a/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/register.mcfunction +++ b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/register.mcfunction @@ -38,5 +38,5 @@ # フィールド data modify storage asset:effect Field.UUID set value [I;1,3,373,0] data modify storage asset:effect Field.Amount set value 0.05d - data modify storage asset:effect Field.DecreaInterval set value 40 + data modify storage asset:effect Field.DecreaseInterval set value 40 data modify storage asset:effect Field.Tick set value 40 diff --git a/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/tick/.mcfunction b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/tick/.mcfunction index 85944587a98..a1265afb386 100644 --- a/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/tick/.mcfunction +++ b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/tick/.mcfunction @@ -4,6 +4,6 @@ # # @within function asset:effect/0373.longevity_your_thoughts/_/tick -# DecreaIntervalTickごとにスタックを減らし効果を更新する +# DecreaseIntervalTickごとにスタックを減らし効果を更新する execute store result storage asset:context this.Tick int 0.9999999999 run data get storage asset:context this.Tick 1 execute if data storage asset:context this{Tick:0} run function asset:effect/0373.longevity_your_thoughts/tick/set_modifier diff --git a/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/tick/set_modifier.mcfunction b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/tick/set_modifier.mcfunction index 442dfb1ce5a..706371c5740 100644 --- a/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/tick/set_modifier.mcfunction +++ b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/tick/set_modifier.mcfunction @@ -4,8 +4,8 @@ # # @within function asset:effect/0373.longevity_your_thoughts/tick/ -# TickにDecreaIntervalをセット - data modify storage asset:context this.Tick set from storage asset:context this.DecreaInterval +# TickにDecreaseIntervalをセット + data modify storage asset:context this.Tick set from storage asset:context this.DecreaseInterval # スタックを減らし効果量を更新 # もしスタックが1より多いならスタックを減らし、効果を更新する diff --git a/Asset/data/asset/functions/object/1164.piece_of_creation/tick/hit_player.mcfunction b/Asset/data/asset/functions/object/1164.piece_of_creation/tick/hit_player.mcfunction index c3a318f48a7..67bac350763 100644 --- a/Asset/data/asset/functions/object/1164.piece_of_creation/tick/hit_player.mcfunction +++ b/Asset/data/asset/functions/object/1164.piece_of_creation/tick/hit_player.mcfunction @@ -17,7 +17,7 @@ data modify storage api: Argument.Duration set from storage asset:context this.Duration data modify storage api: Argument.Stack set from storage asset:context this.Stack data modify storage api: Argument.FieldOverride.Amount set from storage asset:context this.Amount - data modify storage api: Argument.FieldOverride.DecreaInterval set from storage asset:context this.DecreaInterval + data modify storage api: Argument.FieldOverride.DecreaseInterval set from storage asset:context this.DecreaseInterval execute as @a[gamemode=!spectator,tag=!Death,dx=0,limit=1] run function api:entity/mob/effect/give function api:entity/mob/effect/reset From 874c0dd032118bd7e56ada51b6c4382525025361 Mon Sep 17 00:00:00 2001 From: k22992068-crypto <286215529+k22992068-crypto@users.noreply.github.com> Date: Mon, 21 Sep 2026 17:00:37 +0900 Subject: [PATCH 17/23] =?UTF-8?q?=F0=9F=8E=A8=20[Artifact=201492]=20?= =?UTF-8?q?=E3=80=8E=E6=95=85=E6=83=B3=E3=81=AE=E9=A1=8D=E7=B8=81=E3=80=8F?= =?UTF-8?q?=E3=81=AE=E3=83=90=E3=83=95=E5=8A=B9=E6=9E=9C=E3=82=92=E5=A4=89?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../give/2.give.mcfunction | 4 ++-- .../trigger/summon.mcfunction | 4 ++-- .../effect/set.mcfunction | 16 +--------------- .../given/.mcfunction | 2 -- .../register.mcfunction | 12 +++++------- .../tick/.mcfunction | 5 ++--- .../tick/set_modifier.mcfunction | 12 ------------ .../tick/update_effect.mcfunction | 12 ------------ .../1164.piece_of_creation/register.mcfunction | 4 ++-- .../1164.piece_of_creation/tick/.mcfunction | 4 ++-- .../tick/hit_player.mcfunction | 16 ++++++++++++++-- 11 files changed, 30 insertions(+), 61 deletions(-) delete mode 100644 Asset/data/asset/functions/effect/0373.longevity_your_thoughts/tick/set_modifier.mcfunction delete mode 100644 Asset/data/asset/functions/effect/0373.longevity_your_thoughts/tick/update_effect.mcfunction diff --git a/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/give/2.give.mcfunction index a6705d0fa4b..642e2db85dd 100644 --- a/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '[{"text":"『故","color":"#DAA1FF"},{"text":"想","color":"#DAA1FF"},{"text":"の","color":"#C5A5FF"},{"text":"額","color":"#B8A8FF"},{"text":"縁』","color":"#9EAEFF"}]' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text":"発動時、敵が”気持ちの欠片”を近くに落とす"}','{"text":"気持ちの欠片に触れたプレイヤーはMP回復量+25%を得る"}','{"text":"バフは2秒ごとに効果量が-5%され、10秒後に切れる"}','{"text":"「まだ喉元に噛みつく牙はある?」","color":"gray"}'] + data modify storage asset:artifact Lore set value ['{"text":"発動時、敵が”気持ちの欠片”を近くに落とす"}','{"text":"気持ちの欠片に触れたプレイヤーはHPを5回復し"}','{"text":"10秒間MP回復量が+5%上昇する"}','{"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 @@ -47,7 +47,7 @@ # MP回復量 (int) # data modify storage asset:artifact MPHealWhenHit set value # 神器のクールダウン - data modify storage asset:artifact LocalCooldown set value 60 + data modify storage asset:artifact LocalCooldown set value 20 # 種別クールダウン ({Type: string, Duration: int}) (オプション) # data modify storage asset:artifact TypeCooldown.Type set value # data modify storage asset:artifact TypeCooldown.Duration set value diff --git a/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/summon.mcfunction b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/summon.mcfunction index d92b66591eb..944b521c61c 100644 --- a/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/summon.mcfunction +++ b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/summon.mcfunction @@ -9,8 +9,8 @@ # 召喚 data modify storage api: Argument.ID set value 1164 - data modify storage api: Argument.FieldOverride.Stack set value 5 data modify storage api: Argument.FieldOverride.Amount set value 0.05d data modify storage api: Argument.FieldOverride.Duration set value 200 - data modify storage api: Argument.FieldOverride.DecreaseInterval set value 40 + data modify storage api: Argument.FieldOverride.Heal set value 5.0d + execute store result storage api: Argument.FieldOverride.UserID int 1 run scoreboard players get @s UserID execute positioned ~ ~1 ~ run function api:object/summon diff --git a/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/effect/set.mcfunction b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/effect/set.mcfunction index 2758e7bdd5b..cdbf0f814ca 100644 --- a/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/effect/set.mcfunction +++ b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/effect/set.mcfunction @@ -7,22 +7,8 @@ # asset:effect/0373.longevity_your_thoughts/re-given/ # asset:effect/0373.longevity_your_thoughts/tick/update_effect -#> val -# @private - #declare score_holder $15G.Stack - #declare score_holder $15G.Amount - -# MP回復量バフの計算(Stack*Amount) - execute store result score $15G.Stack Temporary run data get storage asset:context Stack 1 - execute store result score $15G.Amount Temporary run data get storage asset:context this.Amount 100 - scoreboard players operation $15G.Amount Temporary *= $15G.Stack Temporary - # MP回復量 data modify storage api: Argument.UUID set from storage asset:context this.UUID - execute store result storage api: Argument.Amount double 0.01 run scoreboard players get $15G.Amount Temporary + data modify storage api: Argument.Amount set from storage asset:context this.Amount data modify storage api: Argument.Operation set value "multiply" function api:modifier/mp_heal/add - -# リセット - scoreboard players reset $15G.Stack Temporary - scoreboard players reset $15G.Amount Temporary diff --git a/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/given/.mcfunction b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/given/.mcfunction index 1430a3947dc..b7d8ce4ad8f 100644 --- a/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/given/.mcfunction +++ b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/given/.mcfunction @@ -6,5 +6,3 @@ # 初期化処理 function asset:effect/0373.longevity_your_thoughts/effect/set -# TickにDecreaseIntervalをセット - data modify storage asset:context this.Tick set from storage asset:context this.DecreaseInterval diff --git a/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/register.mcfunction b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/register.mcfunction index a9a7ed38721..d2fdad4f200 100644 --- a/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/register.mcfunction +++ b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/register.mcfunction @@ -11,19 +11,19 @@ # 名前 (TextComponentString) data modify storage asset:effect Name set value '{"text":"遺るあなたの想い","color":"#DAA1FF"}' # 説明文 (TextComponentString[]) - data modify storage asset:effect Description set value ['{"text":"MP回復量が上昇する"}','{"text":"効果は時間とともに減少する"}'] + data modify storage asset:effect Description set value ['{"text":"MP回復量が上昇する"}'] # 効果時間 (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 "forceReplace" + # data modify storage asset:effect DurationOperation set value # スタックの操作方法 (default = API || "replace") - data modify storage asset:effect StackOperation set value "forceReplace" + # 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 + data modify storage asset:effect MaxStack set value 1 # 悪い効果か否か (boolean) data modify storage asset:effect IsBadEffect set value false # 死亡時のエフェクトの処理 (default = "remove") @@ -33,10 +33,8 @@ # エフェクトを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 StackVisible set value false # フィールド data modify storage asset:effect Field.UUID set value [I;1,3,373,0] data modify storage asset:effect Field.Amount set value 0.05d - data modify storage asset:effect Field.DecreaseInterval set value 40 - data modify storage asset:effect Field.Tick set value 40 diff --git a/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/tick/.mcfunction b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/tick/.mcfunction index a1265afb386..760395cace0 100644 --- a/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/tick/.mcfunction +++ b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/tick/.mcfunction @@ -4,6 +4,5 @@ # # @within function asset:effect/0373.longevity_your_thoughts/_/tick -# DecreaseIntervalTickごとにスタックを減らし効果を更新する - execute store result storage asset:context this.Tick int 0.9999999999 run data get storage asset:context this.Tick 1 - execute if data storage asset:context this{Tick:0} run function asset:effect/0373.longevity_your_thoughts/tick/set_modifier +# 演出 + execute if predicate lib:random_pass_per/20 run particle minecraft:dust_color_transition 1 0.4 1 0.8 0.2 0.8 1 ~ ~1 ~ 0.4 0.4 0.4 1 10 diff --git a/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/tick/set_modifier.mcfunction b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/tick/set_modifier.mcfunction deleted file mode 100644 index 706371c5740..00000000000 --- a/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/tick/set_modifier.mcfunction +++ /dev/null @@ -1,12 +0,0 @@ -#> asset:effect/0373.longevity_your_thoughts/tick/set_modifier -# -# 効果の更新 -# -# @within function asset:effect/0373.longevity_your_thoughts/tick/ - -# TickにDecreaseIntervalをセット - data modify storage asset:context this.Tick set from storage asset:context this.DecreaseInterval - -# スタックを減らし効果量を更新 - # もしスタックが1より多いならスタックを減らし、効果を更新する - execute unless data storage asset:context this{Stack:..1} run function asset:effect/0373.longevity_your_thoughts/tick/update_effect diff --git a/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/tick/update_effect.mcfunction b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/tick/update_effect.mcfunction deleted file mode 100644 index e293e3e58a2..00000000000 --- a/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/tick/update_effect.mcfunction +++ /dev/null @@ -1,12 +0,0 @@ -#> asset:effect/0373.longevity_your_thoughts/tick/update_effect -# -# エフェクトの終了 -# -# @within function asset:effect/0373.longevity_your_thoughts/tick/set_modifier - -# スタックと効果量の更新 - execute store result storage asset:context Stack int 0.9999999999 run data get storage asset:context Stack - # 補正をリセット - function asset:effect/0373.longevity_your_thoughts/effect/reset - # 効果量の更新 - execute unless data storage asset:context this{Stack:0} run function asset:effect/0373.longevity_your_thoughts/effect/set diff --git a/Asset/data/asset/functions/object/1164.piece_of_creation/register.mcfunction b/Asset/data/asset/functions/object/1164.piece_of_creation/register.mcfunction index 0739354e36c..250f6da6298 100644 --- a/Asset/data/asset/functions/object/1164.piece_of_creation/register.mcfunction +++ b/Asset/data/asset/functions/object/1164.piece_of_creation/register.mcfunction @@ -17,7 +17,7 @@ # ID (int) data modify storage asset:object ID set value 1164 # フィールド(オプション) - data modify storage asset:object Field.Stack set value 5 data modify storage asset:object Field.Amount set value 0.05 data modify storage asset:object Field.Duration set value 200 - data modify storage asset:object Field.DecreaTime set value 40 + data modify storage asset:object Field.Heal set value 1 + data modify storage asset:object Field.UserID set value -1 diff --git a/Asset/data/asset/functions/object/1164.piece_of_creation/tick/.mcfunction b/Asset/data/asset/functions/object/1164.piece_of_creation/tick/.mcfunction index 06facb5a1c6..af960bcc7c0 100644 --- a/Asset/data/asset/functions/object/1164.piece_of_creation/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1164.piece_of_creation/tick/.mcfunction @@ -13,9 +13,9 @@ execute at @s run tp @s ~ ~ ~ ~3 ~ # 近くのプレイヤーに自身の向きを変えずに追尾 - execute at @s facing entity @a[gamemode=!spectator,tag=!Death,distance=..2,limit=1] eyes positioned ^ ^ ^0.25 run tp @s ~ ~ ~ + execute at @s facing entity @a[gamemode=!spectator,tag=!Death,distance=..3,limit=1] eyes positioned ^ ^ ^0.25 run tp @s ~ ~ ~ -# playerに触れるとMPを回復して消滅 +# playerとの接触処理 execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @a[gamemode=!spectator,tag=!Death,dx=0,limit=1] run function asset:object/1164.piece_of_creation/tick/hit_player # 消滅処理 diff --git a/Asset/data/asset/functions/object/1164.piece_of_creation/tick/hit_player.mcfunction b/Asset/data/asset/functions/object/1164.piece_of_creation/tick/hit_player.mcfunction index 67bac350763..a38ede3f022 100644 --- a/Asset/data/asset/functions/object/1164.piece_of_creation/tick/hit_player.mcfunction +++ b/Asset/data/asset/functions/object/1164.piece_of_creation/tick/hit_player.mcfunction @@ -4,6 +4,10 @@ # # @within function asset:object/1164.piece_of_creation/tick/ +#> private +# @private + #declare score_holder $UserID + # 演出 playsound minecraft:entity.arrow.hit_player player @a ~0.5 ~0.5 ~0.5 0.6 2 0.0 playsound minecraft:entity.allay.ambient_with_item player @a ~ ~ ~ 2.0 0.9 0.0 @@ -15,11 +19,19 @@ # hitしたプレイヤーにMP回復量バフを与える data modify storage api: Argument.ID set value 373 data modify storage api: Argument.Duration set from storage asset:context this.Duration - data modify storage api: Argument.Stack set from storage asset:context this.Stack data modify storage api: Argument.FieldOverride.Amount set from storage asset:context this.Amount - data modify storage api: Argument.FieldOverride.DecreaseInterval set from storage asset:context this.DecreaseInterval execute as @a[gamemode=!spectator,tag=!Death,dx=0,limit=1] run function api:entity/mob/effect/give function api:entity/mob/effect/reset +# 回復 + data modify storage api: Argument.Heal set from storage asset:context this.Heal + execute store result score $UserID Temporary run data get storage asset:context this.UserID + execute as @a if score @s UserID = $UserID Temporary run function api:heal/modifier + execute as @a[gamemode=!spectator,tag=!Death,dx=0,limit=1] run function api:heal/ + function api:heal/reset + +# リセット + scoreboard players reset $UserID Temporary + # 消滅処理 kill @s From 444eb7b9b10102908b16c87eedf15cd7f73f98d9 Mon Sep 17 00:00:00 2001 From: k22992068-crypto <286215529+k22992068-crypto@users.noreply.github.com> Date: Thu, 8 Oct 2026 22:13:16 +0900 Subject: [PATCH 18/23] =?UTF-8?q?=E3=82=A8=E3=83=95=E3=82=A7=E3=82=AF?= =?UTF-8?q?=E3=83=88=E3=81=AEremove=E3=81=AE=E5=AE=9F=E8=A3=85=E5=BF=98?= =?UTF-8?q?=E3=82=8C=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../0373.longevity_your_thoughts/_/remove.mcfunction | 7 +++++++ .../0373.longevity_your_thoughts/remove/.mcfunction | 8 ++++++++ Asset/data/asset/tags/functions/effect/remove.json | 1 + 3 files changed, 16 insertions(+) create mode 100644 Asset/data/asset/functions/effect/0373.longevity_your_thoughts/_/remove.mcfunction create mode 100644 Asset/data/asset/functions/effect/0373.longevity_your_thoughts/remove/.mcfunction diff --git a/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/_/remove.mcfunction b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/_/remove.mcfunction new file mode 100644 index 00000000000..1f9fc62f84d --- /dev/null +++ b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/_/remove.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0373.longevity_your_thoughts/_/remove +# +# Effectが神器や牛乳によって削除された時に実行されるfunction +# +# @within tag/function asset:effect/remove + +execute if data storage asset:context {id:373} run function asset:effect/0373.longevity_your_thoughts/remove/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/remove/.mcfunction b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/remove/.mcfunction new file mode 100644 index 00000000000..9607d156b47 --- /dev/null +++ b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/remove/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0373.longevity_your_thoughts/remove/ +# +# Effectが削除された時の処理 +# +# @within function asset:effect/0373.longevity_your_thoughts/_/remove + +# 補正をリセット + function asset:effect/0373.longevity_your_thoughts/effect/reset \ 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 eb09e87f9c4..8a960699e60 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/0373.longevity_your_thoughts/_/remove", "asset:effect/0371.tsukimi/_/remove", "asset:effect/0355.heart_gap/_/remove", "asset:effect/0354.protection_of_courage/_/remove", From 4942aaa63ee77214c856eb2e67f76faa3e95f838 Mon Sep 17 00:00:00 2001 From: k22992068-crypto <286215529+k22992068-crypto@users.noreply.github.com> Date: Fri, 9 Oct 2026 00:09:24 +0900 Subject: [PATCH 19/23] =?UTF-8?q?=E5=BF=85=E8=A6=81=E3=81=AA=E3=81=84regiv?= =?UTF-8?q?e=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../0373.longevity_your_thoughts/_/re-given.mcfunction | 7 ------- .../effect/reset.mcfunction | 3 +-- .../0373.longevity_your_thoughts/re-given/.mcfunction | 10 ---------- Asset/data/asset/tags/functions/effect/re-given.json | 1 - 4 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 Asset/data/asset/functions/effect/0373.longevity_your_thoughts/_/re-given.mcfunction delete mode 100644 Asset/data/asset/functions/effect/0373.longevity_your_thoughts/re-given/.mcfunction diff --git a/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/_/re-given.mcfunction b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/_/re-given.mcfunction deleted file mode 100644 index 91393d7b68c..00000000000 --- a/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/_/re-given.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> asset:effect/0373.longevity_your_thoughts/_/re-given -# -# Effectが上書きされた時に実行されるfunction -# -# @within tag/function asset:effect/re-given - -execute if data storage asset:context {id:373} run function asset:effect/0373.longevity_your_thoughts/re-given/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/effect/reset.mcfunction b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/effect/reset.mcfunction index 1dc18a09782..da81e8bbcf9 100644 --- a/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/effect/reset.mcfunction +++ b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/effect/reset.mcfunction @@ -4,8 +4,7 @@ # # @within function # asset:effect/0373.longevity_your_thoughts/end/ -# asset:effect/0373.longevity_your_thoughts/re-given/ -# asset:effect/0373.longevity_your_thoughts/tick/update_effect +# asset:effect/0373.longevity_your_thoughts/remove/ # 補正をリセット data modify storage api: Argument.UUID set from storage asset:context this.UUID diff --git a/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/re-given/.mcfunction b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/re-given/.mcfunction deleted file mode 100644 index c415f1094c0..00000000000 --- a/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/re-given/.mcfunction +++ /dev/null @@ -1,10 +0,0 @@ -#> asset:effect/0373.longevity_your_thoughts/re-given/ -# -# Effectが上書きされた時の処理 -# -# @within function asset:effect/0373.longevity_your_thoughts/_/re-given - -# 補正をリセット - function asset:effect/0373.longevity_your_thoughts/effect/reset -# 初期化処理 - function asset:effect/0373.longevity_your_thoughts/effect/set diff --git a/Asset/data/asset/tags/functions/effect/re-given.json b/Asset/data/asset/tags/functions/effect/re-given.json index 87a36d21eb1..8333c4c14d9 100644 --- a/Asset/data/asset/tags/functions/effect/re-given.json +++ b/Asset/data/asset/tags/functions/effect/re-given.json @@ -1,6 +1,5 @@ { "values": [ - "asset:effect/0373.longevity_your_thoughts/_/re-given", "asset:effect/0384.ninjas_mindset/_/re-given", "asset:effect/0371.tsukimi/_/re-given", "asset:effect/0348.cool_feeling/_/re-given", From 6097d391bd6d387a721f7abe2790f435ba931c40 Mon Sep 17 00:00:00 2001 From: k22992068-crypto <286215529+k22992068-crypto@users.noreply.github.com> Date: Sun, 15 Nov 2026 23:30:52 +0900 Subject: [PATCH 20/23] =?UTF-8?q?=E7=AF=84=E5=9B=B2=E3=82=9264=E3=83=96?= =?UTF-8?q?=E3=83=AD=E3=83=83=E3=82=AF=E3=81=AB=E5=88=B6=E9=99=90=E3=81=97?= =?UTF-8?q?=E3=80=81=E3=81=9D=E3=82=8C=E4=BB=A5=E4=B8=8A=E9=81=A0=E3=81=8F?= =?UTF-8?q?=E3=81=AB=E9=9B=A2=E3=82=8C=E3=81=9F=E6=89=8B=E9=87=91=E6=9C=AA?= =?UTF-8?q?=E6=94=BB=E6=92=83=E3=81=97=E3=81=9F=E3=81=A8=E3=81=8D=E3=81=AB?= =?UTF-8?q?=E3=81=AF=E7=99=BA=E5=8B=95=E3=81=97=E3=81=AA=E3=81=84=E3=82=88?= =?UTF-8?q?=E3=81=86=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trigger/2.check_condition.mcfunction | 2 ++ .../1492.your_thoughts_frames/trigger/3.main.mcfunction | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/2.check_condition.mcfunction index 3cf23f72a0e..a48c5a12db3 100644 --- a/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/2.check_condition.mcfunction +++ b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/2.check_condition.mcfunction @@ -11,6 +11,8 @@ execute if entity @s[tag=CanUsed] if data storage asset:context Attack{IsDoT:true} run tag @s remove CanUsed # バニラ攻撃の場合はCanUsedを削除 execute if data storage asset:context Attack{IsVanilla:1b} run tag @s remove CanUsed +# 64ブロック以内に攻撃対象がいなければCanUsedを削除 + execute unless entity @e[type=#lib:living,type=!player,tag=Victim,distance=..64,limit=1] run tag @s remove CanUsed # 3.1416%の確率でCanUsedを残す(7%*51%*88%=3.1416%) execute unless predicate lib:random_pass_per/7 run tag @s remove CanUsed diff --git a/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/3.main.mcfunction index 6c19dae3b1b..7bcd5f8d449 100644 --- a/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/3.main.mcfunction @@ -10,7 +10,7 @@ function asset:artifact/common/use/offhand # 攻撃対象の近くにオーブを召喚 - execute at @e[type=#lib:living,type=!player,tag=Victim,distance=..30,limit=1] run function asset:artifact/1492.your_thoughts_frames/trigger/summon + execute at @e[type=#lib:living,type=!player,tag=Victim,distance=..64,limit=1] run function asset:artifact/1492.your_thoughts_frames/trigger/summon # 演出 playsound block.amethyst_block.chime player @a ~ ~ ~ 5 0.8 From 12115a22af661c51e4a52451f7ffcdae5c62cd47 Mon Sep 17 00:00:00 2001 From: k22992068-crypto <286215529+k22992068-crypto@users.noreply.github.com> Date: Sun, 15 Nov 2026 23:35:48 +0900 Subject: [PATCH 21/23] =?UTF-8?q?=E6=AC=A0=E7=89=87=E3=81=A8=E3=81=AE?= =?UTF-8?q?=E6=8E=A5=E8=A7=A6=E3=81=8C=E3=80=81=E8=B7=9D=E9=9B=A2=E3=81=AE?= =?UTF-8?q?=E4=B8=80=E7=95=AA=E8=BF=91=E3=81=84=E3=83=97=E3=83=AC=E3=82=A4?= =?UTF-8?q?=E3=83=A4=E3=83=BC=E3=81=AB=E5=AF=BE=E3=81=97=E3=81=A6=E8=A1=8C?= =?UTF-8?q?=E3=82=8F=E3=82=8C=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../effect/0373.longevity_your_thoughts/effect/set.mcfunction | 2 -- .../functions/object/1164.piece_of_creation/tick/.mcfunction | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/effect/set.mcfunction b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/effect/set.mcfunction index cdbf0f814ca..dc0fc8f15e0 100644 --- a/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/effect/set.mcfunction +++ b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/effect/set.mcfunction @@ -4,8 +4,6 @@ # # @within function # asset:effect/0373.longevity_your_thoughts/given/ -# asset:effect/0373.longevity_your_thoughts/re-given/ -# asset:effect/0373.longevity_your_thoughts/tick/update_effect # MP回復量 data modify storage api: Argument.UUID set from storage asset:context this.UUID diff --git a/Asset/data/asset/functions/object/1164.piece_of_creation/tick/.mcfunction b/Asset/data/asset/functions/object/1164.piece_of_creation/tick/.mcfunction index af960bcc7c0..d36f8ae1590 100644 --- a/Asset/data/asset/functions/object/1164.piece_of_creation/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1164.piece_of_creation/tick/.mcfunction @@ -13,10 +13,10 @@ execute at @s run tp @s ~ ~ ~ ~3 ~ # 近くのプレイヤーに自身の向きを変えずに追尾 - execute at @s facing entity @a[gamemode=!spectator,tag=!Death,distance=..3,limit=1] eyes positioned ^ ^ ^0.25 run tp @s ~ ~ ~ + execute at @s facing entity @p[gamemode=!spectator,tag=!Death,distance=..3] eyes positioned ^ ^ ^0.25 run tp @s ~ ~ ~ # playerとの接触処理 - execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @a[gamemode=!spectator,tag=!Death,dx=0,limit=1] run function asset:object/1164.piece_of_creation/tick/hit_player + execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @p[gamemode=!spectator,tag=!Death,dx=0] run function asset:object/1164.piece_of_creation/tick/hit_player # 消滅処理 execute if entity @s[scores={General.Object.Tick=200..}] run function asset:object/1164.piece_of_creation/tick/kill From 20997aa2a51b78cd20b4ea00fe134a128ccb4738 Mon Sep 17 00:00:00 2001 From: k22992068-crypto <286215529+k22992068-crypto@users.noreply.github.com> Date: Mon, 16 Nov 2026 01:57:25 +0900 Subject: [PATCH 22/23] =?UTF-8?q?=E6=AD=A3=E3=81=97=E3=81=8F=E4=B8=80?= =?UTF-8?q?=E7=95=AA=E8=BF=91=E3=81=84=E6=95=B5=E3=82=92=E9=81=B8=E3=81=B6?= =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../object/1164.piece_of_creation/tick/.mcfunction | 2 +- .../1164.piece_of_creation/tick/hit_player.mcfunction | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Asset/data/asset/functions/object/1164.piece_of_creation/tick/.mcfunction b/Asset/data/asset/functions/object/1164.piece_of_creation/tick/.mcfunction index d36f8ae1590..8fb82bf1d5e 100644 --- a/Asset/data/asset/functions/object/1164.piece_of_creation/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1164.piece_of_creation/tick/.mcfunction @@ -16,7 +16,7 @@ execute at @s facing entity @p[gamemode=!spectator,tag=!Death,distance=..3] eyes positioned ^ ^ ^0.25 run tp @s ~ ~ ~ # playerとの接触処理 - execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @p[gamemode=!spectator,tag=!Death,dx=0] run function asset:object/1164.piece_of_creation/tick/hit_player + execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @a[gamemode=!spectator,tag=!Death,dx=0] run function asset:object/1164.piece_of_creation/tick/hit_player # 消滅処理 execute if entity @s[scores={General.Object.Tick=200..}] run function asset:object/1164.piece_of_creation/tick/kill diff --git a/Asset/data/asset/functions/object/1164.piece_of_creation/tick/hit_player.mcfunction b/Asset/data/asset/functions/object/1164.piece_of_creation/tick/hit_player.mcfunction index a38ede3f022..f9fbb347515 100644 --- a/Asset/data/asset/functions/object/1164.piece_of_creation/tick/hit_player.mcfunction +++ b/Asset/data/asset/functions/object/1164.piece_of_creation/tick/hit_player.mcfunction @@ -12,22 +12,22 @@ playsound minecraft:entity.arrow.hit_player player @a ~0.5 ~0.5 ~0.5 0.6 2 0.0 playsound minecraft:entity.allay.ambient_with_item player @a ~ ~ ~ 2.0 0.9 0.0 playsound minecraft:block.glass.break player @a ~ ~ ~ 1.0 1.4 0.0 - particle minecraft:dust_color_transition 1 0.4 1 0.8 0.2 0.8 1 ~ ~ ~ 2 2 2 1 40 - particle minecraft:dust_color_transition 1 0.4 1 0.8 0.2 0.8 1 ~ ~ ~ 0.4 0.4 0.4 1 40 + particle minecraft:dust_color_transition 1 0.4 1 0.8 0.2 0.8 1 ~0.5 ~0.5 ~0.5 2 2 2 1 40 + particle minecraft:dust_color_transition 1 0.4 1 0.8 0.2 0.8 1 ~0.5 ~0.5 ~0.5 0.4 0.4 0.4 1 40 particle end_rod ~0.5 ~0.5 ~0.5 0 0 0 0.2 20 # hitしたプレイヤーにMP回復量バフを与える data modify storage api: Argument.ID set value 373 data modify storage api: Argument.Duration set from storage asset:context this.Duration data modify storage api: Argument.FieldOverride.Amount set from storage asset:context this.Amount - execute as @a[gamemode=!spectator,tag=!Death,dx=0,limit=1] run function api:entity/mob/effect/give + execute as @a[gamemode=!spectator,tag=!Death,dx=0] positioned ~0.5 ~0.5 ~0.5 as @p run function api:entity/mob/effect/give function api:entity/mob/effect/reset # 回復 data modify storage api: Argument.Heal set from storage asset:context this.Heal execute store result score $UserID Temporary run data get storage asset:context this.UserID execute as @a if score @s UserID = $UserID Temporary run function api:heal/modifier - execute as @a[gamemode=!spectator,tag=!Death,dx=0,limit=1] run function api:heal/ + execute as @a[gamemode=!spectator,tag=!Death,dx=0] positioned ~0.5 ~0.5 ~0.5 as @p run function api:heal/ function api:heal/reset # リセット From 3a6fdc4733f02753c8f1fd813bba7de4aca73e1d Mon Sep 17 00:00:00 2001 From: k22992068-crypto <286215529+k22992068-crypto@users.noreply.github.com> Date: Mon, 16 Nov 2026 09:33:11 +0900 Subject: [PATCH 23/23] =?UTF-8?q?=E4=B8=80=E7=95=AA=E8=BF=91=E3=81=8F?= =?UTF-8?q?=E3=81=AE=E3=83=97=E3=83=AC=E3=82=A4=E3=83=A4=E3=83=BC=E3=81=AB?= =?UTF-8?q?=E6=AD=A3=E3=81=97=E3=81=8F=E5=BD=93=E3=81=9F=E3=82=89=E3=81=AA?= =?UTF-8?q?=E3=81=84=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../object/1164.piece_of_creation/_index.d.mcfunction | 6 ++++++ .../object/1164.piece_of_creation/tick/.mcfunction | 10 ++++++++-- .../1164.piece_of_creation/tick/hit_player.mcfunction | 4 ++-- 3 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 Asset/data/asset/functions/object/1164.piece_of_creation/_index.d.mcfunction diff --git a/Asset/data/asset/functions/object/1164.piece_of_creation/_index.d.mcfunction b/Asset/data/asset/functions/object/1164.piece_of_creation/_index.d.mcfunction new file mode 100644 index 00000000000..7c112933b85 --- /dev/null +++ b/Asset/data/asset/functions/object/1164.piece_of_creation/_index.d.mcfunction @@ -0,0 +1,6 @@ +#> asset:object/1164.piece_of_creation/_index.d +# @private + +#> tag +# @within function asset:object/1164.piece_of_creation/** + #declare tag 1164.Target diff --git a/Asset/data/asset/functions/object/1164.piece_of_creation/tick/.mcfunction b/Asset/data/asset/functions/object/1164.piece_of_creation/tick/.mcfunction index 8fb82bf1d5e..7b000836fbc 100644 --- a/Asset/data/asset/functions/object/1164.piece_of_creation/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1164.piece_of_creation/tick/.mcfunction @@ -12,11 +12,17 @@ # ゆっくり回転 execute at @s run tp @s ~ ~ ~ ~3 ~ +#一番近くのプレイヤーにタグをつける + tag @p[gamemode=!spectator,tag=!Death,distance=..3] add 1164.Target + # 近くのプレイヤーに自身の向きを変えずに追尾 - execute at @s facing entity @p[gamemode=!spectator,tag=!Death,distance=..3] eyes positioned ^ ^ ^0.25 run tp @s ~ ~ ~ + execute at @s facing entity @p[tag=1164.Target,distance=..3] eyes positioned ^ ^ ^0.25 run tp @s ~ ~ ~ # playerとの接触処理 - execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @a[gamemode=!spectator,tag=!Death,dx=0] run function asset:object/1164.piece_of_creation/tick/hit_player + execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @p[tag=1164.Target,dx=0] run function asset:object/1164.piece_of_creation/tick/hit_player + +# リセット + tag @a[tag=1164.Target,distance=..16] remove 1164.Target # 消滅処理 execute if entity @s[scores={General.Object.Tick=200..}] run function asset:object/1164.piece_of_creation/tick/kill diff --git a/Asset/data/asset/functions/object/1164.piece_of_creation/tick/hit_player.mcfunction b/Asset/data/asset/functions/object/1164.piece_of_creation/tick/hit_player.mcfunction index f9fbb347515..40d2e1d6851 100644 --- a/Asset/data/asset/functions/object/1164.piece_of_creation/tick/hit_player.mcfunction +++ b/Asset/data/asset/functions/object/1164.piece_of_creation/tick/hit_player.mcfunction @@ -20,14 +20,14 @@ data modify storage api: Argument.ID set value 373 data modify storage api: Argument.Duration set from storage asset:context this.Duration data modify storage api: Argument.FieldOverride.Amount set from storage asset:context this.Amount - execute as @a[gamemode=!spectator,tag=!Death,dx=0] positioned ~0.5 ~0.5 ~0.5 as @p run function api:entity/mob/effect/give + execute as @p[tag=1164.Target,dx=0] run function api:entity/mob/effect/give function api:entity/mob/effect/reset # 回復 data modify storage api: Argument.Heal set from storage asset:context this.Heal execute store result score $UserID Temporary run data get storage asset:context this.UserID execute as @a if score @s UserID = $UserID Temporary run function api:heal/modifier - execute as @a[gamemode=!spectator,tag=!Death,dx=0] positioned ~0.5 ~0.5 ~0.5 as @p run function api:heal/ + execute as @p[tag=1164.Target,dx=0] run function api:heal/ function api:heal/reset # リセット