From 822336ab56c645735372f97599c70d1581abe35e Mon Sep 17 00:00:00 2001 From: vandomej Date: Sun, 5 Oct 2025 22:31:50 -0700 Subject: [PATCH] Implementing scene sequencing for game --- game_manager.gd | 9 ++++++++- score_screen.gd | 14 +++++++++----- score_screen.tscn | 9 +++++++-- turn_manager.gd | 1 - 4 files changed, 24 insertions(+), 9 deletions(-) diff --git a/game_manager.gd b/game_manager.gd index ab7f938..06d8e7b 100644 --- a/game_manager.gd +++ b/game_manager.gd @@ -95,7 +95,12 @@ func destroy_painting(): DisplayServer.tts_speak("Oh nooooooo! Took too long!", turn_manager.voice_id, turn_manager.tts_volume, turn_manager.tts_pitch) DisplayServer.tts_speak("Try to make it up on the next painting!", turn_manager.voice_id, turn_manager.tts_volume, turn_manager.tts_pitch) desk.numpad.reminder_timer.stop() - next_painting(current_painting) + if current_painting <= paintings_total - 1: + next_painting((current_painting)) + print("The next painting is valued at $" + str(starting_price) + " (should be $" + str(paintings[current_painting]) + ")") + (print(str(state))) + else: + end_auction() func sell_painting(): total_sales = total_sales + current_bid @@ -116,9 +121,11 @@ func end_auction(): if total_sales >= target_sales: #add context specific score text? DisplayServer.tts_speak("Congratulations! The auction house will run another day.", turn_manager.voice_id, turn_manager.tts_volume, turn_manager.tts_pitch) + emit_signal("won") else: #add context specific score text? DisplayServer.tts_speak("You have failed. We must find a new auctioneer.", turn_manager.voice_id, turn_manager.tts_volume, turn_manager.tts_pitch) + emit_signal("lost") # OTHER THINGS TO ADD: # UI elements for score diff --git a/score_screen.gd b/score_screen.gd index 5917771..7e36345 100644 --- a/score_screen.gd +++ b/score_screen.gd @@ -3,9 +3,12 @@ extends Node2D signal restart_game var input_received = false +var timer_elapsed = false func _ready() -> void: win() + await $Timer.timeout + timer_elapsed = true func win(): $MorshoReactManager/MorshoHappy.visible = true @@ -20,9 +23,10 @@ func lose(): %WinLossAudioPlayer.play() func _input(event): - if input_received: - return + if timer_elapsed == true: + if input_received: + return - if event is InputEventKey or event is InputEventMouseButton: - input_received = true - emit_signal("restart_game") + if event is InputEventKey or event is InputEventMouseButton: + input_received = true + emit_signal("restart_game") diff --git a/score_screen.tscn b/score_screen.tscn index 5e92991..ff94b3b 100644 --- a/score_screen.tscn +++ b/score_screen.tscn @@ -4,7 +4,7 @@ [ext_resource type="Script" uid="uid://cp71ivjeuuaaf" path="res://score_screen.gd" id="1_cyy7t"] [ext_resource type="Texture2D" uid="uid://cabsfveh1oc6i" path="res://assets/menus/final score/morshu-happy-large.png" id="1_juxjb"] [ext_resource type="Texture2D" uid="uid://d24dlalqmr6r0" path="res://assets/menus/final score/morshu-anger-large.png" id="2_3r2db"] -[ext_resource type="Script" path="res://hotline_miami.gd" id="4_joumd"] +[ext_resource type="Script" uid="uid://bmn6cds78753q" path="res://hotline_miami.gd" id="4_joumd"] [node name="ScoreScreen" type="Node2D"] script = ExtResource("1_cyy7t") @@ -35,7 +35,7 @@ offset_right = 545.0 offset_bottom = 175.0 grow_vertical = 2 theme = ExtResource("1_3r2db") -text = "placeholder" +text = "Press any key to restart" horizontal_alignment = 1 vertical_alignment = 1 @@ -56,3 +56,8 @@ texture = ExtResource("2_3r2db") [node name="WinLossAudioPlayer" type="AudioStreamPlayer" parent="."] unique_name_in_owner = true + +[node name="Timer" type="Timer" parent="."] +wait_time = 3.0 +one_shot = true +autostart = true diff --git a/turn_manager.gd b/turn_manager.gd index b968015..f3da378 100644 --- a/turn_manager.gd +++ b/turn_manager.gd @@ -43,4 +43,3 @@ func _handle_reminder_timer_timeout() -> void: if game_manager.state == game_manager.bidding_state.ASKING or game_manager.state == game_manager.bidding_state.BID: game_manager.state = game_manager.bidding_state.CLOSED game_manager.destroy_painting() -