Modified BattleCalculator

I made the fight method static and changed the parameters to be more
descriptive.