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

Resolved #3035 - added nationsToRemove in modOptions

Browse Source
This commit is contained in:
Yair Morgenstern
2020-08-27 11:51:20 +03:00
parent 2c66b53b27
commit d2e914473a
2 changed files with 30 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,6 +29,7 @@ class ModOptions {
var techsToRemove = HashSet<String>() var techsToRemove = HashSet<String>()
var buildingsToRemove = HashSet<String>() var buildingsToRemove = HashSet<String>()
var unitsToRemove = HashSet<String>() var unitsToRemove = HashSet<String>()
var nationsToRemove = HashSet<String>()
var uniques = HashSet<String>() var uniques = HashSet<String>()
} }
@ -77,6 +78,7 @@ class Ruleset {
unitPromotions.putAll(ruleset.unitPromotions) unitPromotions.putAll(ruleset.unitPromotions)
units.putAll(ruleset.units) units.putAll(ruleset.units)
for (unitToRemove in ruleset.modOptions.unitsToRemove) units.remove(unitToRemove) for (unitToRemove in ruleset.modOptions.unitsToRemove) units.remove(unitToRemove)
for (nationToRemove in ruleset.modOptions.unitsToRemove) nations.remove(nationToRemove)
mods += ruleset.mods mods += ruleset.mods
} }
@ -103,8 +105,8 @@ class Ruleset {
if (modOptionsFile.exists()) { if (modOptionsFile.exists()) {
try { try {
modOptions = jsonParser.getFromJson(ModOptions::class.java, modOptionsFile) modOptions = jsonParser.getFromJson(ModOptions::class.java, modOptionsFile)
} catch (ex: Exception) {
} }
catch (ex:Exception){}
} }
val techFile = folderHandle.child("Techs.json") val techFile = folderHandle.child("Techs.json")
@ -186,12 +188,13 @@ class Ruleset {
fun getEraNumber(era: String) = getEras().indexOf(era) fun getEraNumber(era: String) = getEras().indexOf(era)
fun getSummary(): String { fun getSummary(): String {
val stringList = ArrayList<String>() val stringList = ArrayList<String>()
if (modOptions.isBaseRuleset) stringList += "Base Ruleset\n"
if (technologies.isNotEmpty()) stringList.add(technologies.size.toString() + " Techs") if (technologies.isNotEmpty()) stringList.add(technologies.size.toString() + " Techs")
if (nations.isNotEmpty()) stringList.add(nations.size.toString() + " Nations") if (nations.isNotEmpty()) stringList.add(nations.size.toString() + " Nations")
if (units.isNotEmpty()) stringList.add(units.size.toString() + " Units") if (units.isNotEmpty()) stringList.add(units.size.toString() + " Units")
if (buildings.isNotEmpty()) stringList.add(buildings.size.toString() + " Buildings") if (buildings.isNotEmpty()) stringList.add(buildings.size.toString() + " Buildings")
if (tileResources.isNotEmpty()) stringList.add(tileResources.size.toString() + " Resources") if (tileResources.isNotEmpty()) stringList.add(tileResources.size.toString() + " Resources")
if (tileImprovements.isNotEmpty()) stringList.add(tileResources.size.toString() + " Improvements") if (tileImprovements.isNotEmpty()) stringList.add(tileImprovements.size.toString() + " Improvements")
stringList += "" stringList += ""
return stringList.joinToString() return stringList.joinToString()
} }

8
core/src/com/unciv/ui/pickerscreens/ModManagementScreen.kt
View File

@ -43,7 +43,13 @@ class ModManagementScreen: PickerScreen() {
removeRightSideClickListeners() removeRightSideClickListeners()
rightSideButton.enable() rightSideButton.enable()
rightSideButton.setText("Download [${repo.name}]".tr()) rightSideButton.setText("Download [${repo.name}]".tr())
rightSideButton.onClick { downloadMod(repo.svn_url) } rightSideButton.onClick {
rightSideButton.setText("Downloading...")
rightSideButton.disable()
downloadMod(repo.svn_url){
rightSideButton.setText("Done!".tr())
}
}
} }
downloadTable.add(downloadButton).row() downloadTable.add(downloadButton).row()
} }