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

Rename unique "remove annex unhappiness" -> "removes annex unhappiness"

Browse Source
This commit is contained in:
yairm210 2025-06-05 11:10:24 +03:00
parent 5d8361d400
commit b3b1fe61e0
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -176,6 +176,7 @@ class CityStats(val city: City) {
fun hasExtraAnnexUnhappiness(): Boolean { fun hasExtraAnnexUnhappiness(): Boolean {
if (city.civ.civName == city.foundingCiv || city.isPuppet) return false if (city.civ.civName == city.foundingCiv || city.isPuppet) return false
return !city.containsBuildingUnique(UniqueType.RemoveAnnexUnhappiness) return !city.containsBuildingUnique(UniqueType.RemoveAnnexUnhappiness)
&& !city.containsBuildingUnique(UniqueType.RemovesAnnexUnhappiness)
} }
fun getStatsOfSpecialist(specialistName: String, localUniqueCache: LocalUniqueCache = LocalUniqueCache(false)): Stats { fun getStatsOfSpecialist(specialistName: String, localUniqueCache: LocalUniqueCache = LocalUniqueCache(false)): Stats {

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

@ -516,7 +516,9 @@ class Building : RulesetStatsObject(), INonPerpetualConstruction {
} }
if (getMatchingUniques(UniqueType.StatsFromTiles).any { it.stats[stat] > 0 }) return true if (getMatchingUniques(UniqueType.StatsFromTiles).any { it.stats[stat] > 0 }) return true
if (getMatchingUniques(UniqueType.StatsPerPopulation).any { it.stats[stat] > 0 }) return true if (getMatchingUniques(UniqueType.StatsPerPopulation).any { it.stats[stat] > 0 }) return true
if (stat == Stat.Happiness && hasUnique(UniqueType.RemoveAnnexUnhappiness)) return true if (stat == Stat.Happiness &&
(hasUnique(UniqueType.RemoveAnnexUnhappiness) || hasUnique(UniqueType.RemovesAnnexUnhappiness))
) return true
return false return false
} }

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

@ -142,7 +142,7 @@ enum class UniqueType(
GainFreeBuildings("Gain a free [buildingName] [cityFilter]", UniqueTarget.Global, UniqueTarget.Triggerable, GainFreeBuildings("Gain a free [buildingName] [cityFilter]", UniqueTarget.Global, UniqueTarget.Triggerable,
docDescription = "Free buildings CANNOT be self-removing - this leads to an endless loop of trying to add the building"), docDescription = "Free buildings CANNOT be self-removing - this leads to an endless loop of trying to add the building"),
BuildingMaintenance("[relativeAmount]% maintenance cost for [buildingFilter] buildings [cityFilter]", UniqueTarget.Global, UniqueTarget.FollowerBelief), BuildingMaintenance("[relativeAmount]% maintenance cost for [buildingFilter] buildings [cityFilter]", UniqueTarget.Global, UniqueTarget.FollowerBelief),
@Deprecated(message = "as of 4.6.13", ReplaceWith("[relativeAmount]% maintenance cost for [all] buildings [cityFilter]"), level = DeprecationLevel.WARNING) @Deprecated(message = "as of 4.16.13", ReplaceWith("[relativeAmount]% maintenance cost for [all] buildings [cityFilter]"), level = DeprecationLevel.WARNING)
BuildingMaintenanceOld("[relativeAmount]% maintenance cost for buildings [cityFilter]", UniqueTarget.Global, UniqueTarget.FollowerBelief), BuildingMaintenanceOld("[relativeAmount]% maintenance cost for buildings [cityFilter]", UniqueTarget.Global, UniqueTarget.FollowerBelief),
RemoveBuilding("Remove [buildingFilter] [cityFilter]", UniqueTarget.Global, UniqueTarget.Triggerable), RemoveBuilding("Remove [buildingFilter] [cityFilter]", UniqueTarget.Global, UniqueTarget.Triggerable),
OneTimeSellBuilding("Sell [buildingFilter] buildings [cityFilter]", UniqueTarget.Global, UniqueTarget.Triggerable), OneTimeSellBuilding("Sell [buildingFilter] buildings [cityFilter]", UniqueTarget.Global, UniqueTarget.Triggerable),
@ -345,7 +345,10 @@ enum class UniqueType(
NotDestroyedWhenCityCaptured("Never destroyed when the city is captured", UniqueTarget.Building), NotDestroyedWhenCityCaptured("Never destroyed when the city is captured", UniqueTarget.Building),
DoublesGoldFromCapturingCity("Doubles Gold given to enemy if city is captured", UniqueTarget.Building), DoublesGoldFromCapturingCity("Doubles Gold given to enemy if city is captured", UniqueTarget.Building),
@Deprecated("As of 4.16.14", ReplaceWith("Removes extra unhappiness from annexed cities"))
RemoveAnnexUnhappiness("Remove extra unhappiness from annexed cities", UniqueTarget.Building), RemoveAnnexUnhappiness("Remove extra unhappiness from annexed cities", UniqueTarget.Building),
RemovesAnnexUnhappiness("Removes extra unhappiness from annexed cities", UniqueTarget.Building),
ConnectTradeRoutes("Connects trade routes over water", UniqueTarget.Building), ConnectTradeRoutes("Connects trade routes over water", UniqueTarget.Building),
GainBuildingWhereBuildable("Automatically built in all cities where it is buildable", UniqueTarget.Building), GainBuildingWhereBuildable("Automatically built in all cities where it is buildable", UniqueTarget.Building),