Skip to content
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.

Sign up for GitHub

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

💄 👻 add skeleton for soul-event text using text_displays #134

Merged
merged 17 commits into from
Jul 28, 2024
Merged

💄 👻 add skeleton for soul-event text using text_displays #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
160ccea
Created new call for help block display and temporary termination
Jul 24, 2024
fbea210
nicer formatting
Jul 25, 2024
45b0d47
wrap matrix
Jul 25, 2024
00b75cd
remove quote escapes
Jul 28, 2024
4dba1f8
Merge branch 'main' of https://github.com/TheAfroOfDoom/omega-flowey-…
Jul 28, 2024
30dc25c
remove trailing spaces
Jul 28, 2024
d8d6ba9
quoted tags
Jul 28, 2024
10979e5
functional terminate function file
Jul 28, 2024
72c6c31
summon function
Jul 28, 2024
03889da
working summon file
Jul 28, 2024
0d7ef2c
trailing newline and @s terminate function namespace
Jul 28, 2024
35fc99e
line break after comment
Jul 28, 2024
752ad51
no target selector for call for help display terminate
Jul 28, 2024
6824455
updated todo for soul event 5 call for help
Jul 28, 2024
b237281
alphabetize terminate mcfunction
Jul 28, 2024
a00007f
no newline in as root
Jul 28, 2024
e1ae5db
Email update test
WesLSmith Jul 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions datapacks/omega-flowey/data/entity/function/soul/soul_0/act_button/touch.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ scoreboard players set #soul_0.touched soul.flag 1
# Apply yellow-highlighted variant
function animated_java:act_button/variants/selected/apply

# TODO(82): this could be a lot cleaner visually
say * You called for help...
# Summon call for help display
function entity:soul/soul_0/call_for_help_display/summon

# TODO(36): transparent fade-out of `act_button` model?

execute as @e[tag=soul_0,tag=soul-executor] run function entity:soul/soul_0/executor/initialize/touch
33 changes: 33 additions & 0 deletions ...cks/omega-flowey/data/entity/function/soul/soul_0/call_for_help_display/summon.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
summon block_display -2.5 49.5 -34.0 \
{Tags:["omega-flowey-remastered","soul","soul_0","call-for-help-display"], \
Passengers:[ \
{id:"minecraft:text_display", \
Tags:["omega-flowey-remastered","soul","soul_0","call-for-help-display"], \
text:'{"text":"* You Called For Help. . .","color":"#FFFFFF","font":"minecraft:uniform"}', \
text_opacity:255, \
background:-1, \
alignment:"center", \
line_width:210, \
default_background:false, \
Rotation:[-180f,0f], \
transformation:[30.0150f,0.0000f,0.0000f,0.0000f, \
0.0000f,30.0700f,0.0000f,0.4900f, \
0.0000f,0.0000f,30.0100f,-0.0100f, \
0.0000f,0.0000f,0.0000f,1.0000f] \
}, \
{id:"minecraft:text_display", \
Tags:["omega-flowey-remastered","soul","soul_0","call-for-help-display"], \
text:'{"text":"* You Called For Help. . .","color":"#FFFFFF","font":"minecraft:uniform"}', \
text_opacity:255, \
background:-16777216, \
alignment:"center", \
line_width:210, \
default_background:false, \
Rotation:[-180f,0f], \
transformation:[30.0000f,0.0000f,0.0000f,0.0000f, \
0.0000f,30.0000f,0.0000f,0.5000f, \
0.0000f,0.0000f,30.0000f,0.0000f, \
0.0000f,0.0000f,0.0000f,1.0000f] \
} \
] \
}
1 change: 1 addition & 0 deletions .../omega-flowey/data/entity/function/soul/soul_0/call_for_help_display/terminate.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
kill @s
1 change: 1 addition & 0 deletions ...packs/omega-flowey/data/entity/function/soul/soul_0/executor/terminate/as_root.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
execute if entity @s[tag=act-button] run function entity:soul/soul_0/act_button/terminate
execute if entity @s[tag=bandaid] run function entity:soul/soul_0/bandaid/terminate
execute if entity @s[tag=call-for-help-display] run function entity:soul/soul_0/call_for_help_display/terminate
execute if entity @s[tag=soul-bullet] run function entity:soul/soul_0/bullet/terminate
2 changes: 1 addition & 1 deletion datapacks/omega-flowey/data/entity/function/soul/soul_5/act_button/touch.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ scoreboard players set #soul_5.touched soul.flag 1
# Apply yellow-highlighted variant
function animated_java:act_button/variants/selected/apply

# TODO(82): this could be a lot cleaner visually
# TODO(136): Generalize code from Soul Event 0 to be applied here
say * You called for help...
# TODO(36): transparent fade-out of `act_button` model?

Expand Down