Merge remote-tracking branch 'origin/master' into spencer

new dialog choice buttons, mouse focus fix

godot/.import/sparkle.wav-417a1bc62cde55b31a9f32e63e85672e.md5

@@ -0,0 +1,3 @@
+source_md5="5a328d0e134030b30e6236d255743fb9"
+dest_md5="0942527d12800b34331ad85647630e88"
+

godot/.import/squirrel.ogg-173ce57c909576975b60c40e81cb281d.md5

@@ -0,0 +1,3 @@
+source_md5="b0989b0b32639e93e7bb9de031cc630c"
+dest_md5="c7494eb2c4518e849d04bd411a623706"
+

godot/.import/synthsparkle.wav-4e71cc88f849bac9d6cffd4fa2181b9c.md5

@@ -0,0 +1,3 @@
+source_md5="718ea6c3f6a955acd994df7eb4c2c07d"
+dest_md5="5f30eed77e07a34869d29b2ddae18a48"
+

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 ]

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"]

godot/assets/audio/sparkle.wav.import

@@ -0,0 +1,23 @@
+[remap]
+
+importer="wav"
+type="AudioStreamSample"
+path="res://.import/sparkle.wav-417a1bc62cde55b31a9f32e63e85672e.sample"
+
+[deps]
+
+source_file="res://assets/audio/sparkle.wav"
+dest_files=[ "res://.import/sparkle.wav-417a1bc62cde55b31a9f32e63e85672e.sample" ]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=0

godot/assets/audio/squirrel.ogg.import

@@ -0,0 +1,15 @@
+[remap]
+
+importer="ogg_vorbis"
+type="AudioStreamOGGVorbis"
+path="res://.import/squirrel.ogg-173ce57c909576975b60c40e81cb281d.oggstr"
+
+[deps]
+
+source_file="res://assets/audio/squirrel.ogg"
+dest_files=[ "res://.import/squirrel.ogg-173ce57c909576975b60c40e81cb281d.oggstr" ]
+
+[params]
+
+loop=false
+loop_offset=0

godot/assets/audio/synthsparkle.wav.import

@@ -0,0 +1,23 @@
+[remap]
+
+importer="wav"
+type="AudioStreamSample"
+path="res://.import/synthsparkle.wav-4e71cc88f849bac9d6cffd4fa2181b9c.sample"
+
+[deps]
+
+source_file="res://assets/audio/synthsparkle.wav"
+dest_files=[ "res://.import/synthsparkle.wav-4e71cc88f849bac9d6cffd4fa2181b9c.sample" ]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=0

godot/assets/heaven_font.tres

@@ -0,0 +1,7 @@
+[gd_resource type="DynamicFont" load_steps=2 format=2]
+
+[ext_resource path="res://assets/friendlyscribbles.ttf" type="DynamicFontData" id=1]
+
+[resource]
+size = 32
+font_data = ExtResource( 1 )

godot/assets/meat_bore/meat_heaven.gd

@@ -1,5 +1,5 @@
 extends Spatial
 
 func _ready():
-	var dialog = Dialogic.start("controls")
+	var dialog = Dialogic.start("heaven")
 	add_child(dialog)

godot/assets/meat_bore/meat_module/meat_module.tscn

@@ -24,7 +24,7 @@ tracks/0/keys = {
 "times": PoolRealArray( 0, 3 ),
 "transitions": PoolRealArray( 1, 1 ),
 "update": 0,
-"values": [ -50.0, 0.0 ]
+"values": [ -50.0, 20.0 ]
 }
 
 [node name="meat_module" instance=ExtResource( 1 )]

godot/dialogic/characters/character-1672875775.json

@@ -0,0 +1,21 @@
+{
+	"color": "#ffffffff",
+	"description": "",
+	"display_name": "The Squirrel",
+	"display_name_bool": true,
+	"id": "character-1672875775.json",
+	"mirror_portraits": false,
+	"name": "The Squirrel",
+	"nickname": "",
+	"nickname_bool": false,
+	"offset_x": 0,
+	"offset_y": 0,
+	"portraits": [
+		{
+			"name": "Default",
+			"path": ""
+		}
+	],
+	"scale": 100,
+	"theme": ""
+}

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"
 		}
 	]
 }

godot/dialogic/folder_structure.json

@@ -13,7 +13,8 @@
 				"character-1667667711.json",
 				"character-1667767751.json",
 				"character-1672267793.json",
-				"character-1672728520.json"
+				"character-1672728520.json",
+				"character-1672875775.json"
 			],
 			"folders": {
 
@@ -50,7 +51,8 @@
 				"theme-1671745159.cfg",
 				"theme-1671748561.cfg",
 				"theme-1672721557.cfg",
-				"theme-1672728448.cfg"
+				"theme-1672728448.cfg",
+				"theme-1672875796.cfg"
 			],
 			"folders": {
 
@@ -82,7 +84,8 @@
 				"timeline-1672725696.json",
 				"timeline-1672727997.json",
 				"timeline-1672812380.json",
-				"timeline-1672859304.json"
+				"timeline-1672859304.json",
+				"timeline-1672875631.json"
 			],
 			"folders": {
 

godot/dialogic/settings.cfg

@@ -7,8 +7,9 @@ updatenumber=3
 default_action_key="dialogic_default_action"
 clicking_dialog_action=false
 autofocus_choices=true
-delay_after_options="0.5"
+delay_after_options="1"
 enable_default_shortcut=false
+choice_hotkey_1="[None]"
 
 [editor]
 
@@ -26,4 +27,4 @@ canvas_layer=50.0
 
 [QuickTimelineTest]
 
-timeline_file="timeline-1667671061.json"
+timeline_file="timeline-1672859304.json"

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

godot/dialogic/themes/theme-1672875796.cfg

@@ -0,0 +1,55 @@
+[buttons]
+
+normal=[ 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 ) ]
+hover=[ true, Color( 0.698039, 0.698039, 0.698039, 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( 0.698039, 0.698039, 0.698039, 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 ) ]
+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 ) ]
+
+[settings]
+
+name="Heaven Theme"
+
+[background]
+
+color="#fff700ff"
+use_color=false
+use_image=true
+image="res://assets/Button13.png"
+modulation_color="#ff9700ff"
+modulation=true
+
+[name]
+
+font="res://assets/heaven_font.tres"
+position=1
+modulation=false
+background_visible=false
+image_visible=false
+auto_color=false
+modulation_color="#ffffffff"
+
+[text]
+
+font="res://assets/heaven_font.tres"
+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]
+
+typing={
+"allow_interrupt": true,
+"audio_bus": "Master",
+"enable": true,
+"path": "res://assets/audio/sparkle.wav",
+"pitch": 1.0,
+"pitch_rand_range": 0.0,
+"volume": 0.0,
+"volume_rand_range": 0.0
+}

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",

godot/dialogic/timelines/timeline-1667668097.json

@@ -1,11 +1,5 @@
 {
 	"events": [
-		{
-			"condition": "!=",
-			"definition": "1667703692-648",
-			"event_id": "dialogic_012",
-			"value": "true"
-		},
 		{
 			"event_id": "dialogic_024",
 			"set_theme": "theme-1671745159.cfg"
@@ -56,47 +50,20 @@
 			"event_id": "dialogic_024",
 			"set_theme": "theme-1671748561.cfg"
 		},
+		{
+			"block_input": true,
+			"event_id": "dialogic_050",
+			"wait_time": 0
+		},
 		{
 			"character": "",
 			"event_id": "dialogic_001",
 			"portrait": "",
-			"text": "(Initializing...)"
+			"text": "initializing..."
 		},
 		{
-			"definition": "1667703692-648",
-			"event_id": "dialogic_014",
-			"operation": "=",
-			"random_upper_limit": 100,
-			"set_random": false,
-			"set_value": "true"
-		},
-		{
-			"change_timeline": "timeline-1672719153.json",
-			"event_id": "dialogic_020"
-		},
-		{
-			"event_id": "dialogic_022",
-			"transition_duration": 1
-		},
-		{
-			"event_id": "dialogic_013"
-		},
-		{
-			"condition": "",
-			"definition": "1667703692-648",
-			"event_id": "dialogic_012",
-			"value": "true"
-		},
-		{
-			"change_timeline": "timeline-1672719153.json",
-			"event_id": "dialogic_020"
-		},
-		{
-			"event_id": "dialogic_022",
-			"transition_duration": 1
-		},
-		{
-			"event_id": "dialogic_013"
+			"change_scene": "res://assets/meat_creek/side_tunnel_1.tscn",
+			"event_id": "dialogic_041"
 		}
 	],
 	"metadata": {

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",

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"
 		},
 		{

godot/dialogic/timelines/timeline-1667693704.json

@@ -8,7 +8,7 @@
 			"character": "",
 			"event_id": "dialogic_001",
 			"portrait": "",
-			"text": "[speed=0]Developed by dukegoobler, km__k, and Noodle1234 \n\nOriginal concept created for the Gamesden Done Quicker 2022 Game Jam\n\nUser interface elements courtesy of John Watson, S. Evans, Wenrexa, and Sunfire Interactive\n\nOverlays and images courtesy of Bacteri, ZimaJeKKT, hippopx.com, and thispersondoesnotexist.com\n\nSounds courtesy of Dryoma and VOiD1 Gaming"
+			"text": "[speed=0]Developed by dukegoobler, km__k, and Noodle1234 \n\nOriginal concept created for the Gamesden Done Quicker 2022 Game Jam\n\nUI elements and fonts courtesy of John Watson, S. Evans, Wenrexa, kmlgames, and Sunfire Interactive\n\nOverlays and images courtesy of Bacteri, ZimaJeKKT, hippopx.com, and thispersondoesnotexist.com\n\nSounds courtesy of Dryoma and VOiD1 Gaming"
 		},
 		{
 			"event_id": "dialogic_022",

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",

godot/dialogic/timelines/timeline-1672719153.json

@@ -13,6 +13,17 @@
 			"portrait": "",
 			"question": ""
 		},
+		{
+			"choice": "Chapter 0- Intro",
+			"condition": "",
+			"definition": "",
+			"event_id": "dialogic_011",
+			"value": ""
+		},
+		{
+			"change_scene": "res://screens/Intro.tscn",
+			"event_id": "dialogic_041"
+		},
 		{
 			"choice": "Chapter 1- Black Boxes",
 			"condition": "",

godot/dialogic/timelines/timeline-1672859304.json

@@ -1,10 +1,42 @@
 {
 	"events": [
+		{
+			"event_id": "dialogic_024",
+			"set_theme": "theme-1672875796.cfg"
+		},
 		{
 			"character": "",
 			"event_id": "dialogic_001",
 			"portrait": "",
+			"text": "Squeak"
+		},
+		{
+			"audio": "play",
+			"audio_bus": "Master",
+			"event_id": "dialogic_030",
+			"event_name": "AudioEvent",
+			"file": "res://assets/audio/synthsparkle.wav",
+			"volume": 0
+		},
+		{
+			"audio": "play",
+			"audio_bus": "Master",
+			"event_id": "dialogic_030",
+			"event_name": "AudioEvent",
+			"file": "res://assets/audio/squirrel.ogg",
+			"volume": 0
+		},
+		{
+			"character": "character-1672875775.json",
+			"event_id": "dialogic_001",
+			"portrait": "",
 			"text": "Password: GHYF12FGXNMQ"
+		},
+		{
+			"character": "",
+			"event_id": "dialogic_001",
+			"portrait": "",
+			"text": "Squeak squeak"
 		}
 	],
 	"metadata": {

godot/dialogic/timelines/timeline-1672875631.json

@@ -0,0 +1,44 @@
+{
+	"events": [
+		{
+			"block_input": true,
+			"event_id": "dialogic_050",
+			"wait_time": 4
+		},
+		{
+			"event_id": "dialogic_024",
+			"set_theme": "theme-1672875796.cfg"
+		},
+		{
+			"character": "",
+			"event_id": "dialogic_001",
+			"portrait": "",
+			"text": "...Where am I?"
+		},
+		{
+			"audio": "play",
+			"audio_bus": "Master",
+			"event_id": "dialogic_030",
+			"event_name": "AudioEvent",
+			"file": "res://assets/audio/synthsparkle.wav",
+			"volume": 0
+		},
+		{
+			"character": "",
+			"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": {
+		"dialogic-version": "1.4.5",
+		"file": "timeline-1672875631.json",
+		"name": "heaven"
+	}
+}

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(

godot/screens/Intro.gd

@@ -0,0 +1,4 @@
+extends Control
+
+func _ready():
+	add_child(Dialogic.start("intro"))

godot/screens/Intro.tscn

@@ -0,0 +1,16 @@
+[gd_scene load_steps=3 format=2]
+
+[ext_resource path="res://screens/Intro.gd" type="Script" id=1]
+[ext_resource path="res://effects/grainy_shader.tscn" type="PackedScene" id=2]
+
+[node name="Intro" type="Control"]
+anchor_right = 1.0
+anchor_bottom = 1.0
+script = ExtResource( 1 )
+
+[node name="ColorRect" type="ColorRect" parent="."]
+anchor_right = 1.0
+anchor_bottom = 1.0
+color = Color( 0, 0, 0, 1 )
+
+[node name="shader" parent="." instance=ExtResource( 2 )]

godot/screens/TitleMenu.gd

@@ -8,7 +8,7 @@ func _on_PlayButton_pressed():
 	$BlackoutSound.play()
 	$ButtonContainer.visible = false
 	$BlackoutScreen.visible = true
-	var dialog = Dialogic.start("intro")
+	var dialog = Dialogic.start("chapterselect")
 	add_child(dialog)
 
 func _on_Credits_pressed():
@@ -16,7 +16,11 @@ func _on_Credits_pressed():
 	add_child(dialog)
 
 func _on_Controls_pressed():
-	var _err = get_tree().change_scene("res://assets/meat_bore/meat_heaven.tscn")
+	var dialog = Dialogic.start("controls")
+	add_child(dialog)
 
 func _on_QuitButton_pressed():
 	get_tree().quit()
+
+func _on_heavenButton_pressed():
+	var _err = get_tree().change_scene("res://assets/meat_bore/meat_heaven.tscn")

godot/screens/TitleScreen_Planet.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=12 format=2]
+[gd_scene load_steps=13 format=2]
 
 [ext_resource path="res://assets/title_font.tres" type="DynamicFont" id=1]
 [ext_resource path="res://effects/WorldEnvironment.tscn" type="PackedScene" id=2]
@@ -44,6 +44,8 @@ glow_bloom = 1.0
 glow_blend_mode = 0
 glow_high_quality = true
 
+[sub_resource type="StyleBoxEmpty" id=3]
+
 [node name="titlescreen_planet" type="Spatial"]
 
 [node name="Camera" type="Camera" parent="."]
@@ -150,7 +152,19 @@ stream = ExtResource( 7 )
 
 [node name="grainy_shader" parent="TitleMenu" instance=ExtResource( 3 )]
 
+[node name="heavenButton" type="Button" parent="TitleMenu"]
+margin_left = -164.0
+margin_top = -176.0
+margin_right = -92.0
+margin_bottom = -112.0
+custom_styles/normal = SubResource( 3 )
+shortcut_in_tooltip = false
+action_mode = 0
+text = " "
+flat = true
+
 [connection signal="pressed" from="TitleMenu/ButtonContainer/PlayButton" to="TitleMenu" method="_on_PlayButton_pressed"]
 [connection signal="pressed" from="TitleMenu/ButtonContainer/Credits" to="TitleMenu" method="_on_Credits_pressed"]
 [connection signal="pressed" from="TitleMenu/ButtonContainer/Controls" to="TitleMenu" method="_on_Controls_pressed"]
 [connection signal="pressed" from="TitleMenu/ButtonContainer/QuitButton" to="TitleMenu" method="_on_QuitButton_pressed"]
+[connection signal="pressed" from="TitleMenu/heavenButton" to="TitleMenu" method="_on_heavenButton_pressed"]