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

Commit

Permalink
Removed unbuilt building icons from Smart Banner
Browse files Browse the repository at this point in the history 
This feature was only ever half-implemented, looked ugly, and basically
nobody actually wanted it. Bye-bye!
  • Loading branch information
@chaorace
chaorace committed Nov 3, 2016
1 parent 73a6d22 commit 0b7aa8f
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 118 deletions.
101 changes: 1 addition & 100 deletions UI/WorldView/CityBannerManager.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1183,29 +1183,8 @@ function CityBanner.UpdateName( self : CityBanner )
local iSpaceport = GameInfo.Districts["DISTRICT_SPACEPORT"].Index;

if self.m_Instance.CityBuiltDistrictAquaduct ~= nil then
self.m_Instance.CityCanBuildObelisk:SetHide(true);
self.m_Instance.CityCanBuildGranary:SetHide(true);
self.m_Instance.CityCanBuildWatermill:SetHide(true);

self.m_Instance.CityUnlockedCitizen:SetHide(true);

self.m_Instance.CityCanBuildDistrictCampus1:SetHide(true);
self.m_Instance.CityCanBuildDistrictCampus2:SetHide(true);
self.m_Instance.CityCanBuildDistrictCampus3:SetHide(true);

self.m_Instance.CityCanBuildDistrictTheatre1:SetHide(true);
self.m_Instance.CityCanBuildDistrictTheatre21:SetHide(true);
self.m_Instance.CityCanBuildDistrictTheatre22:SetHide(true);
self.m_Instance.CityCanBuildDistrictTheatre3:SetHide(true);

self.m_Instance.CityCanBuildDistrictIndustrial1:SetHide(true);
self.m_Instance.CityCanBuildDistrictIndustrial2:SetHide(true);
self.m_Instance.CityCanBuildDistrictIndustrial3:SetHide(true);

self.m_Instance.CityCanBuildDistrictCommercial1:SetHide(true);
self.m_Instance.CityCanBuildDistrictCommercial2:SetHide(true);
self.m_Instance.CityCanBuildDistrictCommercial3:SetHide(true);

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

Expand Down Expand Up @@ -1249,85 +1228,7 @@ function CityBanner.UpdateName( self : CityBanner )
end
end
-- End Unlocked Citizen Check

local buildQueue = pCity:GetBuildQueue();
local hMonument = GameInfo.Buildings["BUILDING_MONUMENT"].Hash;
local hGranary = GameInfo.Buildings["BUILDING_GRANARY"].Hash;
local hWatermill = GameInfo.Buildings["BUILDING_WATER_MILL"].Hash;
local hSewer = GameInfo.Buildings["BUILDING_SEWER"].Hash;
if (buildQueue:CanProduce( hMonument, true )) then
self.m_Instance.CityCanBuildObelisk:SetHide(false);
else
self.m_Instance.CityCanBuildObelisk:SetHide(true);
end
if (buildQueue:CanProduce( hGranary, true )) then
self.m_Instance.CityCanBuildGranary:SetHide(false);
else
self.m_Instance.CityCanBuildGranary:SetHide(true);
end
if (buildQueue:CanProduce( hWatermill, true )) then
self.m_Instance.CityCanBuildWatermill:SetHide(false);
else
self.m_Instance.CityCanBuildWatermill:SetHide(true);
end
--if (buildQueue:CanProduce( hSewer, true )) then
-- self.m_Instance.CityCanBuildSewer:SetHide(false);
--end

local hLibrary = GameInfo.Buildings["BUILDING_LIBRARY"].Hash;
local hUniversity = GameInfo.Buildings["BUILDING_UNIVERSITY"].Hash;
local hResearchLab = GameInfo.Buildings["BUILDING_RESEARCH_LAB"].Hash;
self.m_Instance.CityCanBuildDistrictCampus1:SetHide(true);
self.m_Instance.CityCanBuildDistrictCampus2:SetHide(true);
self.m_Instance.CityCanBuildDistrictCampus3:SetHide(true);
if (buildQueue:CanProduce( hLibrary, true )) then
self.m_Instance.CityCanBuildDistrictCampus1:SetHide(false);
elseif (buildQueue:CanProduce( hUniversity, true )) then
self.m_Instance.CityCanBuildDistrictCampus2:SetHide(false);
elseif (buildQueue:CanProduce( hResearchLab, true )) then
self.m_Instance.CityCanBuildDistrictCampus3:SetHide(false);
end

local hAmphitheater = GameInfo.Buildings["BUILDING_AMPHITHEATER"].Hash;
local hArtMuseum = GameInfo.Buildings["BUILDING_MUSEUM_ART"].Hash;
local hArtifactMuseum = GameInfo.Buildings["BUILDING_MUSEUM_ARTIFACT"].Hash;
local hBroadcastCenter = GameInfo.Buildings["BUILDING_BROADCAST_CENTER"].Hash;
self.m_Instance.CityCanBuildDistrictTheatre1:SetHide(true);
self.m_Instance.CityCanBuildDistrictTheatre21:SetHide(true);
self.m_Instance.CityCanBuildDistrictTheatre22:SetHide(true);
self.m_Instance.CityCanBuildDistrictTheatre3:SetHide(true);
if (buildQueue:CanProduce( hAmphitheater, true )) then
self.m_Instance.CityCanBuildDistrictTheatre1:SetHide(false);
end

local hWorkshop = GameInfo.Buildings["BUILDING_WORKSHOP"].Hash;
local hFactory = GameInfo.Buildings["BUILDING_FACTORY"].Hash;
local hPowerPlant = GameInfo.Buildings["BUILDING_POWER_PLANT"].Hash;
self.m_Instance.CityCanBuildDistrictIndustrial1:SetHide(true);
self.m_Instance.CityCanBuildDistrictIndustrial2:SetHide(true);
self.m_Instance.CityCanBuildDistrictIndustrial3:SetHide(true);
if (buildQueue:CanProduce( hWorkshop, true )) then
self.m_Instance.CityCanBuildDistrictIndustrial1:SetHide(false);
elseif (buildQueue:CanProduce( hFactory, true )) then
self.m_Instance.CityCanBuildDistrictIndustrial2:SetHide(false);
elseif (buildQueue:CanProduce( hPowerPlant, true )) then
self.m_Instance.CityCanBuildDistrictIndustrial3:SetHide(false);
end

local hMarket = GameInfo.Buildings["BUILDING_MARKET"].Hash;
local hBank = GameInfo.Buildings["BUILDING_BANK"].Hash;
local hStockExchange = GameInfo.Buildings["BUILDING_STOCK_EXCHANGE"].Hash;
self.m_Instance.CityCanBuildDistrictCommercial1:SetHide(true);
self.m_Instance.CityCanBuildDistrictCommercial2:SetHide(true);
self.m_Instance.CityCanBuildDistrictCommercial3:SetHide(true);
if (buildQueue:CanProduce( hMarket, true )) then
self.m_Instance.CityCanBuildDistrictCommercial1:SetHide(false);
elseif (buildQueue:CanProduce( hBank, true )) then
self.m_Instance.CityCanBuildDistrictCommercial2:SetHide(false);
elseif (buildQueue:CanProduce( hStockExchange, true )) then
self.m_Instance.CityCanBuildDistrictCommercial3:SetHide(false);
end


for i, district in pCityDistricts:Members() do
local districtType = district:GetType();
local districtInfo:table = GameInfo.Districts[districtType];
Expand Down
18 changes: 0 additions & 18 deletions UI/WorldView/CityBannerManager.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,6 @@
<Label ID="CityHousingInsufficientIcon" Anchor="L,C" Style="FontNormal20" String="[ICON_HousingInsufficient]"/>
<Label ID="CityAmenitiesInsufficientIcon" Anchor="L,C" Style="FontNormal20" String="[ICON_AmenitiesInsufficient]"/>

<Label ID="CityCanBuildObelisk" Hidden="1" Anchor="L,C" Style="FontNormal20" String=" O "/>
<Label ID="CityCanBuildGranary" Hidden="1" Anchor="L,C" Style="FontNormal20" String=" G "/>
<Label ID="CityCanBuildWatermill" Hidden="1" Anchor="L,C" Style="FontNormal20" String=" W "/>
<Label ID="CityCanBuildSewer" Hidden="1" Anchor="L,C" Style="FontNormal20" String=" S "/>

<Label ID="CityUnlockedCitizen" Hidden="1" Anchor="L,C" String="[ICON_FOOD]"/>

<Label ID="CityBuiltDistrictAquaduct" Hidden="1" Anchor="L,C" Style="FontNormal20" String="[ICON_DISTRICT_AQUEDUCT]"/>
Expand All @@ -68,28 +63,15 @@
<Label ID="CityBuiltDistrictMbanza" Hidden="1" Anchor="L,C" Style="FontNormal20" String="[ICON_DISTRICT_MBANZA]"/>

<Label ID="CityBuiltDistrictCampus" Hidden="1" Anchor="L,C" Style="FontNormal20" String="[ICON_DISTRICT_CAMPUS]"/>
<Label ID="CityCanBuildDistrictCampus1" Hidden="1" Anchor="L,C" Style="FontNormal20" String=" L "/>
<Label ID="CityCanBuildDistrictCampus2" Hidden="1" Anchor="L,C" Style="FontNormal20" String=" U "/>
<Label ID="CityCanBuildDistrictCampus3" Hidden="1" Anchor="L,C" Style="FontNormal20" String=" R "/>

<Label ID="CityBuiltDistrictTheatre" Hidden="1" Anchor="L,C" Style="FontNormal20" String="[ICON_DISTRICT_THEATER]"/>
<Label ID="CityBuiltDistrictAcropolis" Hidden="1" Anchor="L,C" Style="FontNormal20" String="[ICON_DISTRICT_ACROPOLIS]"/>
<Label ID="CityCanBuildDistrictTheatre1" Hidden="1" Anchor="L,C" Style="FontNormal20" String=" A "/>
<Label ID="CityCanBuildDistrictTheatre21" Hidden="1" Anchor="L,C" Style="FontNormal20" String=" T "/>
<Label ID="CityCanBuildDistrictTheatre22" Hidden="1" Anchor="L,C" Style="FontNormal20" String=" R "/>
<Label ID="CityCanBuildDistrictTheatre3" Hidden="1" Anchor="L,C" Style="FontNormal20" String=" B "/>


<Label ID="CityBuiltDistrictIndustrial" Hidden="1" Anchor="L,C" Style="FontNormal20" String="[ICON_DISTRICT_INDUSTRIAL_ZONE]"/>
<Label ID="CityBuiltDistrictHansa" Hidden="1" Anchor="L,C" Style="FontNormal20" String="[ICON_DISTRICT_HANSA]"/>
<Label ID="CityCanBuildDistrictIndustrial1" Hidden="1" Anchor="L,C" Style="FontNormal20" String=" W "/>
<Label ID="CityCanBuildDistrictIndustrial2" Hidden="1" Anchor="L,C" Style="FontNormal20" String=" F "/>
<Label ID="CityCanBuildDistrictIndustrial3" Hidden="1" Anchor="L,C" Style="FontNormal20" String=" P "/>

<Label ID="CityBuiltDistrictCommercial" Hidden="1" Anchor="L,C" Style="FontNormal20" String="[ICON_DISTRICT_COMMERCIAL_HUB]"/>
<Label ID="CityCanBuildDistrictCommercial1" Hidden="1" Anchor="L,C" Style="FontNormal20" String=" M "/>
<Label ID="CityCanBuildDistrictCommercial2" Hidden="1" Anchor="L,C" Style="FontNormal20" String=" B "/>
<Label ID="CityCanBuildDistrictCommercial3" Hidden="1" Anchor="L,C" Style="FontNormal20" String=" S "/>

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

Expand Down

0 comments on commit 0b7aa8f

Please sign in to comment.