Compare commits
	
		
			No commits in common. "a0a559c4ca4301924a39012787407e3c142871f8" and "5b347ee250ae3606c44e227fe359fe1a2b9c8eda" have entirely different histories.
		
	
	
		
			a0a559c4ca
			...
			5b347ee250
		
	
		
					 6 changed files with 7 additions and 56 deletions
				
			
		| 
						 | 
					@ -6,4 +6,3 @@ https://freesound.org/people/deadrobotmusic/sounds/555462/
 | 
				
			||||||
https://freesound.org/people/saturdaysoundguy/sounds/388019/
 | 
					https://freesound.org/people/saturdaysoundguy/sounds/388019/
 | 
				
			||||||
https://freesound.org/people/pfranzen/sounds/404327/
 | 
					https://freesound.org/people/pfranzen/sounds/404327/
 | 
				
			||||||
 | 
					
 | 
				
			||||||
https://freesound.org/people/ztitchez/packs/20841/
 | 
					 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,4 +1,4 @@
 | 
				
			||||||
[gd_scene load_steps=10 format=2]
 | 
					[gd_scene load_steps=9 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.tscn" type="PackedScene" id=1]
 | 
				
			||||||
[ext_resource path="res://assets/meat_bore/meat_module/meat_module_outside_walls_1.png" type="Texture" id=2]
 | 
					[ext_resource path="res://assets/meat_bore/meat_module/meat_module_outside_walls_1.png" type="Texture" id=2]
 | 
				
			||||||
| 
						 | 
					@ -7,14 +7,12 @@
 | 
				
			||||||
[ext_resource path="res://assets/models/meat_tentacle.tscn" type="PackedScene" id=5]
 | 
					[ext_resource path="res://assets/models/meat_tentacle.tscn" type="PackedScene" id=5]
 | 
				
			||||||
[ext_resource path="res://assets/models/meatcircle.tscn" type="PackedScene" id=6]
 | 
					[ext_resource path="res://assets/models/meatcircle.tscn" type="PackedScene" id=6]
 | 
				
			||||||
[ext_resource path="res://assets/meat_bore/npcs/inherited/lee.tscn" type="PackedScene" id=7]
 | 
					[ext_resource path="res://assets/meat_bore/npcs/inherited/lee.tscn" type="PackedScene" id=7]
 | 
				
			||||||
[ext_resource path="res://assets/audio/ambient_drone.ogg" type="AudioStream" id=8]
 | 
					 | 
				
			||||||
[ext_resource path="res://assets/meat_bore/dialogue_platform.tscn" type="PackedScene" id=9]
 | 
					[ext_resource path="res://assets/meat_bore/dialogue_platform.tscn" type="PackedScene" id=9]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[node name="level_lee" type="Spatial"]
 | 
					[node name="level_lee" type="Spatial"]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[node name="meat_module_1" parent="." instance=ExtResource( 1 )]
 | 
					[node name="meat_module_1" parent="." instance=ExtResource( 1 )]
 | 
				
			||||||
texture = ExtResource( 2 )
 | 
					texture = ExtResource( 2 )
 | 
				
			||||||
audio = ExtResource( 8 )
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
[node name="meat_spiral" parent="." instance=ExtResource( 3 )]
 | 
					[node name="meat_spiral" parent="." instance=ExtResource( 3 )]
 | 
				
			||||||
transform = Transform( 0.989982, 0, 0, 0, -4.37114e-08, -1.1, 0, 1.02073, -4.90795e-08, 0, -123.038, 0 )
 | 
					transform = Transform( 0.989982, 0, 0, 0, -4.37114e-08, -1.1, 0, 1.02073, -4.90795e-08, 0, -123.038, 0 )
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -43,17 +43,6 @@
 | 
				
			||||||
			"event_id": "dialogic_022",
 | 
								"event_id": "dialogic_022",
 | 
				
			||||||
			"transition_duration": 1
 | 
								"transition_duration": 1
 | 
				
			||||||
		},
 | 
							},
 | 
				
			||||||
		{
 | 
					 | 
				
			||||||
			"choice": "Chapter 3- The End",
 | 
					 | 
				
			||||||
			"condition": "",
 | 
					 | 
				
			||||||
			"definition": "",
 | 
					 | 
				
			||||||
			"event_id": "dialogic_011",
 | 
					 | 
				
			||||||
			"value": ""
 | 
					 | 
				
			||||||
		},
 | 
					 | 
				
			||||||
		{
 | 
					 | 
				
			||||||
			"change_scene": "res://jackie_skip.tscn",
 | 
					 | 
				
			||||||
			"event_id": "dialogic_041"
 | 
					 | 
				
			||||||
		},
 | 
					 | 
				
			||||||
		{
 | 
							{
 | 
				
			||||||
			"event_id": "dialogic_013"
 | 
								"event_id": "dialogic_013"
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,23 +0,0 @@
 | 
				
			||||||
[gd_scene load_steps=7 format=2]
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
[ext_resource path="res://effects/grainy_shader.tscn" type="PackedScene" id=1]
 | 
					 | 
				
			||||||
[ext_resource path="res://assets/meat_bore/meat_module/level_jackie.tscn" type="PackedScene" id=2]
 | 
					 | 
				
			||||||
[ext_resource path="res://player/player.tscn" type="PackedScene" id=3]
 | 
					 | 
				
			||||||
[ext_resource path="res://effects/WorldEnvironment.tscn" type="PackedScene" id=4]
 | 
					 | 
				
			||||||
[ext_resource path="res://effects/MeatSinkParameters.tscn" type="PackedScene" id=5]
 | 
					 | 
				
			||||||
[ext_resource path="res://assets/meat_bore/meat_module/level_wally.tscn" type="PackedScene" id=6]
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
[node name="jackie_skip" type="Spatial"]
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
[node name="level_jackie" parent="." instance=ExtResource( 2 )]
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
[node name="WorldEnvironment" parent="." instance=ExtResource( 4 )]
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
[node name="shader" parent="." instance=ExtResource( 1 )]
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
[node name="Player" parent="." instance=ExtResource( 3 )]
 | 
					 | 
				
			||||||
transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 2.05098, -464.864, -2.97118 )
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
[node name="MeatSinkParameters" parent="." instance=ExtResource( 5 )]
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
[node name="level_wally" parent="." instance=ExtResource( 6 )]
 | 
					 | 
				
			||||||
| 
						 | 
					@ -16,7 +16,7 @@ func _on_Credits_pressed():
 | 
				
			||||||
	add_child(dialog)
 | 
						add_child(dialog)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
func _on_Controls_pressed():
 | 
					func _on_Controls_pressed():
 | 
				
			||||||
	var _err = get_tree().change_scene("res://assets/meat_bore/meat_heaven.tscn")
 | 
						get_tree().change_scene("res://assets/meat_bore/meat_heaven.tscn")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
func _on_QuitButton_pressed():
 | 
					func _on_QuitButton_pressed():
 | 
				
			||||||
	get_tree().quit()
 | 
						get_tree().quit()
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -11,14 +11,14 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[sub_resource type="Animation" id=1]
 | 
					[sub_resource type="Animation" id=1]
 | 
				
			||||||
resource_name = "struggler_camera"
 | 
					resource_name = "struggler_camera"
 | 
				
			||||||
length = 20.0
 | 
					length = 10.0
 | 
				
			||||||
tracks/0/type = "transform"
 | 
					tracks/0/type = "transform"
 | 
				
			||||||
tracks/0/path = NodePath("Camera")
 | 
					tracks/0/path = NodePath("Camera")
 | 
				
			||||||
tracks/0/interp = 2
 | 
					tracks/0/interp = 2
 | 
				
			||||||
tracks/0/loop_wrap = true
 | 
					tracks/0/loop_wrap = true
 | 
				
			||||||
tracks/0/imported = false
 | 
					tracks/0/imported = false
 | 
				
			||||||
tracks/0/enabled = true
 | 
					tracks/0/enabled = true
 | 
				
			||||||
tracks/0/keys = PoolRealArray( 0, 1, 0, -0.239693, 4.30081, 0, 0, 0, 1, 1, 1, 1, 0.3, 1, 0, -0.239693, 4.30081, 0, 0, 0, 1, 1, 1, 1, 11.5, 1, 0, -0.377647, 1.43717, 0.0871558, 0, 0, 0.996195, 1, 1, 1 )
 | 
					tracks/0/keys = PoolRealArray( 0.1, 1, 0, -0.239693, 4.30081, 0, 0, 0, 1, 1, 1, 1, 8.4, 1, 0, -0.377647, 1.43717, 0.0871558, 0, 0, 0.996195, 1, 1, 1 )
 | 
				
			||||||
tracks/1/type = "value"
 | 
					tracks/1/type = "value"
 | 
				
			||||||
tracks/1/path = NodePath("blackscreen:visible")
 | 
					tracks/1/path = NodePath("blackscreen:visible")
 | 
				
			||||||
tracks/1/interp = 1
 | 
					tracks/1/interp = 1
 | 
				
			||||||
| 
						 | 
					@ -26,22 +26,10 @@ tracks/1/loop_wrap = true
 | 
				
			||||||
tracks/1/imported = false
 | 
					tracks/1/imported = false
 | 
				
			||||||
tracks/1/enabled = true
 | 
					tracks/1/enabled = true
 | 
				
			||||||
tracks/1/keys = {
 | 
					tracks/1/keys = {
 | 
				
			||||||
"times": PoolRealArray( 0, 3.1, 11.5 ),
 | 
					"times": PoolRealArray( 0.2, 9.1 ),
 | 
				
			||||||
"transitions": PoolRealArray( 1, 1, 1 ),
 | 
					"transitions": PoolRealArray( 1, 1 ),
 | 
				
			||||||
"update": 1,
 | 
					"update": 1,
 | 
				
			||||||
"values": [ true, false, true ]
 | 
					"values": [ false, true ]
 | 
				
			||||||
}
 | 
					 | 
				
			||||||
tracks/2/type = "value"
 | 
					 | 
				
			||||||
tracks/2/path = NodePath("blackscreen:modulate")
 | 
					 | 
				
			||||||
tracks/2/interp = 1
 | 
					 | 
				
			||||||
tracks/2/loop_wrap = true
 | 
					 | 
				
			||||||
tracks/2/imported = false
 | 
					 | 
				
			||||||
tracks/2/enabled = true
 | 
					 | 
				
			||||||
tracks/2/keys = {
 | 
					 | 
				
			||||||
"times": PoolRealArray( 0, 2.1, 3.1 ),
 | 
					 | 
				
			||||||
"transitions": PoolRealArray( 1, 1, 1 ),
 | 
					 | 
				
			||||||
"update": 0,
 | 
					 | 
				
			||||||
"values": [ Color( 1, 1, 1, 1 ), Color( 1, 1, 1, 1 ), Color( 1, 1, 1, 0 ) ]
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[node name="end_wall_struggler" type="Spatial"]
 | 
					[node name="end_wall_struggler" type="Spatial"]
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		
		Reference in a new issue