Skip to content

Commit 0a2f90f

Browse files
authored
Automatically correct CK3 bookmark date if earlier than corrected save date (ParadoxGameConverters#1216)
1 parent 4182135 commit 0a2f90f

4 files changed

Lines changed: 8 additions & 7 deletions

File tree

ImperatorToCK3/CK3/World.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@ public World(Imperator.World impWorld, Configuration config) {
6464
config.CK3BookmarkDate = CorrectedDate;
6565
Logger.Info($"CK3 bookmark date set to: {config.CK3BookmarkDate}");
6666
} else if (CorrectedDate > config.CK3BookmarkDate) {
67-
Logger.Error("Corrected save date is later than CK3 bookmark date, proceeding at your own risk!");
67+
Logger.Warn($"Corrected save can't be later than CK3 bookmark date, setting CK3 bookmark date to {CorrectedDate}!");
68+
config.CK3BookmarkDate = CorrectedDate;
6869
}
6970

7071
LoadCorrectProvinceMappingsVersion(impWorld);

ImperatorToCK3/Mappers/Region/CK3RegionMapper.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public bool RegionNameIsValid(string regionName) {
7272
return countyName;
7373
}
7474
}
75-
Logger.Warn($"Province ID {provinceId} has no parent county name!");
75+
Logger.Warn($"CK3 province ID {provinceId} has no parent county name!");
7676
return null;
7777
}
7878
public string? GetParentDuchyName(ulong provinceId) {
@@ -81,7 +81,7 @@ public bool RegionNameIsValid(string regionName) {
8181
return duchyName;
8282
}
8383
}
84-
Logger.Warn($"Province ID {provinceId} has no parent duchy name!");
84+
Logger.Warn($"CK3 province ID {provinceId} has no parent duchy name!");
8585
return null;
8686
}
8787
public string? GetParentRegionName(ulong provinceId) {
@@ -90,7 +90,7 @@ public bool RegionNameIsValid(string regionName) {
9090
return regionName;
9191
}
9292
}
93-
Logger.Warn($"Province ID {provinceId} has no parent region name!");
93+
Logger.Warn($"CK3 province ID {provinceId} has no parent region name!");
9494
return null;
9595
}
9696

ImperatorToCK3/Mappers/Region/ImperatorRegionMapper.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public bool RegionNameIsValid(string regionName) {
4848
return region.Id;
4949
}
5050
}
51-
Logger.Warn($"Province ID {provinceId} has no parent region name!");
51+
Logger.Warn($"I:R province ID {provinceId} has no parent region name!");
5252
return null;
5353
}
5454
public string? GetParentAreaName(ulong provinceId) {
@@ -57,7 +57,7 @@ public bool RegionNameIsValid(string regionName) {
5757
return area.Id;
5858
}
5959
}
60-
Logger.Warn($"Province ID {provinceId} has no parent area name!");
60+
Logger.Warn($"I:R province ID {provinceId} has no parent area name!");
6161
return null;
6262
}
6363
private void LinkRegions() {

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "7.0.102",
3+
"version": "7.0.200",
44
"rollForward": "disable"
55
}
66
}

0 commit comments

Comments
 (0)