Compare commits

..

2 Commits

Author SHA1 Message Date
Spencer Killen 1db4c70dc5
. 2023-01-04 12:49:02 -07:00
Spencer Killen a0a559c4ca
. 2023-01-04 11:27:39 -07:00
39 changed files with 206 additions and 26 deletions

View File

@ -6,3 +6,4 @@ https://freesound.org/people/deadrobotmusic/sounds/555462/
https://freesound.org/people/saturdaysoundguy/sounds/388019/
https://freesound.org/people/pfranzen/sounds/404327/
https://freesound.org/people/ztitchez/packs/20841/

View File

@ -0,0 +1,3 @@
source_md5="0d1325b97cf461ec5ec7808bc913ef42"
dest_md5="a023f068c0e8827fb675e4fbbb048cbb"

View File

@ -0,0 +1,3 @@
source_md5="3a385e14d6eb6923ccf91dd1cb28189d"
dest_md5="eb2c9ffbc38a068cbf20a25840d223c7"

View File

@ -0,0 +1,3 @@
source_md5="396555959e9e945bee2624e8e2a46459"
dest_md5="66fc2f88861c6a2cd6edd88297df06de"

View File

@ -0,0 +1,3 @@
source_md5="e94f463023ac83e135ac0a075d4dca04"
dest_md5="14b63a4d8594a89694c3941fd900d484"

BIN
godot/assets/audio/drones/level1.ogg (Stored with Git LFS) Normal file

Binary file not shown.

View File

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

BIN
godot/assets/audio/drones/level2.ogg (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,15 @@
[remap]
importer="ogg_vorbis"
type="AudioStreamOGGVorbis"
path="res://.import/level2.ogg-6452fe14260edca86c1a236af0796152.oggstr"
[deps]
source_file="res://assets/audio/drones/level2.ogg"
dest_files=[ "res://.import/level2.ogg-6452fe14260edca86c1a236af0796152.oggstr" ]
[params]
loop=true
loop_offset=0

BIN
godot/assets/audio/drones/level3.ogg (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,15 @@
[remap]
importer="ogg_vorbis"
type="AudioStreamOGGVorbis"
path="res://.import/level3.ogg-18e4672c1d31a79b63f24bf4c382578d.oggstr"
[deps]
source_file="res://assets/audio/drones/level3.ogg"
dest_files=[ "res://.import/level3.ogg-18e4672c1d31a79b63f24bf4c382578d.oggstr" ]
[params]
loop=true
loop_offset=0

BIN
godot/assets/audio/drones/level4.ogg (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,15 @@
[remap]
importer="ogg_vorbis"
type="AudioStreamOGGVorbis"
path="res://.import/level4.ogg-97d7f319d1a0afd0cc3c7d019cb66d14.oggstr"
[deps]
source_file="res://assets/audio/drones/level4.ogg"
dest_files=[ "res://.import/level4.ogg-97d7f319d1a0afd0cc3c7d019cb66d14.oggstr" ]
[params]
loop=true
loop_offset=0

View File

@ -0,0 +1,8 @@
extends Area
func _on_Area_body_entered(body):
if body.get_parent() == Util.player:
var d = Dialogic.start("password")
add_child(d)

View File

@ -0,0 +1,5 @@
extends AudioStreamPlayer
func _ready():
yield(GlobalEventBus, "new_ambient_music_start")
stop()

View File

@ -1,4 +1,4 @@
[gd_scene load_steps=17 format=2]
[gd_scene load_steps=19 format=2]
[ext_resource path="res://assets/meat_bore/meat_tunnel_top.tscn" type="PackedScene" id=1]
[ext_resource path="res://assets/meat_bore/meat_module/level_wally.tscn" type="PackedScene" id=2]
@ -15,6 +15,8 @@
[ext_resource path="res://assets/models/meat_tentacle.tscn" type="PackedScene" id=13]
[ext_resource path="res://assets/meat_bore/obelisk_ring.tscn" type="PackedScene" id=14]
[ext_resource path="res://assets/meat_bore/npcs/inherited/guy.tscn" type="PackedScene" id=15]
[ext_resource path="res://assets/audio/ambient_drone.ogg" type="AudioStream" id=16]
[ext_resource path="res://assets/meat_bore/SurfaceAmbientMusic.gd" type="Script" id=17]
[sub_resource type="Environment" id=3]
background_mode = 2
@ -137,4 +139,9 @@ transform = Transform( -95.0824, 0, 30.9731, 0, 100, 0, -30.9731, 0, -95.0824, 0
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.746, 0 )
[node name="guy" parent="." instance=ExtResource( 15 )]
transform = Transform( 2, 0, 0, 0, 2, 0, 0, 0, 2, -0.524274, 0.652003, 82.3411 )
transform = Transform( 1.5, 0, 0, 0, 1.5, 0, 0, 0, 1.5, -0.524274, 0.652003, 82.3411 )
[node name="SurfaceAmbientMusic" type="AudioStreamPlayer" parent="."]
stream = ExtResource( 16 )
autoplay = true
script = ExtResource( 17 )

File diff suppressed because one or more lines are too long

View File

@ -5,6 +5,7 @@ func _on_AmbientAudioRegion_body_entered(body):
return
$AmbientAudio.play()
$AnimationPlayer.play("fade")
GlobalEventBus.emit_signal("new_ambient_music_start")
func _on_AmbientAudioRegion_body_exited(body):

View File

@ -1,4 +1,4 @@
[gd_scene load_steps=7 format=2]
[gd_scene load_steps=8 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/bridge.tscn" type="PackedScene" id=2]
@ -6,12 +6,14 @@
[ext_resource path="res://assets/meat_bore/Swquish.tscn" type="PackedScene" id=4]
[ext_resource path="res://assets/meat_bore/npcs/inherited/alexis.tscn" type="PackedScene" id=5]
[ext_resource path="res://assets/meat_bore/dialogue_platform.tscn" type="PackedScene" id=6]
[ext_resource path="res://assets/audio/drones/level3.ogg" type="AudioStream" id=7]
[node name="level_alexis" type="Spatial"]
[node name="meat_module_3" parent="." instance=ExtResource( 1 )]
transform = Transform( -0.341905, 0, -0.939734, 0, 1, 0, 0.939734, 0, -0.341905, 0, -229.622, 0 )
texture = ExtResource( 3 )
audio = ExtResource( 7 )
[node name="Swquish" parent="." instance=ExtResource( 4 )]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -247.072, 0 )

View File

@ -1,4 +1,4 @@
[gd_scene load_steps=9 format=2]
[gd_scene load_steps=10 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_2.png" type="Texture" id=2]
@ -6,6 +6,7 @@
[ext_resource path="res://assets/meat_bore/bridge.tscn" type="PackedScene" id=4]
[ext_resource path="res://assets/models/meat_tentacle.tscn" type="PackedScene" id=5]
[ext_resource path="res://assets/models/meat_tentacle_small.tscn" type="PackedScene" id=6]
[ext_resource path="res://assets/audio/drones/level2.ogg" type="AudioStream" id=7]
[ext_resource path="res://assets/meat_bore/npcs/inherited/clark.tscn" type="PackedScene" id=8]
[ext_resource path="res://assets/meat_bore/dialogue_platform.tscn" type="PackedScene" id=9]
@ -28,6 +29,7 @@ shadow_enabled = true
[node name="meat_module_2" parent="." instance=ExtResource( 1 )]
transform = Transform( 0.742409, 0, 0.669947, 0, 1, 0, -0.669947, 0, 0.742409, 0, -114.811, 0 )
texture = ExtResource( 2 )
audio = ExtResource( 7 )
[node name="meatcircle" parent="." instance=ExtResource( 3 )]
transform = Transform( -0.0599631, -2.54901, 3.84308, 4.72262, 0.154299, -0.0388896, -0.0780571, 5.51163, 4.34052, 16.0579, -173.995, -14.3824 )

View File

@ -52,7 +52,7 @@ transform = Transform( 4.51801e-05, -600, 4.63546e-06, -30.6993, 2.31773e-06, 59
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 )
transform = Transform( 2, 0, 0, 0, 2, 0, 0, 0, 0.062, 0, 0, 0 )
shape = SubResource( 1 )
[node name="black_box" parent="." instance=ExtResource( 9 )]

View File

@ -1,4 +1,4 @@
[gd_scene load_steps=9 format=2]
[gd_scene load_steps=10 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_1.png" type="Texture" id=2]
@ -7,12 +7,14 @@
[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/meat_bore/npcs/inherited/lee.tscn" type="PackedScene" id=7]
[ext_resource path="res://assets/audio/drones/level1.ogg" type="AudioStream" id=8]
[ext_resource path="res://assets/meat_bore/dialogue_platform.tscn" type="PackedScene" id=9]
[node name="level_lee" type="Spatial"]
[node name="meat_module_1" parent="." instance=ExtResource( 1 )]
texture = ExtResource( 2 )
audio = ExtResource( 8 )
[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 )

View File

@ -1,4 +1,4 @@
[gd_scene load_steps=11 format=2]
[gd_scene load_steps=12 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_4.png" type="Texture" id=2]
@ -10,6 +10,7 @@
[ext_resource path="res://assets/models/meat_tentacle_small.tscn" type="PackedScene" id=8]
[ext_resource path="res://assets/meat_creek/creek_platform.tscn" type="PackedScene" id=9]
[ext_resource path="res://assets/models/meat_tentacle.tscn" type="PackedScene" id=10]
[ext_resource path="res://assets/audio/drones/level4.ogg" type="AudioStream" id=11]
[node name="level_wally" type="Spatial"]
@ -28,6 +29,7 @@ transform = Transform( 2.09804, 0, 0, 0, 1, 0, 0, 0, 1.93413, 4.80014, -404.599,
[node name="meat_module_4" parent="." instance=ExtResource( 1 )]
transform = Transform( 0.882693, 0, 0.469949, 0, 1, 0, -0.469949, 0, 0.882693, 0, -344.433, 0 )
texture = ExtResource( 2 )
audio = ExtResource( 11 )
[node name="bridge" parent="." instance=ExtResource( 5 )]
transform = Transform( 0.930046, 0, -0.367443, 0, 1, 0, 0.367443, 0, 0.930046, 7.31136, -410.338, 21.682 )

View File

@ -18,7 +18,7 @@ shape = SubResource( 1 )
[node name="StaticBody" type="StaticBody" parent="."]
[node name="CollisionShape" type="CollisionShape" parent="StaticBody"]
transform = Transform( 1, 0, 0, 0, 9.98379, 0, 0, 0, 1, 0, 0, 0 )
transform = Transform( 0.5, 0, 0, 0, 9.984, 0, 0, 0, 0.5, -0.00283813, 0.00507665, 0.0029031 )
shape = SubResource( 2 )
[node name="SignalGenerator" parent="." instance=ExtResource( 1 )]

View File

@ -389,7 +389,7 @@ max_wait = 30.0
one_shot = true
[node name="guy" parent="." index="15" instance=ExtResource( 24 )]
transform = Transform( -0.99998, 0, -0.00631814, 0, 1, 0, 0.00631814, 0, -0.99998, -65.889, 1.74389, -97.945 )
transform = Transform( -1.49997, 0, -0.0094773, 0, 1.5, 0, 0.0094773, 0, -1.49997, -65.889, 1.74389, -97.945 )
initial_dialogic_timeline = "guy_creek"
[node name="dialogue_platform" parent="guy" index="4" instance=ExtResource( 25 )]

View File

@ -10,6 +10,8 @@ func state(is_active: bool):
stream_paused = not is_active
func _process(_delta):
if Util.player == null:
return
unit_db = base_unit_volume - $VolumeControl.volume_subtract
var distance = (transform.origin - Util.player.camera_position()).length()
GlobalEventBus.emit_signal("player_objective_ping", self, distance)

View File

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

View File

@ -170,9 +170,19 @@
"event_id": "dialogic_011",
"value": ""
},
{
"anchor_id": "anchor-1634488067",
"event_id": "dialogic_016"
},
{
"event_id": "dialogic_013"
},
{
"event_id": "dialogic_015",
"id": "anchor-1634488067",
"index": 0,
"name": "listening"
},
{
"character": "character-1667667711.json",
"event_id": "dialogic_001",

View File

@ -0,0 +1,15 @@
{
"events": [
{
"character": "",
"event_id": "dialogic_001",
"portrait": "",
"text": "Password: GHYF12FGXNMQ"
}
],
"metadata": {
"dialogic-version": "1.4.5",
"file": "timeline-1672859304.json",
"name": "password"
}
}

View File

@ -5,7 +5,7 @@ signal player_entered_meat_sink
signal player_exited_meat_sink
signal player_walkie_talkie_state_change(is_active)
signal player_objective_ping(who, distance)
signal new_ambient_music_start
# This is only here to remove warnings about these signals not getting called (they get called by other nodes)
func never_called():
@ -13,3 +13,4 @@ func never_called():
emit_signal("player_exited_meat_sink")
emit_signal("player_walkie_talkie_state_change", false)
emit_signal("player_objective_ping", null, 0.0)
emit_signal("new_ambient_music_start")

View File

@ -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 and Input.is_action_just_pressed("ui_cancel"):
if event is InputEventMouseButton:
Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED)
var look_relative = Vector2(

View File

@ -8,9 +8,9 @@ extends Spatial
# 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)
$AnimationPlayer.play_backwards("camera pan")
# Called every frame. 'delta' is the elapsed time since the previous frame.
#func _process(delta):
# pass

View File

@ -19,16 +19,16 @@ tracks/0/imported = false
tracks/0/enabled = true
tracks/0/keys = PoolRealArray( 0, 1, -46.689, 16.1053, -2.91671, 0, -0.707107, 0, 0.707107, 1, 1, 1, 2, 1, -34.2336, 16.1053, -2.91671, 0, -0.707107, 0, 0.707107, 1, 1, 1, 3, 1, -25.3341, 16.1053, -2.91671, -0.183013, -0.683013, -0.183013, 0.683013, 1, 1, 1, 5, 1, -8.57989, 16.1053, -2.91671, -0.430459, -0.560986, -0.430459, 0.560986, 1, 1, 1, 7.5, 1, -8.57989, 9.14282, -2.91671, -0.430459, -0.560986, -0.430459, 0.560986, 1, 1, 1, 10, 1, -8.57989, -34.7238, -2.91671, -0.430459, -0.560985, -0.430459, 0.560985, 1, 1, 1 )
tracks/1/type = "value"
tracks/1/path = NodePath("blackscreen:visible")
tracks/1/path = NodePath("blackscreen:modulate")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/keys = {
"times": PoolRealArray( 0, 9.8 ),
"transitions": PoolRealArray( 1, 2.82843 ),
"update": 1,
"values": [ false, true ]
"times": PoolRealArray( 0.1, 1.8, 10 ),
"transitions": PoolRealArray( 1, 1, 1 ),
"update": 0,
"values": [ Color( 1, 1, 1, 1 ), Color( 1, 1, 1, 0 ), Color( 1, 1, 1, 0 ) ]
}
[sub_resource type="PanoramaSky" id=2]
@ -74,11 +74,10 @@ script = ExtResource( 5 )
transform = Transform( 0, 0, -1, 0, 1, 0, 1, 0, 0, -46.689, 16.1053, -2.91671 )
[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
autoplay = "camera pan"
"anims/camera pan" = SubResource( 1 )
[node name="blackscreen" type="ColorRect" parent="."]
visible = false
modulate = Color( 1, 1, 1, 0 )
anchor_right = 1.0
anchor_bottom = 1.0
mouse_filter = 2

View File

@ -11,14 +11,14 @@
[sub_resource type="Animation" id=1]
resource_name = "struggler_camera"
length = 10.0
length = 20.0
tracks/0/type = "transform"
tracks/0/path = NodePath("Camera")
tracks/0/interp = 2
tracks/0/loop_wrap = true
tracks/0/imported = false
tracks/0/enabled = true
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/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/1/type = "value"
tracks/1/path = NodePath("blackscreen:visible")
tracks/1/interp = 1
@ -26,10 +26,22 @@ tracks/1/loop_wrap = true
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/keys = {
"times": PoolRealArray( 0.2, 9.1 ),
"transitions": PoolRealArray( 1, 1 ),
"times": PoolRealArray( 0, 3.1, 11.5 ),
"transitions": PoolRealArray( 1, 1, 1 ),
"update": 1,
"values": [ false, true ]
"values": [ true, 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"]