From 3734f391019293608e39a2e28e6aee6f5f7fe0d6 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Sun, 22 Mar 2020 22:40:07 +0200 Subject: [PATCH] Changed "Requires [resource]" to "Consumes 1 [resource]" to make it obvious that resource is consumed - #1964 --- android/assets/jsons/translations/Czech.properties | 2 +- android/assets/jsons/translations/Dutch.properties | 2 +- android/assets/jsons/translations/English.properties | 2 +- android/assets/jsons/translations/French.properties | 2 +- android/assets/jsons/translations/German.properties | 2 +- android/assets/jsons/translations/Indonesian.properties | 2 +- android/assets/jsons/translations/Italian.properties | 2 +- android/assets/jsons/translations/Japanese.properties | 2 +- android/assets/jsons/translations/Korean.properties | 2 +- android/assets/jsons/translations/Malay.properties | 2 +- android/assets/jsons/translations/Polish.properties | 2 +- android/assets/jsons/translations/Portuguese.properties | 2 +- android/assets/jsons/translations/Romanian.properties | 2 +- android/assets/jsons/translations/Russian.properties | 2 +- .../assets/jsons/translations/Simplified_Chinese.properties | 2 +- android/assets/jsons/translations/Spanish.properties | 2 +- android/assets/jsons/translations/Thai.properties | 2 +- .../assets/jsons/translations/Traditional_Chinese.properties | 2 +- android/assets/jsons/translations/Turkish.properties | 2 +- android/assets/jsons/translations/Ukrainian.properties | 2 +- android/assets/jsons/translations/template.properties | 2 +- core/src/com/unciv/models/ruleset/Building.kt | 4 ++-- core/src/com/unciv/models/ruleset/unit/BaseUnit.kt | 2 +- 23 files changed, 24 insertions(+), 24 deletions(-) diff --git a/android/assets/jsons/translations/Czech.properties b/android/assets/jsons/translations/Czech.properties index 75ab6246..9d58fe71 100644 --- a/android/assets/jsons/translations/Czech.properties +++ b/android/assets/jsons/translations/Czech.properties @@ -37,7 +37,7 @@ Requires worked [resource] near city = Vyžaduje zdroj suroviny [resource] na ú Wonder is being built elsewhere = Div světa již stavíte v jiném městě Requires a [buildingName] in all cities = Vyžaduje budovu [buildingName] ve všech městech Requires a [buildingName] in this city = Vyžaduje budovu [buildingName] v tomto městě -Requires [resource] = Vyžaduje surovinu [resource] +Consumes 1 [resource] = Vyžaduje surovinu [resource] Required tech: [requiredTech] = Vyžaduje technologii: [requiredTech] Current construction = Současná produkce diff --git a/android/assets/jsons/translations/Dutch.properties b/android/assets/jsons/translations/Dutch.properties index a283bcd0..6d19605f 100644 --- a/android/assets/jsons/translations/Dutch.properties +++ b/android/assets/jsons/translations/Dutch.properties @@ -53,7 +53,7 @@ Requires a [buildingName] in all cities = # Requires translation! Requires a [buildingName] in this city = # Requires translation! -Requires [resource] = +Consumes 1 [resource] = # Requires translation! Required tech: [requiredTech] = diff --git a/android/assets/jsons/translations/English.properties b/android/assets/jsons/translations/English.properties index c8ce1643..596b8de0 100644 --- a/android/assets/jsons/translations/English.properties +++ b/android/assets/jsons/translations/English.properties @@ -66,7 +66,7 @@ Requires a [buildingName] in all cities = # Requires translation! Requires a [buildingName] in this city = # Requires translation! -Requires [resource] = +Consumes 1 [resource] = # Requires translation! Required tech: [requiredTech] = diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties index de99fa58..359644d5 100644 --- a/android/assets/jsons/translations/French.properties +++ b/android/assets/jsons/translations/French.properties @@ -37,7 +37,7 @@ Requires worked [resource] near city = Nécessite l'exploitation de [resource] p Wonder is being built elsewhere = Cette merveille est déjà en construction ailleurs Requires a [buildingName] in all cities = Nécessite un(e) [buildingName] dans toutes les villes Requires a [buildingName] in this city = Nécessite un(e) [buildingName] dans cette ville -Requires [resource] = [resource] requis(e) +Consumes 1 [resource] = [resource] requis(e) Required tech: [requiredTech] = Nécessite la technologie: [requiredTech] Current construction = Construction actuelle diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties index 8aca28db..210cc39c 100644 --- a/android/assets/jsons/translations/German.properties +++ b/android/assets/jsons/translations/German.properties @@ -37,7 +37,7 @@ Requires worked [resource] near city = Benötigte eine Bewirtschaftung von [reso Wonder is being built elsewhere = Das Wunder wird woanders gebaut Requires a [buildingName] in all cities = Benötigt das Gebäude [buildingName] in allen Städten Requires a [buildingName] in this city = Benötigt das Gebäude [buildingName] in dieser Stadt -Requires [resource] = Benötigt [resource] +Consumes 1 [resource] = Benötigt [resource] Required tech: [requiredTech] = Benötigt Technologie: [requiredTech] Current construction = Aktuelle Konstruktion diff --git a/android/assets/jsons/translations/Indonesian.properties b/android/assets/jsons/translations/Indonesian.properties index 812cfea1..8ead478f 100644 --- a/android/assets/jsons/translations/Indonesian.properties +++ b/android/assets/jsons/translations/Indonesian.properties @@ -37,7 +37,7 @@ Requires worked [resource] near city = Membutuhkan [resource] yang diperkerjakan Wonder is being built elsewhere = Keajaiban Dunia sedang dibangun di tempat lain Requires a [buildingName] in all cities = Membutuhlan [buildingName] di semua kota Requires a [buildingName] in this city = Membutuhkan [buildingName] di kota ini -Requires [resource] = Membutuhkan [resource] +Consumes 1 [resource] = Membutuhkan [resource] Required tech: [requiredTech] = Membutuhkab teknologi: [requiredTech] Current construction = Konstruksi saat ini diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties index 1f953314..0f6d8c74 100644 --- a/android/assets/jsons/translations/Italian.properties +++ b/android/assets/jsons/translations/Italian.properties @@ -37,7 +37,7 @@ Requires worked [resource] near city = Richiede che la città sfrutti [resource] Wonder is being built elsewhere = Meraviglia in costruzione altrove Requires a [buildingName] in all cities = Richiede [buildingName] in tutte le città Requires a [buildingName] in this city = Richiede [buildingName] nella città -Requires [resource] = Richiede [resource] +Consumes 1 [resource] = Richiede [resource] Required tech: [requiredTech] = Tecnologie propedeutiche: [requiredTech] Current construction = Costruzione attuale diff --git a/android/assets/jsons/translations/Japanese.properties b/android/assets/jsons/translations/Japanese.properties index 5d31c0de..ea8a0bfb 100644 --- a/android/assets/jsons/translations/Japanese.properties +++ b/android/assets/jsons/translations/Japanese.properties @@ -37,7 +37,7 @@ Requires worked [resource] near city = 都市の近郊で稼働する[resource] Wonder is being built elsewhere = 遺産は他の都市で建設されています Requires a [buildingName] in all cities = すべての都市に[buildingName]が必要 Requires a [buildingName] in this city = この都市に[buildingName]が必要 -Requires [resource] = [resource]が必要 +Consumes 1 [resource] = [resource]が必要 Required tech: [requiredTech] = 必要なテクノロジー:[requiredTech] Current construction = 生産中 diff --git a/android/assets/jsons/translations/Korean.properties b/android/assets/jsons/translations/Korean.properties index fb944859..c6c61edb 100644 --- a/android/assets/jsons/translations/Korean.properties +++ b/android/assets/jsons/translations/Korean.properties @@ -52,7 +52,7 @@ Requires worked [resource] near city = 도시 근처에 [resource] 자원이 개 Wonder is being built elsewhere = 불가사의가 이미 다른 곳에서 지어지고 있습니다. Requires a [buildingName] in all cities = 모든 도시에 [buildingName] 건물이 지어져 있어야 합니다. Requires a [buildingName] in this city = 이 도시에 [buildingName] 건물이 지어져 있어야 합니다. -Requires [resource] = [resource] 자원이 필요합니다. +Consumes 1 [resource] = [resource] 자원이 필요합니다. Required tech: [requiredTech] = [requiredTech] 기술이 연구되어야 합니다. # Requires translation! diff --git a/android/assets/jsons/translations/Malay.properties b/android/assets/jsons/translations/Malay.properties index ebdb7c52..3cc47bae 100644 --- a/android/assets/jsons/translations/Malay.properties +++ b/android/assets/jsons/translations/Malay.properties @@ -63,7 +63,7 @@ Requires a [buildingName] in all cities = # Requires translation! Requires a [buildingName] in this city = # Requires translation! -Requires [resource] = +Consumes 1 [resource] = # Requires translation! Required tech: [requiredTech] = diff --git a/android/assets/jsons/translations/Polish.properties b/android/assets/jsons/translations/Polish.properties index 4e9ab22c..2ace7803 100644 --- a/android/assets/jsons/translations/Polish.properties +++ b/android/assets/jsons/translations/Polish.properties @@ -37,7 +37,7 @@ Requires worked [resource] near city = Wymaga w mieście surowca [resource] Wonder is being built elsewhere = Cud jest już budowany gdzie indziej Requires a [buildingName] in all cities = [buildingName] musi znajdować się we wszystkich miastach Requires a [buildingName] in this city = Wymaga budynku [buildingName] w tym mieście -Requires [resource] = Wymaga surowca [resource] +Consumes 1 [resource] = Wymaga surowca [resource] Required tech: [requiredTech] = Wymaga odkrycia technologii [requiredTech] Current construction = Bieżąca budowa diff --git a/android/assets/jsons/translations/Portuguese.properties b/android/assets/jsons/translations/Portuguese.properties index 552cfa8b..2779030a 100644 --- a/android/assets/jsons/translations/Portuguese.properties +++ b/android/assets/jsons/translations/Portuguese.properties @@ -40,7 +40,7 @@ Requires worked [resource] near city = Requer [resource] trabalhado perto da cid Wonder is being built elsewhere = Uma maravilha está sendo construida em uma cidade estrangeira Requires a [buildingName] in all cities = Requer um(a) [buildingName] em todas as cidades Requires a [buildingName] in this city = Requer um [buildingName] nessa cidade -Requires [resource] = Requer [resource] +Consumes 1 [resource] = Requer [resource] Required tech: [requiredTech] = Requer tecnologia: [requiredTech] # Requires translation! diff --git a/android/assets/jsons/translations/Romanian.properties b/android/assets/jsons/translations/Romanian.properties index 55296c92..91980a85 100644 --- a/android/assets/jsons/translations/Romanian.properties +++ b/android/assets/jsons/translations/Romanian.properties @@ -39,7 +39,7 @@ Requires worked [resource] near city = Wonder is being built elsewhere = Requires a [buildingName] in all cities = Necesită ca [buildingName] să fie în toate orașele Requires a [buildingName] in this city = Necesită ca [buildingName] să fie în acest oraș -Requires [resource] = Necesită [resource] +Consumes 1 [resource] = Necesită [resource] Required tech: [requiredTech] = Tehnologia necesară: [requiredTech] Current construction = Construcția curentă diff --git a/android/assets/jsons/translations/Russian.properties b/android/assets/jsons/translations/Russian.properties index dfdb1f9d..c9ecda51 100644 --- a/android/assets/jsons/translations/Russian.properties +++ b/android/assets/jsons/translations/Russian.properties @@ -37,7 +37,7 @@ Requires worked [resource] near city = Требует добычи [resource] в Wonder is being built elsewhere = Чудо света строится где-то ещё Requires a [buildingName] in all cities = Требует [buildingName] во всех городах Requires a [buildingName] in this city = Требует [buildingName] в городе -Requires [resource] = Требует [resource] +Consumes 1 [resource] = Требует [resource] Required tech: [requiredTech] = Требуется технология: [requiredTech] Current construction = Текущее строительство diff --git a/android/assets/jsons/translations/Simplified_Chinese.properties b/android/assets/jsons/translations/Simplified_Chinese.properties index 71e4419b..7666cb61 100644 --- a/android/assets/jsons/translations/Simplified_Chinese.properties +++ b/android/assets/jsons/translations/Simplified_Chinese.properties @@ -37,7 +37,7 @@ Requires worked [resource] near city = 需要城市附近有已开发的资源 Wonder is being built elsewhere = 其他城市正在建造该奇观 Requires a [buildingName] in all cities = 需要所有城市建有[buildingName] Requires a [buildingName] in this city = 需要城市建有[buildingName] -Requires [resource] = 需要资源：[resource] +Consumes 1 [resource] = 需要资源：[resource] Required tech: [requiredTech] = 需要科技：[requiredTech] Current construction = 当前项目 diff --git a/android/assets/jsons/translations/Spanish.properties b/android/assets/jsons/translations/Spanish.properties index bcd8e41c..d9a78f6e 100644 --- a/android/assets/jsons/translations/Spanish.properties +++ b/android/assets/jsons/translations/Spanish.properties @@ -37,7 +37,7 @@ Requires worked [resource] near city = Requiere trabajo [resource] cerca de la c Wonder is being built elsewhere = Esta maravilla se está construyendo en otro lugar Requires a [buildingName] in all cities = Requiere un [buildingName] en todas las ciudades Requires a [buildingName] in this city = Requiere un [buildingName] en la misma ciudad -Requires [resource] = Requiere [resource] +Consumes 1 [resource] = Requiere [resource] Required tech: [requiredTech] = Tecnología requerida: [requiredTech] Current construction = Construcción actual diff --git a/android/assets/jsons/translations/Thai.properties b/android/assets/jsons/translations/Thai.properties index 340a1334..3441c67b 100644 --- a/android/assets/jsons/translations/Thai.properties +++ b/android/assets/jsons/translations/Thai.properties @@ -287,7 +287,7 @@ Requires worked [resource] near city = จะต้องมีการทำ Wonder is being built elsewhere = สิ่งมหัศจรรย์กำลังถูกสร้างขึ้นที่ไหนสักแห่ง Requires a [buildingName] in all cities = ต้องมี [buildingName] ในทุกเมือง Requires a [buildingName] in this city = ต้องมี [buildingName] ในเมืองนี้ -Requires [resource] = ต้องการ [resource] +Consumes 1 [resource] = ต้องการ [resource] Required tech: [requiredTech] = ต้องการเทคโนโลยี: [requiredTech] Diplomacy = การทูต diff --git a/android/assets/jsons/translations/Traditional_Chinese.properties b/android/assets/jsons/translations/Traditional_Chinese.properties index aa6886f8..df22c6e6 100644 --- a/android/assets/jsons/translations/Traditional_Chinese.properties +++ b/android/assets/jsons/translations/Traditional_Chinese.properties @@ -37,7 +37,7 @@ Requires worked [resource] near city = 需要城市附近有已開發的資源 Wonder is being built elsewhere = 其他城市正在建造該奇觀 Requires a [buildingName] in all cities = 需要所有城市建有[buildingName] Requires a [buildingName] in this city = 需要城市建有[buildingName] -Requires [resource] = 需要資源：[resource] +Consumes 1 [resource] = 需要資源：[resource] Required tech: [requiredTech] = 需要科技：[requiredTech] Current construction = 當前項目 diff --git a/android/assets/jsons/translations/Turkish.properties b/android/assets/jsons/translations/Turkish.properties index 422587ff..45cb7487 100644 --- a/android/assets/jsons/translations/Turkish.properties +++ b/android/assets/jsons/translations/Turkish.properties @@ -37,7 +37,7 @@ Requires worked [resource] near city = Şehir yakınlarında çalışılan [reso Wonder is being built elsewhere = Eser başka bir yerde inşa ediliyor Requires a [buildingName] in all cities = Tüm şehirlerde bir [buildingName] gerekir Requires a [buildingName] in this city = Bu şehirde bir [buildingName] gerekiyor -Requires [resource] = [resource] gerektirir +Consumes 1 [resource] = [resource] gerektirir Required tech: [requiredTech] = Gerekli teknoloji: [requiredTech] Current construction = Mevcut inşaat diff --git a/android/assets/jsons/translations/Ukrainian.properties b/android/assets/jsons/translations/Ukrainian.properties index 94900d9d..2cb96ff0 100644 --- a/android/assets/jsons/translations/Ukrainian.properties +++ b/android/assets/jsons/translations/Ukrainian.properties @@ -37,7 +37,7 @@ Requires worked [resource] near city = Біля міста має бути ро Wonder is being built elsewhere = Диво будується у іншому місті Requires a [buildingName] in all cities = В усіх містах має бути будівля: [buildingName] Requires a [buildingName] in this city = У місті має бути будівля: [buildingName] -Requires [resource] = Потрібен ресурс: [resource] +Consumes 1 [resource] = Потрібен ресурс: [resource] Required tech: [requiredTech] = Потрібна технологія: [requiredTech] Current construction = Зараз будується diff --git a/android/assets/jsons/translations/template.properties b/android/assets/jsons/translations/template.properties index f40fe8d7..b0c698e1 100644 --- a/android/assets/jsons/translations/template.properties +++ b/android/assets/jsons/translations/template.properties @@ -37,7 +37,7 @@ Requires worked [resource] near city = Wonder is being built elsewhere = Requires a [buildingName] in all cities = Requires a [buildingName] in this city = -Requires [resource] = +Consumes 1 [resource] = Required tech: [requiredTech] = Current construction = diff --git a/core/src/com/unciv/models/ruleset/Building.kt b/core/src/com/unciv/models/ruleset/Building.kt index 7212dfc4..5e99b567 100644 --- a/core/src/com/unciv/models/ruleset/Building.kt +++ b/core/src/com/unciv/models/ruleset/Building.kt @@ -81,7 +81,7 @@ class Building : NamedStats(), IConstruction{ if (!forBuildingPickerScreen && requiredBuildingInAllCities != null) stringBuilder.appendln("Requires [$requiredBuildingInAllCities] to be built in all cities".tr()) if(requiredResource!=null) - stringBuilder.appendln("Requires [$requiredResource]".tr()) + stringBuilder.appendln("Consumes 1 [$requiredResource]".tr()) if (providesFreeBuilding != null) stringBuilder.appendln("Provides a free [$providesFreeBuilding] in the city".tr()) if(uniques.isNotEmpty()) stringBuilder.appendln(uniques.asSequence().map { it.tr() }.joinToString("\n")) @@ -309,7 +309,7 @@ class Building : NamedStats(), IConstruction{ return "Cannot be built with $cannotBeBuiltWith" if (requiredResource != null && !civInfo.hasResource(requiredResource!!)) - return "Requires [$requiredResource]" + return "Consumes 1 [$requiredResource]" if (requiredNearbyImprovedResources != null) { val containsResourceWithImprovement = construction.cityInfo.getWorkableTiles() diff --git a/core/src/com/unciv/models/ruleset/unit/BaseUnit.kt b/core/src/com/unciv/models/ruleset/unit/BaseUnit.kt index b2bd555f..6152bd3e 100644 --- a/core/src/com/unciv/models/ruleset/unit/BaseUnit.kt +++ b/core/src/com/unciv/models/ruleset/unit/BaseUnit.kt @@ -139,7 +139,7 @@ class BaseUnit : INamed, IConstruction { && (name == "Manhattan Project" || uniques.contains("Requires Manhattan Project"))) return "Disabled by setting" if (uniques.contains("Requires Manhattan Project") && !civInfo.containsBuildingUnique("Enables nuclear weapon")) return "Requires Manhattan Project" - if (requiredResource!=null && !civInfo.hasResource(requiredResource!!)) return "Requires [$requiredResource]" + if (requiredResource!=null && !civInfo.hasResource(requiredResource!!)) return "Consumes 1 [$requiredResource]" if (name == Constants.settler && civInfo.isCityState()) return "No settler for city-states" if (name == Constants.settler && civInfo.isOneCityChallenger()) return "No settler for players in One City Challenge" return ""