Combat Upgrade

I've made a lot of changes to the combat systems and params. I still have a lot of tweaks to add to it but I wanted to put up something to try out in the meantime.