d61ebe66b84057aa8908a5b78bef8fbdd0beff03
4
Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
|
|
d61ebe66b8 |
Phase 8: Free Play ready-up system + client scenes
Server (Phase A): - CustomLobby: +HostReady/GuestReady/HostFirstTurnPref/GuestFirstTurnPref/MaxPlayers - Migration: AddReadyUpSystem — applied to prod DB - GameJoinCustomLobbyHandler: no longer auto-creates session; sets Full status, resets readiness, pushes CustomLobbyGuestJoinedPush to host - GameLobbyReadyHandler (NEW): game.custom.lobby.ready — marks caller ready, resolves first-turn, creates session + pushes game.custom.started when all ready - GameUnreadyHandler (NEW): game.custom.lobby.unready - GameChangeLobbyDeckHandler (NEW): game.custom.lobby.change_deck - GameUpdateLobbyRulesHandler (NEW): game.custom.update_rules (host only) - GameListActiveLobbiesHandler (NEW): game.custom.list_active (Status==Started) - GameListCustomLobbiesHandler: now batch-loads host/guest display names - GameMessages: +LobbyReadyRequest/Response, UnreadyInLobbyRequest/Response, ChangeLobbyDeckRequest/Response, UpdateLobbyRulesRequest/Response, ListActiveLobbiesRequest/Response, LobbyReadyStatusPush, LobbyDeckChangedPush, ActiveLobbyDto; CustomLobbyDto +HostDisplayName/GuestDisplayName - ServiceRegistration: register 5 new handlers Client (Phase B): - CustomLobby.gd: new autoload for Free Play lobby state + all server calls - project.godot: register CustomLobby autoload - MainScreen: +Free Play button → FreePlayScreen.tscn - FreePlayScreen (NEW): Open Lobbies tab + Active Games tab + Create dialog - LobbyRoomScreen (NEW): ready-up UI, first-turn selector, preset voting - Game.gd: +is_spectating, +start_spectating(), +stop_spectating() - game_screen.gd: spectator mode — SPECTATING label, hidden action buttons, neutral HUD labels, stop_spectating() on exit Generated with [Claude Code](https://claude.ai/code) via [Happy](https://happy.engineering) Co-Authored-By: Claude <noreply@anthropic.com> Co-Authored-By: Happy <yesreply@happy.engineering> |
||
|
|
93d27e9270 |
Phase 2+7: GameEngine rule enforcement + extended lobby handlers
Phase 2 — GameEngine: - Draw(): now draws DrawPerTurn+DrawPerTurnBonus cards per call (was always 1); enforces HandSizeCap with block-draw or auto-discard (DiscardOnMaxHand) - EndTurn(): returns (GameState, bool gameOver); applies MpBuff to all next-player units at turn start; checks TurnLimit and sets GameOver phase if exceeded - GetTurnLimitWinner(): helper returning winner/loser by ArchSpirit HP (P1 on tie) - ValidateDeck(): new public method checking MinDeckSize, MaxDeckSize, MaxArchTier1 - GameRules note: new fields are already in place from Phase 1 Phase 7 — Handlers + Messages: - CustomRulesOverride: +9 new nullable fields (HandSizeCap, DiscardOnMaxHand, MaxDeckSize, MinDeckSize, MaxArchTier1, TurnTimerSeconds, TimeLimitMinutes, TurnLimit, MpBuff) - CustomRulesDto: +9 matching fields + HasPassword bool - CreateCustomLobbyRequest: +Password field - JoinCustomLobbyRequest: +Password field; handler now validates password - ListCustomLobbiesRequest: +NameSearch, ShowPasswordProtected filters - GameCreateCustomLobbyHandler: full rule merge + ToDto covers all new fields - GameJoinCustomLobbyHandler: password check + full rules construction incl. new fields - GameListCustomLobbiesHandler: full DTO mapping + NameSearch/password filters - GameEndTurnHandler: injected identityDb+eventBus; handles TurnLimit game-over using same pattern as GameAttackHandler (set session fields before SaveStateAsync) - GameDrawHandler: update deconstruct to discard unused drawn list (_) - CustomLobbyGuestJoinedPush: new push type (used in Phase 6) Generated with [Claude Code](https://claude.ai/code) via [Happy](https://happy.engineering) Co-Authored-By: Claude <noreply@anthropic.com> Co-Authored-By: Happy <yesreply@happy.engineering> |
||
|
|
9b6b7191f0 |
Add square grid system, positional combat, sacrifice, and Placement phase
Grid infrastructure (SOR.Game/Grid/): - Coord — immutable (X,Y) struct with Manhattan distance, adjacency, BFS helpers - Tile — mutable affinity slots (Base1/Base2) + occupancy tracking - Board — 8×8 (configurable) grid, PlaceUnit/RemoveUnit/MoveUnit/BuildOccupancyMap - Pathfinding — Walk/Flight BFS (GetReachableWithCost), Jump/Teleport range (GetJumpRange) - LineOfSight — supercover DDA; occupied intermediate tiles block LOS - AffinitySystem — full Resolve table for all 20+ affinities per affinity.md, PushAffinity, ApplyPlacementAffinity, IsAffinityValid (basic vs non-basic rules) Combat (SOR.Game/Combat/): - AttackSystem — Manhattan range + optional LOS validation (§6.10) - SacrificeSystem — exact ST return formula from gameplay.md §6.15 Abilities (SOR.Game/Abilities/): - AbilitySystem stub — future pass per abilities.md Game engine / state changes: - GamePhase: added Placement phase (before Draw) - GameRuleSet + GameRules: added BoardWidth/BoardHeight (default 8×8) - GameState: added Board, PlayerOneAccountId; CardInstance gains MovementType, MaxMp, MinAttackRange, MaxAttackRange, RequiresLos, MinChannelRange, MaxChannelRange, IsLeader (moved from FieldCard); FieldCard adds Position + CurrentMp - [JsonPolymorphic] on CardInstance so FieldCard survives JSONB round-trip - JsonStringEnumConverter added to GameEngine serializer options - GameEngine.Initialize: creates Board + sets Placement phase; no opening draw yet - GameEngine.PlaceArchSpirit: validates row, pushes affinity, triggers opening draw and SP gain when both players placed - GameEngine.ChannelCard (was PlayCard): validates channeling range + affinity for Spirits - GameEngine.MoveUnit: Walk/Flight BFS, Jump (1 MP/landing), Teleport (LOS + 1 MP) - GameEngine.Attack: adds range+LOS validation via AttackSystem - GameEngine.Sacrifice: adjacency + SacrificeSystem ST formula - GameEngine.EndTurn: now also restores MP (§6.0 step 1) for next player - ToDto: includes Board tiles with resolved affinities; CardInstanceDto gets Position, CurrentMp, MaxMp, MovementType New handlers: game.place_arch_spirit, game.move_unit, game.sacrifice Updated handlers: game.play_card (target tile), GameReadyHandler (new Initialize sig) Migration: AddBoardDimensions (board_width/board_height on game_rule_sets) Generated with [Claude Code](https://claude.ai/code) via [Happy](https://happy.engineering) Co-Authored-By: Claude <noreply@anthropic.com> Co-Authored-By: Happy <yesreply@happy.engineering> |
||
|
|
682a525193 |
Fix gameplay engine rules + add RuleSet/CustomLobby system
Engine corrections (per gameplay.md + user spec): - Opening draw: both players draw 6 cards at game start - P1 skips Draw phase on turn 1 (already has opening hand); P2 draws once at start of their first turn → 7 cards total - SP: starts at 0, accumulates +3/turn (never resets, no cap by default) - ST: starts at 0, earned only through sacrifice (no per-turn grant) - No entry sickness: units can attack/move/ability the turn they are summoned - Defense restores to MaxDefense at start of each turn (§6.9.3) - Rename Graveyard → Discard throughout (GameState, GameEngine, GameMessages) - Remove IsEntrySick flag from CardInstance and CardInstanceDto GameRuleSet / CustomLobby infrastructure: - GameRuleSet DB entity: admin-configurable rules (IsRankedDefault, IsCustomDefault) - GameRules record (SOR.Game): in-memory config embedded in GameState.Rules - GameSession.RuleSnapshotJson: immutable per-session rule snapshot (jsonb) - MatchmakerService: loads ranked ruleset and snapshots it into each GameSession - GameReadyHandler: deserializes rule snapshot and passes rules to GameEngine.Initialize - CustomLobby DB entity: host+guest, rule overrides, GameSessionId link - CustomLobbyStatus enum: Open / Full / Started / Cancelled Custom game handlers (4): - game.custom.create — host creates lobby with optional rule overrides - game.custom.join — guest joins; when full, creates GameSession + pushes both players - game.custom.leave — host cancels or guest leaves - game.custom.list — paged list of Open lobbies Admin portal: - /game/ranked-rules — edit the ranked play ruleset (auto-seeds default on first visit) - /game/custom-lobbies — read-only view of active and recent custom lobbies - NavMenu: added Ranked Rules + Custom Lobbies links under Game Migration: AddGameRulesAndCustomLobby (game_rule_sets, custom_lobbies, rule_snapshot column on game_sessions) Generated with [Claude Code](https://claude.ai/code) via [Happy](https://happy.engineering) Co-Authored-By: Claude <noreply@anthropic.com> Co-Authored-By: Happy <yesreply@happy.engineering> |