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

Grassland ad Tundra are now also constants, completing the set

Browse Source
This commit is contained in:
Yair Morgenstern 2019-10-20 10:48:16 +03:00
parent 384194c531
commit e2c19696c9
4 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/assets/jsons/Translations/NewGame,SaveGame,LoadGame,Options.json
View File

@ -776,7 +776,7 @@
German: "Untätige Einheiten anzeigen bei Rundenende" German: "Untätige Einheiten anzeigen bei Rundenende"
French:"Vérifier les unités inactives" French:"Vérifier les unités inactives"
Russian:"Найти незанятые юниты" Russian:"Найти незанятые юниты"
Korean:"턴이 끝나기 전에 미행동 유닛 보기 Korean:"턴이 끝나기 전에 미행동 유닛 보기"
} }
"Move units with a single tap":{ "Move units with a single tap":{

2
core/src/com/unciv/Constants.kt
View File

@ -14,6 +14,8 @@ class Constants{
const val plains = "Plains" const val plains = "Plains"
const val lakes = "Lakes" const val lakes = "Lakes"
const val desert = "Desert" const val desert = "Desert"
const val grassland = "Grassland"
const val tundra = "Tundra"
const val barbarianEncampment = "Barbarian encampment" const val barbarianEncampment = "Barbarian encampment"

4
core/src/com/unciv/logic/automation/WorkerAutomation.kt
View File

@ -188,8 +188,8 @@ class WorkerAutomation(val unit: MapUnit) {
tile.terrainFeature == "Marsh" -> "Remove Marsh" tile.terrainFeature == "Marsh" -> "Remove Marsh"
tile.terrainFeature == Constants.forest -> "Lumber mill" tile.terrainFeature == Constants.forest -> "Lumber mill"
tile.baseTerrain == Constants.hill -> "Mine" tile.baseTerrain == Constants.hill -> "Mine"
tile.baseTerrain in listOf("Grassland",Constants.desert,Constants.plains) -> "Farm" tile.baseTerrain in listOf(Constants.grassland,Constants.desert,Constants.plains) -> "Farm"
tile.baseTerrain == "Tundra" -> "Trading post" tile.baseTerrain == Constants.tundra -> "Trading post"
else -> throw Exception("No improvement found for "+tile.baseTerrain) else -> throw Exception("No improvement found for "+tile.baseTerrain)
} }
if (improvementString == null) return null if (improvementString == null) return null

21
core/src/com/unciv/logic/map/RandomMapGenerator.kt
View File

@ -200,15 +200,15 @@ class CelluarAutomataRandomMapGenerator(): SeedRandomMapGenerator() {
//change grassland to desert or tundra based on y //change grassland to desert or tundra based on y
if (abs(getLatitude(tile.position)) < maxLatitude * 0.1) { if (abs(getLatitude(tile.position)) < maxLatitude * 0.1) {
if (terrain == "Grassland" || terrain == "Tundra") if (terrain == Constants.grassland || terrain == Constants.tundra)
terrain = Constants.desert terrain = Constants.desert
} else if (abs(getLatitude(tile.position)) > maxLatitude * 0.7) { } else if (abs(getLatitude(tile.position)) > maxLatitude * 0.7) {
if (terrain == "Grassland" || terrain == Constants.plains || terrain == Constants.desert || terrain == Constants.ocean) { if (terrain == Constants.grassland || terrain == Constants.plains || terrain == Constants.desert || terrain == Constants.ocean) {
terrain = "Tundra" terrain = Constants.tundra
} }
} else { } else {
if (terrain == "Tundra") terrain = Constants.plains if (terrain == Constants.tundra) terrain = Constants.plains
else if (terrain == Constants.desert) terrain = "Grassland" else if (terrain == Constants.desert) terrain = Constants.grassland
} }
val area = Area(terrain) val area = Area(terrain)
@ -282,10 +282,9 @@ class AlexanderRandomMapGenerator:RandomMapGenerator(){
map[vector] = null map[vector] = null
val sparkList = ArrayList<Vector2>() val sparkList = ArrayList<Vector2>()
val grassland = "Grassland"
for(i in 0..distance*distance/6){ for(i in 0..distance*distance/6){
val location = map.filter { it.value==null }.map { it.key }.random() val location = map.filter { it.value==null }.map { it.key }.random()
map[location] = TileInfo().apply { baseTerrain= grassland} map[location] = TileInfo().apply { baseTerrain= Constants.grassland}
sparkList.add(location) sparkList.add(location)
} }
@ -293,9 +292,9 @@ class AlexanderRandomMapGenerator:RandomMapGenerator(){
val currentSpark = sparkList.random() val currentSpark = sparkList.random()
val emptyTilesAroundSpark = HexMath().getAdjacentVectors(currentSpark) val emptyTilesAroundSpark = HexMath().getAdjacentVectors(currentSpark)
.filter { map.containsKey(it) && map[it]==null } .filter { map.containsKey(it) && map[it]==null }
if(map[currentSpark]!!.baseTerrain==grassland){ if(map[currentSpark]!!.baseTerrain==Constants.grassland){
for(tile in emptyTilesAroundSpark){ for(tile in emptyTilesAroundSpark){
if(Math.random()<landExpansionChance) map[tile]=TileInfo().apply { baseTerrain=grassland } if(Math.random()<landExpansionChance) map[tile]=TileInfo().apply { baseTerrain=Constants.grassland }
else map[tile]=TileInfo().apply { baseTerrain=Constants.ocean } else map[tile]=TileInfo().apply { baseTerrain=Constants.ocean }
} }
} }
@ -311,8 +310,8 @@ class AlexanderRandomMapGenerator:RandomMapGenerator(){
for(entry in map){ for(entry in map){
entry.value!!.position = entry.key entry.value!!.position = entry.key
if(entry.value!!.baseTerrain==Constants.ocean if(entry.value!!.baseTerrain==Constants.ocean
&& HexMath().getAdjacentVectors(entry.key).all { !map.containsKey(it) || map[it]!!.baseTerrain==grassland }) && HexMath().getAdjacentVectors(entry.key).all { !map.containsKey(it) || map[it]!!.baseTerrain==Constants.grassland })
entry.value!!.baseTerrain=grassland entry.value!!.baseTerrain=Constants.grassland
newmap[entry.key.toString()] = entry.value!! newmap[entry.key.toString()] = entry.value!!
} }