settel/knowyt
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

randomize order of sources

Browse Source
This commit is contained in:
Settel 2021-09-20 16:53:49 +02:00
parent a00931d50a
commit 56bb29611b
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
server/src/game/nextRound.go
View File

@ -21,7 +21,16 @@ func (gm *Game) nextRound() {
} }
gm.notifyClients() gm.notifyClients()
time.Sleep(2 * time.Second) time.Sleep(1500 * time.Millisecond)
err = gm.changeGameState(STATE_READY_SET, STATE_READY_SET, "")
if err != nil {
fmt.Println(err)
return
}
gm.notifyClients()
time.Sleep(1500 * time.Millisecond)
err = gm.changeGameState(STATE_READY_SET, STATE_PLAY, PHASE_NONE) err = gm.changeGameState(STATE_READY_SET, STATE_PLAY, PHASE_NONE)
if err != nil { if err != nil {

16
server/src/game/setupRound.go
View File

@ -36,18 +36,24 @@ func (gm *Game) selectQuote() {
} }
sourceId := q.GetSourceId() sourceId := q.GetSourceId()
if !gm.isSourceIdInList(sources, sourceId) {
sources = append(sources, gm.getSourceById(sourceId))
}
if len(sources) == 12 { if len(sources) == 12 {
break if quote != nil {
break
}
} else {
if !gm.isSourceIdInList(sources, sourceId) {
sources = append(sources, gm.getSourceById(sourceId))
}
} }
} }
gm.mu.Lock() gm.mu.Lock()
defer gm.mu.Unlock() defer gm.mu.Unlock()
gm.round.quoteId = quote.GetId() gm.round.quoteId = quote.GetId()
gm.round.sources = sources gm.round.sources = make([]Source, len(sources))
for idx, idxPerm := range r.Perm(len(sources)) {
gm.round.sources[idx] = sources[idxPerm]
}
} }
func (gm *Game) getSourceById(id string) Source { func (gm *Game) getSourceById(id string) Source {