Skip to content

Commit b3f584f

Browse files
committed
Add Meziantou.Analyzer
1 parent e9d241f commit b3f584f

File tree

11 files changed

+26
-22
lines changed

11 files changed

+26
-22
lines changed

ImperatorToCK3.UnitTests/CK3/Characters/CharacterCollectionTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -263,8 +263,8 @@ public void ImperatorCountriesGoldCanBeDistributedAmongRulerAndVassals() {
263263
);
264264
var governorship1 = new Governorship(governorshipReader1, imperatorWorld.Countries, imperatorWorld.ImperatorRegionMapper);
265265
var governorship2 = new Governorship(governorshipReader2, imperatorWorld.Countries, imperatorWorld.ImperatorRegionMapper);
266-
imperatorWorld.Jobs.Governorships.Add(governorship1);
267-
imperatorWorld.Jobs.Governorships.Add(governorship2);
266+
imperatorWorld.JobsDB.Governorships.Add(governorship1);
267+
imperatorWorld.JobsDB.Governorships.Add(governorship2);
268268

269269
var titles = new Title.LandedTitles();
270270
titles.LoadTitles(new BufferedReader(@"

ImperatorToCK3.UnitTests/CK3/Titles/LandedTitlesTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ public void GovernorshipsCanBeRecognizedAsCountyLevel() {
251251
"governorship = \"galatia_region\""
252252
);
253253
var governorship1 = new Governorship(reader, imperatorWorld.Countries, impRegionMapper);
254-
imperatorWorld.Jobs.Governorships.Add(governorship1);
254+
imperatorWorld.JobsDB.Governorships.Add(governorship1);
255255
var titles = new Title.LandedTitles();
256256
titles.LoadTitles(new BufferedReader(
257257
"c_county1 = { b_barony1={province=1} } " +

ImperatorToCK3.UnitTests/Imperator/Diplomacy/DiplomacyTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public void WarWithNoDefendersIsSkipped() {
2020
3 = { previous=no defender=1 }
2121
}
2222
""");
23-
var diplomacy = new ImperatorToCK3.Imperator.Diplomacy.Diplomacy(reader);
23+
var diplomacy = new ImperatorToCK3.Imperator.Diplomacy.DiplomacyDB(reader);
2424

2525
Assert.Empty(diplomacy.Wars);
2626
var logStr = output.ToString();

ImperatorToCK3.UnitTests/Imperator/Jobs/JobsTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ public JobsTests() {
2828
}
2929
[Fact]
3030
public void GovernorshipsDefaultToEmpty() {
31-
var jobs = new ImperatorToCK3.Imperator.Jobs.Jobs();
31+
var jobs = new ImperatorToCK3.Imperator.Jobs.JobsDB();
3232
Assert.Empty(jobs.Governorships);
3333
}
3434
[Fact]
3535
public void GovernorshipsCanBeRead() {
3636
var reader = new BufferedReader(
3737
"province_job={who=1 governorship=galatia_region} province_job={who=2 governorship=galatia_region}"
3838
);
39-
var jobs = new ImperatorToCK3.Imperator.Jobs.Jobs(reader, countryCollection, irRegionMapper);
39+
var jobs = new ImperatorToCK3.Imperator.Jobs.JobsDB(reader, countryCollection, irRegionMapper);
4040
Assert.Collection(jobs.Governorships,
4141
item1 => Assert.Equal((ulong)1, item1.Country.Id),
4242
item2 => Assert.Equal((ulong)2, item2.Country.Id)
@@ -50,7 +50,7 @@ public void IgnoredTokensAreLogged() {
5050
var reader = new BufferedReader(
5151
"useless_job = {}"
5252
);
53-
_ = new ImperatorToCK3.Imperator.Jobs.Jobs(reader, countryCollection, irRegionMapper);
53+
_ = new ImperatorToCK3.Imperator.Jobs.JobsDB(reader, countryCollection, irRegionMapper);
5454

5555
Assert.Contains("Ignored Jobs tokens: useless_job", output.ToString());
5656
}

ImperatorToCK3.UnitTests/Mappers/TagTitle/MappingTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ public void GovernorshipToDeJureDuchyMappingFailsIfDuchyIsNot60PercentControlled
113113
var irGovernorship = new Governorship(governorshipReader, irCountries, irRegionMapper);
114114
Assert.Equal(irRegionId, irGovernorship.Region.Id);
115115
Assert.Equal(irCountryId, irGovernorship.Country.Id);
116-
var jobs = new Jobs();
116+
var jobs = new JobsDB();
117117
jobs.Governorships.Add(irGovernorship);
118118

119119
const string duchyId = "d_galatia";

ImperatorToCK3/CK3/Titles/LandedTitles.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ List<Governorship> countryLevelGovernorships
353353
) {
354354
Logger.Info("Importing Imperator Governorships...");
355355

356-
var governorships = irWorld.Jobs.Governorships;
356+
var governorships = irWorld.JobsDB.Governorships;
357357
var governorshipsPerRegion = governorships.GroupBy(g => g.Region.Id)
358358
.ToDictionary(g => g.Key, g => g.Count());
359359

ImperatorToCK3/CK3/World.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ public World(Imperator.World impWorld, Configuration config) {
241241
);
242242

243243
// Give counties to rulers and governors.
244-
OverwriteCountiesHistory(impWorld.Jobs.Governorships, countyLevelGovernorships, impWorld.Characters, impWorld.Provinces, CorrectedDate);
244+
OverwriteCountiesHistory(impWorld.JobsDB.Governorships, countyLevelGovernorships, impWorld.Characters, impWorld.Provinces, CorrectedDate);
245245
// Import holding owners as barons and counts.
246246
LandedTitles.ImportImperatorHoldings(Provinces, impWorld.Characters, CorrectedDate);
247247

ImperatorToCK3/Imperator/Diplomacy/Diplomacy.cs renamed to ImperatorToCK3/Imperator/Diplomacy/DiplomacyDB.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55

66
namespace ImperatorToCK3.Imperator.Diplomacy;
77

8-
public class Diplomacy {
9-
public List<War> Wars { get; } = new();
10-
public Diplomacy(BufferedReader reader) {
8+
public class DiplomacyDB {
9+
public IList<War> Wars { get; } = new List<War>();
10+
public DiplomacyDB(BufferedReader reader) {
1111
var parser = new Parser();
1212
parser.RegisterKeyword("database", databaseReader => {
1313
var databaseParser = new Parser();

ImperatorToCK3/Imperator/Jobs/Jobs.cs renamed to ImperatorToCK3/Imperator/Jobs/JobsDB.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66

77
namespace ImperatorToCK3.Imperator.Jobs;
88

9-
public class Jobs {
10-
public List<Governorship> Governorships { get; } = new();
9+
public class JobsDB {
10+
public IList<Governorship> Governorships { get; } = new List<Governorship>();
1111

12-
public Jobs() { }
13-
public Jobs(BufferedReader jobsReader, CountryCollection countries, ImperatorRegionMapper irRegionMapper) {
12+
public JobsDB() { }
13+
public JobsDB(BufferedReader jobsReader, CountryCollection countries, ImperatorRegionMapper irRegionMapper) {
1414
var ignoredTokens = new IgnoredKeywordsSet();
1515
var parser = new Parser();
1616
parser.RegisterKeyword("province_job", reader => {

ImperatorToCK3/Imperator/World.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ public class World : Parser {
4646
public AreaCollection Areas { get; } = new();
4747
public ImperatorRegionMapper ImperatorRegionMapper { get; }
4848
public StateCollection States { get; } = new();
49-
public List<War> Wars { get; private set; } = new();
50-
public Jobs.Jobs Jobs { get; private set; } = new();
49+
public IList<War> Wars { get; private set; } = new List<War>();
50+
public Jobs.JobsDB JobsDB { get; private set; } = new();
5151
public UnitCollection Units { get; } = new();
5252
public CulturesDB CulturesDB { get; } = new();
5353
public ReligionCollection Religions { get; private set; }
@@ -193,14 +193,14 @@ public World(Configuration config, ConverterVersion converterVersion): this(conf
193193
});
194194
RegisterKeyword("diplomacy", reader => {
195195
Logger.Info("Loading diplomacy...");
196-
var diplomacy = new Diplomacy.Diplomacy(reader);
196+
var diplomacy = new Diplomacy.DiplomacyDB(reader);
197197
Wars = diplomacy.Wars;
198198
Logger.IncrementProgress();
199199
});
200200
RegisterKeyword("jobs", reader => {
201201
Logger.Info("Loading Jobs...");
202-
Jobs = new Jobs.Jobs(reader, Countries, ImperatorRegionMapper);
203-
Logger.Info($"Loaded {Jobs.Governorships.Capacity} governorships.");
202+
JobsDB = new Jobs.JobsDB(reader, Countries, ImperatorRegionMapper);
203+
Logger.Info($"Loaded {JobsDB.Governorships.Count} governorships.");
204204
Logger.IncrementProgress();
205205
});
206206
RegisterKeyword("deity_manager", reader => {

0 commit comments

Comments
 (0)