Rebuilt and simplified weapon state system.  Fully functional combos.