⚖️ ブラストアイの強化&ハード対応 (#1323)

ProjectTSB · Jun 26, 2023 · ae75c62 · ae75c62
1 parent 37dfaf0
commit ae75c62
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 14 deletions.
diff --git a/Asset/data/asset/functions/mob/0139.blast_eye/tick/2.1.1.prepare.mcfunction b/Asset/data/asset/functions/mob/0139.blast_eye/tick/2.1.1.prepare.mcfunction
@@ -5,9 +5,12 @@
 # @within function asset:mob/0139.blast_eye/tick/2.1.active_tick
 
 # 着火し始めた瞬間の演出
-    execute if score @s 3v.Time matches 200 run playsound minecraft:entity.creeper.primed hostile @a ~ ~ ~ 1 0.5
-    execute if score @s 3v.Time matches 200 run particle flame ^ ^ ^ 0.2 0.2 0.2 0 5 normal
+    execute if score @s 3v.Time matches 160 run playsound minecraft:entity.creeper.primed hostile @a ~ ~ ~ 1 0.5
+    execute if score @s 3v.Time matches 160 run particle flame ^ ^ ^ 0.2 0.2 0.2 0 5 normal
 
 # 爆破準備中の演出
     particle large_smoke ^ ^0.5 ^ 0 0 0 0 1 normal
-    particle minecraft:dust_color_transition 1.0 0.75 0.0 1.0 0.0 0.0 0.0 ^ ^ ^0.25 0.1 0.1 0.1 1 2
+    particle minecraft:dust_color_transition 1.0 0.75 0.0 1.0 0.0 0.0 0.0 ^ ^ ^0.25 0.1 0.1 0.1 1 2
+
+# ハード以上の場合の処理
+    execute if predicate api:global_vars/difficulty/min/hard run function asset:mob/0139.blast_eye/tick/hard_effects
diff --git a/Asset/data/asset/functions/mob/0139.blast_eye/tick/2.1.2.boom.mcfunction b/Asset/data/asset/functions/mob/0139.blast_eye/tick/2.1.2.boom.mcfunction
@@ -9,9 +9,9 @@
     particle minecraft:explosion ~ ~ ~ 1 1 1 0 3
 
 # DamageAPI設定
-    data modify storage lib: Argument.Damage set value 12.0f
+    data modify storage lib: Argument.Damage set value 20.0f
     data modify storage lib: Argument.AttackType set value "Physical"
-    data modify storage lib: Argument.ElementType set value "None"
+    data modify storage lib: Argument.ElementType set value "Fire"
     data modify storage lib: Argument.DisableParticle set value true
 # 補正
     function lib:damage/modifier

diff --git a/Asset/data/asset/functions/mob/0139.blast_eye/tick/2.1.3.timeshift_particle.mcfunction b/Asset/data/asset/functions/mob/0139.blast_eye/tick/2.1.3.timeshift_particle.mcfunction
@@ -6,7 +6,7 @@
 
 # 演出
     particle minecraft:explosion ~ ~ ~ 1 1 1 0 3
-    execute if score @s 3v.Time matches 245.. run particle minecraft:poof ~ ~ ~ 0.8 0.8 0.8 0 6
+    execute if score @s 3v.Time matches 205.. run particle minecraft:poof ~ ~ ~ 0.8 0.8 0.8 0 6
 
 # mob固定
     tp @s @s
diff --git a/Asset/data/asset/functions/mob/0139.blast_eye/tick/2.1.active_tick.mcfunction b/Asset/data/asset/functions/mob/0139.blast_eye/tick/2.1.active_tick.mcfunction
@@ -8,16 +8,16 @@
     scoreboard players add @s 3v.Time 1
 
 # 一定確率で爆発後のクールダウン短縮
-execute if score @s 3v.Time matches 160..199 if predicate lib:random_pass_per/2 run scoreboard players set @s 3v.Time 200
+    execute if score @s 3v.Time matches 120..159 if predicate lib:random_pass_per/2 run scoreboard players set @s 3v.Time 160
 
 # 爆破予告
-    execute if score @s 3v.Time matches 200..240 anchored eyes run function asset:mob/0139.blast_eye/tick/2.1.1.prepare
+    execute if score @s 3v.Time matches 160..200 anchored eyes run function asset:mob/0139.blast_eye/tick/2.1.1.prepare
 
 # 爆破
-    execute if score @s 3v.Time matches 240 anchored eyes positioned ^ ^ ^2 run function asset:mob/0139.blast_eye/tick/2.1.2.boom
+    execute if score @s 3v.Time matches 200 anchored eyes positioned ^ ^ ^2 run function asset:mob/0139.blast_eye/tick/2.1.2.boom
 
 # 爆破後も数tickだけ爆発particleを出し続ける
-    execute if score @s 3v.Time matches 241..249 anchored eyes positioned ^ ^ ^2 run function asset:mob/0139.blast_eye/tick/2.1.3.timeshift_particle
+    execute if score @s 3v.Time matches 201..209 anchored eyes positioned ^ ^ ^2 run function asset:mob/0139.blast_eye/tick/2.1.3.timeshift_particle
 
 # タイマーリセット
-    execute if score @s 3v.Time matches 250 run scoreboard players set @s 3v.Time 0
+    execute if score @s 3v.Time matches 210 run scoreboard players set @s 3v.Time 0
diff --git a/Asset/data/asset/functions/mob/0139.blast_eye/tick/2.tick.mcfunction b/Asset/data/asset/functions/mob/0139.blast_eye/tick/2.tick.mcfunction
@@ -5,6 +5,4 @@
 # @within function asset:mob/0139.blast_eye/tick/1.trigger
 
 # Playerが近くに居た時のみ稼働
-    execute if entity @p[distance=..12] run function asset:mob/0139.blast_eye/tick/2.1.active_tick
-
-
+    execute if entity @p[distance=..25] run function asset:mob/0139.blast_eye/tick/2.1.active_tick
diff --git a/Asset/data/asset/functions/mob/0139.blast_eye/tick/hard_effects.mcfunction b/Asset/data/asset/functions/mob/0139.blast_eye/tick/hard_effects.mcfunction
@@ -0,0 +1,9 @@
+#> asset:mob/0139.blast_eye/tick/hard_effects
+#
+# ハード限定の処理
+#
+# @within function asset:mob/0139.blast_eye/tick/2.1.1.prepare
+
+# ハード以上なら移動速度上昇と耐性を得る
+    effect give @s speed 1 2 true
+    effect give @s resistance 1 7 true