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

Ruins no longer give researched techs - kudos philn3v!

Browse Source 
Can no longer see over mountains
This commit is contained in:
Yair Morgenstern 2018-11-30 10:21:44 +02:00
parent 5e8cf6ea84
commit 8c3282ddce
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,7 +52,7 @@ class GameStarter(){
} }
fun getStartingLocations(numberOfPlayers:Int,tileMap: TileMap): Stack<TileInfo> { fun getStartingLocations(numberOfPlayers:Int,tileMap: TileMap): Stack<TileInfo> {
for(minimumDistanceBetweenStartingLocations in 7 downTo 1){ for(minimumDistanceBetweenStartingLocations in 7 downTo 0){
val freeTiles = tileMap.values val freeTiles = tileMap.values
.filter { it.isLand() && vectorIsWithinNTilesOfEdge(it.position,3,tileMap)} .filter { it.isLand() && vectorIsWithinNTilesOfEdge(it.position,3,tileMap)}
.toMutableList() .toMutableList()

3
core/src/com/unciv/logic/map/MapUnit.kt
View File

@ -329,7 +329,8 @@ class MapUnit {
city.population.autoAssignPopulation() city.population.autoAssignPopulation()
civInfo.addNotification("We have found survivors the ruins - population added to ["+city.name+"]",city.location, Color.GREEN) civInfo.addNotification("We have found survivors the ruins - population added to ["+city.name+"]",city.location, Color.GREEN)
} }
val researchableAncientEraTechs = GameBasics.Technologies.values.filter { civInfo.tech.canBeResearched(it.name)} val researchableAncientEraTechs = GameBasics.Technologies.values
.filter { !civInfo.tech.isResearched(it.name) && civInfo.tech.canBeResearched(it.name)}
if(researchableAncientEraTechs.isNotEmpty()) if(researchableAncientEraTechs.isNotEmpty())
actions.add { actions.add {
val tech = researchableAncientEraTechs.getRandom().name val tech = researchableAncientEraTechs.getRandom().name

3
core/src/com/unciv/logic/map/TileInfo.kt
View File

@ -79,7 +79,8 @@ open class TileInfo {
fun getHeight(): Int { fun getHeight(): Int {
var height = 0 var height = 0
if (listOf("Forest", "Jungle").contains(terrainFeature)) height += 1 if (listOf("Forest", "Jungle").contains(terrainFeature)) height += 1
if ("Hill" == baseTerrain) height += 2 if (baseTerrain == "Hill") height += 2
if(baseTerrain=="Mountain") height = 4
return height return height
} }