mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-14 17:59:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Add specialist slot tooltip for buildings that provide them (#1776)

Browse Source 
* Add specialist slot tooltip for buildings that provide them
 - #1762

* Remove duplicate translations
This commit is contained in:
Teague Lander
2020-01-26 22:33:10 -08:00
committed by Yair Morgenstern
parent d3d8933bbf
commit ac8a1f144b
3 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
android/assets/jsons/translationsByLanguage/English.properties
View File

@ -1499,6 +1499,11 @@ Specialist Buildings =
Specialist Allocation = Specialist Allocation =
# Requires translation! # 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! # Requires translation!
Food eaten = Food eaten =
# Requires translation! # Requires translation!

5
android/assets/jsons/translationsByLanguage/template.properties
View File

@ -822,6 +822,11 @@ Annex city =
Specialist Buildings = Specialist Buildings =
Specialist Allocation = Specialist Allocation =
Specialists = Specialists =
[specialist] slots =
Engineer specialist =
Merchant specialist =
Scientist specialist =
Artist specialist =
Food eaten = Food eaten =
Growth bonus = Growth bonus =
Unassigned population = Unassigned population =

9
core/src/com/unciv/models/ruleset/Building.kt
View File

@ -102,6 +102,15 @@ class Building : NamedStats(), IConstruction{
if (gpp.science != 0f) stringBuilder.appendln("+" + gpp.science.toInt() + " "+"[Great Scientist] points".tr()) 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 (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) { if (resourceBonusStats != null) {
val resources = ruleset.tileResources.values.filter { name == it.building }.joinToString { it.name.tr() } val resources = ruleset.tileResources.values.filter { name == it.building }.joinToString { it.name.tr() }
stringBuilder.appendln("$resources {provide} $resourceBonusStats".tr()) stringBuilder.appendln("$resources {provide} $resourceBonusStats".tr())