search

civfanatics / CQUI_Community-Edition

Civilization 6 mod - UI enhancements, reduce clicks and manage your empire faster!
MIT License
156 stars 29 forks source link

Various Fixes in City View #352

Closed JamieNyanchi closed 1 year ago

JamieNyanchi commented 1 year ago

This makes a few changes to the city view to fix and polish up some areas. The changes are described below.

  1. Added support for the Loyalty and Power lenses when selected on their respective tabs.

  2. Polished drag threshold code and added it for citizen management and tile swapping.

  3. Properly restore City Management view when cancelling district/building placement, whether by right clicking or by clicking the close buttons.

  4. Hide the advisor on the Power panel based on the CQUI settings.

  5. When changing the name of a city, don't use the all uppercase version of the name in the edit box. Fixes #327.

As always, if more detail on the changes is desired or if changes are requested, I'd be happy to make them!

Infixo commented 1 year ago
  1. I don't want the Loyalty and Power lenses to automatically show when browsing through city info. I kind of like that the city is always in its main view sort of speak. For some reason Firaxis didn't add neither such functionality. So, it's not a fix just a change.
  2. I don't know what exactly is this. 3, 4, 5 - these are ok.
JamieNyanchi commented 1 year ago

Regarding 1, I thought it was intended that those lenses show up when clicking on the Loyalty and Power tabs in the city overview panel. When I load up the game with no mods and click though the tabs, it applies those lenses for me. In addition, it even shows a key for the Power lens when selected on that tab which further makes me believe it was intended, at the very least for that tab. I could maybe make it a setting so that the "main view" stays on every tab (I assume you mean the citizen management lens when you say main view)? Or I could just remove this change completely even. Just to clarify, this doesn't take you out of the city view at all when you click those tabs. It just applies the lens while in the city view. It does take off the citizen management lens while selected on those, but it already did this for the religion lens.

For 2, I should have specified more in the main post. The relevant changes are in the plotinfo_CQUI and worldinput_CQUI files. This was initially added in #330 for tile purchasing. I believe one issue I noticed before was that if you dragged the map and then tried to purchase a tile (even if you don't drag while attempting to purchase), it won't go through. You'd have to double click at that point. I modified it so that this won't happen while still preventing accidental purchases when dragging. I also extended this to selecting tiles for citizens to manage and to swapping tiles between cities.

I hope this helps!

Infixo commented 1 year ago

Ad. 1 Hm. Seems I forgot how the vanilla UI behaves then, I am so used to CQUI :) I think the idea of adding a param to "auto-lens" section of params should solve this. Like "auto-loyalty-lens-in-city" and "auto-power-lens-in-city". Ad. 2 So... does it fix the double-click-to-buy-tile thing? would be great...

JamieNyanchi commented 1 year ago

Regarding 1, I think adding in settings would be a fine solution. It would let people choose whether or not they want to keep the citizen management view active even if on Loyalty or Power. I can work on getting that added and tested. Would we want to do something similar for the Religion tab too though since that also takes away the citizen management view?

Regarding 2, yes, it does fix that. Sorry for not being more clear. Sometimes it's hard for me to get my thoughts into words. With the way it's coded here, dragging the map before even attempting to buy a tile won't force you to double click. This is done while still maintaining the intention of the original PR, which is to prevent accidental actions while dragging the map.

Infixo commented 1 year ago

Re. 1. Great :) Could be nice for religion, too, if it is not too much to ask of you? Re. 2. You are very thorough and precise. You see lots of trees, it takes a bit of practice to see the woods. Don't worry :)