mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-04 15:27:50 +07:00
Code Issues Packages Projects Releases Wiki Activity

Pre-solved potential bugs, unique typing for deprecated uniques

Browse Source
This commit is contained in:
yairm210
2021-11-14 00:16:01 +02:00
parent 297c3d8ba6
commit f3115d9f03
6 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/com/unciv/logic/BackwardCompatibility.kt
View File

@ -70,11 +70,7 @@ object BackwardCompatibility {
if (!ruleSet.technologies.containsKey(tech))
civInfo.tech.techsResearched.remove(tech)
for (policy in civInfo.policies.adoptedPolicies.toList())
if (!ruleSet.policies.containsKey(policy)
// Conversion code for deprecated policies since 3.16.15
&& !(policy == "Patronage " || policy == "Patronage Complete")
//
)
if (!ruleSet.policies.containsKey(policy))
civInfo.policies.adoptedPolicies.remove(policy)
}
}

2
core/src/com/unciv/logic/battle/Battle.kt
View File

@ -37,7 +37,7 @@ object Battle {
/** Alternatively, maybe we DID reach that tile, but it turned out to be a hill or something,
* so we expended all of our movement points!
*/
if (attacker.unit.currentMovement != attackableTile.movementLeftAfterMovingToAttackTile)
if (attacker.unit.currentMovement == 0f)
return
if (attacker.unit.hasUnique(UniqueType.MustSetUp) && !attacker.unit.isSetUpForSiege()) {
attacker.unit.action = UnitActionType.SetUp.value

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

@ -614,11 +614,11 @@ class CityStats(val cityInfo: CityInfo) {
var foodEatenBySpecialists = 2f * cityInfo.population.getNumberOfSpecialists()
// Deprecated since 3.16.11
for (unique in cityInfo.civInfo.getMatchingUniques("-[]% food consumption by specialists"))
for (unique in cityInfo.civInfo.getMatchingUniques(UniqueType.FoodConsumptionBySpecialistsDeprecated))
foodEatenBySpecialists *= 1f - unique.params[0].toFloat() / 100f
//
for (unique in cityInfo.getMatchingUniques("[]% food consumption by specialists []"))
for (unique in cityInfo.getMatchingUniques(UniqueType.FoodConsumptionBySpecialists))
if (cityInfo.matchesFilter(unique.params[1]))
foodEatenBySpecialists *= unique.params[0].toPercent()

2
core/src/com/unciv/logic/civilization/CivInfoStats.kt
View File

@ -182,7 +182,7 @@ class CivInfoStats(val civInfo: CivilizationInfo) {
}
// Deprecated since 3.16.15
if (civInfo.hasUnique("50% of excess happiness added to culture towards policies")) {
if (civInfo.hasUnique(UniqueType.ExcessHappinessToCultureDeprecated)) {
val happiness = civInfo.getHappiness()
if (happiness > 0) statMap.add("Policies", Stats(culture = happiness / 2f))
}

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

@ -155,6 +155,15 @@ enum class UniqueType(val text:String, vararg targets: UniqueTarget, val flags:
FreeExtraBeliefs("May choose [amount] additional [beliefType] beliefs when [foundingOrEnhancing] a religion", UniqueTarget.Global),
FreeExtraAnyBeliefs("May choose [amount] additional belief(s) of any type when [foundingOrEnhancing] a religion", UniqueTarget.Global),
FoodConsumptionBySpecialists("[amount]% food consumption by specialists [cityFilter]", UniqueTarget.Global),
@Deprecated("As of 3.18.2", ReplaceWith("[-amount]% food consumption by specialists [cityFilter]"), DeprecationLevel.WARNING)
FoodConsumptionBySpecialistsDeprecated("-[amount]% food consumption by specialists [cityFilter]", UniqueTarget.Global),
ExcessHappinessToGlobalStat("[amount]% of excess happiness converted to [stat]", UniqueTarget.Global),
@Deprecated("As of 3.18.2", ReplaceWith("[50]% of excess happiness converted to [Culture]"), DeprecationLevel.WARNING)
ExcessHappinessToCultureDeprecated("50% of excess happiness added to culture towards policies", UniqueTarget.Global),
// There is potential to merge these
BuyUnitsIncreasingCost("May buy [baseUnitFilter] units for [amount] [stat] [cityFilter] at an increasing price ([amount])", UniqueTarget.Global),
BuyBuildingsIncreasingCost("May buy [buildingFilter] buildings for [amount] [stat] [cityFilter] at an increasing price ([amount])", UniqueTarget.Global),

2
core/src/com/unciv/models/tilesets/TileSetCache.kt
View File

@ -22,8 +22,8 @@ object TileSetCache : HashMap<String, TileSetConfig>() {
val mods = mutableListOf("")
if (UncivGame.isCurrentInitialized()) {
mods.addAll(UncivGame.Current.settings.visualMods)
mods.addAll(ruleSetMods)
}
mods.addAll(ruleSetMods)
clear()
for (mod in mods.distinct()) {
val entry = allConfigs.entries.firstOrNull { it.key.mod == mod } ?: continue