tolelom/Catacombs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: lobby shows player names and classes in room listing

Browse Source 
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
tolelom
2026-03-24 14:47:53 +09:00
parent 29387ebaa0
commit 533e460968
4 changed files with 85 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
ui/lobby_view.go
View File

@@ -20,10 +20,16 @@ type lobbyState struct {
type roomInfo struct {
Code string
Name string
Players int
Players []playerInfo
Status string
}
type playerInfo struct {
Name string
Class string
Ready bool
}
func renderLobby(state lobbyState, width, height int) string {
headerStyle := lipgloss.NewStyle().
Foreground(lipgloss.Color("205")).
@@ -43,7 +49,21 @@ func renderLobby(state lobbyState, width, height int) string {
marker = "> "
}
roomList += fmt.Sprintf("%s%s [%s] (%d/4) %s\n",
marker, r.Name, r.Code, r.Players, r.Status)
marker, r.Name, r.Code, len(r.Players), r.Status)
// Show players in selected room
if i == state.cursor {
for _, p := range r.Players {
cls := p.Class
if cls == "" {
cls = "..."
}
readyMark := " "
if p.Ready {
readyMark = "✓ "
}
roomList += fmt.Sprintf(" %s%s (%s)\n", readyMark, p.Name, cls)
}
}
}
if roomList == "" {
roomList = " No rooms available. Create one!"

13
ui/model.go
View File

@@ -209,7 +209,7 @@ func (m Model) updateLobby(msg tea.Msg) (tea.Model, tea.Cmd) {
if m.lobbyState.joining {
if isEnter(key) && len(m.lobbyState.codeInput) == 4 {
if m.lobby != nil {
if err := m.lobby.JoinRoom(m.lobbyState.codeInput, m.playerName); err == nil {
if err := m.lobby.JoinRoom(m.lobbyState.codeInput, m.playerName, m.fingerprint); err == nil {
m.roomCode = m.lobbyState.codeInput
m.screen = screenClassSelect
}
@@ -231,7 +231,7 @@ func (m Model) updateLobby(msg tea.Msg) (tea.Model, tea.Cmd) {
if isKey(key, "c") {
if m.lobby != nil {
code := m.lobby.CreateRoom(m.playerName + "'s Room")
m.lobby.JoinRoom(code, m.playerName)
m.lobby.JoinRoom(code, m.playerName, m.fingerprint)
m.roomCode = code
m.screen = screenClassSelect
}
@@ -249,7 +249,7 @@ func (m Model) updateLobby(msg tea.Msg) (tea.Model, tea.Cmd) {
} else if isEnter(key) {
if m.lobby != nil && len(m.lobbyState.rooms) > 0 {
r := m.lobbyState.rooms[m.lobbyState.cursor]
if err := m.lobby.JoinRoom(r.Code, m.playerName); err == nil {
if err := m.lobby.JoinRoom(r.Code, m.playerName, m.fingerprint); err == nil {
m.roomCode = r.Code
m.screen = screenClassSelect
}
@@ -274,6 +274,7 @@ func (m Model) updateClassSelect(msg tea.Msg) (tea.Model, tea.Cmd) {
} else if isEnter(key) {
if m.lobby != nil {
selectedClass := classOptions[m.classState.cursor].class
m.lobby.SetPlayerClass(m.roomCode, m.fingerprint, selectedClass.String())
room := m.lobby.GetRoom(m.roomCode)
if room != nil {
if room.Session == nil {
@@ -523,10 +524,14 @@ func (m Model) withRefreshedLobby() Model {
if r.Status == game.RoomPlaying {
status = "Playing"
}
players := make([]playerInfo, len(r.Players))
for j, p := range r.Players {
players[j] = playerInfo{Name: p.Name, Class: p.Class, Ready: p.Ready}
}
m.lobbyState.rooms[i] = roomInfo{
Code: r.Code,
Name: r.Name,
Players: len(r.Players),
Players: players,
Status: status,
}
}