I would like to request for this as well. The capability of switch weapon after actions are used before ending the turn should be provided for controller users!