Melee update either bugged or needs tweaking

[KuietKat]

I play alot of valkyr and have noticed that while in her ultimate, switching weapons causes the invincibility to go away but keeps energy drain (tested on excalibur and umbra with the same results)

also when deactivating the ultimate it automatically switches to the equipped melee weapon, i guess this is only an issue for the "enable left click for melee attack" option, but still.

while not game breaking, i would like to see the ultimate's in question either locked into their respective melee weapons (maybe using the same code for equipping nothing but a melee weapon, to enable gliding without switching weapons) or a rework for either the energy loss while not equipped, or for valkyr to either keep invincibility while ultimate is up no matter what or possibly take it off completely and have increased armor instead for the duration.