AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-24 03:53:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

the word 'default' is misleading since it's an overrider

Browse Source
This commit is contained in:
yairm210 2024-08-04 10:22:37 +03:00
parent e01ba625ba
commit 4e51c94fa4
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/com/unciv/models/ruleset/ModOptions.kt
View File

@ -14,8 +14,8 @@ class ModOptions : IHasUniques {
var unitsToRemove = HashSet<String>()
var nationsToRemove = HashSet<String>()
val constants = ModConstants()
var defaultUnitset: String? = null
var defaultTileset: String? = null
var unitset: String? = null
var tileset: String? = null
//endregion
//region Metadata, automatic

4
core/src/com/unciv/models/ruleset/RulesetCache.kt
View File

@ -150,8 +150,8 @@ object RulesetCache : HashMap<String, Ruleset>() {
newRuleset.modOptions.uniques = ArrayList()
newRuleset.modOptions.isBaseRuleset = true
// Default tileset and unitset are according to base ruleset
newRuleset.modOptions.defaultTileset = mod.modOptions.defaultTileset
newRuleset.modOptions.defaultUnitset = mod.modOptions.defaultUnitset
newRuleset.modOptions.tileset = mod.modOptions.tileset
newRuleset.modOptions.unitset = mod.modOptions.unitset
}
newRuleset.add(mod)
newRuleset.mods += mod.name

4
core/src/com/unciv/ui/components/tilegroups/TileSetStrings.kt
View File

@ -34,8 +34,8 @@ class TileSetStrings(
) {
constructor(ruleset: Ruleset, settings: GameSettings) : this(
ruleset.modOptions.defaultTileset ?: settings.tileSet,
ruleset.modOptions.defaultUnitset ?: settings.unitSet
ruleset.modOptions.tileset ?: settings.tileSet,
ruleset.modOptions.unitset ?: settings.unitSet
)

4
docs/Modders/Mod-file-structure/5-Miscellaneous-JSON-files.md
View File

@ -162,8 +162,8 @@ The file can have the following attributes, not including the values Unciv sets
| unitsToRemove | List | empty | List of [Units](4-Unit-related-JSON-files.md#unitsjson) or [unitFilter](../../Unique-parameters.md#baseunitfilter) to remove (isBaseRuleset=false only) |
| nationsToRemove | List | empty | List of [Nations](2-Civilization-related-JSON-files.md#nationsjson) or [nationFilter](../../Unique-parameters.md#nationfilter) to remove (isBaseRuleset=false only) |
| constants | Object | empty | See [ModConstants](#modconstants) |
| defaultTileset | String | empty | Only applicable for base rulesets |
| defaultUnitset | String | empty | Only applicable for base rulesets |
| tileset | String | empty | Only applicable for base rulesets |
| unitset | String | empty | Only applicable for base rulesets |
The values normally set automatically from github metadata are: