Sid Meier's Civilization VI

Sid Meier's Civilization VI

Extended Diplomacy Ribbon
the_m4a 9 Feb, 2021 @ 3:25am
Extended Diplomacy Ribbon, CQUI, and DiplomacyDealView.lua
(Word salads should not be consumed at 2am)

Short version:
CQUI does not use ReplaceUIScript for DiplomacyDealView_CQUI.lua anymore, and any version of DiplomacyDealView.lua that has the 'include("DiplomacyDealView_", true)' at the end of the file will now also load the CQUI DiplomacyDealView.

The EDR ReplaceUIScript for DiplomacyDealView.lua has that 'include' at the end of it, so the CQUI DiplomacyDealView also gets loaded. I cleaned up the CQUI DiplomacyDealView so that it would not break the diplo screen if the CQUI XML was not loaded along with it.
Last edited by the_m4a; 13 Feb, 2021 @ 4:16pm
< >
Showing 1-7 of 7 comments
Aristos  [developer] 11 Feb, 2021 @ 11:32am 
Coders at Firaxis are in Kindergarten...

Anyways, I am not sure what your question is anymore...
the_m4a 11 Feb, 2021 @ 3:14pm 
LOL - sorry, this is what I get for trying to type things up at 2am or whichever. The question is basically: are you okay with me implementing a copy of "TradeableIndicator" with the same behaviors in CQUI?

The primary purpose is that by both of us having the same Control declared in our respective DiplomacyDealView.xml files, it is easier to have CQUI and EDR work easily together. The secondary goal of my request is that what EDS does with "TradableIndicator" is better than what CQUI was doing with the "important" icon.


Aristos  [developer] 12 Feb, 2021 @ 2:23pm 
Do you mean the [NEW_ICON] icon inside deal view to signal the resources that are not owned or traded in by the human player?

Wasn't the deal view in CQUI color coded to signal the same info? At least that is how I left it (I recoded that integration in full, was a pain in the butt because of all the bugs in Firaxis code, and I mean the DLL, not the LUA files)... why would you need to signal it through the NEW icon also?
the_m4a 12 Feb, 2021 @ 9:21pm 
Yeah, good point, the coloring works to the point that frankly I didn't understand the point of the additional "!".

Different question, then: do you know offhand if I have the CQUI DiplomacyDealView stuff load later than EDR, does that adversely affect EDR? As best I could tell, it does not cause trouble.
Aristos  [developer] 13 Feb, 2021 @ 12:48pm 
the load order "should" just replace identical files with the one of the highest order, so if you apply a higher order to diplomacydealview it should just dominate EDR's version... but if you still want to add redundancy by using the NEW icon, feel free to add it as long as you give credits (I have no idea if my comments from the original file when I did the integration/recoding are still there...)
the_m4a 13 Feb, 2021 @ 4:11pm 
I leave most of the original comments when I see them :) You and Azurency and a few others have done lots of good things wit this code, I like leaving that history (and credit) there.

This is what I put in the XML:
<!-- CQUI: Workaround for Extended Diplomacy Ribbon (EDR) by Aristos, which adds a TradableIndicator and references it in their ReplaceUIScript --> <!-- When the CQUI Lua is loaded, this will not show. If EDR Lua loads with the CQUI XML, this prevents the Diplomacy Deal Screen from becoming non-functional --> <Label ID="TradeableIndicator" String="[ICON_New]" Anchor="L,T" Offset="-11,-11" Hidden="1"/>

I updated the CQUI modinfo to look for EDR and load the diplomacydealscreen late if it's also running:
<!-- Extended Diplomacy Ribbon has a load order value of 13000 (or 13001, 13002) for its DiplomacyDealView.xml, CQUI needs to load later --> <ImportFiles id="CQUI_IMPORT_FILES_DIPLOMACYDEALVIEW_XML_EDR" criteria = "ModInUse_ExtendedDiplomacyRibbon"> <Properties> <LoadOrder>13013</LoadOrder> </Properties> <Items> <File>Assets/UI/diplomacydealview.xml</File> </Items> </ImportFiles>
Aristos  [developer] 15 Feb, 2021 @ 1:13pm 
:steamthumbsup:
< >
Showing 1-7 of 7 comments
Per page: 1530 50