Fix queue in multiplayer

This commit is contained in:
JonShard
2026-08-20 11:18:38 +02:00
parent 655751e5bd
commit 6432dca31a
7 changed files with 51 additions and 36 deletions
+16 -6
View File
@@ -11,16 +11,21 @@ var customers_served: int = 0
func _ready() -> void:
GameManager.set_game_state(GameManager.GameState.BUILDING)
Signals.game_state_changed.connect(_on_game_state_changed)
Signals.table_satisfied.connect(_on_table_statisfied)
func _on_game_state_changed(new_state: GameManager.GameState) -> void:
if new_state == GameManager.GameState.RUNNING:
start_next_day()
func _on_table_statisfied(_table: Table) -> void:
customers_served += 1
SweetLogger.info("Spawned: {0} served: {1}, per_day: {2} time_remaining: {3}, progress: {4}", [customers_spawned, customers_served, GameManager.customers_per_day, snappedf(day_time_remaining, 0.1), snappedf(get_day_progression(), 0.1)])
# Returns 0-1 progress of the day time
func get_day_progression() -> float:
return 1 - (day_time_remaining / GameManager.day_length_seconds)
return clampf(1 - (day_time_remaining / GameManager.day_length_seconds), 0.0, 1.0)
func _reset_values() -> void:
@@ -39,18 +44,23 @@ func start_next_day() -> void:
func finish_current_day() -> void:
SweetLogger.info("Finishing current day")
_reset_values()
GameManager.set_game_state(GameManager.GameState.BUILDING)
func _process(delta: float) -> void:
if not NetworkManager.owns_world():
return
if GameManager.game_state != GameManager.GameState.RUNNING:
return
day_time_remaining -= delta
if day_time_remaining > 0:
day_time_remaining -= delta
day_time_remaining = max(0, day_time_remaining)
var customers_at_this_time = GameManager.customers_per_day * get_day_progression()
#print("DayController: customers_at_this_time: ", customers_at_this_time)
if customers_spawned < customers_at_this_time:
customers_spawned += 1
SweetLogger.info("Spawning customer")
SweetLogger.info("Requesting to spawn customer")
Signals.request_customer_spawn.emit()
# If day complete
if GameManager.customers_per_day == customers_served and customers_spawned == GameManager.customers_per_day: