Improved and cleaned combat system code a little.
Some polishing done on combat system.