Fixed joint war.

[pspjuth]

This makes it possible to get joint war and research agreements in vanilla version.
This adds back the initial dialog from unmodded trade screen.
It seems the deal manager refuses incomplete deals and thus the upfront dialog is needed.
This solution should work for R&F as well with Third Party and Casus Belli choices.

[pspjuth]

This fixes the last problem in vanilla I'm aware of.

[ihendriks]

Looks good to me aside of the indentation of the one block.

Did we remove this code earlier ourselves or was this missed in the merging during the spring patch? Because it seems like we were missing a lot of this, which is pretty weird.

I'll test this ingame as well, see how that goes.

[ihendriks]

from L258 until here the code is indented too much (2 spaces)

[ihendriks]

I tested this on R&F and it works just fine. Didn't test in vanilla but I think if it works in R&F it'll work in vanilla just as well.

Didn't get to test the research agreement though, only joint war (with CB) and joining ongoing war (also with CB). Works both in joining an ongoing war yourself as well as asking AI to join yours.

[pspjuth]

I think since the Improved Deal Screen had a very different design, this popup was removed.
And that worked up to the last patch where it seems something changed in the deal manager.

[ihendriks]

Looks good to me now.

And yeah, that does make the most sense. Just seemed like a lot of lua was missing as well, which seems weird to me, as it's usually commented out with a note instead of just removed. But maybe it's because it's an integration, and not native CQUI.

[Azurency]

Thank you for your help 👍. However the popup was removed, and I'd like to keep it that way as it fits the orignal spirit of the improved deal screen better.
You guested it right, the code was removed by the original creator of this mod.
I just pushed a fix for the base game (e682907) and I'll test it for R&F when everything is merged together on the expansion1 branch.