mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-02-11 11:28:03 +07:00
Code Issues Packages Projects Releases Wiki Activity

Extended use for "in [tileFilter] tiles" conditionals (#5827)

Browse Source 
* Changed 'in [tileFilter] tiles' to also apply outside of combat

* Changed unique docs writer to also sort applicables, so these are also not regenerated constantly
This commit is contained in:
Xander Lenstra 2021-12-20 12:53:03 +01:00 committed by GitHub
parent b7804c0bf6
commit c9628c7fa7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -87,13 +87,17 @@ class Unique(val text: String, val sourceObjectType: UniqueTarget? = null, val s
state.ourCombatant != null && state.ourCombatant.getHealth() > condition.params[0].toInt()
UniqueType.ConditionalBelowHP ->
state.ourCombatant != null && state.ourCombatant.getHealth() < condition.params[0].toInt()
UniqueType.ConditionalInTiles,
UniqueType.ConditionalInTiles ->
(state.attackedTile != null && state.attackedTile.matchesFilter(condition.params[0]))
|| (state.unit != null && state.unit.getTile().matchesFilter(condition.params[0]))
UniqueType.ConditionalFightingInTiles ->
state.attackedTile != null && state.attackedTile.matchesFilter(condition.params[0])
UniqueType.ConditionalInTilesAnd ->
state.attackedTile != null && state.attackedTile.matchesFilter(condition.params[0]) && state.attackedTile.matchesFilter(condition.params[1])
(state.attackedTile != null && state.attackedTile.matchesFilter(condition.params[0]) && state.attackedTile.matchesFilter(condition.params[1]))
|| (state.unit != null && state.unit.getTile().matchesFilter(condition.params[0]) && state.unit.getTile().matchesFilter(condition.params[1]))
UniqueType.ConditionalInTilesNot ->
state.attackedTile != null && !state.attackedTile.matchesFilter(condition.params[0])
|| (state.unit != null && !state.unit.getTile().matchesFilter(condition.params[0]))
UniqueType.ConditionalVsLargerCiv -> {
val yourCities = state.civInfo?.cities?.size ?: 1
val theirCities = state.theirCombatant?.getCivInfo()?.cities?.size ?: 0

2
desktop/src/com/unciv/app/desktop/UniqueDocsWriter.kt
View File

@ -56,7 +56,7 @@ class UniqueDocsWriter {
lines += "#### $uniqueText"
if (uniqueType.text.contains('['))
lines += "Example: \"${replaceExamples(uniqueText)}\"\n"
lines += "Applicable to: " + uniqueType.targetTypes.joinToString()
lines += "Applicable to: " + uniqueType.targetTypes.sorted().joinToString()
lines += ""
}
}

40
docs/uniques.md
View File

@ -18,7 +18,7 @@
#### [stats]
Example: "[+1 Gold, +2 Production]"
Applicable to: Improvement, Global, FollowerBelief
Applicable to: Global, FollowerBelief, Improvement
#### [stats] [cityFilter]
Example: "[+1 Gold, +2 Production] [in all cities]"
@ -88,7 +88,7 @@ Applicable to: Global
#### [amount]% Production when constructing [buildingFilter] wonders [cityFilter]
Example: "[20]% Production when constructing [buildingFilter] wonders [in all cities]"
Applicable to: Resource, Global, FollowerBelief
Applicable to: Global, FollowerBelief, Resource
#### [amount]% Production when constructing [buildingFilter] buildings [cityFilter]
Example: "[20]% Production when constructing [buildingFilter] buildings [in all cities]"
@ -218,25 +218,25 @@ Applicable to: Global
#### [amount]% Strength
Example: "[20]% Strength"
Applicable to: Unit, Global
Applicable to: Global, Unit
#### [amount] Movement
Example: "[20] Movement"
Applicable to: Unit, Global
Applicable to: Global, Unit
#### [amount] Sight
Example: "[20] Sight"
Applicable to: Unit, Global, Terrain
Applicable to: Global, Unit, Terrain
#### [amount]% Spread Religion Strength
Example: "[20]% Spread Religion Strength"
Applicable to: Unit, Global
Applicable to: Global, Unit
#### Normal vision when embarked
Applicable to: Unit, Global
Applicable to: Global, Unit
#### Free [baseUnitFilter] appears
Example: "Free [Melee] appears"
@ -344,38 +344,38 @@ Applicable to: Building
#### Consumes [amount] [resource]
Example: "Consumes [20] [Iron]"
Applicable to: Unit, Improvement, Building
Applicable to: Building, Unit, Improvement
#### Provides [amount] [resource]
Example: "Provides [20] [Iron]"
Applicable to: Improvement, Building
Applicable to: Building, Improvement
#### Unbuildable
Applicable to: Unit, Building
Applicable to: Building, Unit
#### Cannot be purchased
Applicable to: Unit, Building
Applicable to: Building, Unit
#### Can be purchased with [stat] [cityFilter]
Example: "Can be purchased with [Culture] [in all cities]"
Applicable to: Unit, Building
Applicable to: Building, Unit
#### Can be purchased for [amount] [stat] [cityFilter]
Example: "Can be purchased for [20] [Culture] [in all cities]"
Applicable to: Unit, Building
Applicable to: Building, Unit
#### Limited to [amount] per Civilization
Example: "Limited to [20] per Civilization"
Applicable to: Unit, Building
Applicable to: Building, Unit
#### Hidden until [amount] social policy branches have been completed
Example: "Hidden until [20] social policy branches have been completed"
Applicable to: Unit, Building
Applicable to: Building, Unit
#### Cost increases by [amount] per owned city
Example: "Cost increases by [20] per owned city"
@ -400,7 +400,7 @@ Applicable to: Building
#### Not displayed as an available construction without [buildingName/tech/resource/policy]
Example: "Not displayed as an available construction without [buildingName/tech/resource/policy]"
Applicable to: Unit, Building
Applicable to: Building, Unit
#### Must be on [terrainFilter]
Example: "Must be on [Grassland]"
@ -426,12 +426,12 @@ Applicable to: Building
Applicable to: Building
#### Hidden when religion is disabled
Applicable to: Unit, Ruins, Building
Applicable to: Building, Unit, Ruins
#### Hidden when [victoryType] Victory is disabled
Example: "Hidden when [victoryType] Victory is disabled"
Applicable to: Unit, Building
Applicable to: Building, Unit
## Unit uniques
#### Founds a new city
@ -607,7 +607,7 @@ Applicable to: Terrain
Applicable to: Terrain
#### Tile provides yield without assigned population
Applicable to: Improvement, Terrain
Applicable to: Terrain, Improvement
#### Nullifies all other stats this tile provides
Applicable to: Terrain
@ -667,7 +667,7 @@ Example: "Considered [terrainQuality] when determining start locations"
Applicable to: Terrain
#### Doesn't generate naturally
Applicable to: Resource, Terrain
Applicable to: Terrain, Resource
#### Occurs at temperature between [amount] and [amount] and humidity between [amount] and [amount]
Example: "Occurs at temperature between [20] and [20] and humidity between [20] and [20]"