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

Code improvement, part 1.

Browse source
This commit is contained in:
Duan Tao 2018-12-28 09:53:30 +08:00
parent 2e91b9f84e
commit f70c725b85
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
core/src/com/unciv/logic/automation/UnitAutomation.kt
View file

@ -33,9 +33,9 @@ class UnitAutomation{
return SpecificUnitAutomation().automateWorkBoats(unit)
}
if (unit.name == "Great General") {
if (unit.name == "Great General")
return SpecificUnitAutomation().automateGeneral(unit)
} else if(unit.name.startsWith("Great")
if(unit.name.startsWith("Great")
&& unit.name in GreatPersonManager().statToGreatPersonMapping.values){ // So "Great War Infantry" isn't caught here
return SpecificUnitAutomation().automateGreatPerson(unit)// I don't know what to do with you yet.
}
@ -403,8 +403,9 @@ class SpecificUnitAutomation{
//try to follow nearby units. Do not garrison in city if possible
val militantToCompany = unit.civInfo.getCivUnits()
.firstOrNull { val tile = it.currentTile
it.type.isLandUnit() && it.getMaxMovement() <= 2.0f && tile.civilianUnit==null
&& unit.canMoveTo(tile) && unit.movementAlgs().canReach(tile) && !tile.isCityCenter() }
it.type.isLandUnit() && it.getMaxMovement() <= 2.0f
&& (tile.civilianUnit == null || tile.civilianUnit == unit)
&& unit.canMoveTo(tile) && !tile.isCityCenter() && unit.movementAlgs().canReach(tile) }
if(militantToCompany!=null) {
unit.movementAlgs().headTowards(militantToCompany.currentTile)

2
core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt
View file

@ -162,7 +162,7 @@ class UnitActions {
}.sound("chimes")
}
if ((unit.name == "Great Artist" || unit.name == "Great General") && !unit.isEmbarked()) {
if (unit.hasUnique("Can start an 8-turn golden age") && !unit.isEmbarked()) {
actionList += UnitAction( "Start Golden Age",unit.currentMovement != 0f
) {
unit.civInfo.goldenAges.enterGoldenAge()