Modified sword logic, now feels more fun