From 86724eaaaff1ee52517008e941ac0fc1e8ecda51 Mon Sep 17 00:00:00 2001 From: Fluffy Date: Tue, 28 Apr 2020 23:33:04 +0200 Subject: [PATCH] fix: copy area now works again --- About/About.xml | 2 +- About/dependencies.json | 13 +++ Assemblies/AreaUnlocker.dll | Bin 10752 -> 11264 bytes LICENSE | 82 ++++-------------- Readme.md | 2 +- .../HarmonyPatch_Dialog_ManageAreas.cs | 2 +- .../AreaUnlocker/Properties/AssemblyInfo.cs | 2 +- 7 files changed, 34 insertions(+), 69 deletions(-) create mode 100644 About/dependencies.json diff --git a/About/About.xml b/About/About.xml index 4dfff9b..2a161e6 100644 --- 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 <size=24>Version</size> -This is version 3.8.96, for RimWorld 1.1.2559. +This is version 3.8.100, for RimWorld 1.1.2618. fluffy.areaunlocker diff --git a/About/dependencies.json b/About/dependencies.json new file mode 100644 index 0000000..d6d3bac --- /dev/null +++ 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" + ] +} \ No newline at end of file diff --git a/Assemblies/AreaUnlocker.dll b/Assemblies/AreaUnlocker.dll index 8a402a7cbb6963b3183568e20463dfc23ed1c2b8..3ad4544718b1f0e916dcb9f79ba785ddb32e4bae 100644 GIT binary patch delta 4452 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 diff --git a/LICENSE b/LICENSE index e21d660..a1a1574 100644 --- 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 index a266e13..261fe71 100644 --- 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. \ No newline at end of file +This is version 3.8.100, for RimWorld 1.1.2618. \ No newline at end of file diff --git a/Source/AreaUnlocker/HarmonyPatch_Dialog_ManageAreas.cs b/Source/AreaUnlocker/HarmonyPatch_Dialog_ManageAreas.cs index 0c771de..1d1a50e 100644 --- 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 index ccebd8b..b4fb806 100644 --- 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")]