Merge with add_reorient so can do cleanly after that

doc/manual.tex

@@ -596,7 +596,6 @@ faithfully report which action spaces were used.
 	with the specified uniform number.}
 \item{\textbf{Reorient}(): Deal with loss of self or ball localization information and
 	pay increased attention to surroundings.}
-
 \end{itemize}
 
 \subsection{Special Actions}

hfo/hfo.py

@@ -29,6 +29,7 @@ An enum of the possible HFO actions, including:
   QUIT(): Quit the game
 """
 NUM_HFO_ACTIONS = 20
+<<<<<<< HEAD
 DASH,TURN,TACKLE,KICK,KICK_TO,MOVE_TO,DRIBBLE_TO,INTERCEPT,MOVE,SHOOT,PASS,DRIBBLE,CATCH,NOOP,QUIT,REDUCE_ANGLE_TO_GOAL,MARK_PLAYER,DEFEND_GOAL,GO_TO_BALL,REORIENT = list(range(NUM_HFO_ACTIONS))
 ACTION_STRINGS = {DASH: "Dash",
                   TURN: "Turn",
@@ -53,6 +54,13 @@ ACTION_STRINGS = {DASH: "Dash",
 
 """
 Possible game statuses:
+=======
+DASH, TURN, TACKLE, KICK, KICK_TO, MOVE_TO, DRIBBLE_TO, INTERCEPT, \
+    MOVE, SHOOT, PASS, DRIBBLE, CATCH, NOOP, QUIT, REDUCE_ANGLE_TO_GOAL,MARK_PLAYER,DEFEND_GOAL,GO_TO_BALL,REORIENT = list(range(NUM_HFO_ACTIONS))
+ACTION_STRINGS = ["Dash", "Turn", "Tackle", "Kick", "KickTo", "MoveTo", "DribbleTo", "Intercept", "Move", "Shoot", "Pass", "Dribble", "Catch", "No-op", "Quit", "Reduce_Angle_To_Goal", "Mark_Player", "Defend_Goal", "Go_To_Ball", "Reorient"]
+
+''' Possible game status
+>>>>>>> add_reorient
   [IN_GAME] Game is currently active
   [GOAL] A goal has been scored by the offense
   [CAPTURED_BY_DEFENSE] The defense has captured the ball

src/agent.cpp

@@ -642,7 +642,7 @@ Agent::doPreprocess()
                   __FILE__": (doPreProcess)" );
 
     //
-    // freezed by tackle effect
+    // frozen by tackle effect
     //
     if ( wm.self().isFrozen() )
     {
@@ -766,7 +766,8 @@ Agent::doReorient()
         dlog.addText( Logger::TEAM,
                       __FILE__": tackle wait. expires= %d",
                       wm.self().tackleExpires() );
-	if (Bhv_Emergency().execute( this )){ // includes change view
+
+	if (Bhv_Emergency().execute( this )) { // includes change view
 	  return ACTION_STATUS_MAYBE;
 	} else {
 	  return ACTION_STATUS_UNKNOWN;
@@ -824,6 +825,7 @@ Agent::doReorient()
     {
         dlog.addText( Logger::TEAM,
                       __FILE__": search ball" );
+
         if (Bhv_NeckBodyToBall().execute( this )) {
 	  return ACTION_STATUS_MAYBE;
 	} else {
@@ -831,6 +833,7 @@ Agent::doReorient()
 	}
     }
 
+
     //
     // check pass message
     //
@@ -843,6 +846,7 @@ Agent::doReorient()
     if (! ( ball.rposValid() && ball.velValid() )) {
       dlog.addText( Logger::TEAM,
 		    __FILE__": search ball" );
+
       if (Bhv_NeckBodyToBall().execute( this )) {
 	return ACTION_STATUS_MAYBE;
       } else {