Update to 1.1

Herigony · Mar 9, 2020 · e9d23e8 · e9d23e8
1 parent c401df1
commit e9d23e8
Show file tree

Hide file tree

Showing 11 changed files with 104 additions and 10 deletions.
diff --git a/Defs/DesignationCategories.xml → 1.0/Defs/DesignationCategories.xml b/Defs/DesignationCategories.xml → 1.0/Defs/DesignationCategories.xml
diff --git a/About/About.xml b/About/About.xml
@@ -4,7 +4,9 @@
 	<author>Herigony</author>
 	<supportedVersions>
 		<li>1.0</li>
+		<li>1.1</li>
 	</supportedVersions>
+	<packageId>Herigony.MapEditTools</packageId>
 	<description>Adds new tools that make editing the map easier.
 To use, just open Architect -> MapTools
 Tools:

diff --git a/About/LoadFolders.xml b/About/LoadFolders.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<loadFolders>
+	<v1.1>
+		<li>1.1</li>
+		<li>Common</li>
+		<li>/</li>
+	</v1.1>
+</loadFolders>
diff --git a/Common/Defs/DesignationCategories.xml b/Common/Defs/DesignationCategories.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+
+	<DesignationCategoryDef>
+	<defName>MapEdit</defName>
+    <label>mapEdit</label>
+    <order>0</order>
+    <specialDesignatorClasses>
+		<li>Designator_Cancel</li>
+		<li>Designator_Deconstruct</li>
+		<li>MapEditTools.Designator_BuildRoof</li>
+		<li>MapEditTools.Designator_RemoveRoof</li>
+		<li>MapEditTools.Designator_SetTerrain</li>
+		<li>MapEditTools.Designator_SmoothSurface</li>
+		<li>MapEditTools.Designator_AddFog</li>
+		<li>MapEditTools.Designator_RemoveFog</li>
+    </specialDesignatorClasses>
+	</DesignationCategoryDef>
+</Defs>
diff --git a/Languages/English/Keyed/MapEditTools.xml b/Languages/English/Keyed/MapEditTools.xml
@@ -10,4 +10,10 @@
 	<MapEditTools.DesignatorSetTerrain>Set Terrain</MapEditTools.DesignatorSetTerrain>
 	<MapEditTools.DesignatorSetTerrainDesc>Set the terrain.</MapEditTools.DesignatorSetTerrainDesc>
 
+	<MapEditTools.DesignatorAddFog>Add Fog</MapEditTools.DesignatorAddFog>
+	<MapEditTools.DesignatorAddFogDesc>Add fog on the map.</MapEditTools.DesignatorAddFogDesc>
+
+	<MapEditTools.DesignatorRemoveFog>Remove Fog</MapEditTools.DesignatorRemoveFog>
+	<MapEditTools.DesignatorRemoveFogDesc>Remove fog on the map.</MapEditTools.DesignatorRemoveFogDesc>
+
 </LanguageData>
diff --git a/Source/FloorEdit.cs b/Source/FloorEdit.cs
@@ -14,8 +14,8 @@ public class Designator_SetTerrain : MapEditDesignator
 
         public Designator_SetTerrain() : base()
         {
-            this.defaultLabel = "MapEditTools.DesignatorSetTerrain".Translate();
-            this.defaultDesc = "MapEditTools.DesignatorSetTerrainDesc".Translate();
+            this.defaultLabel = "MapEditTools.DesignatorSetTerrain".Translate().Resolve();
+            this.defaultDesc = "MapEditTools.DesignatorSetTerrainDesc".Translate().Resolve();
         }
 
         public override void DesignateSingleCell(IntVec3 c)

diff --git a/Source/FogEdit.cs b/Source/FogEdit.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Verse;
+
+namespace MapEditTools
+{
+    class Designator_AddFog : MapEditDesignator
+    {
+        public Designator_AddFog() : base()
+        {
+            this.defaultLabel = "MapEditTools.DesignatorAddFog".Translate().Resolve();
+            this.defaultDesc = "MapEditTools.DesignatorAddFogDesc".Translate().Resolve();
+        }
+
+        public override AcceptanceReport CanDesignateCell(IntVec3 loc)
+        {
+            return !Map.fogGrid.IsFogged(loc);
+        }
+
+        public override void DesignateSingleCell(IntVec3 c)
+        {
+            Map.fogGrid.fogGrid[Map.cellIndices.CellToIndex(c)] = true;
+            Map.mapDrawer.MapMeshDirty(c, MapMeshFlag.FogOfWar);
+        }
+    }
+
+    class Designator_RemoveFog : MapEditDesignator
+    {
+        public Designator_RemoveFog() : base()
+        {
+            this.defaultLabel = "MapEditTools.DesignatorRemoveFog".Translate().Resolve();
+            this.defaultDesc = "MapEditTools.DesignatorRemoveFogDesc".Translate().Resolve();
+        }
+
+        public override AcceptanceReport CanDesignateCell(IntVec3 loc)
+        {
+            return Map.fogGrid.IsFogged(loc);
+        }
+
+        public override void DesignateSingleCell(IntVec3 c)
+        {
+            Map.fogGrid.Unfog(c);
+        }
+    }
+}
diff --git a/Source/MapEditTools.csproj b/Source/MapEditTools.csproj
@@ -9,9 +9,10 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>MapEditTools</RootNamespace>
     <AssemblyName>MapEditTools</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>false</Deterministic>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -22,14 +23,16 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <RunCodeAnalysis>false</RunCodeAnalysis>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>none</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\Assemblies\</OutputPath>
+    <OutputPath>..\1.1\Assemblies\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Assembly-CSharp">
@@ -46,9 +49,18 @@
       <HintPath>..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\RimWorld\RimWorldWin64_Data\Managed\UnityEngine.dll</HintPath>
       <Private>False</Private>
     </Reference>
+    <Reference Include="UnityEngine.CoreModule">
+      <HintPath>..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\RimWorld\RimWorldWin64_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="UnityEngine.IMGUIModule">
+      <HintPath>..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\RimWorld\RimWorldWin64_Data\Managed\UnityEngine.IMGUIModule.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="FloorEdit.cs" />
+    <Compile Include="FogEdit.cs" />
     <Compile Include="MapEditDesignator.cs" />
     <Compile Include="MapEditTools.cs" />
     <Compile Include="RoofEdit.cs" />

diff --git a/Source/Properties/AssemblyInfo.cs b/Source/Properties/AssemblyInfo.cs
@@ -28,4 +28,4 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.1.0")]
+[assembly: AssemblyVersion("1.2.0.0")]
diff --git a/Source/RoofEdit.cs b/Source/RoofEdit.cs
@@ -30,8 +30,8 @@ public class Designator_BuildRoof : Designator_SetRoof
     {
         public Designator_BuildRoof() : base()
         {
-            this.defaultLabel = "MapEditTools.DesignatorBuildRoof".Translate();
-            this.defaultDesc = "MapEditTools.DesignatorBuildRoofDesc".Translate();
+            this.defaultLabel = "MapEditTools.DesignatorBuildRoof".Translate().Resolve();
+            this.defaultDesc = "MapEditTools.DesignatorBuildRoofDesc".Translate().Resolve();
             this.icon = ContentFinder<Texture2D>.Get("UI/Designators/BuildRoofArea");
         }
 
@@ -63,8 +63,8 @@ public class Designator_RemoveRoof : Designator_SetRoof
     {
         public Designator_RemoveRoof() : base()
         {
-            this.defaultLabel = "MapEditTools.DesignatorRemoveRoof".Translate();
-            this.defaultDesc = "MapEditTools.DesignatorRemoveRoofDesc".Translate();
+            this.defaultLabel = "MapEditTools.DesignatorRemoveRoof".Translate().Resolve();
+            this.defaultDesc = "MapEditTools.DesignatorRemoveRoofDesc".Translate().Resolve();
             this.icon = ContentFinder<Texture2D>.Get("UI/Designators/NoRoofArea");
             this.soundSucceeded = SoundDefOf.Designate_Deconstruct;
         }

diff --git a/Source/SmoothTool.cs b/Source/SmoothTool.cs
@@ -15,7 +15,7 @@ public Designator_SmoothSurface() : base() { }
         public override AcceptanceReport CanDesignateCell(IntVec3 c)
         {
             AcceptanceReport report = base.CanDesignateCell(c);
-            if (report.Accepted || report.Reason == "SurfaceBeingSmoothed".Translate() || report.Reason == "TooCloseToMapEdge".Translate())
+            if (report.Accepted || report.Reason == "SurfaceBeingSmoothed".Translate().Resolve() || report.Reason == "TooCloseToMapEdge".Translate().Resolve())
                 return true;
             return report;
         }