Started diverging
Removed the old combat and faction code, replaced the game constants, got rid of some terrain code
Pummelling it