fix: copy area now works again

fluffy-mods · Apr 28, 2020 · 86724ea · 86724ea
1 parent 314360e
commit 86724ea
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 69 deletions.
diff --git a/About/About.xml b/About/About.xml
@@ -12,7 +12,7 @@ While this completely removes the limit on the number of areas you can create, t
 
 
 &lt;size=24&gt;Version&lt;/size&gt;
-This is version 3.8.96, for RimWorld 1.1.2559.
+This is version 3.8.100, for RimWorld 1.1.2618.
 
 </description>
   <packageId>fluffy.areaunlocker</packageId>

diff --git a/About/dependencies.json b/About/dependencies.json
@@ -0,0 +1,13 @@
+{ 
+    "depends": [
+        {
+            "id": "brrainz.harmony",
+            "name": "Harmony",
+            "steam": 2009463077,
+            "url": "https://github.com/pardeike/HarmonyRimWorld/releases/latest"
+        }
+    ],
+    "after": [
+        "brrainz.harmony"
+    ]
+}
diff --git a/Assemblies/AreaUnlocker.dll b/Assemblies/AreaUnlocker.dll
diff --git a/LICENSE b/LICENSE
@@ -4,16 +4,26 @@ Any original content (e.g. text, imagery or sounds) are licensed under
 CC-BY-SA 4.0, the text of which is given below.
 =======================================================================
 
-Copyright 2017 Fluffy
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Copyright 2020 Fluffy
 
+Permission is hereby granted, free of charge, to any person obtaining 
+a copy of this software and associated documentation files (the 
+"Software"), to deal in the Software without restriction, including 
+without limitation the rights to use, copy, modify, merge, publish, 
+distribute, sublicense, and/or sell copies of the Software, and to 
+permit persons to whom the Software is furnished to do so, subject to 
+the following conditions:
 
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABI-
+LITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
+SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES
+OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR 
+OTHER DEALINGS IN THE SOFTWARE.
 
 
 
@@ -23,62 +33,6 @@ software and documentation are licensed under the MIT license, the text
 of which is given above.
 =======================================================================
 
-Attribution-ShareAlike 4.0 International
-
-=======================================================================
-
-Creative Commons Corporation ("Creative Commons") is not a law firm and
-does not provide legal services or legal advice. Distribution of
-Creative Commons public licenses does not create a lawyer-client or
-other relationship. Creative Commons makes its licenses and related
-information available on an "as-is" basis. Creative Commons gives no
-warranties regarding its licenses, any material licensed under their
-terms and conditions, or any related information. Creative Commons
-disclaims all liability for damages resulting from their use to the
-fullest extent possible.
-
-Using Creative Commons Public Licenses
-
-Creative Commons public licenses provide a standard set of terms and
-conditions that creators and other rights holders may use to share
-original works of authorship and other material subject to copyright
-and certain other rights specified in the public license below. The
-following considerations are for informational purposes only, are not
-exhaustive, and do not form part of our licenses.
-
-     Considerations for licensors: Our public licenses are
-     intended for use by those authorized to give the public
-     permission to use material in ways otherwise restricted by
-     copyright and certain other rights. Our licenses are
-     irrevocable. Licensors should read and understand the terms
-     and conditions of the license they choose before applying it.
-     Licensors should also secure all rights necessary before
-     applying our licenses so that the public can reuse the
-     material as expected. Licensors should clearly mark any
-     material not subject to the license. This includes other CC-
-     licensed material, or material used under an exception or
-     limitation to copyright. More considerations for licensors:
-	wiki.creativecommons.org/Considerations_for_licensors
-
-     Considerations for the public: By using one of our public
-     licenses, a licensor grants the public permission to use the
-     licensed material under specified terms and conditions. If
-     the licensor's permission is not necessary for any reason--for
-     example, because of any applicable exception or limitation to
-     copyright--then that use is not regulated by the license. Our
-     licenses grant only permissions under copyright and certain
-     other rights that a licensor has authority to grant. Use of
-     the licensed material may still be restricted for other
-     reasons, including because others have copyright or other
-     rights in the material. A licensor may make special requests,
-     such as asking that all changes be marked or described.
-     Although not required by our licenses, you are encouraged to
-     respect those requests where reasonable. More_considerations
-     for the public: 
-	wiki.creativecommons.org/Considerations_for_licensees
-
-=======================================================================
-
 Creative Commons Attribution-ShareAlike 4.0 International Public
 License
 
@@ -450,5 +404,3 @@ the avoidance of doubt, this paragraph does not form part of the
 public licenses.
 
 Creative Commons may be contacted at creativecommons.org.
-
-0Trackers
diff --git a/Readme.md b/Readme.md
@@ -29,4 +29,4 @@ Show your appreciation by buying me a coffee (or contribute towards a nice singl
 [![I Have a Black Dog](https://i.ibb.co/ss59Rwy/New-Project-2.png)](https://www.youtube.com/watch?v=XiCrniLQGYc)
 
 # Version
-This is version 3.8.96, for RimWorld 1.1.2559.
+This is version 3.8.100, for RimWorld 1.1.2618.
diff --git a/Source/AreaUnlocker/HarmonyPatch_Dialog_ManageAreas.cs b/Source/AreaUnlocker/HarmonyPatch_Dialog_ManageAreas.cs
@@ -98,7 +98,7 @@ private static void Copy( Area area )
 
             // create the copy
             area.areaManager.TryMakeNewAllowed( out var copy );
-            Traverse.Create( copy ).Field( "labelInt" ).SetValue( label );
+            Traverse.Create( copy ).Field( "labelInt" ).SetValue( label.Resolve() );
             foreach ( var cell in area.ActiveCells )
                 copy[cell] = true;
         }

diff --git a/Source/AreaUnlocker/Properties/AssemblyInfo.cs b/Source/AreaUnlocker/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("3.0.0")]
-[assembly: AssemblyFileVersion("3.8.96")]
+[assembly: AssemblyFileVersion("3.8.100")]