diff options
| -rw-r--r-- | client/game.gd | 2 | ||||
| -rw-r--r-- | client/menu/game.gd | 4 | ||||
| -rw-r--r-- | client/menu/overlay.gd | 10 | ||||
| -rw-r--r-- | client/multiplayer.gd | 3 |
4 files changed, 9 insertions, 10 deletions
diff --git a/client/game.gd b/client/game.gd index 4ac28d2b..4db41e2a 100644 --- a/client/game.gd +++ b/client/game.gd @@ -250,7 +250,7 @@ func _ready(): ) mp.score.connect(overlay.update) - mp.hide_score.connect(overlay.reset) + mp.set_ingame.connect(overlay.set_ingame) mp.set_ingame.connect( func toggle_lobby(_state: bool, lobby_state: bool): diff --git a/client/menu/game.gd b/client/menu/game.gd index 06f9fbae..bef4a5df 100644 --- a/client/menu/game.gd +++ b/client/menu/game.gd @@ -17,8 +17,8 @@ extends Menu @onready var game: Game = $Game -@onready var debug_label = $Debug -@onready var overlay = $Overlay +@onready var debug_label: RichTextLabel = $Debug +@onready var overlay: Overlay = $Overlay @onready var popup_message: PopupMessage = $PopupMessage func _ready(): diff --git a/client/menu/overlay.gd b/client/menu/overlay.gd index 08520412..e992faf8 100644 --- a/client/menu/overlay.gd +++ b/client/menu/overlay.gd @@ -31,7 +31,6 @@ var points: int = 0 @onready var decimals_label: Label = $Time/Paper/Line/Decimals func update(failed_: int, completed_: int, points_: int, time: float): - show() if failed_ - failed: failed_label.text = str(failed_) failed_label.scale = LABEL_SCALE @@ -49,9 +48,12 @@ func update(failed_: int, completed_: int, points_: int, time: float): if timer.is_stopped(): timer.start() -func reset(): - hide() - timer.stop() +func set_ingame(state: bool, lobby: bool): + if lobby: + hide() + timer.stop() + else: + show() func _process(delta): failed_label.scale = G.interpolate(failed_label.scale, Vector2(1, 1), delta * 4.) diff --git a/client/multiplayer.gd b/client/multiplayer.gd index 132c6705..8ba32f55 100644 --- a/client/multiplayer.gd +++ b/client/multiplayer.gd @@ -50,7 +50,6 @@ signal set_tile_finished(tile: Vector2i, warn: bool) signal set_player_finished(player: int, warn: bool) signal set_ingame(state: bool, lobby: bool) signal score(demands_failed: int, demands_completed: int, points: int, time_remaining: float) -signal hide_score() signal server_message(text: String) signal replay_start() signal connection_closed(reason: String) @@ -253,8 +252,6 @@ func handle_packet(bytes: PackedByteArray): var time_remaining = decoded.get("time_remaining") if time_remaining != null: score.emit(demands_failed, demands_completed, points, time_remaining) - else: - hide_score.emit() "menu": var menu: String = decoded["menu"] match menu: |