Merge branch 'spencer'

godot/addons/dialogic/Editor/Events/styles/ResourceMenuPanelBackground.tres

@@ -5,7 +5,7 @@ content_margin_left = 10.0
 content_margin_right = 10.0
 content_margin_top = 10.0
 content_margin_bottom = 10.0
-bg_color = Color( 0.03, 0.21, 0.26, 1 )
+bg_color = Color( 0.2, 0.23, 0.31, 1 )
 border_width_left = 1
 border_width_top = 1
 border_width_right = 1

godot/assets/meat_bore/meat_module/Area.gd

@@ -0,0 +1,6 @@
+extends Area
+
+
+func _on_Area_body_entered(body):
+	if body.get_parent() == Util.player:
+		Util.shader.mega_madness()

godot/assets/meat_bore/meat_module/level_jackie.tscn

@@ -1,10 +1,19 @@
-[gd_scene load_steps=6 format=2]
+[gd_scene load_steps=13 format=2]
 
 [ext_resource path="res://assets/meat_bore/meat_module/meat_module.tscn" type="PackedScene" id=1]
 [ext_resource path="res://assets/meat_bore/meat_module/meat_module_outside_walls_5.png" type="Texture" id=2]
 [ext_resource path="res://assets/meat_bore/npcs/inherited/jackie.tscn" type="PackedScene" id=3]
 [ext_resource path="res://assets/meat_bore/dialogue_platform.tscn" type="PackedScene" id=4]
 [ext_resource path="res://effects/SinkBlock.tscn" type="PackedScene" id=5]
+[ext_resource path="res://tests/bore_hole/DeathArea.gd" type="Script" id=6]
+[ext_resource path="res://assets/meat_bore/bridge.tscn" type="PackedScene" id=7]
+[ext_resource path="res://assets/models/heart/Heart_2.tscn" type="PackedScene" id=8]
+[ext_resource path="res://assets/models/black_box/black_box.tscn" type="PackedScene" id=9]
+[ext_resource path="res://assets/meat_bore/meat_module/Area.gd" type="Script" id=10]
+
+[sub_resource type="BoxShape" id=1]
+
+[sub_resource type="BoxShape" id=2]
 
 [node name="level_jackie" type="Spatial"]
 
@@ -23,3 +32,31 @@ transform = Transform( 0.957214, 0.289383, 0, -0.289383, 0.957214, 0, 0, 0, 1, -
 
 [node name="SinkBlock" parent="." instance=ExtResource( 5 )]
 transform = Transform( 30, 0, 0, 0, 1, 0, 0, 0, 30, -0.004, -469.575, 0.012 )
+
+[node name="bridge" parent="." instance=ExtResource( 7 )]
+transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, -525.933, -4.029 )
+
+[node name="Heart_2" parent="." instance=ExtResource( 8 )]
+transform = Transform( 4.51801e-05, -600, 4.63546e-06, -30.6993, 2.31773e-06, 599.214, -599.214, -4.53581e-05, -30.6993, 12.6254, -834.663, -7.77628 )
+
+[node name="Area" type="Area" parent="Heart_2"]
+script = ExtResource( 6 )
+
+[node name="CollisionShape" type="CollisionShape" parent="Heart_2/Area"]
+transform = Transform( 2, 0, 0, 0, 2, 0, 0, 0, 0.085, 0, 0, 0 )
+shape = SubResource( 1 )
+
+[node name="black_box" parent="." instance=ExtResource( 9 )]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 18.1989, -523.791, -3.90097 )
+id = 6
+
+[node name="Area" type="Area" parent="."]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -473.241, 0 )
+script = ExtResource( 10 )
+
+[node name="CollisionShape" type="CollisionShape" parent="Area"]
+transform = Transform( 500, 0, 0, 0, 13, 0, 0, 0, 500, 0, -3.39966, 0 )
+shape = SubResource( 2 )
+
+[connection signal="body_entered" from="Heart_2/Area" to="Heart_2/Area" method="_on_Area_body_entered"]
+[connection signal="body_entered" from="Area" to="Area" method="_on_Area_body_entered"]

godot/assets/models/heart/Heart_2.tscn

@@ -30,8 +30,8 @@ start_node = "HeartBeat"
 [node name="Heart_2" instance=ExtResource( 1 )]
 
 [node name="Heart" parent="." index="0"]
-blend_shapes/bulge1 = 0.56232
+blend_shapes/bulge1 = 0.251092
-blend_shapes/bulge2 = 0.43768
+blend_shapes/bulge2 = 0.748908
 
 [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="AnimationPlayer" index="0"]
 stream = ExtResource( 2 )

godot/dialogic/folder_structure.json

@@ -80,7 +80,8 @@
 				"timeline-1672623960.json",
 				"timeline-1672719153.json",
 				"timeline-1672725696.json",
-				"timeline-1672727997.json"
+				"timeline-1672727997.json",
+				"timeline-1672812380.json"
 			],
 			"folders": {
 

godot/dialogic/timelines/timeline-1672812380.json

@@ -0,0 +1,19 @@
+{
+	"events": [
+		{
+			"event_id": "dialogic_024",
+			"set_theme": "theme-1671745159.cfg"
+		},
+		{
+			"character": "",
+			"event_id": "dialogic_001",
+			"portrait": "",
+			"text": "[data corrupted]"
+		}
+	],
+	"metadata": {
+		"dialogic-version": "1.4.5",
+		"file": "timeline-1672812380.json",
+		"name": "blackbox_6"
+	}
+}

godot/effects/grainy_shader.gd

@@ -1,5 +1,13 @@
 extends Spatial
 
+func _ready():
+	Util.shader = self
+
+func mega_madness():
+	$CanvasLayer/ColorRect.visible = false
+	$CanvasLayer/ColorRect2.visible = true
+	$AudioStreamPlayer.play()
+
 func madness():
 	$CanvasLayer/ColorRect.visible = false
 	$CanvasLayer/ColorRect2.visible = true

godot/effects/grainy_shader.tscn

@@ -1,9 +1,10 @@
-[gd_scene load_steps=6 format=2]
+[gd_scene load_steps=7 format=2]
 
 [ext_resource path="res://effects/dithering/screen_space_shader.tres" type="Shader" id=1]
 [ext_resource path="res://effects/grainy_shader.tres" type="Material" id=2]
 [ext_resource path="res://effects/grainy_shader.gd" type="Script" id=3]
 [ext_resource path="res://assets/audio/sicky_drone_2.ogg" type="AudioStream" id=4]
+[ext_resource path="res://assets/audio/sicky_drone.ogg" type="AudioStream" id=5]
 
 [sub_resource type="ShaderMaterial" id=3]
 shader = ExtResource( 1 )
@@ -38,3 +39,6 @@ anchor_bottom = 1.0
 [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="CanvasLayer/ColorRect2"]
 stream = ExtResource( 4 )
 volume_db = 15.0
+
+[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
+stream = ExtResource( 5 )

godot/tests/bore_hole/DeathArea.gd

@@ -0,0 +1,6 @@
+extends Area
+
+
+func _on_Area_body_entered(body):
+	if body.get_parent() == Util.player:
+		var _err = get_tree().change_scene("res://screens/gameover_screen.tscn")

godot/util.gd

@@ -4,10 +4,10 @@ extends Node
 onready var player = null
 onready var meat_sink_parameters = null
 signal meat_sink_parameters
+var shader = null
 
 func never_called():
 	emit_signal("meat_sink_parameters")
-
 func vec3_componentwise_clamp(vec: Vector3, lower: float, upper: float) -> Vector3:
 	return Vector3(
 		clamp(vec.x, lower, upper),