Enums and Small Modifications

I made terrain an enum, and I changed a variable in battleCalc to make
it more explicit as to what it does.