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

Standardized 'spread religion' / 'remove heresy' actions

Browse Source
This commit is contained in:
Yair Morgenstern
2023-12-07 19:54:46 +02:00
parent 8f049f45f1
commit c4310fb0f9
2 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/com/unciv/ui/screens/worldscreen/unit/actions/UnitActions.kt
View File

@ -47,7 +47,9 @@ object UnitActions {
UnitActionType.ConductTradeMission to UnitActionsGreatPerson::getConductTradeMissionActions,
UnitActionType.FoundReligion to UnitActionsReligion::getFoundReligionActions,
UnitActionType.EnhanceReligion to UnitActionsReligion::getEnhanceReligionActions,
UnitActionType.CreateImprovement to UnitActionsFromUniques::getImprovementCreationActions
UnitActionType.CreateImprovement to UnitActionsFromUniques::getImprovementCreationActions,
UnitActionType.SpreadReligion to UnitActionsReligion::addSpreadReligionActions,
UnitActionType.RemoveHeresy to UnitActionsReligion::getRemoveHeresyActions
)
private fun getNormalActions(unit: MapUnit): List<UnitAction> {
@ -58,9 +60,6 @@ object UnitActions {
actionList.addAll(getActionsFunction(unit, tile))
// Determined by unit uniques
UnitActionsReligion.addSpreadReligionActions(unit, actionList)
UnitActionsReligion.addRemoveHeresyActions(unit, actionList)
UnitActionsFromUniques.addTriggerUniqueActions(unit, actionList)
UnitActionsFromUniques.addAddInCapitalAction(unit, actionList, tile)

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

@ -85,9 +85,9 @@ object UnitActionsReligion {
return pressureAdded.toInt()
}
fun addSpreadReligionActions(unit: MapUnit, actionList: ArrayList<UnitAction>) {
if (!unit.civ.religionManager.maySpreadReligionAtAll(unit)) return
val city = unit.currentTile.getCity() ?: return
fun addSpreadReligionActions(unit: MapUnit, tile: Tile): List<UnitAction> {
if (!unit.civ.religionManager.maySpreadReligionAtAll(unit)) return listOf()
val city = unit.currentTile.getCity() ?: return listOf()
val newStyleUnique = UnitActionModifiers.getUsableUnitActionUniques(unit, UniqueType.CanSpreadReligion).firstOrNull()
@ -95,7 +95,7 @@ object UnitActionsReligion {
UnitActionModifiers.actionTextWithSideEffects("Spread [${unit.getReligionDisplayName()!!}]", newStyleUnique, unit)
else "Spread [${unit.getReligionDisplayName()!!}]"
actionList += UnitAction(
return listOf(UnitAction(
UnitActionType.SpreadReligion,
title = title,
action = {
@ -113,19 +113,19 @@ object UnitActionsReligion {
unit.currentMovement = 0f
}
}.takeIf { unit.currentMovement > 0 && unit.civ.religionManager.maySpreadReligionNow(unit) }
)
))
}
internal fun addRemoveHeresyActions(unit: MapUnit, actionList: ArrayList<UnitAction>) {
if (!unit.civ.gameInfo.isReligionEnabled()) return
val religion = unit.civ.gameInfo.religions[unit.religion] ?: return
if (religion.isPantheon()) return
internal fun getRemoveHeresyActions(unit: MapUnit, tile: Tile): List<UnitAction> {
if (!unit.civ.gameInfo.isReligionEnabled()) return listOf()
val religion = unit.civ.gameInfo.religions[unit.religion] ?: return listOf()
if (religion.isPantheon()) return listOf()
val city = unit.currentTile.getCity() ?: return
if (city.civ != unit.civ) return
val city = unit.currentTile.getCity() ?: return listOf()
if (city.civ != unit.civ) return listOf()
// Only allow the action if the city actually has any foreign religion
// This will almost be always due to pressure from cities close-by
if (city.religion.getPressures().none { it.key != unit.religion!! }) return
if (city.religion.getPressures().none { it.key != unit.religion!! }) return listOf()
val hasOldStyleAbility = unit.abilityUsesLeft.containsKey(Constants.removeHeresy)
&& unit.abilityUsesLeft[Constants.removeHeresy]!! > 0
@ -133,13 +133,13 @@ object UnitActionsReligion {
val newStyleUnique = UnitActionModifiers.getUsableUnitActionUniques(unit, UniqueType.CanRemoveHeresy).firstOrNull()
val hasNewStyleAbility = newStyleUnique != null
if (!hasOldStyleAbility && !hasNewStyleAbility) return
if (!hasOldStyleAbility && !hasNewStyleAbility) return listOf()
val title = if (hasNewStyleAbility)
UnitActionModifiers.actionTextWithSideEffects("Remove Heresy", newStyleUnique!!, unit)
else "Remove Heresy"
actionList += UnitAction(
return listOf(UnitAction(
UnitActionType.RemoveHeresy,
title = title,
action = {
@ -161,6 +161,6 @@ object UnitActionsReligion {
unit.currentMovement = 0f
}
}.takeIf { unit.currentMovement > 0f }
)
))
}
}