Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions Source/MapComponents/MapComponent_RenderManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -809,7 +809,7 @@ private string CreateFilePath(FileNamePattern fileNamePattern, bool addTmpSubdir
var path = PrModSettings.ExportPath;
if (PrModSettings.CreateSubdirs)
{
var subDir = Escape(Find.World.info.seedString, Path.GetInvalidPathChars());
var subDir = Escape(Find.World.info.seedString, Path.GetInvalidFileNameChars());
path = Path.Combine(path, subDir);
if (!manuallyTriggered & GameComponentProgressManager.TileFoldersEnabled) // start using tile folders when a new game is created to avoid confusion in existing games
{
Expand Down Expand Up @@ -876,15 +876,17 @@ private string CreateImageNameDateTime()
var quadrum = MoreGenDate.QuadrumInteger(tick, longitude);
var day = GenDate.DayOfQuadrum(tick, longitude) + 1;
var hour = GenDate.HourInteger(tick, longitude);
string mapName = PrModSettings.UseMapNameInstead ? map.ToString() : map.Tile.ToString();
return "rimworld-" + Find.World.info.seedString + "-" + year + "-" + quadrum + "-" +
string seedName = Escape(Find.World.info.seedString, Path.GetInvalidFileNameChars());
string mapName = Escape(PrModSettings.UseMapNameInstead ? map.ToString() : map.Tile.ToString(), Path.GetInvalidFileNameChars());
return "rimworld-" + seedName + "-" + year + "-" + quadrum + "-" +
((day < 10) ? "0" : "") + day + "-" + ((hour < 10) ? "0" : "") + hour + "-" + mapName;
}

private string CreateImageNameNumbered()
{
string mapName = PrModSettings.UseMapNameInstead ? map.ToString() : map.Tile.ToString();
return "rimworld-" + Find.World.info.seedString + "-" +
string seedName = Escape(Find.World.info.seedString, Path.GetInvalidFileNameChars());
string mapName = Escape(PrModSettings.UseMapNameInstead ? map.ToString() : map.Tile.ToString(), Path.GetInvalidFileNameChars());
return "rimworld-" + seedName + "-" +
lastRenderedCounter.ToString("000000") + "-" + mapName;
}
}
Expand Down
Loading