From 66ee2a6fdcf031570aac47ff197bfdd5127e8964 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=91=A0=E7=92=83?= <87566955+Lapis-LJA@users.noreply.github.com> Date: Tue, 27 Jun 2023 01:59:37 +0900 Subject: [PATCH] =?UTF-8?q?=F0=9F=A9=B9=20=E3=83=AA=E3=82=BB=E3=83=83?= =?UTF-8?q?=E3=83=88=E3=81=95=E3=82=8C=E3=81=A6=E3=81=84=E3=81=AA=E3=81=84?= =?UTF-8?q?Temporary=E3=81=8C=E3=83=AA=E3=82=BB=E3=83=83=E3=83=88=E3=81=95?= =?UTF-8?q?=E3=82=8C=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=20(#1296)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: blanoir3298 --- .../mob/0286.456_dice_entity/summon/init.mcfunction | 5 ++++- .../functions/artifact/_index.d.mcfunction | 7 ++++++- .../triggers/equipments/update_cooldown/.mcfunction | 4 +++- .../equipments/update_cooldown/foreach.mcfunction | 2 -- .../spawner/tick/6_distributed_interval.mcfunction | 12 ++++++------ .../functions/tick/6_distributed_interval.mcfunction | 4 ++-- .../data/lib/functions/array/core/reverse.mcfunction | 3 ++- .../data/lib/functions/array/move.mcfunction | 5 ++++- .../bit_array_to_integer/core/main.mcfunction | 3 ++- .../player_manager/functions/mp/regen/do.mcfunction | 3 ++- 10 files changed, 31 insertions(+), 17 deletions(-) diff --git a/Asset/data/asset/functions/mob/0286.456_dice_entity/summon/init.mcfunction b/Asset/data/asset/functions/mob/0286.456_dice_entity/summon/init.mcfunction index 1887aeb251..3d31bf963e 100644 --- a/Asset/data/asset/functions/mob/0286.456_dice_entity/summon/init.mcfunction +++ b/Asset/data/asset/functions/mob/0286.456_dice_entity/summon/init.mcfunction @@ -12,4 +12,7 @@ # 0~2の値を4~6になるように4加算 scoreboard players add @s Temporary 4 # 保持 - scoreboard players operation @s CU.RandomCount = @s Temporary \ No newline at end of file + scoreboard players operation @s CU.RandomCount = @s Temporary + +# リセット + scoreboard players reset @s Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/artifact/_index.d.mcfunction b/TheSkyBlessing/data/asset_manager/functions/artifact/_index.d.mcfunction index bdfd9ecb43..3d1c74c32e 100644 --- a/TheSkyBlessing/data/asset_manager/functions/artifact/_index.d.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/artifact/_index.d.mcfunction @@ -66,4 +66,9 @@ #declare score_holder $Cooldown #declare score_holder $Value #declare score_holder $NormalizedValue - #declare score_holder $Max \ No newline at end of file + #declare score_holder $Max + +#> リセット用 +# @within function asset_manager:artifact/triggers/equipments/update_cooldown/* + #declare score_holder $Tick + #declare score_holder $LatestUsedTick \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/equipments/update_cooldown/.mcfunction b/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/equipments/update_cooldown/.mcfunction index c508620d39..73936b5de4 100644 --- a/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/equipments/update_cooldown/.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/equipments/update_cooldown/.mcfunction @@ -31,4 +31,6 @@ data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LocalCoolDown set from storage lib: Array # リセット function lib:array/session/close - data remove storage asset:artifact ItemData \ No newline at end of file + data remove storage asset:artifact ItemData + scoreboard players reset $Tick Temporary + scoreboard players reset $LatestUsedTick Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/equipments/update_cooldown/foreach.mcfunction b/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/equipments/update_cooldown/foreach.mcfunction index f90766c463..94654eaf46 100644 --- a/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/equipments/update_cooldown/foreach.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/equipments/update_cooldown/foreach.mcfunction @@ -6,9 +6,7 @@ #> Private # @private - #declare score_holder $Tick #declare score_holder $Max - #declare score_holder $LatestUsedTick # データ取得 execute store result score $Tick Temporary run time query gametime diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/tick/6_distributed_interval.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/tick/6_distributed_interval.mcfunction index 9938d23718..e7f65eb1f8 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/tick/6_distributed_interval.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/tick/6_distributed_interval.mcfunction @@ -4,9 +4,9 @@ # # @within function core:tick/6_distributed_interval -execute if data storage global {IsProduction:1b} if score $DistributeGroup Temporary matches 0 run function #asset:spawner/register/a -execute if data storage global {IsProduction:1b} if score $DistributeGroup Temporary matches 1 run function #asset:spawner/register/b -execute if data storage global {IsProduction:1b} if score $DistributeGroup Temporary matches 2 run function #asset:spawner/register/c -execute if data storage global {IsProduction:1b} if score $DistributeGroup Temporary matches 3 run function #asset:spawner/register/d -execute if data storage global {IsProduction:1b} if score $DistributeGroup Temporary matches 4 run function #asset:spawner/register/e -execute if data storage global {IsProduction:1b} if score $DistributeGroup Temporary matches 5 run function #asset:spawner/register/f \ No newline at end of file +execute if data storage global {IsProduction:1b} if score $DistributeGroup Global matches 0 run function #asset:spawner/register/a +execute if data storage global {IsProduction:1b} if score $DistributeGroup Global matches 1 run function #asset:spawner/register/b +execute if data storage global {IsProduction:1b} if score $DistributeGroup Global matches 2 run function #asset:spawner/register/c +execute if data storage global {IsProduction:1b} if score $DistributeGroup Global matches 3 run function #asset:spawner/register/d +execute if data storage global {IsProduction:1b} if score $DistributeGroup Global matches 4 run function #asset:spawner/register/e +execute if data storage global {IsProduction:1b} if score $DistributeGroup Global matches 5 run function #asset:spawner/register/f \ No newline at end of file diff --git a/TheSkyBlessing/data/core/functions/tick/6_distributed_interval.mcfunction b/TheSkyBlessing/data/core/functions/tick/6_distributed_interval.mcfunction index b3766daa90..0e24bd19e3 100644 --- a/TheSkyBlessing/data/core/functions/tick/6_distributed_interval.mcfunction +++ b/TheSkyBlessing/data/core/functions/tick/6_distributed_interval.mcfunction @@ -9,5 +9,5 @@ # 次のtickのグループを決める - scoreboard players add $DistributeGroup Temporary 1 - scoreboard players operation $DistributeGroup Temporary %= $6 Const \ No newline at end of file + scoreboard players add $DistributeGroup Global 1 + scoreboard players operation $DistributeGroup Global %= $6 Const \ No newline at end of file diff --git a/TheSkyBlessing/data/lib/functions/array/core/reverse.mcfunction b/TheSkyBlessing/data/lib/functions/array/core/reverse.mcfunction index 632671136d..420323a1c2 100644 --- a/TheSkyBlessing/data/lib/functions/array/core/reverse.mcfunction +++ b/TheSkyBlessing/data/lib/functions/array/core/reverse.mcfunction @@ -4,4 +4,5 @@ execute store result score $Index Temporary if data storage lib: Array[] function lib:array/core/move data modify storage lib: Array set from storage lib: Cache -data remove storage lib: Cache \ No newline at end of file +data remove storage lib: Cache +scoreboard players reset $Index Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/lib/functions/array/move.mcfunction b/TheSkyBlessing/data/lib/functions/array/move.mcfunction index f8bc6cdd08..f080070d48 100644 --- a/TheSkyBlessing/data/lib/functions/array/move.mcfunction +++ b/TheSkyBlessing/data/lib/functions/array/move.mcfunction @@ -23,4 +23,7 @@ scoreboard players remove $Index Temporary 1 scoreboard players operation $Index Temporary -= $Argument.Index Lib # 再帰的に動かす - execute if score $Index Temporary matches 1.. run function lib:array/core/move \ No newline at end of file + execute if score $Index Temporary matches 1.. run function lib:array/core/move + +# リセット + scoreboard players reset $Index Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/lib/functions/bit_array_to_integer/core/main.mcfunction b/TheSkyBlessing/data/lib/functions/bit_array_to_integer/core/main.mcfunction index aed268ee4f..cb216f96b9 100644 --- a/TheSkyBlessing/data/lib/functions/bit_array_to_integer/core/main.mcfunction +++ b/TheSkyBlessing/data/lib/functions/bit_array_to_integer/core/main.mcfunction @@ -14,4 +14,5 @@ # 再帰的に計算 function lib:bit_array_to_integer/core/recursive # リセット - function lib:array/session/close \ No newline at end of file + function lib:array/session/close + scoreboard players reset $bit Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/player_manager/functions/mp/regen/do.mcfunction b/TheSkyBlessing/data/player_manager/functions/mp/regen/do.mcfunction index dc1a19dd72..03b45ff579 100644 --- a/TheSkyBlessing/data/player_manager/functions/mp/regen/do.mcfunction +++ b/TheSkyBlessing/data/player_manager/functions/mp/regen/do.mcfunction @@ -42,4 +42,5 @@ # クールダウンリセット scoreboard players set @s MPRegenCooldown 0 # リセット - scoreboard players reset $AmountFloat Temporary \ No newline at end of file + scoreboard players reset $AmountFloat Temporary + scoreboard players reset $isNegative Temporary \ No newline at end of file