Repository: TUSB/TheUnusualSkyBlock
Pull request #823: 夜駆の1.21.1移植
Author: login: yabane
Labels: name: 機能開発
description: 機能追加をするもの(実装確定済みのみ)
name: 優先度: 通常
name: 1-21-1
description: MCver1.21.1で確認された問題
Created: 2025-05-16T02:30:44Z | Merged: 2025-05-26T03:25:19Z

<!-- markdownlint-disable MD041 -->

## チケット URL<!-- 必須 -->
<!-- GH-〇〇 チケット番号 -->
<!-- チケット番号がない場合は NO-ISSUE -->
GH-813
## 対応内容・対応背景・妥協点<!-- 必須 -->
<!-- 簡単な説明 -->
<!-- スクリーンショットを添付してください -->
夜駆を1.21.1に移植した。
## やったこと<!-- 必須 -->
<!-- このPR内でやったことを書く -->
master=>player,dustの調整
## やってないこと<!-- なかったらこの項目を削除してください -->
<!-- このPR内でやっていないことやTODO等の残タスクを書く -->
マクロ化 調整が終わったら検討したい

<!-- ここから下は削除しないでください -->
### チェックリスト [(ガイドライン)](https://github.com/orgs/TUSB/discussions/1)
  - [x] ガイドラインどおりですか? ([チェック表](https://github.com/orgs/TUSB/discussions/1#discussioncomment-12440295))
<!-- ここから上は削除しないでください -->
<!-- markdownlint-enable MD041 -->



Diff:
diff --git a/data/makeup/function/skill/act/ninja/yokake/level1_3.mcfunction b/data/makeup/function/skill/act/ninja/yokake/level1_3.mcfunction
new file mode 100644
index 000000000..969c3380e
--- /dev/null
+++ b/data/makeup/function/skill/act/ninja/yokake/level1_3.mcfunction
@@ -0,0 +1,7 @@
+#> makeup:skill/act/ninja/yokake/level1_3
+#
+# 夜駆演出 lv1~3
+playsound minecraft:entity.skeleton_horse.gallop_water player @a[distance=..16] ~ ~ ~ 1 
+playsound minecraft:entity.phantom.ambient player @a[distance=..16] ~ ~ ~ 1 0
+playsound minecraft:entity.phantom.ambient player @a[distance=..16] ~ ~ ~ 1 0.6
+particle minecraft:smoke ~ ~0.4 ~ 1 0.4 1 0 200 force
diff --git a/data/makeup/function/skill/act/ninja/yokake/level4_6.mcfunction b/data/makeup/function/skill/act/ninja/yokake/level4_6.mcfunction
new file mode 100644
index 000000000..edd419271
--- /dev/null
+++ b/data/makeup/function/skill/act/ninja/yokake/level4_6.mcfunction
@@ -0,0 +1,10 @@
+#> makeup:skill/act/ninja/yokake/level4_6
+#
+# 夜駆演出 lv4~6
+playsound minecraft:item.elytra.flying player @a[distance=..16] ~ ~ ~ 0.7 1.2
+playsound minecraft:entity.zombie_villager.converted player @a[distance=..16] ~ ~ ~ 0.7 2
+playsound minecraft:entity.skeleton_horse.gallop_water player @a[distance=..16] ~ ~ ~ 1 
+playsound minecraft:entity.phantom.ambient player @a[distance=..16] ~ ~ ~ 1 0
+playsound minecraft:entity.phantom.ambient player @a[distance=..16] ~ ~ ~ 1 0.6
+particle minecraft:large_smoke ~ ~0.4 ~ 1 0.4 1 0 100 force
+particle minecraft:dust{color:[0.0,0.6,2.0]} ~ ~0.4 ~ 1 0.4 1 1 30 force
diff --git a/data/makeup/function/skill/act/ninja/yokake/level7_8.mcfunction b/data/makeup/function/skill/act/ninja/yokake/level7_8.mcfunction
new file mode 100644
index 000000000..171460e6e
--- /dev/null
+++ b/data/makeup/function/skill/act/ninja/yokake/level7_8.mcfunction
@@ -0,0 +1,12 @@
+#> makeup:skill/act/ninja/yokake/level7_8
+#
+# 夜駆演出 lv7~8
+playsound minecraft:entity.wolf.howl player @a[distance=..16] ~ ~ ~ 0.3 1
+playsound minecraft:item.trident.thunder player @a[distance=..16] ~ ~ ~ 0.7 2
+playsound minecraft:item.elytra.flying player @a[distance=..16] ~ ~ ~ 0.7 1.2
+playsound minecraft:entity.zombie_villager.converted player @a[distance=..16] ~ ~ ~ 0.7 2
+playsound minecraft:entity.skeleton_horse.gallop_water player @a[distance=..16] ~ ~ ~ 1
+playsound minecraft:entity.phantom.ambient player @a[distance=..16] ~ ~ ~ 1 0
+playsound minecraft:entity.phantom.ambient player @a[distance=..16] ~ ~ ~ 1 0.6
+particle minecraft:large_smoke ~ ~0.4 ~ 2 0.4 2 0 300 force
+particle minecraft:dust{color:[-1000,-1000,-1000],scale:2} ~ ~0.4 ~ 2 0.4 2 1 50 force
diff --git a/data/skill/function/act/ninja/yokake/act0.mcfunction b/data/skill/function/act/ninja/yokake/act0.mcfunction
new file mode 100644
index 000000000..4e1f086f2
--- /dev/null
+++ b/data/skill/function/act/ninja/yokake/act0.mcfunction
@@ -0,0 +1,26 @@
+#> skill:act/ninja/yokake/act0
+#
+# 夜駆発動
+
+execute store result score _ _ run time query daytime
+
+#17:00-19:00=>2 19:00-20:30=>3 20:30-22:00=>4 22:00-23:30=>5 23:30-0:30=>6 0:30-2:00=>5 2:00-3:30=>4 3:30-5:00=>3 5:00-7:00=>2 7:00-17:00=>1
+execute if score _ _ matches 11000..13000 run scoreboard players set _ Calc 2
+execute if score _ _ matches 13000..14500 run scoreboard players set _ Calc 3
+execute if score _ _ matches 14500..16000 run scoreboard players set _ Calc 4
+execute if score _ _ matches 16000..17500 run scoreboard players set _ Calc 5
+execute if score _ _ matches 17500..18500 run scoreboard players set _ Calc 6
+execute if score _ _ matches 18500..20000 run scoreboard players set _ Calc 5
+execute if score _ _ matches 20000..21500 run scoreboard players set _ Calc 4
+execute if score _ _ matches 21500..23000 run scoreboard players set _ Calc 3
+execute if score _ _ matches 23000..24000 run scoreboard players set _ Calc 2
+execute if score _ _ matches 00000..01000 run scoreboard players set _ Calc 2
+execute if score _ _ matches 01000..11000 run scoreboard players set _ Calc 1
+execute if score _ Level matches 2 run scoreboard players add _ Calc 1
+execute if score _ Level matches 3 run scoreboard players add _ Calc 2
+function skill:act/ninja/yokake/fork
+
+# スニークしていれば範囲化
+execute unless score @s SneakTime matches 1.. run return fail
+scoreboard players remove _ Calc 1
+execute as @a[distance=0.1..15] at @s run function skill:act/ninja/yokake/fork
diff --git a/data/skill/function/act/ninja/yokake/fork.mcfunction b/data/skill/function/act/ninja/yokake/fork.mcfunction
new file mode 100644
index 000000000..ab072d877
--- /dev/null
+++ b/data/skill/function/act/ninja/yokake/fork.mcfunction
@@ -0,0 +1,12 @@
+#> skill:act/ninja/yokake/fork
+#
+# 夜駆分岐
+
+execute if score _ Calc matches 1 run function skill:act/ninja/yokake/level1
+execute if score _ Calc matches 2 run function skill:act/ninja/yokake/level2
+execute if score _ Calc matches 3 run function skill:act/ninja/yokake/level3
+execute if score _ Calc matches 4 run function skill:act/ninja/yokake/level4
+execute if score _ Calc matches 5 run function skill:act/ninja/yokake/level5
+execute if score _ Calc matches 6 run function skill:act/ninja/yokake/level6
+execute if score _ Calc matches 7 run function skill:act/ninja/yokake/level7
+execute if score _ Calc matches 8.. run function skill:act/ninja/yokake/level8
diff --git a/data/skill/function/act/ninja/yokake/level1.mcfunction b/data/skill/function/act/ninja/yokake/level1.mcfunction
new file mode 100644
index 000000000..fbd2629b1
--- /dev/null
+++ b/data/skill/function/act/ninja/yokake/level1.mcfunction
@@ -0,0 +1,8 @@
+#> skill:act/ninja/yokake/level1
+#
+# 夜駆レベル1
+
+effect give @s minecraft:night_vision 60 0
+
+#演出
+function makeup:skill/act/ninja/yokake/level1_3
diff --git a/data/skill/function/act/ninja/yokake/level2.mcfunction b/data/skill/function/act/ninja/yokake/level2.mcfunction
new file mode 100644
index 000000000..5e16d820c
--- /dev/null
+++ b/data/skill/function/act/ninja/yokake/level2.mcfunction
@@ -0,0 +1,8 @@
+#> skill:act/ninja/yokake/level2
+#
+# 夜駆レベル2
+
+effect give @s minecraft:night_vision 60 0
+
+#演出
+function makeup:skill/act/ninja/yokake/level1_3
diff --git a/data/skill/function/act/ninja/yokake/level3.mcfunction b/data/skill/function/act/ninja/yokake/level3.mcfunction
new file mode 100644
index 000000000..2ac12d77f
--- /dev/null
+++ b/data/skill/function/act/ninja/yokake/level3.mcfunction
@@ -0,0 +1,10 @@
+#> skill:act/ninja/yokake/level3
+#
+# 夜駆レベル3
+
+effect give @s minecraft:night_vision 60 0
+#effect give @s minecraft:absorption 60 3
+effect give @s minecraft:haste 60 1
+
+#演出
+function makeup:skill/act/ninja/yokake/level1_3
diff --git a/data/skill/function/act/ninja/yokake/level4.mcfunction b/data/skill/function/act/ninja/yokake/level4.mcfunction
new file mode 100644
index 000000000..e17bffac3
--- /dev/null
+++ b/data/skill/function/act/ninja/yokake/level4.mcfunction
@@ -0,0 +1,11 @@
+#> skill:act/ninja/yokake/level4
+#
+# 夜駆レベル4
+
+effect give @s minecraft:night_vision 60 0
+#effect give @s minecraft:absorption 60 5
+effect give @s minecraft:haste 60 2
+effect give @s minecraft:resistance 60 0
+
+#演出
+function makeup:skill/act/ninja/yokake/level4_6
diff --git a/data/skill/function/act/ninja/yokake/level5.mcfunction b/data/skill/function/act/ninja/yokake/level5.mcfunction
new file mode 100644
index 000000000..7cbf6094a
--- /dev/null
+++ b/data/skill/function/act/ninja/yokake/level5.mcfunction
@@ -0,0 +1,11 @@
+#> skill:act/ninja/yokake/level5
+#
+# 夜駆レベル5
+
+effect give @s minecraft:night_vision 60 0
+#effect give @s minecraft:absorption 60 7
+effect give @s minecraft:haste 60 3
+effect give @s minecraft:resistance 60 1
+
+#演出
+function makeup:skill/act/ninja/yokake/level4_6
diff --git a/data/skill/function/act/ninja/yokake/level6.mcfunction b/data/skill/function/act/ninja/yokake/level6.mcfunction
new file mode 100644
index 000000000..5c6c62bbe
--- /dev/null
+++ b/data/skill/function/act/ninja/yokake/level6.mcfunction
@@ -0,0 +1,11 @@
+#> skill:act/ninja/yokake/level6
+#
+# 夜駆レベル6
+
+effect give @s minecraft:night_vision 60 0
+#effect give @s minecraft:absorption 60 9
+effect give @s minecraft:haste 60 4
+effect give @s minecraft:resistance 60 2
+
+#演出
+function makeup:skill/act/ninja/yokake/level4_6
diff --git a/data/skill/function/act/ninja/yokake/level7.mcfunction b/data/skill/function/act/ninja/yokake/level7.mcfunction
new file mode 100644
index 000000000..85c9d6176
--- /dev/null
+++ b/data/skill/function/act/ninja/yokake/level7.mcfunction
@@ -0,0 +1,11 @@
+#> skill:act/ninja/yokake/level7
+#
+# 夜駆レベル7
+
+effect give @s minecraft:night_vision 60 0
+effect give @s minecraft:absorption 60 11
+effect give @s minecraft:haste 60 5
+effect give @s minecraft:resistance 60 3
+
+#演出
+function makeup:skill/act/ninja/yokake/level7_8
diff --git a/data/skill/function/act/ninja/yokake/level8.mcfunction b/data/skill/function/act/ninja/yokake/level8.mcfunction
new file mode 100644
index 000000000..b7c70849f
--- /dev/null
+++ b/data/skill/function/act/ninja/yokake/level8.mcfunction
@@ -0,0 +1,11 @@
+#> skill:act/ninja/yokake/level8
+#
+# 夜駆レベル8
+
+effect give @s minecraft:night_vision 60 0
+effect give @s minecraft:absorption 60 14
+effect give @s minecraft:haste 60 11
+effect give @s minecraft:resistance 60 4
+
+#演出
+function makeup:skill/act/ninja/yokake/level7_8


Reviews:
user: login: NePonpon
body: レベル1と2の内容が同じだからレベルをわける意味があるのかわからなくなっちゃった
差をつけるか統合するか。そのままでもいいと思うけどね
state: CHANGES_REQUESTED
author_association: MEMBER
submitted_at: 2025-05-21T03:46:16Z
user: login: NePonpon
state: COMMENTED
author_association: MEMBER
submitted_at: 2025-05-21T03:47:17Z
user: login: github-actions[bot]
body: LGTM 👍
state: COMMENTED
author_association: NONE
submitted_at: 2025-05-21T07:19:54Z
user: login: NePonpon
state: APPROVED
author_association: MEMBER
submitted_at: 2025-05-26T03:25:17Z

Review comments:
diff_hunk: @@ -0,0 +1,27 @@
+#> skill:act/ninja/yokake/act0
+#
+# 夜駆発動
+
+execute store result score _ _ run time query daytime
+
+#17:00-19:00=>2 19:00-20:30=>3 20:30-22:00=>4 22:00-23:30=>5 23:30-0:30=>6 0:30-2:00=>5 2:00-3:30=>4 3:30-5:00=>3 5:00-7:00=>2 7:00-17:00=>1
+execute if score _ _ matches 11000..13000 run scoreboard players set _ Calc 2
+execute if score _ _ matches 13000..14500 run scoreboard players set _ Calc 3
+execute if score _ _ matches 14500..16000 run scoreboard players set _ Calc 4
+execute if score _ _ matches 16000..17500 run scoreboard players set _ Calc 5
+execute if score _ _ matches 17500..18500 run scoreboard players set _ Calc 6
+execute if score _ _ matches 18500..20000 run scoreboard players set _ Calc 5
+execute if score _ _ matches 20000..21500 run scoreboard players set _ Calc 4
+execute if score _ _ matches 21500..23000 run scoreboard players set _ Calc 3
+execute if score _ _ matches 23000..24000 run scoreboard players set _ Calc 2
+execute if score _ _ matches 00000..01000 run scoreboard players set _ Calc 2
+execute if score _ _ matches 01000..11000 run scoreboard players set _ Calc 1
+execute if score _ Level matches 2 run scoreboard players add _ Calc 1
+execute if score _ Level matches 3 run scoreboard players add _ Calc 2
+tellraw @a [{"score":{"name":"_","objective":"Calc"}}]
path: data/skill/function/act/ninja/yokake/act0.mcfunction
user: login: NePonpon
body: デバッグコマンドあります
created_at: 2025-05-21T03:42:57Z
author_association: MEMBER
path: data/skill/function/act/ninja/yokake/fork.mcfunction
user: login: NePonpon
body: マクロに出来そうなものかと思ったけど、8以降が対応しずらそう
というコメント
created_at: 2025-05-21T03:43:55Z
author_association: MEMBER
path: data/skill/function/act/ninja/yokake/fork.mcfunction
user: login: NePonpon
body: 分岐前に mod 8 + 1で1~8に丸めるか？
created_at: 2025-05-21T03:47:17Z
author_association: MEMBER

PR comments:
user: login: mocope
created_at: 2025-05-16T06:19:50Z
body: GH-822 と紐付けられてないっぽい
author_association: NONE
user: login: yabane
created_at: 2025-05-21T07:22:06Z
body: 免疫システムの変更のため衝撃吸収をCOしました。
マクロ化など効果部分に関する変更はバランス調整が落ち着くまで待ちたい。
author_association: CONTRIBUTOR