BattleScreen now uses isCurrentTroopMelee

Changed implementation in BattleScreen to use isCurrentTroopMelee.