Skip to content
This repository has been archived by the owner on Dec 18, 2017. It is now read-only.

Commit

Permalink
Fixed broken district icons in smart banner
Browse files Browse the repository at this point in the history
  • Loading branch information
@chaorace
chaorace committed Nov 3, 2016
1 parent 0b7aa8f commit 00e65ce
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 26 deletions.
34 changes: 16 additions & 18 deletions UI/WorldView/CityBannerManager.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1162,48 +1162,45 @@ function CityBanner.UpdateName( self : CityBanner )
-- districtType:number == Index
local iAquaduct = GameInfo.Districts["DISTRICT_AQUEDUCT"].Index;
local iBath = GameInfo.Districts["DISTRICT_BATH"].Index;

local iNeighborhood = GameInfo.Districts["DISTRICT_NEIGHBORHOOD"].Index;
local iMbanza = GameInfo.Districts["DISTRICT_MBANZA"].Index;

local iCampus = GameInfo.Districts["DISTRICT_CAMPUS"].Index;

local iTheater = GameInfo.Districts["DISTRICT_THEATER"].Index;
local iAcropolis = GameInfo.Districts["DISTRICT_ACROPOLIS"].Index;

local iIndustrial = GameInfo.Districts["DISTRICT_INDUSTRIAL_ZONE"].Index;
local iHansa = GameInfo.Districts["DISTRICT_HANSA"].Index;

local iCommerce = GameInfo.Districts["DISTRICT_COMMERCIAL_HUB"].Index;
local iEncampment = GameInfo.Districts["DISTRICT_ENCAMPMENT"].Index;

local iHarbor = GameInfo.Districts["DISTRICT_HARBOR"].Index;
local iRoyalNavy = GameInfo.Districts["DISTRICT_ROYAL_NAVY_DOCKYARD"].Index;

local iSpaceport = GameInfo.Districts["DISTRICT_SPACEPORT"].Index;
local iEntertainmentComplex = GameInfo.Districts["DISTRICT_ENTERTAINMENT_COMPLEX"].Index;
local iHolySite = GameInfo.Districts["DISTRICT_HOLY_SITE"].Index;
local iAerodrome = GameInfo.Districts["DISTRICT_AERODROME"].Index;
local iStreetCarnival = GameInfo.Districts["DISTRICT_STREET_CARNIVAL"].Index;
local iLavra = GameInfo.Districts["DISTRICT_LAVRA"].Index;

if self.m_Instance.CityBuiltDistrictAquaduct ~= nil then
self.m_Instance.CityUnlockedCitizen:SetHide(true);

self.m_Instance.CityBuiltDistrictAquaduct:SetHide(true);
self.m_Instance.CityBuiltDistrictBath:SetHide(true);

self.m_Instance.CityBuiltDistrictNeighborhood:SetHide(true);
self.m_Instance.CityBuiltDistrictMbanza:SetHide(true);

self.m_Instance.CityBuiltDistrictCampus:SetHide(true);
self.m_Instance.CityBuiltDistrictCommercial:SetHide(true);
self.m_Instance.CityBuiltDistrictEncampment:SetHide(true);

self.m_Instance.CityBuiltDistrictTheatre:SetHide(true);
self.m_Instance.CityBuiltDistrictAcropolis:SetHide(true);

self.m_Instance.CityBuiltDistrictIndustrial:SetHide(true);
self.m_Instance.CityBuiltDistrictHansa:SetHide(true);
self.m_Instance.CityBuiltDistrictHarbor:SetHide(true);
self.m_Instance.CityBuiltDistrictRoyalNavy:SetHide(true);

self.m_Instance.CityBuiltDistrictSpaceport:SetHide(true);
self.m_Instance.CityBuiltDistrictEntertainment:SetHide(true);
self.m_Instance.CityBuiltDistrictHoly:SetHide(true);
self.m_Instance.CityBuiltDistrictAerodrome:SetHide(true);
self.m_Instance.CityBuiltDistrictStreetCarnival:SetHide(true);
self.m_Instance.CityBuiltDistrictLavra:SetHide(true);
end

local pCityDistricts:table = pCity:GetDistricts();
Expand Down Expand Up @@ -1236,23 +1233,24 @@ function CityBanner.UpdateName( self : CityBanner )
if isBuilt then
if (districtType == iAquaduct) then self.m_Instance.CityBuiltDistrictAquaduct:SetHide(false); end
if (districtType == iBath) then self.m_Instance.CityBuiltDistrictBath:SetHide(false); end

if (districtType == iNeighborhood) then self.m_Instance.CityBuiltDistrictNeighborhood:SetHide(false); end
if (districtType == iMbanza) then self.m_Instance.CityBuiltDistrictMbanza:SetHide(false); end

if (districtType == iCampus) then self.m_Instance.CityBuiltDistrictCampus:SetHide(false); end
if (districtType == iCommerce) then self.m_Instance.CityBuiltDistrictCommercial:SetHide(false); end
if (districtType == iEncampment) then self.m_Instance.CityBuiltDistrictEncampment:SetHide(false); end

if (districtType == iTheater) then self.m_Instance.CityBuiltDistrictTheatre:SetHide(false); end
if (districtType == iAcropolis) then self.m_Instance.CityBuiltDistrictAcropolis:SetHide(false); end

if (districtType == iIndustrial) then self.m_Instance.CityBuiltDistrictIndustrial:SetHide(false); end
if (districtType == iHansa) then self.m_Instance.CityBuiltDistrictHansa:SetHide(false); end
if (districtType == iHarbor) then self.m_Instance.CityBuiltDistrictHarbor:SetHide(false); end
if (districtType == iRoyalNavy) then self.m_Instance.CityBuiltDistrictRoyalNavy:SetHide(false); end

if (districtType == iSpaceport) then self.m_Instance.CityBuiltDistrictSpaceport:SetHide(false); end
if (districtType == iEntertainmentComplex) then self.m_Instance.CityBuiltDistrictEntertainment:SetHide(false); end
if (districtType == iHolySite) then self.m_Instance.CityBuiltDistrictHoly:SetHide(false); end
if (districtType == iAerodrome) then self.m_Instance.CityBuiltDistrictAerodrome:SetHide(false); end
if (districtType == iStreetCarnival) then self.m_Instance.CityBuiltDistrictStreetCarnival:SetHide(false); end
if (districtType == iLavra) then self.m_Instance.CityBuiltDistrictLavra:SetHide(false); end

end
end
end
Expand Down
14 changes: 6 additions & 8 deletions UI/WorldView/CityBannerManager.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,14 +79,12 @@
<Label ID="CityBuiltDistrictRoyalNavy" Hidden="1" Anchor="L,C" Style="FontNormal20" String="[ICON_DISTRICT_ROYAL_NAVY_DOCKYARD]"/>

<Label ID="CityBuiltDistrictSpaceport" Hidden="1" Anchor="L,C" Style="FontNormal20" String="[ICON_DISTRICT_SPACEPORT]"/>

<!-- These are broken for some reason -->
<!--<Label ID="CityBuiltDistrictEntertainment" Anchor="L,C" Style="FontNormal20" String="[ICON_DISTRICT_ENTERTAINMENT_COMPLEX]"/>
<Label ID="CityBuiltDistrictHoly" Anchor="L,C" Style="FontNormal20" String="[ICON_DISTRICT_HOLY_SITE]"/>
<Label ID="CityBuiltDistrictAerodrome" Anchor="L,C" Style="FontNormal20" String="[ICON_DISTRICT_AERODROME]"/>
<Label ID="CityBuiltDistrictStreetCarnival" Anchor="L,C" Style="FontNormal20" String="[ICON_DISTRICT_STREET_CARNIVAL]"/>
<Label ID="CityBuiltDistrictLavra" Anchor="L,C" Style="FontNormal20" String="[ICON_DISTRICT_LAVRA]"/>
-->

<Image ID="CityBuiltDistrictEntertainment" Hidden="1" Icon="ICON_DISTRICT_ENTERTAINMENT_COMPLEX" Size="20,20" Anchor="L,C"/>
<Image ID="CityBuiltDistrictHoly" Hidden="1" Icon="ICON_DISTRICT_HOLY_SITE" Size="20,20" Anchor="L,C"/>
<Image ID="CityBuiltDistrictAerodrome" Hidden="1" Icon="ICON_DISTRICT_AERODROME" Size="20,20" Anchor="L,C"/>
<Image ID="CityBuiltDistrictStreetCarnival" Hidden="1" Icon="ICON_DISTRICT_STREET_CARNIVAL" Size="20,20" Anchor="L,C"/>
<Image ID="CityBuiltDistrictLavra" Hidden="1" Icon="ICON_DISTRICT_LAVRA" Size="20,20" Anchor="L,C"/>

<Label ID="CityQuestIcon" Anchor="L,C" Style="FontNormal20" />
<Label ID="CityName" Anchor="L,C" Style="HeaderSmallCaps" String="BALTIMORE" />
Expand Down

0 comments on commit 00e65ce

Please sign in to comment.