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

Civ-wide uniques for city-wide resources

Browse Source
This commit is contained in:
Yair Morgenstern 2024-02-27 19:38:14 +02:00
parent 04528696f7
commit 4f5fdf1727
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/com/unciv/logic/city/CityResources.kt
View File

@ -21,7 +21,7 @@ object CityResources {
manageCityResourcesRequiredByBuildings(city, cityResources) manageCityResourcesRequiredByBuildings(city, cityResources)
getCityResourcesFromUniqueBuildings(city, cityResources, resourceModifer) getCityResourcesFromCiv(city, cityResources, resourceModifer)
if (city.civ.isCityState() && city.isCapital() && city.civ.cityStateResource != null) { if (city.civ.isCityState() && city.isCapital() && city.civ.cityStateResource != null) {
cityResources.add( cityResources.add(
@ -33,7 +33,6 @@ object CityResources {
return cityResources return cityResources
} }
/** Gets the number of resources available to this city /** Gets the number of resources available to this city
* Accommodates both city-wide and civ-wide resources */ * Accommodates both city-wide and civ-wide resources */
fun getResourceAmount(city: City, resourceName: String): Int { fun getResourceAmount(city: City, resourceName: String): Int {
@ -82,9 +81,9 @@ object CityResources {
} }
} }
private fun getCityResourcesFromUniqueBuildings(city: City, cityResources: ResourceSupplyList, resourceModifer: HashMap<String, Float>) { private fun getCityResourcesFromCiv(city: City, cityResources: ResourceSupplyList, resourceModifer: HashMap<String, Float>) {
for (unique in city.cityConstructions.builtBuildingUniqueMap // This includes the uniques from buildings, from this and all other cities
.getMatchingUniques(UniqueType.ProvidesResources, StateForConditionals(city.civ, city))) { // E.G "Provides [1] [Iron]" for (unique in city.civ.getMatchingUniques(UniqueType.ProvidesResources, StateForConditionals(city.civ, city))) { // E.G "Provides [1] [Iron]"
val resource = city.getRuleset().tileResources[unique.params[1]] val resource = city.getRuleset().tileResources[unique.params[1]]
?: continue ?: continue
cityResources.add( cityResources.add(

5
docs/Modders/uniques.md
View File

@ -2084,6 +2084,11 @@ Simple unique parameters are explained by mouseover. Complex parameters are expl
Applicable to: Conditional Applicable to: Conditional
??? example "&lt;in cities with [amount] [populationFilter]&gt;"
Example: "&lt;in cities with [3] [Followers of this Religion]&gt;"
Applicable to: Conditional
??? example "&lt;with a garrison&gt;" ??? example "&lt;with a garrison&gt;"
Applicable to: Conditional Applicable to: Conditional