diff --git a/datapacks/omega-flowey/data/entity/function/soul/soul_0/act_button/touch.mcfunction b/datapacks/omega-flowey/data/entity/function/soul/soul_0/act_button/touch.mcfunction index 2bdba97c0..6633f3941 100644 --- a/datapacks/omega-flowey/data/entity/function/soul/soul_0/act_button/touch.mcfunction +++ b/datapacks/omega-flowey/data/entity/function/soul/soul_0/act_button/touch.mcfunction @@ -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 diff --git a/datapacks/omega-flowey/data/entity/function/soul/soul_0/call_for_help_display/summon.mcfunction b/datapacks/omega-flowey/data/entity/function/soul/soul_0/call_for_help_display/summon.mcfunction new file mode 100644 index 000000000..a4914acc8 --- /dev/null +++ b/datapacks/omega-flowey/data/entity/function/soul/soul_0/call_for_help_display/summon.mcfunction @@ -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] \ + } \ + ] \ + } diff --git a/datapacks/omega-flowey/data/entity/function/soul/soul_0/call_for_help_display/terminate.mcfunction b/datapacks/omega-flowey/data/entity/function/soul/soul_0/call_for_help_display/terminate.mcfunction new file mode 100644 index 000000000..e06eec111 --- /dev/null +++ b/datapacks/omega-flowey/data/entity/function/soul/soul_0/call_for_help_display/terminate.mcfunction @@ -0,0 +1 @@ +kill @s diff --git a/datapacks/omega-flowey/data/entity/function/soul/soul_0/executor/terminate/as_root.mcfunction b/datapacks/omega-flowey/data/entity/function/soul/soul_0/executor/terminate/as_root.mcfunction index bfad7d006..f0f2702cf 100644 --- a/datapacks/omega-flowey/data/entity/function/soul/soul_0/executor/terminate/as_root.mcfunction +++ b/datapacks/omega-flowey/data/entity/function/soul/soul_0/executor/terminate/as_root.mcfunction @@ -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 diff --git a/datapacks/omega-flowey/data/entity/function/soul/soul_5/act_button/touch.mcfunction b/datapacks/omega-flowey/data/entity/function/soul/soul_5/act_button/touch.mcfunction index a15864038..d86879e0c 100644 --- a/datapacks/omega-flowey/data/entity/function/soul/soul_5/act_button/touch.mcfunction +++ b/datapacks/omega-flowey/data/entity/function/soul/soul_5/act_button/touch.mcfunction @@ -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?