From 3d29a247f1fb8827a8275acba261537e6c7378d2 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Wed, 5 Nov 2025 12:09:45 +0900 Subject: [PATCH 01/11] =?UTF-8?q?=E3=83=80=E3=83=A1=E3=83=BC=E3=82=B8?= =?UTF-8?q?=E3=81=A7=E6=AD=BB=E3=81=AA=E3=81=AA=E3=81=84=E3=82=88=E3=81=86?= =?UTF-8?q?=E3=81=AB=E3=81=99=E3=82=8B=E5=AE=9F=E8=A3=85=E3=81=AE=E9=80=94?= =?UTF-8?q?=E4=B8=AD=E3=81=BE=E3=81=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1324.oracle/give/1.trigger.mcfunction | 7 ++ .../1324.oracle/give/2.give.mcfunction | 73 +++++++++++++++++++ .../artifact/1324.oracle/register.mcfunction | 7 ++ .../1324.oracle/trigger/1.trigger.mcfunction | 8 ++ .../trigger/2.check_condition.mcfunction | 17 +++++ .../1324.oracle/trigger/3.main.mcfunction | 16 ++++ .../1324.oracle/trigger/_index.d.mcfunction | 10 +++ .../1324.oracle/trigger/damage.mcfunction | 28 +++++++ .../trigger/find_target.mcfunction | 32 ++++++++ .../1324.oracle/trigger/get_health.mcfunction | 13 ++++ .../asset/tags/functions/artifact/give.json | 3 +- .../tags/functions/artifact/register.json | 3 +- .../asset/tags/functions/artifact/tick.json | 3 +- 13 files changed, 217 insertions(+), 3 deletions(-) create mode 100644 Asset/data/asset/functions/artifact/1324.oracle/give/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1324.oracle/give/2.give.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1324.oracle/register.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1324.oracle/trigger/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1324.oracle/trigger/2.check_condition.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1324.oracle/trigger/3.main.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1324.oracle/trigger/_index.d.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1324.oracle/trigger/damage.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1324.oracle/trigger/find_target.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1324.oracle/trigger/get_health.mcfunction diff --git a/Asset/data/asset/functions/artifact/1324.oracle/give/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1324.oracle/give/1.trigger.mcfunction new file mode 100644 index 00000000000..d65bcdceeaa --- /dev/null +++ b/Asset/data/asset/functions/artifact/1324.oracle/give/1.trigger.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1324.oracle/give/1.trigger +# +# 神器の取得処理の呼び出し時に実行されるfunction +# +# @within tag/function asset:artifact/give + +execute if data storage asset:context {id:1324} run function asset:artifact/1324.oracle/give/2.give \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1324.oracle/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1324.oracle/give/2.give.mcfunction new file mode 100644 index 00000000000..7d7726a7223 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1324.oracle/give/2.give.mcfunction @@ -0,0 +1,73 @@ +#> asset:artifact/1324.oracle/give/2.give +# +# 神器の作成部 ここでID等を定義する +# +# @user +# @within function asset:artifact/1324.oracle/give/1.trigger + +# 神器の説明や消費MPなどをここで設定する。 +# 最後にasset:artifact/common/giveを実行することで入手可能。 + +# 神器のID (int) スプレッドシートの値を入れる + data modify storage asset:artifact ID set value 1324 +# 神器のベースアイテム + data modify storage asset:artifact Item set value "minecraft:stick" +# 神器の名前 (TextComponentString) + data modify storage asset:artifact Name set value '[{"text":"オ","color":"#9e99fc"},{"text":"ラ","color":"#9bb3fd"},{"text":"ク","color":"#98cefe"},{"text":"ル","color":"#96e9ff"}]' +# 神器の説明文 (TextComponentString[]) + data modify storage asset:artifact Lore set value ['{"text":"自身と周囲20mのプレイヤーの中で"}','{"translate":"-%1$s最も現在体力の高い対象に20の固定ダメージを与える","with":[{"text":"\\u0002","font":"space"}]}','{"translate":"-%1$s最も現在体力の低い対象に20の固定回復を与える","with":[{"text":"\\u0002","font":"space"}]}'] +# 消費アイテム ({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 "hotbar" +# 神器のトリガー (string) Wikiを参照 + data modify storage asset:artifact Trigger set value "passive" +# 効果が重複可能か否か (boolean) (オプション) + # data modify storage asset:artifact EnableDuplication set value +# 神器の発動条件 (TextComponentString) (オプション) + # data modify storage asset:artifact Condition set value +# 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.Damage set value [0,0] +# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.AttackType set value [Physical,Magic] +# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.ElementType set value [Fire,Water,Thunder,None] +# 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.BypassResist set value +# 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.IsRangeAttack set value +# 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.AttackRange set value +# MP消費量 (int) + data modify storage asset:artifact MPCost set value 0 +# MP必要量 (int) (オプション) + # data modify storage asset:artifact MPRequire set value +# MP回復量 (int) + # data modify storage asset:artifact MPHealWhenHit set value +# 神器のクールダウン (int) (オプション) + data modify storage asset:artifact LocalCooldown set value 100 +# 種別クールダウン ({Type: string, Duration: int}) (オプション) + # data modify storage asset:artifact TypeCooldown.Type set value + # data modify storage asset:artifact TypeCooldown.Duration set value +# 第二種別クールダウン ({Type: string, Duration: int}) (オプション) + # data modify storage asset:artifact SecondaryTypeCooldown.Type set value + # data modify storage asset:artifact SecondaryTypeCooldown.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 "ALL" +# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) + # data modify storage asset:artifact CustomNBT set value {} + +# 神器の入手用function + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/1324.oracle/register.mcfunction b/Asset/data/asset/functions/artifact/1324.oracle/register.mcfunction new file mode 100644 index 00000000000..22a31af17b3 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1324.oracle/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1324.oracle/register +# +# 神器プールへの登録処理 +# +# @within tag/function asset:artifact/register + +data modify storage asset:artifact RarityRegistry[4] append value [1324] \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1324.oracle/trigger/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1324.oracle/trigger/1.trigger.mcfunction new file mode 100644 index 00000000000..3a11f91ad0a --- /dev/null +++ b/Asset/data/asset/functions/artifact/1324.oracle/trigger/1.trigger.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1324.oracle/trigger/1.trigger +# +# 指定したイベントタイミングで実行されるfunction +# +# @within tag/function asset:artifact/** + +# storage asset:idの%slot%に装備している神器のIDが入っているので比較し、~/2.check_condition.mcfunctionを実行する + execute if data storage asset:context id{hotbar:[1324]} run function asset:artifact/1324.oracle/trigger/2.check_condition \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1324.oracle/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1324.oracle/trigger/2.check_condition.mcfunction new file mode 100644 index 00000000000..f7a903f741c --- /dev/null +++ b/Asset/data/asset/functions/artifact/1324.oracle/trigger/2.check_condition.mcfunction @@ -0,0 +1,17 @@ +#> asset:artifact/1324.oracle/trigger/2.check_condition +# +# 神器の発動条件をチェックします +# +# @within function asset:artifact/1324.oracle/trigger/1.trigger + +# ID指定する + data modify storage asset:artifact TargetID set value 1324 +# 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く + function asset:artifact/common/check_condition/hotbar +# 他にアイテム等確認する場合はここに書く + +# 他にプレイヤーがいない場合は発動しない + execute if entity @s[tag=CanUsed] unless entity @p[tag=!this,tag=!PlayerShouldInvulnerable,distance=..20] run tag @s remove CanUsed + +# CanUsedタグをチェックして3.main.mcfunctionを実行する + execute if entity @s[tag=CanUsed] run function asset:artifact/1324.oracle/trigger/3.main diff --git a/Asset/data/asset/functions/artifact/1324.oracle/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1324.oracle/trigger/3.main.mcfunction new file mode 100644 index 00000000000..9514e555128 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1324.oracle/trigger/3.main.mcfunction @@ -0,0 +1,16 @@ +#> asset:artifact/1324.oracle/trigger/3.main +# +# 神器のメイン処理部 +# +# @within function asset:artifact/1324.oracle/trigger/2.check_condition + +# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う + function asset:artifact/common/use/hotbar + +# ここから先は神器側の効果の処理を書く + +# 最も現在体力の高い/低いプレイヤーを検索 + function asset:artifact/1324.oracle/trigger/find_target + + +# リセット diff --git a/Asset/data/asset/functions/artifact/1324.oracle/trigger/_index.d.mcfunction b/Asset/data/asset/functions/artifact/1324.oracle/trigger/_index.d.mcfunction new file mode 100644 index 00000000000..296c5f61a6e --- /dev/null +++ b/Asset/data/asset/functions/artifact/1324.oracle/trigger/_index.d.mcfunction @@ -0,0 +1,10 @@ +#> asset:artifact/1324.oracle/trigger/_index.d +# @private + +#> tag +# @within function asset:artifact/1324.oracle/trigger/** + #declare tag 10S.SearchTarget + #declare tag 10S.HighestHealth + #declare tag 10S.LowestHealth + #declare score_holder $10S.HighestHealth + #declare score_holder $10S.LowestHealth diff --git a/Asset/data/asset/functions/artifact/1324.oracle/trigger/damage.mcfunction b/Asset/data/asset/functions/artifact/1324.oracle/trigger/damage.mcfunction new file mode 100644 index 00000000000..10bcc393023 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1324.oracle/trigger/damage.mcfunction @@ -0,0 +1,28 @@ +#> asset:artifact/1324.oracle/trigger/damage +# +# +# +# @within function asset:artifact/1324.oracle/trigger/3.main + +#> Private +# @private + #declare score_holder $10S.Health + +# ダメージのデフォルト値 + data modify storage api: Argument.Damage set value 20f + +# 自身の現在の体力が20以下なら、体力を1残すダメージにする + execute store result score $10S.Health Temporary run function asset:artifact/1324.oracle/trigger/get_health + execute if score $10S.Health Temporary matches ..200 store result storage api: Argument.Damage float 0.1 run scoreboard players remove $10S.Health Temporary 10 + +# 最も現在体力の高いプレイヤーに固定ダメージを与えるが、死なないようにする +# 念のためデスログは設定しておく + data modify storage api: Argument.AttackType set value "Magic" + data modify storage api: Argument.FixedDamage set value true + data modify storage api: Argument.DeathMessage set value ['[{"translate": "%1$sは%2$sに体力を","with":[{"selector":"@s"}]}]'] + function api:damage/modifier + execute as @p[tag=10S.HighestHealth] run function api:damage/ + function api:damage/reset + +# リセット + scoreboard players reset $10S.Health Temporary diff --git a/Asset/data/asset/functions/artifact/1324.oracle/trigger/find_target.mcfunction b/Asset/data/asset/functions/artifact/1324.oracle/trigger/find_target.mcfunction new file mode 100644 index 00000000000..56c163fb553 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1324.oracle/trigger/find_target.mcfunction @@ -0,0 +1,32 @@ +#> asset:artifact/1324.oracle/trigger/find_target +# +# +# +# @within function asset:artifact/1324.oracle/trigger/3.main + +# 範囲内の対象の現在体力を取得 +# 検索対象：最も現在体力が高いプレイヤー1名, 最も現在体力の低いプレイヤー1名 + +# 検索対象にTagを付与 + tag @a[tag=!PlayerShouldInvulnerable,distance=..20] add 10S.SearchTarget + +# 各プレイヤーの現在体力をスコアへ代入 + execute as @a[tag=10S.SearchTarget] store result score @s Temporary run function asset:artifact/1324.oracle/trigger/get_health + +# $HighestHealth, $LowestHealthの初期化 + scoreboard players set $10S.HighestHealth Temporary 0 + scoreboard players set $10S.LowestHealth Temporary 2147483647 + +# 全員の体力と比較する + execute as @a[tag=10S.SearchTarget] run scoreboard players operation $10S.HighestHealth Temporary > @s Temporary + execute as @a[tag=10S.SearchTarget] run scoreboard players operation $10S.LowestHealth Temporary < @s Temporary + +# 特定したプレイヤーにTagを付与 + execute as @a[tag=10S.SearchTarget] if score @s Temporary = $10S.HighestHealth Temporary run tag @s add 10S.HighestHealth + execute as @a[tag=10S.SearchTarget] if score @s Temporary = $10S.LowestHealth Temporary run tag @s add 10S.LowestHealth + +# リセット + scoreboard players reset @a[tag=10S.SearchTarget] Temporary + tag @a[tag=10S.SearchTarget] remove 10S.SearchTarget + scoreboard players reset $10S.HighestHealth Temporary + scoreboard players reset $10S.LowestHealth Temporary diff --git a/Asset/data/asset/functions/artifact/1324.oracle/trigger/get_health.mcfunction b/Asset/data/asset/functions/artifact/1324.oracle/trigger/get_health.mcfunction new file mode 100644 index 00000000000..e933d63f441 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1324.oracle/trigger/get_health.mcfunction @@ -0,0 +1,13 @@ +#> asset:artifact/1324.oracle/trigger/get_health +# +# +# +# @within function +# asset:artifact/1324.oracle/trigger/damage +# asset:artifact/1324.oracle/trigger/find_target + +# 現在体力を取得 + function api:data_get/health + +# 現在体力の10倍を返り値として返す + return run data get storage api: Health 10 diff --git a/Asset/data/asset/tags/functions/artifact/give.json b/Asset/data/asset/tags/functions/artifact/give.json index f3eb0088574..dd0bdeb5683 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/1324.oracle/give/1.trigger", "asset:artifact/1140.over_pulse_booster/give/1.trigger", "asset:artifact/1139.over_pulse_legframe/give/1.trigger", "asset:artifact/1138.over_pulse_bodyarmor/give/1.trigger", @@ -517,4 +518,4 @@ "asset:artifact/0735.collision_plate/give/1.trigger", "asset:artifact/0745.blade_of_whirlwind/give/1.trigger" ] -} +} \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/artifact/register.json b/Asset/data/asset/tags/functions/artifact/register.json index deba1661508..ef97a6ecb22 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/1324.oracle/register", "asset:artifact/1137.over_pulse_headgear/register", "asset:artifact/1228.fatalerror/register", "asset:artifact/1273.maidchan_plush/register", @@ -295,4 +296,4 @@ "asset:artifact/1027.fire_of_rebirth/register", "asset:artifact/1111.rod_o_redeem/register" ] -} +} \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/artifact/tick.json b/Asset/data/asset/tags/functions/artifact/tick.json index e6afc60e9e6..61c0906a389 100644 --- a/Asset/data/asset/tags/functions/artifact/tick.json +++ b/Asset/data/asset/tags/functions/artifact/tick.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1324.oracle/trigger/1.trigger", "asset:artifact/0237.schrodingers_cat/trigger/1.trigger", "asset:artifact/1057.great_demon_head/tick/1.trigger", "asset:artifact/1066.weight_stone/tick/1.trigger", @@ -27,4 +28,4 @@ "asset:artifact/0204.spelunker_shoes/trigger/1.trigger", "asset:artifact/0468.raging_demon/trigger/1.trigger" ] -} +} \ No newline at end of file From 5e1d6c37e575cd8287cb67c4b83781b9a63b0d4a Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Wed, 5 Nov 2025 18:46:44 +0900 Subject: [PATCH 02/11] =?UTF-8?q?=E5=AE=8C=E6=88=90=EF=BC=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1324.oracle/give/2.give.mcfunction | 4 +-- .../artifact/1324.oracle/register.mcfunction | 3 +- .../1324.oracle/trigger/3.main.mcfunction | 11 ++++++- .../1324.oracle/trigger/_index.d.mcfunction | 8 ++--- .../1324.oracle/trigger/damage.mcfunction | 28 ----------------- .../trigger/find_target.mcfunction | 31 ++++++++++--------- .../1324.oracle/trigger/get_health.mcfunction | 13 -------- .../1324.oracle/trigger/get_mp.mcfunction | 11 +++++++ 8 files changed, 45 insertions(+), 64 deletions(-) delete mode 100644 Asset/data/asset/functions/artifact/1324.oracle/trigger/damage.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/1324.oracle/trigger/get_health.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1324.oracle/trigger/get_mp.mcfunction diff --git a/Asset/data/asset/functions/artifact/1324.oracle/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1324.oracle/give/2.give.mcfunction index 7d7726a7223..43978705999 100644 --- a/Asset/data/asset/functions/artifact/1324.oracle/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1324.oracle/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '[{"text":"オ","color":"#9e99fc"},{"text":"ラ","color":"#9bb3fd"},{"text":"ク","color":"#98cefe"},{"text":"ル","color":"#96e9ff"}]' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text":"自身と周囲20mのプレイヤーの中で"}','{"translate":"-%1$s最も現在体力の高い対象に20の固定ダメージを与える","with":[{"text":"\\u0002","font":"space"}]}','{"translate":"-%1$s最も現在体力の低い対象に20の固定回復を与える","with":[{"text":"\\u0002","font":"space"}]}'] + data modify storage asset:artifact Lore set value ['{"text":"自身と周囲20mのプレイヤーの中で"}','{"translate":"-%1$s最も現在MPの多い1名のMPを100減少させる","with":[{"text":"\\u0002","font":"space"}]}','{"translate":"-%1$s最も現在MPの少ない1名のMPを100回復する","with":[{"text":"\\u0002","font":"space"}]}'] # 消費アイテム ({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 @@ -49,7 +49,7 @@ # MP回復量 (int) # data modify storage asset:artifact MPHealWhenHit set value # 神器のクールダウン (int) (オプション) - data modify storage asset:artifact LocalCooldown set value 100 + data modify storage asset:artifact LocalCooldown set value 140 # 種別クールダウン ({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/1324.oracle/register.mcfunction b/Asset/data/asset/functions/artifact/1324.oracle/register.mcfunction index 22a31af17b3..adb6c8450f0 100644 --- a/Asset/data/asset/functions/artifact/1324.oracle/register.mcfunction +++ b/Asset/data/asset/functions/artifact/1324.oracle/register.mcfunction @@ -4,4 +4,5 @@ # # @within tag/function asset:artifact/register -data modify storage asset:artifact RarityRegistry[4] append value [1324] \ No newline at end of file +# いつか実装される日替わり交換村人のプールに突っ込む予定 +# data modify storage asset:artifact RarityRegistry[4] append value [1324] diff --git a/Asset/data/asset/functions/artifact/1324.oracle/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1324.oracle/trigger/3.main.mcfunction index 9514e555128..d148ca248a0 100644 --- a/Asset/data/asset/functions/artifact/1324.oracle/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1324.oracle/trigger/3.main.mcfunction @@ -9,8 +9,17 @@ # ここから先は神器側の効果の処理を書く -# 最も現在体力の高い/低いプレイヤーを検索 +# 最も現在MPの高い/低いプレイヤーを検索 function asset:artifact/1324.oracle/trigger/find_target +# 最も現在MPの多いプレイヤーのMPを減少 + data modify storage api: Argument.Fluctuation set value -100 + execute as @p[tag=10S.HighestMP] run function api:mp/fluctuation + +# 最も現在MPの少ないプレイヤーのMPを回復 + data modify storage api: Argument.Fluctuation set value 100 + execute as @p[tag=10S.LowestMP] run function api:mp/fluctuation # リセット + tag @p[tag=10S.HighestMP] remove 10S.HighestMP + tag @p[tag=10S.LowestMP] remove 10S.LowestMP diff --git a/Asset/data/asset/functions/artifact/1324.oracle/trigger/_index.d.mcfunction b/Asset/data/asset/functions/artifact/1324.oracle/trigger/_index.d.mcfunction index 296c5f61a6e..820ebbea623 100644 --- a/Asset/data/asset/functions/artifact/1324.oracle/trigger/_index.d.mcfunction +++ b/Asset/data/asset/functions/artifact/1324.oracle/trigger/_index.d.mcfunction @@ -4,7 +4,7 @@ #> tag # @within function asset:artifact/1324.oracle/trigger/** #declare tag 10S.SearchTarget - #declare tag 10S.HighestHealth - #declare tag 10S.LowestHealth - #declare score_holder $10S.HighestHealth - #declare score_holder $10S.LowestHealth + #declare tag 10S.HighestMP + #declare tag 10S.LowestMP + #declare score_holder $10S.HighestMP + #declare score_holder $10S.LowestMP diff --git a/Asset/data/asset/functions/artifact/1324.oracle/trigger/damage.mcfunction b/Asset/data/asset/functions/artifact/1324.oracle/trigger/damage.mcfunction deleted file mode 100644 index 10bcc393023..00000000000 --- a/Asset/data/asset/functions/artifact/1324.oracle/trigger/damage.mcfunction +++ /dev/null @@ -1,28 +0,0 @@ -#> asset:artifact/1324.oracle/trigger/damage -# -# -# -# @within function asset:artifact/1324.oracle/trigger/3.main - -#> Private -# @private - #declare score_holder $10S.Health - -# ダメージのデフォルト値 - data modify storage api: Argument.Damage set value 20f - -# 自身の現在の体力が20以下なら、体力を1残すダメージにする - execute store result score $10S.Health Temporary run function asset:artifact/1324.oracle/trigger/get_health - execute if score $10S.Health Temporary matches ..200 store result storage api: Argument.Damage float 0.1 run scoreboard players remove $10S.Health Temporary 10 - -# 最も現在体力の高いプレイヤーに固定ダメージを与えるが、死なないようにする -# 念のためデスログは設定しておく - data modify storage api: Argument.AttackType set value "Magic" - data modify storage api: Argument.FixedDamage set value true - data modify storage api: Argument.DeathMessage set value ['[{"translate": "%1$sは%2$sに体力を","with":[{"selector":"@s"}]}]'] - function api:damage/modifier - execute as @p[tag=10S.HighestHealth] run function api:damage/ - function api:damage/reset - -# リセット - scoreboard players reset $10S.Health Temporary diff --git a/Asset/data/asset/functions/artifact/1324.oracle/trigger/find_target.mcfunction b/Asset/data/asset/functions/artifact/1324.oracle/trigger/find_target.mcfunction index 56c163fb553..3caed7ede8f 100644 --- a/Asset/data/asset/functions/artifact/1324.oracle/trigger/find_target.mcfunction +++ b/Asset/data/asset/functions/artifact/1324.oracle/trigger/find_target.mcfunction @@ -4,29 +4,30 @@ # # @within function asset:artifact/1324.oracle/trigger/3.main -# 範囲内の対象の現在体力を取得 -# 検索対象：最も現在体力が高いプレイヤー1名, 最も現在体力の低いプレイヤー1名 +# 範囲内の対象の現在MPを取得 +# 検索対象：最も現在MPが高いプレイヤー1名, 最も現在MPの低いプレイヤー1名 # 検索対象にTagを付与 tag @a[tag=!PlayerShouldInvulnerable,distance=..20] add 10S.SearchTarget -# 各プレイヤーの現在体力をスコアへ代入 - execute as @a[tag=10S.SearchTarget] store result score @s Temporary run function asset:artifact/1324.oracle/trigger/get_health +# 各プレイヤーの現在MPをスコアへ代入 + execute as @a[tag=10S.SearchTarget] store result score @s Temporary run function asset:artifact/1324.oracle/trigger/get_mp -# $HighestHealth, $LowestHealthの初期化 - scoreboard players set $10S.HighestHealth Temporary 0 - scoreboard players set $10S.LowestHealth Temporary 2147483647 +# $HighestMP, $LowestMPの初期化 + scoreboard players set $10S.HighestMP Temporary 0 + scoreboard players set $10S.LowestMP Temporary 2147483647 -# 全員の体力と比較する - execute as @a[tag=10S.SearchTarget] run scoreboard players operation $10S.HighestHealth Temporary > @s Temporary - execute as @a[tag=10S.SearchTarget] run scoreboard players operation $10S.LowestHealth Temporary < @s Temporary +# 最も多い対象を探す + execute as @a[tag=10S.SearchTarget] run scoreboard players operation $10S.HighestMP Temporary > @s Temporary + execute as @a[tag=10S.SearchTarget] if score @s Temporary = $10S.HighestMP Temporary run tag @s add 10S.HighestMP -# 特定したプレイヤーにTagを付与 - execute as @a[tag=10S.SearchTarget] if score @s Temporary = $10S.HighestHealth Temporary run tag @s add 10S.HighestHealth - execute as @a[tag=10S.SearchTarget] if score @s Temporary = $10S.LowestHealth Temporary run tag @s add 10S.LowestHealth +# 最も少ない対象を探す +# 最も多い対象は検索から除外 + execute as @a[tag=10S.SearchTarget,tag=!10S.HighestMP] run scoreboard players operation $10S.LowestMP Temporary < @s Temporary + execute as @a[tag=10S.SearchTarget,tag=!10S.HighestMP] if score @s Temporary = $10S.LowestMP Temporary run tag @s add 10S.LowestMP # リセット scoreboard players reset @a[tag=10S.SearchTarget] Temporary tag @a[tag=10S.SearchTarget] remove 10S.SearchTarget - scoreboard players reset $10S.HighestHealth Temporary - scoreboard players reset $10S.LowestHealth Temporary + scoreboard players reset $10S.HighestMP Temporary + scoreboard players reset $10S.LowestMP Temporary diff --git a/Asset/data/asset/functions/artifact/1324.oracle/trigger/get_health.mcfunction b/Asset/data/asset/functions/artifact/1324.oracle/trigger/get_health.mcfunction deleted file mode 100644 index e933d63f441..00000000000 --- a/Asset/data/asset/functions/artifact/1324.oracle/trigger/get_health.mcfunction +++ /dev/null @@ -1,13 +0,0 @@ -#> asset:artifact/1324.oracle/trigger/get_health -# -# -# -# @within function -# asset:artifact/1324.oracle/trigger/damage -# asset:artifact/1324.oracle/trigger/find_target - -# 現在体力を取得 - function api:data_get/health - -# 現在体力の10倍を返り値として返す - return run data get storage api: Health 10 diff --git a/Asset/data/asset/functions/artifact/1324.oracle/trigger/get_mp.mcfunction b/Asset/data/asset/functions/artifact/1324.oracle/trigger/get_mp.mcfunction new file mode 100644 index 00000000000..5203bd002f7 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1324.oracle/trigger/get_mp.mcfunction @@ -0,0 +1,11 @@ +#> asset:artifact/1324.oracle/trigger/get_mp +# +# +# +# @within function asset:artifact/1324.oracle/trigger/find_target + +# 現在体力を取得 + function api:mp/get_current + +# 現在体力の10倍を返り値として返す + return run data get storage api: Health 10 From 142dd754c232db5f6b3661d83793081924450b31 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Wed, 5 Nov 2025 21:48:25 +0900 Subject: [PATCH 03/11] =?UTF-8?q?=E7=A5=9E=E5=99=A8=E5=90=8D=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/1.trigger.mcfunction | 4 ++-- .../give/2.give.mcfunction | 6 +++--- .../register.mcfunction | 2 +- .../trigger/1.trigger.mcfunction | 4 ++-- .../trigger/2.check_condition.mcfunction | 6 +++--- .../trigger/3.main.mcfunction | 6 +++--- .../trigger/_index.d.mcfunction | 4 ++-- .../trigger/find_target.mcfunction | 6 +++--- .../trigger/get_mp.mcfunction | 4 ++-- Asset/data/asset/tags/functions/artifact/give.json | 4 ++-- Asset/data/asset/tags/functions/artifact/register.json | 4 ++-- Asset/data/asset/tags/functions/artifact/tick.json | 4 ++-- 12 files changed, 27 insertions(+), 27 deletions(-) rename Asset/data/asset/functions/artifact/{1324.oracle => 1324.mysterious_star}/give/1.trigger.mcfunction (64%) rename Asset/data/asset/functions/artifact/{1324.oracle => 1324.mysterious_star}/give/2.give.mcfunction (94%) rename Asset/data/asset/functions/artifact/{1324.oracle => 1324.mysterious_star}/register.mcfunction (83%) rename Asset/data/asset/functions/artifact/{1324.oracle => 1324.mysterious_star}/trigger/1.trigger.mcfunction (71%) rename Asset/data/asset/functions/artifact/{1324.oracle => 1324.mysterious_star}/trigger/2.check_condition.mcfunction (79%) rename Asset/data/asset/functions/artifact/{1324.oracle => 1324.mysterious_star}/trigger/3.main.mcfunction (79%) rename Asset/data/asset/functions/artifact/{1324.oracle => 1324.mysterious_star}/trigger/_index.d.mcfunction (61%) rename Asset/data/asset/functions/artifact/{1324.oracle => 1324.mysterious_star}/trigger/find_target.mcfunction (87%) rename Asset/data/asset/functions/artifact/{1324.oracle => 1324.mysterious_star}/trigger/get_mp.mcfunction (55%) diff --git a/Asset/data/asset/functions/artifact/1324.oracle/give/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1324.mysterious_star/give/1.trigger.mcfunction similarity index 64% rename from Asset/data/asset/functions/artifact/1324.oracle/give/1.trigger.mcfunction rename to Asset/data/asset/functions/artifact/1324.mysterious_star/give/1.trigger.mcfunction index d65bcdceeaa..3a94693c03e 100644 --- a/Asset/data/asset/functions/artifact/1324.oracle/give/1.trigger.mcfunction +++ b/Asset/data/asset/functions/artifact/1324.mysterious_star/give/1.trigger.mcfunction @@ -1,7 +1,7 @@ -#> asset:artifact/1324.oracle/give/1.trigger +#> asset:artifact/1324.mysterious_star/give/1.trigger # # 神器の取得処理の呼び出し時に実行されるfunction # # @within tag/function asset:artifact/give -execute if data storage asset:context {id:1324} run function asset:artifact/1324.oracle/give/2.give \ No newline at end of file +execute if data storage asset:context {id:1324} run function asset:artifact/1324.mysterious_star/give/2.give diff --git a/Asset/data/asset/functions/artifact/1324.oracle/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1324.mysterious_star/give/2.give.mcfunction similarity index 94% rename from Asset/data/asset/functions/artifact/1324.oracle/give/2.give.mcfunction rename to Asset/data/asset/functions/artifact/1324.mysterious_star/give/2.give.mcfunction index 43978705999..a8d535d9f41 100644 --- a/Asset/data/asset/functions/artifact/1324.oracle/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1324.mysterious_star/give/2.give.mcfunction @@ -1,9 +1,9 @@ -#> asset:artifact/1324.oracle/give/2.give +#> asset:artifact/1324.mysterious_star/give/2.give # # 神器の作成部 ここでID等を定義する # # @user -# @within function asset:artifact/1324.oracle/give/1.trigger +# @within function asset:artifact/1324.mysterious_star/give/1.trigger # 神器の説明や消費MPなどをここで設定する。 # 最後にasset:artifact/common/giveを実行することで入手可能。 @@ -13,7 +13,7 @@ # 神器のベースアイテム data modify storage asset:artifact Item set value "minecraft:stick" # 神器の名前 (TextComponentString) - data modify storage asset:artifact Name set value '[{"text":"オ","color":"#9e99fc"},{"text":"ラ","color":"#9bb3fd"},{"text":"ク","color":"#98cefe"},{"text":"ル","color":"#96e9ff"}]' + data modify storage asset:artifact Name set value '[{"text":"神","color":"#9e99fc"},{"text":"秘","color":"#9bb3fd"},{"text":"の","color":"#98cefe"},{"text":"星","color":"#96e9ff"}]' # 神器の説明文 (TextComponentString[]) data modify storage asset:artifact Lore set value ['{"text":"自身と周囲20mのプレイヤーの中で"}','{"translate":"-%1$s最も現在MPの多い1名のMPを100減少させる","with":[{"text":"\\u0002","font":"space"}]}','{"translate":"-%1$s最も現在MPの少ない1名のMPを100回復する","with":[{"text":"\\u0002","font":"space"}]}'] # 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション) diff --git a/Asset/data/asset/functions/artifact/1324.oracle/register.mcfunction b/Asset/data/asset/functions/artifact/1324.mysterious_star/register.mcfunction similarity index 83% rename from Asset/data/asset/functions/artifact/1324.oracle/register.mcfunction rename to Asset/data/asset/functions/artifact/1324.mysterious_star/register.mcfunction index adb6c8450f0..832683a35e1 100644 --- a/Asset/data/asset/functions/artifact/1324.oracle/register.mcfunction +++ b/Asset/data/asset/functions/artifact/1324.mysterious_star/register.mcfunction @@ -1,4 +1,4 @@ -#> asset:artifact/1324.oracle/register +#> asset:artifact/1324.mysterious_star/register # # 神器プールへの登録処理 # diff --git a/Asset/data/asset/functions/artifact/1324.oracle/trigger/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1324.mysterious_star/trigger/1.trigger.mcfunction similarity index 71% rename from Asset/data/asset/functions/artifact/1324.oracle/trigger/1.trigger.mcfunction rename to Asset/data/asset/functions/artifact/1324.mysterious_star/trigger/1.trigger.mcfunction index 3a11f91ad0a..a10037b1a3c 100644 --- a/Asset/data/asset/functions/artifact/1324.oracle/trigger/1.trigger.mcfunction +++ b/Asset/data/asset/functions/artifact/1324.mysterious_star/trigger/1.trigger.mcfunction @@ -1,8 +1,8 @@ -#> asset:artifact/1324.oracle/trigger/1.trigger +#> asset:artifact/1324.mysterious_star/trigger/1.trigger # # 指定したイベントタイミングで実行されるfunction # # @within tag/function asset:artifact/** # storage asset:idの%slot%に装備している神器のIDが入っているので比較し、~/2.check_condition.mcfunctionを実行する - execute if data storage asset:context id{hotbar:[1324]} run function asset:artifact/1324.oracle/trigger/2.check_condition \ No newline at end of file + execute if data storage asset:context id{hotbar:[1324]} run function asset:artifact/1324.mysterious_star/trigger/2.check_condition diff --git a/Asset/data/asset/functions/artifact/1324.oracle/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1324.mysterious_star/trigger/2.check_condition.mcfunction similarity index 79% rename from Asset/data/asset/functions/artifact/1324.oracle/trigger/2.check_condition.mcfunction rename to Asset/data/asset/functions/artifact/1324.mysterious_star/trigger/2.check_condition.mcfunction index f7a903f741c..8457d264e53 100644 --- a/Asset/data/asset/functions/artifact/1324.oracle/trigger/2.check_condition.mcfunction +++ b/Asset/data/asset/functions/artifact/1324.mysterious_star/trigger/2.check_condition.mcfunction @@ -1,8 +1,8 @@ -#> asset:artifact/1324.oracle/trigger/2.check_condition +#> asset:artifact/1324.mysterious_star/trigger/2.check_condition # # 神器の発動条件をチェックします # -# @within function asset:artifact/1324.oracle/trigger/1.trigger +# @within function asset:artifact/1324.mysterious_star/trigger/1.trigger # ID指定する data modify storage asset:artifact TargetID set value 1324 @@ -14,4 +14,4 @@ execute if entity @s[tag=CanUsed] unless entity @p[tag=!this,tag=!PlayerShouldInvulnerable,distance=..20] run tag @s remove CanUsed # CanUsedタグをチェックして3.main.mcfunctionを実行する - execute if entity @s[tag=CanUsed] run function asset:artifact/1324.oracle/trigger/3.main + execute if entity @s[tag=CanUsed] run function asset:artifact/1324.mysterious_star/trigger/3.main diff --git a/Asset/data/asset/functions/artifact/1324.oracle/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1324.mysterious_star/trigger/3.main.mcfunction similarity index 79% rename from Asset/data/asset/functions/artifact/1324.oracle/trigger/3.main.mcfunction rename to Asset/data/asset/functions/artifact/1324.mysterious_star/trigger/3.main.mcfunction index d148ca248a0..cf871453fec 100644 --- a/Asset/data/asset/functions/artifact/1324.oracle/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1324.mysterious_star/trigger/3.main.mcfunction @@ -1,8 +1,8 @@ -#> asset:artifact/1324.oracle/trigger/3.main +#> asset:artifact/1324.mysterious_star/trigger/3.main # # 神器のメイン処理部 # -# @within function asset:artifact/1324.oracle/trigger/2.check_condition +# @within function asset:artifact/1324.mysterious_star/trigger/2.check_condition # 基本的な使用時の処理(MP消費や使用回数の処理など)を行う function asset:artifact/common/use/hotbar @@ -10,7 +10,7 @@ # ここから先は神器側の効果の処理を書く # 最も現在MPの高い/低いプレイヤーを検索 - function asset:artifact/1324.oracle/trigger/find_target + function asset:artifact/1324.mysterious_star/trigger/find_target # 最も現在MPの多いプレイヤーのMPを減少 data modify storage api: Argument.Fluctuation set value -100 diff --git a/Asset/data/asset/functions/artifact/1324.oracle/trigger/_index.d.mcfunction b/Asset/data/asset/functions/artifact/1324.mysterious_star/trigger/_index.d.mcfunction similarity index 61% rename from Asset/data/asset/functions/artifact/1324.oracle/trigger/_index.d.mcfunction rename to Asset/data/asset/functions/artifact/1324.mysterious_star/trigger/_index.d.mcfunction index 820ebbea623..efe3bdc8811 100644 --- a/Asset/data/asset/functions/artifact/1324.oracle/trigger/_index.d.mcfunction +++ b/Asset/data/asset/functions/artifact/1324.mysterious_star/trigger/_index.d.mcfunction @@ -1,8 +1,8 @@ -#> asset:artifact/1324.oracle/trigger/_index.d +#> asset:artifact/1324.mysterious_star/trigger/_index.d # @private #> tag -# @within function asset:artifact/1324.oracle/trigger/** +# @within function asset:artifact/1324.mysterious_star/trigger/** #declare tag 10S.SearchTarget #declare tag 10S.HighestMP #declare tag 10S.LowestMP diff --git a/Asset/data/asset/functions/artifact/1324.oracle/trigger/find_target.mcfunction b/Asset/data/asset/functions/artifact/1324.mysterious_star/trigger/find_target.mcfunction similarity index 87% rename from Asset/data/asset/functions/artifact/1324.oracle/trigger/find_target.mcfunction rename to Asset/data/asset/functions/artifact/1324.mysterious_star/trigger/find_target.mcfunction index 3caed7ede8f..8ebcb9a7fdb 100644 --- a/Asset/data/asset/functions/artifact/1324.oracle/trigger/find_target.mcfunction +++ b/Asset/data/asset/functions/artifact/1324.mysterious_star/trigger/find_target.mcfunction @@ -1,8 +1,8 @@ -#> asset:artifact/1324.oracle/trigger/find_target +#> asset:artifact/1324.mysterious_star/trigger/find_target # # # -# @within function asset:artifact/1324.oracle/trigger/3.main +# @within function asset:artifact/1324.mysterious_star/trigger/3.main # 範囲内の対象の現在MPを取得 # 検索対象：最も現在MPが高いプレイヤー1名, 最も現在MPの低いプレイヤー1名 @@ -11,7 +11,7 @@ tag @a[tag=!PlayerShouldInvulnerable,distance=..20] add 10S.SearchTarget # 各プレイヤーの現在MPをスコアへ代入 - execute as @a[tag=10S.SearchTarget] store result score @s Temporary run function asset:artifact/1324.oracle/trigger/get_mp + execute as @a[tag=10S.SearchTarget] store result score @s Temporary run function asset:artifact/1324.mysterious_star/trigger/get_mp # $HighestMP, $LowestMPの初期化 scoreboard players set $10S.HighestMP Temporary 0 diff --git a/Asset/data/asset/functions/artifact/1324.oracle/trigger/get_mp.mcfunction b/Asset/data/asset/functions/artifact/1324.mysterious_star/trigger/get_mp.mcfunction similarity index 55% rename from Asset/data/asset/functions/artifact/1324.oracle/trigger/get_mp.mcfunction rename to Asset/data/asset/functions/artifact/1324.mysterious_star/trigger/get_mp.mcfunction index 5203bd002f7..ec641fe4748 100644 --- a/Asset/data/asset/functions/artifact/1324.oracle/trigger/get_mp.mcfunction +++ b/Asset/data/asset/functions/artifact/1324.mysterious_star/trigger/get_mp.mcfunction @@ -1,8 +1,8 @@ -#> asset:artifact/1324.oracle/trigger/get_mp +#> asset:artifact/1324.mysterious_star/trigger/get_mp # # # -# @within function asset:artifact/1324.oracle/trigger/find_target +# @within function asset:artifact/1324.mysterious_star/trigger/find_target # 現在体力を取得 function api:mp/get_current diff --git a/Asset/data/asset/tags/functions/artifact/give.json b/Asset/data/asset/tags/functions/artifact/give.json index dd0bdeb5683..fe05ffaef4d 100644 --- a/Asset/data/asset/tags/functions/artifact/give.json +++ b/Asset/data/asset/tags/functions/artifact/give.json @@ -1,6 +1,6 @@ { "values": [ - "asset:artifact/1324.oracle/give/1.trigger", + "asset:artifact/1324.mysterious_star/give/1.trigger", "asset:artifact/1140.over_pulse_booster/give/1.trigger", "asset:artifact/1139.over_pulse_legframe/give/1.trigger", "asset:artifact/1138.over_pulse_bodyarmor/give/1.trigger", @@ -518,4 +518,4 @@ "asset:artifact/0735.collision_plate/give/1.trigger", "asset:artifact/0745.blade_of_whirlwind/give/1.trigger" ] -} \ No newline at end of file +} diff --git a/Asset/data/asset/tags/functions/artifact/register.json b/Asset/data/asset/tags/functions/artifact/register.json index ef97a6ecb22..aee41121f20 100644 --- a/Asset/data/asset/tags/functions/artifact/register.json +++ b/Asset/data/asset/tags/functions/artifact/register.json @@ -1,6 +1,6 @@ { "values": [ - "asset:artifact/1324.oracle/register", + "asset:artifact/1324.mysterious_star/register", "asset:artifact/1137.over_pulse_headgear/register", "asset:artifact/1228.fatalerror/register", "asset:artifact/1273.maidchan_plush/register", @@ -296,4 +296,4 @@ "asset:artifact/1027.fire_of_rebirth/register", "asset:artifact/1111.rod_o_redeem/register" ] -} \ No newline at end of file +} diff --git a/Asset/data/asset/tags/functions/artifact/tick.json b/Asset/data/asset/tags/functions/artifact/tick.json index 61c0906a389..fdd28ce1de3 100644 --- a/Asset/data/asset/tags/functions/artifact/tick.json +++ b/Asset/data/asset/tags/functions/artifact/tick.json @@ -1,6 +1,6 @@ { "values": [ - "asset:artifact/1324.oracle/trigger/1.trigger", + "asset:artifact/1324.mysterious_star/trigger/1.trigger", "asset:artifact/0237.schrodingers_cat/trigger/1.trigger", "asset:artifact/1057.great_demon_head/tick/1.trigger", "asset:artifact/1066.weight_stone/tick/1.trigger", @@ -28,4 +28,4 @@ "asset:artifact/0204.spelunker_shoes/trigger/1.trigger", "asset:artifact/0468.raging_demon/trigger/1.trigger" ] -} \ No newline at end of file +} From 42e427f68a2f0560c1e05fb32ed4d6db9582da90 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Thu, 6 Nov 2025 15:35:54 +0900 Subject: [PATCH 04/11] =?UTF-8?q?=E3=83=86=E3=82=AD=E3=82=B9=E3=83=88?= =?UTF-8?q?=E3=82=92=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifact/1324.mysterious_star/give/2.give.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/artifact/1324.mysterious_star/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1324.mysterious_star/give/2.give.mcfunction index a8d535d9f41..e929e814c0c 100644 --- a/Asset/data/asset/functions/artifact/1324.mysterious_star/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1324.mysterious_star/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '[{"text":"神","color":"#9e99fc"},{"text":"秘","color":"#9bb3fd"},{"text":"の","color":"#98cefe"},{"text":"星","color":"#96e9ff"}]' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text":"自身と周囲20mのプレイヤーの中で"}','{"translate":"-%1$s最も現在MPの多い1名のMPを100減少させる","with":[{"text":"\\u0002","font":"space"}]}','{"translate":"-%1$s最も現在MPの少ない1名のMPを100回復する","with":[{"text":"\\u0002","font":"space"}]}'] + data modify storage asset:artifact Lore set value ['{"text":"自身と周囲20mのプレイヤーの中で"}','{"text":"最も現在MPの多い1名のMPを100減少させ"}','{"text":"最も現在MPの少ない1名のMPを100回復する"}'] # 消費アイテム ({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 39a2240879c825e44c26a97e542bbc2a82ccd09f Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Thu, 6 Nov 2025 18:48:37 +0900 Subject: [PATCH 05/11] =?UTF-8?q?CD=E5=8F=8A=E3=81=B3MP=E5=A2=97=E6=B8=9B?= =?UTF-8?q?=E9=87=8F=E3=82=92=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifact/1324.mysterious_star/give/2.give.mcfunction | 4 ++-- .../artifact/1324.mysterious_star/trigger/3.main.mcfunction | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1324.mysterious_star/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1324.mysterious_star/give/2.give.mcfunction index e929e814c0c..3936e0f5859 100644 --- a/Asset/data/asset/functions/artifact/1324.mysterious_star/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1324.mysterious_star/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '[{"text":"神","color":"#9e99fc"},{"text":"秘","color":"#9bb3fd"},{"text":"の","color":"#98cefe"},{"text":"星","color":"#96e9ff"}]' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text":"自身と周囲20mのプレイヤーの中で"}','{"text":"最も現在MPの多い1名のMPを100減少させ"}','{"text":"最も現在MPの少ない1名のMPを100回復する"}'] + data modify storage asset:artifact Lore set value ['{"text":"自身と周囲20mのプレイヤーの中で"}','{"text":"最も現在MPの多い1名のMPを10減少させ"}','{"text":"最も現在MPの少ない1名のMPを10回復する"}'] # 消費アイテム ({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 @@ -49,7 +49,7 @@ # MP回復量 (int) # data modify storage asset:artifact MPHealWhenHit set value # 神器のクールダウン (int) (オプション) - data modify storage asset:artifact LocalCooldown set value 140 + 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/1324.mysterious_star/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1324.mysterious_star/trigger/3.main.mcfunction index cf871453fec..33da83eea74 100644 --- a/Asset/data/asset/functions/artifact/1324.mysterious_star/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1324.mysterious_star/trigger/3.main.mcfunction @@ -13,11 +13,11 @@ function asset:artifact/1324.mysterious_star/trigger/find_target # 最も現在MPの多いプレイヤーのMPを減少 - data modify storage api: Argument.Fluctuation set value -100 + data modify storage api: Argument.Fluctuation set value -10 execute as @p[tag=10S.HighestMP] run function api:mp/fluctuation # 最も現在MPの少ないプレイヤーのMPを回復 - data modify storage api: Argument.Fluctuation set value 100 + data modify storage api: Argument.Fluctuation set value 10 execute as @p[tag=10S.LowestMP] run function api:mp/fluctuation # リセット From 2923a640beb01ed2372a984d6ad7006a3377afa8 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Thu, 6 Nov 2025 19:23:26 +0900 Subject: [PATCH 06/11] =?UTF-8?q?MP=E7=A7=BB=E5=8B=95=E9=87=8F=E3=82=92?= =?UTF-8?q?=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifact/1324.mysterious_star/give/2.give.mcfunction | 2 +- .../artifact/1324.mysterious_star/trigger/3.main.mcfunction | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1324.mysterious_star/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1324.mysterious_star/give/2.give.mcfunction index 3936e0f5859..d1c885ac5de 100644 --- a/Asset/data/asset/functions/artifact/1324.mysterious_star/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1324.mysterious_star/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '[{"text":"神","color":"#9e99fc"},{"text":"秘","color":"#9bb3fd"},{"text":"の","color":"#98cefe"},{"text":"星","color":"#96e9ff"}]' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text":"自身と周囲20mのプレイヤーの中で"}','{"text":"最も現在MPの多い1名のMPを10減少させ"}','{"text":"最も現在MPの少ない1名のMPを10回復する"}'] + data modify storage asset:artifact Lore set value ['{"text":"自身と周囲20mのプレイヤーの中で"}','{"text":"最も現在MPの多い1名のMPを2減少させ"}','{"text":"最も現在MPの少ない1名のMPを2回復する"}'] # 消費アイテム ({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/1324.mysterious_star/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1324.mysterious_star/trigger/3.main.mcfunction index 33da83eea74..d2c423dfaa0 100644 --- a/Asset/data/asset/functions/artifact/1324.mysterious_star/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1324.mysterious_star/trigger/3.main.mcfunction @@ -13,11 +13,11 @@ function asset:artifact/1324.mysterious_star/trigger/find_target # 最も現在MPの多いプレイヤーのMPを減少 - data modify storage api: Argument.Fluctuation set value -10 + data modify storage api: Argument.Fluctuation set value -2 execute as @p[tag=10S.HighestMP] run function api:mp/fluctuation # 最も現在MPの少ないプレイヤーのMPを回復 - data modify storage api: Argument.Fluctuation set value 10 + data modify storage api: Argument.Fluctuation set value 2 execute as @p[tag=10S.LowestMP] run function api:mp/fluctuation # リセット From dbee2943bb28410dab51a06616c4386a25c4a954 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Thu, 6 Nov 2025 20:19:36 +0900 Subject: [PATCH 07/11] =?UTF-8?q?=E8=A4=87=E6=95=B0=E5=90=8D=E6=8C=87?= =?UTF-8?q?=E5=AE=9A=E3=81=97=E3=81=86=E3=82=8B=E5=95=8F=E9=A1=8C=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 --- .../1324.mysterious_star/trigger/find_target.mcfunction | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1324.mysterious_star/trigger/find_target.mcfunction b/Asset/data/asset/functions/artifact/1324.mysterious_star/trigger/find_target.mcfunction index 8ebcb9a7fdb..3720f73c9ee 100644 --- a/Asset/data/asset/functions/artifact/1324.mysterious_star/trigger/find_target.mcfunction +++ b/Asset/data/asset/functions/artifact/1324.mysterious_star/trigger/find_target.mcfunction @@ -19,12 +19,12 @@ # 最も多い対象を探す execute as @a[tag=10S.SearchTarget] run scoreboard players operation $10S.HighestMP Temporary > @s Temporary - execute as @a[tag=10S.SearchTarget] if score @s Temporary = $10S.HighestMP Temporary run tag @s add 10S.HighestMP + execute as @a[tag=10S.SearchTarget] unless entity @p[tag=10S.HighestMP] if score @s Temporary = $10S.HighestMP Temporary run tag @s add 10S.HighestMP # 最も少ない対象を探す # 最も多い対象は検索から除外 execute as @a[tag=10S.SearchTarget,tag=!10S.HighestMP] run scoreboard players operation $10S.LowestMP Temporary < @s Temporary - execute as @a[tag=10S.SearchTarget,tag=!10S.HighestMP] if score @s Temporary = $10S.LowestMP Temporary run tag @s add 10S.LowestMP + execute as @a[tag=10S.SearchTarget,tag=!10S.HighestMP] unless entity @p[tag=10S.LowestMP] if score @s Temporary = $10S.LowestMP Temporary run tag @s add 10S.LowestMP # リセット scoreboard players reset @a[tag=10S.SearchTarget] Temporary From 552e220d4dc17b7693550ef894a52c82149cbc82 Mon Sep 17 00:00:00 2001 From: ChenCMD Date: Thu, 6 Nov 2025 21:16:58 +0900 Subject: [PATCH 08/11] =?UTF-8?q?=E3=83=90=E3=82=B0=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=E5=8F=8A=E3=81=B3=E6=BC=94=E5=87=BA=E3=81=AE=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trigger/3.main.mcfunction | 19 +++++++++++++++---- .../trigger/_index.d.mcfunction | 2 ++ .../trigger/find_target.mcfunction | 2 ++ .../trigger/get_mp.mcfunction | 2 +- .../trigger/vfx/.mcfunction | 8 ++++++++ .../trigger/vfx/recursive.mcfunction | 17 +++++++++++++++++ 6 files changed, 45 insertions(+), 5 deletions(-) create mode 100644 Asset/data/asset/functions/artifact/1324.mysterious_star/trigger/vfx/.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1324.mysterious_star/trigger/vfx/recursive.mcfunction diff --git a/Asset/data/asset/functions/artifact/1324.mysterious_star/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1324.mysterious_star/trigger/3.main.mcfunction index d2c423dfaa0..1ff2f8998fe 100644 --- a/Asset/data/asset/functions/artifact/1324.mysterious_star/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1324.mysterious_star/trigger/3.main.mcfunction @@ -12,14 +12,25 @@ # 最も現在MPの高い/低いプレイヤーを検索 function asset:artifact/1324.mysterious_star/trigger/find_target +# 演出 + function asset:artifact/1324.mysterious_star/trigger/vfx/ + # 最も現在MPの多いプレイヤーのMPを減少 data modify storage api: Argument.Fluctuation set value -2 - execute as @p[tag=10S.HighestMP] run function api:mp/fluctuation + data modify storage api: Argument.DisableLog set value true + execute as @p[tag=10S.HighestMPTarget] run function api:mp/fluctuation # 最も現在MPの少ないプレイヤーのMPを回復 data modify storage api: Argument.Fluctuation set value 2 - execute as @p[tag=10S.LowestMP] run function api:mp/fluctuation + data modify storage api: Argument.DisableLog set value true + execute as @p[tag=10S.LowestMPTarget] run function api:mp/fluctuation + +#say ------- +#say @a[tag=10S.HighestMPTarget] +#say @a[tag=10S.LowestMPTarget] # リセット - tag @p[tag=10S.HighestMP] remove 10S.HighestMP - tag @p[tag=10S.LowestMP] remove 10S.LowestMP + tag @a[tag=10S.HighestMP] remove 10S.HighestMP + tag @a[tag=10S.HighestMPTarget] remove 10S.HighestMPTarget + tag @a[tag=10S.LowestMP] remove 10S.LowestMP + tag @a[tag=10S.LowestMPTarget] remove 10S.LowestMPTarget diff --git a/Asset/data/asset/functions/artifact/1324.mysterious_star/trigger/_index.d.mcfunction b/Asset/data/asset/functions/artifact/1324.mysterious_star/trigger/_index.d.mcfunction index efe3bdc8811..de557b57bd0 100644 --- a/Asset/data/asset/functions/artifact/1324.mysterious_star/trigger/_index.d.mcfunction +++ b/Asset/data/asset/functions/artifact/1324.mysterious_star/trigger/_index.d.mcfunction @@ -5,6 +5,8 @@ # @within function asset:artifact/1324.mysterious_star/trigger/** #declare tag 10S.SearchTarget #declare tag 10S.HighestMP + #declare tag 10S.HighestMPTarget #declare tag 10S.LowestMP + #declare tag 10S.LowestMPTarget #declare score_holder $10S.HighestMP #declare score_holder $10S.LowestMP diff --git a/Asset/data/asset/functions/artifact/1324.mysterious_star/trigger/find_target.mcfunction b/Asset/data/asset/functions/artifact/1324.mysterious_star/trigger/find_target.mcfunction index 8ebcb9a7fdb..bec60021d92 100644 --- a/Asset/data/asset/functions/artifact/1324.mysterious_star/trigger/find_target.mcfunction +++ b/Asset/data/asset/functions/artifact/1324.mysterious_star/trigger/find_target.mcfunction @@ -20,11 +20,13 @@ # 最も多い対象を探す execute as @a[tag=10S.SearchTarget] run scoreboard players operation $10S.HighestMP Temporary > @s Temporary execute as @a[tag=10S.SearchTarget] if score @s Temporary = $10S.HighestMP Temporary run tag @s add 10S.HighestMP + tag @r[tag=10S.HighestMP] add 10S.HighestMPTarget # 最も少ない対象を探す # 最も多い対象は検索から除外 execute as @a[tag=10S.SearchTarget,tag=!10S.HighestMP] run scoreboard players operation $10S.LowestMP Temporary < @s Temporary execute as @a[tag=10S.SearchTarget,tag=!10S.HighestMP] if score @s Temporary = $10S.LowestMP Temporary run tag @s add 10S.LowestMP + tag @r[tag=10S.LowestMP] add 10S.LowestMPTarget # リセット scoreboard players reset @a[tag=10S.SearchTarget] Temporary diff --git a/Asset/data/asset/functions/artifact/1324.mysterious_star/trigger/get_mp.mcfunction b/Asset/data/asset/functions/artifact/1324.mysterious_star/trigger/get_mp.mcfunction index ec641fe4748..6ac829fe7b7 100644 --- a/Asset/data/asset/functions/artifact/1324.mysterious_star/trigger/get_mp.mcfunction +++ b/Asset/data/asset/functions/artifact/1324.mysterious_star/trigger/get_mp.mcfunction @@ -8,4 +8,4 @@ function api:mp/get_current # 現在体力の10倍を返り値として返す - return run data get storage api: Health 10 + return run data get storage api: Return.CurrentMP 10 diff --git a/Asset/data/asset/functions/artifact/1324.mysterious_star/trigger/vfx/.mcfunction b/Asset/data/asset/functions/artifact/1324.mysterious_star/trigger/vfx/.mcfunction new file mode 100644 index 00000000000..59c8e60aec2 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1324.mysterious_star/trigger/vfx/.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1324.mysterious_star/trigger/vfx/ +# +# +# +# @within function asset:artifact/1324.mysterious_star/trigger/3.main + +# MPが最も多いプレイヤーから低いプレイヤーへ線を伸ばす + execute as @p[tag=10S.HighestMPTarget] at @s facing entity @p[tag=10S.LowestMPTarget] feet positioned ~ ~0.2 ~ run function asset:artifact/1324.mysterious_star/trigger/vfx/recursive diff --git a/Asset/data/asset/functions/artifact/1324.mysterious_star/trigger/vfx/recursive.mcfunction b/Asset/data/asset/functions/artifact/1324.mysterious_star/trigger/vfx/recursive.mcfunction new file mode 100644 index 00000000000..62a23338313 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1324.mysterious_star/trigger/vfx/recursive.mcfunction @@ -0,0 +1,17 @@ +#> asset:artifact/1324.mysterious_star/trigger/vfx/recursive +# +# +# +# @within function +# asset:artifact/1324.mysterious_star/trigger/vfx/ +# asset:artifact/1324.mysterious_star/trigger/vfx/recursive + +# 演出 + particle dust 0.384 0.373 0.953 0.75 ~ ~ ~ 0.25 0.25 0.25 1 0 normal + particle dust 0.384 0.373 0.953 0.75 ^ ^ ^0.5 0.25 0.25 0.25 1 0 normal + +# LowestMPTargetが近くにいたら終了 + execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @p[tag=10S.LowestMPTarget,dx=0] run return fail + +# 再帰 + execute if entity @s[distance=..40] positioned ^ ^ ^1 run function asset:artifact/1324.mysterious_star/trigger/vfx/recursive From f09d36fd689022370eeea2a2615e5c06810bfe3c Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Fri, 7 Nov 2025 18:34:19 +0900 Subject: [PATCH 09/11] =?UTF-8?q?=E7=99=BA=E5=8B=95=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E3=82=92=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trigger/2.check_condition.mcfunction | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1324.mysterious_star/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1324.mysterious_star/trigger/2.check_condition.mcfunction index 8457d264e53..bcbdee6a964 100644 --- a/Asset/data/asset/functions/artifact/1324.mysterious_star/trigger/2.check_condition.mcfunction +++ b/Asset/data/asset/functions/artifact/1324.mysterious_star/trigger/2.check_condition.mcfunction @@ -10,8 +10,14 @@ function asset:artifact/common/check_condition/hotbar # 他にアイテム等確認する場合はここに書く -# 他にプレイヤーがいない場合は発動しない - execute if entity @s[tag=CanUsed] unless entity @p[tag=!this,tag=!PlayerShouldInvulnerable,distance=..20] run tag @s remove CanUsed +#> Private +# @private + #declare score_holder $10S.PlayerCount + +# tag=!PlayerShouldInvulnerableが二人以上範囲内にいなけれれば使用不可 + execute if entity @s[tag=CanUsed] store result score $10S.PlayerCount Temporary if entity @a[tag=!PlayerShouldInvulnerable,distance=..20] + execute if entity @s[tag=CanUsed] unless score $10S.PlayerCount Temporary matches 2.. run tag @s remove CanUsed + execute if entity @s[tag=CanUsed] run scoreboard players reset $10S.PlayerCount Temporary # CanUsedタグをチェックして3.main.mcfunctionを実行する execute if entity @s[tag=CanUsed] run function asset:artifact/1324.mysterious_star/trigger/3.main From 6363d24fa3bb8017fbf40c97344e97675b47c28e Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Fri, 14 Nov 2025 20:58:13 +0900 Subject: [PATCH 10/11] =?UTF-8?q?Temporary=E3=81=8C=E6=AD=A3=E5=B8=B8?= =?UTF-8?q?=E3=81=AB=E3=83=AA=E3=82=BB=E3=83=83=E3=83=88=E3=81=95=E3=82=8C?= =?UTF-8?q?=E3=81=AA=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 --- .../1324.mysterious_star/trigger/2.check_condition.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/artifact/1324.mysterious_star/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1324.mysterious_star/trigger/2.check_condition.mcfunction index bcbdee6a964..cd4d816cd84 100644 --- a/Asset/data/asset/functions/artifact/1324.mysterious_star/trigger/2.check_condition.mcfunction +++ b/Asset/data/asset/functions/artifact/1324.mysterious_star/trigger/2.check_condition.mcfunction @@ -16,8 +16,8 @@ # tag=!PlayerShouldInvulnerableが二人以上範囲内にいなけれれば使用不可 execute if entity @s[tag=CanUsed] store result score $10S.PlayerCount Temporary if entity @a[tag=!PlayerShouldInvulnerable,distance=..20] + execute if entity @s[tag=CanUsed] unless score $10S.PlayerCount Temporary matches 2.. run scoreboard players reset $10S.PlayerCount Temporary execute if entity @s[tag=CanUsed] unless score $10S.PlayerCount Temporary matches 2.. run tag @s remove CanUsed - execute if entity @s[tag=CanUsed] run scoreboard players reset $10S.PlayerCount Temporary # CanUsedタグをチェックして3.main.mcfunctionを実行する execute if entity @s[tag=CanUsed] run function asset:artifact/1324.mysterious_star/trigger/3.main From e921dc876e11f0225514c42aebd9072390dca6d0 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Fri, 14 Nov 2025 23:22:50 +0900 Subject: [PATCH 11/11] =?UTF-8?q?=E3=81=A8=E3=82=8A=E3=81=82=E3=81=88?= =?UTF-8?q?=E3=81=9A=E3=81=AE=E9=9A=A0=E3=81=97=E6=9E=A0=E3=81=AE=E3=83=97?= =?UTF-8?q?=E3=83=BC=E3=83=AB=E3=81=AB=E7=AA=81=E3=81=A3=E8=BE=BC=E3=82=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifact/1324.mysterious_star/register.mcfunction | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1324.mysterious_star/register.mcfunction b/Asset/data/asset/functions/artifact/1324.mysterious_star/register.mcfunction index 832683a35e1..6f806b677a2 100644 --- a/Asset/data/asset/functions/artifact/1324.mysterious_star/register.mcfunction +++ b/Asset/data/asset/functions/artifact/1324.mysterious_star/register.mcfunction @@ -4,5 +4,4 @@ # # @within tag/function asset:artifact/register -# いつか実装される日替わり交換村人のプールに突っ込む予定 -# data modify storage asset:artifact RarityRegistry[4] append value [1324] + data modify storage asset:artifact HideRarityRegistry[2] append value [1324]