More updates from Patch 1.0.0.290

[tyrken]

Here is another attempt at helping with the massive changes, starting with just a couple of files in case I'm doing something wrong - please provide feedback as it's very difficult doing it blind - no syntax/lint & little lua knowledge. Thankfully found a old but useful GUI for 5-way merges in http://diffuse.sourceforge.net/index.html I drive with a space-normalisation script.

Sometimes it's been easier to start from a tab-to-spaced form of the updated 290 code and just add back in the CQUI changes that, but sorry this makes a lot of diffs to your CQUI expansion2 branch.

• popups/techciviccompletedpopup.lua
• popups/mappinlistpanel.xml (no changes)
• popups/wonderbuiltpopup.lua
• screens/civicstree.lua
• Screens/governmentscreen.lua
• Screens/governmentscreen.xml
• Screens/techtree.lua
• ToolTips/plottooltip.lua
• strategicview_mapplacement.lua
• techandcivicsupport.lua
• toppanel.lua
• toppanel.xml
• unitflagmanager.lua
• unitflagmanager.xml
• worldinput.lua
• worldtracker.lua
• worldtracker.xml
• worldview/plotinfo.lua
• worldview/plotinfo.xml (no changes needed)
• worldviewiconsmanager.lua

Many apologies @accatyyc I didn't notice until completed that you'd also started at the bottom working on worldviewiconsmanager.lua, please review my changes against what you have!

[joelekstrom]

No problem, I'm not really sure what I'm doing either - but @Azurency posted a helpful review on my PR, so check that out as well.

[tyrken]

OK, for worldviewiconsmanager.lua I've added in the =>256 on line 93 and checked the feedback from #383.

TBH the second parameter to IconManager:FindIconAtlas is on closer inspection a size, so the new 256 value here & where I add the debatable comment just above might actually be wrong (UI from the mod might not have room compared to the new stock UI). Should be pretty clear once we get the whole thing play-testable.

[Azurency]

I'll try to make a review this week 😉

[tyrken]

In unitflagmanager.lua do we need something to balance the CQUI instance.FlagBaseDarken on lines 522-536 (War Check), e.g. instance.FlagBaseLighten:SetColor( primaryColor );?

[tyrken]

Got this comment in Screens/governmentscreen.xml: <!--Filters are added dynamically through AddFilterTabButtons--> ... hoping they actually meant RealizeFilterTabs in the matching lua file, added an equivalent there.

In line 1114 of Screens/governmentscreen.lua, I reverted a CQUI change of the variable name from "strSlotType" to "rowSlotType", that looked like a mistake.

[tyrken]

• screens/civicstree.lua: Line 585 has CQUI removing an else that was there in original & update, I have NOT removed it as it looked wrong, please confirm!

  if node["unlockGOV"] == nil then
  node["unlockGOV"] = InstanceManager:new( "GovernmentIcon", "GovernmentInstanceGrid", node.UnlockStack );
  else   <--- This else was deleted by CQUI!
  node["unlockGOV"]:DestroyInstances()
  end

• replacements/* - can you explain what is meant to be merged with what? Confusing...

• popups/techciviccompletedpopup.lua - I can't really see where to put any of the changes from CQUI, so reverted to updated 290 version instead.

• popups/mappinlistpanel.xml - no changes needed

[tyrken]

@Azurency have you managed to start code review yet?

[Azurency]

@tyrken not this pull request, I'm on #382 for now

[Azurency]

Great, thx for the contribution 👍 🎉