AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-30 07:21:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/yairm210/UnCiv

Browse Source
This commit is contained in:
Yair Morgenstern 2019-09-11 19:37:09 +03:00
commit b8c3bd402f
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
android/assets/jsons/Translations/Units,Promotions.json
View File

@ -671,7 +671,8 @@
} }
"Turtle Ship":{ "Turtle Ship":{
Spanish:"Nave tartaruga" Italian:"Nave tartaruga"
Spanish:"Nave tartaruga"//Should be "Barco tortuga"
Simplified_Chinese:"龟船" Simplified_Chinese:"龟船"
Russian:"Кобуксон" Russian:"Кобуксон"
} }

10
core/src/com/unciv/logic/automation/Automation.kt
View File

@ -5,6 +5,7 @@ import com.unciv.logic.city.CityInfo
import com.unciv.logic.civilization.CivilizationInfo import com.unciv.logic.civilization.CivilizationInfo
import com.unciv.logic.map.BFS import com.unciv.logic.map.BFS
import com.unciv.logic.map.TileInfo import com.unciv.logic.map.TileInfo
import com.unciv.models.gamebasics.VictoryType
import com.unciv.models.gamebasics.unit.BaseUnit import com.unciv.models.gamebasics.unit.BaseUnit
import com.unciv.models.gamebasics.unit.UnitType import com.unciv.models.gamebasics.unit.UnitType
import com.unciv.models.stats.Stats import com.unciv.models.stats.Stats
@ -38,7 +39,7 @@ class Automation {
rank += stats.gold / 5 // it's barely worth anything at this points rank += stats.gold / 5 // it's barely worth anything at this points
} }
else{ else{
if (stats.food <= 2) rank += (stats.food * 1.2f) //food get more value to keep city growing if (stats.food <= 2 || city.civInfo.getHappiness() > 5) rank += (stats.food * 1.2f) //food get more value to keep city growing
else rank += (2.4f + (stats.food - 2) / 2) // 1.2 point for each food up to 2, from there on half a point else rank += (2.4f + (stats.food - 2) / 2) // 1.2 point for each food up to 2, from there on half a point
if (city.civInfo.gold < 0 && city.civInfo.statsForNextTurn.gold <= 0) rank += stats.gold // we have a global problem if (city.civInfo.gold < 0 && city.civInfo.statsForNextTurn.gold <= 0) rank += stats.gold // we have a global problem
@ -46,7 +47,12 @@ class Automation {
rank += stats.production rank += stats.production
rank += stats.science rank += stats.science
rank += stats.culture if (city.tiles.size < 12 || city.civInfo.victoryType() == VictoryType.Cultural){
rank += stats.culture
}
else{
rank += stats.culture / 2
}
} }
return rank return rank
} }

2
core/src/com/unciv/logic/city/CityStats.kt
View File

@ -228,7 +228,7 @@ class CityStats {
if (policies.contains("Commerce Complete")) stats.gold += 1 if (policies.contains("Commerce Complete")) stats.gold += 1
if (policies.contains("Secularism")) stats.science += 2 if (policies.contains("Secularism")) stats.science += 2
if (cityInfo.containsBuildingUnique("+1 Production from specialists")) if (cityInfo.civInfo.containsBuildingUnique("+1 Production from specialists"))
stats.production += 1 stats.production += 1
if(cityInfo.civInfo.nation.unique=="+2 Science for all specialists and Great Person tile improvements") if(cityInfo.civInfo.nation.unique=="+2 Science for all specialists and Great Person tile improvements")
stats.science+=2 stats.science+=2