Update for 1.4, add ability to hide zones and overlays

Author: JonathanTroyer

About/About.xml

@@ -7,6 +7,7 @@
     <li>1.1</li>
     <li>1.2</li>
     <li>1.3</li>
+    <li>1.4</li>
   </supportedVersions>
   <packageId>neptimus7.progressrenderer</packageId>
   <modDependencies>

Common/Languages/English/Keyed/All.xml

@@ -44,6 +44,10 @@
 	<LPR_SettingsRenderGameConditionsDescription>Enable this when the rendered images should contain game condition effects (like weather and lighting from toxic fallout).</LPR_SettingsRenderGameConditionsDescription>
 	<LPR_SettingsRenderWeatherLabel>Weather</LPR_SettingsRenderWeatherLabel>
 	<LPR_SettingsRenderWeatherDescription>Enable this when the rendered images should contain the current ingame weather.</LPR_SettingsRenderWeatherDescription>
+	<LPR_SettingsRenderZonesLabel>Zones</LPR_SettingsRenderZonesLabel>
+	<LPR_SettingsRenderZonesDescription>Enable this to include zones in the rendered image.</LPR_SettingsRenderZonesDescription>
+	<LPR_SettingsRenderOverlaysLabel>Overlays</LPR_SettingsRenderOverlaysLabel>
+	<LPR_SettingsRenderOverlaysDescription>Enable this to include overlays in the rendered image. This setting includes all overlays.</LPR_SettingsRenderOverlaysDescription>
 	<LPR_SettingsSmoothRenderAreaStepsLabel>Smooth render area on change (set smoothing steps)</LPR_SettingsSmoothRenderAreaStepsLabel>
 	<LPR_SettingsSmoothRenderAreaStepsDescription>You can increase this if you want a smoother transition of your rendered area when you change the area with corner markers. Rendering will transition smoothly to the new area in the next X renderings. (Note that it may take a while to get to the new area if you choose a high step value and a low render interval.)</LPR_SettingsSmoothRenderAreaStepsDescription>
 	<LPR_SettingsIntervalLabel>Render every</LPR_SettingsIntervalLabel>

Progress-Renderer.csproj

@@ -109,6 +109,7 @@
     <Compile Include="Source\Mod\PRMod.cs" />
     <Compile Include="Source\Mod\PRModSettings.cs" />
     <Compile Include="Source\UI\SmallMessageBox.cs" />
+    <Compile Include="Source\Utils\Utils.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="About\About.xml" />
@@ -124,6 +125,7 @@
     <Content Include="Common\Textures\UI\Designators\CornerMarkerOn.png" />
     <Content Include="News\UpdateFeatureDefs\UpdateFeatures.xml" />
     <Content Include="v1.2\Assemblies\Progress-Renderer.dll" />
+    <Content Include="v1.4\Assemblies\Progress-Renderer.dll" />
   </ItemGroup>
   <ItemGroup>
     <None Include=".gitattributes" />

Source/Designator/Designator_CornerMarker.cs

@@ -70,9 +70,9 @@ public override void DesignateSingleCell(IntVec3 c)
 
         private void DesignateSingleCellFeedback()
         {
-            List<Designation> cornerMarkers = Map.designationManager.allDesignations.FindAll(des => des.def == DesignationDefOf.CornerMarker);
+            var cornerMarkers = Map.designationManager.AllDesignations.FindAll(des => des.def == DesignationDefOf.CornerMarker);
             // Message for the amount of markers on the map
-            int markerCount = cornerMarkers.Count;
+            var markerCount = cornerMarkers.Count;
             string message = TranslatorFormattedStringExtensions.Translate("LPR_MessageCornerMarkerAmount", markerCount) + " ";
             if (markerCount < 2)
             {
@@ -90,23 +90,23 @@ private void DesignateSingleCellFeedback()
             // Message for the created area (if enough markers)
             if (markerCount > 1)
             {
-                int startX = Map.Size.x;
-                int startZ = Map.Size.z;
-                int endX = 0;
-                int endZ = 0;
-                foreach (Designation des in cornerMarkers)
+                var startX = Map.Size.x;
+                var startZ = Map.Size.z;
+                var endX = 0;
+                var endZ = 0;
+                foreach (var des in cornerMarkers)
                 {
-                    IntVec3 cell = des.target.Cell;
+                    var cell = des.target.Cell;
                     if (cell.x < startX) { startX = cell.x; }
                     if (cell.z < startZ) { startZ = cell.z; }
                     if (cell.x > endX) { endX = cell.x; }
                     if (cell.z > endZ) { endZ = cell.z; }
                 }
                 endX += 1;
                 endZ += 1;
-                int distX = endX - startX;
-                int distZ = endZ - startZ;
-                string ratio = ((float)distX / distZ).ToString("0.###");
+                var distX = endX - startX;
+                var distZ = endZ - startZ;
+                var ratio = ((float)distX / distZ).ToString("0.###");
                 string messageRect = TranslatorFormattedStringExtensions.Translate("LPR_MessageCornerMarkersRect", distX, distZ);
                 if (distX * 3 == distZ * 4)
                 {

Source/Gen/MoreGenDate.cs

@@ -8,7 +8,7 @@ public static class MoreGenDate
 
         public static int QuadrumInteger(long absTicks, float longitude)
         {
-            Quadrum quadrum = GenDate.Quadrum(absTicks, longitude);
+            var quadrum = GenDate.Quadrum(absTicks, longitude);
             if (quadrum == Quadrum.Aprimay) { return 1; }
             else if (quadrum == Quadrum.Jugust) { return 2; }
             else if (quadrum == Quadrum.Septober) { return 3; }
@@ -18,7 +18,7 @@ public static int QuadrumInteger(long absTicks, float longitude)
 
         public static int HoursPassedInteger(int absTicks, float longitude)
         {
-            int ticks = absTicks + LocalTicksOffsetFromLongitude(longitude);
+            var ticks = absTicks + LocalTicksOffsetFromLongitude(longitude);
             return ticks / 2500;
         }