From 2b86c441a05e6187d2c95255526bad7a7fff2f67 Mon Sep 17 00:00:00 2001 From: Harmony Honey Date: Sat, 30 Apr 2022 16:11:28 -0400 Subject: [PATCH] Audio.play() float fix!(: Music.gd cleanup! Credits! Title text Image ^.^ --- media/image/UI/title.png | Bin 0 -> 12450 bytes src/autoload/Audio.gd | 4 +-- src/autoload/Music.gd | 20 +++----------- src/autoload/Music.tscn | 5 +--- src/menu/MenuBase.gd | 2 +- src/menu/MenuCredits.gd | 11 ++++++++ src/menu/MenuTitle.gd | 5 ++++ src/menu/MenuTitle.tscn | 55 +++++++++++++++++++++++++++++++++++++-- 8 files changed, 77 insertions(+), 25 deletions(-) create mode 100644 media/image/UI/title.png create mode 100644 src/menu/MenuCredits.gd diff --git a/media/image/UI/title.png b/media/image/UI/title.png new file mode 100644 index 0000000000000000000000000000000000000000..141658786969bac0b5f42f0bb40ed68b3397ea45 GIT binary patch literal 12450 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 w8O`@F8NWRKQvYSot9azv3L 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 literal 0 HcmV?d00001 diff --git a/src/autoload/Audio.gd b/src/autoload/Audio.gd index cee9dda..6fe782f 100644 --- a/src/autoload/Audio.gd +++ b/src/autoload/Audio.gd @@ -8,10 +8,10 @@ onready var menu_pause := $Menu/Pause onready var gem_collect := $Gem/Collect onready var gem_show := $Gem/Show -func play(arg : AudioStreamPlayer, from := 1.0, to := -1): +func play(arg : AudioStreamPlayer, from := 1.0, to := -1.0): if !is_instance_valid(arg): return - if to == -1: + if to < 0: arg.pitch_scale = from else: arg.pitch_scale = rand_range(from, to) diff --git a/src/autoload/Music.gd b/src/autoload/Music.gd index 600f59d..3e7a53e 100644 --- a/src/autoload/Music.gd +++ b/src/autoload/Music.gd @@ -1,9 +1,6 @@ extends AudioStreamPlayer -export var ost1 : AudioStream -export var ost2: AudioStream -export var ost3 : AudioStream -export var ost4 : AudioStream +export (Array, AudioStream) var ost = [] var last_song := -1 var array = [] @@ -16,21 +13,12 @@ func _on_Music_finished(): play_song() func play_song(): - if array.size() == 0: - array = [0,1,2,3] + if array.empty(): + array = range(ost.size()) array.erase(last_song) array.shuffle() - match array[0]: - 0: - stream = ost1 - 1: - stream = ost2 - 2: - stream = ost3 - 3: - stream = ost4 - + stream = ost[array[0]] last_song = array[0] array.remove(0) play() diff --git a/src/autoload/Music.tscn b/src/autoload/Music.tscn index f0c63e3..5b1f04f 100644 --- a/src/autoload/Music.tscn +++ b/src/autoload/Music.tscn @@ -10,9 +10,6 @@ pause_mode = 2 bus = "Music" script = ExtResource( 1 ) -ost1 = ExtResource( 2 ) -ost2 = ExtResource( 3 ) -ost3 = ExtResource( 4 ) -ost4 = ExtResource( 5 ) +ost = [ ExtResource( 2 ), ExtResource( 3 ), ExtResource( 4 ), ExtResource( 5 ) ] [connection signal="finished" from="." to="." method="_on_Music_finished"] diff --git a/src/menu/MenuBase.gd b/src/menu/MenuBase.gd index 9bf33c3..a3e2946 100644 --- a/src/menu/MenuBase.gd +++ b/src/menu/MenuBase.gd @@ -151,4 +151,4 @@ func audio_accept(): Audio.play(Audio.menu_accept, 0.8, 1.2) func audio_back(): - Audio.play(Audio.menu_cancel, 0.8, 1.2) + Audio.play(Audio.menu_cancel, 0.6, 0.9) diff --git a/src/menu/MenuCredits.gd b/src/menu/MenuCredits.gd new file mode 100644 index 0000000..6d035e2 --- /dev/null +++ b/src/menu/MenuCredits.gd @@ -0,0 +1,11 @@ +extends MenuBase + + +func _input(event): + menu_input(event) + +func _physics_process(delta): + menu_process(delta) + +func back(): + self.is_open = false diff --git a/src/menu/MenuTitle.gd b/src/menu/MenuTitle.gd index 2648d9f..d4b8094 100644 --- a/src/menu/MenuTitle.gd +++ b/src/menu/MenuTitle.gd @@ -3,6 +3,9 @@ extends MenuBase export var sub_path : NodePath onready var file_menu = get_node_or_null(sub_path) +export var credits_path : NodePath +onready var credits_menu = get_node_or_null(credits_path) + func _input(event): menu_input(event) @@ -16,6 +19,8 @@ func accept(): sub_menu(file_menu) "options": sub_menu(MenuOptions) + "credits": + sub_menu(credits_menu) "exit": get_tree().quit() diff --git a/src/menu/MenuTitle.tscn b/src/menu/MenuTitle.tscn index 9aabf39..c847407 100644 --- a/src/menu/MenuTitle.tscn +++ b/src/menu/MenuTitle.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=22 format=2] +[gd_scene load_steps=24 format=2] [ext_resource path="res://media/font/mini-wakuwaku.otf" type="DynamicFontData" id=1] [ext_resource path="res://media/font/profile/PauseItem.tres" type="DynamicFont" id=2] @@ -18,6 +18,8 @@ [ext_resource path="res://src/menu/MenuFileDelete.gd" type="Script" id=16] [ext_resource path="res://src/menu/MenuFileOpen.gd" type="Script" id=17] [ext_resource path="res://src/menu/MenuBoot.gd" type="Script" id=18] +[ext_resource path="res://media/image/UI/title.png" type="Texture" id=19] +[ext_resource path="res://src/menu/MenuCredits.gd" type="Script" id=20] [sub_resource type="StyleBoxFlat" id=1] bg_color = Color( 0.74902, 0.376471, 0.380392, 1 ) @@ -73,6 +75,7 @@ cursor_path = NodePath("Cursor") cursor_margin = Vector2( 20, 3 ) fade_path = NodePath(".") sub_path = NodePath("../FileMenu") +credits_path = NodePath("../Credits") [node name="Cursor" type="Panel" parent="Canvas/MainMenu"] anchor_right = 1.0 @@ -413,6 +416,47 @@ __meta__ = { "_edit_use_anchors_": false } +[node name="Credits" type="Control" parent="Canvas"] +visible = false +margin_right = 1280.0 +margin_bottom = 720.0 +script = ExtResource( 20 ) +__meta__ = { +"_edit_use_anchors_": false +} +is_audio_cursor = false +fade_path = NodePath(".") + +[node name="Back" type="ColorRect" parent="Canvas/Credits"] +modulate = Color( 1, 1, 1, 0.8 ) +anchor_right = 1.0 +anchor_bottom = 1.0 +color = Color( 0, 0, 0, 1 ) +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="Label" type="Label" parent="Canvas/Credits"] +anchor_right = 1.0 +anchor_bottom = 1.0 +size_flags_horizontal = 4 +size_flags_vertical = 5 +custom_fonts/font = ExtResource( 2 ) +text = "ROTA + +by Harmony Honey + + +Made with Godot Engine + + +harmony-hunnie.itch.io" +align = 1 +valign = 1 +__meta__ = { +"_edit_use_anchors_": false +} + [node name="Map" type="Node2D" parent="."] __meta__ = { "_edit_lock_": true @@ -434,12 +478,19 @@ is_cam = false position = Vector2( 1800, 650 ) script = ExtResource( 3 ) +[node name="Title" type="Sprite" parent="Map"] +modulate = Color( 0.25098, 0.25098, 0.25098, 1 ) +position = Vector2( 1800, 650 ) +scale = Vector2( 0.9, 0.9 ) +texture = ExtResource( 19 ) + [node name="Label" type="Label" parent="Map"] +visible = false margin_left = 1500.0 margin_top = 500.0 margin_right = 2100.0 margin_bottom = 800.0 -custom_colors/font_color = Color( 0.25, 0.25, 0.25, 1 ) +custom_colors/font_color = Color( 0.25098, 0.25098, 0.25098, 1 ) custom_fonts/font = SubResource( 4 ) text = "ROTA" align = 1