wbrawner/Unciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resolved #2381 - can now remove buildings and units as well, test'D, wiki'D and example'D

Browse source
This commit is contained in:
Yair Morgenstern 2020-04-13 11:57:49 +03:00
parent 546345c353
commit fdb3d69869
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -16,6 +16,8 @@ import kotlin.collections.set
class ModOptions {
var techsToRemove = HashSet<String>()
var buildingsToRemove = HashSet<String>()
var unitsToRemove = HashSet<String>()
}
class Ruleset {
@ -51,17 +53,18 @@ class Ruleset {
fun add(ruleset: Ruleset) {
buildings.putAll(ruleset.buildings)
for(techToRemove in ruleset.modOptions.techsToRemove) technologies.remove(techToRemove)
for(buildingToRemove in ruleset.modOptions.buildingsToRemove) buildings.remove(buildingToRemove)
difficulties.putAll(ruleset.difficulties)
nations.putAll(ruleset.nations)
policyBranches.putAll(ruleset.policyBranches)
technologies.putAll(ruleset.technologies)
buildings.putAll(ruleset.buildings)
for(techToRemove in ruleset.modOptions.techsToRemove) technologies.remove(techToRemove)
terrains.putAll(ruleset.terrains)
tileImprovements.putAll(ruleset.tileImprovements)
tileResources.putAll(ruleset.tileResources)
unitPromotions.putAll(ruleset.unitPromotions)
units.putAll(ruleset.units)
for(unitToRemove in ruleset.modOptions.unitsToRemove) units.remove(unitToRemove)
}
fun clear() {