Refactored movement for Attack Button further.
Fixed bug that caused regular Attack Buttons to update their time (thus causing a time reduction that was out of sync) when a Shield Attack Button was tapped.