Commit e52a84f4 authored by drallensmith's avatar drallensmith

Merge with add_reorient so can do cleanly after that

parents 8740b55b 732c2b99
No preview for this file type
...@@ -596,7 +596,6 @@ faithfully report which action spaces were used. ...@@ -596,7 +596,6 @@ faithfully report which action spaces were used.
with the specified uniform number.} with the specified uniform number.}
\item{\textbf{Reorient}(): Deal with loss of self or ball localization information and \item{\textbf{Reorient}(): Deal with loss of self or ball localization information and
pay increased attention to surroundings.} pay increased attention to surroundings.}
\end{itemize} \end{itemize}
\subsection{Special Actions} \subsection{Special Actions}
......
...@@ -29,6 +29,7 @@ An enum of the possible HFO actions, including: ...@@ -29,6 +29,7 @@ An enum of the possible HFO actions, including:
QUIT(): Quit the game QUIT(): Quit the game
""" """
NUM_HFO_ACTIONS = 20 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)) 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", ACTION_STRINGS = {DASH: "Dash",
TURN: "Turn", TURN: "Turn",
...@@ -53,6 +54,13 @@ ACTION_STRINGS = {DASH: "Dash", ...@@ -53,6 +54,13 @@ ACTION_STRINGS = {DASH: "Dash",
""" """
Possible game statuses: 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 [IN_GAME] Game is currently active
[GOAL] A goal has been scored by the offense [GOAL] A goal has been scored by the offense
[CAPTURED_BY_DEFENSE] The defense has captured the ball [CAPTURED_BY_DEFENSE] The defense has captured the ball
......
...@@ -642,7 +642,7 @@ Agent::doPreprocess() ...@@ -642,7 +642,7 @@ Agent::doPreprocess()
__FILE__": (doPreProcess)" ); __FILE__": (doPreProcess)" );
// //
// freezed by tackle effect // frozen by tackle effect
// //
if ( wm.self().isFrozen() ) if ( wm.self().isFrozen() )
{ {
...@@ -766,7 +766,8 @@ Agent::doReorient() ...@@ -766,7 +766,8 @@ Agent::doReorient()
dlog.addText( Logger::TEAM, dlog.addText( Logger::TEAM,
__FILE__": tackle wait. expires= %d", __FILE__": tackle wait. expires= %d",
wm.self().tackleExpires() ); wm.self().tackleExpires() );
if (Bhv_Emergency().execute( this )){ // includes change view
if (Bhv_Emergency().execute( this )) { // includes change view
return ACTION_STATUS_MAYBE; return ACTION_STATUS_MAYBE;
} else { } else {
return ACTION_STATUS_UNKNOWN; return ACTION_STATUS_UNKNOWN;
...@@ -824,6 +825,7 @@ Agent::doReorient() ...@@ -824,6 +825,7 @@ Agent::doReorient()
{ {
dlog.addText( Logger::TEAM, dlog.addText( Logger::TEAM,
__FILE__": search ball" ); __FILE__": search ball" );
if (Bhv_NeckBodyToBall().execute( this )) { if (Bhv_NeckBodyToBall().execute( this )) {
return ACTION_STATUS_MAYBE; return ACTION_STATUS_MAYBE;
} else { } else {
...@@ -831,6 +833,7 @@ Agent::doReorient() ...@@ -831,6 +833,7 @@ Agent::doReorient()
} }
} }
// //
// check pass message // check pass message
// //
...@@ -843,6 +846,7 @@ Agent::doReorient() ...@@ -843,6 +846,7 @@ Agent::doReorient()
if (! ( ball.rposValid() && ball.velValid() )) { if (! ( ball.rposValid() && ball.velValid() )) {
dlog.addText( Logger::TEAM, dlog.addText( Logger::TEAM,
__FILE__": search ball" ); __FILE__": search ball" );
if (Bhv_NeckBodyToBall().execute( this )) { if (Bhv_NeckBodyToBall().execute( this )) {
return ACTION_STATUS_MAYBE; return ACTION_STATUS_MAYBE;
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment