adding battlecalculator logic + fixed model state behaviour change