Combined diesel-electric and gas