I'm still planning on a more ambitious navigation mod, but this is a simple interim change to the existing navigation model that allows you to use the up/down keys to navigate directly to an avatar. This means that if you open your card hand & need to cast a spell that targets the enemy avatar, you can simply hit the up key a couple of times instead of navigating left (through potentially a huge number of cards if you're in a long, drawn out match).

projects/mtg/include/DuelLayers.h

@@ -33,6 +33,7 @@ public:
   ActionLayer * actionLayer();
   ActionStack * stackLayer();
   GuiCombat * combatLayer();
+  GuiAvatars * GetAvatars();
   void init();
   virtual void Update(float dt, Player * player);
   void CheckUserInput(int isAI);

projects/mtg/include/GuiAvatars.h

@@ -20,9 +20,11 @@ class GuiAvatars : public GuiLayer
   
 
  public:
-  GuiAvatars(CardSelector*);
+	GuiAvatars(CardSelector*);
   ~GuiAvatars();
-  //  virtual void Render();
+
+	GuiAvatar* GetSelf();
+  GuiAvatar* GetOpponent();
   void Update(float dt);
   void Render();
   void Activate(PlayGuiObject* c);