more gateway things

Author: y21

http/gateway/coordinate_change.go

@@ -10,17 +10,17 @@ import (
 
 func CoordinateChangeEventCallback(c *WebSocketConnection, d *AnyMessage) {
 roomID, ok := d.Data["room"].(string)
-if !ok {
-return
-}
+var x, y int
 
-x, ok := d.Data["x"].(int)
-if !ok {
+if temp, ok := d.Data["x"].(float64); ok {
+x = int(temp)
+} else {
 return
 }
 
-y, ok := d.Data["y"].(int)
-if !ok {
+if temp, ok := d.Data["y"].(float64); ok {
+y = int(temp)
+} else {
 return
 }
 

http/gateway/handler.go

@@ -88,20 +88,19 @@ func handleHello(c *WebSocketConnection, d *AnyMessage) {
 Health: 100,
 X: rand.Intn(r.Map.MapSize.Width),
 Y: rand.Intn(r.Map.MapSize.Height),
+Conn: c.Conn,
 }
 
 if err != nil && err.Error() == user.UserNotFound {
 p.Username = r.GenerateGuestName()
 p.BR = player.GuestBR
-p.Blob = player.BlobowoID
+p.Blob = user.StartBlob
 p.Guest = true
 p.Role = user.GuestRole
 } else if u != nil {
 p.Username = u.Username
 p.BR = u.BR
-// TODO: write a function that converts a blob string to int
-//p.Blob = u.ActiveBlob
-p.Blob = player.BlobowoID
+p.Blob = user.StartBlob
 p.Guest = false
 p.Role = u.Role
 p.Coins = u.Blobcoins
@@ -199,3 +198,24 @@ func (c *WebSocketConnection) HandleAntiCheatFlags(r *room.Room, flags int) bool
 }
 return false
 }
+
+func WatchRoom(r *room.Room) {
+for {
+for _, p := range r.Players {
+conn, ok := connections[p.ID]
+if !ok {
+continue
+}
+
+conn.Send(AnyMessage{
+Op: OpEvent,
+T: CoordinateChangeEvent,
+Data: map[string]interface{}{
+"players": r.Players,
+},
+})
+}
+
+time.Sleep(time.Millisecond * 25)
+}
+}

main.go

@@ -7,6 +7,7 @@ import (
 "time"
 
 "github.com/blobs-io/blobsgame/database"
+"github.com/blobs-io/blobsgame/http/gateway"
 "github.com/blobs-io/blobsgame/http/web"
 "github.com/blobs-io/blobsgame/models/gamemap"
 "github.com/blobs-io/blobsgame/models/room"
@@ -48,8 +49,9 @@ func main() {
 // Create rooms
 room.Rooms = make(map[string]*room.Room)
 for i := 0; i < 3; i++ {
-room.New(room.FFAMode)
-room.New(room.EliminationMode)
+go gateway.WatchRoom(room.New(room.FFAMode))
+
+go gateway.WatchRoom(room.New(room.EliminationMode))
 }
 fmt.Printf("Created %d rooms\n", len(room.Rooms))
 

models/item/item.go

@@ -2,14 +2,14 @@ package item
 
 const (
 HealthItem = 0
-CoinItem = 1
-ItemWidth = 20
-ItemHeight = 20
+CoinItem  = 1
+ItemWidth  = 20.0
+ItemHeight = 20.0
 )
 
 type Item struct {
-X int `json:"x"`
-Y int `json:"y"`
-Type uint8 `json:"type"`
-ID string `json:"id"`
-}
+X  int  `json:"x"`
+Y  int  `json:"y"`
+Type uint8  `json:"type"`
+ID  string `json:"id"`
+}

models/player/player.go

@@ -2,6 +2,8 @@ package player
 
 import (
 "time"
+
+"github.com/gofiber/websocket"
 )
 
 const (
@@ -21,9 +23,6 @@ const (
 DirectionRight = 1
 DirectionDown = 2
 DirectionLeft = 3
-
-// Blob IDs
-BlobowoID = 0
 )
 
 type CoordinatesAny struct {
@@ -32,26 +31,27 @@ type CoordinatesAny struct {
 }
 
 type Player struct {
-Username string `json:"username"`
-BR int `json:"br"`
-Blob uint8 `json:"blob"` // Blob ID
-Role int8 `json:"role"`
-ID string `json:"id"`
-LastNom int64 `json:"lastNom"`
-Direction uint8 `json:"direction"`
-DirectionChangeCoordinates CoordinatesAny `json:"directionChangeCoordinates"`
-DirectionChangedAt int64 `json:"directionChangedAt"`
-Guest bool `json:"guest"`
-Distance int `json:"distance"`
-Health uint8 `json:"health"`
-AntiCheatFlags int `json:"antiCheatFlags"`
-X int `json:"x"`
-Y int `json:"y"`
-LastRegeneration int64 `json:"lastRegeneration"`
-LastPing int64 `json:"lastPing"`
-Coins int `json:"coins"`
-Noms int `json:"noms"`
-XP int `json:"xp"`
+Username string `json:"username"`
+BR int `json:"br"`
+Blob string `json:"blob"`
+Role int8 `json:"role"`
+ID string `json:"id"`
+LastNom int64 `json:"lastNom"`
+Direction uint8 `json:"direction"`
+DirectionChangeCoordinates CoordinatesAny `json:"directionChangeCoordinates"`
+DirectionChangedAt int64 `json:"directionChangedAt"`
+Guest bool `json:"guest"`
+Distance int `json:"distance"`
+Health uint8 `json:"health"`
+AntiCheatFlags int `json:"antiCheatFlags"`
+X int `json:"x"`
+Y int `json:"y"`
+LastRegeneration int64 `json:"lastRegeneration"`
+LastPing int64 `json:"lastPing"`
+Coins int `json:"coins"`
+Noms int `json:"noms"`
+XP int `json:"xp"`
+Conn *websocket.Conn `json:"-"`
 }
 
 func (p *Player) Update(br int, coins int, xp int) {

models/room/room.go

@@ -110,10 +110,9 @@ func (r *Room) GetPlayerByUsername(username string) *player.Player {
 }
 
 func (r *Room) GetPlayerByWebSocketID(id string) *player.Player {
-for i, p := range r.Players {
-if p.ID == id {
-return r.Players[i]
-}
+index := r.GetPlayerIndexByWebSocketID(id)
+if index > -1 {
+return r.Players[index]
 }
 return nil
 }

models/user/user.go

@@ -62,10 +62,13 @@ const (
 BlobNoAccess = "you cannot use this blob"
 DailyGiftFailed = "you have already requested your daily gift, come back later" // TODO: display time left
 
+// Valid blobs
+Blobowo = "blobowo"
+
 // Properties
 StartRating = 1000
 StartCoins = 0
-StartBlob = "blobowo"
+StartBlob = Blobowo
 StartXP = 0
 DailyCoins = 20