From bcd717523f5694c706d12361b532d572f1197798 Mon Sep 17 00:00:00 2001
From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com>
Date: Thu, 23 Oct 2025 04:49:14 +0900
Subject: [PATCH 1/8] =?UTF-8?q?=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../give/1.trigger.mcfunction                 |  7 ++
 .../1315.dolphin_dive/give/2.give.mcfunction  | 68 +++++++++++++++++++
 .../1315.dolphin_dive/register.mcfunction     |  7 ++
 .../trigger/1.trigger.mcfunction              |  8 +++
 .../trigger/2.check_condition.mcfunction      | 16 +++++
 .../trigger/3.main.mcfunction                 | 35 ++++++++++
 .../1315.dolphin_dive/trigger/vfx.mcfunction  | 68 +++++++++++++++++++
 .../0341.dolphin_dive/_/register.mcfunction   |  7 ++
 .../0341.dolphin_dive/_/tick.mcfunction       |  7 ++
 .../0341.dolphin_dive/register.mcfunction     | 39 +++++++++++
 .../effect/0341.dolphin_dive/tick/.mcfunction | 19 ++++++
 .../0341.dolphin_dive/tick/landing.mcfunction | 14 ++++
 .../1151.dolphin_dive/register.mcfunction     | 21 ++++++
 .../1151.dolphin_dive/summon/.mcfunction      |  8 +++
 .../object/1151.dolphin_dive/tick/.mcfunction | 16 +++++
 .../1151.dolphin_dive/tick/wave/1.mcfunction  | 19 ++++++
 .../1151.dolphin_dive/tick/wave/2.mcfunction  | 23 +++++++
 .../1151.dolphin_dive/tick/wave/3.mcfunction  | 27 ++++++++
 .../tick/wave/damage/1.mcfunction             | 36 ++++++++++
 .../tick/wave/damage/2.mcfunction             | 36 ++++++++++
 .../tick/wave/damage/3.mcfunction             | 36 ++++++++++
 .../wave/damage/check_duplicate.mcfunction    | 15 ++++
 .../tick/wave/summon.mcfunction               |  9 +++
 .../object/alias/1151/register.mcfunction     |  8 +++
 .../object/alias/1151/summon.mcfunction       |  8 +++
 .../object/alias/1151/tick.mcfunction         |  8 +++
 .../artifact/click.carrot_on_a_stick.json     |  6 +-
 .../asset/tags/functions/artifact/give.json   |  3 +-
 .../tags/functions/artifact/register.json     |  3 +-
 .../asset/tags/functions/effect/register.json |  3 +-
 .../asset/tags/functions/effect/tick.json     |  1 +
 31 files changed, 574 insertions(+), 7 deletions(-)
 create mode 100644 Asset/data/asset/functions/artifact/1315.dolphin_dive/give/1.trigger.mcfunction
 create mode 100644 Asset/data/asset/functions/artifact/1315.dolphin_dive/give/2.give.mcfunction
 create mode 100644 Asset/data/asset/functions/artifact/1315.dolphin_dive/register.mcfunction
 create mode 100644 Asset/data/asset/functions/artifact/1315.dolphin_dive/trigger/1.trigger.mcfunction
 create mode 100644 Asset/data/asset/functions/artifact/1315.dolphin_dive/trigger/2.check_condition.mcfunction
 create mode 100644 Asset/data/asset/functions/artifact/1315.dolphin_dive/trigger/3.main.mcfunction
 create mode 100644 Asset/data/asset/functions/artifact/1315.dolphin_dive/trigger/vfx.mcfunction
 create mode 100644 Asset/data/asset/functions/effect/0341.dolphin_dive/_/register.mcfunction
 create mode 100644 Asset/data/asset/functions/effect/0341.dolphin_dive/_/tick.mcfunction
 create mode 100644 Asset/data/asset/functions/effect/0341.dolphin_dive/register.mcfunction
 create mode 100644 Asset/data/asset/functions/effect/0341.dolphin_dive/tick/.mcfunction
 create mode 100644 Asset/data/asset/functions/effect/0341.dolphin_dive/tick/landing.mcfunction
 create mode 100644 Asset/data/asset/functions/object/1151.dolphin_dive/register.mcfunction
 create mode 100644 Asset/data/asset/functions/object/1151.dolphin_dive/summon/.mcfunction
 create mode 100644 Asset/data/asset/functions/object/1151.dolphin_dive/tick/.mcfunction
 create mode 100644 Asset/data/asset/functions/object/1151.dolphin_dive/tick/wave/1.mcfunction
 create mode 100644 Asset/data/asset/functions/object/1151.dolphin_dive/tick/wave/2.mcfunction
 create mode 100644 Asset/data/asset/functions/object/1151.dolphin_dive/tick/wave/3.mcfunction
 create mode 100644 Asset/data/asset/functions/object/1151.dolphin_dive/tick/wave/damage/1.mcfunction
 create mode 100644 Asset/data/asset/functions/object/1151.dolphin_dive/tick/wave/damage/2.mcfunction
 create mode 100644 Asset/data/asset/functions/object/1151.dolphin_dive/tick/wave/damage/3.mcfunction
 create mode 100644 Asset/data/asset/functions/object/1151.dolphin_dive/tick/wave/damage/check_duplicate.mcfunction
 create mode 100644 Asset/data/asset/functions/object/1151.dolphin_dive/tick/wave/summon.mcfunction
 create mode 100644 Asset/data/asset/functions/object/alias/1151/register.mcfunction
 create mode 100644 Asset/data/asset/functions/object/alias/1151/summon.mcfunction
 create mode 100644 Asset/data/asset/functions/object/alias/1151/tick.mcfunction

diff --git a/Asset/data/asset/functions/artifact/1315.dolphin_dive/give/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1315.dolphin_dive/give/1.trigger.mcfunction
new file mode 100644
index 00000000000..702184b57e5
--- /dev/null
+++ b/Asset/data/asset/functions/artifact/1315.dolphin_dive/give/1.trigger.mcfunction
@@ -0,0 +1,7 @@
+#> asset:artifact/1315.dolphin_dive/give/1.trigger
+#
+# 神器の取得処理の呼び出し時に実行されるfunction
+#
+# @within tag/function asset:artifact/give
+
+execute if data storage asset:context {id:1315} run function asset:artifact/1315.dolphin_dive/give/2.give
\ No newline at end of file
diff --git a/Asset/data/asset/functions/artifact/1315.dolphin_dive/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1315.dolphin_dive/give/2.give.mcfunction
new file mode 100644
index 00000000000..449dcbe6bbd
--- /dev/null
+++ b/Asset/data/asset/functions/artifact/1315.dolphin_dive/give/2.give.mcfunction
@@ -0,0 +1,68 @@
+#> asset:artifact/1315.dolphin_dive/give/2.give
+#
+# 神器の作成部 ここでID等を定義する
+#
+# @user
+# @within function asset:artifact/1315.dolphin_dive/give/1.trigger
+
+# 神器の説明や消費MPなどをここで設定する。
+# 最後にasset:artifact/common/giveを実行することで入手可能。
+
+# 神器のID (int) スプレッドシートの値を入れる
+    data modify storage asset:artifact ID set value 1315
+# 神器のベースアイテム
+    data modify storage asset:artifact Item set value "minecraft:carrot_on_a_stick"
+# 神器の名前 (TextComponentString)
+    data modify storage asset:artifact Name set value '{"text":"ドルフィンダイブ","color":"#96FFFC"}'
+# 神器の説明文 (TextComponentString[])
+    data modify storage asset:artifact Lore set value ['{"text":"前方に跳躍し、着地時に周囲にダメージを与える","color":"white"}','{"text":"使用後2秒間は落下ダメージを無効化する","color":"white"}']
+# 消費アイテム ({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 "mainhand"
+# 神器のトリガー (string) Wikiを参照
+    data modify storage asset:artifact Trigger set value "onClick"
+# 神器の発動条件 (TextComponentString) (オプション)
+    data modify storage asset:artifact Condition set value '{"text":"地面に立っている","color":"white"}'
+# 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション)
+    data modify storage asset:artifact AttackInfo.Damage set value [1000]
+# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション)
+    data modify storage asset:artifact AttackInfo.AttackType set value [Physical]
+# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション)
+    data modify storage asset:artifact AttackInfo.ElementType set value [Water]
+# 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション)
+    # data modify storage asset:artifact AttackInfo.BypassResist set value
+# 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション)
+    data modify storage asset:artifact AttackInfo.IsRangeAttack set value "every"
+# 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション)
+    data modify storage asset:artifact AttackInfo.AttackRange set value 6
+# MP消費量 (int)
+    data modify storage asset:artifact MPCost set value 100
+# 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
+# 種別クールダウン ({Type: string, Duration: int}) (オプション)
+    data modify storage asset:artifact TypeCooldown.Type set value "shortRange"
+    data modify storage asset:artifact TypeCooldown.Duration set value 80
+# グローバルクールダウン (int) (オプション)
+    # data modify storage asset:artifact SpecialCooldown set value
+# クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション)
+    # data modify storage asset:artifact DisableCooldownMessage set value
+# 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 ["Flora", "Urban", "Rumor"]
+# カスタム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/1315.dolphin_dive/register.mcfunction b/Asset/data/asset/functions/artifact/1315.dolphin_dive/register.mcfunction
new file mode 100644
index 00000000000..e02de1139b9
--- /dev/null
+++ b/Asset/data/asset/functions/artifact/1315.dolphin_dive/register.mcfunction
@@ -0,0 +1,7 @@
+#> asset:artifact/1315.dolphin_dive/register
+#
+# 神器プールへの登録処理
+#
+# @within tag/function asset:artifact/register
+
+data modify storage asset:artifact RarityRegistry[4] append value [1315]
\ No newline at end of file
diff --git a/Asset/data/asset/functions/artifact/1315.dolphin_dive/trigger/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1315.dolphin_dive/trigger/1.trigger.mcfunction
new file mode 100644
index 00000000000..7673f024ac5
--- /dev/null
+++ b/Asset/data/asset/functions/artifact/1315.dolphin_dive/trigger/1.trigger.mcfunction
@@ -0,0 +1,8 @@
+#> asset:artifact/1315.dolphin_dive/trigger/1.trigger
+#
+# 指定したイベントタイミングで実行されるfunction
+#
+# @within tag/function asset:artifact/**
+
+# storage asset:idのmainhandに装備している神器のIDが入っているので比較し、~/2.check_condition.mcfunctionを実行する
+    execute if data storage asset:context id{mainhand:1315} run function asset:artifact/1315.dolphin_dive/trigger/2.check_condition
\ No newline at end of file
diff --git a/Asset/data/asset/functions/artifact/1315.dolphin_dive/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1315.dolphin_dive/trigger/2.check_condition.mcfunction
new file mode 100644
index 00000000000..236fb4c65e4
--- /dev/null
+++ b/Asset/data/asset/functions/artifact/1315.dolphin_dive/trigger/2.check_condition.mcfunction
@@ -0,0 +1,16 @@
+#> asset:artifact/1315.dolphin_dive/trigger/2.check_condition
+#
+# 神器の発動条件をチェックします
+#
+# @within function asset:artifact/1315.dolphin_dive/trigger/1.trigger
+
+# 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く
+    function asset:artifact/common/check_condition/mainhand
+# 他にアイテム等確認する場合はここに書く
+
+# 地面に足がついてなければ使用不可
+    execute if entity @s[tag=CanUsed] run function api:data_get/on_ground
+    execute if entity @s[tag=CanUsed] unless data storage api: {OnGround:true} run tag @s remove CanUsed
+
+# CanUsedタグをチェックして3.main.mcfunctionを実行する
+    execute if entity @s[tag=CanUsed] run function asset:artifact/1315.dolphin_dive/trigger/3.main
diff --git a/Asset/data/asset/functions/artifact/1315.dolphin_dive/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1315.dolphin_dive/trigger/3.main.mcfunction
new file mode 100644
index 00000000000..26e9f0d9197
--- /dev/null
+++ b/Asset/data/asset/functions/artifact/1315.dolphin_dive/trigger/3.main.mcfunction
@@ -0,0 +1,35 @@
+#> asset:artifact/1315.dolphin_dive/trigger/3.main
+#
+# 神器のメイン処理部
+#
+# @within function asset:artifact/1315.dolphin_dive/trigger/2.check_condition
+
+# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う
+    function asset:artifact/common/use/mainhand
+
+# ここから先は神器側の効果の処理を書く
+
+# 演出
+    execute positioned ~ ~0.3 ~ rotated ~ 0 run function asset:artifact/1315.dolphin_dive/trigger/vfx
+    playsound entity.dolphin.jump player @a ~ ~ ~ 0.8 1.1
+    playsound entity.dolphin.jump player @a ~ ~ ~ 0.8 1.0
+    playsound entity.dolphin.jump player @a ~ ~ ~ 0.8 0.9
+    playsound minecraft:entity.dolphin.splash player @a ~ ~ ~ 1 1
+    execute if predicate lib:random_pass_per/50 run playsound minecraft:entity.dolphin.play player @a ~ ~ ~ 0.7 1
+
+# PlayerMotion
+    scoreboard players set $strength PlayerMotion.Api.Launch 11000
+    execute rotated ~ -65 run function lib:player_motion/launch_looking
+
+# 攻撃用エフェクト付与
+    data modify storage api: Argument.ID set value 341
+    data modify storage api: Argument.FieldOverride.Damage set value 1000
+    function api:entity/mob/effect/give
+    function api:entity/mob/effect/reset
+
+# 落下ダメージ無効
+    data modify storage api: Argument.ID set value 190
+    data modify storage api: Argument.Stack set value 10
+    data modify storage api: Argument.Duration set value 40
+    function api:entity/mob/effect/give
+    function api:entity/mob/effect/reset
diff --git a/Asset/data/asset/functions/artifact/1315.dolphin_dive/trigger/vfx.mcfunction b/Asset/data/asset/functions/artifact/1315.dolphin_dive/trigger/vfx.mcfunction
new file mode 100644
index 00000000000..bf18d22d6cc
--- /dev/null
+++ b/Asset/data/asset/functions/artifact/1315.dolphin_dive/trigger/vfx.mcfunction
@@ -0,0 +1,68 @@
+#> asset:artifact/1315.dolphin_dive/trigger/vfx
+#
+#
+#
+# @within function asset:artifact/1315.dolphin_dive/trigger/3.main
+
+# [ImportKey]: NobwRALgngDgpmAXGAxgSwE4oDYIDRgCuhaAJkmAJwAslcARqQBwCGAtAEwBs9AZm9QCMABmpt6LJhzaUucOCiaVhKAMwBWFGAIA7FgFsEyQGGKAAkHawMFhgMBnJOBQB7QjohIuwgijju4GI5gAG4s2IRG4AAeSN5gULEAvokEtqRohA6I6sK5ebkEdhA2HohxcNjYaDB2RiJxGM7FEEZxaHYAopXVtR0AjoRh2FAAyta+5Ii8YbXJALpAA_3
+# 円 1
+particle cloud ~ ~ ~ ^0 ^ ^-500000000 0.000000001 0 normal @a
+particle cloud ~ ~ ~ ^52264231.63383 ^ ^-497260947.68414 0.000000001 0 normal @a
+particle cloud ~ ~ ~ ^103955845.40888 ^ ^-489073800.3669 0.000000001 0 normal @a
+particle cloud ~ ~ ~ ^154508497.18747 ^ ^-475528258.14758 0.000000001 0 normal @a
+particle cloud ~ ~ ~ ^203368321.5379 ^ ^-456772728.8213 0.000000001 0 normal @a
+particle cloud ~ ~ ~ ^250000000 ^ ^-433012701.89222 0.000000001 0 normal @a
+particle cloud ~ ~ ~ ^293892626.14624 ^ ^-404508497.18747 0.000000001 0 normal @a
+particle cloud ~ ~ ~ ^334565303.17943 ^ ^-371572412.7387 0.000000001 0 normal @a
+particle cloud ~ ~ ~ ^371572412.7387 ^ ^-334565303.17943 0.000000001 0 normal @a
+particle cloud ~ ~ ~ ^404508497.18747 ^ ^-293892626.14624 0.000000001 0 normal @a
+particle cloud ~ ~ ~ ^433012701.89222 ^ ^-250000000 0.000000001 0 normal @a
+particle cloud ~ ~ ~ ^456772728.8213 ^ ^-203368321.5379 0.000000001 0 normal @a
+particle cloud ~ ~ ~ ^475528258.14758 ^ ^-154508497.18747 0.000000001 0 normal @a
+particle cloud ~ ~ ~ ^489073800.3669 ^ ^-103955845.40888 0.000000001 0 normal @a
+particle cloud ~ ~ ~ ^497260947.68414 ^ ^-52264231.63383 0.000000001 0 normal @a
+particle cloud ~ ~ ~ ^500000000 ^ ^0 0.000000001 0 normal @a
+particle cloud ~ ~ ~ ^497260947.68414 ^ ^52264231.63383 0.000000001 0 normal @a
+particle cloud ~ ~ ~ ^489073800.3669 ^ ^103955845.40888 0.000000001 0 normal @a
+particle cloud ~ ~ ~ ^475528258.14758 ^ ^154508497.18747 0.000000001 0 normal @a
+particle cloud ~ ~ ~ ^456772728.8213 ^ ^203368321.5379 0.000000001 0 normal @a
+particle cloud ~ ~ ~ ^433012701.89222 ^ ^250000000 0.000000001 0 normal @a
+particle cloud ~ ~ ~ ^404508497.18747 ^ ^293892626.14624 0.000000001 0 normal @a
+particle cloud ~ ~ ~ ^371572412.7387 ^ ^334565303.17943 0.000000001 0 normal @a
+particle cloud ~ ~ ~ ^334565303.17943 ^ ^371572412.7387 0.000000001 0 normal @a
+particle cloud ~ ~ ~ ^293892626.14624 ^ ^404508497.18747 0.000000001 0 normal @a
+particle cloud ~ ~ ~ ^250000000 ^ ^433012701.89222 0.000000001 0 normal @a
+particle cloud ~ ~ ~ ^203368321.5379 ^ ^456772728.8213 0.000000001 0 normal @a
+particle cloud ~ ~ ~ ^154508497.18747 ^ ^475528258.14758 0.000000001 0 normal @a
+particle cloud ~ ~ ~ ^103955845.40888 ^ ^489073800.3669 0.000000001 0 normal @a
+particle cloud ~ ~ ~ ^52264231.63383 ^ ^497260947.68414 0.000000001 0 normal @a
+particle cloud ~ ~ ~ ^0 ^ ^500000000 0.000000001 0 normal @a
+particle cloud ~ ~ ~ ^-52264231.63383 ^ ^497260947.68414 0.000000001 0 normal @a
+particle cloud ~ ~ ~ ^-103955845.40888 ^ ^489073800.3669 0.000000001 0 normal @a
+particle cloud ~ ~ ~ ^-154508497.18747 ^ ^475528258.14758 0.000000001 0 normal @a
+particle cloud ~ ~ ~ ^-203368321.5379 ^ ^456772728.8213 0.000000001 0 normal @a
+particle cloud ~ ~ ~ ^-250000000 ^ ^433012701.89222 0.000000001 0 normal @a
+particle cloud ~ ~ ~ ^-293892626.14624 ^ ^404508497.18747 0.000000001 0 normal @a
+particle cloud ~ ~ ~ ^-334565303.17943 ^ ^371572412.7387 0.000000001 0 normal @a
+particle cloud ~ ~ ~ ^-371572412.7387 ^ ^334565303.17943 0.000000001 0 normal @a
+particle cloud ~ ~ ~ ^-404508497.18747 ^ ^293892626.14624 0.000000001 0 normal @a
+particle cloud ~ ~ ~ ^-433012701.89222 ^ ^250000000 0.000000001 0 normal @a
+particle cloud ~ ~ ~ ^-456772728.8213 ^ ^203368321.5379 0.000000001 0 normal @a
+particle cloud ~ ~ ~ ^-475528258.14758 ^ ^154508497.18747 0.000000001 0 normal @a
+particle cloud ~ ~ ~ ^-489073800.3669 ^ ^103955845.40888 0.000000001 0 normal @a
+particle cloud ~ ~ ~ ^-497260947.68414 ^ ^52264231.63383 0.000000001 0 normal @a
+particle cloud ~ ~ ~ ^-500000000 ^ ^0 0.000000001 0 normal @a
+particle cloud ~ ~ ~ ^-497260947.68414 ^ ^-52264231.63383 0.000000001 0 normal @a
+particle cloud ~ ~ ~ ^-489073800.3669 ^ ^-103955845.40888 0.000000001 0 normal @a
+particle cloud ~ ~ ~ ^-475528258.14758 ^ ^-154508497.18747 0.000000001 0 normal @a
+particle cloud ~ ~ ~ ^-456772728.8213 ^ ^-203368321.5379 0.000000001 0 normal @a
+particle cloud ~ ~ ~ ^-433012701.89222 ^ ^-250000000 0.000000001 0 normal @a
+particle cloud ~ ~ ~ ^-404508497.18747 ^ ^-293892626.14624 0.000000001 0 normal @a
+particle cloud ~ ~ ~ ^-371572412.7387 ^ ^-334565303.17943 0.000000001 0 normal @a
+particle cloud ~ ~ ~ ^-334565303.17943 ^ ^-371572412.7387 0.000000001 0 normal @a
+particle cloud ~ ~ ~ ^-293892626.14624 ^ ^-404508497.18747 0.000000001 0 normal @a
+particle cloud ~ ~ ~ ^-250000000 ^ ^-433012701.89222 0.000000001 0 normal @a
+particle cloud ~ ~ ~ ^-203368321.5379 ^ ^-456772728.8213 0.000000001 0 normal @a
+particle cloud ~ ~ ~ ^-154508497.18747 ^ ^-475528258.14758 0.000000001 0 normal @a
+particle cloud ~ ~ ~ ^-103955845.40888 ^ ^-489073800.3669 0.000000001 0 normal @a
+particle cloud ~ ~ ~ ^-52264231.63383 ^ ^-497260947.68414 0.000000001 0 normal @a
diff --git a/Asset/data/asset/functions/effect/0341.dolphin_dive/_/register.mcfunction b/Asset/data/asset/functions/effect/0341.dolphin_dive/_/register.mcfunction
new file mode 100644
index 00000000000..cec093314a7
--- /dev/null
+++ b/Asset/data/asset/functions/effect/0341.dolphin_dive/_/register.mcfunction
@@ -0,0 +1,7 @@
+#> asset:effect/0341.dolphin_dive/_/register
+#
+#
+#
+# @within tag/function asset:effect/register
+
+execute if data storage asset:context {id:341} run function asset:effect/0341.dolphin_dive/register
\ No newline at end of file
diff --git a/Asset/data/asset/functions/effect/0341.dolphin_dive/_/tick.mcfunction b/Asset/data/asset/functions/effect/0341.dolphin_dive/_/tick.mcfunction
new file mode 100644
index 00000000000..dcbbc2c3d12
--- /dev/null
+++ b/Asset/data/asset/functions/effect/0341.dolphin_dive/_/tick.mcfunction
@@ -0,0 +1,7 @@
+#> asset:effect/0341.dolphin_dive/_/tick
+#
+# Effectが発動している間毎tick実行されるfunction
+#
+# @within tag/function asset:effect/tick
+
+execute if data storage asset:context {id:341} run function asset:effect/0341.dolphin_dive/tick/
\ No newline at end of file
diff --git a/Asset/data/asset/functions/effect/0341.dolphin_dive/register.mcfunction b/Asset/data/asset/functions/effect/0341.dolphin_dive/register.mcfunction
new file mode 100644
index 00000000000..403dbab4cb6
--- /dev/null
+++ b/Asset/data/asset/functions/effect/0341.dolphin_dive/register.mcfunction
@@ -0,0 +1,39 @@
+#> asset:effect/0341.dolphin_dive/register
+#
+# Effectのデータを指定
+#
+# @within function asset:effect/0341.dolphin_dive/_/register
+
+# ExtendsSafe (boolean) (default = false)
+    # data modify storage asset:effect ExtendsSafe set value true
+# ID (int)
+    data modify storage asset:effect ID set value 341
+# 名前 (TextComponentString)
+    data modify storage asset:effect Name set value '{"text":"ドルフィンダイブ"}'
+# 説明文 (TextComponentString[])
+    data modify storage asset:effect Description set value []
+# 効果時間 (int) (default = API || error)
+    data modify storage asset:effect Duration set value 100
+# スタック (int) (default = API || 1)
+    # data modify storage asset:effect Stack set value
+# 効果時間の操作方法 (default = API || "replace")
+    # data modify storage asset:effect DurationOperation set value
+# スタックの操作方法 (default = API || "replace")
+    # data modify storage asset:effect StackOperation set value
+# 最大効果時間 (int) (default = 2147483647)
+    # data modify storage asset:effect MaxDuration set value
+# 最大スタック (int) (default = 2147483647)
+    data modify storage asset:effect MaxStack set value 1
+# 悪い効果か否か (boolean)
+    data modify storage asset:effect IsBadEffect set value false
+# 死亡時のエフェクトの処理 (default = "remove")
+    # data modify storage asset:effect ProcessOnDied set value
+# 消すのに必要なレベル (int) (default = 1)
+    data modify storage asset:effect RequireClearLv set value 4
+# エフェクトをUIに表示するか (boolean) (default = true)
+    data modify storage asset:effect Visible set value false
+# エフェクトのスタックををUIに表示するか (boolean) (default = true)
+    # data modify storage asset:effect StackVisible set value
+
+# フィールド
+    data modify storage asset:effect Field.Delay set value 3
diff --git a/Asset/data/asset/functions/effect/0341.dolphin_dive/tick/.mcfunction b/Asset/data/asset/functions/effect/0341.dolphin_dive/tick/.mcfunction
new file mode 100644
index 00000000000..e3569acc0ec
--- /dev/null
+++ b/Asset/data/asset/functions/effect/0341.dolphin_dive/tick/.mcfunction
@@ -0,0 +1,19 @@
+#> asset:effect/0341.dolphin_dive/tick/
+#
+# Effectのtick処理
+#
+# @within function asset:effect/0341.dolphin_dive/_/tick
+
+# 演出
+    particle dolphin ~ ~1 ~ 0.4 0.3 0.4 0 5 normal @a
+    particle dust 0.4 1 1 1 ~ ~ ~ 0.3 0.4 0.3 0 2 normal @a
+
+# 最初の数tickは着地検知を無効とする
+    execute store result storage asset:context this.Delay int 0.9999999999 run data get storage asset:context this.Delay
+    execute unless data storage asset:context this{Delay:0} run return fail
+
+# 着地検知
+    function api:data_get/on_ground
+
+# 着地
+    execute if data storage api: {OnGround:true} run function asset:effect/0341.dolphin_dive/tick/landing
diff --git a/Asset/data/asset/functions/effect/0341.dolphin_dive/tick/landing.mcfunction b/Asset/data/asset/functions/effect/0341.dolphin_dive/tick/landing.mcfunction
new file mode 100644
index 00000000000..666b2a35689
--- /dev/null
+++ b/Asset/data/asset/functions/effect/0341.dolphin_dive/tick/landing.mcfunction
@@ -0,0 +1,14 @@
+#> asset:effect/0341.dolphin_dive/tick/landing
+#
+#
+#
+# @within function asset:effect/0341.dolphin_dive/tick/
+
+# Durationを0にしてエフェクト解除
+    data modify storage asset:context Duration set value 0
+
+# Object召喚
+    data modify storage api: Argument.ID set value 1151
+    data modify storage api: Argument.FieldOverride.Damage set from storage asset:context this.Damage
+    execute store result storage api: Argument.FieldOverride.UserID int 1 run scoreboard players get @s UserID
+    function api:object/summon
diff --git a/Asset/data/asset/functions/object/1151.dolphin_dive/register.mcfunction b/Asset/data/asset/functions/object/1151.dolphin_dive/register.mcfunction
new file mode 100644
index 00000000000..77e1f63a892
--- /dev/null
+++ b/Asset/data/asset/functions/object/1151.dolphin_dive/register.mcfunction
@@ -0,0 +1,21 @@
+#> asset:object/1151.dolphin_dive/register
+#
+# Objectのデータを指定
+#
+# @within function asset:object/alias/1151/register
+
+# 継承(オプション)
+    data modify storage asset:object Extends append value 2
+    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 1151
+# フィールド(オプション)
+    data modify storage asset:object Field.Damage set value 1
+    data modify storage asset:object Field.UserID set value -1
diff --git a/Asset/data/asset/functions/object/1151.dolphin_dive/summon/.mcfunction b/Asset/data/asset/functions/object/1151.dolphin_dive/summon/.mcfunction
new file mode 100644
index 00000000000..f0ed4b8dce9
--- /dev/null
+++ b/Asset/data/asset/functions/object/1151.dolphin_dive/summon/.mcfunction
@@ -0,0 +1,8 @@
+#> asset:object/1151.dolphin_dive/summon/
+#
+# Object召喚処理の呼び出し時に実行されるfunction
+#
+# @within asset:object/alias/1151/summon
+
+# 元となるEntityを召喚する
+    summon marker ~ ~ ~ {Tags:["ObjectInit"]}
diff --git a/Asset/data/asset/functions/object/1151.dolphin_dive/tick/.mcfunction b/Asset/data/asset/functions/object/1151.dolphin_dive/tick/.mcfunction
new file mode 100644
index 00000000000..3da29a36e98
--- /dev/null
+++ b/Asset/data/asset/functions/object/1151.dolphin_dive/tick/.mcfunction
@@ -0,0 +1,16 @@
+#> asset:object/1151.dolphin_dive/tick/
+#
+# Objectのtick時の処理
+#
+# @within asset:object/alias/1151/tick
+
+# Tick加算
+    scoreboard players add @s General.Object.Tick 1
+
+# 波
+    execute if score @s General.Object.Tick matches 1 run function asset:object/1151.dolphin_dive/tick/wave/1
+    execute if score @s General.Object.Tick matches 6 run function asset:object/1151.dolphin_dive/tick/wave/2
+    execute if score @s General.Object.Tick matches 11 run function asset:object/1151.dolphin_dive/tick/wave/3
+
+# 消滅処理
+    kill @s[scores={General.Object.Tick=11..}]
diff --git a/Asset/data/asset/functions/object/1151.dolphin_dive/tick/wave/1.mcfunction b/Asset/data/asset/functions/object/1151.dolphin_dive/tick/wave/1.mcfunction
new file mode 100644
index 00000000000..b76cf14dfda
--- /dev/null
+++ b/Asset/data/asset/functions/object/1151.dolphin_dive/tick/wave/1.mcfunction
@@ -0,0 +1,19 @@
+#> asset:object/1151.dolphin_dive/tick/wave/1
+#
+#
+#
+# @within function asset:object/1151.dolphin_dive/tick/
+
+# ダメージ
+    function asset:object/1151.dolphin_dive/tick/wave/damage/1
+
+# playsound
+    playsound minecraft:entity.dolphin.splash player @a ~ ~ ~ 0.7 0.8
+    playsound minecraft:entity.dolphin.splash player @a ~ ~ ~ 0.7 0.75
+    playsound minecraft:entity.dolphin.splash player @a ~ ~ ~ 0.7 0.7
+
+# object
+    execute rotated ~000 ~ positioned ^ ^ ^1.5 run function asset:object/1151.dolphin_dive/tick/wave/summon
+    execute rotated ~090 ~ positioned ^ ^ ^1.5 run function asset:object/1151.dolphin_dive/tick/wave/summon
+    execute rotated ~180 ~ positioned ^ ^ ^1.5 run function asset:object/1151.dolphin_dive/tick/wave/summon
+    execute rotated ~270 ~ positioned ^ ^ ^1.5 run function asset:object/1151.dolphin_dive/tick/wave/summon
diff --git a/Asset/data/asset/functions/object/1151.dolphin_dive/tick/wave/2.mcfunction b/Asset/data/asset/functions/object/1151.dolphin_dive/tick/wave/2.mcfunction
new file mode 100644
index 00000000000..277c88b4938
--- /dev/null
+++ b/Asset/data/asset/functions/object/1151.dolphin_dive/tick/wave/2.mcfunction
@@ -0,0 +1,23 @@
+#> asset:object/1151.dolphin_dive/tick/wave/2
+#
+#
+#
+# @within function asset:object/1151.dolphin_dive/tick/
+
+# ダメージ
+    function asset:object/1151.dolphin_dive/tick/wave/damage/2
+
+# playsound
+    playsound minecraft:entity.dolphin.splash player @a ~ ~ ~ 0.7 0.9
+    playsound minecraft:entity.dolphin.splash player @a ~ ~ ~ 0.7 0.85
+    playsound minecraft:entity.dolphin.splash player @a ~ ~ ~ 0.7 0.8
+
+# object
+    execute rotated ~000 ~ positioned ^ ^ ^3 run function asset:object/1151.dolphin_dive/tick/wave/summon
+    execute rotated ~045 ~ positioned ^ ^ ^3 run function asset:object/1151.dolphin_dive/tick/wave/summon
+    execute rotated ~090 ~ positioned ^ ^ ^3 run function asset:object/1151.dolphin_dive/tick/wave/summon
+    execute rotated ~135 ~ positioned ^ ^ ^3 run function asset:object/1151.dolphin_dive/tick/wave/summon
+    execute rotated ~180 ~ positioned ^ ^ ^3 run function asset:object/1151.dolphin_dive/tick/wave/summon
+    execute rotated ~225 ~ positioned ^ ^ ^3 run function asset:object/1151.dolphin_dive/tick/wave/summon
+    execute rotated ~270 ~ positioned ^ ^ ^3 run function asset:object/1151.dolphin_dive/tick/wave/summon
+    execute rotated ~315 ~ positioned ^ ^ ^3 run function asset:object/1151.dolphin_dive/tick/wave/summon
diff --git a/Asset/data/asset/functions/object/1151.dolphin_dive/tick/wave/3.mcfunction b/Asset/data/asset/functions/object/1151.dolphin_dive/tick/wave/3.mcfunction
new file mode 100644
index 00000000000..aa065adb191
--- /dev/null
+++ b/Asset/data/asset/functions/object/1151.dolphin_dive/tick/wave/3.mcfunction
@@ -0,0 +1,27 @@
+#> asset:object/1151.dolphin_dive/tick/wave/3
+#
+#
+#
+# @within function asset:object/1151.dolphin_dive/tick/
+
+# ダメージ
+    function asset:object/1151.dolphin_dive/tick/wave/damage/3
+
+# playsound
+    playsound minecraft:entity.dolphin.splash player @a ~ ~ ~ 0.7 1.0
+    playsound minecraft:entity.dolphin.splash player @a ~ ~ ~ 0.7 0.95
+    playsound minecraft:entity.dolphin.splash player @a ~ ~ ~ 0.7 0.9
+
+# object
+    execute rotated ~000 ~ positioned ^ ^ ^4.5 run function asset:object/1151.dolphin_dive/tick/wave/summon
+    execute rotated ~030 ~ positioned ^ ^ ^4.5 run function asset:object/1151.dolphin_dive/tick/wave/summon
+    execute rotated ~060 ~ positioned ^ ^ ^4.5 run function asset:object/1151.dolphin_dive/tick/wave/summon
+    execute rotated ~090 ~ positioned ^ ^ ^4.5 run function asset:object/1151.dolphin_dive/tick/wave/summon
+    execute rotated ~120 ~ positioned ^ ^ ^4.5 run function asset:object/1151.dolphin_dive/tick/wave/summon
+    execute rotated ~150 ~ positioned ^ ^ ^4.5 run function asset:object/1151.dolphin_dive/tick/wave/summon
+    execute rotated ~180 ~ positioned ^ ^ ^4.5 run function asset:object/1151.dolphin_dive/tick/wave/summon
+    execute rotated ~210 ~ positioned ^ ^ ^4.5 run function asset:object/1151.dolphin_dive/tick/wave/summon
+    execute rotated ~240 ~ positioned ^ ^ ^4.5 run function asset:object/1151.dolphin_dive/tick/wave/summon
+    execute rotated ~270 ~ positioned ^ ^ ^4.5 run function asset:object/1151.dolphin_dive/tick/wave/summon
+    execute rotated ~300 ~ positioned ^ ^ ^4.5 run function asset:object/1151.dolphin_dive/tick/wave/summon
+    execute rotated ~330 ~ positioned ^ ^ ^4.5 run function asset:object/1151.dolphin_dive/tick/wave/summon
diff --git a/Asset/data/asset/functions/object/1151.dolphin_dive/tick/wave/damage/1.mcfunction b/Asset/data/asset/functions/object/1151.dolphin_dive/tick/wave/damage/1.mcfunction
new file mode 100644
index 00000000000..4d3ada5e38d
--- /dev/null
+++ b/Asset/data/asset/functions/object/1151.dolphin_dive/tick/wave/damage/1.mcfunction
@@ -0,0 +1,36 @@
+#> asset:object/1151.dolphin_dive/tick/wave/damage/1
+#
+#
+#
+# @within function asset:object/1151.dolphin_dive/tick/wave/1
+
+#> Private
+# @private
+    #declare score_holder $UserID
+
+# 円柱Libを用いて判定する
+    data modify storage lib: Argument.BoundingCylinder.Radius set value 2d
+    data modify storage lib: Argument.BoundingCylinder.Height set value 4d
+    data modify storage lib: Argument.BoundingCylinder.Selector set value "@e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..7]"
+    execute positioned ~ ~-1 ~ run function lib:bounding_cylinder/
+
+# ダメージ設定
+    data modify storage api: Argument.Damage set from storage asset:context this.Damage
+    data modify storage api: Argument.AttackType set value "Physical"
+    data modify storage api: Argument.ElementType set value "Water"
+    execute store result score $UserID Temporary run data get storage asset:context this.UserID
+    execute as @a if score @s UserID = $UserID Temporary run function api:damage/modifier
+
+# Motion設定
+    data modify storage lib: Argument.VectorMagnitude set value 3.5f
+    data modify storage lib: Argument.KnockbackResist set value 1b
+
+# 多重ヒット防止判定をしてダメージとMotion
+    execute as @e[type=#lib:living_without_player,tag=Enemy,tag=BoundingCylinder,tag=!Uninterferable,distance=..7] run function asset:object/1151.dolphin_dive/tick/wave/damage/check_duplicate
+
+# DamageAPI リセット
+    function api:damage/reset
+
+# その他リセット
+    scoreboard players reset $UserID Temporary
+    tag @e[type=#lib:living_without_player,tag=BoundingCylinder,distance=..7] remove BoundingCylinder
diff --git a/Asset/data/asset/functions/object/1151.dolphin_dive/tick/wave/damage/2.mcfunction b/Asset/data/asset/functions/object/1151.dolphin_dive/tick/wave/damage/2.mcfunction
new file mode 100644
index 00000000000..6781d4560f7
--- /dev/null
+++ b/Asset/data/asset/functions/object/1151.dolphin_dive/tick/wave/damage/2.mcfunction
@@ -0,0 +1,36 @@
+#> asset:object/1151.dolphin_dive/tick/wave/damage/2
+#
+#
+#
+# @within function asset:object/1151.dolphin_dive/tick/wave/2
+
+#> Private
+# @private
+    #declare score_holder $UserID
+
+# 円柱Libを用いて判定する
+    data modify storage lib: Argument.BoundingCylinder.Radius set value 4d
+    data modify storage lib: Argument.BoundingCylinder.Height set value 4d
+    data modify storage lib: Argument.BoundingCylinder.Selector set value "@e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..7]"
+    execute positioned ~ ~-1 ~ run function lib:bounding_cylinder/
+
+# ダメージ設定
+    data modify storage api: Argument.Damage set from storage asset:context this.Damage
+    data modify storage api: Argument.AttackType set value "Physical"
+    data modify storage api: Argument.ElementType set value "Water"
+    execute store result score $UserID Temporary run data get storage asset:context this.UserID
+    execute as @a if score @s UserID = $UserID Temporary run function api:damage/modifier
+
+# Motion設定
+    data modify storage lib: Argument.VectorMagnitude set value 3.0f
+    data modify storage lib: Argument.KnockbackResist set value 1b
+
+# 多重ヒット防止判定をしてダメージとMotion
+    execute as @e[type=#lib:living_without_player,tag=Enemy,tag=BoundingCylinder,tag=!Uninterferable,distance=..7] run function asset:object/1151.dolphin_dive/tick/wave/damage/check_duplicate
+
+# DamageAPI リセット
+    function api:damage/reset
+
+# リセット
+    scoreboard players reset $UserID Temporary
+    tag @e[type=#lib:living_without_player,tag=BoundingCylinder,distance=..7] remove BoundingCylinder
diff --git a/Asset/data/asset/functions/object/1151.dolphin_dive/tick/wave/damage/3.mcfunction b/Asset/data/asset/functions/object/1151.dolphin_dive/tick/wave/damage/3.mcfunction
new file mode 100644
index 00000000000..fa635a8080e
--- /dev/null
+++ b/Asset/data/asset/functions/object/1151.dolphin_dive/tick/wave/damage/3.mcfunction
@@ -0,0 +1,36 @@
+#> asset:object/1151.dolphin_dive/tick/wave/damage/3
+#
+#
+#
+# @within function asset:object/1151.dolphin_dive/tick/wave/3
+
+#> Private
+# @private
+    #declare score_holder $UserID
+
+# 円柱Libを用いて判定する
+    data modify storage lib: Argument.BoundingCylinder.Radius set value 6d
+    data modify storage lib: Argument.BoundingCylinder.Height set value 4d
+    data modify storage lib: Argument.BoundingCylinder.Selector set value "@e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..7]"
+    execute positioned ~ ~-1 ~ run function lib:bounding_cylinder/
+
+# ダメージ設定
+    data modify storage api: Argument.Damage set from storage asset:context this.Damage
+    data modify storage api: Argument.AttackType set value "Physical"
+    data modify storage api: Argument.ElementType set value "Water"
+    execute store result score $UserID Temporary run data get storage asset:context this.UserID
+    execute as @a if score @s UserID = $UserID Temporary run function api:damage/modifier
+
+# Motion設定
+    data modify storage lib: Argument.VectorMagnitude set value 2.5f
+    data modify storage lib: Argument.KnockbackResist set value 1b
+
+# 多重ヒット防止判定をしてダメージとMotion
+    execute as @e[type=#lib:living_without_player,tag=Enemy,tag=BoundingCylinder,tag=!Uninterferable,distance=..7] run function asset:object/1151.dolphin_dive/tick/wave/damage/check_duplicate
+
+# DamageAPI リセット
+    function api:damage/reset
+
+# リセット
+    scoreboard players reset $UserID Temporary
+    tag @e[type=#lib:living_without_player,tag=BoundingCylinder,distance=..7] remove BoundingCylinder
diff --git a/Asset/data/asset/functions/object/1151.dolphin_dive/tick/wave/damage/check_duplicate.mcfunction b/Asset/data/asset/functions/object/1151.dolphin_dive/tick/wave/damage/check_duplicate.mcfunction
new file mode 100644
index 00000000000..eb8772cd03c
--- /dev/null
+++ b/Asset/data/asset/functions/object/1151.dolphin_dive/tick/wave/damage/check_duplicate.mcfunction
@@ -0,0 +1,15 @@
+#> asset:object/1151.dolphin_dive/tick/wave/damage/check_duplicate
+#
+#
+#
+# @within function asset:object/1151.dolphin_dive/tick/wave/damage/*
+
+# 既にヒットしていなければダメージとモーション
+   function asset:object/call.m {method:"check_duplicate"}
+   execute unless predicate asset:object/0002.duplicate_hit_protection_mixin/is_first_hit run return fail
+
+# ダメージ
+    function api:damage/
+
+# モーション
+    execute if entity @s[tag=!Immovable] facing entity @s feet rotated ~ -30 run function lib:motion/
diff --git a/Asset/data/asset/functions/object/1151.dolphin_dive/tick/wave/summon.mcfunction b/Asset/data/asset/functions/object/1151.dolphin_dive/tick/wave/summon.mcfunction
new file mode 100644
index 00000000000..014a7c5ba34
--- /dev/null
+++ b/Asset/data/asset/functions/object/1151.dolphin_dive/tick/wave/summon.mcfunction
@@ -0,0 +1,9 @@
+#> asset:object/1151.dolphin_dive/tick/wave/summon
+#
+#
+#
+# @within function asset:object/1151.dolphin_dive/tick/wave/*
+
+# 召喚
+    data modify storage api: Argument.ID set value 2256
+    function api:object/summon
diff --git a/Asset/data/asset/functions/object/alias/1151/register.mcfunction b/Asset/data/asset/functions/object/alias/1151/register.mcfunction
new file mode 100644
index 00000000000..92992958b79
--- /dev/null
+++ b/Asset/data/asset/functions/object/alias/1151/register.mcfunction
@@ -0,0 +1,8 @@
+#> asset:object/alias/1151/register
+#
+# Objectのデータ指定処理のエイリアス
+#
+# @within asset_manager:object/summon/register.m
+
+# 元の登録処理を呼び出す
+    function asset:object/1151.dolphin_dive/register
diff --git a/Asset/data/asset/functions/object/alias/1151/summon.mcfunction b/Asset/data/asset/functions/object/alias/1151/summon.mcfunction
new file mode 100644
index 00000000000..22cd3653a75
--- /dev/null
+++ b/Asset/data/asset/functions/object/alias/1151/summon.mcfunction
@@ -0,0 +1,8 @@
+#> asset:object/alias/1151/summon
+#
+# Object召喚処理のエイリアス
+#
+# @within asset_manager:object/summon/summon.m
+
+# 元の召喚処理を呼び出す
+    function asset:object/1151.dolphin_dive/summon/
diff --git a/Asset/data/asset/functions/object/alias/1151/tick.mcfunction b/Asset/data/asset/functions/object/alias/1151/tick.mcfunction
new file mode 100644
index 00000000000..ec7218fba01
--- /dev/null
+++ b/Asset/data/asset/functions/object/alias/1151/tick.mcfunction
@@ -0,0 +1,8 @@
+#> asset:object/alias/1151/tick
+#
+# Tick時処理のエイリアス
+#
+# @within asset_manager:object/tick/tick.m
+
+# 元のTick処理を呼び出す
+    function asset:object/1151.dolphin_dive/tick/
diff --git a/Asset/data/asset/tags/functions/artifact/click.carrot_on_a_stick.json b/Asset/data/asset/tags/functions/artifact/click.carrot_on_a_stick.json
index 5864dbd3668..4e24925964e 100644
--- a/Asset/data/asset/tags/functions/artifact/click.carrot_on_a_stick.json
+++ b/Asset/data/asset/tags/functions/artifact/click.carrot_on_a_stick.json
@@ -1,5 +1,6 @@
 {
     "values": [
+        "asset:artifact/1315.dolphin_dive/trigger/1.trigger",
         "asset:artifact/0005.musket_matchlock/trigger/1.trigger",
         "asset:artifact/0017.harmful_books/trigger/1.trigger",
         "asset:artifact/0075.whirlpool_wand/trigger/1.trigger",
@@ -90,7 +91,6 @@
         "asset:artifact/1265.thunder_ray/trigger/1.trigger",
         "asset:artifact/1270.raging_passion_pickaxe/trigger/1.trigger",
         "asset:artifact/1272.big_water_launcher/trigger/1.trigger",
-
         "asset:artifact/0001.book_of_all-seeing/trigger/1.trigger",
         "asset:artifact/0002.blessing/trigger/1.trigger",
         "asset:artifact/0007.nitrogen_fixater/trigger/1.trigger",
@@ -175,8 +175,6 @@
         "asset:artifact/1284.quiver/trigger/1.trigger",
         "asset:artifact/1285.torch_bag/trigger/1.trigger",
         "asset:artifact/2001.staff_of_the_willless/trigger/1.trigger",
-
         "asset:artifact/0019.scripture/trigger/1.trigger"
-
     ]
-}
+}
\ No newline at end of file
diff --git a/Asset/data/asset/tags/functions/artifact/give.json b/Asset/data/asset/tags/functions/artifact/give.json
index f3eb0088574..91292a4c048 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/1315.dolphin_dive/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..6b3aff26e18 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/1315.dolphin_dive/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/effect/register.json b/Asset/data/asset/tags/functions/effect/register.json
index 2df8839cf1a..bf8d81b61db 100644
--- a/Asset/data/asset/tags/functions/effect/register.json
+++ b/Asset/data/asset/tags/functions/effect/register.json
@@ -1,5 +1,6 @@
 {
     "values": [
+        "asset:effect/0341.dolphin_dive/_/register",
         "asset:effect/0025.levitation/_/register",
         "asset:effect/0247.great_demon_armor/_/register",
         "asset:effect/0246.flame_devil_armor/_/register",
@@ -167,4 +168,4 @@
         "asset:effect/0007.defense_base_debuff/_/register",
         "asset:effect/0258.spirit_melody/_/register"
     ]
-}
+}
\ No newline at end of file
diff --git a/Asset/data/asset/tags/functions/effect/tick.json b/Asset/data/asset/tags/functions/effect/tick.json
index 8a5fbd5389e..48d9eba4703 100644
--- a/Asset/data/asset/tags/functions/effect/tick.json
+++ b/Asset/data/asset/tags/functions/effect/tick.json
@@ -1,5 +1,6 @@
 {
     "values": [
+        "asset:effect/0341.dolphin_dive/_/tick",
         "asset:effect/0025.levitation/_/tick",
         "asset:effect/0244.aurora_armor/_/tick",
         "asset:effect/0243.oblivious_snow/_/tick",

From 1ff469f8c3281feae2dd3896e7c8b31eca9ba886 Mon Sep 17 00:00:00 2001
From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com>
Date: Thu, 23 Oct 2025 04:51:07 +0900
Subject: [PATCH 2/8] =?UTF-8?q?=E3=82=A8=E3=83=A9=E3=83=BC=E5=9B=9E?=
 =?UTF-8?q?=E9=81=BF=E7=94=A8declare=E3=82=92=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../artifact/1315.dolphin_dive/trigger/3.main.mcfunction    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Asset/data/asset/functions/artifact/1315.dolphin_dive/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1315.dolphin_dive/trigger/3.main.mcfunction
index 26e9f0d9197..1978074f2bc 100644
--- a/Asset/data/asset/functions/artifact/1315.dolphin_dive/trigger/3.main.mcfunction
+++ b/Asset/data/asset/functions/artifact/1315.dolphin_dive/trigger/3.main.mcfunction
@@ -9,6 +9,12 @@
 
 # ここから先は神器側の効果の処理を書く
 
+# 一時的に定義してエラーを回避する
+#> Private
+# @private
+    #declare objective PlayerMotion.Api.Launch
+    #declare function lib:player_motion/launch_looking
+
 # 演出
     execute positioned ~ ~0.3 ~ rotated ~ 0 run function asset:artifact/1315.dolphin_dive/trigger/vfx
     playsound entity.dolphin.jump player @a ~ ~ ~ 0.8 1.1

From ba4d7e1e03b2b85fb6296b0872ad0b8d8cb87f8d Mon Sep 17 00:00:00 2001
From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com>
Date: Thu, 23 Oct 2025 05:34:06 +0900
Subject: [PATCH 3/8] =?UTF-8?q?=E6=B0=B4=E9=9D=A2=E3=81=A7=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E5=8F=AF=E8=83=BD/=E7=99=BA=E5=8B=95=E3=81=99?=
 =?UTF-8?q?=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../artifact/1315.dolphin_dive/give/2.give.mcfunction    | 2 +-
 .../trigger/2.check_condition.mcfunction                 | 5 ++---
 .../trigger/predicate/on_ground.mcfunction               | 9 +++++++++
 .../trigger/predicate/water_surface.mcfunction           | 8 ++++++++
 .../functions/effect/0341.dolphin_dive/tick/.mcfunction  | 5 ++++-
 5 files changed, 24 insertions(+), 5 deletions(-)
 create mode 100644 Asset/data/asset/functions/artifact/1315.dolphin_dive/trigger/predicate/on_ground.mcfunction
 create mode 100644 Asset/data/asset/functions/artifact/1315.dolphin_dive/trigger/predicate/water_surface.mcfunction

diff --git a/Asset/data/asset/functions/artifact/1315.dolphin_dive/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1315.dolphin_dive/give/2.give.mcfunction
index 449dcbe6bbd..fcb6240a3ca 100644
--- a/Asset/data/asset/functions/artifact/1315.dolphin_dive/give/2.give.mcfunction
+++ b/Asset/data/asset/functions/artifact/1315.dolphin_dive/give/2.give.mcfunction
@@ -27,7 +27,7 @@
 # 神器のトリガー (string) Wikiを参照
     data modify storage asset:artifact Trigger set value "onClick"
 # 神器の発動条件 (TextComponentString) (オプション)
-    data modify storage asset:artifact Condition set value '{"text":"地面に立っている","color":"white"}'
+    data modify storage asset:artifact Condition set value '{"text":"地面に立っているか、水面にいる","color":"white"}'
 # 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション)
     data modify storage asset:artifact AttackInfo.Damage set value [1000]
 # 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション)
diff --git a/Asset/data/asset/functions/artifact/1315.dolphin_dive/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1315.dolphin_dive/trigger/2.check_condition.mcfunction
index 236fb4c65e4..60ba85b11f5 100644
--- a/Asset/data/asset/functions/artifact/1315.dolphin_dive/trigger/2.check_condition.mcfunction
+++ b/Asset/data/asset/functions/artifact/1315.dolphin_dive/trigger/2.check_condition.mcfunction
@@ -8,9 +8,8 @@
     function asset:artifact/common/check_condition/mainhand
 # 他にアイテム等確認する場合はここに書く
 
-# 地面に足がついてなければ使用不可
-    execute if entity @s[tag=CanUsed] run function api:data_get/on_ground
-    execute if entity @s[tag=CanUsed] unless data storage api: {OnGround:true} run tag @s remove CanUsed
+# 地面に足をついている or 水面にいる(疑似的に判定)なら使用可能
+    execute if entity @s[tag=CanUsed] unless function asset:artifact/1315.dolphin_dive/trigger/predicate/on_ground unless function asset:artifact/1315.dolphin_dive/trigger/predicate/water_surface run tag @s remove CanUsed
 
 # CanUsedタグをチェックして3.main.mcfunctionを実行する
     execute if entity @s[tag=CanUsed] run function asset:artifact/1315.dolphin_dive/trigger/3.main
diff --git a/Asset/data/asset/functions/artifact/1315.dolphin_dive/trigger/predicate/on_ground.mcfunction b/Asset/data/asset/functions/artifact/1315.dolphin_dive/trigger/predicate/on_ground.mcfunction
new file mode 100644
index 00000000000..b31bde53ee3
--- /dev/null
+++ b/Asset/data/asset/functions/artifact/1315.dolphin_dive/trigger/predicate/on_ground.mcfunction
@@ -0,0 +1,9 @@
+#> asset:artifact/1315.dolphin_dive/trigger/predicate/on_ground
+#
+#
+#
+# @within function asset:artifact/1315.dolphin_dive/trigger/2.check_condition
+
+# OnGround:1bなら成功
+    function api:data_get/on_ground
+    execute if data storage api: {OnGround:true} run return 1
diff --git a/Asset/data/asset/functions/artifact/1315.dolphin_dive/trigger/predicate/water_surface.mcfunction b/Asset/data/asset/functions/artifact/1315.dolphin_dive/trigger/predicate/water_surface.mcfunction
new file mode 100644
index 00000000000..0dfd9d01497
--- /dev/null
+++ b/Asset/data/asset/functions/artifact/1315.dolphin_dive/trigger/predicate/water_surface.mcfunction
@@ -0,0 +1,8 @@
+#> asset:artifact/1315.dolphin_dive/trigger/predicate/water_surface
+#
+#
+#
+# @within function asset:artifact/1315.dolphin_dive/trigger/2.check_condition
+
+# 足元が水 かつ 顔が水中でないなら成功
+    execute if block ~ ~ ~ water anchored eyes unless block ^ ^ ^ water run return 1
diff --git a/Asset/data/asset/functions/effect/0341.dolphin_dive/tick/.mcfunction b/Asset/data/asset/functions/effect/0341.dolphin_dive/tick/.mcfunction
index e3569acc0ec..9722ce77622 100644
--- a/Asset/data/asset/functions/effect/0341.dolphin_dive/tick/.mcfunction
+++ b/Asset/data/asset/functions/effect/0341.dolphin_dive/tick/.mcfunction
@@ -16,4 +16,7 @@
     function api:data_get/on_ground
 
 # 着地
-    execute if data storage api: {OnGround:true} run function asset:effect/0341.dolphin_dive/tick/landing
+    execute if data storage api: {OnGround:1b} run function asset:effect/0341.dolphin_dive/tick/landing
+
+# OnGround:0bかつすぐ下が水なら水面とみなして発動
+    execute if data storage api: {OnGround:0b} if block ~ ~-1 ~ water align y run function asset:effect/0341.dolphin_dive/tick/landing

From 1ef6ae5aa19848082e4a154692e4d3fa48b32350 Mon Sep 17 00:00:00 2001
From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com>
Date: Thu, 23 Oct 2025 05:38:04 +0900
Subject: [PATCH 4/8] =?UTF-8?q?=E3=83=87=E3=82=A3=E3=83=AC=E3=82=A4?=
 =?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

---
 .../functions/effect/0341.dolphin_dive/register.mcfunction      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Asset/data/asset/functions/effect/0341.dolphin_dive/register.mcfunction b/Asset/data/asset/functions/effect/0341.dolphin_dive/register.mcfunction
index 403dbab4cb6..996b2895271 100644
--- a/Asset/data/asset/functions/effect/0341.dolphin_dive/register.mcfunction
+++ b/Asset/data/asset/functions/effect/0341.dolphin_dive/register.mcfunction
@@ -36,4 +36,4 @@
     # data modify storage asset:effect StackVisible set value
 
 # フィールド
-    data modify storage asset:effect Field.Delay set value 3
+    data modify storage asset:effect Field.Delay set value 6

From 7c39d9119b33c2b183b623d514259dfd0ec782c7 Mon Sep 17 00:00:00 2001
From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com>
Date: Thu, 23 Oct 2025 06:27:36 +0900
Subject: [PATCH 5/8] =?UTF-8?q?=E7=B8=A6=E5=88=A4=E5=AE=9A=E5=BC=B7?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../object/1151.dolphin_dive/tick/wave/damage/1.mcfunction      | 2 +-
 .../object/1151.dolphin_dive/tick/wave/damage/2.mcfunction      | 2 +-
 .../object/1151.dolphin_dive/tick/wave/damage/3.mcfunction      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Asset/data/asset/functions/object/1151.dolphin_dive/tick/wave/damage/1.mcfunction b/Asset/data/asset/functions/object/1151.dolphin_dive/tick/wave/damage/1.mcfunction
index 4d3ada5e38d..6e8575afaea 100644
--- a/Asset/data/asset/functions/object/1151.dolphin_dive/tick/wave/damage/1.mcfunction
+++ b/Asset/data/asset/functions/object/1151.dolphin_dive/tick/wave/damage/1.mcfunction
@@ -10,7 +10,7 @@
 
 # 円柱Libを用いて判定する
     data modify storage lib: Argument.BoundingCylinder.Radius set value 2d
-    data modify storage lib: Argument.BoundingCylinder.Height set value 4d
+    data modify storage lib: Argument.BoundingCylinder.Height set value 5d
     data modify storage lib: Argument.BoundingCylinder.Selector set value "@e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..7]"
     execute positioned ~ ~-1 ~ run function lib:bounding_cylinder/
 
diff --git a/Asset/data/asset/functions/object/1151.dolphin_dive/tick/wave/damage/2.mcfunction b/Asset/data/asset/functions/object/1151.dolphin_dive/tick/wave/damage/2.mcfunction
index 6781d4560f7..0c92ac9d797 100644
--- a/Asset/data/asset/functions/object/1151.dolphin_dive/tick/wave/damage/2.mcfunction
+++ b/Asset/data/asset/functions/object/1151.dolphin_dive/tick/wave/damage/2.mcfunction
@@ -10,7 +10,7 @@
 
 # 円柱Libを用いて判定する
     data modify storage lib: Argument.BoundingCylinder.Radius set value 4d
-    data modify storage lib: Argument.BoundingCylinder.Height set value 4d
+    data modify storage lib: Argument.BoundingCylinder.Height set value 5d
     data modify storage lib: Argument.BoundingCylinder.Selector set value "@e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..7]"
     execute positioned ~ ~-1 ~ run function lib:bounding_cylinder/
 
diff --git a/Asset/data/asset/functions/object/1151.dolphin_dive/tick/wave/damage/3.mcfunction b/Asset/data/asset/functions/object/1151.dolphin_dive/tick/wave/damage/3.mcfunction
index fa635a8080e..60d9dacaf1a 100644
--- a/Asset/data/asset/functions/object/1151.dolphin_dive/tick/wave/damage/3.mcfunction
+++ b/Asset/data/asset/functions/object/1151.dolphin_dive/tick/wave/damage/3.mcfunction
@@ -10,7 +10,7 @@
 
 # 円柱Libを用いて判定する
     data modify storage lib: Argument.BoundingCylinder.Radius set value 6d
-    data modify storage lib: Argument.BoundingCylinder.Height set value 4d
+    data modify storage lib: Argument.BoundingCylinder.Height set value 5d
     data modify storage lib: Argument.BoundingCylinder.Selector set value "@e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..7]"
     execute positioned ~ ~-1 ~ run function lib:bounding_cylinder/
 

From 8561e33f113428aa7e628a4bff741bdf085db60b Mon Sep 17 00:00:00 2001
From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com>
Date: Sat, 25 Oct 2025 03:08:46 +0900
Subject: [PATCH 6/8] =?UTF-8?q?=E6=BC=94=E5=87=BA=E3=82=92=E8=AA=BF?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../asset/functions/effect/0341.dolphin_dive/tick/.mcfunction   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Asset/data/asset/functions/effect/0341.dolphin_dive/tick/.mcfunction b/Asset/data/asset/functions/effect/0341.dolphin_dive/tick/.mcfunction
index 9722ce77622..b6496b952dd 100644
--- a/Asset/data/asset/functions/effect/0341.dolphin_dive/tick/.mcfunction
+++ b/Asset/data/asset/functions/effect/0341.dolphin_dive/tick/.mcfunction
@@ -6,7 +6,7 @@
 
 # 演出
     particle dolphin ~ ~1 ~ 0.4 0.3 0.4 0 5 normal @a
-    particle dust 0.4 1 1 1 ~ ~ ~ 0.3 0.4 0.3 0 2 normal @a
+    particle dust 0.4 1 1 1 ~ ~1 ~ 0.3 0.4 0.3 0 2 normal @a
 
 # 最初の数tickは着地検知を無効とする
     execute store result storage asset:context this.Delay int 0.9999999999 run data get storage asset:context this.Delay

From 74107c34630cba411783b2317ddcad2956b8497d Mon Sep 17 00:00:00 2001
From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com>
Date: Sun, 16 Nov 2025 18:29:18 +0900
Subject: [PATCH 7/8] =?UTF-8?q?=E8=AB=B8=E3=80=85=E8=AA=BF=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../effect/0341.dolphin_dive/tick/.mcfunction |  2 +-
 .../0341.dolphin_dive/tick/landing.mcfunction | 12 ++++++++++
 .../object/1151.dolphin_dive/tick/.mcfunction |  6 ++---
 .../1151.dolphin_dive/tick/wave/1.mcfunction  |  8 +++----
 .../1151.dolphin_dive/tick/wave/2.mcfunction  | 16 ++++++-------
 .../1151.dolphin_dive/tick/wave/3.mcfunction  | 24 +++++++++----------
 .../tick/wave/summon.mcfunction               |  9 -------
 .../tick/wave/summon/.mcfunction              |  9 +++++++
 .../tick/wave/summon/max_start.mcfunction     |  9 +++++++
 9 files changed, 58 insertions(+), 37 deletions(-)
 delete mode 100644 Asset/data/asset/functions/object/1151.dolphin_dive/tick/wave/summon.mcfunction
 create mode 100644 Asset/data/asset/functions/object/1151.dolphin_dive/tick/wave/summon/.mcfunction
 create mode 100644 Asset/data/asset/functions/object/1151.dolphin_dive/tick/wave/summon/max_start.mcfunction

diff --git a/Asset/data/asset/functions/effect/0341.dolphin_dive/tick/.mcfunction b/Asset/data/asset/functions/effect/0341.dolphin_dive/tick/.mcfunction
index b6496b952dd..17082e755c3 100644
--- a/Asset/data/asset/functions/effect/0341.dolphin_dive/tick/.mcfunction
+++ b/Asset/data/asset/functions/effect/0341.dolphin_dive/tick/.mcfunction
@@ -19,4 +19,4 @@
     execute if data storage api: {OnGround:1b} run function asset:effect/0341.dolphin_dive/tick/landing
 
 # OnGround:0bかつすぐ下が水なら水面とみなして発動
-    execute if data storage api: {OnGround:0b} if block ~ ~-1 ~ water align y run function asset:effect/0341.dolphin_dive/tick/landing
+    execute if data storage api: {OnGround:0b} if block ~ ~-0.5 ~ water align y run function asset:effect/0341.dolphin_dive/tick/landing
diff --git a/Asset/data/asset/functions/effect/0341.dolphin_dive/tick/landing.mcfunction b/Asset/data/asset/functions/effect/0341.dolphin_dive/tick/landing.mcfunction
index 666b2a35689..7c9de94abc0 100644
--- a/Asset/data/asset/functions/effect/0341.dolphin_dive/tick/landing.mcfunction
+++ b/Asset/data/asset/functions/effect/0341.dolphin_dive/tick/landing.mcfunction
@@ -4,9 +4,21 @@
 #
 # @within function asset:effect/0341.dolphin_dive/tick/
 
+# 一時的に定義してエラーを回避する
+#> Private
+# @private
+    #declare objective PlayerMotion.Api.Launch
+    #declare function lib:player_motion/launch_looking
+
 # Durationを0にしてエフェクト解除
     data modify storage asset:context Duration set value 0
 
+    tp @s @s
+
+# PlayerMotion
+    scoreboard players set $strength PlayerMotion.Api.Launch 7000
+    execute rotated ~ -65 run function lib:player_motion/launch_looking
+
 # Object召喚
     data modify storage api: Argument.ID set value 1151
     data modify storage api: Argument.FieldOverride.Damage set from storage asset:context this.Damage
diff --git a/Asset/data/asset/functions/object/1151.dolphin_dive/tick/.mcfunction b/Asset/data/asset/functions/object/1151.dolphin_dive/tick/.mcfunction
index 3da29a36e98..d2a1c74348f 100644
--- a/Asset/data/asset/functions/object/1151.dolphin_dive/tick/.mcfunction
+++ b/Asset/data/asset/functions/object/1151.dolphin_dive/tick/.mcfunction
@@ -9,8 +9,8 @@
 
 # 波
     execute if score @s General.Object.Tick matches 1 run function asset:object/1151.dolphin_dive/tick/wave/1
-    execute if score @s General.Object.Tick matches 6 run function asset:object/1151.dolphin_dive/tick/wave/2
-    execute if score @s General.Object.Tick matches 11 run function asset:object/1151.dolphin_dive/tick/wave/3
+    execute if score @s General.Object.Tick matches 4 run function asset:object/1151.dolphin_dive/tick/wave/2
+    execute if score @s General.Object.Tick matches 9 run function asset:object/1151.dolphin_dive/tick/wave/3
 
 # 消滅処理
-    kill @s[scores={General.Object.Tick=11..}]
+    kill @s[scores={General.Object.Tick=9..}]
diff --git a/Asset/data/asset/functions/object/1151.dolphin_dive/tick/wave/1.mcfunction b/Asset/data/asset/functions/object/1151.dolphin_dive/tick/wave/1.mcfunction
index b76cf14dfda..f153d3be4c8 100644
--- a/Asset/data/asset/functions/object/1151.dolphin_dive/tick/wave/1.mcfunction
+++ b/Asset/data/asset/functions/object/1151.dolphin_dive/tick/wave/1.mcfunction
@@ -13,7 +13,7 @@
     playsound minecraft:entity.dolphin.splash player @a ~ ~ ~ 0.7 0.7
 
 # object
-    execute rotated ~000 ~ positioned ^ ^ ^1.5 run function asset:object/1151.dolphin_dive/tick/wave/summon
-    execute rotated ~090 ~ positioned ^ ^ ^1.5 run function asset:object/1151.dolphin_dive/tick/wave/summon
-    execute rotated ~180 ~ positioned ^ ^ ^1.5 run function asset:object/1151.dolphin_dive/tick/wave/summon
-    execute rotated ~270 ~ positioned ^ ^ ^1.5 run function asset:object/1151.dolphin_dive/tick/wave/summon
+    execute rotated ~000 ~ positioned ^ ^ ^1.5 run function asset:object/1151.dolphin_dive/tick/wave/summon/max_start
+    execute rotated ~090 ~ positioned ^ ^ ^1.5 run function asset:object/1151.dolphin_dive/tick/wave/summon/max_start
+    execute rotated ~180 ~ positioned ^ ^ ^1.5 run function asset:object/1151.dolphin_dive/tick/wave/summon/max_start
+    execute rotated ~270 ~ positioned ^ ^ ^1.5 run function asset:object/1151.dolphin_dive/tick/wave/summon/max_start
diff --git a/Asset/data/asset/functions/object/1151.dolphin_dive/tick/wave/2.mcfunction b/Asset/data/asset/functions/object/1151.dolphin_dive/tick/wave/2.mcfunction
index 277c88b4938..60f8232ed91 100644
--- a/Asset/data/asset/functions/object/1151.dolphin_dive/tick/wave/2.mcfunction
+++ b/Asset/data/asset/functions/object/1151.dolphin_dive/tick/wave/2.mcfunction
@@ -13,11 +13,11 @@
     playsound minecraft:entity.dolphin.splash player @a ~ ~ ~ 0.7 0.8
 
 # object
-    execute rotated ~000 ~ positioned ^ ^ ^3 run function asset:object/1151.dolphin_dive/tick/wave/summon
-    execute rotated ~045 ~ positioned ^ ^ ^3 run function asset:object/1151.dolphin_dive/tick/wave/summon
-    execute rotated ~090 ~ positioned ^ ^ ^3 run function asset:object/1151.dolphin_dive/tick/wave/summon
-    execute rotated ~135 ~ positioned ^ ^ ^3 run function asset:object/1151.dolphin_dive/tick/wave/summon
-    execute rotated ~180 ~ positioned ^ ^ ^3 run function asset:object/1151.dolphin_dive/tick/wave/summon
-    execute rotated ~225 ~ positioned ^ ^ ^3 run function asset:object/1151.dolphin_dive/tick/wave/summon
-    execute rotated ~270 ~ positioned ^ ^ ^3 run function asset:object/1151.dolphin_dive/tick/wave/summon
-    execute rotated ~315 ~ positioned ^ ^ ^3 run function asset:object/1151.dolphin_dive/tick/wave/summon
+    execute rotated ~000 ~ positioned ^ ^ ^3 run function asset:object/1151.dolphin_dive/tick/wave/summon/
+    execute rotated ~045 ~ positioned ^ ^ ^3 run function asset:object/1151.dolphin_dive/tick/wave/summon/
+    execute rotated ~090 ~ positioned ^ ^ ^3 run function asset:object/1151.dolphin_dive/tick/wave/summon/
+    execute rotated ~135 ~ positioned ^ ^ ^3 run function asset:object/1151.dolphin_dive/tick/wave/summon/
+    execute rotated ~180 ~ positioned ^ ^ ^3 run function asset:object/1151.dolphin_dive/tick/wave/summon/
+    execute rotated ~225 ~ positioned ^ ^ ^3 run function asset:object/1151.dolphin_dive/tick/wave/summon/
+    execute rotated ~270 ~ positioned ^ ^ ^3 run function asset:object/1151.dolphin_dive/tick/wave/summon/
+    execute rotated ~315 ~ positioned ^ ^ ^3 run function asset:object/1151.dolphin_dive/tick/wave/summon/
diff --git a/Asset/data/asset/functions/object/1151.dolphin_dive/tick/wave/3.mcfunction b/Asset/data/asset/functions/object/1151.dolphin_dive/tick/wave/3.mcfunction
index aa065adb191..13042830baf 100644
--- a/Asset/data/asset/functions/object/1151.dolphin_dive/tick/wave/3.mcfunction
+++ b/Asset/data/asset/functions/object/1151.dolphin_dive/tick/wave/3.mcfunction
@@ -13,15 +13,15 @@
     playsound minecraft:entity.dolphin.splash player @a ~ ~ ~ 0.7 0.9
 
 # object
-    execute rotated ~000 ~ positioned ^ ^ ^4.5 run function asset:object/1151.dolphin_dive/tick/wave/summon
-    execute rotated ~030 ~ positioned ^ ^ ^4.5 run function asset:object/1151.dolphin_dive/tick/wave/summon
-    execute rotated ~060 ~ positioned ^ ^ ^4.5 run function asset:object/1151.dolphin_dive/tick/wave/summon
-    execute rotated ~090 ~ positioned ^ ^ ^4.5 run function asset:object/1151.dolphin_dive/tick/wave/summon
-    execute rotated ~120 ~ positioned ^ ^ ^4.5 run function asset:object/1151.dolphin_dive/tick/wave/summon
-    execute rotated ~150 ~ positioned ^ ^ ^4.5 run function asset:object/1151.dolphin_dive/tick/wave/summon
-    execute rotated ~180 ~ positioned ^ ^ ^4.5 run function asset:object/1151.dolphin_dive/tick/wave/summon
-    execute rotated ~210 ~ positioned ^ ^ ^4.5 run function asset:object/1151.dolphin_dive/tick/wave/summon
-    execute rotated ~240 ~ positioned ^ ^ ^4.5 run function asset:object/1151.dolphin_dive/tick/wave/summon
-    execute rotated ~270 ~ positioned ^ ^ ^4.5 run function asset:object/1151.dolphin_dive/tick/wave/summon
-    execute rotated ~300 ~ positioned ^ ^ ^4.5 run function asset:object/1151.dolphin_dive/tick/wave/summon
-    execute rotated ~330 ~ positioned ^ ^ ^4.5 run function asset:object/1151.dolphin_dive/tick/wave/summon
+    execute rotated ~000 ~ positioned ^ ^ ^4.5 run function asset:object/1151.dolphin_dive/tick/wave/summon/
+    execute rotated ~030 ~ positioned ^ ^ ^4.5 run function asset:object/1151.dolphin_dive/tick/wave/summon/
+    execute rotated ~060 ~ positioned ^ ^ ^4.5 run function asset:object/1151.dolphin_dive/tick/wave/summon/
+    execute rotated ~090 ~ positioned ^ ^ ^4.5 run function asset:object/1151.dolphin_dive/tick/wave/summon/
+    execute rotated ~120 ~ positioned ^ ^ ^4.5 run function asset:object/1151.dolphin_dive/tick/wave/summon/
+    execute rotated ~150 ~ positioned ^ ^ ^4.5 run function asset:object/1151.dolphin_dive/tick/wave/summon/
+    execute rotated ~180 ~ positioned ^ ^ ^4.5 run function asset:object/1151.dolphin_dive/tick/wave/summon/
+    execute rotated ~210 ~ positioned ^ ^ ^4.5 run function asset:object/1151.dolphin_dive/tick/wave/summon/
+    execute rotated ~240 ~ positioned ^ ^ ^4.5 run function asset:object/1151.dolphin_dive/tick/wave/summon/
+    execute rotated ~270 ~ positioned ^ ^ ^4.5 run function asset:object/1151.dolphin_dive/tick/wave/summon/
+    execute rotated ~300 ~ positioned ^ ^ ^4.5 run function asset:object/1151.dolphin_dive/tick/wave/summon/
+    execute rotated ~330 ~ positioned ^ ^ ^4.5 run function asset:object/1151.dolphin_dive/tick/wave/summon/
diff --git a/Asset/data/asset/functions/object/1151.dolphin_dive/tick/wave/summon.mcfunction b/Asset/data/asset/functions/object/1151.dolphin_dive/tick/wave/summon.mcfunction
deleted file mode 100644
index 014a7c5ba34..00000000000
--- a/Asset/data/asset/functions/object/1151.dolphin_dive/tick/wave/summon.mcfunction
+++ /dev/null
@@ -1,9 +0,0 @@
-#> asset:object/1151.dolphin_dive/tick/wave/summon
-#
-#
-#
-# @within function asset:object/1151.dolphin_dive/tick/wave/*
-
-# 召喚
-    data modify storage api: Argument.ID set value 2256
-    function api:object/summon
diff --git a/Asset/data/asset/functions/object/1151.dolphin_dive/tick/wave/summon/.mcfunction b/Asset/data/asset/functions/object/1151.dolphin_dive/tick/wave/summon/.mcfunction
new file mode 100644
index 00000000000..7648cbceeed
--- /dev/null
+++ b/Asset/data/asset/functions/object/1151.dolphin_dive/tick/wave/summon/.mcfunction
@@ -0,0 +1,9 @@
+#> asset:object/1151.dolphin_dive/tick/wave/summon/
+#
+#
+#
+# @within function asset:object/1151.dolphin_dive/tick/wave/**
+
+# 召喚
+    data modify storage api: Argument.ID set value 2256
+    function api:object/summon
diff --git a/Asset/data/asset/functions/object/1151.dolphin_dive/tick/wave/summon/max_start.mcfunction b/Asset/data/asset/functions/object/1151.dolphin_dive/tick/wave/summon/max_start.mcfunction
new file mode 100644
index 00000000000..9dae4270bfd
--- /dev/null
+++ b/Asset/data/asset/functions/object/1151.dolphin_dive/tick/wave/summon/max_start.mcfunction
@@ -0,0 +1,9 @@
+#> asset:object/1151.dolphin_dive/tick/wave/summon/max_start
+#
+#
+#
+# @within function asset:object/1151.dolphin_dive/tick/wave/1
+
+# 最初から水柱がほぼ最大の状態で召喚
+    data modify storage api: Argument.FieldOverride.Frames set value [20572,20573,20574,20575,20576,20577]
+    function asset:object/1151.dolphin_dive/tick/wave/summon/

From 6ae45b43d118f88e5bb26e810f2793ee2e320d7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=AF=E3=81=84=E3=81=84=E3=82=8D?=
 <mrashen.2gou@gmail.com>
Date: Sat, 23 May 2026 15:41:35 +0900
Subject: [PATCH 8/8] =?UTF-8?q?:alien:=20ProjectTSB/TheSkyBlessing#2163=20?=
 =?UTF-8?q?=E3=81=AE=E5=A4=89=E6=9B=B4=E3=82=92=E9=81=A9=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../1315.dolphin_dive/trigger/3.main.mcfunction      | 12 +++---------
 .../effect/0341.dolphin_dive/tick/landing.mcfunction | 10 ++--------
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/Asset/data/asset/functions/artifact/1315.dolphin_dive/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1315.dolphin_dive/trigger/3.main.mcfunction
index 1978074f2bc..9823b802ae5 100644
--- a/Asset/data/asset/functions/artifact/1315.dolphin_dive/trigger/3.main.mcfunction
+++ b/Asset/data/asset/functions/artifact/1315.dolphin_dive/trigger/3.main.mcfunction
@@ -9,12 +9,6 @@
 
 # ここから先は神器側の効果の処理を書く
 
-# 一時的に定義してエラーを回避する
-#> Private
-# @private
-    #declare objective PlayerMotion.Api.Launch
-    #declare function lib:player_motion/launch_looking
-
 # 演出
     execute positioned ~ ~0.3 ~ rotated ~ 0 run function asset:artifact/1315.dolphin_dive/trigger/vfx
     playsound entity.dolphin.jump player @a ~ ~ ~ 0.8 1.1
@@ -23,9 +17,9 @@
     playsound minecraft:entity.dolphin.splash player @a ~ ~ ~ 1 1
     execute if predicate lib:random_pass_per/50 run playsound minecraft:entity.dolphin.play player @a ~ ~ ~ 0.7 1
 
-# PlayerMotion
-    scoreboard players set $strength PlayerMotion.Api.Launch 11000
-    execute rotated ~ -65 run function lib:player_motion/launch_looking
+# Motion
+    data modify storage lib: Argument.VectorMagnitude set value 1.1d
+    execute rotated ~ -65 run function lib:motion/looking
 
 # 攻撃用エフェクト付与
     data modify storage api: Argument.ID set value 341
diff --git a/Asset/data/asset/functions/effect/0341.dolphin_dive/tick/landing.mcfunction b/Asset/data/asset/functions/effect/0341.dolphin_dive/tick/landing.mcfunction
index 7c9de94abc0..3c44929b781 100644
--- a/Asset/data/asset/functions/effect/0341.dolphin_dive/tick/landing.mcfunction
+++ b/Asset/data/asset/functions/effect/0341.dolphin_dive/tick/landing.mcfunction
@@ -4,20 +4,14 @@
 #
 # @within function asset:effect/0341.dolphin_dive/tick/
 
-# 一時的に定義してエラーを回避する
-#> Private
-# @private
-    #declare objective PlayerMotion.Api.Launch
-    #declare function lib:player_motion/launch_looking
-
 # Durationを0にしてエフェクト解除
     data modify storage asset:context Duration set value 0
 
     tp @s @s
 
 # PlayerMotion
-    scoreboard players set $strength PlayerMotion.Api.Launch 7000
-    execute rotated ~ -65 run function lib:player_motion/launch_looking
+    data modify storage lib: Argument.VectorMagnitude set value 0.7d
+    execute rotated ~ -65 run function lib:motion/looking
 
 # Object召喚
     data modify storage api: Argument.ID set value 1151