From 0b9f668e4b53ac904b637a453e054a48b0c886c2 Mon Sep 17 00:00:00 2001 From: anitmyan <61045441+anitmyan@users.noreply.github.com> Date: Mon, 19 Oct 2026 17:52:09 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20?= =?UTF-8?q?=E7=A5=9E=E5=99=A8=E3=82=AF=E3=83=BC=E3=83=AB=E3=83=80=E3=82=A6?= =?UTF-8?q?=E3=83=B3=E3=82=92=E5=85=A8=E3=81=A6=E8=A7=A3=E6=B6=88=E3=81=99?= =?UTF-8?q?=E3=82=8Bdebug=E3=82=B3=E3=83=9E=E3=83=B3=E3=83=89=E3=82=92?= =?UTF-8?q?=E4=BD=9C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/artifact/_index.d.mcfunction | 1 + .../artifact/cooldown/reset_all.mcfunction | 22 +++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 TheSkyBlessing/data/debug/functions/artifact/cooldown/reset_all.mcfunction diff --git a/TheSkyBlessing/data/asset_manager/functions/artifact/_index.d.mcfunction b/TheSkyBlessing/data/asset_manager/functions/artifact/_index.d.mcfunction index 407d0b8812..2dedf98dbe 100644 --- a/TheSkyBlessing/data/asset_manager/functions/artifact/_index.d.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/artifact/_index.d.mcfunction @@ -19,6 +19,7 @@ # asset_manager:artifact/use/ # asset_manager:artifact/tick/ # core:tick/ +# debug:artifact/cooldown/reset_all #declare score_holder $ArtifactSpecialCooldown #> Trigger検知用 diff --git a/TheSkyBlessing/data/debug/functions/artifact/cooldown/reset_all.mcfunction b/TheSkyBlessing/data/debug/functions/artifact/cooldown/reset_all.mcfunction new file mode 100644 index 0000000000..74727e5628 --- /dev/null +++ b/TheSkyBlessing/data/debug/functions/artifact/cooldown/reset_all.mcfunction @@ -0,0 +1,22 @@ +#> debug:artifact/cooldown/reset_all +# +# 実行者のすべての神器クールダウンを解消します +# +# @private +# @user + + +# LCD +# アイテムに付いた最終発動時刻を削除 + data modify storage api: Argument.Inventory set from entity @s Inventory + data remove storage api: Argument.Inventory[].tag.TSB.LatestUseTick + function api:inventory/set +# プレイヤーのLCD状況データもリセット(何かしらの行動時にしか自動更新してくれないので) + function oh_my_dat:please + data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LocalCoolDown[].Value set value -15 + +# TCD + data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].TypeCooldown set value [] + +#GCD + scoreboard players set $ArtifactSpecialCooldown Global 0 From b41accdbfd391caef6388661e7d37307f17245f1 Mon Sep 17 00:00:00 2001 From: anitmyan <61045441+anitmyan@users.noreply.github.com> Date: Mon, 19 Oct 2026 18:02:01 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=E9=96=A2=E6=95=B0=E5=90=8D=E5=A4=89?= =?UTF-8?q?=E6=9B=B4=E3=81=A8=E5=AE=9F=E8=A1=8C=E8=80=85=E3=83=81=E3=82=A7?= =?UTF-8?q?=E3=83=83=E3=82=AF=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reset_all.mcfunction => cooldown_reset.mcfunction} | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) rename TheSkyBlessing/data/debug/functions/artifact/{cooldown/reset_all.mcfunction => cooldown_reset.mcfunction} (76%) diff --git a/TheSkyBlessing/data/debug/functions/artifact/cooldown/reset_all.mcfunction b/TheSkyBlessing/data/debug/functions/artifact/cooldown_reset.mcfunction similarity index 76% rename from TheSkyBlessing/data/debug/functions/artifact/cooldown/reset_all.mcfunction rename to TheSkyBlessing/data/debug/functions/artifact/cooldown_reset.mcfunction index 74727e5628..41bd2af806 100644 --- a/TheSkyBlessing/data/debug/functions/artifact/cooldown/reset_all.mcfunction +++ b/TheSkyBlessing/data/debug/functions/artifact/cooldown_reset.mcfunction @@ -1,10 +1,12 @@ -#> debug:artifact/cooldown/reset_all +#> debug:artifact/cooldown_reset # # 実行者のすべての神器クールダウンを解消します # # @private # @user +# 実行者が居ない場合エラー + execute unless entity @s[type=player] run return run tellraw @a [{"storage":"global","nbt":"Prefix.ERROR"},{"text": "実行者を指定してください。"}] # LCD # アイテムに付いた最終発動時刻を削除