Fixed getThreat() and getAdjThreat()

Map generation is broken but I'm fixing that too.