Notional bug (caused by intercept after ship overrun) and bug in forced ship rebase

[Mayhemizer_slith]

version 5.0.0.10

Germany DoW on Netherlands and sail ships and div to North Sea. Invasion to empty Rotterdam + INF joins the combat. 3 units attack defender in Amsterdam, ART and FTR3 provide 12 points ground support. 2 points shore bombardment to both hexes.

In this situation Rotterdam has 2 notionals (1 base, 1 city, 1 ZOC, -1 surprise).

Roll high enough to make Amsterdam fall. After Amsterdam falls Rotterdam should have 1 notional if I understand rules right. This happens if any of the following happens
- ship in Amsterdam is captured
- ship in Amsterdam is destroyed
- ship in Amsterdam is aborted but not intercepted

But if Germany intercepts (and CW finds too, for example both rolling 1) there is a naval combat and German NAV is aborted in air combat and then German ships abort to Kiel. In this case Netherland CA stays in box 0 (does not continue rebase to port) and Rotterdam has 0 notionals.

[Mayhemizer_slith]

I think this was the first time I attack Netherlands like this, attacking both cities at once. Both attacks are +18 if Amsterdam is attacked first.