AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-24 03:53:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Resolved #8647 - fixed Guruship belief

Browse Source
This commit is contained in:
Yair Morgenstern 2023-02-12 19:34:40 +02:00
parent aaf06b7589
commit 6bcaed7947
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/assets/jsons/Civ V - Gods & Kings/Beliefs.json
View File

@ -148,7 +148,7 @@
{ {
"name": "Guruship", "name": "Guruship",
"type": "Follower", "type": "Follower",
"uniques": ["[+2 Production] <in cities with at least [1] [Specialists]>"] "uniques": ["[+2 Production] [in cities following this religion] <in cities with at least [1] [Specialists]>"]
}, },
{ {
"name": "Holy Warriors", "name": "Holy Warriors",

9
core/src/com/unciv/models/ruleset/tech/Technology.kt
View File

@ -13,7 +13,6 @@ import com.unciv.models.ruleset.unit.BaseUnit
import com.unciv.models.translations.tr import com.unciv.models.translations.tr
import com.unciv.ui.civilopedia.FormattedLine import com.unciv.ui.civilopedia.FormattedLine
import com.unciv.ui.utils.Fonts import com.unciv.ui.utils.Fonts
import java.util.*
class Technology: RulesetObject() { class Technology: RulesetObject() {
@ -38,18 +37,18 @@ class Technology: RulesetObject() {
for (unique in uniques) lineList += unique.tr() for (unique in uniques) lineList += unique.tr()
for (improvement in ruleset.tileImprovements.values) { for (improvement in ruleset.tileImprovements.values) {
for (unique in improvement.uniqueObjects) { for (unique in improvement.getMatchingUniques(UniqueType.Stats)) {
if (unique.isOfType(UniqueType.Stats)) {
val requiredTech = unique.conditionals.firstOrNull { it.isOfType(UniqueType.ConditionalTech) }?.params?.get(0) val requiredTech = unique.conditionals.firstOrNull { it.isOfType(UniqueType.ConditionalTech) }?.params?.get(0)
if (requiredTech != name) continue if (requiredTech != name) continue
lineList += "[${unique.params[0]}] from every [${improvement.name}]" lineList += "[${unique.params[0]}] from every [${improvement.name}]"
} else if (unique.isOfType(UniqueType.ImprovementStatsOnTile)) { }
for (unique in improvement.getMatchingUniques(UniqueType.ImprovementStatsOnTile)) {
val requiredTech = unique.conditionals.firstOrNull { it.isOfType(UniqueType.ConditionalTech) }?.params?.get(0) val requiredTech = unique.conditionals.firstOrNull { it.isOfType(UniqueType.ConditionalTech) }?.params?.get(0)
if (requiredTech != name) continue if (requiredTech != name) continue
lineList += "[${unique.params[0]}] from every [${improvement.name}] on [${unique.params[1]}] tiles" lineList += "[${unique.params[0]}] from every [${improvement.name}] on [${unique.params[1]}] tiles"
} }
} }
}
val viewingCiv = UncivGame.Current.worldScreen!!.viewingCiv val viewingCiv = UncivGame.Current.worldScreen!!.viewingCiv
val enabledUnits = getEnabledUnits(ruleset, viewingCiv) val enabledUnits = getEnabledUnits(ruleset, viewingCiv)