-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- also convert indicator to marker entity
- Loading branch information
1 parent
3c62233
commit 55c2840
Showing
4 changed files
with
4 additions
and
8 deletions.
There are no files selected for viewing
3 changes: 1 addition & 2 deletions
3
...flowey/data/entity/functions/hostile/omega-flowey/attack/bomb/bullet/terminate.mcfunction
This file contains 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 |
|---|---|---|
| @@ -1,2 +1 @@ | ||
| ## Terminate bullet | ||
| function animated_java:bomb_bullet/remove/this | ||
| function animated_java:bomb/remove/this |
2 changes: 1 addition & 1 deletion
2
...tity/functions/hostile/omega-flowey/attack/bomb/executor/loop/indicator/summon.mcfunction
This file contains 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 |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| # Summon indicator | ||
| $execute positioned $(x) $(y) $(z) rotated $(yaw) $(pitch) run function animated_java:bomb/summon | ||
| $summon minecraft:marker $(x) $(y) $(z) { CustomName: '"Bomb Indicator"', Tags:["omega-flowey-remastered","groupable","hostile","omega-flowey","attack","attack-indicator","attack-indicator-new","bomb"]} | ||
|
|
||
| # Initialize indicator | ||
| execute as @e[tag=attack-indicator-new] at @s run function entity:hostile/omega-flowey/attack/bomb/indicator/initialize |
5 changes: 1 addition & 4 deletions
5
...entity/functions/hostile/omega-flowey/attack/bomb/indicator/loop/bullet/summon.mcfunction
This file contains 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 |
|---|---|---|
| @@ -1,8 +1,5 @@ | ||
| # Summon bullet | ||
| $execute positioned $(x) 35 $(z) run function animated_java:bomb_bullet/summon | ||
|
|
||
| # Copy yaw to bullet | ||
| execute store result storage attack:bomb yaw float 1 run data get entity @s Rotation[0] 100 | ||
| $execute positioned $(x) 45 $(z) rotated 0 0 run function animated_java:bomb/summon | ||
|
|
||
| # Initialize bullet | ||
| execute as @e[tag=attack-bullet-new] run function entity:hostile/omega-flowey/attack/bomb/bullet/initialize |
2 changes: 1 addition & 1 deletion
2
...wey/data/entity/functions/hostile/omega-flowey/attack/bomb/indicator/terminate.mcfunction
This file contains 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 |
|---|---|---|
| @@ -1 +1 @@ | ||
| function animated_java:bomb/remove/this | ||
| kill @s |