From 22d9df4c4f5b3110d214fb23b7888071777a5d9b Mon Sep 17 00:00:00 2001 From: yabane_27 Date: Tue, 18 Nov 2025 16:23:20 +0900 Subject: [PATCH 01/11] =?UTF-8?q?GH-972=20Add=20=E3=83=AF=E3=82=A4?= =?UTF-8?q?=E3=83=AB=E3=83=89=E3=83=95=E3=83=AC=E3=82=A2=E5=91=BC=E3=81=B3?= =?UTF-8?q?=E5=87=BA=E3=81=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/skill/function/native_tick.mcfunction | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data/skill/function/native_tick.mcfunction b/data/skill/function/native_tick.mcfunction index faa754634..a2a0a1c1c 100644 --- a/data/skill/function/native_tick.mcfunction +++ b/data/skill/function/native_tick.mcfunction @@ -28,6 +28,8 @@ execute if entity @s[tag=BlastSpark] run function makeup:skill/act/hunter/blast_ execute if entity @s[tag=KasapTrap] run function skill:act/hunter/kasap_trap/tick # ボミオストラップ execute if entity @s[tag=DecelerateTrap] run function skill:act/hunter/decelerate_trap/tick +# ワイルドフレア +execute if entity @s[tag=WildFlare] run function skill:act/hunter/wild_flare/tick ## 白魔導士 # ヘイローバウンド From 84a24556455b3a9d3d8b4f4d2d62a358a9527fc8 Mon Sep 17 00:00:00 2001 From: yabane_27 Date: Tue, 18 Nov 2025 16:23:43 +0900 Subject: [PATCH 02/11] =?UTF-8?q?GH-972=20Add=20=E3=83=AF=E3=82=A4?= =?UTF-8?q?=E3=83=AB=E3=83=89=E3=83=95=E3=83=AC=E3=82=A2=E6=BC=94=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../function/skill/act/hunter/wild_flare/act0.mcfunction | 4 ++++ .../function/skill/act/hunter/wild_flare/explode.mcfunction | 5 +++++ .../function/skill/act/hunter/wild_flare/tick.mcfunction | 4 ++++ 3 files changed, 13 insertions(+) create mode 100644 data/makeup/function/skill/act/hunter/wild_flare/act0.mcfunction create mode 100644 data/makeup/function/skill/act/hunter/wild_flare/explode.mcfunction create mode 100644 data/makeup/function/skill/act/hunter/wild_flare/tick.mcfunction diff --git a/data/makeup/function/skill/act/hunter/wild_flare/act0.mcfunction b/data/makeup/function/skill/act/hunter/wild_flare/act0.mcfunction new file mode 100644 index 000000000..0522af8d5 --- /dev/null +++ b/data/makeup/function/skill/act/hunter/wild_flare/act0.mcfunction @@ -0,0 +1,4 @@ +#> makeup:skill/act/hunter/wild_flare/act0 +# +# ワイルドフレア発動演出 +playsound minecraft:entity.blaze.shoot player @a[distance=..16] ~ ~ ~ 1 1 diff --git a/data/makeup/function/skill/act/hunter/wild_flare/explode.mcfunction b/data/makeup/function/skill/act/hunter/wild_flare/explode.mcfunction new file mode 100644 index 000000000..102c85c67 --- /dev/null +++ b/data/makeup/function/skill/act/hunter/wild_flare/explode.mcfunction @@ -0,0 +1,5 @@ +#> makeup:skill/act/hunter/wild_flare/explode +# +# ワイルドフレア爆発演出 +playsound minecraft:entity.generic.explode player @a[distance=..16] ~ ~ ~ 0.5 1 +particle minecraft:explosion ~ ~ ~ 0 0 0 0 0 force diff --git a/data/makeup/function/skill/act/hunter/wild_flare/tick.mcfunction b/data/makeup/function/skill/act/hunter/wild_flare/tick.mcfunction new file mode 100644 index 000000000..7cf8b8883 --- /dev/null +++ b/data/makeup/function/skill/act/hunter/wild_flare/tick.mcfunction @@ -0,0 +1,4 @@ +#> makeup:skill/act/hunter/wild_flare/tick +# +# ワイルドフレア毎tick演出 +particle minecraft:flame ~ ~ ~ 2 1 2 0.01 1 force @a[tag=ShowParticles] From 7f4f7eec6397b66e4383c89b9f63db6af8941069 Mon Sep 17 00:00:00 2001 From: yabane_27 Date: Tue, 18 Nov 2025 16:24:52 +0900 Subject: [PATCH 03/11] =?UTF-8?q?GH-972=20Add=20=E3=83=AF=E3=82=A4?= =?UTF-8?q?=E3=83=AB=E3=83=89=E3=83=95=E3=83=AC=E3=82=A2=E5=AE=9F=E8=A1=8C?= =?UTF-8?q?=EF=BC=88=E6=9A=AB=E5=AE=9A=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../act/hunter/wild_flare/act0.mcfunction | 17 +++++++++++ .../act/hunter/wild_flare/explode.mcfunction | 28 +++++++++++++++++++ .../hunter/wild_flare/make_flare.mcfunction | 15 ++++++++++ .../wild_flare/make_flare_loop.mcfunction | 15 ++++++++++ .../hunter/wild_flare/set_velocity.mcfunction | 10 +++++++ .../act/hunter/wild_flare/tick.mcfunction | 11 ++++++++ .../act/hunter/wild_flare/tick_mob.mcfunction | 14 ++++++++++ 7 files changed, 110 insertions(+) create mode 100644 data/skill/function/act/hunter/wild_flare/act0.mcfunction create mode 100644 data/skill/function/act/hunter/wild_flare/explode.mcfunction create mode 100644 data/skill/function/act/hunter/wild_flare/make_flare.mcfunction create mode 100644 data/skill/function/act/hunter/wild_flare/make_flare_loop.mcfunction create mode 100644 data/skill/function/act/hunter/wild_flare/set_velocity.mcfunction create mode 100644 data/skill/function/act/hunter/wild_flare/tick.mcfunction create mode 100644 data/skill/function/act/hunter/wild_flare/tick_mob.mcfunction diff --git a/data/skill/function/act/hunter/wild_flare/act0.mcfunction b/data/skill/function/act/hunter/wild_flare/act0.mcfunction new file mode 100644 index 000000000..8f0323524 --- /dev/null +++ b/data/skill/function/act/hunter/wild_flare/act0.mcfunction @@ -0,0 +1,17 @@ +#> skill:act/hunter/wild_flare/act0 +# +# ワイルドフレア発動 + +# 矢修正 +execute if score _ Level matches 1 run data modify storage skill: damage set from storage skill: Data.Hunter[{Name:"ワイルドフレア",Level:1}].Damage +execute if score _ Level matches 2 run data modify storage skill: damage set from storage skill: Data.Hunter[{Name:"ワイルドフレア",Level:2}].Damage +execute if score _ Level matches 3 run data modify storage skill: damage set from storage skill: Data.Hunter[{Name:"ワイルドフレア",Level:3}].Damage + +# ダメージ計算 +function skill:damage/add/skill/weapon + +# ダメージを保存 +execute as @e[distance=..5,type=#minecraft:arrows,tag=!Initialized,sort=nearest,limit=1] run data merge entity @s {PortalCooldown:2,Tags:[WildFlareSeed,CooldownRequired]} +scoreboard players operation @e[distance=..5,type=#minecraft:arrows,tag=!Initialized,sort=nearest,limit=1] Level = _ Level + +function makeup:skill/act/hunter/wild_flare/act0 diff --git a/data/skill/function/act/hunter/wild_flare/explode.mcfunction b/data/skill/function/act/hunter/wild_flare/explode.mcfunction new file mode 100644 index 000000000..d60a55301 --- /dev/null +++ b/data/skill/function/act/hunter/wild_flare/explode.mcfunction @@ -0,0 +1,28 @@ +#> skill:act/hunter/wild_flare/explode +# +# ワイルドフレア拡散準備 + +# 方角取得用マーカー召喚 +function calc:geometry/tp_00001 +# 方角取得用マーカー処理 +execute store result score _ Calc run data get entity @s Pos[0] 100 +execute store result score _ _ run data get entity @s Motion[0] 100 +execute store result entity 0-0-0-0-1 Pos[0] double 0.01 run scoreboard players operation _ Calc -= _ _ +execute store result score _ Calc run data get entity @s Pos[1] 100 +execute store result score _ _ run data get entity @s Motion[1] 100 +execute store result entity 0-0-0-0-1 Pos[1] double 0.01 run scoreboard players operation _ Calc -= _ _ +execute store result score _ Calc run data get entity @s Pos[2] 100 +execute store result score _ _ run data get entity @s Motion[2] 100 +execute store result entity 0-0-0-0-1 Pos[2] double 0.01 run scoreboard players operation _ Calc -= _ _ + +execute at 0-0-0-0-1 run tp 0-0-0-0-1 ~ ~ ~ facing entity @s + +# ワイルドフレア生成 +function skill:damage/load +scoreboard players operation _ Level = @s Level +data modify storage skill: Skill.Owner set from entity @s Owner +execute as 0-0-0-0-1 at @s positioned ^ ^ ^2 run function skill:act/hunter/wild_flare/make_flare +data remove storage skill: Skill.Owner + +# 演出 +function makeup:skill/act/hunter/wild_flare/explode diff --git a/data/skill/function/act/hunter/wild_flare/make_flare.mcfunction b/data/skill/function/act/hunter/wild_flare/make_flare.mcfunction new file mode 100644 index 000000000..43e09e002 --- /dev/null +++ b/data/skill/function/act/hunter/wild_flare/make_flare.mcfunction @@ -0,0 +1,15 @@ +#> skill:act/hunter/wild_flare/make_flare +# +# ワイルドフレア拡散準備 + +# ループカウント設定 +scoreboard players set _ Count 1 + +# 矢召喚 +function skill:act/hunter/wild_flare/make_flare_loop + +# モーション設定 +execute as @e[distance=..1.1,tag=WildFlare] at @s run function skill:act/hunter/wild_flare/set_velocity + +# マーカー返却 +function calc:geometry/return_marker diff --git a/data/skill/function/act/hunter/wild_flare/make_flare_loop.mcfunction b/data/skill/function/act/hunter/wild_flare/make_flare_loop.mcfunction new file mode 100644 index 000000000..e18211e8f --- /dev/null +++ b/data/skill/function/act/hunter/wild_flare/make_flare_loop.mcfunction @@ -0,0 +1,15 @@ +#> skill:act/hunter/wild_flare/make_flare_loop +# +# ワイルドフレア拡散準備ループ + +# 向きをランダムに決める +function calc:set/random_rotation + +# 矢召喚 +execute rotated as @s run summon minecraft:arrow ^ ^ ^1 {Tags:[WildFlare,CooldownRequired,Skill,NativeTask,FlyingRequired],PortalCooldown:100,Fire:100s,damage:0.0d} + +# カウンタデクリメント +scoreboard players remove _ Count 1 + +# 条件ループ継続 +execute if score _ Count matches 1.. run function skill:act/hunter/wild_flare/make_flare_loop diff --git a/data/skill/function/act/hunter/wild_flare/set_velocity.mcfunction b/data/skill/function/act/hunter/wild_flare/set_velocity.mcfunction new file mode 100644 index 000000000..8f1efd6e5 --- /dev/null +++ b/data/skill/function/act/hunter/wild_flare/set_velocity.mcfunction @@ -0,0 +1,10 @@ +#> skill:act/hunter/wild_flare/set_velocity +# +# ワイルドフレアMotion付与 + +# ダメージをセーブ +function skill:damage/save + +data modify entity @s Owner set from storage skill: Skill.Owner +scoreboard players operation @s Level = _ Level +execute facing entity 0-0-0-0-1 feet positioned 0.0 0.0 0.0 positioned ^ ^ ^-1.2 run function calc:throw_projectile/ diff --git a/data/skill/function/act/hunter/wild_flare/tick.mcfunction b/data/skill/function/act/hunter/wild_flare/tick.mcfunction new file mode 100644 index 000000000..3b7f88618 --- /dev/null +++ b/data/skill/function/act/hunter/wild_flare/tick.mcfunction @@ -0,0 +1,11 @@ +#> skill:act/hunter/wild_flare/tick +# +# ワイルドフレアダメージ&演出 + +# ダメージ付与 +execute if entity @s[tag=FlyingRequired] if entity @e[distance=..3,tag=Enemy] run function skill:act/hunter/wild_flare/tick_mob + +# 水中削除 +kill @s[nbt={Fire:0s}] + +function makeup:skill/act/hunter/wild_flare/tick diff --git a/data/skill/function/act/hunter/wild_flare/tick_mob.mcfunction b/data/skill/function/act/hunter/wild_flare/tick_mob.mcfunction new file mode 100644 index 000000000..fb77348f7 --- /dev/null +++ b/data/skill/function/act/hunter/wild_flare/tick_mob.mcfunction @@ -0,0 +1,14 @@ +#> skill:act/hunter/wild_flare/tick_mob +# +# ワイルドフレア ダメージ付与 +# +# @within function skill:act/hunter/wild_flare/tick + +# スキルダメージをロード +execute if score @s Level matches 1 run data modify storage skill: damage set from storage skill: Data.Hunter[{Name:"ワイルドフレア",Level:1}].Damage +execute if score @s Level matches 2 run data modify storage skill: damage set from storage skill: Data.Hunter[{Name:"ワイルドフレア",Level:2}].Damage +execute if score @s Level matches 3 run data modify storage skill: damage set from storage skill: Data.Hunter[{Name:"ワイルドフレア",Level:3}].Damage + +# 対象となるモブにダメージを入れる +data modify storage skill: damage.hit set value 0b +execute positioned ~-1 ~-1 ~-1 as @e[dx=1,dy=1,dz=1,tag=Enemy] run function skill:damage/apply/ From 926f690e5d0e5bd74ab514ac9c84cc2627190e8d Mon Sep 17 00:00:00 2001 From: yabane_27 Date: Tue, 18 Nov 2025 17:31:50 +0900 Subject: [PATCH 04/11] =?UTF-8?q?GH-972=20Add=20=E3=83=AF=E3=82=A4?= =?UTF-8?q?=E3=83=AB=E3=83=89=E3=83=95=E3=83=AC=E3=82=A2=E5=91=BC=E3=81=B3?= =?UTF-8?q?=E5=87=BA=E3=81=972?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/enemy/function/tick.mcfunction | 3 +++ 1 file changed, 3 insertions(+) diff --git a/data/enemy/function/tick.mcfunction b/data/enemy/function/tick.mcfunction index e483e843d..abcb23a86 100644 --- a/data/enemy/function/tick.mcfunction +++ b/data/enemy/function/tick.mcfunction @@ -5,6 +5,9 @@ execute if score $Ticks Count matches 0 run function enemy:one_second ## 忍者 # 居縮 execute if entity @s[scores={Isukumi=1..}] run function skill:act/ninja/isukumi/tick +## 狩人 +# ワイルドフレア +execute if entity @s[tag=WildFlareInterval] run function skill:act/hunter/wild_flare/tick_enemy ### Mob自然ダメージ反映 execute if entity @s[nbt=!{AbsorptionAmount:2048f}] run function enemy:damage/natural From d036e291febd0aaafad2f57af6adbc11edc7403e Mon Sep 17 00:00:00 2001 From: yabane_27 Date: Tue, 18 Nov 2025 17:32:12 +0900 Subject: [PATCH 05/11] =?UTF-8?q?GH-972=20Add=20=E3=83=AF=E3=82=A4?= =?UTF-8?q?=E3=83=AB=E3=83=89=E3=83=95=E3=83=AC=E3=82=A2=E7=94=A8=E3=82=B9?= =?UTF-8?q?=E3=82=B3=E3=82=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/main/function/load_once.mcfunction | 1 + 1 file changed, 1 insertion(+) diff --git a/data/main/function/load_once.mcfunction b/data/main/function/load_once.mcfunction index fedd37d6c..a73403c5d 100644 --- a/data/main/function/load_once.mcfunction +++ b/data/main/function/load_once.mcfunction @@ -140,6 +140,7 @@ scoreboard objectives add BlastSpark dummy {"text":"ブラストスパーク継 scoreboard objectives add Kasap dummy {"text":"ルカナントラップ継続秒数"} scoreboard objectives add KasapRatio dummy {"text":"ルカナントラップダメージ倍率"} scoreboard objectives add Decelerate dummy {"text":"ボミオストラップ継続秒数"} +scoreboard objectives add WildFlareInterval dummy {"text":"ワイルドフレアダメージインターバル"} #白魔導士 scoreboard objectives add HaloBound dummy {"text":"ヘイローバウンド演出カウント"} #黒魔導士 From 5d0a2bbb7042a2846fbaf224f25310ea0c131b4b Mon Sep 17 00:00:00 2001 From: yabane_27 Date: Tue, 18 Nov 2025 17:33:35 +0900 Subject: [PATCH 06/11] =?UTF-8?q?GH-972=20Modify=20=E3=82=B3=E3=83=A1?= =?UTF-8?q?=E3=83=B3=E3=83=88=E3=82=A2=E3=82=A6=E3=83=88=E3=82=92=E5=A4=89?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/skill/function/act/hunter/wild_flare/act0.mcfunction | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/data/skill/function/act/hunter/wild_flare/act0.mcfunction b/data/skill/function/act/hunter/wild_flare/act0.mcfunction index 8f0323524..02b1a9e93 100644 --- a/data/skill/function/act/hunter/wild_flare/act0.mcfunction +++ b/data/skill/function/act/hunter/wild_flare/act0.mcfunction @@ -2,15 +2,12 @@ # # ワイルドフレア発動 -# 矢修正 +# ダメージ取得 execute if score _ Level matches 1 run data modify storage skill: damage set from storage skill: Data.Hunter[{Name:"ワイルドフレア",Level:1}].Damage execute if score _ Level matches 2 run data modify storage skill: damage set from storage skill: Data.Hunter[{Name:"ワイルドフレア",Level:2}].Damage execute if score _ Level matches 3 run data modify storage skill: damage set from storage skill: Data.Hunter[{Name:"ワイルドフレア",Level:3}].Damage -# ダメージ計算 -function skill:damage/add/skill/weapon - -# ダメージを保存 +# 矢にデータを保存 execute as @e[distance=..5,type=#minecraft:arrows,tag=!Initialized,sort=nearest,limit=1] run data merge entity @s {PortalCooldown:2,Tags:[WildFlareSeed,CooldownRequired]} scoreboard players operation @e[distance=..5,type=#minecraft:arrows,tag=!Initialized,sort=nearest,limit=1] Level = _ Level From b1da61cc5b7eadd7c43c3d6bbf169a31b1640ec9 Mon Sep 17 00:00:00 2001 From: yabane_27 Date: Tue, 18 Nov 2025 17:36:41 +0900 Subject: [PATCH 07/11] =?UTF-8?q?GH-972=20Modify=20=E3=83=80=E3=83=A1?= =?UTF-8?q?=E3=83=BC=E3=82=B8=E3=81=AB=E3=82=A4=E3=83=B3=E3=82=BF=E3=83=BC?= =?UTF-8?q?=E3=83=90=E3=83=AB=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{tick_mob.mcfunction => apply.mcfunction} | 6 +++--- .../act/hunter/wild_flare/apply_enemy.mcfunction | 10 ++++++++++ .../function/act/hunter/wild_flare/tick.mcfunction | 2 +- .../act/hunter/wild_flare/tick_enemy.mcfunction | 8 ++++++++ 4 files changed, 22 insertions(+), 4 deletions(-) rename data/skill/function/act/hunter/wild_flare/{tick_mob.mcfunction => apply.mcfunction} (83%) create mode 100644 data/skill/function/act/hunter/wild_flare/apply_enemy.mcfunction create mode 100644 data/skill/function/act/hunter/wild_flare/tick_enemy.mcfunction diff --git a/data/skill/function/act/hunter/wild_flare/tick_mob.mcfunction b/data/skill/function/act/hunter/wild_flare/apply.mcfunction similarity index 83% rename from data/skill/function/act/hunter/wild_flare/tick_mob.mcfunction rename to data/skill/function/act/hunter/wild_flare/apply.mcfunction index fb77348f7..a7e7555bd 100644 --- a/data/skill/function/act/hunter/wild_flare/tick_mob.mcfunction +++ b/data/skill/function/act/hunter/wild_flare/apply.mcfunction @@ -1,4 +1,4 @@ -#> skill:act/hunter/wild_flare/tick_mob +#> skill:act/hunter/wild_flare/apply # # ワイルドフレア ダメージ付与 # @@ -9,6 +9,6 @@ execute if score @s Level matches 1 run data modify storage skill: damage set fr execute if score @s Level matches 2 run data modify storage skill: damage set from storage skill: Data.Hunter[{Name:"ワイルドフレア",Level:2}].Damage execute if score @s Level matches 3 run data modify storage skill: damage set from storage skill: Data.Hunter[{Name:"ワイルドフレア",Level:3}].Damage -# 対象となるモブにダメージを入れる +# 対象となる敵側でダメージ処理を実行 data modify storage skill: damage.hit set value 0b -execute positioned ~-1 ~-1 ~-1 as @e[dx=1,dy=1,dz=1,tag=Enemy] run function skill:damage/apply/ +execute positioned ~-1 ~-1 ~-1 as @e[dx=1,dy=1,dz=1,tag=Enemy] run function skill:act/hunter/wild_flare/apply_enemy diff --git a/data/skill/function/act/hunter/wild_flare/apply_enemy.mcfunction b/data/skill/function/act/hunter/wild_flare/apply_enemy.mcfunction new file mode 100644 index 000000000..1f3eed4a9 --- /dev/null +++ b/data/skill/function/act/hunter/wild_flare/apply_enemy.mcfunction @@ -0,0 +1,10 @@ +#> skill:act/hunter/wild_flare/apply_enemy +# +# ワイルドフレア ダメージ・インターバル付与 + +# ダメージを付与 +function skill:damage/apply/ + +# インターバル付与 +tag @s add WildFlareInterval +scoreboard players set @s WildFlareInterval 20 diff --git a/data/skill/function/act/hunter/wild_flare/tick.mcfunction b/data/skill/function/act/hunter/wild_flare/tick.mcfunction index 3b7f88618..37d9c7808 100644 --- a/data/skill/function/act/hunter/wild_flare/tick.mcfunction +++ b/data/skill/function/act/hunter/wild_flare/tick.mcfunction @@ -3,7 +3,7 @@ # ワイルドフレアダメージ&演出 # ダメージ付与 -execute if entity @s[tag=FlyingRequired] if entity @e[distance=..3,tag=Enemy] run function skill:act/hunter/wild_flare/tick_mob +execute if entity @s[tag=FlyingRequired] if entity @e[distance=..3,tag=Enemy,tag=!WildFlareInterval] run function skill:act/hunter/wild_flare/apply # 水中削除 kill @s[nbt={Fire:0s}] diff --git a/data/skill/function/act/hunter/wild_flare/tick_enemy.mcfunction b/data/skill/function/act/hunter/wild_flare/tick_enemy.mcfunction new file mode 100644 index 000000000..6666cde67 --- /dev/null +++ b/data/skill/function/act/hunter/wild_flare/tick_enemy.mcfunction @@ -0,0 +1,8 @@ +#> skill:act/hunter/wild_flare/tick_enemy +# +# ワイルドフレアインターバル消費 + +scoreboard players remove @s WildFlareInterval 1 +execute if score @s WildFlareInterval matches 1.. run return fail +tag @s remove WildFlareInterval +scoreboard players reset @s WildFlareInterval From 828936f6a3c6ffb81bcfc8456422f8f5073fc086 Mon Sep 17 00:00:00 2001 From: yabane_27 Date: Tue, 18 Nov 2025 17:37:05 +0900 Subject: [PATCH 08/11] =?UTF-8?q?NO-ISSUE=20=E3=83=87=E3=83=90=E3=83=83?= =?UTF-8?q?=E3=82=B0=E7=94=A8=E3=81=AE=E5=A4=89=E6=9B=B4=E3=82=92=E5=BE=A9?= =?UTF-8?q?=E5=85=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/skill/function/act/hunter/wild_flare/make_flare.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/skill/function/act/hunter/wild_flare/make_flare.mcfunction b/data/skill/function/act/hunter/wild_flare/make_flare.mcfunction index 43e09e002..ab1b747be 100644 --- a/data/skill/function/act/hunter/wild_flare/make_flare.mcfunction +++ b/data/skill/function/act/hunter/wild_flare/make_flare.mcfunction @@ -3,7 +3,7 @@ # ワイルドフレア拡散準備 # ループカウント設定 -scoreboard players set _ Count 1 +scoreboard players set _ Count 30 # 矢召喚 function skill:act/hunter/wild_flare/make_flare_loop From c0f5c6cf3fac8f9e950ef87fcebfbbdf194ffc82 Mon Sep 17 00:00:00 2001 From: yabane_27 Date: Tue, 18 Nov 2025 17:45:12 +0900 Subject: [PATCH 09/11] =?UTF-8?q?GH-972=20Add=20=E3=83=87=E3=83=90?= =?UTF-8?q?=E3=83=95=E4=BB=98=E4=B8=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/skill/function/act/hunter/wild_flare/apply.mcfunction | 2 +- .../function/act/hunter/wild_flare/apply_enemy.mcfunction | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/data/skill/function/act/hunter/wild_flare/apply.mcfunction b/data/skill/function/act/hunter/wild_flare/apply.mcfunction index a7e7555bd..11bebb418 100644 --- a/data/skill/function/act/hunter/wild_flare/apply.mcfunction +++ b/data/skill/function/act/hunter/wild_flare/apply.mcfunction @@ -11,4 +11,4 @@ execute if score @s Level matches 3 run data modify storage skill: damage set fr # 対象となる敵側でダメージ処理を実行 data modify storage skill: damage.hit set value 0b -execute positioned ~-1 ~-1 ~-1 as @e[dx=1,dy=1,dz=1,tag=Enemy] run function skill:act/hunter/wild_flare/apply_enemy +execute positioned ~-1 ~-1 ~-1 as @e[dx=1,dy=1,dz=1,tag=Enemy] at @s run function skill:act/hunter/wild_flare/apply_enemy diff --git a/data/skill/function/act/hunter/wild_flare/apply_enemy.mcfunction b/data/skill/function/act/hunter/wild_flare/apply_enemy.mcfunction index 1f3eed4a9..90ea8f40a 100644 --- a/data/skill/function/act/hunter/wild_flare/apply_enemy.mcfunction +++ b/data/skill/function/act/hunter/wild_flare/apply_enemy.mcfunction @@ -2,8 +2,9 @@ # # ワイルドフレア ダメージ・インターバル付与 -# ダメージを付与 +# ダメージ・デバフを付与 function skill:damage/apply/ +function effect:enemy_debuff/burn/apply # インターバル付与 tag @s add WildFlareInterval From 4a31eb5ab76cf756fed13bcd181ac0fbcf701470 Mon Sep 17 00:00:00 2001 From: yabane_27 Date: Fri, 21 Nov 2025 20:14:12 +0900 Subject: [PATCH 10/11] =?UTF-8?q?GH-972=20Remove=20=E4=B8=8D=E8=A6=81?= =?UTF-8?q?=E3=81=AB=E3=81=AA=E3=81=A3=E3=81=9F=E3=83=80=E3=83=A1=E3=83=BC?= =?UTF-8?q?=E3=82=B8=E5=8F=96=E5=BE=97=E3=81=AE=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/skill/function/act/hunter/wild_flare/act0.mcfunction | 5 ----- 1 file changed, 5 deletions(-) diff --git a/data/skill/function/act/hunter/wild_flare/act0.mcfunction b/data/skill/function/act/hunter/wild_flare/act0.mcfunction index 02b1a9e93..a3db98c1d 100644 --- a/data/skill/function/act/hunter/wild_flare/act0.mcfunction +++ b/data/skill/function/act/hunter/wild_flare/act0.mcfunction @@ -2,11 +2,6 @@ # # ワイルドフレア発動 -# ダメージ取得 -execute if score _ Level matches 1 run data modify storage skill: damage set from storage skill: Data.Hunter[{Name:"ワイルドフレア",Level:1}].Damage -execute if score _ Level matches 2 run data modify storage skill: damage set from storage skill: Data.Hunter[{Name:"ワイルドフレア",Level:2}].Damage -execute if score _ Level matches 3 run data modify storage skill: damage set from storage skill: Data.Hunter[{Name:"ワイルドフレア",Level:3}].Damage - # 矢にデータを保存 execute as @e[distance=..5,type=#minecraft:arrows,tag=!Initialized,sort=nearest,limit=1] run data merge entity @s {PortalCooldown:2,Tags:[WildFlareSeed,CooldownRequired]} scoreboard players operation @e[distance=..5,type=#minecraft:arrows,tag=!Initialized,sort=nearest,limit=1] Level = _ Level From 6697c3fa395a9e6c9acc90880263b04fc13c7850 Mon Sep 17 00:00:00 2001 From: yabane_27 Date: Fri, 28 Nov 2025 16:23:08 +0900 Subject: [PATCH 11/11] =?UTF-8?q?GH-972=20Add=20=E5=9C=B0=E9=9D=A2?= =?UTF-8?q?=E3=81=AB=E7=9D=80=E5=BC=BE=E6=99=82=E3=81=AE=E5=A4=B1=E6=95=97?= =?UTF-8?q?=E5=87=A6=E7=90=86=E3=81=A8=E6=BC=94=E5=87=BA=E3=82=92=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/entity/function/cooldown.mcfunction | 5 +++-- .../function/skill/act/hunter/wild_flare/failed.mcfunction | 5 +++++ 2 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 data/makeup/function/skill/act/hunter/wild_flare/failed.mcfunction diff --git a/data/entity/function/cooldown.mcfunction b/data/entity/function/cooldown.mcfunction index e904710a2..4dbe0f02b 100644 --- a/data/entity/function/cooldown.mcfunction +++ b/data/entity/function/cooldown.mcfunction @@ -15,8 +15,9 @@ execute if entity @s[tag=DarkSwamp] run function skill:act/black_mage/dark_swamp ###ブラストスパーク炸裂 execute if entity @s[tag=BlastSpark] run function skill:act/hunter/blast_spark/explode -###ワイルドフレア拡散処理 -execute if entity @s[tag=WildFlareSeed] run function skill:act/hunter/wild_flare/explode +###ワイルドフレア拡散/失敗処理 +execute if entity @s[tag=WildFlareSeed,tag=Flying] run function skill:act/hunter/wild_flare/explode +execute if entity @s[tag=WildFlareSeed,tag=!Flying] run function makeup:skill/act/hunter/wild_flare/failed ### ヘイローバウンド終了 execute if entity @s[tag=HaloBound] run function skill:act/white_mage/halo_bound/act2 diff --git a/data/makeup/function/skill/act/hunter/wild_flare/failed.mcfunction b/data/makeup/function/skill/act/hunter/wild_flare/failed.mcfunction new file mode 100644 index 000000000..8e51d7034 --- /dev/null +++ b/data/makeup/function/skill/act/hunter/wild_flare/failed.mcfunction @@ -0,0 +1,5 @@ +#> makeup:skill/act/hunter/wild_flare/failed +# +# ワイルドフレア失敗演出 +playsound minecraft:block.fire.extinguish player @a[distance=..16] ~ ~ ~ 1 1 +particle minecraft:dust{color:[0,0,0],scale:1.5} ~ ~ ~ 0.4 0.4 0.4 1 10 force @a[tag=ShowParticles]