diff -c src/antichess/antichess_board.C:1.26 src/antichess/antichess_board.C:1.27
*** src/antichess/antichess_board.C:1.26	Fri Dec 15 14:56:14 1995
--- src/antichess/antichess_board.C	Fri Dec 15 14:56:14 1995
***************
*** 141,159 ****
  	break;
      case pawn: 
  	if (mv->was_promotion())
! 	    total = 7;
  	else
  	    total= 1;
  	break;
!     case rook: total= 5;
  	break;
      case knight: total= 3;
  	break;
!     case bishop: total= 5;
  	break;
!     case queen: total= 7;
  	break;
!     case king: total= 2;
  	break;
      }
      if (p_mover == p_pov)
--- 141,159 ----
  	break;
      case pawn: 
  	if (mv->was_promotion())
! 	    total = 10;
  	else
  	    total= 1;
  	break;
!     case rook: total= 6;
  	break;
      case knight: total= 3;
  	break;
!     case bishop: total= 6;
  	break;
!     case queen: total= 10;
  	break;
!     case king: total= 3;
  	break;
      }
      if (p_mover == p_pov)
***************
*** 184,198 ****
  	    case none:     break;
  	    case pawn: piece = 1;
  		break;
! 	    case rook: piece = 5;
  		break;
  	    case knight: piece = 3;
  		break;
! 	    case bishop: piece = 5;
  		break;
! 	    case queen: piece = 7;
  		break;
! 	    case king: piece = 2;
  		break;
  	    }
  	    if (b->fetch(y1,x1).piece_color == this_color)
--- 184,198 ----
  	    case none:     break;
  	    case pawn: piece = 1;
  		break;
! 	    case rook: piece = 6;
  		break;
  	    case knight: piece = 3;
  		break;
! 	    case bishop: piece = 6;
  		break;
! 	    case queen: piece = 10;
  		break;
! 	    case king: piece = 3;
  		break;
  	    }
  	    if (b->fetch(y1,x1).piece_color == this_color)
***************
*** 206,217 ****
  
  long antichess_board::suggest_time(long time_left) const {
    if ((starting_pieces()-pieces_remaining(0)-pieces_remaining(1)) < 1)
!     return (time_left / 30);  // Start game, don't think too hard
!   else if ((pieces_remaining(0)+pieces_remaining(1)) < 10)
!     return (time_left / 10);
    else return (time_left / (pieces_remaining(0) + pieces_remaining(1)));
- //    return (time_left * (starting_pieces()+1-pieces_remaining(0)
- //		  -pieces_remaining(1))) /starting_pieces();
  }
  
  void * antichess_board::force (typeinfo_t &t){
--- 206,215 ----
  
  long antichess_board::suggest_time(long time_left) const {
    if ((starting_pieces()-pieces_remaining(0)-pieces_remaining(1)) < 1)
!     return (time_left / 60);  // Start game, don't think too hard
!   else if ((pieces_remaining(0)+pieces_remaining(1)) < 10)  //
!       return (time_left / 5);
    else return (time_left / (pieces_remaining(0) + pieces_remaining(1)));
  }
  
  void * antichess_board::force (typeinfo_t &t){
diff -c src/base/ChangeLog:1.53 src/base/ChangeLog:1.54
*** src/base/ChangeLog:1.53	Fri Dec 15 14:56:16 1995
--- src/base/ChangeLog	Fri Dec 15 14:56:16 1995
***************
*** 1,3 ****
--- 1,9 ----
+ <<<<<<< ChangeLog
+ Fri Dec 15 02:40:30 1995  Sam Hartman  <hartmans@tertius.mit.edu>
+ 
+ 	* Makefile.in (all): Remove that stupid 2 that keeps popping up.
+ 
+ =======
  Fri Dec 15 05:03:15 1995  Jered J Floyd  (jered@vorlon)
  
  	* machine_player.C: Make empty mgnode ptrs on mnodes NULL,
***************
*** 12,17 ****
--- 18,24 ----
  	I cannot determine why.
  
  Fri Dec 15 02:40:30 1995  Sam Hartman  <hartmans@tertius.mit.edu>
+ >>>>>>> 1.53
  
  	* game.C: Implement set_time_left
  
diff -c src/base/Makefile.in:1.11 src/base/Makefile.in:1.13
*** src/base/Makefile.in:1.11	Fri Dec 15 14:56:16 1995
--- src/base/Makefile.in	Fri Dec 15 14:56:17 1995
***************
*** 22,26 ****
  
  include $(top_srcdir)/config/commonrules
  
- 
- 2
\ No newline at end of file
--- 22,24 ----
diff -c src/base/machine_player.C:1.23 src/base/machine_player.C:1.26
*** src/base/machine_player.C:1.23	Fri Dec 15 14:56:18 1995
--- src/base/machine_player.C	Fri Dec 15 14:56:18 1995
***************
*** 1,7 ****
  //  This is -*- c++ -*- code
  
  
! // $Id: machine_player.C,v 1.23 1995/12/15 11:25:16 jered Exp $
  
  #include <ctype.h>
  #include <6170.h>
--- 1,7 ----
  //  This is -*- c++ -*- code
  
  
! // $Id: machine_player.C,v 1.26 1995/12/15 19:27:45 hartmans Exp $
  
  #include <ctype.h>
  #include <6170.h>
diff -c src/include/machine_player.h:1.12 src/include/machine_player.h:1.14
*** src/include/machine_player.h:1.12	Fri Dec 15 14:56:19 1995
--- src/include/machine_player.h	Fri Dec 15 14:56:19 1995
***************
*** 1,5 ****
  //  This is -*- c++ -*- code
! // $Id: machine_player.h,v 1.12 1995/12/15 11:25:23 jered Exp $
  
  
  #ifndef __MACHINE_PLAYER_H__
--- 1,5 ----
  //  This is -*- c++ -*- code
! // $Id: machine_player.h,v 1.14 1995/12/15 19:27:48 hartmans Exp $
  
  
  #ifndef __MACHINE_PLAYER_H__
***************
*** 46,57 ****
        move_generator *mg;
        int mg_index;
        mnode *mn;
!       mgnode *next;
      };
      struct mnode {
        move *nmove;
        board::value nval;
!       mgnode *nnode;
        mnode *next;
      };
      void try_simple(void);
--- 46,57 ----
        move_generator *mg;
        int mg_index;
        mnode *mn;
! 	mgnode *next;
      };
      struct mnode {
        move *nmove;
        board::value nval;
! 	mgnode *nnode;
        mnode *next;
      };
      void try_simple(void);
