battery and ammo constraints
fixing conflict