From ac8a1f144bf8170cfc2d22fdd719beed88a45fd3 Mon Sep 17 00:00:00 2001 From: Teague Lander Date: Sun, 26 Jan 2020 22:33:10 -0800 Subject: [PATCH] Add specialist slot tooltip for buildings that provide them (#1776) * Add specialist slot tooltip for buildings that provide them - #1762 * Remove duplicate translations --- .../jsons/translationsByLanguage/English.properties | 7 ++++++- .../jsons/translationsByLanguage/template.properties | 7 ++++++- core/src/com/unciv/models/ruleset/Building.kt | 9 +++++++++ 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/android/assets/jsons/translationsByLanguage/English.properties b/android/assets/jsons/translationsByLanguage/English.properties index f11af3bb80..e81ae075b2 100644 --- a/android/assets/jsons/translationsByLanguage/English.properties +++ b/android/assets/jsons/translationsByLanguage/English.properties @@ -1498,7 +1498,12 @@ Specialist Buildings = # Requires translation! Specialist Allocation = # Requires translation! -Specialists = +Specialists = +[specialist] slots = [specialist] slots +Engineer specialist = Engineer specialist +Merchant specialist = Merchant specialist +Scientist specialist = Scientist specialist +Artist specialist = Artist specialist # Requires translation! Food eaten = # Requires translation! diff --git a/android/assets/jsons/translationsByLanguage/template.properties b/android/assets/jsons/translationsByLanguage/template.properties index 68a4fe281a..ce134b056e 100644 --- a/android/assets/jsons/translationsByLanguage/template.properties +++ b/android/assets/jsons/translationsByLanguage/template.properties @@ -821,7 +821,12 @@ Nothing = Annex city = Specialist Buildings = Specialist Allocation = -Specialists = +Specialists = +[specialist] slots = +Engineer specialist = +Merchant specialist = +Scientist specialist = +Artist specialist = Food eaten = Growth bonus = Unassigned population = diff --git a/core/src/com/unciv/models/ruleset/Building.kt b/core/src/com/unciv/models/ruleset/Building.kt index e1258ef61e..f713e0776d 100644 --- a/core/src/com/unciv/models/ruleset/Building.kt +++ b/core/src/com/unciv/models/ruleset/Building.kt @@ -102,6 +102,15 @@ class Building : NamedStats(), IConstruction{ if (gpp.science != 0f) stringBuilder.appendln("+" + gpp.science.toInt() + " "+"[Great Scientist] points".tr()) if (gpp.culture != 0f) stringBuilder.appendln("+" + gpp.culture.toInt() + " "+"[Great Artist] points".tr()) } + + if (this.specialistSlots != null) { + val ss = this.specialistSlots!! + if (ss.production != 0f) stringBuilder.appendln("+" + ss.production.toInt() + " " + "[Engineer specialist] slots".tr()) + if (ss.gold != 0f) stringBuilder.appendln("+" + ss.gold .toInt() + " " + "[Merchant specialist] slots".tr()) + if (ss.science != 0f) stringBuilder.appendln("+" + ss.science .toInt() + " " + "[Scientist specialist] slots".tr()) + if (ss.culture != 0f) stringBuilder.appendln("+" + ss.culture .toInt() + " " + "[Artist specialist] slots".tr()) + } + if (resourceBonusStats != null) { val resources = ruleset.tileResources.values.filter { name == it.building }.joinToString { it.name.tr() } stringBuilder.appendln("$resources {provide} $resourceBonusStats".tr())