AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-28 22:37:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Deprecation

Browse Source
This commit is contained in:
yairm210 2021-09-09 21:55:25 +03:00
parent 9a35323331
commit d8d94cb6bd
5 changed files with 13 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/com/unciv/logic/battle/BattleDamage.kt
View File

@ -235,11 +235,7 @@ object BattleDamage {
private fun getTileSpecificModifiers(unit: MapUnitCombatant, tile: TileInfo): Counter<String> {
val modifiers = Counter<String>()
for (unique in unit.unit.getMatchingUniques("+[]% Strength in []")
+ unit.getCivInfo()
// Deprecated since 3.16.7
.getMatchingUniques("+[]% Strength for units fighting in []")) {
//
for (unique in unit.unit.getMatchingUniques("+[]% Strength in []")) {
val filter = unique.params[1]
if (tile.matchesFilter(filter, unit.getCivInfo()))
modifiers.add(filter, unique.params[0].toInt())

12
core/src/com/unciv/models/ruleset/Building.kt
View File

@ -365,18 +365,6 @@ class Building : NamedStats(), INonPerpetualConstruction, ICivilopediaText {
var cost = getBaseBuyCost(cityInfo, stat)?.toDouble()
if (cost == null) return null
// Deprecated since 3.15.15
if (stat == Stat.Gold) {
for (unique in cityInfo.getMatchingUniques("Cost of purchasing items in cities reduced by []%"))
cost *= 1 - (unique.params[0].toFloat() / 100)
for (unique in cityInfo.getMatchingUniques("Cost of purchasing [] buildings reduced by []%")) {
if (matchesFilter(unique.params[0]))
cost *= 1 - (unique.params[1].toFloat() / 100)
}
}
//
for (unique in cityInfo.getMatchingUniques("[] cost of purchasing items in cities []%"))
if (stat.name == unique.params[0])
cost *= unique.params[1].toPercent()

3
core/src/com/unciv/models/ruleset/Difficulty.kt
View File

@ -15,7 +15,6 @@ class Difficulty: INamed, ICivilopediaText {
var policyCostModifier:Float = 1f
var unhappinessModifier:Float = 1f
var barbarianBonus:Float = 0f
var startingUnits = ArrayList<String>() // Deprecated since 3.15.8 - with eras
var playerBonusStartingUnits = ArrayList<String>()
var aiCityGrowthModifier:Float = 1f
@ -25,9 +24,7 @@ class Difficulty: INamed, ICivilopediaText {
var aiBuildingMaintenanceModifier:Float = 1f
var aiUnitMaintenanceModifier = 1f
var aiFreeTechs = ArrayList<String>()
var aiMajorCivStartingUnits = ArrayList<String>() // Deprecated since 3.15.8 - with eras
var aiMajorCivBonusStartingUnits = ArrayList<String>()
var aiCityStateStartingUnits = ArrayList<String>() // Deprecated since 3.15.8
var aiCityStateBonusStartingUnits = ArrayList<String>()
var aiUnhappinessModifier = 1f
var turnBarbariansCanEnterPlayerTiles = 0

15
core/src/com/unciv/models/ruleset/Unique.kt
View File

@ -168,21 +168,6 @@ object UniqueTriggerActivation {
return civInfo.addUnit(greatPerson.name, chosenCity) != null
}
}
// Deprecated since 3.15.4
"+1 population in each city" -> {
for (city in civInfo.cities) {
city.population.addPopulation(1)
}
if (notification != null) {
civInfo.addNotification(
notification,
LocationAction(civInfo.cities.map { it.location }),
NotificationIcon.Population
)
}
return true
}
//
"[] population []" -> {
val citiesWithPopulationChanged: MutableList<Vector2> = mutableListOf()
for (city in civInfo.cities) {

32
core/src/com/unciv/models/ruleset/unit/BaseUnit.kt
View File

@ -425,6 +425,7 @@ class BaseUnit : INamed, INonPerpetualConstruction, ICivilopediaText {
fun addConstructionBonuses(unit: MapUnit, cityConstructions: CityConstructions) {
val civInfo = cityConstructions.cityInfo.civInfo
@Suppress("LocalVariableName")
var XP = 0
@ -437,25 +438,20 @@ class BaseUnit : INamed, INonPerpetualConstruction, ICivilopediaText {
}
unit.promotions.XP = XP
for (unique in
cityConstructions.cityInfo.getMatchingUniques("All newly-trained [] units [] receive the [] promotion")
.filter { cityConstructions.cityInfo.matchesFilter(it.params[1]) } +
// Deprecated since 3.15.9
cityConstructions.cityInfo.getLocalMatchingUniques("All newly-trained [] units in this city receive the [] promotion")
//
) {
for (unique in cityConstructions.cityInfo.getMatchingUniques("All newly-trained [] units [] receive the [] promotion")
.filter { cityConstructions.cityInfo.matchesFilter(it.params[1]) }) {
val filter = unique.params[0]
val promotion = unique.params.last()
if (unit.matchesFilter(filter)
if (unit.matchesFilter(filter)
|| (
filter == "relevant"
&& civInfo.gameInfo.ruleSet.unitPromotions.values
.any {
it.name == promotion
&& unit.type.name in it.unitTypes
}
)
filter == "relevant"
&& civInfo.gameInfo.ruleSet.unitPromotions.values
.any {
it.name == promotion
&& unit.type.name in it.unitTypes
}
)
) {
unit.promotions.addPromotion(promotion, isFree = true)
}
@ -492,9 +488,6 @@ class BaseUnit : INamed, INonPerpetualConstruction, ICivilopediaText {
"Nuclear Weapon" -> isNuclearWeapon()
"Great Person", "Great" -> isGreatPerson()
// Deprecated as of 3.15.2
"military water" -> isMilitary() && isWaterUnit()
//
else -> {
if (getType().matchesFilter(filter)) return true
if (
@ -509,8 +502,7 @@ class BaseUnit : INamed, INonPerpetualConstruction, ICivilopediaText {
fun isGreatPerson() = uniqueObjects.any { it.placeholderText == "Great Person - []" }
// "Nuclear Weapon" unique deprecated since 3.15.4
fun isNuclearWeapon() = uniqueObjects.any { it.placeholderText == "Nuclear Weapon" || it.placeholderText == "Nuclear weapon of Strength []" }
fun isNuclearWeapon() = uniqueObjects.any { it.placeholderText == "Nuclear weapon of Strength []" }
fun movesLikeAirUnits() = getType().getMovementType() == UnitMovementType.Air