From 3e930deb2248d02e6a7d1699c8b63d19928e8503 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Sun, 30 Aug 2026 14:41:46 +0200 Subject: [PATCH 01/11] =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E3=81=AEArtifact?= =?UTF-8?q?=E3=81=A8Effect=E3=82=92=E4=BD=9C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../damage_from_entity/1.trigger.mcfunction | 8 +++ .../2.check_condition.mcfunction | 17 +++++ .../damage_from_entity/3.1.success.mcfunction | 20 ++++++ .../damage_from_entity/3.2.failure.mcfunction | 10 +++ .../damage_from_entity/3.main.mcfunction | 21 ++++++ .../1584.pk_insight/give/1.trigger.mcfunction | 7 ++ .../1584.pk_insight/give/2.give.mcfunction | 68 +++++++++++++++++++ .../1584.pk_insight/register.mcfunction | 7 ++ .../trigger/1.trigger.mcfunction | 8 +++ .../trigger/2.check_condition.mcfunction | 12 ++++ .../1584.pk_insight/trigger/3.main.mcfunction | 14 ++++ .../386.pk_insight/_/register.mcfunction | 7 ++ .../effect/386.pk_insight/register.mcfunction | 39 +++++++++++ .../artifact/click.carrot_on_a_stick.json | 3 +- .../artifact/damage/from_entity/.json | 1 + .../asset/tags/functions/artifact/give.json | 3 +- .../tags/functions/artifact/register.json | 3 +- .../asset/tags/functions/effect/register.json | 3 +- 18 files changed, 247 insertions(+), 4 deletions(-) create mode 100644 Asset/data/asset/functions/artifact/1584.pk_insight/damage_from_entity/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1584.pk_insight/damage_from_entity/2.check_condition.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1584.pk_insight/damage_from_entity/3.1.success.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1584.pk_insight/damage_from_entity/3.2.failure.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1584.pk_insight/damage_from_entity/3.main.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1584.pk_insight/give/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1584.pk_insight/give/2.give.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1584.pk_insight/register.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1584.pk_insight/trigger/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1584.pk_insight/trigger/2.check_condition.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1584.pk_insight/trigger/3.main.mcfunction create mode 100644 Asset/data/asset/functions/effect/386.pk_insight/_/register.mcfunction create mode 100644 Asset/data/asset/functions/effect/386.pk_insight/register.mcfunction diff --git a/Asset/data/asset/functions/artifact/1584.pk_insight/damage_from_entity/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1584.pk_insight/damage_from_entity/1.trigger.mcfunction new file mode 100644 index 0000000000..0581b58cef --- /dev/null +++ b/Asset/data/asset/functions/artifact/1584.pk_insight/damage_from_entity/1.trigger.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1584.pk_insight/damage_from_entity/1.trigger +# +# +# +# @within tag/function asset:artifact/damage/from_entity/ + +# storage asset:idのoffhandに装備している神器のIDが入っているので比較し、~/2.check_condition.mcfunctionを実行する + execute if data storage asset:context id{offhand:1584} run function asset:artifact/1584.pk_insight/damage_from_entity/2.check_condition diff --git a/Asset/data/asset/functions/artifact/1584.pk_insight/damage_from_entity/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1584.pk_insight/damage_from_entity/2.check_condition.mcfunction new file mode 100644 index 0000000000..3e59d81588 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1584.pk_insight/damage_from_entity/2.check_condition.mcfunction @@ -0,0 +1,17 @@ +#> asset:artifact/1584.pk_insight/damage_from_entity/2.check_condition +# +# +# +# @within function asset:artifact/1584.pk_insight/damage_from_entity/1.trigger + +# 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く + function asset:artifact/common/check_condition/offhand +# 他にアイテム等確認する場合はここに書く +# Effect 386が付与されている状態が条件 + data modify storage api: Argument.ID set value 386 + function api:entity/mob/effect/get/from_id + function api:entity/mob/effect/reset + execute unless data storage api: Return.Effect{ID:386} run tag @s remove CanUsed + +# CanUsedタグをチェックして3.main.mcfunctionを実行する + execute if entity @s[tag=CanUsed] run function asset:artifact/1584.pk_insight/damage_from_entity/3.main diff --git a/Asset/data/asset/functions/artifact/1584.pk_insight/damage_from_entity/3.1.success.mcfunction b/Asset/data/asset/functions/artifact/1584.pk_insight/damage_from_entity/3.1.success.mcfunction new file mode 100644 index 0000000000..f48c20a1a9 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1584.pk_insight/damage_from_entity/3.1.success.mcfunction @@ -0,0 +1,20 @@ +#> asset:artifact/1584.pk_insight/damage_from_entity/3.1.success +# +# +# +# @within function asset:artifact/1584.pk_insight/damage_from_entity/3.main + +# 攻撃者に割合ダメージ + #初期化 + data modify storage api: Argument.Damage set value 0 + #通常の敵には35% + execute as @e[type=#lib:living,tag=Attacker,tag=!Enemy.Boss,tag=!Uninterferable,distance=..20] store result storage api: Argument.Damage float 0.35 run function api:mob/get_max_health + #天使には割合ではなく固定で1000ダメージ + execute as @e[type=#lib:living,tag=Attacker,tag=Enemy.Boss,tag=!Uninterferable,distance=..20] run data modify storage api: Argument.Damage set value 1000 + + data modify storage api: Argument.AttackType set value "Magic" + data modify storage api: Argument.ElementType set value "None" + data modify storage api: Argument.FixedDamage set value 1b + function api:damage/modifier + execute if data storage api: Argument.Damage as @e[type=#lib:living,tag=Attacker,distance=..20] run function api:damage/ + function api:damage/reset diff --git a/Asset/data/asset/functions/artifact/1584.pk_insight/damage_from_entity/3.2.failure.mcfunction b/Asset/data/asset/functions/artifact/1584.pk_insight/damage_from_entity/3.2.failure.mcfunction new file mode 100644 index 0000000000..80f27d0a8d --- /dev/null +++ b/Asset/data/asset/functions/artifact/1584.pk_insight/damage_from_entity/3.2.failure.mcfunction @@ -0,0 +1,10 @@ +#> asset:artifact/1584.pk_insight/damage_from_entity/3.2.failure +# +# +# +# @within function asset:artifact/1584.pk_insight/damage_from_entity/3.main + +# Effect剝奪 + data modify storage api: Argument.ID set value 386 + function api:entity/mob/effect/remove/from_id + function api:entity/mob/effect/reset diff --git a/Asset/data/asset/functions/artifact/1584.pk_insight/damage_from_entity/3.main.mcfunction b/Asset/data/asset/functions/artifact/1584.pk_insight/damage_from_entity/3.main.mcfunction new file mode 100644 index 0000000000..2c7b9e2466 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1584.pk_insight/damage_from_entity/3.main.mcfunction @@ -0,0 +1,21 @@ +#> asset:artifact/1584.pk_insight/damage_from_entity/3.main +# +# +# +# @within function asset:artifact/1584.pk_insight/damage_from_entity/2.check_condition + +#> Private +# @private + #declare score_holder $Duration + +# Effect 386の残り効果時間が5tick以内なら成功 + data modify storage api: Argument.ID set value 386 + function api:entity/mob/effect/get/from_id + execute store result score $Duration Temporary run data get storage api: Return.Effect.Duration + function api:entity/mob/effect/reset + execute if score $Duration Temporary matches ..5 run function asset:artifact/1584.pk_insight/damage_from_entity/3.1.success +# 失敗したらEffectも剝奪 + execute unless score $Duration Temporary matches ..5 run function asset:artifact/1584.pk_insight/damage_from_entity/3.2.failure + +# リセット + scoreboard players reset $Duration Temporary diff --git a/Asset/data/asset/functions/artifact/1584.pk_insight/give/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1584.pk_insight/give/1.trigger.mcfunction new file mode 100644 index 0000000000..dff4c81e87 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1584.pk_insight/give/1.trigger.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1584.pk_insight/give/1.trigger +# +# 神器の取得処理の呼び出し時に実行されるfunction +# +# @within tag/function asset:artifact/give + +execute if data storage asset:context {id:1584} run function asset:artifact/1584.pk_insight/give/2.give \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1584.pk_insight/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1584.pk_insight/give/2.give.mcfunction new file mode 100644 index 0000000000..30c374652b --- /dev/null +++ b/Asset/data/asset/functions/artifact/1584.pk_insight/give/2.give.mcfunction @@ -0,0 +1,68 @@ +#> asset:artifact/1584.pk_insight/give/2.give +# +# 神器の作成部 ここでID等を定義する +# +# @user +# @within function asset:artifact/1584.pk_insight/give/1.trigger + +# 神器の説明や消費MPなどをここで設定する。 +# 最後にasset:artifact/common/giveを実行することで入手可能。 + +# 神器のID (int) スプレッドシートの値を入れる + data modify storage asset:artifact ID set value 1584 +# 神器のベースアイテム + data modify storage asset:artifact Item set value "minecraft:carrot_on_a_stick" +# 神器の名前 (TextComponentString) + data modify storage asset:artifact Name set value '{"text": "予言者の見極め"}' +# 神器の説明文 (TextComponentString[]) + data modify storage asset:artifact Lore set value [] +# 消費アイテム ({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 "onClick" +# 神器の発動条件 (TextComponentString) (オプション) + # data modify storage asset:artifact Condition set value +# 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.Damage set value [0,0] +# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.AttackType set value [Magic] +# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.ElementType set value [None] +# 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.BypassResist set value true +# 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.IsRangeAttack set value +# 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.AttackRange set value 20 +# MP消費量 (int) + data modify storage asset:artifact MPCost set value 20 +# 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 600 +# 種別クールダウン ({Type: string, Duration: int}) (オプション) + # data modify storage asset:artifact TypeCooldown.Type set value + # data modify storage asset:artifact TypeCooldown.Duration set value +# グローバルクールダウン (int) (オプション) + # data modify storage asset:artifact SpecialCooldown set value +# クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) + # data modify storage asset:artifact DisableCooldownMessage set value +# MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) + # data modify storage asset:artifact DisableMPMessage set value +# 破壊時の音を鳴らさないかどうか (boolean) (オプション) + # data modify storage asset:artifact DisableBreakSound set value +# 扱える神 (string[]) Wikiを参照 + data modify storage asset:artifact CanUsedGod set value ['Rumor', 'Nyaptov', "Wi-ki"] +# カスタム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/1584.pk_insight/register.mcfunction b/Asset/data/asset/functions/artifact/1584.pk_insight/register.mcfunction new file mode 100644 index 0000000000..ad3a28813f --- /dev/null +++ b/Asset/data/asset/functions/artifact/1584.pk_insight/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1584.pk_insight/register +# +# 神器プールへの登録処理 +# +# @within tag/function asset:artifact/register + +data modify storage asset:artifact RarityRegistry[2] append value [1584] \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1584.pk_insight/trigger/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1584.pk_insight/trigger/1.trigger.mcfunction new file mode 100644 index 0000000000..8572fc67c1 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1584.pk_insight/trigger/1.trigger.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1584.pk_insight/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:1584} run function asset:artifact/1584.pk_insight/trigger/2.check_condition \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1584.pk_insight/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1584.pk_insight/trigger/2.check_condition.mcfunction new file mode 100644 index 0000000000..3edd768827 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1584.pk_insight/trigger/2.check_condition.mcfunction @@ -0,0 +1,12 @@ +#> asset:artifact/1584.pk_insight/trigger/2.check_condition +# +# 神器の発動条件をチェックします +# +# @within function asset:artifact/1584.pk_insight/trigger/1.trigger + +# 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く + function asset:artifact/common/check_condition/offhand +# 他にアイテム等確認する場合はここに書く + +# CanUsedタグをチェックして3.main.mcfunctionを実行する + execute if entity @s[tag=CanUsed] run function asset:artifact/1584.pk_insight/trigger/3.main \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1584.pk_insight/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1584.pk_insight/trigger/3.main.mcfunction new file mode 100644 index 0000000000..9d9cd3620d --- /dev/null +++ b/Asset/data/asset/functions/artifact/1584.pk_insight/trigger/3.main.mcfunction @@ -0,0 +1,14 @@ +#> asset:artifact/1584.pk_insight/trigger/3.main +# +# 神器のメイン処理部 +# +# @within function asset:artifact/1584.pk_insight/trigger/2.check_condition + +# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う + function asset:artifact/common/use/offhand + +# ここから先は神器側の効果の処理を書く +# Effect 386を付与 + data modify storage api: Argument.ID set value 386 + function api:entity/mob/effect/give + function api:entity/mob/effect/reset diff --git a/Asset/data/asset/functions/effect/386.pk_insight/_/register.mcfunction b/Asset/data/asset/functions/effect/386.pk_insight/_/register.mcfunction new file mode 100644 index 0000000000..60516c8a8a --- /dev/null +++ b/Asset/data/asset/functions/effect/386.pk_insight/_/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/386.pk_insight/_/register +# +# +# +# @within tag/function asset:effect/register + +execute if data storage asset:context {id:386} run function asset:effect/386.pk_insight/register \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/386.pk_insight/register.mcfunction b/Asset/data/asset/functions/effect/386.pk_insight/register.mcfunction new file mode 100644 index 0000000000..2948ed0e13 --- /dev/null +++ b/Asset/data/asset/functions/effect/386.pk_insight/register.mcfunction @@ -0,0 +1,39 @@ +#> asset:effect/386.pk_insight/register +# +# Effectのデータを指定 +# +# @within function asset:effect/386.pk_insight/_/register + +# ExtendsSafe (boolean) (default = false) + # data modify storage asset:effect ExtendsSafe set value true +# ID (int) + data modify storage asset:effect ID set value 386 +# 名前 (TextComponentString) + data modify storage asset:effect Name set value '{"text": "予言者の見極め"}' +# 説明文 (TextComponentString[]) + data modify storage asset:effect Description set value [] +# 効果時間 (int) (default = API || error) + data modify storage asset:effect Duration set value 35 +# スタック (int) (default = API || 1) + # data modify storage asset:effect Stack set value +# 効果時間の操作方法 (default = API || "replace") + # data modify storage asset:effect DurationOperation set value +# スタックの操作方法 (default = API || "replace") + # data modify storage asset:effect StackOperation set value +# 最大効果時間 (int) (default = 2147483647) + # data modify storage asset:effect MaxDuration set value +# 最大スタック (int) (default = 2147483647) + # data modify storage asset:effect MaxStack set value +# 悪い効果か否か (boolean) + data modify storage asset:effect IsBadEffect set value false +# 死亡時のエフェクトの処理 (default = "remove") + # data modify storage asset:effect ProcessOnDied set value +# 消すのに必要なレベル (int) (default = 1) + # data modify storage asset:effect RequireClearLv set value +# エフェクトをUIに表示するか (boolean) (default = true) + # data modify storage asset:effect Visible set value +# エフェクトのスタックををUIに表示するか (boolean) (default = true) + data modify storage asset:effect StackVisible set value false + +# フィールド + # data modify storage asset:effect Field set value {} diff --git a/Asset/data/asset/tags/functions/artifact/click.carrot_on_a_stick.json b/Asset/data/asset/tags/functions/artifact/click.carrot_on_a_stick.json index 8b0fecd8b5..8cee4fc0c4 100644 --- a/Asset/data/asset/tags/functions/artifact/click.carrot_on_a_stick.json +++ b/Asset/data/asset/tags/functions/artifact/click.carrot_on_a_stick.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1584.pk_insight/trigger/1.trigger", "asset:artifact/1332.bebebeam/trigger/1.trigger", "asset:artifact/1306.will_o_wisp/trigger/1.trigger", "asset:artifact/1144.cradle_of_azure_moon/trigger/1.trigger", @@ -177,4 +178,4 @@ "asset:artifact/2001.staff_of_the_willless/trigger/1.trigger", "asset:artifact/0019.scripture/trigger/1.trigger" ] -} +} \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/artifact/damage/from_entity/.json b/Asset/data/asset/tags/functions/artifact/damage/from_entity/.json index ba88a05bc5..3bb17c9ea3 100644 --- a/Asset/data/asset/tags/functions/artifact/damage/from_entity/.json +++ b/Asset/data/asset/tags/functions/artifact/damage/from_entity/.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1584.pk_insight/damage_from_entity/1.trigger", "asset:artifact/1311.yearning_rose/damage_from_entity/1.trigger", "asset:artifact/0554.catastrophe/damage_entity/1.trigger", "asset:artifact/1141.bell_of_courage/trigger/1.trigger", diff --git a/Asset/data/asset/tags/functions/artifact/give.json b/Asset/data/asset/tags/functions/artifact/give.json index fdb7a26c47..5eb00c5608 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/1584.pk_insight/give/1.trigger", "asset:artifact/1562.tsukimi_dango/give/1.trigger", "asset:artifact/1430.shield_of_fate/give/1.trigger", "asset:artifact/1453.frost_flake_bow/give/1.trigger", @@ -540,4 +541,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 2bba1f3f33..bfc8e7e893 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/1584.pk_insight/register", "asset:artifact/1562.tsukimi_dango/register", "asset:artifact/1453.frost_flake_bow/register", "asset:artifact/1430.shield_of_fate/register", @@ -318,4 +319,4 @@ "asset:artifact/1027.fire_of_rebirth/register", "asset:artifact/1111.rod_o_redeem/register" ] -} +} \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/effect/register.json b/Asset/data/asset/tags/functions/effect/register.json index 78c10d4140..c02caec4c6 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/386.pk_insight/_/register", "asset:effect/0371.tsukimi/_/register", "asset:effect/0355.heart_gap/_/register", "asset:effect/0354.protection_of_courage/_/register", @@ -182,4 +183,4 @@ "asset:effect/0007.defense_base_debuff/_/register", "asset:effect/0258.spirit_melody/_/register" ] -} +} \ No newline at end of file From ce1fd2ac7ededd19a7deebab4d529db1d9f2b162 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Mon, 31 Aug 2026 14:44:48 +0200 Subject: [PATCH 02/11] =?UTF-8?q?Namespace=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{386.pk_insight => 0386.pk_insight}/_/register.mcfunction | 4 ++-- .../{386.pk_insight => 0386.pk_insight}/register.mcfunction | 4 ++-- Asset/data/asset/tags/functions/effect/register.json | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) rename Asset/data/asset/functions/effect/{386.pk_insight => 0386.pk_insight}/_/register.mcfunction (60%) rename Asset/data/asset/functions/effect/{386.pk_insight => 0386.pk_insight}/register.mcfunction (94%) diff --git a/Asset/data/asset/functions/effect/386.pk_insight/_/register.mcfunction b/Asset/data/asset/functions/effect/0386.pk_insight/_/register.mcfunction similarity index 60% rename from Asset/data/asset/functions/effect/386.pk_insight/_/register.mcfunction rename to Asset/data/asset/functions/effect/0386.pk_insight/_/register.mcfunction index 60516c8a8a..6cf59d0b0d 100644 --- a/Asset/data/asset/functions/effect/386.pk_insight/_/register.mcfunction +++ b/Asset/data/asset/functions/effect/0386.pk_insight/_/register.mcfunction @@ -1,7 +1,7 @@ -#> asset:effect/386.pk_insight/_/register +#> asset:effect/0386.pk_insight/_/register # # # # @within tag/function asset:effect/register -execute if data storage asset:context {id:386} run function asset:effect/386.pk_insight/register \ No newline at end of file +execute if data storage asset:context {id:386} run function asset:effect/0386.pk_insight/register diff --git a/Asset/data/asset/functions/effect/386.pk_insight/register.mcfunction b/Asset/data/asset/functions/effect/0386.pk_insight/register.mcfunction similarity index 94% rename from Asset/data/asset/functions/effect/386.pk_insight/register.mcfunction rename to Asset/data/asset/functions/effect/0386.pk_insight/register.mcfunction index 2948ed0e13..53dc18dd0c 100644 --- a/Asset/data/asset/functions/effect/386.pk_insight/register.mcfunction +++ b/Asset/data/asset/functions/effect/0386.pk_insight/register.mcfunction @@ -1,8 +1,8 @@ -#> asset:effect/386.pk_insight/register +#> asset:effect/0386.pk_insight/register # # Effectのデータを指定 # -# @within function asset:effect/386.pk_insight/_/register +# @within function asset:effect/0386.pk_insight/_/register # ExtendsSafe (boolean) (default = false) # data modify storage asset:effect ExtendsSafe set value true diff --git a/Asset/data/asset/tags/functions/effect/register.json b/Asset/data/asset/tags/functions/effect/register.json index c02caec4c6..7942fe9821 100644 --- a/Asset/data/asset/tags/functions/effect/register.json +++ b/Asset/data/asset/tags/functions/effect/register.json @@ -1,6 +1,6 @@ { "values": [ - "asset:effect/386.pk_insight/_/register", + "asset:effect/0386.pk_insight/_/register", "asset:effect/0371.tsukimi/_/register", "asset:effect/0355.heart_gap/_/register", "asset:effect/0354.protection_of_courage/_/register", @@ -183,4 +183,4 @@ "asset:effect/0007.defense_base_debuff/_/register", "asset:effect/0258.spirit_melody/_/register" ] -} \ No newline at end of file +} From 5936b81b7d94a4e82845cf35e88e05aaac5c7fbc Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Mon, 31 Aug 2026 15:58:09 +0200 Subject: [PATCH 03/11] =?UTF-8?q?=E5=8A=B9=E6=9E=9C=E4=B8=AD=E3=81=AE?= =?UTF-8?q?=E3=83=87=E3=83=90=E3=83=95=E3=81=A8=E3=82=B8=E3=83=A3=E3=82=B9?= =?UTF-8?q?=E3=83=88=E3=82=AC=E3=83=BC=E3=83=89=E5=88=A4=E5=AE=9A=E6=99=82?= =?UTF-8?q?=E3=81=AE=E3=83=90=E3=83=95=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../effect/0386.pk_insight/_/end.mcfunction | 7 +++++++ .../effect/0386.pk_insight/_/given.mcfunction | 7 +++++++ .../effect/0386.pk_insight/_/remove.mcfunction | 7 +++++++ .../effect/0386.pk_insight/_/tick.mcfunction | 7 +++++++ .../effect/0386.pk_insight/end/.mcfunction | 8 ++++++++ .../effect/0386.pk_insight/given/.mcfunction | 8 ++++++++ .../0386.pk_insight/modifier/add.mcfunction | 14 ++++++++++++++ .../0386.pk_insight/modifier/remove.mcfunction | 12 ++++++++++++ .../effect/0386.pk_insight/remove/.mcfunction | 8 ++++++++ .../effect/0386.pk_insight/tick/.mcfunction | 13 +++++++++++++ .../effect/0386.pk_insight/tick/guard.mcfunction | 15 +++++++++++++++ Asset/data/asset/tags/functions/effect/end.json | 3 ++- Asset/data/asset/tags/functions/effect/given.json | 3 ++- .../data/asset/tags/functions/effect/remove.json | 3 ++- Asset/data/asset/tags/functions/effect/tick.json | 3 ++- 15 files changed, 114 insertions(+), 4 deletions(-) create mode 100644 Asset/data/asset/functions/effect/0386.pk_insight/_/end.mcfunction create mode 100644 Asset/data/asset/functions/effect/0386.pk_insight/_/given.mcfunction create mode 100644 Asset/data/asset/functions/effect/0386.pk_insight/_/remove.mcfunction create mode 100644 Asset/data/asset/functions/effect/0386.pk_insight/_/tick.mcfunction create mode 100644 Asset/data/asset/functions/effect/0386.pk_insight/end/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0386.pk_insight/given/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0386.pk_insight/modifier/add.mcfunction create mode 100644 Asset/data/asset/functions/effect/0386.pk_insight/modifier/remove.mcfunction create mode 100644 Asset/data/asset/functions/effect/0386.pk_insight/remove/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0386.pk_insight/tick/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0386.pk_insight/tick/guard.mcfunction diff --git a/Asset/data/asset/functions/effect/0386.pk_insight/_/end.mcfunction b/Asset/data/asset/functions/effect/0386.pk_insight/_/end.mcfunction new file mode 100644 index 0000000000..6a853b400d --- /dev/null +++ b/Asset/data/asset/functions/effect/0386.pk_insight/_/end.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0386.pk_insight/_/end +# +# Effectの効果の終了時に実行されるfunction +# +# @within tag/function asset:effect/end + +execute if data storage asset:context {id:386} run function asset:effect/0386.pk_insight/end/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0386.pk_insight/_/given.mcfunction b/Asset/data/asset/functions/effect/0386.pk_insight/_/given.mcfunction new file mode 100644 index 0000000000..aeba505989 --- /dev/null +++ b/Asset/data/asset/functions/effect/0386.pk_insight/_/given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0386.pk_insight/_/given +# +# Effectが付与された時に実行されるfunction +# +# @within tag/function asset:effect/given + +execute if data storage asset:context {id:386} run function asset:effect/0386.pk_insight/given/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0386.pk_insight/_/remove.mcfunction b/Asset/data/asset/functions/effect/0386.pk_insight/_/remove.mcfunction new file mode 100644 index 0000000000..887f9a10d1 --- /dev/null +++ b/Asset/data/asset/functions/effect/0386.pk_insight/_/remove.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0386.pk_insight/_/remove +# +# Effectが神器や牛乳によって削除された時に実行されるfunction +# +# @within tag/function asset:effect/remove + +execute if data storage asset:context {id:386} run function asset:effect/0386.pk_insight/remove/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0386.pk_insight/_/tick.mcfunction b/Asset/data/asset/functions/effect/0386.pk_insight/_/tick.mcfunction new file mode 100644 index 0000000000..3b19a090d3 --- /dev/null +++ b/Asset/data/asset/functions/effect/0386.pk_insight/_/tick.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0386.pk_insight/_/tick +# +# Effectが発動している間毎tick実行されるfunction +# +# @within tag/function asset:effect/tick + +execute if data storage asset:context {id:386} run function asset:effect/0386.pk_insight/tick/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0386.pk_insight/end/.mcfunction b/Asset/data/asset/functions/effect/0386.pk_insight/end/.mcfunction new file mode 100644 index 0000000000..5f8ab98d54 --- /dev/null +++ b/Asset/data/asset/functions/effect/0386.pk_insight/end/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0386.pk_insight/end/ +# +# Effectの効果が切れた時の処理 +# +# @within function asset:effect/0386.pk_insight/_/end + +# バフ/デバフ解除 + function asset:effect/0386.pk_insight/modifier/remove diff --git a/Asset/data/asset/functions/effect/0386.pk_insight/given/.mcfunction b/Asset/data/asset/functions/effect/0386.pk_insight/given/.mcfunction new file mode 100644 index 0000000000..3f4bcdb476 --- /dev/null +++ b/Asset/data/asset/functions/effect/0386.pk_insight/given/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0386.pk_insight/given/ +# +# Effectが付与された時の処理 +# +# @within function asset:effect/0386.pk_insight/_/given + +# modifier付与 + function asset:effect/0386.pk_insight/modifier/add diff --git a/Asset/data/asset/functions/effect/0386.pk_insight/modifier/add.mcfunction b/Asset/data/asset/functions/effect/0386.pk_insight/modifier/add.mcfunction new file mode 100644 index 0000000000..dc01ca07db --- /dev/null +++ b/Asset/data/asset/functions/effect/0386.pk_insight/modifier/add.mcfunction @@ -0,0 +1,14 @@ +#> asset:effect/0386.pk_insight/modifier/add +# +# +# +# @within function asset:effect/0386.pk_insight/** + +# 耐性 + data modify storage api: Argument.UUID set value [I;1,3,386,0] + data modify storage api: Argument.Amount set value -0.7d + data modify storage api: Argument.Operation set value "multiply_base" + function api:modifier/defense/base/add + +# 移動速度 + attribute @s generic.movement_speed modifier add 1-0-3-0-386 "386.pk_insight" -0.5 multiply_base diff --git a/Asset/data/asset/functions/effect/0386.pk_insight/modifier/remove.mcfunction b/Asset/data/asset/functions/effect/0386.pk_insight/modifier/remove.mcfunction new file mode 100644 index 0000000000..0e0b9eaf5c --- /dev/null +++ b/Asset/data/asset/functions/effect/0386.pk_insight/modifier/remove.mcfunction @@ -0,0 +1,12 @@ +#> asset:effect/0386.pk_insight/modifier/remove +# +# +# +# @within function asset:effect/0386.pk_insight/** + +# 耐性 + data modify storage api: Argument.UUID set value [I;1,3,386,0] + function api:modifier/defense/base/remove + +# 移動速度 + attribute @s generic.movement_speed modifier remove 1-0-3-0-386 diff --git a/Asset/data/asset/functions/effect/0386.pk_insight/remove/.mcfunction b/Asset/data/asset/functions/effect/0386.pk_insight/remove/.mcfunction new file mode 100644 index 0000000000..8e698df39e --- /dev/null +++ b/Asset/data/asset/functions/effect/0386.pk_insight/remove/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0386.pk_insight/remove/ +# +# Effectが削除された時の処理 +# +# @within function asset:effect/0386.pk_insight/_/remove + +# バフ/デバフ解除 + function asset:effect/0386.pk_insight/modifier/remove diff --git a/Asset/data/asset/functions/effect/0386.pk_insight/tick/.mcfunction b/Asset/data/asset/functions/effect/0386.pk_insight/tick/.mcfunction new file mode 100644 index 0000000000..aa1a188c1b --- /dev/null +++ b/Asset/data/asset/functions/effect/0386.pk_insight/tick/.mcfunction @@ -0,0 +1,13 @@ +#> asset:effect/0386.pk_insight/tick/ +# +# Effectのtick処理 +# +# @within function asset:effect/0386.pk_insight/_/tick + +#> Private +#@private + #declare score_holder $Duration + +# 残り時間が5tick以内なら耐性デバフを消して大幅上昇 + execute store result score $Duration Temporary run data get storage asset:context Duration + execute if score $Duration Temporary matches 5 run function asset:effect/0386.pk_insight/tick/guard diff --git a/Asset/data/asset/functions/effect/0386.pk_insight/tick/guard.mcfunction b/Asset/data/asset/functions/effect/0386.pk_insight/tick/guard.mcfunction new file mode 100644 index 0000000000..33f1987161 --- /dev/null +++ b/Asset/data/asset/functions/effect/0386.pk_insight/tick/guard.mcfunction @@ -0,0 +1,15 @@ +#> asset:effect/0386.pk_insight/tick/guard +# +# +# +# @within function asset:effect/0386.pk_insight/tick/ + + +# デバフを消す + function asset:effect/0386.pk_insight/modifier/remove + +# バフを再付与 + data modify storage api: Argument.UUID set value [I;1,3,386,0] + data modify storage api: Argument.Amount set value 0.7d + data modify storage api: Argument.Operation set value "multiply_base" + function api:modifier/defense/base/add diff --git a/Asset/data/asset/tags/functions/effect/end.json b/Asset/data/asset/tags/functions/effect/end.json index c9796ea3fa..a1be8d9595 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/0386.pk_insight/_/end", "asset:effect/0371.tsukimi/_/end", "asset:effect/0355.heart_gap/_/end", "asset:effect/0354.protection_of_courage/_/end", @@ -112,4 +113,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 c40d6e3cb7..fbf0597625 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/0386.pk_insight/_/given", "asset:effect/0371.tsukimi/_/given", "asset:effect/0355.heart_gap/_/given", "asset:effect/0354.protection_of_courage/_/given", @@ -106,4 +107,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/remove.json b/Asset/data/asset/tags/functions/effect/remove.json index eb09e87f9c..5825fced15 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/0386.pk_insight/_/remove", "asset:effect/0371.tsukimi/_/remove", "asset:effect/0355.heart_gap/_/remove", "asset:effect/0354.protection_of_courage/_/remove", @@ -120,4 +121,4 @@ "asset:effect/0007.defense_base_debuff/_/remove", "asset:effect/0258.spirit_melody/_/remove" ] -} +} \ 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 90687895ee..0e0d1acb77 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/0386.pk_insight/_/tick", "asset:effect/0355.heart_gap/_/tick", "asset:effect/0348.cool_feeling/_/tick", "asset:effect/0356.dolphin_blessing/_/tick", @@ -107,4 +108,4 @@ "asset:effect/0279.poison_of_vinderre/_/tick", "asset:effect/0258.spirit_melody/_/tick" ] -} +} \ No newline at end of file From 69d24605112c43456d3ca195c367704f7929fcc3 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Mon, 31 Aug 2026 16:38:16 +0200 Subject: [PATCH 04/11] =?UTF-8?q?=E3=82=AB=E3=82=A6=E3=83=B3=E3=83=88?= =?UTF-8?q?=E3=83=80=E3=82=A6=E3=83=B3&=E6=BC=94=E5=87=BA=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../damage_from_entity/3.1.success.mcfunction | 4 ++++ .../damage_from_entity/3.main.mcfunction | 6 +++--- .../effect/0386.pk_insight/register.mcfunction | 4 ++-- .../effect/0386.pk_insight/tick/.mcfunction | 10 +++++++++- .../effect/0386.pk_insight/tick/count.mcfunction | 13 +++++++++++++ .../effect/0386.pk_insight/tick/guard.mcfunction | 5 +++++ 6 files changed, 36 insertions(+), 6 deletions(-) create mode 100644 Asset/data/asset/functions/effect/0386.pk_insight/tick/count.mcfunction diff --git a/Asset/data/asset/functions/artifact/1584.pk_insight/damage_from_entity/3.1.success.mcfunction b/Asset/data/asset/functions/artifact/1584.pk_insight/damage_from_entity/3.1.success.mcfunction index f48c20a1a9..1753b3b142 100644 --- a/Asset/data/asset/functions/artifact/1584.pk_insight/damage_from_entity/3.1.success.mcfunction +++ b/Asset/data/asset/functions/artifact/1584.pk_insight/damage_from_entity/3.1.success.mcfunction @@ -18,3 +18,7 @@ function api:damage/modifier execute if data storage api: Argument.Damage as @e[type=#lib:living,tag=Attacker,distance=..20] run function api:damage/ function api:damage/reset + +# 演出 + playsound entity.evoker.cast_spell player @a ~ ~ ~ 2.0 2.0 + playsound entity.enderman.teleport player @a ~ ~ ~ 1.0 1.0 diff --git a/Asset/data/asset/functions/artifact/1584.pk_insight/damage_from_entity/3.main.mcfunction b/Asset/data/asset/functions/artifact/1584.pk_insight/damage_from_entity/3.main.mcfunction index 2c7b9e2466..f946c16fca 100644 --- a/Asset/data/asset/functions/artifact/1584.pk_insight/damage_from_entity/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1584.pk_insight/damage_from_entity/3.main.mcfunction @@ -8,14 +8,14 @@ # @private #declare score_holder $Duration -# Effect 386の残り効果時間が5tick以内なら成功 +# Effect 386の残り効果時間が9tick以内なら成功 data modify storage api: Argument.ID set value 386 function api:entity/mob/effect/get/from_id execute store result score $Duration Temporary run data get storage api: Return.Effect.Duration function api:entity/mob/effect/reset - execute if score $Duration Temporary matches ..5 run function asset:artifact/1584.pk_insight/damage_from_entity/3.1.success + execute if score $Duration Temporary matches ..9 run function asset:artifact/1584.pk_insight/damage_from_entity/3.1.success # 失敗したらEffectも剝奪 - execute unless score $Duration Temporary matches ..5 run function asset:artifact/1584.pk_insight/damage_from_entity/3.2.failure + execute unless score $Duration Temporary matches ..9 run function asset:artifact/1584.pk_insight/damage_from_entity/3.2.failure # リセット scoreboard players reset $Duration Temporary diff --git a/Asset/data/asset/functions/effect/0386.pk_insight/register.mcfunction b/Asset/data/asset/functions/effect/0386.pk_insight/register.mcfunction index 53dc18dd0c..8d62dcc90a 100644 --- a/Asset/data/asset/functions/effect/0386.pk_insight/register.mcfunction +++ b/Asset/data/asset/functions/effect/0386.pk_insight/register.mcfunction @@ -13,7 +13,7 @@ # 説明文 (TextComponentString[]) data modify storage asset:effect Description set value [] # 効果時間 (int) (default = API || error) - data modify storage asset:effect Duration set value 35 + data modify storage asset:effect Duration set value 39 # スタック (int) (default = API || 1) # data modify storage asset:effect Stack set value # 効果時間の操作方法 (default = API || "replace") @@ -36,4 +36,4 @@ data modify storage asset:effect StackVisible set value false # フィールド - # data modify storage asset:effect Field set value {} + data modify storage asset:effect Field.Interval set value 10 diff --git a/Asset/data/asset/functions/effect/0386.pk_insight/tick/.mcfunction b/Asset/data/asset/functions/effect/0386.pk_insight/tick/.mcfunction index aa1a188c1b..4923e79281 100644 --- a/Asset/data/asset/functions/effect/0386.pk_insight/tick/.mcfunction +++ b/Asset/data/asset/functions/effect/0386.pk_insight/tick/.mcfunction @@ -8,6 +8,14 @@ #@private #declare score_holder $Duration +# Interval減算 + execute store result storage asset:context this.Interval int 0.9999999999 run data get storage asset:context this.Interval +# 10tickごとにカウントダウン + execute if data storage asset:context this{Interval:0} anchored eyes positioned ^ ^ ^ run function asset:effect/0386.pk_insight/tick/count + # 残り時間が5tick以内なら耐性デバフを消して大幅上昇 execute store result score $Duration Temporary run data get storage asset:context Duration - execute if score $Duration Temporary matches 5 run function asset:effect/0386.pk_insight/tick/guard + execute if score $Duration Temporary matches 9 run function asset:effect/0386.pk_insight/tick/guard + +# リセット + scoreboard players reset $Duration Temporary diff --git a/Asset/data/asset/functions/effect/0386.pk_insight/tick/count.mcfunction b/Asset/data/asset/functions/effect/0386.pk_insight/tick/count.mcfunction new file mode 100644 index 0000000000..e26e5b9367 --- /dev/null +++ b/Asset/data/asset/functions/effect/0386.pk_insight/tick/count.mcfunction @@ -0,0 +1,13 @@ +#> asset:effect/0386.pk_insight/tick/count +# +# +# +# @within function asset:effect/0386.pk_insight/tick/ + +# Intervalリセット + data modify storage asset:context this.Interval set value 10 + +# 演出 + playsound entity.ender_eye.death player @a ~ ~ ~ 2.0 1.0 + particle composter ~ ~ ~ 0.1 0.25 0.1 1 15 + particle witch ~ ~ ~ 0.1 0.25 0.1 1 15 diff --git a/Asset/data/asset/functions/effect/0386.pk_insight/tick/guard.mcfunction b/Asset/data/asset/functions/effect/0386.pk_insight/tick/guard.mcfunction index 33f1987161..e32234eb3c 100644 --- a/Asset/data/asset/functions/effect/0386.pk_insight/tick/guard.mcfunction +++ b/Asset/data/asset/functions/effect/0386.pk_insight/tick/guard.mcfunction @@ -13,3 +13,8 @@ data modify storage api: Argument.Amount set value 0.7d data modify storage api: Argument.Operation set value "multiply_base" function api:modifier/defense/base/add + +# 演出 + playsound entity.ender_eye.death player @a ~ ~ ~ 2.0 2.0 + playsound entity.experience_orb.pickup player @a ~ ~ ~ 2.0 1.0 + execute anchored eyes positioned ^ ^ ^ run particle end_rod ~ ~ ~ 0.1 0.25 0.1 0.1 15 From 543b2b207fe10ffd652cb78706075414bf055270 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Mon, 31 Aug 2026 18:22:40 +0200 Subject: [PATCH 05/11] =?UTF-8?q?Lore=E9=A1=9E=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/artifact/1584.pk_insight/give/2.give.mcfunction | 4 ++-- .../functions/effect/0386.pk_insight/register.mcfunction | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1584.pk_insight/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1584.pk_insight/give/2.give.mcfunction index 30c374652b..cc27451f0e 100644 --- a/Asset/data/asset/functions/artifact/1584.pk_insight/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1584.pk_insight/give/2.give.mcfunction @@ -13,9 +13,9 @@ # 神器のベースアイテム data modify storage asset:artifact Item set value "minecraft:carrot_on_a_stick" # 神器の名前 (TextComponentString) - data modify storage asset:artifact Name set value '{"text": "予言者の見極め"}' + data modify storage asset:artifact Name set value '{"text": "予言者の見極め", "color": "#deceeb"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value [] + data modify storage asset:artifact Lore set value ['{"text": "使用後、耐性と移動速度が大幅に下がり、カウントダウンが始まる。"}', '{"text": "3カウント後、0.5間だけ耐性が大きく上昇し、攻撃者に最大体力の35%分の割合ダメージを与える。"}'] # 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション) # data modify storage asset:artifact ConsumeItem.Item set value '{"translate":"item.minecraft.stick"}' # data modify storage asset:artifact ConsumeItem.Count set value 1 diff --git a/Asset/data/asset/functions/effect/0386.pk_insight/register.mcfunction b/Asset/data/asset/functions/effect/0386.pk_insight/register.mcfunction index 8d62dcc90a..527100e640 100644 --- a/Asset/data/asset/functions/effect/0386.pk_insight/register.mcfunction +++ b/Asset/data/asset/functions/effect/0386.pk_insight/register.mcfunction @@ -9,9 +9,9 @@ # ID (int) data modify storage asset:effect ID set value 386 # 名前 (TextComponentString) - data modify storage asset:effect Name set value '{"text": "予言者の見極め"}' + data modify storage asset:effect Name set value '{"text": "予言者の見極め", "color": "#deceeb"}' # 説明文 (TextComponentString[]) - data modify storage asset:effect Description set value [] + data modify storage asset:effect Description set value ['{"text": "移動速度と耐性が極端に低下する"}', '{"text": "終了直前に、耐性が極端に上昇する"}'] # 効果時間 (int) (default = API || error) data modify storage asset:effect Duration set value 39 # スタック (int) (default = API || 1) From c324ed98cfbc724fcf91b66bc72909f85c050b23 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Mon, 31 Aug 2026 18:48:40 +0200 Subject: [PATCH 06/11] =?UTF-8?q?Lore=E3=82=92=E8=A6=8B=E3=82=84=E3=81=99?= =?UTF-8?q?=E3=81=8F&=E5=88=86=E3=81=8B=E3=82=8A=E3=82=84=E3=81=99?= =?UTF-8?q?=E3=81=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifact/1584.pk_insight/give/2.give.mcfunction | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1584.pk_insight/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1584.pk_insight/give/2.give.mcfunction index cc27451f0e..1cf84fa882 100644 --- a/Asset/data/asset/functions/artifact/1584.pk_insight/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1584.pk_insight/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text": "予言者の見極め", "color": "#deceeb"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text": "使用後、耐性と移動速度が大幅に下がり、カウントダウンが始まる。"}', '{"text": "3カウント後、0.5間だけ耐性が大きく上昇し、攻撃者に最大体力の35%分の割合ダメージを与える。"}'] + data modify storage asset:artifact Lore set value ['{"text": "使用後、耐性と移動速度が大幅に下がり、カウントダウンが始まる。"}', '{"text": "3カウント後、0.5秒の間耐性が大きく上昇する。"}','{"text": "耐性上昇中にダメージを受けたとき、攻撃者にダメージを与える。"}'] # 消費アイテム ({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 @@ -29,7 +29,7 @@ # 神器の発動条件 (TextComponentString) (オプション) # data modify storage asset:artifact Condition set value # 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.Damage set value [0,0] + data modify storage asset:artifact AttackInfo.Damage set value "最大体力の35%分" # 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) data modify storage asset:artifact AttackInfo.AttackType set value [Magic] # 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) @@ -37,7 +37,7 @@ # 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) data modify storage asset:artifact AttackInfo.BypassResist set value true # 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.IsRangeAttack set value + data modify storage asset:artifact AttackInfo.IsRangeAttack set value "never" # 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) data modify storage asset:artifact AttackInfo.AttackRange set value 20 # MP消費量 (int) From 44ec8bb2e5c6eff158c5770b442011b5ee8df148 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Tue, 1 Sep 2026 15:11:42 +0200 Subject: [PATCH 07/11] =?UTF-8?q?Lore=E3=82=92=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/artifact/1584.pk_insight/give/2.give.mcfunction | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1584.pk_insight/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1584.pk_insight/give/2.give.mcfunction index 1cf84fa882..10db898874 100644 --- a/Asset/data/asset/functions/artifact/1584.pk_insight/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1584.pk_insight/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text": "予言者の見極め", "color": "#deceeb"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text": "使用後、耐性と移動速度が大幅に下がり、カウントダウンが始まる。"}', '{"text": "3カウント後、0.5秒の間耐性が大きく上昇する。"}','{"text": "耐性上昇中にダメージを受けたとき、攻撃者にダメージを与える。"}'] + data modify storage asset:artifact Lore set value ['{"text": "使用後、耐性と移動速度が大幅に下がり、カウントダウンが始まる。"}', '{"text": "3カウント後、0.5秒の間耐性が大きく上昇する。"}','{"text": "耐性上昇中にダメージを受けたとき、攻撃者にダメージを与える。"}','{"text": "通常: 最大体力の35%分の割合ダメージ", "color": "gray"}', '{"text": "天使: 1000ダメージ", "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 @@ -29,7 +29,7 @@ # 神器の発動条件 (TextComponentString) (オプション) # data modify storage asset:artifact Condition set value # 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) - data modify storage asset:artifact AttackInfo.Damage set value "最大体力の35%分" + data modify storage asset:artifact AttackInfo.Damage set value "???" # 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) data modify storage asset:artifact AttackInfo.AttackType set value [Magic] # 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) From 2ba820b79e3ad202c1d7481881d9c8c430be57a6 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Tue, 1 Sep 2026 15:27:04 +0200 Subject: [PATCH 08/11] =?UTF-8?q?=E5=8F=8D=E6=92=83=E5=9B=9E=E6=95=B0?= =?UTF-8?q?=E3=82=92=E4=B8=80=E5=9B=9E=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../damage_from_entity/3.2.failure.mcfunction | 10 ---------- .../damage_from_entity/3.main.mcfunction | 6 ++++-- 2 files changed, 4 insertions(+), 12 deletions(-) delete mode 100644 Asset/data/asset/functions/artifact/1584.pk_insight/damage_from_entity/3.2.failure.mcfunction diff --git a/Asset/data/asset/functions/artifact/1584.pk_insight/damage_from_entity/3.2.failure.mcfunction b/Asset/data/asset/functions/artifact/1584.pk_insight/damage_from_entity/3.2.failure.mcfunction deleted file mode 100644 index 80f27d0a8d..0000000000 --- a/Asset/data/asset/functions/artifact/1584.pk_insight/damage_from_entity/3.2.failure.mcfunction +++ /dev/null @@ -1,10 +0,0 @@ -#> asset:artifact/1584.pk_insight/damage_from_entity/3.2.failure -# -# -# -# @within function asset:artifact/1584.pk_insight/damage_from_entity/3.main - -# Effect剝奪 - data modify storage api: Argument.ID set value 386 - function api:entity/mob/effect/remove/from_id - function api:entity/mob/effect/reset diff --git a/Asset/data/asset/functions/artifact/1584.pk_insight/damage_from_entity/3.main.mcfunction b/Asset/data/asset/functions/artifact/1584.pk_insight/damage_from_entity/3.main.mcfunction index f946c16fca..61a566823d 100644 --- a/Asset/data/asset/functions/artifact/1584.pk_insight/damage_from_entity/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1584.pk_insight/damage_from_entity/3.main.mcfunction @@ -14,8 +14,10 @@ execute store result score $Duration Temporary run data get storage api: Return.Effect.Duration function api:entity/mob/effect/reset execute if score $Duration Temporary matches ..9 run function asset:artifact/1584.pk_insight/damage_from_entity/3.1.success -# 失敗したらEffectも剝奪 - execute unless score $Duration Temporary matches ..9 run function asset:artifact/1584.pk_insight/damage_from_entity/3.2.failure +# Effect剝奪 + data modify storage api: Argument.ID set value 386 + function api:entity/mob/effect/remove/from_id + function api:entity/mob/effect/reset # リセット scoreboard players reset $Duration Temporary From e9116b3ffbac6267671103c35b0c97f0280a0ec6 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Tue, 1 Sep 2026 15:48:07 +0200 Subject: [PATCH 09/11] =?UTF-8?q?=E5=8A=B9=E6=9E=9C=E4=B8=AD=E3=81=AB?= =?UTF-8?q?=E3=82=AA=E3=83=95=E3=83=8F=E3=83=B3=E3=83=89=E3=81=8B=E3=82=89?= =?UTF-8?q?=E5=A4=96=E3=81=99=E3=81=A8Effect=E3=81=8C=E8=A7=A3=E9=99=A4?= =?UTF-8?q?=E3=81=95=E3=82=8C=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifact/1584.pk_insight/give/2.give.mcfunction | 2 +- .../1584.pk_insight/trigger/dis_equip/.mcfunction | 7 +++++++ .../1584.pk_insight/trigger/dis_equip/main.mcfunction | 10 ++++++++++ .../data/asset/tags/functions/artifact/dis_equip.json | 3 ++- 4 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 Asset/data/asset/functions/artifact/1584.pk_insight/trigger/dis_equip/.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1584.pk_insight/trigger/dis_equip/main.mcfunction diff --git a/Asset/data/asset/functions/artifact/1584.pk_insight/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1584.pk_insight/give/2.give.mcfunction index 10db898874..97a15206b4 100644 --- a/Asset/data/asset/functions/artifact/1584.pk_insight/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1584.pk_insight/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text": "予言者の見極め", "color": "#deceeb"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text": "使用後、耐性と移動速度が大幅に下がり、カウントダウンが始まる。"}', '{"text": "3カウント後、0.5秒の間耐性が大きく上昇する。"}','{"text": "耐性上昇中にダメージを受けたとき、攻撃者にダメージを与える。"}','{"text": "通常: 最大体力の35%分の割合ダメージ", "color": "gray"}', '{"text": "天使: 1000ダメージ", "color": "gray"}'] + data modify storage asset:artifact Lore set value ['{"text": "使用後、耐性と移動速度が大幅に下がり、カウントダウンが始まる。"}', '{"text": "3カウント後、0.5秒の間耐性が大きく上昇する。"}','{"text": "耐性上昇中にダメージを受けたとき、攻撃者にダメージを与える。"}','{"text": "通常: 最大体力の35%分の割合ダメージ", "color": "gray"}', '{"text": "天使: 1000ダメージ", "color": "gray"}', '{"text": "この効果はオフハンドからこの神器を外した場合、不発になる。"}'] # 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション) # data modify storage asset:artifact ConsumeItem.Item set value '{"translate":"item.minecraft.stick"}' # data modify storage asset:artifact ConsumeItem.Count set value 1 diff --git a/Asset/data/asset/functions/artifact/1584.pk_insight/trigger/dis_equip/.mcfunction b/Asset/data/asset/functions/artifact/1584.pk_insight/trigger/dis_equip/.mcfunction new file mode 100644 index 0000000000..084cbe72d6 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1584.pk_insight/trigger/dis_equip/.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1584.pk_insight/trigger/dis_equip/ +# +# 装備を外した時に外した部位にのみのidが入った状態でトリガーされる +# +# @within tag/function asset:artifact/dis_equip + +execute if data storage asset:context id{offhand:1584} run function asset:artifact/1584.pk_insight/trigger/dis_equip/main \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1584.pk_insight/trigger/dis_equip/main.mcfunction b/Asset/data/asset/functions/artifact/1584.pk_insight/trigger/dis_equip/main.mcfunction new file mode 100644 index 0000000000..7081a28813 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1584.pk_insight/trigger/dis_equip/main.mcfunction @@ -0,0 +1,10 @@ +#> asset:artifact/1584.pk_insight/trigger/dis_equip/main +# +# 装備を外した時のメイン処理 +# +# @within function asset:artifact/1584.pk_insight/trigger/dis_equip/ + +# Effect剝奪 + data modify storage api: Argument.ID set value 386 + function api:entity/mob/effect/remove/from_id + function api:entity/mob/effect/reset diff --git a/Asset/data/asset/tags/functions/artifact/dis_equip.json b/Asset/data/asset/tags/functions/artifact/dis_equip.json index 66024826fc..d0f2c54e5f 100644 --- a/Asset/data/asset/tags/functions/artifact/dis_equip.json +++ b/Asset/data/asset/tags/functions/artifact/dis_equip.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1584.pk_insight/trigger/dis_equip/", "asset:artifact/1430.shield_of_fate/trigger/dis_equip/", "asset:artifact/0772.dolphin_amulet/trigger/dis_equip/", "asset:artifact/1409.mana_charm/trigger/dis_equip/", @@ -67,4 +68,4 @@ "asset:artifact/0961.light_charm/trigger/dis_equip/", "asset:artifact/0960.heavy_charm/trigger/dis_equip/" ] -} +} \ No newline at end of file From 23640866778f8a5a90d4d667ee311fe17c516718 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Tue, 1 Sep 2026 17:13:28 +0200 Subject: [PATCH 10/11] =?UTF-8?q?=E5=8A=B9=E6=9E=9C=E9=87=8F=E3=82=92?= =?UTF-8?q?=E6=98=8E=E8=A8=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/artifact/1584.pk_insight/give/2.give.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/artifact/1584.pk_insight/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1584.pk_insight/give/2.give.mcfunction index 97a15206b4..cab7a310bb 100644 --- a/Asset/data/asset/functions/artifact/1584.pk_insight/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1584.pk_insight/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text": "予言者の見極め", "color": "#deceeb"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text": "使用後、耐性と移動速度が大幅に下がり、カウントダウンが始まる。"}', '{"text": "3カウント後、0.5秒の間耐性が大きく上昇する。"}','{"text": "耐性上昇中にダメージを受けたとき、攻撃者にダメージを与える。"}','{"text": "通常: 最大体力の35%分の割合ダメージ", "color": "gray"}', '{"text": "天使: 1000ダメージ", "color": "gray"}', '{"text": "この効果はオフハンドからこの神器を外した場合、不発になる。"}'] + data modify storage asset:artifact Lore set value ['{"text": "使用後、耐性が", "extra": [{"text": "70%", "color": "red"}, {"text": "、移動速度が", "color": "white"}, {"text": "50%", "color": "red"}, {"text": "下がり、カウントダウンが始まる。", "color": "white"}]}', '{"text": "3カウント後、0.5秒の間耐性が", "extra": [{"text": "70%", "color": "green"}, {"text": "上昇する。", "color": "white"}]}','{"text": "耐性上昇中にダメージを受けたとき、攻撃者にダメージを与える。"}','{"text": "通常: 最大体力の35%分の割合ダメージ", "color": "gray"}', '{"text": "天使: 1000ダメージ", "color": "gray"}', '{"text": "この効果はオフハンドからこの神器を外した場合、不発になる。"}'] # 消費アイテム ({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 8289853444693da207b0f29538d0f417eeccda95 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Sat, 5 Sep 2026 11:47:06 +0200 Subject: [PATCH 11/11] =?UTF-8?q?=E8=A3=85=E5=82=99=E8=A7=A3=E9=99=A4?= =?UTF-8?q?=E6=99=82=E3=81=AE=E3=83=9A=E3=83=8A=E3=83=AB=E3=83=86=E3=82=A3?= =?UTF-8?q?=E3=82=92=E9=87=8D=E3=81=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1584.pk_insight/give/2.give.mcfunction | 2 +- .../trigger/2.check_condition.mcfunction | 8 +++- .../trigger/dis_equip/main.mcfunction | 7 +++- .../0389.collapsed_insight/_/end.mcfunction | 7 ++++ .../0389.collapsed_insight/_/given.mcfunction | 7 ++++ .../_/register.mcfunction | 7 ++++ .../_/remove.mcfunction | 7 ++++ .../0389.collapsed_insight/end/.mcfunction | 8 ++++ .../0389.collapsed_insight/given/.mcfunction | 8 ++++ .../modifier/add.mcfunction | 11 ++++++ .../modifier/remove.mcfunction | 9 +++++ .../register.mcfunction | 39 +++++++++++++++++++ .../0389.collapsed_insight/remove/.mcfunction | 8 ++++ .../data/asset/tags/functions/effect/end.json | 1 + .../asset/tags/functions/effect/given.json | 1 + .../asset/tags/functions/effect/register.json | 3 +- .../asset/tags/functions/effect/remove.json | 1 + 17 files changed, 129 insertions(+), 5 deletions(-) create mode 100644 Asset/data/asset/functions/effect/0389.collapsed_insight/_/end.mcfunction create mode 100644 Asset/data/asset/functions/effect/0389.collapsed_insight/_/given.mcfunction create mode 100644 Asset/data/asset/functions/effect/0389.collapsed_insight/_/register.mcfunction create mode 100644 Asset/data/asset/functions/effect/0389.collapsed_insight/_/remove.mcfunction create mode 100644 Asset/data/asset/functions/effect/0389.collapsed_insight/end/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0389.collapsed_insight/given/.mcfunction create mode 100644 Asset/data/asset/functions/effect/0389.collapsed_insight/modifier/add.mcfunction create mode 100644 Asset/data/asset/functions/effect/0389.collapsed_insight/modifier/remove.mcfunction create mode 100644 Asset/data/asset/functions/effect/0389.collapsed_insight/register.mcfunction create mode 100644 Asset/data/asset/functions/effect/0389.collapsed_insight/remove/.mcfunction diff --git a/Asset/data/asset/functions/artifact/1584.pk_insight/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1584.pk_insight/give/2.give.mcfunction index cab7a310bb..6612eb6975 100644 --- a/Asset/data/asset/functions/artifact/1584.pk_insight/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1584.pk_insight/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text": "予言者の見極め", "color": "#deceeb"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text": "使用後、耐性が", "extra": [{"text": "70%", "color": "red"}, {"text": "、移動速度が", "color": "white"}, {"text": "50%", "color": "red"}, {"text": "下がり、カウントダウンが始まる。", "color": "white"}]}', '{"text": "3カウント後、0.5秒の間耐性が", "extra": [{"text": "70%", "color": "green"}, {"text": "上昇する。", "color": "white"}]}','{"text": "耐性上昇中にダメージを受けたとき、攻撃者にダメージを与える。"}','{"text": "通常: 最大体力の35%分の割合ダメージ", "color": "gray"}', '{"text": "天使: 1000ダメージ", "color": "gray"}', '{"text": "この効果はオフハンドからこの神器を外した場合、不発になる。"}'] + data modify storage asset:artifact Lore set value ['{"text": "使用後、耐性が", "extra": [{"text": "70%", "color": "red"}, {"text": "、移動速度が", "color": "white"}, {"text": "50%", "color": "red"}, {"text": "下がり、カウントダウンが始まる。", "color": "white"}]}', '{"text": "3カウント後、0.5秒の間耐性が", "extra": [{"text": "70%", "color": "green"}, {"text": "上昇する。", "color": "white"}]}','{"text": "耐性上昇中にダメージを受けたとき、攻撃者にダメージを与える。"}','{"text": "通常: 最大体力の35%分の割合ダメージ", "color": "gray"}', '{"text": "天使: 1000ダメージ", "color": "gray"}', '{"text": "この効果はオフハンドからこの神器を外した場合、不発になり、"}', '{"text": "10秒の間耐性が", "extra": [{"text": "30%", "color": "red"}, {"text": "低下しこの神器が使用不可となる。"}]}'] # 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション) # data modify storage asset:artifact ConsumeItem.Item set value '{"translate":"item.minecraft.stick"}' # data modify storage asset:artifact ConsumeItem.Count set value 1 diff --git a/Asset/data/asset/functions/artifact/1584.pk_insight/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1584.pk_insight/trigger/2.check_condition.mcfunction index 3edd768827..3efddce808 100644 --- a/Asset/data/asset/functions/artifact/1584.pk_insight/trigger/2.check_condition.mcfunction +++ b/Asset/data/asset/functions/artifact/1584.pk_insight/trigger/2.check_condition.mcfunction @@ -7,6 +7,10 @@ # 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く function asset:artifact/common/check_condition/offhand # 他にアイテム等確認する場合はここに書く - +# Effect 389があるなら失敗 + data modify storage api: Argument.ID set value 389 + function api:entity/mob/effect/get/from_id + execute if data storage api: Return.Effect run tag @s remove CanUsed + # CanUsedタグをチェックして3.main.mcfunctionを実行する - execute if entity @s[tag=CanUsed] run function asset:artifact/1584.pk_insight/trigger/3.main \ No newline at end of file + execute if entity @s[tag=CanUsed] run function asset:artifact/1584.pk_insight/trigger/3.main diff --git a/Asset/data/asset/functions/artifact/1584.pk_insight/trigger/dis_equip/main.mcfunction b/Asset/data/asset/functions/artifact/1584.pk_insight/trigger/dis_equip/main.mcfunction index 7081a28813..64868f318b 100644 --- a/Asset/data/asset/functions/artifact/1584.pk_insight/trigger/dis_equip/main.mcfunction +++ b/Asset/data/asset/functions/artifact/1584.pk_insight/trigger/dis_equip/main.mcfunction @@ -4,7 +4,12 @@ # # @within function asset:artifact/1584.pk_insight/trigger/dis_equip/ -# Effect剝奪 +# Effect 386剝奪 data modify storage api: Argument.ID set value 386 function api:entity/mob/effect/remove/from_id function api:entity/mob/effect/reset + +# Effect 389付与 + data modify storage api: Argument.ID set value 389 + function api:entity/mob/effect/give + function api:entity/mob/effect/reset diff --git a/Asset/data/asset/functions/effect/0389.collapsed_insight/_/end.mcfunction b/Asset/data/asset/functions/effect/0389.collapsed_insight/_/end.mcfunction new file mode 100644 index 0000000000..a3fa8cae5a --- /dev/null +++ b/Asset/data/asset/functions/effect/0389.collapsed_insight/_/end.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0389.collapsed_insight/_/end +# +# Effectの効果の終了時に実行されるfunction +# +# @within tag/function asset:effect/end + +execute if data storage asset:context {id:389} run function asset:effect/0389.collapsed_insight/end/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0389.collapsed_insight/_/given.mcfunction b/Asset/data/asset/functions/effect/0389.collapsed_insight/_/given.mcfunction new file mode 100644 index 0000000000..81bb7c1518 --- /dev/null +++ b/Asset/data/asset/functions/effect/0389.collapsed_insight/_/given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0389.collapsed_insight/_/given +# +# Effectが付与された時に実行されるfunction +# +# @within tag/function asset:effect/given + +execute if data storage asset:context {id:389} run function asset:effect/0389.collapsed_insight/given/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0389.collapsed_insight/_/register.mcfunction b/Asset/data/asset/functions/effect/0389.collapsed_insight/_/register.mcfunction new file mode 100644 index 0000000000..c1bd3a6a4e --- /dev/null +++ b/Asset/data/asset/functions/effect/0389.collapsed_insight/_/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0389.collapsed_insight/_/register +# +# +# +# @within tag/function asset:effect/register + +execute if data storage asset:context {id:389} run function asset:effect/0389.collapsed_insight/register \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0389.collapsed_insight/_/remove.mcfunction b/Asset/data/asset/functions/effect/0389.collapsed_insight/_/remove.mcfunction new file mode 100644 index 0000000000..c0ed456aae --- /dev/null +++ b/Asset/data/asset/functions/effect/0389.collapsed_insight/_/remove.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0389.collapsed_insight/_/remove +# +# Effectが神器や牛乳によって削除された時に実行されるfunction +# +# @within tag/function asset:effect/remove + +execute if data storage asset:context {id:389} run function asset:effect/0389.collapsed_insight/remove/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0389.collapsed_insight/end/.mcfunction b/Asset/data/asset/functions/effect/0389.collapsed_insight/end/.mcfunction new file mode 100644 index 0000000000..d6c35e0b29 --- /dev/null +++ b/Asset/data/asset/functions/effect/0389.collapsed_insight/end/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0389.collapsed_insight/end/ +# +# Effectの効果が切れた時の処理 +# +# @within function asset:effect/0389.collapsed_insight/_/end + +# modifier削除 + function asset:effect/0389.collapsed_insight/modifier/remove diff --git a/Asset/data/asset/functions/effect/0389.collapsed_insight/given/.mcfunction b/Asset/data/asset/functions/effect/0389.collapsed_insight/given/.mcfunction new file mode 100644 index 0000000000..40d4cf894b --- /dev/null +++ b/Asset/data/asset/functions/effect/0389.collapsed_insight/given/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0389.collapsed_insight/given/ +# +# Effectが付与された時の処理 +# +# @within function asset:effect/0389.collapsed_insight/_/given + +# modifier付与 + function asset:effect/0389.collapsed_insight/modifier/add diff --git a/Asset/data/asset/functions/effect/0389.collapsed_insight/modifier/add.mcfunction b/Asset/data/asset/functions/effect/0389.collapsed_insight/modifier/add.mcfunction new file mode 100644 index 0000000000..027366794b --- /dev/null +++ b/Asset/data/asset/functions/effect/0389.collapsed_insight/modifier/add.mcfunction @@ -0,0 +1,11 @@ +#> asset:effect/0389.collapsed_insight/modifier/add +# +# +# +# @within function asset:effect/0389.collapsed_insight/given/ + +# 耐性 + data modify storage api: Argument.UUID set value [I;1,3,389,0] + data modify storage api: Argument.Amount set value -0.3d + data modify storage api: Argument.Operation set value "multiply_base" + function api:modifier/defense/base/add diff --git a/Asset/data/asset/functions/effect/0389.collapsed_insight/modifier/remove.mcfunction b/Asset/data/asset/functions/effect/0389.collapsed_insight/modifier/remove.mcfunction new file mode 100644 index 0000000000..94507e8e94 --- /dev/null +++ b/Asset/data/asset/functions/effect/0389.collapsed_insight/modifier/remove.mcfunction @@ -0,0 +1,9 @@ +#> asset:effect/0389.collapsed_insight/modifier/remove +# +# +# +# @within function asset:effect/0389.collapsed_insight/** + +# 耐性 + data modify storage api: Argument.UUID set value [I;1,3,389,0] + function api:modifier/defense/base/remove diff --git a/Asset/data/asset/functions/effect/0389.collapsed_insight/register.mcfunction b/Asset/data/asset/functions/effect/0389.collapsed_insight/register.mcfunction new file mode 100644 index 0000000000..06f62e490e --- /dev/null +++ b/Asset/data/asset/functions/effect/0389.collapsed_insight/register.mcfunction @@ -0,0 +1,39 @@ +#> asset:effect/0389.collapsed_insight/register +# +# Effectのデータを指定 +# +# @within function asset:effect/0389.collapsed_insight/_/register + +# ExtendsSafe (boolean) (default = false) + # data modify storage asset:effect ExtendsSafe set value true +# ID (int) + data modify storage asset:effect ID set value 389 +# 名前 (TextComponentString) + data modify storage asset:effect Name set value '{"text": "予言者の名折れ"}' +# 説明文 (TextComponentString[]) + data modify storage asset:effect Description set value ['{"text": "耐性が大きく下がり、予言者の見極めが発動できなくなる"}'] +# 効果時間 (int) (default = API || error) + data modify storage asset:effect Duration set value 200 +# スタック (int) (default = API || 1) + # data modify storage asset:effect Stack set value +# 効果時間の操作方法 (default = API || "replace") + # data modify storage asset:effect DurationOperation set value +# スタックの操作方法 (default = API || "replace") + # data modify storage asset:effect StackOperation set value +# 最大効果時間 (int) (default = 2147483647) + # data modify storage asset:effect MaxDuration set value +# 最大スタック (int) (default = 2147483647) + # data modify storage asset:effect MaxStack set value +# 悪い効果か否か (boolean) + data modify storage asset:effect IsBadEffect set value true +# 死亡時のエフェクトの処理 (default = "remove") + # data modify storage asset:effect ProcessOnDied set value +# 消すのに必要なレベル (int) (default = 1) + # data modify storage asset:effect RequireClearLv set value +# エフェクトをUIに表示するか (boolean) (default = true) + # data modify storage asset:effect Visible set value +# エフェクトのスタックををUIに表示するか (boolean) (default = true) + data modify storage asset:effect StackVisible set value false + +# フィールド + # data modify storage asset:effect Field set value {} diff --git a/Asset/data/asset/functions/effect/0389.collapsed_insight/remove/.mcfunction b/Asset/data/asset/functions/effect/0389.collapsed_insight/remove/.mcfunction new file mode 100644 index 0000000000..f0dee33820 --- /dev/null +++ b/Asset/data/asset/functions/effect/0389.collapsed_insight/remove/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0389.collapsed_insight/remove/ +# +# Effectが削除された時の処理 +# +# @within function asset:effect/0389.collapsed_insight/_/remove + +# modifier削除 + function asset:effect/0389.collapsed_insight/modifier/remove diff --git a/Asset/data/asset/tags/functions/effect/end.json b/Asset/data/asset/tags/functions/effect/end.json index a1be8d9595..1230f30246 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/0389.collapsed_insight/_/end", "asset:effect/0386.pk_insight/_/end", "asset:effect/0371.tsukimi/_/end", "asset:effect/0355.heart_gap/_/end", diff --git a/Asset/data/asset/tags/functions/effect/given.json b/Asset/data/asset/tags/functions/effect/given.json index fbf0597625..a810c0240d 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/0389.collapsed_insight/_/given", "asset:effect/0386.pk_insight/_/given", "asset:effect/0371.tsukimi/_/given", "asset:effect/0355.heart_gap/_/given", diff --git a/Asset/data/asset/tags/functions/effect/register.json b/Asset/data/asset/tags/functions/effect/register.json index 7942fe9821..7ec7035ee7 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/0389.collapsed_insight/_/register", "asset:effect/0386.pk_insight/_/register", "asset:effect/0371.tsukimi/_/register", "asset:effect/0355.heart_gap/_/register", @@ -183,4 +184,4 @@ "asset:effect/0007.defense_base_debuff/_/register", "asset:effect/0258.spirit_melody/_/register" ] -} +} \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/effect/remove.json b/Asset/data/asset/tags/functions/effect/remove.json index 5825fced15..e32d312fe9 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/0389.collapsed_insight/_/remove", "asset:effect/0386.pk_insight/_/remove", "asset:effect/0371.tsukimi/_/remove", "asset:effect/0355.heart_gap/_/remove",