From d32f5b144e532e180714c0b2d64c7a5a92d55f75 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Fri, 7 Mar 2025 02:44:10 +0900 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=81=BF=E4=B8=8D=E8=83=BD=E3=81=AB?= =?UTF-8?q?=E3=81=AA=E3=81=A3=E3=81=9F6=E5=80=8B=E4=B8=A6=E3=81=B9?= =?UTF-8?q?=E3=82=924=E5=80=8B=E4=B8=A6=E3=81=B9=E3=81=AB=E8=AA=BF?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../giant_pumpkin2/pos_type/line/{6 => 4}/1.mcfunction | 6 +----- .../giant_pumpkin2/pos_type/line/{6 => 4}/2.mcfunction | 6 +----- .../giant_pumpkin2/pos_type/line/{6 => 4}/3.mcfunction | 6 +----- .../giant_pumpkin2/pos_type/line/{6 => 4}/4.mcfunction | 6 +----- .../tick/skill/giant_pumpkin2/select_line.mcfunction | 8 ++++---- 5 files changed, 8 insertions(+), 24 deletions(-) rename Asset/data/asset/functions/mob/0059.jack_o_lantern/tick/skill/giant_pumpkin2/pos_type/line/{6 => 4}/1.mcfunction (71%) rename Asset/data/asset/functions/mob/0059.jack_o_lantern/tick/skill/giant_pumpkin2/pos_type/line/{6 => 4}/2.mcfunction (71%) rename Asset/data/asset/functions/mob/0059.jack_o_lantern/tick/skill/giant_pumpkin2/pos_type/line/{6 => 4}/3.mcfunction (71%) rename Asset/data/asset/functions/mob/0059.jack_o_lantern/tick/skill/giant_pumpkin2/pos_type/line/{6 => 4}/4.mcfunction (71%) diff --git a/Asset/data/asset/functions/mob/0059.jack_o_lantern/tick/skill/giant_pumpkin2/pos_type/line/6/1.mcfunction b/Asset/data/asset/functions/mob/0059.jack_o_lantern/tick/skill/giant_pumpkin2/pos_type/line/4/1.mcfunction similarity index 71% rename from Asset/data/asset/functions/mob/0059.jack_o_lantern/tick/skill/giant_pumpkin2/pos_type/line/6/1.mcfunction rename to Asset/data/asset/functions/mob/0059.jack_o_lantern/tick/skill/giant_pumpkin2/pos_type/line/4/1.mcfunction index b6ec361052..dd9f80a84f 100644 --- a/Asset/data/asset/functions/mob/0059.jack_o_lantern/tick/skill/giant_pumpkin2/pos_type/line/6/1.mcfunction +++ b/Asset/data/asset/functions/mob/0059.jack_o_lantern/tick/skill/giant_pumpkin2/pos_type/line/4/1.mcfunction @@ -1,11 +1,9 @@ -#> asset:mob/0059.jack_o_lantern/tick/skill/giant_pumpkin2/pos_type/line/6/1 +#> asset:mob/0059.jack_o_lantern/tick/skill/giant_pumpkin2/pos_type/line/4/1 # # 1直線に並べて転がす.1 # # @within function asset:mob/0059.jack_o_lantern/tick/skill/giant_pumpkin2/* - execute positioned ^7.5 ^0 ^-9 rotated 0 0 run function asset:mob/0059.jack_o_lantern/tick/skill/common/giant_pumpkin/neutral - execute positioned ^4.5 ^0 ^-9 rotated 0 0 run function asset:mob/0059.jack_o_lantern/tick/skill/common/giant_pumpkin/neutral execute positioned ^1.5 ^0 ^-9 rotated 0 0 run function asset:mob/0059.jack_o_lantern/tick/skill/common/giant_pumpkin/neutral @@ -13,5 +11,3 @@ execute positioned ^-1.5 ^0 ^-9 rotated 0 0 run function asset:mob/0059.jack_o_lantern/tick/skill/common/giant_pumpkin/neutral execute positioned ^-4.5 ^0 ^-9 rotated 0 0 run function asset:mob/0059.jack_o_lantern/tick/skill/common/giant_pumpkin/neutral - - execute positioned ^-7.5 ^0 ^-9 rotated 0 0 run function asset:mob/0059.jack_o_lantern/tick/skill/common/giant_pumpkin/neutral diff --git a/Asset/data/asset/functions/mob/0059.jack_o_lantern/tick/skill/giant_pumpkin2/pos_type/line/6/2.mcfunction b/Asset/data/asset/functions/mob/0059.jack_o_lantern/tick/skill/giant_pumpkin2/pos_type/line/4/2.mcfunction similarity index 71% rename from Asset/data/asset/functions/mob/0059.jack_o_lantern/tick/skill/giant_pumpkin2/pos_type/line/6/2.mcfunction rename to Asset/data/asset/functions/mob/0059.jack_o_lantern/tick/skill/giant_pumpkin2/pos_type/line/4/2.mcfunction index 81ba16ae92..0cac61180c 100644 --- a/Asset/data/asset/functions/mob/0059.jack_o_lantern/tick/skill/giant_pumpkin2/pos_type/line/6/2.mcfunction +++ b/Asset/data/asset/functions/mob/0059.jack_o_lantern/tick/skill/giant_pumpkin2/pos_type/line/4/2.mcfunction @@ -1,11 +1,9 @@ -#> asset:mob/0059.jack_o_lantern/tick/skill/giant_pumpkin2/pos_type/line/6/2 +#> asset:mob/0059.jack_o_lantern/tick/skill/giant_pumpkin2/pos_type/line/4/2 # # 1直線に並べて転がす.2 # # @within function asset:mob/0059.jack_o_lantern/tick/skill/giant_pumpkin2/* - execute positioned ^9 ^0 ^7.5 rotated 90 0 run function asset:mob/0059.jack_o_lantern/tick/skill/common/giant_pumpkin/neutral - execute positioned ^9 ^0 ^4.5 rotated 90 0 run function asset:mob/0059.jack_o_lantern/tick/skill/common/giant_pumpkin/neutral execute positioned ^9 ^0 ^1.5 rotated 90 0 run function asset:mob/0059.jack_o_lantern/tick/skill/common/giant_pumpkin/neutral @@ -13,5 +11,3 @@ execute positioned ^9 ^0 ^-1.5 rotated 90 0 run function asset:mob/0059.jack_o_lantern/tick/skill/common/giant_pumpkin/neutral execute positioned ^9 ^0 ^-4.5 rotated 90 0 run function asset:mob/0059.jack_o_lantern/tick/skill/common/giant_pumpkin/neutral - - execute positioned ^9 ^0 ^-7.5 rotated 90 0 run function asset:mob/0059.jack_o_lantern/tick/skill/common/giant_pumpkin/neutral diff --git a/Asset/data/asset/functions/mob/0059.jack_o_lantern/tick/skill/giant_pumpkin2/pos_type/line/6/3.mcfunction b/Asset/data/asset/functions/mob/0059.jack_o_lantern/tick/skill/giant_pumpkin2/pos_type/line/4/3.mcfunction similarity index 71% rename from Asset/data/asset/functions/mob/0059.jack_o_lantern/tick/skill/giant_pumpkin2/pos_type/line/6/3.mcfunction rename to Asset/data/asset/functions/mob/0059.jack_o_lantern/tick/skill/giant_pumpkin2/pos_type/line/4/3.mcfunction index 0d20903474..2e2665bd63 100644 --- a/Asset/data/asset/functions/mob/0059.jack_o_lantern/tick/skill/giant_pumpkin2/pos_type/line/6/3.mcfunction +++ b/Asset/data/asset/functions/mob/0059.jack_o_lantern/tick/skill/giant_pumpkin2/pos_type/line/4/3.mcfunction @@ -1,11 +1,9 @@ -#> asset:mob/0059.jack_o_lantern/tick/skill/giant_pumpkin2/pos_type/line/6/3 +#> asset:mob/0059.jack_o_lantern/tick/skill/giant_pumpkin2/pos_type/line/4/3 # # 1直線に並べて転がす.3 # # @within function asset:mob/0059.jack_o_lantern/tick/skill/giant_pumpkin2/* - execute positioned ^7.5 ^0 ^9 rotated 180 0 run function asset:mob/0059.jack_o_lantern/tick/skill/common/giant_pumpkin/neutral - execute positioned ^4.5 ^0 ^9 rotated 180 0 run function asset:mob/0059.jack_o_lantern/tick/skill/common/giant_pumpkin/neutral execute positioned ^1.5 ^0 ^9 rotated 180 0 run function asset:mob/0059.jack_o_lantern/tick/skill/common/giant_pumpkin/neutral @@ -13,5 +11,3 @@ execute positioned ^-1.5 ^0 ^9 rotated 180 0 run function asset:mob/0059.jack_o_lantern/tick/skill/common/giant_pumpkin/neutral execute positioned ^-4.5 ^0 ^9 rotated 180 0 run function asset:mob/0059.jack_o_lantern/tick/skill/common/giant_pumpkin/neutral - - execute positioned ^-7.5 ^0 ^9 rotated 180 0 run function asset:mob/0059.jack_o_lantern/tick/skill/common/giant_pumpkin/neutral diff --git a/Asset/data/asset/functions/mob/0059.jack_o_lantern/tick/skill/giant_pumpkin2/pos_type/line/6/4.mcfunction b/Asset/data/asset/functions/mob/0059.jack_o_lantern/tick/skill/giant_pumpkin2/pos_type/line/4/4.mcfunction similarity index 71% rename from Asset/data/asset/functions/mob/0059.jack_o_lantern/tick/skill/giant_pumpkin2/pos_type/line/6/4.mcfunction rename to Asset/data/asset/functions/mob/0059.jack_o_lantern/tick/skill/giant_pumpkin2/pos_type/line/4/4.mcfunction index d4d9b1cce2..f3ba3d9a07 100644 --- a/Asset/data/asset/functions/mob/0059.jack_o_lantern/tick/skill/giant_pumpkin2/pos_type/line/6/4.mcfunction +++ b/Asset/data/asset/functions/mob/0059.jack_o_lantern/tick/skill/giant_pumpkin2/pos_type/line/4/4.mcfunction @@ -1,11 +1,9 @@ -#> asset:mob/0059.jack_o_lantern/tick/skill/giant_pumpkin2/pos_type/line/6/4 +#> asset:mob/0059.jack_o_lantern/tick/skill/giant_pumpkin2/pos_type/line/4/4 # # 1直線に並べて転がす.4 # # @within function asset:mob/0059.jack_o_lantern/tick/skill/giant_pumpkin2/* - execute positioned ^-9 ^0 ^7.5 rotated 270 0 run function asset:mob/0059.jack_o_lantern/tick/skill/common/giant_pumpkin/neutral - execute positioned ^-9 ^0 ^4.5 rotated 270 0 run function asset:mob/0059.jack_o_lantern/tick/skill/common/giant_pumpkin/neutral execute positioned ^-9 ^0 ^1.5 rotated 270 0 run function asset:mob/0059.jack_o_lantern/tick/skill/common/giant_pumpkin/neutral @@ -13,5 +11,3 @@ execute positioned ^-9 ^0 ^-1.5 rotated 270 0 run function asset:mob/0059.jack_o_lantern/tick/skill/common/giant_pumpkin/neutral execute positioned ^-9 ^0 ^-4.5 rotated 270 0 run function asset:mob/0059.jack_o_lantern/tick/skill/common/giant_pumpkin/neutral - - execute positioned ^-9 ^0 ^-7.5 rotated 270 0 run function asset:mob/0059.jack_o_lantern/tick/skill/common/giant_pumpkin/neutral diff --git a/Asset/data/asset/functions/mob/0059.jack_o_lantern/tick/skill/giant_pumpkin2/select_line.mcfunction b/Asset/data/asset/functions/mob/0059.jack_o_lantern/tick/skill/giant_pumpkin2/select_line.mcfunction index 588f8c59db..9ddd6ffc20 100644 --- a/Asset/data/asset/functions/mob/0059.jack_o_lantern/tick/skill/giant_pumpkin2/select_line.mcfunction +++ b/Asset/data/asset/functions/mob/0059.jack_o_lantern/tick/skill/giant_pumpkin2/select_line.mcfunction @@ -14,10 +14,10 @@ execute if score $Random Temporary matches 3 if predicate api:global_vars/difficulty/max/normal run function asset:mob/0059.jack_o_lantern/tick/skill/giant_pumpkin2/pos_type/line/3/4 # ハード以上 - execute if score $Random Temporary matches 0 if predicate api:global_vars/difficulty/min/hard run function asset:mob/0059.jack_o_lantern/tick/skill/giant_pumpkin2/pos_type/line/6/1 - execute if score $Random Temporary matches 1 if predicate api:global_vars/difficulty/min/hard run function asset:mob/0059.jack_o_lantern/tick/skill/giant_pumpkin2/pos_type/line/6/2 - execute if score $Random Temporary matches 2 if predicate api:global_vars/difficulty/min/hard run function asset:mob/0059.jack_o_lantern/tick/skill/giant_pumpkin2/pos_type/line/6/3 - execute if score $Random Temporary matches 3 if predicate api:global_vars/difficulty/min/hard run function asset:mob/0059.jack_o_lantern/tick/skill/giant_pumpkin2/pos_type/line/6/4 + execute if score $Random Temporary matches 0 if predicate api:global_vars/difficulty/min/hard run function asset:mob/0059.jack_o_lantern/tick/skill/giant_pumpkin2/pos_type/line/4/1 + execute if score $Random Temporary matches 1 if predicate api:global_vars/difficulty/min/hard run function asset:mob/0059.jack_o_lantern/tick/skill/giant_pumpkin2/pos_type/line/4/2 + execute if score $Random Temporary matches 2 if predicate api:global_vars/difficulty/min/hard run function asset:mob/0059.jack_o_lantern/tick/skill/giant_pumpkin2/pos_type/line/4/3 + execute if score $Random Temporary matches 3 if predicate api:global_vars/difficulty/min/hard run function asset:mob/0059.jack_o_lantern/tick/skill/giant_pumpkin2/pos_type/line/4/4 # リセット scoreboard players reset $Random Temporary