assets: Added a 43 offset on X and Y on the map

client/map.go

@@ -28,8 +28,7 @@ func (m *Map) Draw(screen *ebiten.Image) {
 	// part that it's seen by the user
 	// If we want to render everything and just move the viewport around we need o render the full image and change the
 	// opt.GeoM.Transport to the Map.X/Y and change the Update function to do the opposite in terms of -+
-	//
-	// TODO: Maybe create a self Map entity with Update/Draw
+
 	op := &ebiten.DrawImageOptions{}
 	s := m.game.Camera.GetState().(CameraState)
 	op.GeoM.Scale(s.Zoom, s.Zoom)

client/new.go

@@ -82,11 +82,15 @@ func wsHandler(ctx context.Context) {
 		}
 
 		actionDispatcher.Dispatch(act)
+		// If the action is StartGame then we
+		// focus the user on it's own line
+		if act.Type == action.StartGame {
+			actionDispatcher.GoHome()
+		}
 	}
 }
 
 func wsSend(a *action.Action) {
-	// TODO: ADD THE ROOM
 	err := wsjson.Write(context.Background(), wsc, a)
 	if err != nil {
 		log.Fatal(err)

server/rooms.go

@@ -131,7 +131,7 @@ func (rs *RoomsStore) Reduce(state, a interface{}) interface{} {
 				Players:     make(map[string]PlayerConn),
 				Connections: make(map[string]string),
 
-				Size:      6,
+				Size:      2,
 				Countdown: 10,
 			}
 			rstate.CurrentWaitingRoom = rid.String()

store/map.go

@@ -94,38 +94,38 @@ func (m *Map) GetRandomSpawnCoordinatesForLineID(lid int) (float64, float64) {
 	// The area is of 112
 
 	p := rand.Intn(112)
-	yy := (p%7)*16 + 16
-	xx := ((p%16)*16 + 16) + (lid * 16 * (16 + 1 + 10 + 1))
+	yy := (43 * 16) + (p%7)*16 + 16
+	xx := (43 * 16) + ((p%16)*16 + 16) + (lid * 16 * (16 + 1 + 10 + 1))
 
 	return float64(xx), float64(yy)
 }
 
 func (m *Map) GetHomeCoordinates(lid int) (float64, float64) {
-	return float64(lid * 16 * (16 + 1 + 10 + 1)), 0
+	return float64(lid*16*(16+1+10+1) + (43 * 16)), (43 * 16)
 }
 
 func (m *Map) EndZone(lid int) utils.Object {
 	return utils.Object{
-		X: float64(16 + (lid * 16 * (16 + 1 + 10 + 1))),
-		Y: 82 * 16,
+		X: float64((43 * 16) + 16 + (lid * 16 * (16 + 1 + 10 + 1))),
+		Y: 82*16 + (43 * 16),
 		W: 16 * 16,
 		H: 3 * 16,
 	}
 }
 
 func (m *Map) BuildingZone(lid int) utils.Object {
 	return utils.Object{
-		X: float64(16 + (lid * 16 * (16 + 1 + 10 + 1))),
-		Y: (7 * 16) + 16, // This +16 is for the border
+		X: float64((43 * 16) + 16 + (lid * 16 * (16 + 1 + 10 + 1))),
+		Y: (7 * 16) + 16 + (43 * 16), // This +16 is for the border
 		W: 16 * 16,
 		H: 74 * 16,
 	}
 }
 
 func (m *Map) UnitZone(lid int) utils.Object {
 	return utils.Object{
-		X: float64(16 + (lid * 16 * (16 + 1 + 10 + 1))),
-		Y: 16, // This +16 is for the border
+		X: float64((43 * 16) + 16 + (lid * 16 * (16 + 1 + 10 + 1))),
+		Y: 16 + (43 * 16), // This +16 is for the border
 		W: 16 * 16,
 		H: 81 * 16,
 	}