From 97689bcecee6ec5b6f6074688c35fcfdfda4ce54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Nordstr=C3=B6m?= Date: Sat, 13 May 2017 05:14:12 +0200 Subject: [PATCH] Added turns left to icons in launchbar (#521) Resolves #516 --- Assets/UI/launchbar.lua | 4 ++++ Assets/UI/launchbar.xml | 14 ++++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Assets/UI/launchbar.lua b/Assets/UI/launchbar.lua index bf0b932..f55c46e 100644 --- a/Assets/UI/launchbar.lua +++ b/Assets/UI/launchbar.lua @@ -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]; @@ -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]; diff --git a/Assets/UI/launchbar.xml b/Assets/UI/launchbar.xml index d0c8e67..fa7e61d 100644 --- a/Assets/UI/launchbar.xml +++ b/Assets/UI/launchbar.xml @@ -93,18 +93,20 @@