AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-26 21:35:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Unique deprecation

Browse Source
This commit is contained in:
Yair Morgenstern 2022-02-09 12:26:04 +02:00
parent c54438ef9f
commit ccfe4386b8
3 changed files with 11 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/com/unciv/logic/battle/Battle.kt
View File

@ -429,16 +429,6 @@ object Battle {
for (unique in thisCombatant.getMatchingUniques(UniqueType.FlatXPGain, stateForConditionals, true)) for (unique in thisCombatant.getMatchingUniques(UniqueType.FlatXPGain, stateForConditionals, true))
baseXP += unique.params[0].toInt() baseXP += unique.params[0].toInt()
var xpModifier = 1f
// Deprecated since 3.18.12
for (unique in thisCombatant.getCivInfo().getMatchingUniques(UniqueType.BonusXPGainForUnits, stateForConditionals)) {
if (thisCombatant.unit.matchesFilter(unique.params[0]))
xpModifier += unique.params[1].toFloat() / 100
}
for (unique in thisCombatant.getMatchingUniques(UniqueType.BonuxXPGain, stateForConditionals, true))
xpModifier += unique.params[0].toFloat() / 100
//
for (unique in thisCombatant.getMatchingUniques(UniqueType.PercentageXPGain, stateForConditionals, true)) for (unique in thisCombatant.getMatchingUniques(UniqueType.PercentageXPGain, stateForConditionals, true))
xpModifier += unique.params[0].toFloat() / 100 xpModifier += unique.params[0].toFloat() / 100

5
core/src/com/unciv/logic/city/CityStats.kt
View File

@ -243,11 +243,6 @@ class CityStats(val cityInfo: CityInfo) {
if (cityInfo.getCenterTile().matchesTerrainFilter(unique.params[1])) if (cityInfo.getCenterTile().matchesTerrainFilter(unique.params[1]))
addUniqueStats(unique) addUniqueStats(unique)
// Deprecated since 3.18.14
for (unique in cityInfo.getMatchingUniques(UniqueType.StatsFromCitiesBefore))
if (!cityInfo.civInfo.hasTechOrPolicy(unique.params[1]))
addUniqueStats(unique)
//
return sourceToStats return sourceToStats
} }

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

@ -75,8 +75,6 @@ enum class UniqueType(val text: String, vararg targets: UniqueTarget, val flags:
StatsFromXPopulation("[stats] in cities with [amount] or more population", UniqueTarget.Global, UniqueTarget.FollowerBelief), StatsFromXPopulation("[stats] in cities with [amount] or more population", UniqueTarget.Global, UniqueTarget.FollowerBelief),
StatsFromCitiesOnSpecificTiles("[stats] in cities on [terrainFilter] tiles", UniqueTarget.Global, UniqueTarget.FollowerBelief), StatsFromCitiesOnSpecificTiles("[stats] in cities on [terrainFilter] tiles", UniqueTarget.Global, UniqueTarget.FollowerBelief),
@Deprecated("as of 3.18.14", ReplaceWith("[stats] [in all cities] <before discovering [tech]> OR [stats] [in all cities] <before adopting [policy]>"))
StatsFromCitiesBefore("[stats] per turn from cities before [tech/policy]", UniqueTarget.Global, UniqueTarget.FollowerBelief),
StatsFromBuildings("[stats] from all [buildingFilter] buildings", UniqueTarget.Global, UniqueTarget.FollowerBelief), StatsFromBuildings("[stats] from all [buildingFilter] buildings", UniqueTarget.Global, UniqueTarget.FollowerBelief),
@Deprecated("as of 3.19.1", ReplaceWith("[stats] from every [Wonder]")) @Deprecated("as of 3.19.1", ReplaceWith("[stats] from every [Wonder]"))
StatsFromWondersDeprecated("[stats] from every Wonder", UniqueTarget.Global, UniqueTarget.FollowerBelief), StatsFromWondersDeprecated("[stats] from every Wonder", UniqueTarget.Global, UniqueTarget.FollowerBelief),
@ -432,15 +430,6 @@ enum class UniqueType(val text: String, vararg targets: UniqueTarget, val flags:
ReligiousUnit("Religious Unit", UniqueTarget.Unit), ReligiousUnit("Religious Unit", UniqueTarget.Unit),
SpaceshipPart("Spaceship part", UniqueTarget.Building, UniqueTarget.Unit), SpaceshipPart("Spaceship part", UniqueTarget.Building, UniqueTarget.Unit),
@Deprecated("as of 3.18.12", ReplaceWith("[amount]% XP gained from combat"), DeprecationLevel.WARNING)
BonuxXPGain("[amount]% Bonus XP gain", UniqueTarget.Unit),
@Deprecated("as of 3.18.12", ReplaceWith("[amount]% XP gained from combat <for [mapUnitFilter] units>"), DeprecationLevel.WARNING)
BonusXPGainForUnits("[mapUnitFilter] units gain [amount]% more Experience from combat", UniqueTarget.Global),
@Deprecated("as of 3.18.14", ReplaceWith("[amount]% maintenance costs <for [mapUnitFilter] units>"), DeprecationLevel.WARNING)
UnitMaintenanceDiscountGlobal("[amount]% maintenance costs for [mapUnitFilter] units", UniqueTarget.Global),
//endregion //endregion
@ -646,6 +635,17 @@ enum class UniqueType(val text: String, vararg targets: UniqueTarget, val flags:
// endregion // endregion
// region DEPRECATED AND REMOVED // region DEPRECATED AND REMOVED
@Deprecated("as of 3.18.14", ReplaceWith("[stats] [in all cities] <before discovering [tech]> OR [stats] [in all cities] <before adopting [policy]>"))
StatsFromCitiesBefore("[stats] per turn from cities before [tech/policy]", UniqueTarget.Global, UniqueTarget.FollowerBelief),
@Deprecated("as of 3.18.12", ReplaceWith("[amount]% XP gained from combat"), DeprecationLevel.WARNING)
BonuxXPGain("[amount]% Bonus XP gain", UniqueTarget.Unit),
@Deprecated("as of 3.18.12", ReplaceWith("[amount]% XP gained from combat <for [mapUnitFilter] units>"), DeprecationLevel.WARNING)
BonusXPGainForUnits("[mapUnitFilter] units gain [amount]% more Experience from combat", UniqueTarget.Global),
@Deprecated("as of 3.18.14", ReplaceWith("[amount]% maintenance costs <for [mapUnitFilter] units>"), DeprecationLevel.WARNING)
UnitMaintenanceDiscountGlobal("[amount]% maintenance costs for [mapUnitFilter] units", UniqueTarget.Global),
@Deprecated("as of 3.18.2", ReplaceWith("[50]% of excess happiness converted to [Culture]"), DeprecationLevel.ERROR) @Deprecated("as of 3.18.2", ReplaceWith("[50]% of excess happiness converted to [Culture]"), DeprecationLevel.ERROR)
ExcessHappinessToCultureDeprecated("50% of excess happiness added to culture towards policies", UniqueTarget.Global), ExcessHappinessToCultureDeprecated("50% of excess happiness added to culture towards policies", UniqueTarget.Global),
@Deprecated("as of 3.16.11", ReplaceWith("Not displayed as an available construction without [buildingName]"), DeprecationLevel.ERROR) @Deprecated("as of 3.16.11", ReplaceWith("Not displayed as an available construction without [buildingName]"), DeprecationLevel.ERROR)