mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-11 16:29:48 +07:00
Code Issues Packages Projects Releases Wiki Activity

Solved bug where units spawned into tiles with ancient ruins would crash the game, and ancient ruin bonuses would sometimes activate twice

Browse Source
This commit is contained in:
Yair Morgenstern
2019-07-25 20:07:10 +03:00
parent 99bce1de30
commit 76339095ce
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -397,7 +397,7 @@ class MapUnit {
fun moveThroughTile(tile: TileInfo){ fun moveThroughTile(tile: TileInfo){
if(tile.improvement==Constants.ancientRuins && civInfo.isMajorCiv()) if(tile.improvement==Constants.ancientRuins && civInfo.isMajorCiv())
getAncientRuinBonus() getAncientRuinBonus(tile)
if(tile.improvement==Constants.barbarianEncampment && !civInfo.isBarbarianCivilization()) if(tile.improvement==Constants.barbarianEncampment && !civInfo.isBarbarianCivilization())
clearEncampment(tile) clearEncampment(tile)
@ -428,14 +428,14 @@ class MapUnit {
civInfo.gold += baseUnit.getDisbandGold() civInfo.gold += baseUnit.getDisbandGold()
} }
private fun getAncientRuinBonus() { private fun getAncientRuinBonus(tile: TileInfo) {
currentTile.improvement=null tile.improvement=null
val actions: ArrayList<() -> Unit> = ArrayList() val actions: ArrayList<() -> Unit> = ArrayList()
if(civInfo.cities.isNotEmpty()) actions.add { if(civInfo.cities.isNotEmpty()) actions.add {
val city = civInfo.cities.random() val city = civInfo.cities.random()
city.population.population++ city.population.population++
city.population.autoAssignPopulation() city.population.autoAssignPopulation()
civInfo.addNotification("We have found survivors in the ruins - population added to ["+city.name+"]",currentTile.position, Color.GREEN) civInfo.addNotification("We have found survivors in the ruins - population added to ["+city.name+"]",tile.position, Color.GREEN)
} }
val researchableAncientEraTechs = GameBasics.Technologies.values val researchableAncientEraTechs = GameBasics.Technologies.values
.filter { .filter {
@ -447,27 +447,27 @@ class MapUnit {
actions.add { actions.add {
val tech = researchableAncientEraTechs.random().name val tech = researchableAncientEraTechs.random().name
civInfo.tech.addTechnology(tech) civInfo.tech.addTechnology(tech)
civInfo.addNotification("We have discovered the lost technology of [$tech] in the ruins!",currentTile.position, Color.BLUE) civInfo.addNotification("We have discovered the lost technology of [$tech] in the ruins!",tile.position, Color.BLUE)
} }
actions.add { actions.add {
val chosenUnit = listOf(Constants.settler, Constants.worker,"Warrior").random() val chosenUnit = listOf(Constants.settler, Constants.worker,"Warrior").random()
if (!civInfo.isCityState() || chosenUnit != Constants.settler) { //City states don't get settler from ruins if (!civInfo.isCityState() || chosenUnit != Constants.settler) { //City states don't get settler from ruins
civInfo.placeUnitNearTile(currentTile.position, chosenUnit) civInfo.placeUnitNearTile(tile.position, chosenUnit)
civInfo.addNotification("A [$chosenUnit] has joined us!", currentTile.position, Color.BROWN) civInfo.addNotification("A [$chosenUnit] has joined us!", tile.position, Color.BROWN)
} }
} }
if(!type.isCivilian()) if(!type.isCivilian())
actions.add { actions.add {
promotions.XP+=10 promotions.XP+=10
civInfo.addNotification("An ancient tribe trains our [$name] in their ways of combat!",currentTile.position, Color.RED) civInfo.addNotification("An ancient tribe trains our [$name] in their ways of combat!",tile.position, Color.RED)
} }
actions.add { actions.add {
val amount = listOf(25,60,100).random() val amount = listOf(25,60,100).random()
civInfo.gold+=amount civInfo.gold+=amount
civInfo.addNotification("We have found a stash of [$amount] gold in the ruins!",currentTile.position, Color.GOLD) civInfo.addNotification("We have found a stash of [$amount] gold in the ruins!",tile.position, Color.GOLD)
} }
(actions.random())() (actions.random())()