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

Deprecated 'religion enabled'

Browse Source
This commit is contained in:
Yair Morgenstern
2023-01-20 11:14:31 +02:00
parent 63d40e3f8a
commit be995b3c3e
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/com/unciv/logic/GameInfo.kt
View File

@ -20,8 +20,8 @@ import com.unciv.logic.civilization.PlayerType
import com.unciv.logic.civilization.managers.TechManager
import com.unciv.logic.civilization.managers.TurnManager
import com.unciv.logic.map.CityDistanceData
import com.unciv.logic.map.tile.TileInfo
import com.unciv.logic.map.TileMap
import com.unciv.logic.map.tile.TileInfo
import com.unciv.models.Religion
import com.unciv.models.metadata.GameParameters
import com.unciv.models.ruleset.ModOptionsConstants
@ -220,7 +220,7 @@ class GameInfo : IsPartOfGameInfoSerialization, HasGameInfoSerializationVersion
fun isReligionEnabled(): Boolean {
val religionDisabledByRuleset = (ruleSet.eras[gameParameters.startingEra]!!.hasUnique(UniqueType.DisablesReligion)
|| ruleSet.modOptions.uniques.contains(ModOptionsConstants.disableReligion))
return !religionDisabledByRuleset && gameParameters.religionEnabled
return !religionDisabledByRuleset
}
fun isEspionageEnabled(): Boolean {

3
core/src/com/unciv/models/metadata/GameParameters.kt
View File

@ -33,8 +33,6 @@ class GameParameters : IsPartOfGameInfoSerialization { // Default values are the
var oneCityChallenge = false
var godMode = false
var nuclearWeaponsEnabled = true
@Deprecated("As of 4.2.3")
var religionEnabled = true
var espionageEnabled = false
var noStartBias = false
@ -64,7 +62,6 @@ class GameParameters : IsPartOfGameInfoSerialization { // Default values are the
parameters.ragingBarbarians = ragingBarbarians
parameters.oneCityChallenge = oneCityChallenge
parameters.nuclearWeaponsEnabled = nuclearWeaponsEnabled
parameters.religionEnabled = religionEnabled
parameters.victoryTypes = ArrayList(victoryTypes)
parameters.startingEra = startingEra
parameters.isOnlineMultiplayer = isOnlineMultiplayer