AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-29 06:51:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Code cleanup.

Browse Source
This commit is contained in:
Duan Tao 2019-05-10 18:37:37 +08:00 committed by Yair Morgenstern
parent 91baeddde2
commit 3b30daf852
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/com/unciv/logic/city/CityConstructions.kt
View File

@ -212,8 +212,7 @@ class CityConstructions {
val basicCultureBuildings = listOf("Monument", "Temple", "Opera House", "Museum") val basicCultureBuildings = listOf("Monument", "Temple", "Opera House", "Museum")
val buildableCultureBuildings = GameBasics.Buildings.values val buildableCultureBuildings = GameBasics.Buildings.values
.filter { it.isBuildable(this) .filter { it.isBuildable(this)
&& (basicCultureBuildings.contains(it.name) || && (basicCultureBuildings.contains(it.name) || basicCultureBuildings.contains(it.replaces))}
(it.replaces != "" && basicCultureBuildings.contains(it.replaces)))}
if (buildableCultureBuildings.isEmpty()) return if (buildableCultureBuildings.isEmpty()) return
val cultureBuildingToBuild = buildableCultureBuildings.minBy { it.cost }!!.name val cultureBuildingToBuild = buildableCultureBuildings.minBy { it.cost }!!.name
addBuilding(cultureBuildingToBuild) addBuilding(cultureBuildingToBuild)

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

@ -331,7 +331,7 @@ class EmpireOverviewScreen : CameraStageBaseScreen(){
filter { !it.otherCiv().isBarbarianCivilization() && !it.otherCiv().isCityState() filter { !it.otherCiv().isBarbarianCivilization() && !it.otherCiv().isCityState()
&& playerKnows(it.otherCiv()) && !it.otherCiv().isDefeated()}){ && playerKnows(it.otherCiv()) && !it.otherCiv().isDefeated()}){
val civGroup = civGroups[civ.civName]!! val civGroup = civGroups[civ.civName]!!
val otherCivGroup = civGroups[diplomacy.otherCivName]!! // val otherCivGroup = civGroups[diplomacy.otherCivName]!!
val statusLine = ImageGetter.getLine(civGroup.x+civGroup.width/2,civGroup.y+civGroup.height/2, val statusLine = ImageGetter.getLine(civGroup.x+civGroup.width/2,civGroup.y+civGroup.height/2,
otherCivGroup.x+otherCivGroup.width/2,otherCivGroup.y+otherCivGroup.height/2,3f) otherCivGroup.x+otherCivGroup.width/2,otherCivGroup.y+otherCivGroup.height/2,3f)