diff --git a/client/src/services/gameHelper.js b/client/src/services/gameHelper.js index 9bbb7a89d..258385ea0 100644 --- a/client/src/services/gameHelper.js +++ b/client/src/services/gameHelper.js @@ -253,6 +253,16 @@ class GameHelper { return this.getDateToString(t, largestUnitOnly) } + getCountdownTimeStringByTicksWithTickETA (game, ticks, useNowDate = false, largestUnitOnly = false) { + const str = this.getCountdownTimeStringByTicks(game, ticks, useNowDate, largestUnitOnly); + + if (game.settings.gameTime.gameType === 'realTime') { + return `${str} - Tick ${game.state.tick + ticks}` + } + + return str + } + getCountdownTimeStringByTicks (game, ticks, useNowDate = false, largestUnitOnly = false) { if (game == null) { return '' diff --git a/client/src/views/game/components/research/Selection.vue b/client/src/views/game/components/research/Selection.vue index de4dce1de..325a0162c 100644 --- a/client/src/views/game/components/research/Selection.vue +++ b/client/src/views/game/components/research/Selection.vue @@ -87,7 +87,7 @@ export default { { text: 'Specialists', value: 'specialists' } ] - this.optionsNow = options.filter(o => TechnologyHelper.isTechnologyEnabled(this.$store.state.game, o.value) + this.optionsNow = options.filter(o => TechnologyHelper.isTechnologyEnabled(this.$store.state.game, o.value) && TechnologyHelper.isTechnologyResearchable(this.$store.state.game, o.value)) this.optionsNext = options.filter(o => TechnologyHelper.isTechnologyEnabled(this.$store.state.game, o.value) && TechnologyHelper.isTechnologyResearchable(this.$store.state.game, o.value)) @@ -133,12 +133,12 @@ export default { this.loadingNext = false }, recalculateTimeRemaining () { - this.timeRemainingEta = GameHelper.getCountdownTimeStringByTicks(this.$store.state.game, this.player.currentResearchTicksEta) + this.timeRemainingEta = GameHelper.getCountdownTimeStringByTicksWithTickETA(this.$store.state.game, this.player.currentResearchTicksEta) if (this.player.nextResearchTicksEta == null) { this.timeNextRemainingEta = null } else { - this.timeNextRemainingEta = GameHelper.getCountdownTimeStringByTicks(this.$store.state.game, this.player.nextResearchTicksEta) + this.timeNextRemainingEta = GameHelper.getCountdownTimeStringByTicksWithTickETA(this.$store.state.game, this.player.nextResearchTicksEta) } } },