diff --git a/godot/addons/dialogic/Editor/Events/CloseDialog.tscn b/godot/addons/dialogic/Editor/Events/CloseDialog.tscn index 4388e3a..e80cc2f 100644 --- a/godot/addons/dialogic/Editor/Events/CloseDialog.tscn +++ b/godot/addons/dialogic/Editor/Events/CloseDialog.tscn @@ -4,9 +4,9 @@ [ext_resource path="res://addons/dialogic/Images/Event Icons/Main Icons/close-dialog.svg" type="Texture" id=2] [ext_resource path="res://addons/dialogic/Editor/Events/Parts/Numbers/TransitonLengthPicker.tscn" type="PackedScene" id=4] -[sub_resource type="StyleBoxEmpty" id=4] +[sub_resource type="StyleBoxEmpty" id=1] -[sub_resource type="Image" id=5] +[sub_resource type="Image" id=4] data = { "data": PoolByteArray( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), "format": "LumAlpha8", @@ -18,10 +18,11 @@ data = { [sub_resource type="ImageTexture" id=3] flags = 4 flags = 4 -image = SubResource( 5 ) +image = SubResource( 4 ) size = Vector2( 16, 16 ) [node name="CloseDialog" instance=ExtResource( 1 )] +mouse_filter = 0 event_name = "Close Dialog" event_data = { "event_id": "dialogic_022", @@ -34,16 +35,16 @@ event_category = 2 sorting_index = 4 [node name="PanelContainer" parent="." index="1"] -margin_right = 300.0 +margin_right = 105.0 [node name="MarginContainer" parent="PanelContainer" index="1"] -margin_right = 300.0 +margin_right = 105.0 [node name="VBoxContainer" parent="PanelContainer/MarginContainer" index="0"] -margin_right = 294.0 +margin_right = 99.0 [node name="Header" parent="PanelContainer/MarginContainer/VBoxContainer" index="0"] -margin_right = 284.0 +margin_right = 89.0 [node name="IconPanel" parent="PanelContainer/MarginContainer/VBoxContainer/Header/CenterContainer" index="0"] self_modulate = Color( 0.941176, 0.266667, 0.219608, 1 ) @@ -58,12 +59,12 @@ text = "Close Dialog" [node name="Content" parent="PanelContainer/MarginContainer/VBoxContainer/Header" index="2"] margin_left = 79.0 -margin_right = 284.0 +margin_right = 89.0 [node name="Spacer" parent="PanelContainer/MarginContainer/VBoxContainer/Header" index="4"] -margin_left = 284.0 -margin_right = 284.0 +margin_left = 89.0 +margin_right = 89.0 [node name="PopupMenu" parent="." index="2"] -custom_styles/hover = SubResource( 4 ) +custom_styles/hover = SubResource( 1 ) items = [ "Documentation", SubResource( 3 ), 0, false, false, 0, 0, null, "", false, "", null, 0, false, false, -1, 0, null, "", true, "Move up", SubResource( 3 ), 0, false, false, 2, 0, null, "", false, "Move down", SubResource( 3 ), 0, false, false, 3, 0, null, "", false, "", null, 0, false, false, -1, 0, null, "", true, "Delete", SubResource( 3 ), 0, false, false, 5, 0, null, "", false ] diff --git a/godot/addons/dialogic/Nodes/DialogNode.tscn b/godot/addons/dialogic/Nodes/DialogNode.tscn index 5f71ea4..109a786 100644 --- a/godot/addons/dialogic/Nodes/DialogNode.tscn +++ b/godot/addons/dialogic/Nodes/DialogNode.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=14 format=2] +[gd_scene load_steps=15 format=2] [ext_resource path="res://addons/dialogic/Nodes/TextBubble.tscn" type="PackedScene" id=1] [ext_resource path="res://addons/dialogic/Example Assets/backgrounds/GlossaryBackground.tres" type="StyleBox" id=2] @@ -11,13 +11,14 @@ [ext_resource path="res://addons/dialogic/Example Assets/Sound Effects/Beep.wav" type="AudioStream" id=9] [ext_resource path="res://addons/dialogic/Nodes/DialogicCustomEvents.gd" type="Script" id=10] [ext_resource path="res://addons/dialogic/Nodes/History.tscn" type="PackedScene" id=11] +[ext_resource path="res://assets/audio/typing.ogg" type="AudioStream" id=12] [sub_resource type="StyleBoxFlat" id=1] bg_color = Color( 1, 1, 1, 0 ) expand_margin_left = 10.0 [sub_resource type="RectangleShape2D" id=2] -extents = Vector2( 1280, 720 ) +extents = Vector2( 1024, 600 ) [node name="DialogNode" type="Control"] anchor_right = 1.0 @@ -29,24 +30,19 @@ anchor_left = 0.5 anchor_top = 1.0 anchor_right = 0.5 anchor_bottom = 1.0 -margin_left = 640.0 -margin_top = 720.0 -margin_right = 640.0 -margin_bottom = 720.0 __meta__ = { "_edit_use_anchors_": false } [node name="TextBubble" parent="." instance=ExtResource( 1 )] -margin_left = 185.0 -margin_top = 513.0 -margin_right = 1095.0 -margin_bottom = 680.0 +margin_top = -207.0 +margin_bottom = -40.0 [node name="Options" type="VBoxContainer" parent="."] visible = false -margin_right = 1280.0 -margin_bottom = 720.0 +margin_top = -50.0 +margin_right = 1024.0 +margin_bottom = 550.0 grow_horizontal = 2 grow_vertical = 2 mouse_filter = 2 @@ -74,7 +70,7 @@ script = ExtResource( 3 ) [node name="Typing" type="AudioStreamPlayer" parent="FX/Audio"] script = ExtResource( 8 ) -samples = [ ExtResource( 9 ) ] +samples = [ ExtResource( 12 ) ] random_strategy = 2 [node name="Waiting" type="AudioStreamPlayer" parent="FX/Audio"] diff --git a/godot/dialogic/definitions.json b/godot/dialogic/definitions.json index ed5043b..1d58925 100644 --- a/godot/dialogic/definitions.json +++ b/godot/dialogic/definitions.json @@ -9,24 +9,12 @@ "type": 0, "value": "false" }, - { - "id": "1667711785-428", - "name": "won game", - "type": 0, - "value": "false" - }, { "id": "1667703692-648", "name": "seen intro", "type": 0, "value": "false" }, - { - "id": "1672699752-574", - "name": "bb_counter", - "type": 0, - "value": "0" - }, { "id": "1672730872-648", "name": "have seen elevator", @@ -57,11 +45,23 @@ "type": 0, "value": "0.0" }, + { + "id": "1672699752-574", + "name": "bb_counter", + "type": 0, + "value": "0" + }, { "id": "1672699872-250", "name": "meat_creek_tutorial_given", "type": 0, "value": "false" + }, + { + "id": "1667711785-428", + "name": "won game", + "type": 0, + "value": "false" } ] } diff --git a/godot/dialogic/settings.cfg b/godot/dialogic/settings.cfg index bc35734..8f21ded 100644 --- a/godot/dialogic/settings.cfg +++ b/godot/dialogic/settings.cfg @@ -9,6 +9,7 @@ clicking_dialog_action=false autofocus_choices=true delay_after_options="1" enable_default_shortcut=false +choice_hotkey_1="[None]" [editor] diff --git a/godot/dialogic/themes/default-theme.cfg b/godot/dialogic/themes/default-theme.cfg index fceab53..5f60ba1 100644 --- a/godot/dialogic/themes/default-theme.cfg +++ b/godot/dialogic/themes/default-theme.cfg @@ -12,10 +12,10 @@ shadow_offset=Vector2( 7, 2 ) [buttons] -normal=[ true, Color( 1, 1, 1, 1 ), false, Color( 0, 0, 0, 1 ), true, "res://addons/dialogic/Example Assets/backgrounds/background-2.png", false, Color( 1, 1, 1, 1 ) ] -hover=[ true, Color( 0.717647, 0.717647, 0.717647, 1 ), false, Color( 0, 0, 0, 1 ), true, "res://addons/dialogic/Example Assets/backgrounds/background-2.png", false, Color( 1, 1, 1, 1 ) ] -focus=[ true, Color( 1, 1, 1, 1 ), false, Color( 0, 0, 0, 1 ), true, "res://addons/dialogic/Example Assets/backgrounds/background-2.png", false, Color( 1, 1, 1, 1 ) ] -pressed=[ false, Color( 1, 1, 1, 1 ), false, Color( 0, 0, 0, 1 ), true, "res://addons/dialogic/Example Assets/backgrounds/background-2.png", false, Color( 1, 1, 1, 1 ) ] +normal=[ true, Color( 1, 1, 1, 1 ), false, Color( 0, 0, 0, 1 ), true, "res://assets/Button07.png", true, Color( 0.764706, 0.764706, 0.764706, 1 ) ] +hover=[ true, Color( 0.717647, 0.717647, 0.717647, 1 ), false, Color( 0, 0, 0, 1 ), true, "res://assets/Button07.png", true, Color( 0.847059, 0.847059, 0.847059, 1 ) ] +focus=[ true, Color( 0.811765, 0.811765, 0.811765, 1 ), false, Color( 0, 0, 0, 1 ), true, "res://assets/Button07.png", true, Color( 1, 1, 1, 1 ) ] +pressed=[ false, Color( 1, 1, 1, 1 ), false, Color( 0, 0, 0, 1 ), true, "res://assets/Button07.png", false, Color( 1, 1, 1, 1 ) ] disabled=[ false, Color( 1, 1, 1, 1 ), false, Color( 0, 0, 0, 1 ), true, "res://addons/dialogic/Example Assets/backgrounds/background-2.png", false, Color( 1, 1, 1, 1 ) ] layout=1 fixed=true diff --git a/godot/dialogic/themes/theme-1672875796.cfg b/godot/dialogic/themes/theme-1672875796.cfg index e7af32d..f9fe4dd 100644 --- a/godot/dialogic/themes/theme-1672875796.cfg +++ b/godot/dialogic/themes/theme-1672875796.cfg @@ -15,8 +15,8 @@ name="Heaven Theme" color="#fff700ff" use_color=false use_image=true -image="res://assets/Button03.png" -modulation_color="#ffff94ee" +image="res://assets/Button13.png" +modulation_color="#ff9700ff" modulation=true [name] @@ -32,13 +32,14 @@ modulation_color="#ffffffff" [text] font="res://assets/heaven_font.tres" -text_margin_top=30.0 -text_margin_left=30.0 -text_margin_right=-30.0 -text_margin_bottom=-30.0 +text_margin_top=40.0 +text_margin_left=40.0 +text_margin_right=-40.0 +text_margin_bottom=-40.0 color="#ffff00e3" shadow=true shadow_color="#9e3c0000" +alignment=4 [audio] diff --git a/godot/dialogic/timelines/timeline-1667667789.json b/godot/dialogic/timelines/timeline-1667667789.json index 89ec284..7689a3b 100644 --- a/godot/dialogic/timelines/timeline-1667667789.json +++ b/godot/dialogic/timelines/timeline-1667667789.json @@ -1,5 +1,9 @@ { "events": [ + { + "emit_signal": "", + "event_id": "dialogic_040" + }, { "event_id": "dialogic_024", "set_theme": "default-theme.cfg" @@ -41,7 +45,7 @@ "character": "character-1667667572.json", "event_id": "dialogic_001", "portrait": "", - "text": "First time on Recovery?" + "text": "This your first time on Recovery Stuart?" }, { "character": "character-1667667572.json", @@ -119,19 +123,19 @@ "character": "character-1667667572.json", "event_id": "dialogic_001", "portrait": "", - "text": "DSV-PRovender's black box says the crew went AWOL a few weeks ago" + "text": "The data you recovered from the DSV-PRovender's black boxes says the crew went AWOL a few weeks ago" }, { "character": "character-1667667572.json", "event_id": "dialogic_001", "portrait": "", - "text": "You need to head down into the mining pit behind me to recover samples" + "text": "They ended up in the bore hole at the top of the mountain behind me. You need to head down inside to recover samples" }, { "character": "character-1667667572.json", "event_id": "dialogic_001", "portrait": "", - "text": " Just walk up to a crew member to collect a neural scan. The lab rats will use it to clone them back on the homeworld" + "text": " Just walk up to a crew member's body to collect a neural scan. The lab rats will use it to clone them back on the homeworld" }, { "character": "character-1667667572.json", @@ -143,7 +147,7 @@ "character": "character-1667667572.json", "event_id": "dialogic_001", "portrait": "", - "text": "That's what the lab rats tell me, anyway" + "text": "That's what the lab rats tell me at least" }, { "character": "character-1667667572.json", @@ -155,13 +159,19 @@ "character": "character-1667667572.json", "event_id": "dialogic_001", "portrait": "", - "text": "If it gets dark, you can toggle your suit's flashlight by pressing (f). Can't collect a good sample if you're as blind a clone! Heh" + "text": "If it gets dark, you can toggle your suit's flashlight by pressing (f)/(y). Can't collect a good sample if you're as blind a clone! Heh" }, { "character": "character-1667667572.json", "event_id": "dialogic_001", "portrait": "", - "text": "Don't stay in one spot for too long either... My last parter got sucked in. Poor guy. Happy clone though. House and kids. Beautiful wife..." + "text": "Your scanner is wired to pick up biometric scans. Take it out with (C)/(X) to listen. If it gets louder, you're getting closer" + }, + { + "character": "character-1667667572.json", + "event_id": "dialogic_001", + "portrait": "", + "text": "Also, don't stay in one spot for too long either. My last parter got sucked in. Poor guy. Happy clone though. House and kids. Beautiful wife..." }, { "character": "character-1667667572.json", @@ -187,12 +197,6 @@ "set_random": false, "set_value": "true" }, - { - "character": "character-1667667572.json", - "event_id": "dialogic_001", - "portrait": "", - "text": "One last thing..." - }, { "character": "character-1667667572.json", "event_id": "dialogic_001", @@ -203,7 +207,7 @@ "character": "character-1667667572.json", "event_id": "dialogic_001", "portrait": "", - "text": "It makes recovery a breeze. Tthe fuel costs an arm and a leg though" + "text": "It makes recovery a breeze. Almost feels nice enough that you forget how much it costs you" }, { "event_id": "dialogic_015", diff --git a/godot/dialogic/timelines/timeline-1667671038.json b/godot/dialogic/timelines/timeline-1667671038.json index d5e986e..7dd1281 100644 --- a/godot/dialogic/timelines/timeline-1667671038.json +++ b/godot/dialogic/timelines/timeline-1667671038.json @@ -155,6 +155,10 @@ "portrait": "", "text": "(Manos falls limp) " }, + { + "emit_signal": "death", + "event_id": "dialogic_040" + }, { "character": "character-1667667675.json", "event_id": "dialogic_001", diff --git a/godot/dialogic/timelines/timeline-1667671061.json b/godot/dialogic/timelines/timeline-1667671061.json index 4d3e34e..cdc2c34 100644 --- a/godot/dialogic/timelines/timeline-1667671061.json +++ b/godot/dialogic/timelines/timeline-1667671061.json @@ -44,9 +44,9 @@ }, { "event_id": "dialogic_015", - "id": "anchor-1634488067", + "id": "anchor-1672883201", "index": 0, - "name": "voss_questions" + "name": "questions" }, { "character": "character-1667667711.json", @@ -101,7 +101,7 @@ "text": "[wave amp=50 freq=2]You wouldn’t want to anger Mother, would you John?[/wave]" }, { - "anchor_id": "anchor-1634488067", + "anchor_id": "anchor-1672883201", "event_id": "dialogic_016" }, { @@ -160,7 +160,7 @@ "text": "[wave amp=50 freq=2]Won’t you join us? Won’t you make Mother happy?[/wave]" }, { - "anchor_id": "anchor-1634488067", + "anchor_id": "anchor-1672883201", "event_id": "dialogic_016" }, { diff --git a/godot/dialogic/timelines/timeline-1672623960.json b/godot/dialogic/timelines/timeline-1672623960.json index 5d7754a..ed94f0d 100644 --- a/godot/dialogic/timelines/timeline-1672623960.json +++ b/godot/dialogic/timelines/timeline-1672623960.json @@ -4,14 +4,6 @@ "event_id": "dialogic_024", "set_theme": "default-theme.cfg" }, - { - "definition": "1672699752-574", - "event_id": "dialogic_014", - "operation": "=", - "random_upper_limit": 100, - "set_random": false, - "set_value": "found_blackbox_count" - }, { "condition": "", "definition": "1672699872-250", @@ -103,19 +95,13 @@ "character": "character-1667667572.json", "event_id": "dialogic_001", "portrait": "", - "text": "Have you taken the readings yet Stuart? Not yet?" + "text": "Have you taken five unique readings yet Stuart? Not yet?" }, { "character": "character-1667667572.json", "event_id": "dialogic_001", "portrait": "", - "text": "We need to rip location data from at least five black boxes to find the crew" - }, - { - "character": "character-1667667572.json", - "event_id": "dialogic_001", - "portrait": "", - "text": "Remember to use your radio by pressing (C)/(x) if you’re having trouble" + "text": "Remember to use your scanner by pressing (C)/(x) if you’re having trouble" }, { "character": "character-1667667572.json", @@ -129,10 +115,6 @@ "portrait": "", "text": "Come back when you’ve gathered enough data" }, - { - "anchor_id": "anchor-1634488067", - "event_id": "dialogic_016" - }, { "event_id": "dialogic_013" }, @@ -293,7 +275,7 @@ "character": "character-1667667572.json", "event_id": "dialogic_001", "portrait": "", - "text": "I’ve tuned your radio to pick up on the black boxes’ frequency. Press (C)/(x) to take it out. " + "text": "I’ve tuned your scanner to pick up on the black boxes’ frequency. Press (C)/(x) to take it out. " }, { "character": "character-1667667572.json", @@ -323,7 +305,7 @@ "character": "character-1667667572.json", "event_id": "dialogic_001", "portrait": "", - "text": "One last thing..." + "text": "Oh and one last thing..." }, { "character": "character-1667667572.json", @@ -335,7 +317,7 @@ "character": "character-1667667572.json", "event_id": "dialogic_001", "portrait": "", - "text": "It makes recovery a breeze. Tthe fuel costs an arm and a leg though" + "text": "It would give you an easier time travesing the terrain. The fuel costs an arm and a leg though" }, { "character": "character-1667667572.json", @@ -344,7 +326,7 @@ ], "portrait": "", - "question": "Still want the glider? The costs are coming out of your end" + "question": "Its your paycheck. You want the boost?" }, { "choice": "Yes", @@ -357,7 +339,7 @@ "character": "character-1667667572.json", "event_id": "dialogic_001", "portrait": "", - "text": "Fine. Hold (Space)/(R1) to slow your fall. Should make climbing down easier" + "text": "Fine. Hold (Space)/(R1) to slow your fall. Should make exploring easier" }, { "definition": "1672783730-648", diff --git a/godot/dialogic/timelines/timeline-1672875631.json b/godot/dialogic/timelines/timeline-1672875631.json index 5dab605..0ddb698 100644 --- a/godot/dialogic/timelines/timeline-1672875631.json +++ b/godot/dialogic/timelines/timeline-1672875631.json @@ -3,7 +3,7 @@ { "block_input": true, "event_id": "dialogic_050", - "wait_time": 0 + "wait_time": 4 }, { "event_id": "dialogic_024", @@ -15,12 +15,6 @@ "portrait": "", "text": "...Where am I?" }, - { - "character": "", - "event_id": "dialogic_001", - "portrait": "", - "text": "I love it here..." - }, { "audio": "play", "audio_bus": "Master", @@ -34,6 +28,12 @@ "event_id": "dialogic_001", "portrait": "", "text": "This must be... [wave amp=50 freq=2][color=red]Meat Heaven[/color][/wave]" + }, + { + "character": "", + "event_id": "dialogic_001", + "portrait": "", + "text": "I never want to leave..." } ], "metadata": { diff --git a/godot/player/CameraController.gd b/godot/player/CameraController.gd index 42cbab7..5627ca1 100644 --- a/godot/player/CameraController.gd +++ b/godot/player/CameraController.gd @@ -22,7 +22,7 @@ func _input(event): if Input.is_action_just_pressed("ui_cancel"): Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE) else: - if event is InputEventMouseButton: + if event is InputEventMouseButton and Input.is_action_just_pressed("ui cancel"): Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED) var look_relative = Vector2(