Adjust laser settings to use just one function

NPCs now use energy for their shots
Fix submodule in branch