From 5782bbc2c3aa8650242cc24e66ec821f4e4af431 Mon Sep 17 00:00:00 2001 From: dukegoobler <76922012+vengefulcartographer@users.noreply.github.com> Date: Mon, 2 Jan 2023 23:21:46 -0700 Subject: [PATCH] elevator dialog --- godot/assets/meat_creek/DialogTrigger.gd | 15 +++++++++++ godot/assets/meat_creek/side_tunnel_1.tscn | 15 ++++++++++- godot/dialogic/folder_structure.json | 3 ++- .../timelines/timeline-1672725696.json | 25 +++++++++++++++++++ godot/project.godot | 3 --- 5 files changed, 56 insertions(+), 5 deletions(-) create mode 100644 godot/assets/meat_creek/DialogTrigger.gd create mode 100644 godot/dialogic/timelines/timeline-1672725696.json diff --git a/godot/assets/meat_creek/DialogTrigger.gd b/godot/assets/meat_creek/DialogTrigger.gd new file mode 100644 index 0000000..a8269db --- /dev/null +++ b/godot/assets/meat_creek/DialogTrigger.gd @@ -0,0 +1,15 @@ +extends Area + +var phase = 0 +var dialog = null + +func _ready(): + pass # Replace with function body. + +func _on_DialogTrigger_body_entered(body): + dialog = Dialogic.start("elevator") + add_child(dialog) + +func _on_DialogTrigger_body_exited(body): + if dialog != null: + dialog = null diff --git a/godot/assets/meat_creek/side_tunnel_1.tscn b/godot/assets/meat_creek/side_tunnel_1.tscn index 73de94e..d81973f 100644 --- a/godot/assets/meat_creek/side_tunnel_1.tscn +++ b/godot/assets/meat_creek/side_tunnel_1.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=25 format=2] +[gd_scene load_steps=27 format=2] [ext_resource path="res://assets/meat_creek/side_tunnel_1.glb" type="PackedScene" id=1] [ext_resource path="res://player/player.tscn" type="PackedScene" id=2] @@ -21,6 +21,7 @@ [ext_resource path="res://assets/models/black_box/black_box.tscn" type="PackedScene" id=19] [ext_resource path="res://assets/models/obelisk/obelisk.tscn" type="PackedScene" id=20] [ext_resource path="res://assets/models/meat_tentacle_small.tscn" type="PackedScene" id=21] +[ext_resource path="res://assets/meat_creek/DialogTrigger.gd" type="Script" id=22] [ext_resource path="res://assets/models/meat_tentacle.tscn" type="PackedScene" id=400] [sub_resource type="PanoramaSky" id=4] @@ -54,6 +55,8 @@ dof_blur_near_quality = 2 glow_enabled = true glow_bloom = 1.0 +[sub_resource type="BoxShape" id=5] + [node name="side_tunnel_1" instance=ExtResource( 1 )] [node name="StaticBody" parent="Canvas001" index="0" instance=ExtResource( 8 )] @@ -327,6 +330,14 @@ id = 4 [node name="elevator" parent="." index="10" instance=ExtResource( 10 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0735546, -123.027, -41.1766 ) +[node name="DialogTrigger" type="Area" parent="elevator" index="1"] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.44246, 0 ) +script = ExtResource( 22 ) + +[node name="CollisionShape" type="CollisionShape" parent="elevator/DialogTrigger" index="0"] +transform = Transform( 1e+06, 0, 0, 0, 0, 0, 0, 0, 1e+06, 0, 0, 0 ) +shape = SubResource( 5 ) + [node name="SignalGenerator" parent="." index="11" instance=ExtResource( 12 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.489914, -122.635, -41.5684 ) stream = ExtResource( 16 ) @@ -361,6 +372,8 @@ max_wait = 30.0 [node name="Timer" type="Timer" parent="AmbientSounds/BottomWhale2" index="0"] one_shot = true +[connection signal="body_entered" from="elevator/DialogTrigger" to="elevator/DialogTrigger" method="_on_DialogTrigger_body_entered"] +[connection signal="body_exited" from="elevator/DialogTrigger" to="elevator/DialogTrigger" method="_on_DialogTrigger_body_exited"] [connection signal="finished" from="AmbientSounds/BottomWhale1" to="AmbientSounds/BottomWhale1" method="_on_sound_finished"] [connection signal="timeout" from="AmbientSounds/BottomWhale1/Timer" to="AmbientSounds/BottomWhale1" method="_on_Timer_timeout"] [connection signal="finished" from="AmbientSounds/BottomWhale2" to="AmbientSounds/BottomWhale2" method="_on_sound_finished"] diff --git a/godot/dialogic/folder_structure.json b/godot/dialogic/folder_structure.json index 8e977f8..b53ce4a 100644 --- a/godot/dialogic/folder_structure.json +++ b/godot/dialogic/folder_structure.json @@ -72,7 +72,8 @@ "timeline-1672267872.json", "timeline-1672267892.json", "timeline-1672623960.json", - "timeline-1672719153.json" + "timeline-1672719153.json", + "timeline-1672725696.json" ], "folders": { diff --git a/godot/dialogic/timelines/timeline-1672725696.json b/godot/dialogic/timelines/timeline-1672725696.json new file mode 100644 index 0000000..e73ef91 --- /dev/null +++ b/godot/dialogic/timelines/timeline-1672725696.json @@ -0,0 +1,25 @@ +{ + "events": [ + { + "event_id": "dialogic_024", + "set_theme": "default-theme.cfg" + }, + { + "character": "", + "event_id": "dialogic_001", + "portrait": "", + "text": "(Where am I?)" + }, + { + "character": "", + "event_id": "dialogic_001", + "portrait": "", + "text": "(Looks the the only way out is down...)" + } + ], + "metadata": { + "dialogic-version": "1.4.5", + "file": "timeline-1672725696.json", + "name": "elevator" + } +} diff --git a/godot/project.godot b/godot/project.godot index 9c7af08..e934d1f 100644 --- a/godot/project.godot +++ b/godot/project.godot @@ -244,7 +244,4 @@ common/enable_pause_aware_picking=true [rendering] -quality/filters/msaa=4 -quality/filters/use_fxaa=true -quality/filters/use_debanding=true environment/default_environment="res://default_env.tres"