-
-
Notifications
You must be signed in to change notification settings - Fork 1
ワイルドフレアの変更と1.21.4移植 #976
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
yabane
wants to merge
12
commits into
releases/1-21-4
Choose a base branch
from
feature/GH-972-hunter-wild_flare
base: releases/1-21-4
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
ワイルドフレアの変更と1.21.4移植 #976
Changes from 10 commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
22d9df4
GH-972 Add ワイルドフレア呼び出し
yabane 84a2455
GH-972 Add ワイルドフレア演出
yabane 7f4f7ee
GH-972 Add ワイルドフレア実行(暫定)
yabane 926f690
GH-972 Add ワイルドフレア呼び出し2
yabane d036e29
GH-972 Add ワイルドフレア用スコア
yabane 5d0a2bb
GH-972 Modify コメントアウトを変更
yabane b1da61c
GH-972 Modify ダメージにインターバルを追加
yabane 828936f
NO-ISSUE デバッグ用の変更を復元
yabane c0f5c6c
GH-972 Add デバフ付与
yabane 4d82615
Merge branch 'releases/1-21-4' into feature/GH-972-hunter-wild_flare
NePonpon 4a31eb5
GH-972 Remove 不要になったダメージ取得の削除
yabane 6697c3f
GH-972 Add 地面に着弾時の失敗処理と演出を追加
yabane File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 4 additions & 0 deletions
4
data/makeup/function/skill/act/hunter/wild_flare/act0.mcfunction
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| #> makeup:skill/act/hunter/wild_flare/act0 | ||
| # | ||
| # ワイルドフレア発動演出 | ||
| playsound minecraft:entity.blaze.shoot player @a[distance=..16] ~ ~ ~ 1 1 |
5 changes: 5 additions & 0 deletions
5
data/makeup/function/skill/act/hunter/wild_flare/explode.mcfunction
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 |
4 changes: 4 additions & 0 deletions
4
data/makeup/function/skill/act/hunter/wild_flare/tick.mcfunction
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| #> 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 | ||
|
|
||
| # 矢にデータを保存 | ||
| 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 | ||
14 changes: 14 additions & 0 deletions
14
data/skill/function/act/hunter/wild_flare/apply.mcfunction
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| #> skill:act/hunter/wild_flare/apply | ||
| # | ||
| # ワイルドフレア ダメージ付与 | ||
| # | ||
| # @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] at @s run function skill:act/hunter/wild_flare/apply_enemy |
11 changes: 11 additions & 0 deletions
11
data/skill/function/act/hunter/wild_flare/apply_enemy.mcfunction
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| #> skill:act/hunter/wild_flare/apply_enemy | ||
| # | ||
| # ワイルドフレア ダメージ・インターバル付与 | ||
|
|
||
| # ダメージ・デバフを付与 | ||
| function skill:damage/apply/ | ||
| function effect:enemy_debuff/burn/apply | ||
|
|
||
| # インターバル付与 | ||
| tag @s add WildFlareInterval | ||
| scoreboard players set @s WildFlareInterval 20 |
28 changes: 28 additions & 0 deletions
28
data/skill/function/act/hunter/wild_flare/explode.mcfunction
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 |
15 changes: 15 additions & 0 deletions
15
data/skill/function/act/hunter/wild_flare/make_flare.mcfunction
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| #> skill:act/hunter/wild_flare/make_flare | ||
| # | ||
| # ワイルドフレア拡散準備 | ||
|
|
||
| # ループカウント設定 | ||
| scoreboard players set _ Count 30 | ||
|
|
||
| # 矢召喚 | ||
| 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 |
15 changes: 15 additions & 0 deletions
15
data/skill/function/act/hunter/wild_flare/make_flare_loop.mcfunction
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 |
10 changes: 10 additions & 0 deletions
10
data/skill/function/act/hunter/wild_flare/set_velocity.mcfunction
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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/ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| #> skill:act/hunter/wild_flare/tick | ||
| # | ||
| # ワイルドフレアダメージ&演出 | ||
|
|
||
| # ダメージ付与 | ||
| 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}] | ||
|
|
||
| function makeup:skill/act/hunter/wild_flare/tick |
8 changes: 8 additions & 0 deletions
8
data/skill/function/act/hunter/wild_flare/tick_enemy.mcfunction
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.