AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-27 13:55:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

modding: 'Only available when' applies to beliefs

Browse Source
This commit is contained in:
Yair Morgenstern 2023-03-20 22:18:55 +02:00
parent 9201ea2cfa
commit e5452f5605
5 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -601,13 +601,13 @@ object NextTurnAutomation {
}
private fun chooseBeliefOfType(civInfo: Civilization, beliefType: BeliefType, additionalBeliefsToExclude: HashSet<Belief> = hashSetOf()): Belief? {
return civInfo.gameInfo.ruleset.beliefs
return civInfo.gameInfo.ruleset.beliefs.values
.filter {
(it.value.type == beliefType || beliefType == BeliefType.Any)
&& !additionalBeliefsToExclude.contains(it.value)
&& civInfo.religionManager.getReligionWithBelief(it.value) == null
(it.type == beliefType || beliefType == BeliefType.Any)
&& !additionalBeliefsToExclude.contains(it)
&& civInfo.religionManager.getReligionWithBelief(it) == null
&& it.getMatchingUniques(UniqueType.OnlyAvailableWhen).none { !it.conditionalsApply(civInfo) }
}
.map { it.value }
.maxByOrNull { ReligionAutomation.rateBelief(civInfo, it) }
}

2
core/src/com/unciv/models/ruleset/unique/UniqueType.kt
View File

@ -301,7 +301,7 @@ enum class UniqueType(val text: String, vararg targets: UniqueTarget, val flags:
HiddenBeforeAmountPolicies("Hidden until [amount] social policy branches have been completed", UniqueTarget.Building, UniqueTarget.Unit),
// Meant to be used together with conditionals, like "Only available <after adopting [policy]> <while the empire is happy>"
OnlyAvailableWhen("Only available", UniqueTarget.Unit, UniqueTarget.Building, UniqueTarget.Improvement,
UniqueTarget.Policy, UniqueTarget.Tech, UniqueTarget.Promotion, UniqueTarget.Ruins),
UniqueTarget.Policy, UniqueTarget.Tech, UniqueTarget.Promotion, UniqueTarget.Ruins, UniqueTarget.FollowerBelief, UniqueTarget.FounderBelief),
ConvertFoodToProductionWhenConstructed("Excess Food converted to Production when under construction", UniqueTarget.Building, UniqueTarget.Unit),
RequiresPopulation("Requires at least [amount] population", UniqueTarget.Building, UniqueTarget.Unit),

2
core/src/com/unciv/ui/screens/pickerscreens/ReligionPickerScreenCommon.kt
View File

@ -25,7 +25,7 @@ import com.unciv.ui.components.extensions.onClick
import com.unciv.ui.components.extensions.toLabel
abstract class ReligionPickerScreenCommon(
private val choosingCiv: Civilization,
protected val choosingCiv: Civilization,
disableScroll: Boolean = false
) : PickerScreen(disableScroll) {

16
core/src/com/unciv/ui/screens/pickerscreens/ReligiousBeliefsPickerScreen.kt
View File

@ -10,9 +10,8 @@ import com.unciv.models.Counter
import com.unciv.models.Religion
import com.unciv.models.ruleset.Belief
import com.unciv.models.ruleset.BeliefType
import com.unciv.models.ruleset.unique.UniqueType
import com.unciv.models.translations.tr
import com.unciv.ui.images.ImageGetter
import com.unciv.ui.popups.AskTextPopup
import com.unciv.ui.components.AutoScrollPane
import com.unciv.ui.components.extensions.addSeparator
import com.unciv.ui.components.extensions.addSeparatorVertical
@ -21,10 +20,12 @@ import com.unciv.ui.components.extensions.enable
import com.unciv.ui.components.extensions.onClick
import com.unciv.ui.components.extensions.packIfNeeded
import com.unciv.ui.components.extensions.surroundWithCircle
import com.unciv.ui.images.ImageGetter
import com.unciv.ui.popups.AskTextPopup
class ReligiousBeliefsPickerScreen (
choosingCiv: Civilization,
newBeliefsToChoose: Counter<BeliefType>,
numberOfBeliefsCanChoose: Counter<BeliefType>,
pickIconAndName: Boolean
): ReligionPickerScreenCommon(choosingCiv, disableScroll = true) {
// Roughly follows the layout of the original (although I am not very good at UI designing, so please improve this)
@ -44,7 +45,7 @@ class ReligiousBeliefsPickerScreen (
// One entry per new Belief to choose - the left side will offer these below the choices from earlier in the game
class BeliefToChoose(val type: BeliefType, var belief: Belief? = null)
private val beliefsToChoose: Array<BeliefToChoose> =
newBeliefsToChoose.flatMap { entry -> (0 until entry.value).map { BeliefToChoose(entry.key) } }.toTypedArray()
numberOfBeliefsCanChoose.flatMap { entry -> (0 until entry.value).map { BeliefToChoose(entry.key) } }.toTypedArray()
private var leftSelection = Selection()
private var leftSelectedIndex = -1
@ -193,8 +194,10 @@ class ReligiousBeliefsPickerScreen (
rightBeliefsToChoose.clear()
rightSelection.clear()
val availableBeliefs = ruleset.beliefs.values
.filter { (it.type == beliefType || beliefType == BeliefType.Any) }
.filter { it.type == beliefType || beliefType == BeliefType.Any }
val civReligionManager = currentReligion.getFounder().religionManager
for (belief in availableBeliefs) {
val beliefButton = getBeliefButton(belief)
when {
@ -213,6 +216,9 @@ class ReligiousBeliefsPickerScreen (
// The Belief is not available because someone already has it
beliefButton.disable(redDisableColor)
}
belief.getMatchingUniques(UniqueType.OnlyAvailableWhen).any { !it.conditionalsApply(choosingCiv) } ->
beliefButton.disable(redDisableColor) // Blocked
else ->
beliefButton.onClickSelect(rightSelection, belief) {
beliefsToChoose[leftButtonIndex].belief = belief

2
docs/Modders/uniques.md
View File

@ -881,7 +881,7 @@ Simple unique parameters are explained by mouseover. Complex parameters are expl
Applicable to: Tech
??? example "Only available"
Applicable to: Tech, Policy, Building, Unit, Promotion, Improvement, Ruins
Applicable to: Tech, Policy, FounderBelief, FollowerBelief, Building, Unit, Promotion, Improvement, Ruins
??? example "Cannot be hurried"
Applicable to: Tech, Building