wbrawner/Unciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resolved #1404 - AI should no longer be able to win cultural victory after being defeated

Browse source
This commit is contained in:
Yair Morgenstern 2019-12-02 22:08:57 +02:00
parent f79858e39e
commit e3ac6f4e53
2 changed files with 33 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/build.gradle
View file

@ -21,8 +21,8 @@ android {
applicationId "com.unciv.app"
minSdkVersion 14
targetSdkVersion 29
versionCode 333
versionName "3.3.3"
versionCode 334
versionName "3.3.4"
}
// Had to add this crap for Travis to build, it wanted to sign the app

57
core/src/com/unciv/logic/GameInfo.kt
View file

@ -63,30 +63,13 @@ class GameInfo {
var thisPlayer = previousHumanPlayer // not calling is currentPlayer because that's alreay taken and I can't think of a better name
var currentPlayerIndex = civilizations.indexOf(thisPlayer)
fun switchTurn(){
thisPlayer.endTurn()
currentPlayerIndex = (currentPlayerIndex+1) % civilizations.size
if(currentPlayerIndex==0){
turns++
if (turns % 10 == 0 && !gameParameters.noBarbarians) {
val encampments = tileMap.values.filter { it.improvement==Constants.barbarianEncampment }
if(encampments.size < civilizations.filter { it.isMajorCiv() }.size) {
val newEncampmentTile = placeBarbarianEncampment(encampments)
if (newEncampmentTile != null)
placeBarbarianUnit(newEncampmentTile)
}
val totalBarbariansAllowedOnMap = encampments.size*3
var extraBarbarians = totalBarbariansAllowedOnMap - getBarbarianCivilization().getCivUnits().size
for (tile in tileMap.values.filter { it.improvement == Constants.barbarianEncampment }) {
if(extraBarbarians<=0) break
extraBarbarians--
placeBarbarianUnit(tile)
}
}
if (turns % 10 == 0 && !gameParameters.noBarbarians) placeBarbarians()
}
thisPlayer = civilizations[currentPlayerIndex]
thisPlayer.startTurn()
@ -95,7 +78,7 @@ class GameInfo {
switchTurn()
while(thisPlayer.playerType==PlayerType.AI){
NextTurnAutomation().automateCivMoves(thisPlayer)
if(!thisPlayer.isDefeated()) NextTurnAutomation().automateCivMoves(thisPlayer)
switchTurn()
}
@ -103,6 +86,10 @@ class GameInfo {
currentPlayerCiv = getCivilization(currentPlayer)
// Start our turn immediately before the player can made decisions - affects whether our units can commit automated actions and then be attacked immediately etc.
notifyOfCloseEnemyUnits(thisPlayer)
}
private fun notifyOfCloseEnemyUnits(thisPlayer: CivilizationInfo) {
val viewableInvisibleTiles = thisPlayer.viewableInvisibleUnitsTiles.map { it.position }
val enemyUnitsCloseToTerritory = thisPlayer.viewableTiles
.filter {
@ -113,15 +100,13 @@ class GameInfo {
}
// enemy units ON our territory
addEnemyUnitNotification(
thisPlayer,
enemyUnitsCloseToTerritory.filter { it.getOwner()==thisPlayer },
addEnemyUnitNotification(thisPlayer,
enemyUnitsCloseToTerritory.filter { it.getOwner() == thisPlayer },
"in"
)
// enemy units NEAR our territory
addEnemyUnitNotification(
thisPlayer,
enemyUnitsCloseToTerritory.filter { it.getOwner()!=thisPlayer },
addEnemyUnitNotification(thisPlayer,
enemyUnitsCloseToTerritory.filter { it.getOwner() != thisPlayer },
"near"
)
}
@ -140,6 +125,26 @@ class GameInfo {
}
}
fun placeBarbarians() {
val encampments = tileMap.values.filter { it.improvement == Constants.barbarianEncampment }
if (encampments.size < civilizations.filter { it.isMajorCiv() }.size) {
val newEncampmentTile = placeBarbarianEncampment(encampments)
if (newEncampmentTile != null)
placeBarbarianUnit(newEncampmentTile)
}
val totalBarbariansAllowedOnMap = encampments.size * 3
var extraBarbarians = totalBarbariansAllowedOnMap - getBarbarianCivilization().getCivUnits().size
for (tile in tileMap.values.filter { it.improvement == Constants.barbarianEncampment }) {
if (extraBarbarians <= 0) break
extraBarbarians--
placeBarbarianUnit(tile)
}
}
fun placeBarbarianEncampment(existingEncampments: List<TileInfo>): TileInfo? {
// Barbarians will only spawn in places that no one can see
val allViewableTiles = civilizations.filterNot { it.isBarbarian() }