Battle System mostly complete

Worked on discussed changes to battle system. All actions should be
working, implemented changes that were made in other commits. Placed in
"BattleSystem(Final)" so I wouldn't screw up any other commits. If
there's anything else I need to add or implement, please email me.