anekdotin
7b44b2f2dc
Server browsing & matchmaking: - HL2-style main menu (QUICK PLAY/SERVER SELECT/OPTIONS/PROFILE/QUIT) replaces the old CASUAL/RANKED tiles; RANKED removed end-to-end (menu, matchmaking-api's Mode.ranked queue path, MMR matching) until ranked is real. - New menu/server_select.gd lists real servers from the matchmaking API's GET /servers and connects directly, retiring the old unreachable menu/server_browser.gd. - Real game-server pool: NetworkManager.host_server() self-registers on boot and heartbeats every 8s with live player counts; API computes available/full status from player_count, and a background sweep marks any server offline once its heartbeat goes stale (catches a crashed server that never deregistered). - Server-select rows get a live UDP ping probe (query port = game port + 10000) instead of trusting stale DB numbers; post-connect HUD shows live RTT off ENet's own peer stats. Race roster overhaul: - Swapped Terran/Mechanos/Vorg for the pivoted roster — Apex Dynamics, Inner Sphere Navy, Outer Rim Collective — each with a 3-ship Fighter/Gunner/Tank lineup, art cropped from concept sheets with background removal + orientation fixes per sheet. - Live headcount + roster + "TEAM FULL" lock on the race-select screen, shared between the initial pre-spawn pick and the pause menu's live SELECT TEAM swap. - Bot personalities (bots/bot_personality.gd): aggression/caution/ accuracy/reaction/awareness traits rolled per bot instead of one fixed AI profile. HUD additions: - Player list (roster, teammates white/enemies yellow, bots flagged), kill feed, minimap, and explosion VFX on death. - Health and energy now render as bars (hud/stat_bar.gd) instead of text in the top-left HUD. Ship energy system: - Per-role max energy (Fighter 100 / Gunner 150 / Tank 250), 75 energy per shot, flat regen (100 per 2.5s), fully server-authoritative and piggybacked on the existing per-tick state broadcast alongside health. - New blue "mirrored" bar top-middle of the screen (hud/energy_bar.gd) whose fill drains from both edges toward the center instead of left-to-right. Ship handling tuning: - Turn rate reduced (4.0 -> 1.0 rad/s) so a quick tap no longer over-rotates; holding past 0.15s ramps to double speed (2.0 rad/s) for fast full turns, gated the same way damage already is so replay during reconciliation can't double-count the hold timer. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
53 lines
1.9 KiB
Python
53 lines
1.9 KiB
Python
import uuid
|
|
|
|
from fastapi import APIRouter, Depends, HTTPException
|
|
from sqlalchemy import select
|
|
from sqlalchemy.ext.asyncio import AsyncSession
|
|
|
|
from app.database import get_db
|
|
from app.models import Player
|
|
from app.queue_manager import queue_manager
|
|
from app.schemas import QueueJoinRequest, QueueJoinResponse, QueueStatusResponse
|
|
|
|
router = APIRouter(prefix="/matchmaking", tags=["matchmaking"])
|
|
|
|
|
|
async def _get_or_create_player(db: AsyncSession, callsign: str) -> Player:
|
|
player = (await db.execute(select(Player).where(Player.callsign == callsign))).scalars().first()
|
|
if player is None:
|
|
player = Player(callsign=callsign)
|
|
db.add(player)
|
|
await db.commit()
|
|
await db.refresh(player)
|
|
return player
|
|
|
|
|
|
@router.post("/queue/join", response_model=QueueJoinResponse)
|
|
async def join_queue(req: QueueJoinRequest, db: AsyncSession = Depends(get_db)) -> QueueJoinResponse:
|
|
player = await _get_or_create_player(db, req.callsign)
|
|
|
|
ticket = await queue_manager.join(player.id, player.callsign, req.mode, player.mmr)
|
|
return QueueJoinResponse(ticket_id=ticket.ticket_id, status=ticket.status)
|
|
|
|
|
|
@router.post("/queue/leave")
|
|
async def leave_queue(ticket_id: uuid.UUID) -> dict:
|
|
ok = await queue_manager.leave(ticket_id)
|
|
if not ok:
|
|
raise HTTPException(status_code=404, detail="Ticket not found or already resolved")
|
|
return {"status": "cancelled"}
|
|
|
|
|
|
@router.get("/queue/status/{ticket_id}", response_model=QueueStatusResponse)
|
|
async def queue_status(ticket_id: uuid.UUID) -> QueueStatusResponse:
|
|
ticket = queue_manager.get(ticket_id)
|
|
if ticket is None:
|
|
raise HTTPException(status_code=404, detail="Ticket not found")
|
|
return QueueStatusResponse(
|
|
ticket_id=ticket.ticket_id,
|
|
status=ticket.status,
|
|
server_ip=ticket.server_ip,
|
|
server_port=ticket.server_port,
|
|
team=ticket.team,
|
|
)
|