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

Added turns left to icons in launchbar #521

Merged
merged 1 commit into from
May 13, 2017
Merged

Added turns left to icons in launchbar #521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Assets/UI/launchbar.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,8 +477,10 @@ function OnTurnBegin()
local cost :number = playerTechs:GetResearchCost(currentTechID);

Controls.ScienceMeter:SetPercent(progress/cost);
Controls.ScienceTurnsLeft:SetText(playerTechs:GetTurnsLeft());
else
Controls.ScienceMeter:SetPercent(0);
Controls.ScienceTurnsLeft:SetText("");
end

local techInfo:table = GameInfo.Technologies[currentTechID];
Expand All @@ -498,8 +500,10 @@ function OnTurnBegin()
local civicCost :number = playerCivics:GetCultureCost(currentCivicID);

Controls.CultureMeter:SetPercent(civicProgress/civicCost);
Controls.CultureTurnsLeft:SetText(playerCivics:GetTurnsLeft());
else
Controls.CultureMeter:SetPercent(0);
Controls.CultureTurnsLeft:SetText("");
end

local CivicInfo:table = GameInfo.Civics[currentCivicID];
Expand Down
14 changes: 8 additions & 6 deletions Assets/UI/launchbar.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,18 +93,20 @@

<Container ID="ScienceHookWithMeter" Anchor="L,T" Offset="1,25" Size="57,57" Hidden="1">
<Button ID="ScienceMeterButton" Anchor="C,C" Offset="0,1" Size="51,51" Texture="LaunchBar_Hook_ScienceButton" Style="ButtonNormalText" TextureOffset="4,9" StateOffsetIncrement="0,60" ToolTip="LOC_HUD_TECHTREE_TOOLTIP" Hidden="0">
<Image Anchor="C,C" Size="57,57" Texture="LaunchBar_Hook_CultureMeter_Backing.dds" Hidden="0" Offset="-1,-5">
<Meter ID="ScienceMeter" Anchor="C,C" Size="57,57" Texture="LaunchBar_Hook_ScienceMeter_Fill.dds" Percent="0" Speed="1.0" Follow="1" Offset="0,1"/>
<Image ID="ResearchIcon" Anchor="C,C" Size="38,38" Texture="Tech38" />
<Image Anchor="C,C" Size="57,57" Texture="LaunchBar_Hook_CultureMeter_Backing.dds" Hidden="0" Offset="-1,-5">
<Meter ID="ScienceMeter" Anchor="C,C" Size="57,57" Texture="LaunchBar_Hook_ScienceMeter_Fill.dds" Percent="0" Speed="1.0" Follow="1" Offset="0,1"/>
<Image ID="ResearchIcon" Anchor="C,C" Size="38,38" Texture="Tech38" Alpha="0.7"/>
<Label ID="ScienceTurnsLeft" Anchor="C,C" String="" FontStyle="stroke" Color0="160,188,220,255" Color1="0,0,0,200" Color2="255,255,255,255" Style="FontNormal20"/>
</Image>
</Button>
</Container>

<Container ID="CultureHookWithMeter" Anchor="L,T" Offset="54,25" Size="57,57" Hidden="1">
<Button ID="CultureMeterButton" Anchor="C,C" Offset="0,1" Size="51,51" Texture="LaunchBar_Hook_CultureButton" Style="ButtonNormalText" TextureOffset="4,9" StateOffsetIncrement="0,60" ToolTip="LOC_HUD_CIVICSTREE_TOOLTIP" Hidden="0">
<Image Anchor="C,C" Size="57,57" Texture="LaunchBar_Hook_CultureMeter_Backing.dds" Hidden="0" Offset="-1,-5">
<Meter ID="CultureMeter" Anchor="C,C" Size="57,57" Texture="LaunchBar_Hook_CultureMeter_Fill.dds" Percent="0" Speed="1.0" Follow="1"/>
<Image ID="CultureIcon" Anchor="C,C" Size="38,38" Texture="Civics38" />
<Image Anchor="C,C" Size="57,57" Texture="LaunchBar_Hook_CultureMeter_Backing.dds" Hidden="0" Offset="-1,-5">
<Meter ID="CultureMeter" Anchor="C,C" Size="57,57" Texture="LaunchBar_Hook_CultureMeter_Fill.dds" Percent="0" Speed="1.0" Follow="1"/>
<Image ID="CultureIcon" Anchor="C,C" Size="38,38" Texture="Civics38" Alpha="0.8" />
<Label ID="CultureTurnsLeft" Anchor="C,C" String="" FontStyle="stroke" Color0="160,188,220,255" Color1="0,0,0,200" Color2="255,255,255,255" Style="FontNormal20"/>
</Image>
</Button>
</Container>
Expand Down