From b7ebc03b0ad2f40e4e9a21d169cfffbb20102052 Mon Sep 17 00:00:00 2001 From: dukegoobler <76922012+vengefulcartographer@users.noreply.github.com> Date: Tue, 3 Jan 2023 00:16:38 -0700 Subject: [PATCH] dialog trigger fix --- godot/assets/meat_creek/DialogTrigger.gd | 5 +++-- godot/assets/meat_creek/DialogTriggerObelisk.gd | 5 +++-- godot/assets/meat_creek/side_tunnel_1.tscn | 3 --- godot/dialogic/themes/theme-1672728448.cfg | 1 + godot/dialogic/timelines/timeline-1672727997.json | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/godot/assets/meat_creek/DialogTrigger.gd b/godot/assets/meat_creek/DialogTrigger.gd index 71f6063..37795ce 100644 --- a/godot/assets/meat_creek/DialogTrigger.gd +++ b/godot/assets/meat_creek/DialogTrigger.gd @@ -6,8 +6,9 @@ func _ready(): pass # Replace with function body. func _on_DialogTrigger_body_entered(body): - dialog = Dialogic.start("elevator") - add_child(dialog) + if body.get_name() == "Player": + dialog = Dialogic.start("elevator") + add_child(dialog) func _on_DialogTrigger_body_exited(body): if dialog != null: diff --git a/godot/assets/meat_creek/DialogTriggerObelisk.gd b/godot/assets/meat_creek/DialogTriggerObelisk.gd index 1d1ec58..0a7952b 100644 --- a/godot/assets/meat_creek/DialogTriggerObelisk.gd +++ b/godot/assets/meat_creek/DialogTriggerObelisk.gd @@ -6,8 +6,9 @@ func _ready(): pass # Replace with function body. func _on_DialogTrigger_body_entered(body): - dialog = Dialogic.start("obelisk") - add_child(dialog) + if body.get_name() == "Player": + dialog = Dialogic.start("obelisk") + add_child(dialog) func _on_DialogTrigger_body_exited(body): if dialog != null: diff --git a/godot/assets/meat_creek/side_tunnel_1.tscn b/godot/assets/meat_creek/side_tunnel_1.tscn index 65d4540..d524dff 100644 --- a/godot/assets/meat_creek/side_tunnel_1.tscn +++ b/godot/assets/meat_creek/side_tunnel_1.tscn @@ -381,9 +381,6 @@ max_wait = 30.0 [node name="Timer" type="Timer" parent="AmbientSounds/BottomWhale2" index="0"] one_shot = true -[node name="mothers voice" type="Spatial" parent="." index="14"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.428938, -102.191, 13.744 ) - [connection signal="body_entered" from="decorations/obelisk/DialogTrigger" to="decorations/obelisk/DialogTrigger" method="_on_DialogTrigger_body_entered"] [connection signal="body_exited" from="decorations/obelisk/DialogTrigger" to="decorations/obelisk/DialogTrigger" method="_on_DialogTrigger_body_exited"] [connection signal="body_entered" from="elevator/DialogTrigger" to="elevator/DialogTrigger" method="_on_DialogTrigger_body_entered"] diff --git a/godot/dialogic/themes/theme-1672728448.cfg b/godot/dialogic/themes/theme-1672728448.cfg index 7a38c5c..602a139 100644 --- a/godot/dialogic/themes/theme-1672728448.cfg +++ b/godot/dialogic/themes/theme-1672728448.cfg @@ -47,6 +47,7 @@ position=1 auto_color=false shadow_visible=true is_hidden=false +shadow_offset=Vector2( 4, 5 ) [audio] diff --git a/godot/dialogic/timelines/timeline-1672727997.json b/godot/dialogic/timelines/timeline-1672727997.json index 579f9cb..c53a348 100644 --- a/godot/dialogic/timelines/timeline-1672727997.json +++ b/godot/dialogic/timelines/timeline-1672727997.json @@ -74,7 +74,7 @@ "value": "" }, { - "character": "", + "character": "character-1672728520.json", "event_id": "dialogic_001", "portrait": "", "text": "LAST OBELISK TERMINAL ACCESS:\n\n\t[/color=green]Ten thousand years ago[/color]\n\t\nLAST STATUS:\n\n\t[/color=green]Seed ripening[/color]"