mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-24 06:39:16 +07:00
Code Issues Packages Projects Releases Wiki Activity

Resources in Civilopedia state unit and buildings that consume the resource - #1964

Browse Source
This commit is contained in:
Yair Morgenstern
2020-03-29 14:29:19 +03:00
parent 3ec27ec6c3
commit 806a0e2269
5 changed files with 418 additions and 390 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/src/com/unciv/models/ruleset/tile/TileResource.kt
View File

@ -1,5 +1,6 @@
package com.unciv.models.ruleset.tile
import com.unciv.models.ruleset.Ruleset
import com.unciv.models.stats.NamedStats
import com.unciv.models.stats.Stats
import com.unciv.models.translations.tr
@ -20,7 +21,7 @@ class TileResource : NamedStats() {
var unique: String? = null
fun getDescription(): String {
fun getDescription(ruleset: Ruleset): String {
val stringBuilder = StringBuilder()
stringBuilder.appendln(resourceType.name.tr())
stringBuilder.appendln(this.clone().toString())
@ -30,6 +31,17 @@ class TileResource : NamedStats() {
stringBuilder.appendln()
stringBuilder.appendln("Improved by [$improvement]".tr())
stringBuilder.appendln("Bonus stats for improvement: ".tr() + "$improvementStats".tr())
val buildingsThatConsumeThis = ruleset.buildings.values.filter { it.requiredResource==name }
if(buildingsThatConsumeThis.isNotEmpty())
stringBuilder.appendln("Buildings that consume this resource: ".tr()
+ buildingsThatConsumeThis.joinToString { it.name.tr() })
val unitsThatConsumeThis = ruleset.units.values.filter { it.requiredResource==name }
if(unitsThatConsumeThis.isNotEmpty())
stringBuilder.appendln("Units that consume this resource: ".tr()
+ unitsThatConsumeThis.joinToString { it.name.tr() })
if(unique!=null) stringBuilder.appendln(unique!!.tr())
return stringBuilder.toString()
}

2
core/src/com/unciv/ui/CivilopediaScreen.kt
View File

@ -62,7 +62,7 @@ class CivilopediaScreen(ruleset: Ruleset) : CameraStageBaseScreen() {
.map { CivilopediaEntry(it.name,it.getDescription(false, null,ruleset),
ImageGetter.getConstructionImage(it.name)) }
categoryToEntries["Resources"] = ruleset.tileResources.values
.map { CivilopediaEntry(it.name,it.getDescription(),
.map { CivilopediaEntry(it.name,it.getDescription(ruleset),
ImageGetter.getResourceImage(it.name,50f)) }
categoryToEntries["Terrains"] = ruleset.terrains.values
.map { CivilopediaEntry(it.name,it.getDescription(ruleset)) }