Merge branch 'master' of https://git.sjkillen.ca/sjkillen/meat_madness_redux

godot/.import/Heart.glb-03edb798deac687a63191bbe1d39c8b6.md5

@@ -0,0 +1,3 @@
+source_md5="25fe832215a1654e3f4bd4f61e46b1db"
+dest_md5="dd6485562e52182e438b58085cc2f822"
+

godot/assets/models/Heart.tscn

@@ -0,0 +1,47 @@
+[gd_scene load_steps=5 format=2]
+
+[ext_resource path="res://assets/models/Heart.glb" type="PackedScene" id=1]
+[ext_resource path="res://assets/models/PlanetMaterial.material" type="Material" id=2]
+[ext_resource path="res://assets/audio/ambient_heartbeat.ogg" type="AudioStream" id=3]
+
+[sub_resource type="Animation" id=1]
+resource_name = "heartbeat"
+length = 3.0
+loop = true
+tracks/0/type = "audio"
+tracks/0/path = NodePath("AudioStreamPlayer")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/keys = {
+"clips": [ {
+"end_offset": 0.0,
+"start_offset": 0.0,
+"stream": ExtResource( 3 )
+} ],
+"times": PoolRealArray( -1.8 )
+}
+tracks/1/type = "transform"
+tracks/1/path = NodePath("Heart")
+tracks/1/interp = 2
+tracks/1/loop_wrap = true
+tracks/1/imported = false
+tracks/1/enabled = true
+tracks/1/keys = PoolRealArray( 0, 1, 0, 0, 0, 0, 0, 0, 1, 10.4637, 10.3542, 10, 0.3, 1, 0, 0, 0, 0, 0, 0, 1, 8, 9, 10, 1.3, 1, 0, 0, 0, 0, 0, 0, 1, 12, 11, 10, 1.6, 1, 0, 0, 0, 0, 0, 0, 1, 10, 8, 10, 2.5, 1, 0, 0, 0, 0, 0, 0, 1, 11, 12, 10, 2.7, 1, 0, 0, 0, 0, 0, 0, 1, 10, 10, 10, 2.9, 1, 0, 0, 0, 0, 0, 0, 1, 9, 10.7, 10 )
+
+[node name="Heart" instance=ExtResource( 1 )]
+
+[node name="Heart" parent="." index="1"]
+transform = Transform( 11.3395, 0, 0, 0, 10.8045, 0, 0, 0, 10, 0, 0, 0 )
+material/0 = ExtResource( 2 )
+
+[node name="AnimationPlayer" type="AnimationPlayer" parent="." index="2"]
+autoplay = "heartbeat"
+playback_speed = 0.75
+anims/heartbeat = SubResource( 1 )
+
+[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="." index="3"]
+stream = ExtResource( 3 )
+volume_db = 10.0
+autoplay = true

godot/dialogic/timelines/timeline-1667667789.json

@@ -4,6 +4,19 @@
 			"event_id": "dialogic_024",
 			"set_theme": "default-theme.cfg"
 		},
+		{
+			"condition": "",
+			"definition": "1672784130-787",
+			"event_id": "dialogic_012",
+			"value": "true"
+		},
+		{
+			"anchor_id": "anchor-1634488067",
+			"event_id": "dialogic_016"
+		},
+		{
+			"event_id": "dialogic_013"
+		},
 		{
 			"condition": "!=",
 			"definition": "1667755202-648",
@@ -22,7 +35,7 @@
 			"character": "",
 			"event_id": "dialogic_001",
 			"portrait": "",
-			"text": "(Your neural scanner blinks. IDENTITY: GUY BRIMLEY. AGE: 29. CONDITION: STABLE.)"
+			"text": "(Your neural scanner blinks. IDENTITY: GUY BRIMLEY. AGE: 29. CONDITION: STABLE)"
 		},
 		{
 			"character": "character-1667667572.json",
@@ -46,7 +59,7 @@
 			"character": "character-1667667572.json",
 			"event_id": "dialogic_001",
 			"portrait": "",
-			"text": "Name, age, physical condition... Hardly even need to talk to anyone anymore! Heh... heh."
+			"text": "Name, age, physical condition... Hardly even need to talk to anyone anymore! Heh... heh"
 		},
 		{
 			"event_id": "dialogic_013"
@@ -69,13 +82,13 @@
 			"character": "",
 			"event_id": "dialogic_001",
 			"portrait": "",
-			"text": "(Your neural scanner blinks. IDENTITY: GUY BRIMLEY. AGE: 29. CONDITION: STABLE.)"
+			"text": "(Your neural scanner blinks. IDENTITY: GUY BRIMLEY. AGE: 29. CONDITION: STABLE)"
 		},
 		{
 			"character": "character-1667667572.json",
 			"event_id": "dialogic_001",
 			"portrait": "",
-			"text": "John Stuart right? Nice to... [color=red]meat[/color] you. Heh heh."
+			"text": "John Stuart right? Nice to... [color=red]meat[/color] you. Heh heh"
 		},
 		{
 			"character": "character-1667667572.json",
@@ -106,25 +119,25 @@
 			"character": "character-1667667572.json",
 			"event_id": "dialogic_001",
 			"portrait": "",
-			"text": "DSV-PRovender's black box says the crew went AWOL a few weeks ago. You need to head down into the mining pit behind me to recover samples."
+			"text": "DSV-PRovender's black box says the crew went AWOL a few weeks ago. You need to head down into the mining pit behind me 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 to collect a neural scan. The lab rats will use it to clone them back on the homeworld"
 		},
 		{
 			"character": "character-1667667572.json",
 			"event_id": "dialogic_001",
 			"portrait": "",
-			"text": "As for DNA... er, well. You have your scalpel? Try to cut at least 50 grams of muscle. Oh! And bone is good too."
+			"text": "As for DNA... er, well. You have your scalpel? Try to cut at least 50 grams of muscle. Oh! And bone is good too"
 		},
 		{
 			"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, anyway"
 		},
 		{
 			"character": "character-1667667572.json",
@@ -161,22 +174,108 @@
 			"event_id": "dialogic_013"
 		},
 		{
-			"character": "character-1667667572.json",
+			"definition": "1672784130-787",
-			"event_id": "dialogic_001",
+			"event_id": "dialogic_014",
-			"portrait": "",
+			"operation": "=",
-			"text": "Try to find samples for as many of the DSV-Provender's crew as you can. But don't come back without a scan of Jackie Voss, the ship's captain."
+			"random_upper_limit": 100,
+			"set_random": false,
+			"set_value": "true"
 		},
 		{
 			"character": "character-1667667572.json",
 			"event_id": "dialogic_001",
 			"portrait": "",
-			"text": "Word is IngestiCorp will pay top dollar to get her back."
+			"text": "One last thing..."
 		},
 		{
 			"character": "character-1667667572.json",
 			"event_id": "dialogic_001",
 			"portrait": "",
-			"text": "Don’t make me wait for too long, Stuart. This place gives me the creeps."
+			"text": "Since you're a rookie, do you want me to enable the gliding function on your suit? "
+		},
+		{
+			"character": "character-1667667572.json",
+			"event_id": "dialogic_001",
+			"portrait": "",
+			"text": "It makes recovery a breeze. Tthe fuel costs an arm and a leg though"
+		},
+		{
+			"event_id": "dialogic_015",
+			"id": "anchor-1634488067",
+			"index": 0,
+			"name": "glider/briefing"
+		},
+		{
+			"character": "character-1667667572.json",
+			"event_id": "dialogic_010",
+			"options": [
+
+			],
+			"portrait": "",
+			"question": "Still want the glider? The costs are coming out of your end"
+		},
+		{
+			"choice": "Yes",
+			"condition": "",
+			"definition": "",
+			"event_id": "dialogic_011",
+			"value": ""
+		},
+		{
+			"character": "character-1667667572.json",
+			"event_id": "dialogic_001",
+			"portrait": "",
+			"text": "Fine. Hold (Space)/(R1) to slow your fall. Should make climbing down easier"
+		},
+		{
+			"definition": "1672783730-648",
+			"event_id": "dialogic_014",
+			"operation": "=",
+			"random_upper_limit": 100,
+			"set_random": false,
+			"set_value": "true"
+		},
+		{
+			"choice": "No",
+			"condition": "",
+			"definition": "",
+			"event_id": "dialogic_011",
+			"value": ""
+		},
+		{
+			"character": "character-1667667572.json",
+			"event_id": "dialogic_001",
+			"portrait": "",
+			"text": "Brave. Heh. Well, suit yourself"
+		},
+		{
+			"definition": "1672783730-648",
+			"event_id": "dialogic_014",
+			"operation": "=",
+			"random_upper_limit": 100,
+			"set_random": false,
+			"set_value": "false"
+		},
+		{
+			"event_id": "dialogic_013"
+		},
+		{
+			"character": "character-1667667572.json",
+			"event_id": "dialogic_001",
+			"portrait": "",
+			"text": "Try to find samples for as many of the DSV-Provender's crew as you can. But don't come back without a scan of Jackie Voss, the ship's captain"
+		},
+		{
+			"character": "character-1667667572.json",
+			"event_id": "dialogic_001",
+			"portrait": "",
+			"text": "Word is IngestiCorp will pay top dollar to get her back"
+		},
+		{
+			"character": "character-1667667572.json",
+			"event_id": "dialogic_001",
+			"portrait": "",
+			"text": "Don’t make me wait for too long, Stuart. This place gives me the creeps"
 		},
 		{
 			"event_id": "dialogic_022",

godot/dialogic/timelines/timeline-1667671061.json

@@ -269,7 +269,7 @@
 			"set_value": "true"
 		},
 		{
-			"change_scene": "",
+			"change_scene": "res://screens/HeartEnding.tscn",
 			"event_id": "dialogic_041"
 		},
 		{

godot/dialogic/timelines/timeline-1672265563.json

@@ -46,7 +46,7 @@
 			"condition": "<=",
 			"definition": "1672699752-574",
 			"event_id": "dialogic_012",
-			"value": "4"
+			"value": "5"
 		},
 		{
 			"definition": "1672699752-574",

godot/dialogic/timelines/timeline-1672267820.json

@@ -58,7 +58,7 @@
 			"condition": "<=",
 			"definition": "1672699752-574",
 			"event_id": "dialogic_012",
-			"value": "4"
+			"value": "5"
 		},
 		{
 			"definition": "1672699752-574",

godot/dialogic/timelines/timeline-1672267850.json

@@ -52,7 +52,7 @@
 			"condition": "<=",
 			"definition": "1672699752-574",
 			"event_id": "dialogic_012",
-			"value": "4"
+			"value": "5"
 		},
 		{
 			"definition": "1672699752-574",

godot/dialogic/timelines/timeline-1672267872.json

@@ -46,7 +46,7 @@
 			"condition": "<=",
 			"definition": "1672699752-574",
 			"event_id": "dialogic_012",
-			"value": "4"
+			"value": "5"
 		},
 		{
 			"definition": "1672699752-574",

godot/dialogic/timelines/timeline-1672267892.json

@@ -70,7 +70,7 @@
 			"condition": "<=",
 			"definition": "1672699752-574",
 			"event_id": "dialogic_012",
-			"value": "4"
+			"value": "5"
 		},
 		{
 			"definition": "1672699752-574",

godot/dialogic/timelines/timeline-1672623960.json

@@ -71,7 +71,7 @@
 			"value": ""
 		},
 		{
-			"change_scene": "",
+			"change_scene": "res://assets/meat_bore/level.tscn",
 			"event_id": "dialogic_041"
 		},
 		{
@@ -129,6 +129,10 @@
 			"portrait": "",
 			"text": "Come back when you’ve gathered enough data"
 		},
+		{
+			"anchor_id": "anchor-1634488067",
+			"event_id": "dialogic_016"
+		},
 		{
 			"event_id": "dialogic_013"
 		},
@@ -310,15 +314,90 @@
 			"text": "Come back when you’ve found five data fragments. That should be enough to paint a clear picture of their final movements"
 		},
 		{
-			"definition": "1672699872-250",
+			"event_id": "dialogic_015",
+			"id": "anchor-1634488067",
+			"index": 0,
+			"name": "glider/float"
+		},
+		{
+			"character": "character-1667667572.json",
+			"event_id": "dialogic_001",
+			"portrait": "",
+			"text": "One last thing..."
+		},
+		{
+			"character": "character-1667667572.json",
+			"event_id": "dialogic_001",
+			"portrait": "",
+			"text": "Since you're a rookie, do you want me to enable the gliding function on your suit? "
+		},
+		{
+			"character": "character-1667667572.json",
+			"event_id": "dialogic_001",
+			"portrait": "",
+			"text": "It makes recovery a breeze. Tthe fuel costs an arm and a leg though"
+		},
+		{
+			"character": "character-1667667572.json",
+			"event_id": "dialogic_010",
+			"options": [
+
+			],
+			"portrait": "",
+			"question": "Still want the glider? The costs are coming out of your end"
+		},
+		{
+			"choice": "Yes",
+			"condition": "",
+			"definition": "",
+			"event_id": "dialogic_011",
+			"value": ""
+		},
+		{
+			"character": "character-1667667572.json",
+			"event_id": "dialogic_001",
+			"portrait": "",
+			"text": "Fine. Hold (Space)/(R1) to slow your fall. Should make climbing down easier"
+		},
+		{
+			"definition": "1672783730-648",
 			"event_id": "dialogic_014",
 			"operation": "=",
 			"random_upper_limit": 100,
 			"set_random": false,
 			"set_value": "true"
 		},
+		{
+			"choice": "No",
+			"condition": "",
+			"definition": "",
+			"event_id": "dialogic_011",
+			"value": ""
+		},
+		{
+			"character": "character-1667667572.json",
+			"event_id": "dialogic_001",
+			"portrait": "",
+			"text": "Brave. Heh. Well, suit yourself"
+		},
+		{
+			"definition": "1672783730-648",
+			"event_id": "dialogic_014",
+			"operation": "=",
+			"random_upper_limit": 100,
+			"set_random": false,
+			"set_value": "false"
+		},
 		{
 			"event_id": "dialogic_013"
+		},
+		{
+			"definition": "1672699872-250",
+			"event_id": "dialogic_014",
+			"operation": "=",
+			"random_upper_limit": 100,
+			"set_random": false,
+			"set_value": "true"
 		}
 	],
 	"metadata": {

godot/project.godot

@@ -93,6 +93,7 @@ _global_script_class_icons={
 [application]
 
 config/name="meat_madness_redux"
+run/main_scene="res://screens/TitleScreen_Planet.tscn"
 config/icon="res://meat_madness_icon.png"
 
 [autoload]

godot/screens/HeartEnding.gd

@@ -0,0 +1,16 @@
+extends Spatial
+
+
+# Declare member variables here. Examples:
+# var a = 2
+# var b = "text"
+
+
+# Called when the node enters the scene tree for the first time.
+func _ready():
+	$blackscreen.visible = false
+	var dialog = Dialogic.start("end")
+	add_child(dialog)
+# Called every frame. 'delta' is the elapsed time since the previous frame.
+#func _process(delta):
+#	pass

godot/screens/HeartEnding.tscn

@@ -0,0 +1,46 @@
+[gd_scene load_steps=7 format=2]
+
+[ext_resource path="res://assets/models/Heart.tscn" type="PackedScene" id=1]
+[ext_resource path="res://effects/WorldEnvironment.tscn" type="PackedScene" id=2]
+[ext_resource path="res://assets/models/meat_tentacle_small.tscn" type="PackedScene" id=3]
+[ext_resource path="res://effects/grainy_shader.tscn" type="PackedScene" id=4]
+[ext_resource path="res://assets/audio/ambient_heartbeat.ogg" type="AudioStream" id=5]
+[ext_resource path="res://screens/HeartEnding.gd" type="Script" id=6]
+
+[node name="heart_ending" type="Spatial"]
+script = ExtResource( 6 )
+
+[node name="blackscreen" type="ColorRect" parent="."]
+anchor_right = 1.0
+anchor_bottom = 1.0
+color = Color( 0, 0, 0, 1 )
+
+[node name="shader" parent="." instance=ExtResource( 4 )]
+
+[node name="WorldEnvironment" parent="." instance=ExtResource( 2 )]
+
+[node name="Camera" type="Camera" parent="."]
+transform = Transform( 0.145734, 0.13343, -0.980285, -0.0204041, 0.991058, 0.131863, 0.989113, 0.000784954, 0.147153, -3.43266, 1.02248, -0.846802 )
+
+[node name="Heart" parent="." instance=ExtResource( 1 )]
+transform = Transform( -0.782048, 0.146739, -0.605696, 0.116013, 0.989175, 0.089852, 0.612325, 0, -0.790607, -0.387377, 0.290657, -1.64202 )
+
+[node name="meat_tentacle_small" parent="Heart" instance=ExtResource( 3 )]
+transform = Transform( 0.0317564, 0, -0.258797, 0, 0.168975, 0, 0.214405, 0, 0.182746, 0.471543, 0.575447, 0.239657 )
+
+[node name="meat_tentacle_small3" parent="Heart" instance=ExtResource( 3 )]
+transform = Transform( -0.0761471, -0.00510652, -0.118058, -0.0728645, 0.271183, 0.227445, 0.0535864, 0.102396, -0.18501, 0.193898, 0.384063, 0.276777 )
+
+[node name="meat_tentacle_small2" parent="Heart" instance=ExtResource( 3 )]
+transform = Transform( 0.0981168, 0.012894, -0.0180828, 0, 0.119073, 0.0849054, 0.0296888, -0.139139, 0.19513, 0.0934034, 0.36021, -0.400155 )
+
+[node name="DirectionalLight" type="DirectionalLight" parent="Heart"]
+transform = Transform( 0.768228, 0.639673, -0.025389, -0.405596, 0.517027, 0.753774, 0.495295, -0.568773, 0.656643, 5.4468, 5.17113, 1.67086 )
+light_color = Color( 0.317647, 0.0156863, 0.0156863, 1 )
+light_energy = 16.0
+shadow_enabled = true
+
+[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
+stream = ExtResource( 5 )
+volume_db = 10.0
+autoplay = true