AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-27 13:55:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #308 from ninjatao/fix_free_building

Browse Source 
Free culture building now generates culture. Add map size option.
This commit is contained in:
yairm210 2018-12-06 11:44:06 +02:00 committed by GitHub
commit eb4844c48d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -188,9 +188,11 @@ class CityConstructions {
fun addCultureBuilding() { fun addCultureBuilding() {
val cultureBuildingToBuild = listOf("Monument", "Temple", "Opera House", "Museum").firstOrNull { !builtBuildings.contains(it) } val cultureBuildingToBuild = listOf("Monument", "Temple", "Opera House", "Museum").firstOrNull { !builtBuildings.contains(it) }
if (cultureBuildingToBuild == null) return if (cultureBuildingToBuild == null) return
builtBuildings.add(cultureBuildingToBuild) addBuilding(cultureBuildingToBuild)
if (currentConstruction == cultureBuildingToBuild) if (currentConstruction == cultureBuildingToBuild) {
currentConstruction=""
Automation().chooseNextConstruction(this) Automation().chooseNextConstruction(this)
}
} }
fun chooseNextConstruction() { fun chooseNextConstruction() {

3
core/src/com/unciv/ui/NewGameScreen.kt
View File

@ -112,7 +112,8 @@ class NewGameScreen: PickerScreen(){
newGameOptionsTable.add("{World size}:".tr()) newGameOptionsTable.add("{World size}:".tr())
val worldSizeToRadius = LinkedHashMap<String, Int>() val worldSizeToRadius = LinkedHashMap<String, Int>()
worldSizeToRadius["Small"] = 10 worldSizeToRadius["Tiny"] = 10
worldSizeToRadius["Small"] = 15
worldSizeToRadius["Medium"] = 20 worldSizeToRadius["Medium"] = 20
worldSizeToRadius["Large"] = 30 worldSizeToRadius["Large"] = 30
worldSizeToRadius["Huge"] = 40 worldSizeToRadius["Huge"] = 40