made the combat window better and have attacking huts, villages, and enemy settlers
merged research into my stuff