From b9cd9aacaa8e590215b8eb249128ea22ed0c4003 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Fri, 7 Mar 2025 02:10:46 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=E6=AD=A3=E3=81=97=E3=81=8F=E3=81=AA?= =?UTF-8?q?=E3=81=84=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../0059.jack_o_lantern/tick/skill/giant_pumpkin2/.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/mob/0059.jack_o_lantern/tick/skill/giant_pumpkin2/.mcfunction b/Asset/data/asset/functions/mob/0059.jack_o_lantern/tick/skill/giant_pumpkin2/.mcfunction index bf4a733908..2cb9b3c792 100644 --- a/Asset/data/asset/functions/mob/0059.jack_o_lantern/tick/skill/giant_pumpkin2/.mcfunction +++ b/Asset/data/asset/functions/mob/0059.jack_o_lantern/tick/skill/giant_pumpkin2/.mcfunction @@ -9,7 +9,7 @@ # 最初のTickでのみ実行 execute if entity @s[scores={General.Mob.Tick=0}] run function asset:mob/0059.jack_o_lantern/tick/skill/giant_pumpkin2/first_tick -# ハード以上での回転 +# 回転 execute if entity @s[scores={General.Mob.Tick=..280}] run function asset:mob/0059.jack_o_lantern/tick/skill/giant_pumpkin2/rotate # スポーンマーカーを中心として巨大カボチャを召喚 From 6814d275b18cd937380e67ba49da2d36ba027f29 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Fri, 7 Mar 2025 02:22:08 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E3=81=99=E3=82=8Btext=5F?= =?UTF-8?q?display=E3=82=92Object=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../0059.jack_o_lantern/_index.d.mcfunction | 1 - .../mob/0059.jack_o_lantern/death/.mcfunction | 3 --- .../0059.jack_o_lantern/remove/.mcfunction | 3 --- .../tick/skill/quiz/.mcfunction | 4 ++-- .../register.mcfunction | 20 +++++++++++++++++++ .../summon/.mcfunction | 8 ++++++++ .../summon/debug.mcfunction | 10 ++++++++++ .../tick/.mcfunction | 11 ++++++++++ .../object/alias/2033/register.mcfunction | 8 ++++++++ .../object/alias/2033/summon.mcfunction | 8 ++++++++ .../object/alias/2033/tick.mcfunction | 8 ++++++++ 11 files changed, 75 insertions(+), 9 deletions(-) create mode 100644 Asset/data/asset/functions/object/2033.pumpkin_text_display/register.mcfunction create mode 100644 Asset/data/asset/functions/object/2033.pumpkin_text_display/summon/.mcfunction create mode 100644 Asset/data/asset/functions/object/2033.pumpkin_text_display/summon/debug.mcfunction create mode 100644 Asset/data/asset/functions/object/2033.pumpkin_text_display/tick/.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/2033/register.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/2033/summon.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/2033/tick.mcfunction diff --git a/Asset/data/asset/functions/mob/0059.jack_o_lantern/_index.d.mcfunction b/Asset/data/asset/functions/mob/0059.jack_o_lantern/_index.d.mcfunction index 634202dae9..d159ccf813 100644 --- a/Asset/data/asset/functions/mob/0059.jack_o_lantern/_index.d.mcfunction +++ b/Asset/data/asset/functions/mob/0059.jack_o_lantern/_index.d.mcfunction @@ -26,4 +26,3 @@ #declare tag 1N.HealthLess40Per #declare tag 1N.AlreadySpecial #declare tag 1N.DisableParticle - #declare tag 1N.TextDisplay diff --git a/Asset/data/asset/functions/mob/0059.jack_o_lantern/death/.mcfunction b/Asset/data/asset/functions/mob/0059.jack_o_lantern/death/.mcfunction index e7fb109434..9576d97f71 100644 --- a/Asset/data/asset/functions/mob/0059.jack_o_lantern/death/.mcfunction +++ b/Asset/data/asset/functions/mob/0059.jack_o_lantern/death/.mcfunction @@ -21,9 +21,6 @@ # カボチャが召喚するオブジェクトも抹消する kill @e[type=item_display,scores={ObjectID=2031..2036},distance=..50] -# TextDisplayをkill - kill @e[type=text_display,tag=1N.TextDisplay] - # スポーンマーカーをkill kill @e[type=marker,tag=1N.SpawnMarker] diff --git a/Asset/data/asset/functions/mob/0059.jack_o_lantern/remove/.mcfunction b/Asset/data/asset/functions/mob/0059.jack_o_lantern/remove/.mcfunction index 99dd7e9dd1..df7ab7153e 100644 --- a/Asset/data/asset/functions/mob/0059.jack_o_lantern/remove/.mcfunction +++ b/Asset/data/asset/functions/mob/0059.jack_o_lantern/remove/.mcfunction @@ -10,8 +10,5 @@ # スポーンマーカーをkill kill @e[type=marker,tag=1N.SpawnMarker] -# TextDisplayをkill - kill @e[type=text_display,tag=1N.TextDisplay] - # "確実に"偽物を消し去る execute as @e[type=zombie,scores={MobID=224},distance=..128] run function api:mob/remove diff --git a/Asset/data/asset/functions/mob/0059.jack_o_lantern/tick/skill/quiz/.mcfunction b/Asset/data/asset/functions/mob/0059.jack_o_lantern/tick/skill/quiz/.mcfunction index 037bc304cb..72208178bc 100644 --- a/Asset/data/asset/functions/mob/0059.jack_o_lantern/tick/skill/quiz/.mcfunction +++ b/Asset/data/asset/functions/mob/0059.jack_o_lantern/tick/skill/quiz/.mcfunction @@ -21,8 +21,8 @@ # 煽りメッセージ execute if entity @s[scores={General.Mob.Tick=50}] run playsound minecraft:block.bell.use hostile @a ~ ~ ~ 1 1.5 - execute if entity @s[scores={General.Mob.Tick=50}] run summon text_display ~ ~3 ~ {Tags:["1N.TextDisplay"],billboard:"center",shadow:1b,text:'[{"text":"探してみな！"},{"text":"\\n↓","color":"white"}]',background:16711680,transformation:{left_rotation:[0.0f,0.0f,0.0f,1.0f],right_rotation:[0.0f,0.0f,0.0f,1.0f],translation:[0.0f,0.0f,0.0f],scale:[2.0f,2.0f,2.0f]}} - execute if entity @s[scores={General.Mob.Tick=70}] positioned ~ ~3 ~ run kill @e[type=text_display,tag=1N.TextDisplay,distance=..0.01,sort=nearest,limit=1] + execute if entity @s[scores={General.Mob.Tick=50}] run data modify storage api: Argument.ID set value 2033 + execute if entity @s[scores={General.Mob.Tick=50}] positioned ~ ~3 ~ run function api:object/summon # 回転途中で頭を取り換える execute if entity @s[scores={General.Mob.Tick=35}] run particle explosion ~ ~1.8 ~ 0 0 0 0 1 diff --git a/Asset/data/asset/functions/object/2033.pumpkin_text_display/register.mcfunction b/Asset/data/asset/functions/object/2033.pumpkin_text_display/register.mcfunction new file mode 100644 index 0000000000..0720b8ac99 --- /dev/null +++ b/Asset/data/asset/functions/object/2033.pumpkin_text_display/register.mcfunction @@ -0,0 +1,20 @@ +#> asset:object/2033.pumpkin_text_display/register +# +# Objectのデータを指定 +# +# @within function asset:object/alias/2033/register + +# 継承(オプション) + # data modify storage asset:object Extends append value + # function asset:object/extends +# 他のObjectに継承されることを許可するか (boolean) (オプション) + # data modify storage asset:object ExtendsSafe set value +# 継承されることを前提とした、抽象的なObjectであるかどうか(boolean) + data modify storage asset:object IsAbstract set value false +# Tickするかどうか(boolean) (オプション) + # data modify storage asset:object IsTicking set value + +# ID (int) + data modify storage asset:object ID set value 2033 +# フィールド(オプション) + # data modify storage asset:object Field.myValue set value \ No newline at end of file diff --git a/Asset/data/asset/functions/object/2033.pumpkin_text_display/summon/.mcfunction b/Asset/data/asset/functions/object/2033.pumpkin_text_display/summon/.mcfunction new file mode 100644 index 0000000000..a6577ef670 --- /dev/null +++ b/Asset/data/asset/functions/object/2033.pumpkin_text_display/summon/.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/2033.pumpkin_text_display/summon/ +# +# Object召喚処理の呼び出し時に実行されるfunction +# +# @within asset:object/alias/2033/summon + +# 元となるEntityを召喚する + summon text_display ~ ~ ~ {Tags:["ObjectInit"],billboard:"center",shadow:1b,text:'[{"text":"探してみな！"},{"text":"\\n↓","color":"white"}]',background:16711680,transformation:{left_rotation:[0.0f,0.0f,0.0f,1.0f],right_rotation:[0.0f,0.0f,0.0f,1.0f],translation:[0.0f,0.0f,0.0f],scale:[2.0f,2.0f,2.0f]}} diff --git a/Asset/data/asset/functions/object/2033.pumpkin_text_display/summon/debug.mcfunction b/Asset/data/asset/functions/object/2033.pumpkin_text_display/summon/debug.mcfunction new file mode 100644 index 0000000000..ee5903d590 --- /dev/null +++ b/Asset/data/asset/functions/object/2033.pumpkin_text_display/summon/debug.mcfunction @@ -0,0 +1,10 @@ +#> asset:object/2033.pumpkin_text_display/summon/debug +# +# 動作チェック用の召喚処理 使い終わったら消してもいいかも +# +# @user +# @private + +# 召喚 + data modify storage api: Argument.ID set value 2033 + function api:object/summon \ No newline at end of file diff --git a/Asset/data/asset/functions/object/2033.pumpkin_text_display/tick/.mcfunction b/Asset/data/asset/functions/object/2033.pumpkin_text_display/tick/.mcfunction new file mode 100644 index 0000000000..a9ce597777 --- /dev/null +++ b/Asset/data/asset/functions/object/2033.pumpkin_text_display/tick/.mcfunction @@ -0,0 +1,11 @@ +#> asset:object/2033.pumpkin_text_display/tick/ +# +# Objectのtick時の処理 +# +# @within asset:object/alias/2033/tick + +# Tick加算 + scoreboard players add @s General.Object.Tick 1 + +# 消滅処理 + kill @s[scores={General.Object.Tick=20..}] diff --git a/Asset/data/asset/functions/object/alias/2033/register.mcfunction b/Asset/data/asset/functions/object/alias/2033/register.mcfunction new file mode 100644 index 0000000000..e8b5077fe9 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/2033/register.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/2033/register +# +# Objectのデータ指定処理のエイリアス +# +# @within asset_manager:object/summon/register.m + +# 元の登録処理を呼び出す + function asset:object/2033.pumpkin_text_display/register \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/2033/summon.mcfunction b/Asset/data/asset/functions/object/alias/2033/summon.mcfunction new file mode 100644 index 0000000000..c667f1384c --- /dev/null +++ b/Asset/data/asset/functions/object/alias/2033/summon.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/2033/summon +# +# Object召喚処理のエイリアス +# +# @within asset_manager:object/summon/summon.m + +# 元の召喚処理を呼び出す + function asset:object/2033.pumpkin_text_display/summon/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/2033/tick.mcfunction b/Asset/data/asset/functions/object/alias/2033/tick.mcfunction new file mode 100644 index 0000000000..2d344eb151 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/2033/tick.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/2033/tick +# +# Tick時処理のエイリアス +# +# @within asset_manager:object/tick/tick.m + +# 元のTick処理を呼び出す + function asset:object/2033.pumpkin_text_display/tick/ \ No newline at end of file From d8db646854d12f3f66189932251a953afeda3e4f Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Fri, 7 Mar 2025 02:37:52 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=E9=9A=99=E9=96=93=E9=81=BF=E3=81=91?= =?UTF-8?q?=E3=82=B9=E3=82=AD=E3=83=AB=E3=81=AB=E5=90=B8=E3=81=84=E8=BE=BC?= =?UTF-8?q?=E3=81=BF=E3=82=92=E5=AE=9F=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../0059.jack_o_lantern/tick/skill/giant_pumpkin2/.mcfunction | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Asset/data/asset/functions/mob/0059.jack_o_lantern/tick/skill/giant_pumpkin2/.mcfunction b/Asset/data/asset/functions/mob/0059.jack_o_lantern/tick/skill/giant_pumpkin2/.mcfunction index 2cb9b3c792..9177ff1d85 100644 --- a/Asset/data/asset/functions/mob/0059.jack_o_lantern/tick/skill/giant_pumpkin2/.mcfunction +++ b/Asset/data/asset/functions/mob/0059.jack_o_lantern/tick/skill/giant_pumpkin2/.mcfunction @@ -12,6 +12,9 @@ # 回転 execute if entity @s[scores={General.Mob.Tick=..280}] run function asset:mob/0059.jack_o_lantern/tick/skill/giant_pumpkin2/rotate +# 14x4x14より外のプレイヤーを吸い込む + execute as @a[gamemode=!spectator,distance=..20] positioned ~-7 ~ ~-7 unless entity @s[dx=13,dy=3,dz=13] at @s facing entity @e[type=marker,tag=1N.SpawnMarker] eyes run tp @s ^ ^ ^0.5 + # スポーンマーカーを中心として巨大カボチャを召喚 # 網目状にカボチャを転がす 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 4/4] =?UTF-8?q?=E5=9B=9E=E9=81=BF=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E3=81=AB=E3=81=AA=E3=81=A3=E3=81=9F6=E5=80=8B=E4=B8=A6?= =?UTF-8?q?=E3=81=B9=E3=82=924=E5=80=8B=E4=B8=A6=E3=81=B9=E3=81=AB?= =?UTF-8?q?=E8=AA=BF=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