Fix missed allegiance change in the Trade Calculations
Correctly get the world list for the allegiances when using the collapse
allegiance setting.
Adjust two items for the hex map drawing

- The positions of the texts were wrong from the latest PyPDFUpdate,
adjust them back correctly
- Tweak the colors for the line drawing, making the blue lighter (so you
can read the text) and the yellow darker (so it doesn't vanish into the
white page).