mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-08 14:57:58 +07:00
Code Issues Packages Projects Releases Wiki Activity

AI 'found religion' takes the action from the list of unit actions, so player and AI ability to act are always the same

Browse Source
This commit is contained in:
Yair Morgenstern
2023-09-28 09:11:34 +03:00
parent 45db7ade2e
commit 2363269814
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/com/unciv/logic/automation/unit/SpecificUnitAutomation.kt
View File

@ -629,7 +629,11 @@ object SpecificUnitAutomation {
return return
} }
UnitActionsReligion.getFoundReligionAction(unit)() val foundReligionAction = UnitActions.getUnitActions(unit)
.firstOrNull { it.type == UnitActionType.FoundReligion }
?.action ?: return
foundReligionAction()
} }
fun enhanceReligion(unit: MapUnit) { fun enhanceReligion(unit: MapUnit) {

12
core/src/com/unciv/ui/screens/worldscreen/unit/actions/UnitActionsReligion.kt
View File

@ -19,17 +19,13 @@ object UnitActionsReligion {
if (!unit.civ.religionManager.mayFoundReligionAtAll(unit)) return if (!unit.civ.religionManager.mayFoundReligionAtAll(unit)) return
actionList += UnitAction( actionList += UnitAction(
UnitActionType.FoundReligion, UnitActionType.FoundReligion,
action = getFoundReligionAction(unit).takeIf { unit.civ.religionManager.mayFoundReligionNow(unit) } action = {
unit.civ.religionManager.foundReligion(unit)
unit.consume()
}.takeIf { unit.civ.religionManager.mayFoundReligionNow(unit) }
) )
} }
fun getFoundReligionAction(unit: MapUnit): () -> Unit {
return {
unit.civ.religionManager.foundReligion(unit)
unit.consume()
}
}
internal fun addEnhanceReligionAction(unit: MapUnit, actionList: ArrayList<UnitAction>) { internal fun addEnhanceReligionAction(unit: MapUnit, actionList: ArrayList<UnitAction>) {
if (!unit.hasUnique(UniqueType.MayEnhanceReligion)) return if (!unit.hasUnique(UniqueType.MayEnhanceReligion)) return
if (!unit.civ.religionManager.mayEnhanceReligionAtAll(unit)) return if (!unit.civ.religionManager.mayEnhanceReligionAtAll(unit)) return