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

Added ruleset check for units whose type is not defined in the unitTypes

Browse Source
This commit is contained in:
yairm210
2021-08-11 20:40:44 +03:00
parent 85ecddad2f
commit a08a0e1489
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/com/unciv/logic/civilization/CivilizationInfo.kt
View File

@ -369,7 +369,9 @@ class CivilizationInfo {
otherCiv.addNotification(meetString, cityStateLocation, NotificationIcon.Gold) otherCiv.addNotification(meetString, cityStateLocation, NotificationIcon.Gold)
else else
otherCiv.addNotification(meetString, NotificationIcon.Gold) otherCiv.addNotification(meetString, NotificationIcon.Gold)
otherCiv.addStats(giftAmount)
for (stat in giftAmount.toHashMap().filter { it.value != 0f })
otherCiv.addStat(stat.key, stat.value.toInt())
} }
fun discoverNaturalWonder(naturalWonderName: String) { fun discoverNaturalWonder(naturalWonderName: String) {

6
core/src/com/unciv/models/ruleset/Ruleset.kt
View File

@ -289,6 +289,7 @@ class Ruleset {
fun isError() = status == CheckModLinksStatus.Error fun isError() = status == CheckModLinksStatus.Error
fun isNotOK() = status != CheckModLinksStatus.OK fun isNotOK() = status != CheckModLinksStatus.OK
} }
fun checkModLinks(): CheckModLinksResult { fun checkModLinks(): CheckModLinksResult {
val lines = ArrayList<String>() val lines = ArrayList<String>()
var warningCount = 0 var warningCount = 0
@ -338,8 +339,9 @@ class Ruleset {
lines += "${unit.name} replaces ${unit.replaces} which does not exist!" lines += "${unit.name} replaces ${unit.replaces} which does not exist!"
for (promotion in unit.promotions) for (promotion in unit.promotions)
if (!unitPromotions.containsKey(promotion)) if (!unitPromotions.containsKey(promotion))
lines += "${unit.replaces} contains promotion $promotion which does not exist!" lines += "${unit.name} contains promotion $promotion which does not exist!"
if (!unitTypes.containsKey(unit.unitType))
lines += "${unit.name} is of type ${unit.unitType}, which does not exist!"
} }
for (building in buildings.values) { for (building in buildings.values) {