-
Notifications
You must be signed in to change notification settings - Fork 64
New icon-based ameneties panel #4
Changes from 1 commit
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -124,6 +124,54 @@ | |
<Grid Anchor="L,T" Offset="0,0" Size="parent,0" AutoSize="Vertical" Style="CityPanelSubPanelContainer" InnerPadding="0,10" InnerOffset="0,5"> | ||
<Stack StackGrowth="Bottom" StackPadding="0"> | ||
<Stack ID="AmenityStack" StackGrowth="Bottom" StackPadding="4" /> | ||
<Stack StackGrowth="Down" Anchor="C,C"> | ||
<Stack StackGrowth="Right" Padding="16"> | ||
<Image ID="AmenetiesStatusIconContainerLuxuries" Anchor="C,C" Size="50,50" Texture="CityPanel_StatusIcon"> | ||
<Image ID="AmenetiesStatusIconLuxuries" Anchor="C,C" Offset="-2,-3" Size="35,35" Texture="Stats45" Icon="ICON_IMPROVEMENT_PLANTATION" /> | ||
<Label ID="AmenetiesStatusYieldLuxuries" Anchor="C,C" Offset="-2,0" Style="CityPanelSubPanelTitle" String="1" /> | ||
<Label ID="AmenetiesStatusLabelLuxuries" Anchor="C,B" Offset="0,-5" Style="UnitPanelStatLabel" Align="Center" String="Luxury Resources" WrapWidth="parent+16" /> | ||
</Image> | ||
<Image ID="AmenetiesStatusIconContainerCivics" Anchor="C,C" Size="50,50" Texture="CityPanel_StatusIcon"> | ||
<Image ID="AmenetiesStatusIconCivics" Anchor="C,C" Offset="-2,-3" Size="35,35" Texture="Stats45" Icon="ICON_NOTIFICATION_CONSIDER_GOVERNMENT_CHANGE" /> | ||
<Label ID="AmenetiesStatusYieldCivics" Anchor="C,C" Offset="-2,0" Style="CityPanelSubPanelTitle" String="1" /> | ||
<Label ID="AmenetiesStatusLabelCivics" Anchor="C,B" Offset="0,-5" Style="UnitPanelStatLabel" Align="Center" String="Civics" WrapWidth="parent+16" /> | ||
</Image> | ||
<Image ID="AmenetiesStatusIconContainerEntertainment" Anchor="C,C" Size="50,50" Texture="CityPanel_StatusIcon"> | ||
<Image ID="AmenetiesStatusIconEntertainment" Anchor="C,C" Offset="-2,-3" Size="35,35" Texture="Stats45" Icon="ICON_PROJECT_CARNIVAL" /> | ||
<Label ID="AmenetiesStatusYieldEntertainment" Anchor="C,C" Offset="-2,0" Style="CityPanelSubPanelTitle" String="1" /> | ||
<Label ID="AmenetiesStatusLabelEntertainment" Anchor="C,B" Offset="0,-5" Style="UnitPanelStatLabel" Align="Center" String="Entertainment" WrapWidth="parent+16" /> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The entertainment label in 1920x1080 windowed mode seems to have an orphaned letter. Overall, I dislike using linewraps here because of the potential for issues like these and also the nasty vertical positioning issues it seems to cause wherever it kicks in, like with Luxury Resources. I think the better approach would be to abandon using the WrapWidth property entirely and instead using a "[NEWLINE]" wherever we anticipate that a line is too long for the label. This gives us the freedom to anticipate which labels will take up two lines and tweak the offsets appropriately. Here's an example:
What do you think? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There's other solutions as well, like using strings that we anticipate won't need wrapping, like truncating "Luxury Resources" to "Luxuries". |
||
</Image> | ||
<Image ID="AmenetiesStatusIconContainerGreatPeople" Anchor="C,C" Size="50,50" Texture="CityPanel_StatusIcon"> | ||
<Image ID="AmenetiesStatusIconGreatPeople" Anchor="C,C" Offset="-2,-3" Size="35,35" Texture="Stats45" Icon="ICON_NOTIFICATION_CLAIM_GREAT_PERSON" /> | ||
<Label ID="AmenetiesStatusYieldGreatPeople" Anchor="C,C" Offset="-2,0" Style="CityPanelSubPanelTitle" String="1" /> | ||
<Label ID="AmenetiesStatusLabelGreatPeople" Anchor="C,B" Offset="0,-5" Style="UnitPanelStatLabel" Align="Center" String="Great People" WrapWidth="parent+16" /> | ||
</Image> | ||
</Stack> | ||
<Container Size="1,16" /> | ||
<Stack StackGrowth="Right" Padding="16"> | ||
<Image ID="AmenetiesStatusIconContainerReligion" Anchor="C,C" Size="50,50" Texture="CityPanel_StatusIcon"> | ||
<Image ID="AmenetiesStatusIconReligion" Anchor="C,C" Offset="-2,-3" Size="35,35" Texture="Stats45" Icon="ICON_UNITOPERATION_FOUND_RELIGION" /> | ||
<Label ID="AmenetiesStatusYieldReligion" Anchor="C,C" Offset="-2,0" Style="CityPanelSubPanelTitle" String="1" /> | ||
<Label ID="AmenetiesStatusLabelReligion" Anchor="C,B" Offset="0,-5" Style="UnitPanelStatLabel" Align="Center" String="Religion" WrapWidth="parent+16" /> | ||
</Image> | ||
<Image ID="AmenetiesStatusIconContainerNationalParks" Anchor="C,C" Size="50,50" Texture="CityPanel_StatusIcon"> | ||
<Image ID="AmenetiesStatusIconNationalParks" Anchor="C,C" Offset="-2,-3" Size="35,35" Texture="Stats45" Icon="ICON_UNITOPERATION_DESIGNATE_PARK" /> | ||
<Label ID="AmenetiesStatusYieldNationalParks" Anchor="C,C" Offset="-2,0" Style="CityPanelSubPanelTitle" String="1" /> | ||
<Label ID="AmenetiesStatusLabelNationalParks" Anchor="C,B" Offset="0,-5" Style="UnitPanelStatLabel" Align="Center" String="National Parks" WrapWidth="parent+16" /> | ||
</Image> | ||
<Image ID="AmenetiesStatusIconContainerWarWeariness" Anchor="C,C" Size="50,50" Texture="CityPanel_StatusIcon"> | ||
<Image ID="AmenetiesStatusIconWarWeariness" Anchor="C,C" Offset="-2,-3" Size="35,35" Texture="Stats45" Icon="ICON_UNITOPERATION_FORTIFY" /> | ||
<Label ID="AmenetiesStatusYieldWarWeariness" Anchor="C,C" Offset="-2,0" Style="CityPanelSubPanelTitle" String="1" /> | ||
<Label ID="AmenetiesStatusLabelWarWeariness" Anchor="C,B" Offset="0,-5" Style="UnitPanelStatLabel" Align="Center" String="War Weariness" WrapWidth="parent+16" /> | ||
</Image> | ||
<Image ID="AmenetiesStatusIconContainerBankruptcy" Anchor="C,C" Size="50,50" Texture="CityPanel_StatusIcon"> | ||
<Image ID="AmenetiesStatusIconBankruptcy" Anchor="C,C" Offset="-2,-3" Size="35,35" Texture="Stats45" Icon="ICON_NOTIFICATION_TREASURY_BANKRUPT" /> | ||
<Label ID="AmenetiesStatusYieldBankruptcy" Anchor="C,C" Offset="-2,0" Style="CityPanelSubPanelTitle" String="1" /> | ||
<Label ID="AmenetiesStatusLabelBankruptcy" Anchor="C,B" Offset="0,-5" Style="UnitPanelStatLabel" Align="Center" String="Bankruptcy" WrapWidth="parent+16" /> | ||
</Image> | ||
</Stack> | ||
</Stack> | ||
<Container Size="1,8" /> | ||
<Container Size="parent,0" AutoSize="Vertical"> | ||
<Label Anchor="L,B" Offset="4,0" Style="CityPanelTextSmall" String="LOC_HUD_CITY_TOTAL_AMENITIES" /> | ||
<Label ID="AmenityTotalNum" Anchor="R,B" Offset="5,-2" Style="CityPanelNumLarge" String="-" FontStyle="Glow"/> | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just one last thing! Let's replace the irrigation icon for the luxuries bubble with a more appropriate resort icon before we merge this in.
The "Seaside Resort" improvement icon is actually called (confusingly) "ICON_IMPROVEMENT_BEACH_RESORT".
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hm, I'm not sure what a resort has to do with luxury resources (AFAIK, it just gives more gold yield and a tourism output), but I agree that there isn't a good icon for luxury resources (all the resource icons are colored) - so I don't mind replacing it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah, didn't mean to impose on your agency over your work. Please feel free to say no to me, I won't bite!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nah, I know. I just don't think there is a good icon, so I don't have a strong opinion. The beach resort icon looks significantly nicer but is less relevant. I think the labels largely mitigate that UX issue though.