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

Resolved #10005 - Great person points for units not in ruleset are ignored, and warned against

Browse Source
This commit is contained in:
Yair Morgenstern
2023-08-30 23:10:14 +03:00
parent 713c5968b8
commit 5585dfa470
3 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -364,6 +364,10 @@ class City : IsPartOfGameInfoSerialization {
val gppCounter = Counter<String>() val gppCounter = Counter<String>()
for (entry in getGreatPersonPointsForNextTurn().values) for (entry in getGreatPersonPointsForNextTurn().values)
gppCounter.add(entry) gppCounter.add(entry)
// Remove all "gpp" values that are not valid units
for (key in gppCounter.keys.toSet())
if (key !in getRuleset().units)
gppCounter.remove(key)
return gppCounter return gppCounter
} }

12
core/src/com/unciv/models/ruleset/validation/RulesetValidator.kt
View File

@ -89,6 +89,11 @@ class RulesetValidator(val ruleset: Ruleset) {
lines.add("${building.name} is buildable and therefore should either have an explicit cost or reference an existing tech!", lines.add("${building.name} is buildable and therefore should either have an explicit cost or reference an existing tech!",
RulesetErrorSeverity.Warning) RulesetErrorSeverity.Warning)
for (gpp in building.greatPersonPoints)
if (gpp.key !in ruleset.units)
lines.add("Building ${building.name} has greatPersonPoints for ${gpp.key}, which is not a unit in the ruleset!",
RulesetErrorSeverity.Warning)
checkUniques(building, lines, rulesetInvariant, tryFixUnknownUniques) checkUniques(building, lines, rulesetInvariant, tryFixUnknownUniques)
} }
@ -234,6 +239,13 @@ class RulesetValidator(val ruleset: Ruleset) {
checkUniques(building, lines, rulesetSpecific, tryFixUnknownUniques) checkUniques(building, lines, rulesetSpecific, tryFixUnknownUniques)
} }
for (specialist in ruleset.specialists.values){
for (gpp in specialist.greatPersonPoints)
if (gpp.key !in ruleset.units)
lines.add("Specialist ${specialist.name} has greatPersonPoints for ${gpp.key}, which is not a unit in the ruleset!",
RulesetErrorSeverity.Warning)
}
for (resource in ruleset.tileResources.values) { for (resource in ruleset.tileResources.values) {
if (resource.revealedBy != null && !ruleset.technologies.containsKey(resource.revealedBy!!)) if (resource.revealedBy != null && !ruleset.technologies.containsKey(resource.revealedBy!!))
lines += "${resource.name} revealed by tech ${resource.revealedBy} which does not exist!" lines += "${resource.name} revealed by tech ${resource.revealedBy} which does not exist!"

4
tests/src/com/unciv/uniques/ResourceTests.kt
View File

@ -99,7 +99,7 @@ class ResourceTests {
fun testImprovementProvidesResourceEvenWithoutTech() { fun testImprovementProvidesResourceEvenWithoutTech() {
val tile = game.tileMap[1,1] val tile = game.tileMap[1,1]
val improvement = game.createTileImprovement("Provides [1] [Coal]", "Consumes [1] [Silver]") val improvement = game.createTileImprovement("Provides [1] [Coal]", "Consumes [1] [Silver]")
tile.changeImprovement(improvement.name) tile.changeImprovement(improvement.name, civInfo)
Assert.assertTrue(civInfo.getCivResourcesByName()["Coal"] == 1) Assert.assertTrue(civInfo.getCivResourcesByName()["Coal"] == 1)
Assert.assertTrue(civInfo.getCivResourcesByName()["Silver"] == -1) Assert.assertTrue(civInfo.getCivResourcesByName()["Silver"] == -1)
} }
@ -109,7 +109,7 @@ class ResourceTests {
fun testImprovementProvidesResourceWithUniqueBonuses() { fun testImprovementProvidesResourceWithUniqueBonuses() {
val tile = game.tileMap[1,1] val tile = game.tileMap[1,1]
val improvement = game.createTileImprovement("Provides [1] [Coal]") val improvement = game.createTileImprovement("Provides [1] [Coal]")
tile.changeImprovement(improvement.name) tile.changeImprovement(improvement.name, civInfo)
Assert.assertTrue(civInfo.getCivResourcesByName()["Coal"] == 1) Assert.assertTrue(civInfo.getCivResourcesByName()["Coal"] == 1)
val doubleCoal = game.createBuilding("Double quantity of [Coal] produced") val doubleCoal = game.createBuilding("Double quantity of [Coal] produced")