diff --git a/backgounds/abstract.tscn b/backgounds/abstract.tscn index 9bcc574..ac2f0fd 100644 --- a/backgounds/abstract.tscn +++ b/backgounds/abstract.tscn @@ -1,12 +1,11 @@ -[gd_scene load_steps=3 format=3 uid="uid://by7ktb1k5ml5y"] +[gd_scene load_steps=2 format=2] -[ext_resource type="Script" path="res://backgounds/abstract.gd" id="1_wbg2a"] -[ext_resource type="Texture2D" uid="uid://qmyfeu4jrmbv" path="res://backgounds/abstract.png" id="2_voi7p"] +[ext_resource path="res://backgounds/abstract.png" type="Texture" id=1] [node name="abstract" type="Node2D"] -script = ExtResource("1_wbg2a") [node name="TextureRect" type="TextureRect" parent="."] -offset_right = 1280.0 -offset_bottom = 720.0 -texture = ExtResource("2_voi7p") +margin_right = 960.0 +margin_bottom = 540.0 +rect_scale = Vector2( 1.33, 1.33 ) +texture = ExtResource( 1 ) diff --git a/backgounds/galaxy.tscn b/backgounds/galaxy.tscn index 50ce97b..818fb4e 100644 --- a/backgounds/galaxy.tscn +++ b/backgounds/galaxy.tscn @@ -1,12 +1,11 @@ -[gd_scene load_steps=3 format=3 uid="uid://cnstwjy5mqdyo"] +[gd_scene load_steps=2 format=2] -[ext_resource type="Texture2D" uid="uid://bona2ytn3y3a5" path="res://backgounds/galaxy.png" id="1_bmyxf"] -[ext_resource type="Script" path="res://backgounds/galaxy.gd" id="1_h1j80"] +[ext_resource path="res://backgounds/galaxy.png" type="Texture" id=1] [node name="galaxy" type="Node2D"] -script = ExtResource("1_h1j80") [node name="TextureRect" type="TextureRect" parent="."] -offset_right = 1280.0 -offset_bottom = 720.0 -texture = ExtResource("1_bmyxf") +margin_right = 40.0 +margin_bottom = 40.0 +rect_scale = Vector2( 1.33, 1.33 ) +texture = ExtResource( 1 ) diff --git a/backgounds/radio.tscn b/backgounds/radio.tscn index 5127385..4bba099 100644 --- a/backgounds/radio.tscn +++ b/backgounds/radio.tscn @@ -1,42 +1,37 @@ -[gd_scene load_steps=5 format=3 uid="uid://c4oc3wj8vu5p0"] +[gd_scene load_steps=4 format=2] -[ext_resource type="Script" path="res://backgounds/radio.gd" id="1_hxbaj"] -[ext_resource type="Texture2D" uid="uid://bows52y4q3suo" path="res://sprites/antenna.png" id="2_26tjs"] -[ext_resource type="Script" path="res://backgounds/Label3.gd" id="3_765rj"] -[ext_resource type="PackedScene" uid="uid://d31udhuuwrajn" path="res://levels/bottomhud.tscn" id="4_51td0"] +[ext_resource path="res://sprites/antenna.png" type="Texture" id=1] +[ext_resource path="res://fonts/title.tres" type="DynamicFont" id=2] +[ext_resource path="res://fonts/start.tres" type="DynamicFont" id=3] [node name="radio" type="Node2D"] -script = ExtResource("1_hxbaj") [node name="TextureRect" type="TextureRect" parent="."] -offset_left = 438.0 -offset_top = 14.0 -offset_right = 864.0 -offset_bottom = 751.0 -scale = Vector2(1, 0.92) -texture = ExtResource("2_26tjs") +margin_left = 438.0 +margin_top = 14.0 +margin_right = 864.0 +margin_bottom = 751.0 +rect_scale = Vector2( 0.92, 0.92 ) +texture = ExtResource( 1 ) [node name="Label" type="Label" parent="."] -offset_left = 461.0 -offset_top = 29.0 -offset_right = 531.0 -offset_bottom = 55.0 -scale = Vector2(6.32794, 4.85128) +margin_left = 400.0 +margin_top = 20.0 +margin_right = 855.0 +margin_bottom = 166.0 +custom_fonts/font = ExtResource( 2 ) text = "Good Job" [node name="Label2" type="Label" parent="."] -offset_left = 346.0 -offset_top = 361.0 -offset_right = 602.0 -offset_bottom = 387.0 -scale = Vector2(2.92998, 7.01768) +margin_top = 400.0 +margin_right = 1280.0 +margin_bottom = 546.0 +custom_fonts/font = ExtResource( 3 ) text = "Press Enter or B to return to title" +align = 1 [node name="Label3" type="Label" parent="."] -offset_left = 158.0 -offset_top = 593.0 -offset_right = 198.0 -offset_bottom = 616.0 -script = ExtResource("3_765rj") - -[node name="Bottomhud" parent="." instance=ExtResource("4_51td0")] +margin_left = 158.0 +margin_top = 593.0 +margin_right = 198.0 +margin_bottom = 607.0 diff --git a/backgounds/supernova.tscn b/backgounds/supernova.tscn index fef39f2..eb2c829 100644 --- a/backgounds/supernova.tscn +++ b/backgounds/supernova.tscn @@ -1,42 +1,35 @@ -[gd_scene load_steps=6 format=3 uid="uid://cx3x5lteh72xk"] +[gd_scene load_steps=4 format=2] -[ext_resource type="Texture2D" uid="uid://bqyx3wu4vf408" path="res://backgounds/supernova.png" id="1_0bxam"] -[ext_resource type="Script" path="res://backgounds/supernova.gd" id="1_3jmy0"] -[ext_resource type="Script" path="res://backgounds/Label.gd" id="3_24urm"] -[ext_resource type="Script" path="res://backgounds/Label3.gd" id="3_h0a4u"] -[ext_resource type="PackedScene" uid="uid://d31udhuuwrajn" path="res://levels/bottomhud.tscn" id="5_knfj0"] +[ext_resource path="res://backgounds/supernova.png" type="Texture" id=1] +[ext_resource path="res://fonts/title.tres" type="DynamicFont" id=2] +[ext_resource path="res://fonts/start.tres" type="DynamicFont" id=3] [node name="supernova" type="Node2D"] -script = ExtResource("1_3jmy0") [node name="TextureRect" type="TextureRect" parent="."] -offset_right = 1280.0 -offset_bottom = 720.0 -texture = ExtResource("1_0bxam") +margin_right = 40.0 +margin_bottom = 40.0 +rect_scale = Vector2( 1.33, 1.33 ) +texture = ExtResource( 1 ) [node name="Label" type="Label" parent="."] -offset_left = 59.0 -offset_top = 89.0 -offset_right = 99.0 -offset_bottom = 112.0 -scale = Vector2(6.32794, 4.85128) +margin_left = 52.0 +margin_top = 52.0 +margin_right = 1216.0 +margin_bottom = 198.0 +custom_fonts/font = ExtResource( 2 ) text = "Your spaceship crashed" -horizontal_alignment = 1 -script = ExtResource("3_24urm") [node name="Label2" type="Label" parent="."] -offset_left = 228.0 -offset_top = 361.0 -offset_right = 488.0 -offset_bottom = 387.0 -scale = Vector2(2.92998, 7.01768) +margin_left = 323.0 +margin_top = 483.0 +margin_right = 920.0 +margin_bottom = 538.0 +custom_fonts/font = ExtResource( 3 ) text = "Press Enter or B to return to title" [node name="Label3" type="Label" parent="."] -offset_left = 158.0 -offset_top = 593.0 -offset_right = 198.0 -offset_bottom = 616.0 -script = ExtResource("3_h0a4u") - -[node name="Bottomhud" parent="." instance=ExtResource("5_knfj0")] +margin_left = 158.0 +margin_top = 593.0 +margin_right = 198.0 +margin_bottom = 607.0 diff --git a/backgounds/wormhole.tscn b/backgounds/wormhole.tscn index ede11b4..9e89cf7 100644 --- a/backgounds/wormhole.tscn +++ b/backgounds/wormhole.tscn @@ -1,12 +1,11 @@ -[gd_scene load_steps=3 format=3 uid="uid://by7ktb1k5ml5y"] +[gd_scene load_steps=2 format=2] -[ext_resource type="Script" path="res://backgounds/wormhole.gd" id="1_fibhv"] -[ext_resource type="Texture2D" uid="uid://bcfmwk0ffy73n" path="res://backgounds/wormhole.png" id="2_6mic1"] +[ext_resource path="res://backgounds/wormhole.png" type="Texture" id=1] [node name="wormhole" type="Node2D"] -script = ExtResource("1_fibhv") [node name="TextureRect" type="TextureRect" parent="."] -offset_right = 1280.0 -offset_bottom = 720.0 -texture = ExtResource("2_6mic1") +margin_right = 960.0 +margin_bottom = 540.0 +rect_scale = Vector2( 1.33, 1.33 ) +texture = ExtResource( 1 ) diff --git a/levels/credits.gd b/levels/credits.gd index d915a63..3e4f044 100644 --- a/levels/credits.gd +++ b/levels/credits.gd @@ -22,8 +22,9 @@ func _process(delta): var bgtime = bgsound.get_playback_position() + AudioServer.get_time_since_last_mix() # Compensate for output latency. bgtime -= AudioServer.get_output_latency() + print(bgtime) #print("Time is: ", bgtime) - if bgtime < 0: + if (playindex == 0 && bgtime > 171) || (playindex == 1 && bgtime > 126) || (playindex == 2 && bgtime > 354): if playstart: if playindex == 0: playindex = 1 @@ -44,7 +45,7 @@ func _process(delta): func _complete(): # This is like autoloading the scene, only # it happens after already loading the main scene. - get_tree().change_scene_to_file("res://backgounds/radio.tscn") + get_tree().change_scene("res://backgounds/radio.tscn") #get_tree().root.add_child(title) #get_tree().root.remove_child(boot) #boot.queue_free() diff --git a/levels/credits.tscn b/levels/credits.tscn index 541538b..329ee54 100644 --- a/levels/credits.tscn +++ b/levels/credits.tscn @@ -1,34 +1,33 @@ -[gd_scene load_steps=8 format=3 uid="uid://g8ajwoud48us"] +[gd_scene load_steps=7 format=2] -[ext_resource type="Script" path="res://levels/credits.gd" id="1_y6orl"] -[ext_resource type="VideoStream" path="res://backgounds/nebula_-_6044 (720p).ogv" id="2_0cref"] -[ext_resource type="Script" path="res://nebula.gd" id="3_ffw0g"] -[ext_resource type="Texture2D" uid="uid://cpd31c6o18rmh" path="res://sprites/ss.png" id="4_pmxuj"] -[ext_resource type="Script" path="res://player.gd" id="5_c2k4x"] -[ext_resource type="Script" path="res://levels/roll.gd" id="6_3q8sp"] -[ext_resource type="PackedScene" uid="uid://d31udhuuwrajn" path="res://levels/bottomhud.tscn" id="7_7k1wd"] +[ext_resource path="res://backgounds/nebula_-_6044 (720p).ogv" type="VideoStream" id=1] +[ext_resource path="res://sprites/ss.png" type="Texture" id=2] +[ext_resource path="res://player.gd" type="Script" id=3] +[ext_resource path="res://fonts/about.tres" type="DynamicFont" id=4] +[ext_resource path="res://levels/roll.gd" type="Script" id=5] +[ext_resource path="res://levels/credits.gd" type="Script" id=6] [node name="credits" type="Node2D"] -script = ExtResource("1_y6orl") +script = ExtResource( 6 ) -[node name="nebula" type="VideoStreamPlayer" parent="."] -offset_right = 40.0 -offset_bottom = 40.0 -scale = Vector2(2, 1.96) -stream = ExtResource("2_0cref") +[node name="nebula" type="VideoPlayer" parent="."] +margin_right = 1280.0 +margin_bottom = 720.0 +stream = ExtResource( 1 ) autoplay = true -script = ExtResource("3_ffw0g") +loop = true -[node name="player" type="Sprite2D" parent="."] -position = Vector2(631, 499) -scale = Vector2(0.3, 0.3) -texture = ExtResource("4_pmxuj") -script = ExtResource("5_c2k4x") +[node name="player" type="Sprite" parent="."] +position = Vector2( 631, 499 ) +scale = Vector2( 0.3, 0.3 ) +texture = ExtResource( 2 ) +script = ExtResource( 3 ) [node name="roll" type="Label" parent="."] -offset_top = 720.0 -offset_right = 1280.0 -offset_bottom = 12504.0 +margin_top = 720.0 +margin_right = 1280.0 +margin_bottom = 14729.0 +custom_fonts/font = ExtResource( 4 ) text = "The Red Robot Radio Programming @@ -481,9 +480,5 @@ You are free to distribute this game and make modifications, but remember sharin You can reuse assets for non-commercial purposes only Be kind and have a happy unfunaversary" -horizontal_alignment = 1 -script = ExtResource("6_3q8sp") - -[node name="Bottomhud" parent="." instance=ExtResource("7_7k1wd")] - -[connection signal="finished" from="nebula" to="nebula" method="_on_finished"] +align = 1 +script = ExtResource( 5 ) diff --git a/levels/roll.gd b/levels/roll.gd index 2f3d85b..fb0860b 100644 --- a/levels/roll.gd +++ b/levels/roll.gd @@ -8,4 +8,4 @@ func _process(delta): #20*623/633=19.6840442338 #Roll velocity calculator #(14.0866856839 * music duration (seconds)) / Line count - position.y -= delta * 19.6840442338 + set_position(get_position() - Vector2(0, delta * 19.6840442338)) diff --git a/music/sweetest-sin.wav.import b/music/sweetest-sin.wav.import index 4b44a59..04b03af 100644 --- a/music/sweetest-sin.wav.import +++ b/music/sweetest-sin.wav.import @@ -17,7 +17,7 @@ force/max_rate=false force/max_rate_hz=22050 edit/trim=false edit/normalize=false -edit/loop_mode=0 +edit/loop_mode=1 edit/loop_begin=0 edit/loop_end=-1 compress/mode=0 diff --git a/music/tekilla.wav.import b/music/tekilla.wav.import index 307b70b..77f1ca3 100644 --- a/music/tekilla.wav.import +++ b/music/tekilla.wav.import @@ -17,7 +17,7 @@ force/max_rate=false force/max_rate_hz=22050 edit/trim=false edit/normalize=false -edit/loop_mode=0 +edit/loop_mode=1 edit/loop_begin=0 edit/loop_end=-1 compress/mode=0 diff --git a/music/yes-i-see.wav.import b/music/yes-i-see.wav.import index 9bf138e..6bbdc1f 100644 --- a/music/yes-i-see.wav.import +++ b/music/yes-i-see.wav.import @@ -17,7 +17,7 @@ force/max_rate=false force/max_rate_hz=22050 edit/trim=false edit/normalize=false -edit/loop_mode=0 +edit/loop_mode=1 edit/loop_begin=0 edit/loop_end=-1 compress/mode=0