Battlescreen should index entities by combatant id not character id.