Commit 7071045

committed

adjust MinPlayerStartup and check mode

1 parent 2519d58 commit 7071045Copy full SHA for 7071045

File tree

+30

-2

lines changed

+30

-2

lines changed

Lines changed: 30 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,8 @@ const (`
`22`	`22`
`23`	`23`	`// Limits etc`
`24`	`24`	`PlayerLimit = 100`
`25`		`- MinPlayerStartup = 4`
`26`		`- WaitingTime = time.Second*2`
	`25`	`+ MinPlayerStartup = 2`
	`26`	`+ WaitingTime = 120000`
`27`	`27`
`28`	`28`	`// States`
`29`	`29`	`WaitingState = 0`
`@@ -62,6 +62,10 @@ func New(mode uint8) *Room {`
`62`	`62`	`r.Players = make([]*player.Player, 0)`
`63`	`63`	`r.Items = make([]*item.Item, 0)`
`64`	`64`
	`65`	`+ if mode == EliminationMode {`
	`66`	`+ r.State = WaitingState`
	`67`	`+ }`
	`68`	`+`
`65`	`69`	`Rooms[r.ID] = &r`
`66`	`70`
`67`	`71`	`return &r`
`@@ -136,3 +140,27 @@ func (r *Room) RemovePlayer(index int) bool {`
`136`	`140`	`r.Players = r.Players[:len(r.Players)-1]`
`137`	`141`	`return true`
`138`	`142`	`}`
	`143`	`+`
	`144`	`+func (r *Room) StartsAt() int64 {`
	`145`	`+ if r.State == WaitingState {`
	`146`	`+ return 0`
	`147`	`+ }`
	`148`	`+`
	`149`	`+ return r.CountdownStarted + WaitingTime`
	`150`	`+}`
	`151`	`+`
	`152`	`+func (r *Room) IsSingle() bool {`
	`153`	`+ return len(r.Players) == 0`
	`154`	`+}`
	`155`	`+`
	`156`	`+func FindLobbyByWebsocketID(id string) *Room {`
	`157`	`+ for i, r := range Rooms {`
	`158`	`+ pl := r.GetPlayerIndexByWebSocketID(id)`
	`159`	`+ if pl < 0 {`
	`160`	`+ continue`
	`161`	`+ }`
	`162`	`+`
	`163`	`+ return Rooms[i]`
	`164`	`+ }`
	`165`	`+ return nil`
	`166`	`+}`

Comments

(0)