Audio improvements, ground scene reworks
This commit is contained in:
parent
27e7ea5f65
commit
6ccf697815
19 changed files with 395 additions and 314 deletions
|
|
@ -11,7 +11,7 @@ config_version=5
|
|||
[application]
|
||||
|
||||
config/name="Super Space Game"
|
||||
run/main_scene="uid://bauklhpieuivd"
|
||||
run/main_scene="uid://b1x7evhkxm385"
|
||||
config/features=PackedStringArray("4.5", "Mobile")
|
||||
boot_splash/bg_color=Color(0, 0, 0, 1)
|
||||
config/icon="res://icon.svg"
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
271
scenes/locations/space_station_1.tscn
Normal file
271
scenes/locations/space_station_1.tscn
Normal file
File diff suppressed because one or more lines are too long
|
|
@ -1,8 +1,10 @@
|
|||
[gd_scene load_steps=10 format=3 uid="uid://b1x7evhkxm385"]
|
||||
[gd_scene load_steps=12 format=3 uid="uid://b1x7evhkxm385"]
|
||||
|
||||
[ext_resource type="Script" uid="uid://md1biuc6ygmv" path="res://scripts/title.gd" id="1_pyl7j"]
|
||||
[ext_resource type="FontFile" uid="uid://n1nd5m2kwexu" path="res://fonts/Michroma.ttf" id="1_wosw1"]
|
||||
[ext_resource type="Texture2D" uid="uid://5iimabvyld40" path="res://textures/particles/basic.png" id="2_4rr2b"]
|
||||
[ext_resource type="AudioStream" uid="uid://cwidt34ehvre4" path="res://sounds/ui_select.mp3" id="2_hiwto"]
|
||||
[ext_resource type="AudioStream" uid="uid://cfnchaj8n83ck" path="res://sounds/music/title.mp3" id="2_ia1n6"]
|
||||
[ext_resource type="Shader" uid="uid://bk7q00br1ms30" path="res://scripts/retro.gdshader" id="2_p6dhs"]
|
||||
[ext_resource type="Script" uid="uid://b2maxk5g6yb0i" path="res://addons/super_awesome_input_icons/classes/input_icon_texture_rect.gd" id="2_pyl7j"]
|
||||
[ext_resource type="FontFile" uid="uid://donsvh2l775rb" path="res://fonts/Doto.ttf" id="3_b3w7a"]
|
||||
|
|
@ -35,6 +37,15 @@ shader_parameter/lens_distortion_strength = 0.0
|
|||
[node name="Title" type="Node2D"]
|
||||
script = ExtResource("1_pyl7j")
|
||||
|
||||
[node name="UiSelect" type="AudioStreamPlayer" parent="."]
|
||||
stream = ExtResource("2_hiwto")
|
||||
|
||||
[node name="Title" type="AudioStreamPlayer" parent="."]
|
||||
stream = ExtResource("2_ia1n6")
|
||||
volume_db = -4.0
|
||||
autoplay = true
|
||||
parameters/looping = true
|
||||
|
||||
[node name="GPUParticles2D" type="GPUParticles2D" parent="."]
|
||||
position = Vector2(-1420, 0)
|
||||
amount = 512
|
||||
|
|
@ -282,6 +293,24 @@ fit_content = true
|
|||
horizontal_alignment = 1
|
||||
vertical_alignment = 1
|
||||
|
||||
[node name="Label4" type="RichTextLabel" parent="UI/Control/Credits"]
|
||||
custom_minimum_size = Vector2(640, 0)
|
||||
layout_mode = 2
|
||||
size_flags_horizontal = 4
|
||||
size_flags_vertical = 4
|
||||
theme_override_fonts/normal_font = ExtResource("1_wosw1")
|
||||
theme_override_fonts/bold_font = ExtResource("3_b3w7a")
|
||||
theme_override_font_sizes/normal_font_size = 32
|
||||
theme_override_font_sizes/bold_font_size = 32
|
||||
theme_override_font_sizes/bold_italics_font_size = 32
|
||||
theme_override_font_sizes/italics_font_size = 32
|
||||
theme_override_font_sizes/mono_font_size = 32
|
||||
bbcode_enabled = true
|
||||
text = "[font size=20]soundtrack by delosound on pixabay[/font]"
|
||||
fit_content = true
|
||||
horizontal_alignment = 1
|
||||
vertical_alignment = 1
|
||||
|
||||
[node name="Buttons" type="HFlowContainer" parent="UI/Control/Credits"]
|
||||
layout_mode = 2
|
||||
alignment = 1
|
||||
|
|
|
|||
|
|
@ -7,6 +7,22 @@ signal choice_made
|
|||
func _ready() -> void:
|
||||
$UI/Control/Dialogue.visible = false
|
||||
|
||||
var location_scene = load("res://scenes/locations/space_station_1.tscn").instantiate()
|
||||
|
||||
for n in location_scene.get_children():
|
||||
location_scene.remove_child(n)
|
||||
add_child(n)
|
||||
|
||||
if "game" in n:
|
||||
n.game = self
|
||||
|
||||
# This gets all descendants. Copied it off the forums don't ask me how it works
|
||||
for o in n.find_children("*", "", true, false):
|
||||
if "game" in o:
|
||||
o.game = self
|
||||
|
||||
location_scene.free()
|
||||
|
||||
func _process(delta: float) -> void:
|
||||
if current_interaction_area:
|
||||
$UI/Control/Interact.visible = true
|
||||
|
|
|
|||
|
|
@ -3,11 +3,6 @@ extends Area2D
|
|||
@export var interact_text = "INTERACT"
|
||||
var game = null
|
||||
|
||||
func _ready() -> void:
|
||||
game = owner
|
||||
|
||||
if game.owner != null: game = game.owner
|
||||
|
||||
func _on_body_entered(body: Node2D) -> void:
|
||||
if body.get_name() == "PlayerGround":
|
||||
game.current_interaction_area = self
|
||||
|
|
|
|||
|
|
@ -12,6 +12,8 @@ func _ready() -> void:
|
|||
func _on_continue_pressed() -> void:
|
||||
if transitioning: return
|
||||
|
||||
$UiSelect.play()
|
||||
|
||||
transitioning = true
|
||||
|
||||
$UI/Control/ControllerInfo/Box/Flow/Continue.release_focus()
|
||||
|
|
@ -46,6 +48,8 @@ func _on_continue_pressed() -> void:
|
|||
func _on_quit_pressed() -> void:
|
||||
if transitioning: return
|
||||
|
||||
$UiSelect.play()
|
||||
|
||||
transitioning = true
|
||||
|
||||
get_viewport().gui_release_focus()
|
||||
|
|
@ -64,6 +68,8 @@ func _on_quit_pressed() -> void:
|
|||
func _on_credits_pressed() -> void:
|
||||
if transitioning: return
|
||||
|
||||
$UiSelect.play()
|
||||
|
||||
transitioning = true
|
||||
|
||||
get_viewport().gui_release_focus()
|
||||
|
|
@ -97,6 +103,8 @@ func _on_credits_pressed() -> void:
|
|||
func _on_exit_credits_pressed() -> void:
|
||||
if transitioning: return
|
||||
|
||||
$UiSelect.play()
|
||||
|
||||
transitioning = true
|
||||
|
||||
get_viewport().gui_release_focus()
|
||||
|
|
@ -131,6 +139,8 @@ func _on_exit_credits_pressed() -> void:
|
|||
func _on_settings_pressed() -> void:
|
||||
if transitioning: return
|
||||
|
||||
$UiSelect.play()
|
||||
|
||||
transitioning = true
|
||||
|
||||
get_viewport().gui_release_focus()
|
||||
|
|
@ -164,6 +174,8 @@ func _on_settings_pressed() -> void:
|
|||
func _on_settings_back_pressed() -> void:
|
||||
if transitioning: return
|
||||
|
||||
$UiSelect.play()
|
||||
|
||||
transitioning = true
|
||||
|
||||
get_viewport().gui_release_focus()
|
||||
|
|
@ -199,6 +211,8 @@ func _on_settings_back_pressed() -> void:
|
|||
func _on_new_game_pressed() -> void:
|
||||
if transitioning: return
|
||||
|
||||
$UiSelect.play()
|
||||
|
||||
transitioning = true
|
||||
|
||||
get_viewport().gui_release_focus()
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,19 +0,0 @@
|
|||
[remap]
|
||||
|
||||
importer="mp3"
|
||||
type="AudioStreamMP3"
|
||||
uid="uid://cdi7o5r4y3jpm"
|
||||
path="res://.godot/imported/2050_bass.mp3-c0e821cf8314cd27ac0ff57d7b69ce25.mp3str"
|
||||
|
||||
[deps]
|
||||
|
||||
source_file="res://sounds/2050_bass.mp3"
|
||||
dest_files=["res://.godot/imported/2050_bass.mp3-c0e821cf8314cd27ac0ff57d7b69ce25.mp3str"]
|
||||
|
||||
[params]
|
||||
|
||||
loop=false
|
||||
loop_offset=0
|
||||
bpm=0
|
||||
beat_count=0
|
||||
bar_beats=4
|
||||
Binary file not shown.
|
|
@ -1,19 +0,0 @@
|
|||
[remap]
|
||||
|
||||
importer="mp3"
|
||||
type="AudioStreamMP3"
|
||||
uid="uid://dklt4lfyqp2c"
|
||||
path="res://.godot/imported/2050_drums.mp3-bb466a17b0f21890ffac6024700bc7fc.mp3str"
|
||||
|
||||
[deps]
|
||||
|
||||
source_file="res://sounds/2050_drums.mp3"
|
||||
dest_files=["res://.godot/imported/2050_drums.mp3-bb466a17b0f21890ffac6024700bc7fc.mp3str"]
|
||||
|
||||
[params]
|
||||
|
||||
loop=false
|
||||
loop_offset=0
|
||||
bpm=0
|
||||
beat_count=0
|
||||
bar_beats=4
|
||||
Binary file not shown.
|
|
@ -1,19 +0,0 @@
|
|||
[remap]
|
||||
|
||||
importer="mp3"
|
||||
type="AudioStreamMP3"
|
||||
uid="uid://gf01n1oediuk"
|
||||
path="res://.godot/imported/2050_music.mp3-a0fe9e1226f9749db65bebe92870c677.mp3str"
|
||||
|
||||
[deps]
|
||||
|
||||
source_file="res://sounds/2050_music.mp3"
|
||||
dest_files=["res://.godot/imported/2050_music.mp3-a0fe9e1226f9749db65bebe92870c677.mp3str"]
|
||||
|
||||
[params]
|
||||
|
||||
loop=false
|
||||
loop_offset=0
|
||||
bpm=0
|
||||
beat_count=0
|
||||
bar_beats=4
|
||||
BIN
sounds/music/title.mp3
Normal file
BIN
sounds/music/title.mp3
Normal file
Binary file not shown.
19
sounds/music/title.mp3.import
Normal file
19
sounds/music/title.mp3.import
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
[remap]
|
||||
|
||||
importer="mp3"
|
||||
type="AudioStreamMP3"
|
||||
uid="uid://cfnchaj8n83ck"
|
||||
path="res://.godot/imported/title.mp3-aa8fec0b29d551db4fe8768d72d31945.mp3str"
|
||||
|
||||
[deps]
|
||||
|
||||
source_file="res://sounds/music/title.mp3"
|
||||
dest_files=["res://.godot/imported/title.mp3-aa8fec0b29d551db4fe8768d72d31945.mp3str"]
|
||||
|
||||
[params]
|
||||
|
||||
loop=false
|
||||
loop_offset=0
|
||||
bpm=0
|
||||
beat_count=0
|
||||
bar_beats=4
|
||||
BIN
sounds/ui_error.mp3
Normal file
BIN
sounds/ui_error.mp3
Normal file
Binary file not shown.
19
sounds/ui_error.mp3.import
Normal file
19
sounds/ui_error.mp3.import
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
[remap]
|
||||
|
||||
importer="mp3"
|
||||
type="AudioStreamMP3"
|
||||
uid="uid://cs4fjgp3g1nb0"
|
||||
path="res://.godot/imported/ui_error.mp3-3827712336dbacceb14ade7d7c4abc85.mp3str"
|
||||
|
||||
[deps]
|
||||
|
||||
source_file="res://sounds/ui_error.mp3"
|
||||
dest_files=["res://.godot/imported/ui_error.mp3-3827712336dbacceb14ade7d7c4abc85.mp3str"]
|
||||
|
||||
[params]
|
||||
|
||||
loop=false
|
||||
loop_offset=0
|
||||
bpm=0
|
||||
beat_count=0
|
||||
bar_beats=4
|
||||
BIN
sounds/ui_select.mp3
Normal file
BIN
sounds/ui_select.mp3
Normal file
Binary file not shown.
19
sounds/ui_select.mp3.import
Normal file
19
sounds/ui_select.mp3.import
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
[remap]
|
||||
|
||||
importer="mp3"
|
||||
type="AudioStreamMP3"
|
||||
uid="uid://cwidt34ehvre4"
|
||||
path="res://.godot/imported/ui_select.mp3-8128c6bf84a0991e26dd9d79dcd1e817.mp3str"
|
||||
|
||||
[deps]
|
||||
|
||||
source_file="res://sounds/ui_select.mp3"
|
||||
dest_files=["res://.godot/imported/ui_select.mp3-8128c6bf84a0991e26dd9d79dcd1e817.mp3str"]
|
||||
|
||||
[params]
|
||||
|
||||
loop=false
|
||||
loop_offset=0
|
||||
bpm=0
|
||||
beat_count=0
|
||||
bar_beats=4
|
||||
Loading…
Reference in a new issue