From 4f8c134bb7f78422c9b7f9a8cc54236d2a03e8dc Mon Sep 17 00:00:00 2001 From: Chris Cromer Date: Fri, 22 Jul 2022 00:10:08 -0400 Subject: [PATCH 1/3] add level 2 music --- godot/assets/music/level2.ogg | 3 +++ godot/assets/music/level2.ogg.import | 15 +++++++++++++++ godot/levels/Level2.tscn | 9 ++++++++- godot/levels/MusicPlayer.gd | 16 ++++++++++++++++ 4 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 godot/assets/music/level2.ogg create mode 100644 godot/assets/music/level2.ogg.import create mode 100644 godot/levels/MusicPlayer.gd diff --git a/godot/assets/music/level2.ogg b/godot/assets/music/level2.ogg new file mode 100644 index 0000000..ebb3231 --- /dev/null +++ b/godot/assets/music/level2.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4fe1597eeec1f308631c10c37e6457d16429c6692a1a6db9bb2641d58facd030 +size 1605670 diff --git a/godot/assets/music/level2.ogg.import b/godot/assets/music/level2.ogg.import new file mode 100644 index 0000000..54354c0 --- /dev/null +++ b/godot/assets/music/level2.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/level2.ogg-0cba17639fcb1c4e45dc4f01c5837760.oggstr" + +[deps] + +source_file="res://assets/music/level2.ogg" +dest_files=[ "res://.import/level2.ogg-0cba17639fcb1c4e45dc4f01c5837760.oggstr" ] + +[params] + +loop=true +loop_offset=0 diff --git a/godot/levels/Level2.tscn b/godot/levels/Level2.tscn index 717c1fe..811360b 100644 --- a/godot/levels/Level2.tscn +++ b/godot/levels/Level2.tscn @@ -1,9 +1,11 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=7 format=2] [ext_resource path="res://CameraLimit.gdns" type="Script" id=1] [ext_resource path="res://characters/player/Player.tscn" type="PackedScene" id=2] [ext_resource path="res://assets/backgrounds/hills.png" type="Texture" id=3] [ext_resource path="res://levels/Level2.tmx" type="PackedScene" id=4] +[ext_resource path="res://assets/music/level2.ogg" type="AudioStream" id=5] +[ext_resource path="res://levels/MusicPlayer.gd" type="Script" id=6] [node name="Level2" type="Node2D"] @@ -39,3 +41,8 @@ centered = false [node name="Level2" parent="Map" instance=ExtResource( 4 )] script = ExtResource( 1 ) + +[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] +pause_mode = 2 +stream = ExtResource( 5 ) +script = ExtResource( 6 ) diff --git a/godot/levels/MusicPlayer.gd b/godot/levels/MusicPlayer.gd new file mode 100644 index 0000000..ab397b1 --- /dev/null +++ b/godot/levels/MusicPlayer.gd @@ -0,0 +1,16 @@ +extends AudioStreamPlayer + + +# there is currently a bug with AudioStreamPlayer +# it doesn't pause when the tree is paused +# so let's manually check if paused and pause the audio +# for this to work pause mode for the node is set to process instead of inherit + + +func _physics_process(_delta: float) -> void: + if get_tree().paused and playing: + stop() + playing = false + elif not get_tree().paused and not playing: + play() + playing = true From 1398f3d92c1f76ab498fad5d2ebb55a1e78221b1 Mon Sep 17 00:00:00 2001 From: Chris Cromer Date: Thu, 21 Jul 2022 00:14:14 -0400 Subject: [PATCH 2/3] GUI should not be visible until ready --- godot/monitor/Monitor.gd | 2 ++ godot/monitor/Monitor.tscn | 1 + 2 files changed, 3 insertions(+) diff --git a/godot/monitor/Monitor.gd b/godot/monitor/Monitor.gd index b9628a1..0c96cc7 100644 --- a/godot/monitor/Monitor.gd +++ b/godot/monitor/Monitor.gd @@ -99,6 +99,8 @@ func _ready() -> void: func _physics_process(_delta: float) -> void: if monitor_enabled: + if not $MonitorGUI.visible: + $MonitorGUI.visible = true if started and not get_tree().paused: var frame = empty_frame.duplicate(true) frame["coins"] = coins diff --git a/godot/monitor/Monitor.tscn b/godot/monitor/Monitor.tscn index 46070db..977db82 100644 --- a/godot/monitor/Monitor.tscn +++ b/godot/monitor/Monitor.tscn @@ -10,5 +10,6 @@ monitor_enabled = true use_development_url = true [node name="MonitorGUI" parent="." instance=ExtResource( 3 )] +visible = false [node name="HTTPRequest" type="HTTPRequest" parent="."] From 71bf91fd2fded796a3d3a5d858c4116ecc9cbe22 Mon Sep 17 00:00:00 2001 From: Chris Cromer Date: Fri, 22 Jul 2022 00:14:25 -0400 Subject: [PATCH 3/3] make ui_accept press the button --- godot/monitor/GUI.tscn | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/godot/monitor/GUI.tscn b/godot/monitor/GUI.tscn index 2fb72ed..d5f25e7 100644 --- a/godot/monitor/GUI.tscn +++ b/godot/monitor/GUI.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=12 format=2] +[gd_scene load_steps=14 format=2] [ext_resource path="res://assets/fonts/data/PixelOperator.tres" type="DynamicFontData" id=1] [ext_resource path="res://assets/fonts/data/PixelOperator-Bold.tres" type="DynamicFontData" id=2] @@ -42,6 +42,13 @@ corner_radius_top_right = 5 corner_radius_bottom_right = 5 corner_radius_bottom_left = 5 +[sub_resource type="InputEventAction" id=17] +action = "ui_accept" +pressed = true + +[sub_resource type="ShortCut" id=18] +shortcut = SubResource( 17 ) + [sub_resource type="StyleBoxFlat" id=15] bg_color = Color( 0.239216, 0.239216, 0.239216, 1 ) corner_radius_top_left = 5 @@ -160,7 +167,9 @@ margin_bottom = 61.0 focus_mode = 0 custom_fonts/font = SubResource( 11 ) custom_styles/normal = SubResource( 12 ) +shortcut_in_tooltip = false enabled_focus_mode = 0 +shortcut = SubResource( 18 ) text = "Ingresar" script = ExtResource( 5 )