Unified & generalized a few uniques (#6379)

* Generalized trade route percent bonuses

* Unified two uniques using populationFilter; deprecated a deprecated uniq

* Made some renamings to improve clarity & fixed tests

* Fixed tests again

* Fixed typo
This commit is contained in:
Xander Lenstra
2022-03-21 20:05:20 +01:00
committed by GitHub
parent 2b1251258c
commit 984c4d9b2d
14 changed files with 103 additions and 71 deletions

View File

@ -98,6 +98,12 @@ It can be any value noted in `baseUnitFilter` or one of the following:
- `Barbarians`, `Barbarian`
- Again, any combination of the above is also allowed, e.g. `[{Wounded} {Water}]` units.
## populationFilter
A filter determining a part of the population of a city. It can be any of the following values:
- `Population`
- `Specialists`
- `Unemployed`
- `Followers of the Majority Religion` or `Followers of this Religion`, both of which only apply when this religion is the majority religion in that city
## regionType
Used for dividing the world into regions in each of which a single player is placed at the start of the game.

View File

@ -71,7 +71,7 @@ Simple unique parameters are explained by mouseover. Complex parameters are expl
??? example "[stats]"
Example: "[+1 Gold, +2 Production]"
Applicable to: Global, FollowerBelief, Improvement
Applicable to: Global, FollowerBelief, Terrain, Improvement
??? example "[stats] [cityFilter]"
Example: "[+1 Gold, +2 Production] [in all cities]"
@ -88,11 +88,6 @@ Simple unique parameters are explained by mouseover. Complex parameters are expl
Applicable to: Global, FollowerBelief
??? example "[stats] in cities with [amount] or more population"
Example: "[+1 Gold, +2 Production] in cities with [20] or more population"
Applicable to: Global, FollowerBelief
??? example "[stats] in cities on [terrainFilter] tiles"
Example: "[+1 Gold, +2 Production] in cities on [Forest] tiles"
@ -153,7 +148,9 @@ Simple unique parameters are explained by mouseover. Complex parameters are expl
Applicable to: Global
??? example "Gold from all trade routes +25%"
??? example "[amount]% [stat] from Trade Routes"
Example: "[20]% [Culture] from Trade Routes"
Applicable to: Global
??? example "Nullifies [stat] [cityFilter]"
@ -273,11 +270,6 @@ Simple unique parameters are explained by mouseover. Complex parameters are expl
Applicable to: Global, FollowerBelief
??? example "[amount]% great person generation [cityFilter]"
Example: "[20]% great person generation [in all cities]"
Applicable to: Global, FollowerBelief
??? example "May choose [amount] additional [beliefType] beliefs when [foundingOrEnhancing] a religion"
Example: "May choose [20] additional [Follower] beliefs when [founding] a religion"
@ -288,13 +280,8 @@ Simple unique parameters are explained by mouseover. Complex parameters are expl
Applicable to: Global
??? example "[amount]% unhappiness from population [cityFilter]"
Example: "[20]% unhappiness from population [in all cities]"
Applicable to: Global, FollowerBelief
??? example "[amount]% unhappiness from specialists [cityFilter]"
Example: "[20]% unhappiness from specialists [in all cities]"
??? example "[amount]% Unhappiness from [populationFilter] [cityFilter]"
Example: "[20]% Unhappiness from [populationFilter] [in all cities]"
Applicable to: Global, FollowerBelief
@ -1555,13 +1542,8 @@ Simple unique parameters are explained by mouseover. Complex parameters are expl
Applicable to: Conditional
??? example "<if this city has at least [amount] specialists>"
Example: "<if this city has at least [20] specialists>"
Applicable to: Conditional
??? example "<in cities where this religion has at least [amount] followers>"
Example: "<in cities where this religion has at least [20] followers>"
??? example "<in cities with at least [amount] [populationFilter]>"
Example: "<in cities with at least [20] [populationFilter]>"
Applicable to: Conditional