diff --git a/Client/origin-client/autoloads/CustomLobby.gd b/Client/origin-client/autoloads/CustomLobby.gd index 401c275..db9c5d1 100644 --- a/Client/origin-client/autoloads/CustomLobby.gd +++ b/Client/origin-client/autoloads/CustomLobby.gd @@ -60,6 +60,9 @@ var is_host : bool = false var i_am_ready : bool = false var partner_ready : bool = false var first_turn_pref: String = "random" +var max_players : int = 2 +var game_mode : String = "FFA" +var team_count : int = 1 # ── Lifecycle ───────────────────────────────────────────────────────────────── @@ -76,18 +79,29 @@ func clear_state() -> void: i_am_ready = false partner_ready = false first_turn_pref = "random" + max_players = 2 + game_mode = "FFA" + team_count = 1 # ── Public actions ──────────────────────────────────────────────────────────── ## Create a new lobby. On success, lobby_id and is_host are set; navigate to LobbyRoomScreen. func create(lobby_name: String, deck_id: String, password: String, - rules_override: Dictionary, on_success: Callable = Callable(), + rules_override: Dictionary, + p_max_players: int = 2, p_game_mode: String = "FFA", p_team_count: int = 1, + on_success: Callable = Callable(), on_error: Callable = Callable()) -> void: clear_state() my_deck_id = deck_id + max_players = p_max_players + game_mode = p_game_mode + team_count = p_team_count var payload := { - "lobbyName": lobby_name, - "deckId": deck_id, + "lobbyName": lobby_name, + "deckId": deck_id, + "maxPlayers": p_max_players, + "gameMode": p_game_mode, + "teamCount": p_team_count, } if password != "": payload["password"] = password @@ -96,9 +110,13 @@ func create(lobby_name: String, deck_id: String, password: String, Network.request("game.custom.create", payload, func(_t: String, p: Variant) -> void: var d := p as Dictionary - lobby_id = str(d.get("lobbyId", "")) - lobby = d - is_host = true + lobby_id = str(d.get("lobbyId", "")) + lobby = d + is_host = true + # Extract server-confirmed values (server may adjust/clamp). + max_players = int(d.get("maxPlayers", p_max_players)) + game_mode = str(d.get("gameMode", p_game_mode)) + team_count = int(d.get("teamCount", p_team_count)) if on_success.is_valid(): on_success.call(d), func(code: String, msg: String) -> void: print("[CustomLobby] ERR create ", code, " ", msg) @@ -117,9 +135,12 @@ func join(lid: String, deck_id: String, password: String, Network.request("game.custom.join", payload, func(_t: String, p: Variant) -> void: var d := p as Dictionary - lobby_id = str(d.get("lobbyId", "")) - lobby = d - is_host = false + lobby_id = str(d.get("lobbyId", "")) + lobby = d + is_host = false + max_players = int(d.get("maxPlayers", 2)) + game_mode = str(d.get("gameMode", "FFA")) + team_count = int(d.get("teamCount", 1)) # Ensure the lobby dict has the fields _refresh_display needs. lobby["guestAccountId"] = str(d.get("guestAccountId", "")) lobby["guestDisplayName"] = str(d.get("guestDisplayName", "")) @@ -296,6 +317,7 @@ func _on_server_push(type: String, payload: Variant) -> void: Game.session_id = sid Game.opponent_name = oname Game.state = {} + clear_state() game_starting.emit(sid, opp, oname) "game.custom.preset.vote_requested": diff --git a/Client/origin-client/autoloads/Game.gd b/Client/origin-client/autoloads/Game.gd index aff313d..5fba220 100644 --- a/Client/origin-client/autoloads/Game.gd +++ b/Client/origin-client/autoloads/Game.gd @@ -20,7 +20,8 @@ signal state_updated(state: Dictionary) ## Emitted when the game ends. signal game_over(winner_account_id: String, win_condition: String, - winner_rank_delta: int, loser_rank_delta: int) + winner_rank_delta: int, loser_rank_delta: int, + player_outcomes: Array) ## Emitted when the server abandons an Initializing session (e.g. server restart). signal session_abandoned(reason: String) @@ -147,6 +148,28 @@ func get_opponent_field() -> Array: return get_opponent().get("field", []) +## Returns all enemy PlayerStateDto dicts (players not on the same team as the local player). +func get_enemy_players() -> Array: + var my_team : int = int(get_my_player().get("teamIndex", -1)) + var result : Array = [] + for p: Dictionary in state.get("players", []): + var pid : String = str(p.get("accountId", "")) + if pid == Auth.user_id: continue + if int(p.get("teamIndex", -2)) != my_team: + result.append(p) + return result + + +## Returns all units (field + archSpirit) belonging to enemy players, as a flat Array. +func get_all_enemy_units() -> Array: + var units : Array = [] + for p: Dictionary in get_enemy_players(): + units.append_array(p.get("field", [])) + var arch : Dictionary = p.get("archSpirit", {}) + if not arch.is_empty(): units.append(arch) + return units + + ## Returns a TileDto dict by coord, or {}. func get_tile(x: int, y: int) -> Dictionary: for t: Dictionary in get_tiles(): @@ -546,13 +569,14 @@ func _on_server_push(type: String, payload: Variant) -> void: _apply_delta(delta) "game.over": - var d := payload as Dictionary - var winner : String = str(d.get("winnerAccountId", "")) - var wc : String = str(d.get("winCondition", "")) - var wd : int = int(d.get("winnerRankDelta", 0)) - var ld : int = int(d.get("loserRankDelta", 0)) + var d := payload as Dictionary + var winner : String = str(d.get("winnerAccountId", "")) + var wc : String = str(d.get("winCondition", "")) + var wd : int = int(d.get("winnerRankDelta", 0)) + var ld : int = int(d.get("loserRankDelta", 0)) + var outcomes : Array = d.get("playerOutcomes", []) as Array state = {} # Clear stale state so a new GameScreen calls send_ready() on the next match - game_over.emit(winner, wc, wd, ld) + game_over.emit(winner, wc, wd, ld, outcomes) "game.session_abandoned": var d := payload as Dictionary diff --git a/Client/origin-client/scenes/free_play/FreePlayScreen.tscn b/Client/origin-client/scenes/free_play/FreePlayScreen.tscn index 474a719..c1932ef 100644 --- a/Client/origin-client/scenes/free_play/FreePlayScreen.tscn +++ b/Client/origin-client/scenes/free_play/FreePlayScreen.tscn @@ -167,7 +167,7 @@ unique_name_in_owner = true visible = false title = "Create Lobby" initial_position = 4 -min_size = Vector2(400, 340) +min_size = Vector2(420, 420) [node name="CreateContent" type="VBoxContainer" parent="CreateDialog"] layout_mode = 1 @@ -197,6 +197,57 @@ layout_mode = 2 placeholder_text = "Leave blank for public" secret = true +[node name="MultiplayerRow" type="HBoxContainer" parent="CreateDialog/CreateContent"] +layout_mode = 2 +theme_override_constants/separation = 12 + +[node name="MaxPlayersLabel" type="Label" parent="CreateDialog/CreateContent/MultiplayerRow"] +layout_mode = 2 +text = "Players:" + +[node name="MaxPlayersSpinner" type="SpinBox" parent="CreateDialog/CreateContent/MultiplayerRow"] +unique_name_in_owner = true +layout_mode = 2 +custom_minimum_size = Vector2(70, 0) +min_value = 2.0 +max_value = 10.0 +value = 2.0 + +[node name="ModeLabel" type="Label" parent="CreateDialog/CreateContent/MultiplayerRow"] +layout_mode = 2 +text = " Mode:" + +[node name="GameModeOption" type="OptionButton" parent="CreateDialog/CreateContent/MultiplayerRow"] +unique_name_in_owner = true +layout_mode = 2 +size_flags_horizontal = 3 +item_count = 3 +selected = 0 +popup/item_0/text = "FFA" +popup/item_0/id = 0 +popup/item_1/text = "Teams" +popup/item_1/id = 1 +popup/item_2/text = "MultiTeam" +popup/item_2/id = 2 + +[node name="TeamCountRow" type="HBoxContainer" parent="CreateDialog/CreateContent"] +unique_name_in_owner = true +layout_mode = 2 +visible = false +theme_override_constants/separation = 12 + +[node name="TeamCountLabel" type="Label" parent="CreateDialog/CreateContent/TeamCountRow"] +layout_mode = 2 +text = "Team Count:" + +[node name="TeamCountSpinner" type="SpinBox" parent="CreateDialog/CreateContent/TeamCountRow"] +unique_name_in_owner = true +layout_mode = 2 +custom_minimum_size = Vector2(70, 0) +min_value = 2.0 +max_value = 5.0 +value = 2.0 + [node name="DeckLabel" type="Label" parent="CreateDialog/CreateContent"] layout_mode = 2 text = "Select Deck:" diff --git a/Client/origin-client/scenes/free_play/free_play_screen.gd b/Client/origin-client/scenes/free_play/free_play_screen.gd index 00338af..711f334 100644 --- a/Client/origin-client/scenes/free_play/free_play_screen.gd +++ b/Client/origin-client/scenes/free_play/free_play_screen.gd @@ -22,6 +22,10 @@ const DECK_BTN = preload("res://scenes/common/components/DeckPickerButton.tscn @onready var deck_select_container : VBoxContainer = %DeckSelectContainer @onready var join_password_dialog : AcceptDialog = %JoinPasswordDialog @onready var join_password_field : LineEdit = %JoinPasswordField +@onready var max_players_spinner : SpinBox = %MaxPlayersSpinner +@onready var game_mode_option : OptionButton = %GameModeOption +@onready var team_count_row : HBoxContainer = %TeamCountRow +@onready var team_count_spinner : SpinBox = %TeamCountSpinner # ── State ───────────────────────────────────────────────────────────────────── @@ -57,6 +61,8 @@ func _setup_ui() -> void: search_field.text_changed.connect(func(_t): _refresh_lobbies()) create_btn.pressed.connect(_show_create_dialog) create_dialog.confirmed.connect(_on_create_confirmed) + game_mode_option.item_selected.connect(func(_idx: int) -> void: + team_count_row.visible = game_mode_option.get_item_text(game_mode_option.selected) != "FFA") join_password_dialog.confirmed.connect(_on_join_password_confirmed) _switch_tab("open") @@ -268,6 +274,9 @@ func _on_spectate_pressed(session_id: String) -> void: func _show_create_dialog() -> void: lobby_name_field.text = "" lobby_password_field.text = "" + max_players_spinner.value = 2 + game_mode_option.selected = 0 + team_count_row.visible = false create_dialog.popup_centered() @@ -279,8 +288,11 @@ func _on_create_confirmed() -> void: if _selected_deck.is_empty(): OS.alert("Please select a deck.", "No Deck Selected") return - var pw := lobby_password_field.text.strip_edges() - CustomLobby.create(name_text, _selected_deck, pw, {}, + var pw : String = lobby_password_field.text.strip_edges() + var mp : int = int(max_players_spinner.value) + var gm : String = game_mode_option.get_item_text(game_mode_option.selected) + var tc : int = int(team_count_spinner.value) if gm != "FFA" else 1 + CustomLobby.create(name_text, _selected_deck, pw, {}, mp, gm, tc, func(_p: Variant) -> void: get_tree().change_scene_to_file("res://scenes/free_play/LobbyRoomScreen.tscn"), func(code: String, msg: String) -> void: diff --git a/Client/origin-client/scenes/game/game_screen.gd b/Client/origin-client/scenes/game/game_screen.gd index 8821f11..678c542 100644 --- a/Client/origin-client/scenes/game/game_screen.gd +++ b/Client/origin-client/scenes/game/game_screen.gd @@ -2212,11 +2212,7 @@ func _valid_attack_target_coords(unit: Dictionary) -> Array: var max_r : int = unit.get("maxAttackRange", 1) if unit.get("isExhausted", false) and unit.get("extraAttacksRemaining", 0) == 0: return results - var opp := Game.get_opponent() - var to_check : Array = [] - to_check.append_array(opp.get("field", [])) - var opp_arch : Dictionary = opp.get("archSpirit", {}) - if not opp_arch.is_empty(): to_check.append(opp_arch) + var to_check : Array = Game.get_all_enemy_units() for t: Dictionary in to_check: if not t.get("canBeAttacked", true): continue var tp : Dictionary = t.get("position", {}) @@ -2237,11 +2233,7 @@ func _valid_attack_target_ids(unit: Dictionary) -> Array: var max_r : int = unit.get("maxAttackRange", 1) if unit.get("isExhausted", false) and unit.get("extraAttacksRemaining", 0) == 0: return results - var opp := Game.get_opponent() - var to_check : Array = [] - to_check.append_array(opp.get("field", [])) - var opp_arch : Dictionary = opp.get("archSpirit", {}) - if not opp_arch.is_empty(): to_check.append(opp_arch) + var to_check : Array = Game.get_all_enemy_units() for t: Dictionary in to_check: if not t.get("canBeAttacked", true): continue var tp : Dictionary = t.get("position", {}) @@ -2274,15 +2266,30 @@ func _attack_range_tiles(unit: Dictionary) -> Array: func _valid_placement_tiles() -> Array: - var results : Array = [] - var my_id := Auth.user_id - var p1_id : String = str(Game.state.get("playerOneAccountId", "")) - var bw : int = Game.board_width() - var bh : int = Game.board_height() - var row : int = 0 if my_id == p1_id else bh - 1 - for tx in range(bw): - if not Game.get_tile(tx, row).get("occupantId"): - results.append(Vector2i(tx, row)) + var results : Array = [] + var my_id := Auth.user_id + var my_seat : int = int(Game.get_my_player().get("seatIndex", 0)) + var board : Dictionary = Game.get_board() + var sz_raw : Dictionary = board.get("startingZones", {}) + + if not sz_raw.is_empty(): + # N-player: use the StartingZones dict keyed by seatIndex. + var seat_key : String = str(my_seat) + var zone : Array = sz_raw.get(seat_key, []) as Array + for coord: Dictionary in zone: + var tx : int = int(coord.get("x", -1)) + var ty : int = int(coord.get("y", -1)) + if tx >= 0 and not Game.get_tile(tx, ty).get("occupantId"): + results.append(Vector2i(tx, ty)) + else: + # Legacy 1v1 fallback. + var p1_id : String = str(Game.state.get("playerOneAccountId", "")) + var bw : int = Game.board_width() + var bh : int = Game.board_height() + var row : int = 0 if my_id == p1_id else bh - 1 + for tx in range(bw): + if not Game.get_tile(tx, row).get("occupantId"): + results.append(Vector2i(tx, row)) return results @@ -2806,10 +2813,7 @@ func _highlight_ability_targets(action: Dictionary) -> void: var targets : Array = [] if include_enemy: - targets.append_array(Game.get_opponent().get("field", [])) - var opp_arch : Dictionary = Game.get_opponent().get("archSpirit", {}) - if not opp_arch.is_empty(): - targets.append(opp_arch) + targets.append_array(Game.get_all_enemy_units()) if include_friendly: targets.append_array(Game.get_field()) var my_arch : Dictionary = Game.get_my_player().get("archSpirit", {}) @@ -2916,8 +2920,6 @@ func _show_player_panel(scope: String, ownership: String) -> void: var my_id : String = Auth.user_id var my_name : String = Auth.display_name if not Auth.display_name.is_empty() else "You" - var opp_id : String = str(Game.get_opponent().get("accountId", "")) - var opp_name : String = Game.opponent_name if not Game.opponent_name.is_empty() else "Opponent" var show_self : bool = ownership in ["Owner", "Ally", "Any"] var show_enemy : bool = ownership in ["Enemy", "Any"] @@ -2926,9 +2928,12 @@ func _show_player_panel(scope: String, ownership: String) -> void: show_enemy = true if show_self: - _add_player_option(vbox, my_name, my_id, scope) + _add_player_option(vbox, my_name, my_id, scope) if show_enemy: - _add_player_option(vbox, opp_name, opp_id, scope) + for ep: Dictionary in Game.get_enemy_players(): + var eid : String = str(ep.get("accountId", "")) + var ename : String = eid.substr(0, 8) + _add_player_option(vbox, ename, eid, scope) panel.add_child(vbox) _hud.add_child(panel) @@ -3393,13 +3398,29 @@ func _on_hold_timer_fired() -> void: # ── Game over ───────────────────────────────────────────────────────────────── func _on_game_over(winner_id: String, win_condition: String, - winner_delta: int, loser_delta: int) -> void: + winner_delta: int, loser_delta: int, + player_outcomes: Array = []) -> void: var i_won : bool = (winner_id == Auth.user_id) _go_result_lbl.text = "Victory!" if i_won else "Defeat" _go_result_lbl.modulate = Color(0.4, 1.0, 0.5) if i_won else Color(1.0, 0.4, 0.4) - var my_delta : int = winner_delta if i_won else loser_delta - _go_rank_lbl.text = "Win by %s | Rank %s%d" % [ - win_condition, "+" if my_delta >= 0 else "", my_delta] + + if not player_outcomes.is_empty(): + # N-player: show each player's rank delta + var outcome_lines : Array = [] + for po: Dictionary in player_outcomes: + var pid : String = str(po.get("accountId", "")) + var oc : String = str(po.get("outcome", "?")) + var rd : int = int(po.get("rankDelta", 0)) + var sign : String = "+" if rd >= 0 else "" + var label: String = "You" if pid == Auth.user_id else pid.substr(0, 8) + outcome_lines.append("%s: %s (%s%d)" % [label, oc, sign, rd]) + _go_rank_lbl.text = "[%s] +" % win_condition + " +".join(outcome_lines) + else: + var my_delta : int = winner_delta if i_won else loser_delta + _go_rank_lbl.text = "Win by %s | Rank %s%d" % [ + win_condition, "+" if my_delta >= 0 else "", my_delta] _go_overlay.visible = true diff --git a/Server/src/SOR.Game/GameEngine.cs b/Server/src/SOR.Game/GameEngine.cs index 514b7f8..3016fc2 100644 --- a/Server/src/SOR.Game/GameEngine.cs +++ b/Server/src/SOR.Game/GameEngine.cs @@ -1451,7 +1451,15 @@ public static class GameEngine RuinId : t.RuinId, RuinOwner : t.RuinOwner)); - return new BoardDto(board.Width, board.Height, tiles); + Dictionary>? startingZones = null; + if (board.StartingZones.Count > 0) + { + startingZones = board.StartingZones.ToDictionary( + kvp => kvp.Key, + kvp => (IEnumerable)kvp.Value.Select(c => new CoordDto(c.X, c.Y))); + } + + return new BoardDto(board.Width, board.Height, tiles, startingZones); } } diff --git a/Server/src/SOR.Game/GameMessages.cs b/Server/src/SOR.Game/GameMessages.cs index 6b39efe..cc50353 100644 --- a/Server/src/SOR.Game/GameMessages.cs +++ b/Server/src/SOR.Game/GameMessages.cs @@ -597,7 +597,9 @@ public sealed record CardInstanceDto( public sealed record BoardDto( int Width, int Height, - IEnumerable Tiles); + IEnumerable Tiles, + /// Seat index → list of valid ArchSpirit placement coords. Empty for legacy 1v1. + Dictionary>? StartingZones = null); public sealed record TileDto( CoordDto Coord,