merges master with militaryInteraction, adds ability to build troops for tirkid