diff --git a/.gitignore b/.gitignore index 4f1b96a..877ee53 100644 --- a/.gitignore +++ b/.gitignore @@ -69,3 +69,6 @@ Source/AllModdingComponents/CompSlotLoadable/Properties Source/AllModdingComponents/CompVehicle/obj Source/AllModdingComponents/CompVehicle/Properties Source/DiscordWebhookToken.txt +/Source/.vs/RimWriter/v16 +/Source/packages/Lib.Harmony.2.0.0.8 +/.vs diff --git a/About/About.xml b/About/About.xml index 61fae49..5afc437 100644 --- a/About/About.xml +++ b/About/About.xml @@ -2,7 +2,21 @@ RimWriter - Books, Scrolls, Tablets, and Libraries Jecrell - 1.0.2059 + +
  • 1.1
  • +
    + jecrell.RimWriter + +
  • + brrainz.harmony + Harmony + steam://url/CommunityFilePage/2009463077 + https://github.com/pardeike/HarmonyRimWorld/releases/latest +
  • +
    + +
  • brrainz.harmony
  • +
    1.20.0.2 (01-04-2019) Add tablets, books, scrolls and more to your RimWorld playthroughs. diff --git a/Assemblies/0Harmony.dll b/Assemblies/0Harmony.dll deleted file mode 100644 index 5078dad..0000000 Binary files a/Assemblies/0Harmony.dll and /dev/null differ diff --git a/Assemblies/RimWriter.dll b/Assemblies/RimWriter.dll index 37d8d05..83033c1 100644 Binary files a/Assemblies/RimWriter.dll and b/Assemblies/RimWriter.dll differ diff --git a/Defs/RecipeDefs/RimWriter_BookBinding.xml b/Defs/RecipeDefs/RimWriter_BookBinding.xml index 828d4b7..fa72252 100644 --- a/Defs/RecipeDefs/RimWriter_BookBinding.xml +++ b/Defs/RecipeDefs/RimWriter_BookBinding.xml @@ -70,7 +70,7 @@ Makes a book by hand at a crafting spot by writing out flattened stationery such as paper or parchment and binding together the pieces. Making a book by hand. 20000 - SculptingSpeed + GeneralLaborSpeed Artistic UnfinishedWriting RimWriter_SoundManualPencil diff --git a/Defs/RecipeDefs/RimWriter_BurnBooks.xml b/Defs/RecipeDefs/RimWriter_BurnBooks.xml index e3ba7f4..5e9e16d 100644 --- a/Defs/RecipeDefs/RimWriter_BurnBooks.xml +++ b/Defs/RecipeDefs/RimWriter_BurnBooks.xml @@ -7,7 +7,7 @@ Burn unwanted books to completely destroy them without any mess. Burning books. 60 - UnskilledLaborSpeed + GeneralLaborSpeed Hauling Cremate Recipe_Cremate @@ -35,7 +35,7 @@ Burn unwanted scrolls to completely destroy them without any mess. Burning scrolls. 60 - UnskilledLaborSpeed + GeneralLaborSpeed Hauling Cremate Recipe_Cremate diff --git a/Defs/RecipeDefs/RimWriter_MaterialCrafting.xml b/Defs/RecipeDefs/RimWriter_MaterialCrafting.xml index 386fc01..9966ddd 100644 --- a/Defs/RecipeDefs/RimWriter_MaterialCrafting.xml +++ b/Defs/RecipeDefs/RimWriter_MaterialCrafting.xml @@ -15,7 +15,7 @@ Makes around one hundred pages from a few logs of wood. Making pages. 3500 - SculptingSpeed + GeneralLaborSpeed Artistic UnfinishedWriting Recipe_Tailor @@ -58,7 +58,7 @@ Makes around one hundred parchments from leather. Making parchment. 3500 - SculptingSpeed + GeneralLaborSpeed Artistic UnfinishedWriting Recipe_Tailor @@ -103,7 +103,7 @@ Makes around one hundred cloth papers from various types of fabric. Making cloth paper. 3500 - SculptingSpeed + GeneralLaborSpeed Artistic UnfinishedWriting Recipe_Tailor diff --git a/Defs/ThingDefs_Buildings/RimWriter_Bookcases.xml b/Defs/ThingDefs_Buildings/RimWriter_Bookcases.xml index eb965a3..193225a 100644 --- a/Defs/ThingDefs_Buildings/RimWriter_Bookcases.xml +++ b/Defs/ThingDefs_Buildings/RimWriter_Bookcases.xml @@ -38,9 +38,9 @@ Joy Misc2 -
  • +
  • Building/Production/LibraryBookcase/Jecrell_BookcaseEmpty @@ -110,9 +110,9 @@ 3 -
  • +
  • Building/Production/ShortBookcase/Jecrell_ShortBookcaseEmpty diff --git a/Defs/ThingDefs_Buildings/RimWriter_Scrollcases.xml b/Defs/ThingDefs_Buildings/RimWriter_Scrollcases.xml index 3a17f3c..b140402 100644 --- a/Defs/ThingDefs_Buildings/RimWriter_Scrollcases.xml +++ b/Defs/ThingDefs_Buildings/RimWriter_Scrollcases.xml @@ -37,9 +37,9 @@ Joy Misc2 -
  • +
  • Building/Production/LibraryScrollcase/Jecrell_ScrollcaseEmpty @@ -109,9 +109,9 @@ 3 -
  • +
  • Building/Production/ShortScrollcase/Jecrell_ShortScrollcaseEmpty diff --git a/Defs/ThingDefs_Item/RimWriter_Materials.xml b/Defs/ThingDefs_Item/RimWriter_Materials.xml index bc93d2a..28676a4 100644 --- a/Defs/ThingDefs_Item/RimWriter_Materials.xml +++ b/Defs/ThingDefs_Item/RimWriter_Materials.xml @@ -16,7 +16,7 @@ 100 - SculptingSpeed + GeneralLaborSpeed Artistic UnfinishedWriting RimWriter_SoundManualPencil @@ -38,7 +38,7 @@ 100 - SculptingSpeed + GeneralLaborSpeed Artistic UnfinishedWriting RimWriter_SoundManualPencil @@ -60,7 +60,7 @@ 100 - SculptingSpeed + GeneralLaborSpeed Artistic UnfinishedWriting RimWriter_SoundManualPencil diff --git a/Defs/ThingDefs_Item/RimWriter_Tablets.xml b/Defs/ThingDefs_Item/RimWriter_Tablets.xml index 6881f1a..8bbc197 100644 --- a/Defs/ThingDefs_Item/RimWriter_Tablets.xml +++ b/Defs/ThingDefs_Item/RimWriter_Tablets.xml @@ -29,7 +29,7 @@ Neolithic Filth_RubbleRock - SculptingSpeed + GeneralLaborSpeed Intellectual UnfinishedWritingTablet Recipe_MakeStoneBlocks diff --git a/Source/CompProperties_StorageGraphic.cs b/Source/CompProperties_StorageGraphic.cs index e922f72..2ba22fb 100644 --- a/Source/CompProperties_StorageGraphic.cs +++ b/Source/CompProperties_StorageGraphic.cs @@ -17,7 +17,7 @@ public class CompProperties_StorageGraphic : CompProperties public CompProperties_StorageGraphic() { - this.compClass = typeof(CompStorageGraphic); + compClass = typeof(CompStorageGraphic); } } } diff --git a/Source/CompStorageGraphic.cs b/Source/CompStorageGraphic.cs index 15c2c00..112ecf5 100644 --- a/Source/CompStorageGraphic.cs +++ b/Source/CompStorageGraphic.cs @@ -10,9 +10,15 @@ namespace RimWriter public class CompStorageGraphic : ThingComp { private Graphic cachedGraphic = null; - public CompProperties_StorageGraphic Props => this.props as CompProperties_StorageGraphic; + public CompProperties_StorageGraphic Props + { + get + { + return (CompProperties_StorageGraphic)props; + } + } - public void UpdateGraphics() +public void UpdateGraphics() { cachedGraphic = null; } diff --git a/Source/GuideBook.cs b/Source/GuideBook.cs index 80dabac..6536dc9 100644 --- a/Source/GuideBook.cs +++ b/Source/GuideBook.cs @@ -1,5 +1,5 @@ using System; -using Harmony; +using HarmonyLib; using JetBrains.Annotations; using RimWorld; using UnityEngine; diff --git a/Source/ModMain.cs b/Source/ModMain.cs index dfc7d15..7681f93 100644 --- a/Source/ModMain.cs +++ b/Source/ModMain.cs @@ -1,5 +1,5 @@ using System; -using Harmony; +using HarmonyLib; using RimWorld; using UnityEngine; using Verse; diff --git a/Source/Properties/AssemblyInfo.cs b/Source/Properties/AssemblyInfo.cs index 28adb3e..a08a546 100644 --- a/Source/Properties/AssemblyInfo.cs +++ b/Source/Properties/AssemblyInfo.cs @@ -18,5 +18,5 @@ [assembly: Guid("a8e081b6-8768-4fe9-817f-f0ee42cf13ef")] -[assembly: AssemblyVersion("1.1.0.7")] -[assembly: AssemblyFileVersion("1.1.0.7")] +[assembly: AssemblyVersion("1.2")] +[assembly: AssemblyFileVersion("1.2")] diff --git a/Source/RimWriter.csproj b/Source/RimWriter.csproj index e3697b9..d2f2a69 100644 --- a/Source/RimWriter.csproj +++ b/Source/RimWriter.csproj @@ -9,7 +9,7 @@ Properties RimWriter RimWriter - v3.5 + v4.7.2 512 @@ -23,6 +23,7 @@ prompt 4 true + false pdbonly @@ -31,26 +32,8 @@ TRACE prompt 4 + false - - - ..\..\Call-of-Cthulhu---Cults\Assemblies\0Harmony.dll - - - ..\..\..\RimWorldWin64_Data\Managed\Assembly-CSharp.dll - False - - - - - - - - - Source-DLLs\UnityEngine.dll - False - - @@ -73,6 +56,268 @@ + + + packages\Lib.Harmony.2.0.0.8\lib\net472\0Harmony.dll + False + + + ..\..\..\RimWorldWin64_Data\Managed\Assembly-CSharp.dll + False + + + + ..\..\..\RimWorldWin64_Data\Managed\Unity.TextMeshPro.dll + False + + + ..\..\..\RimWorldWin64_Data\Managed\UnityEngine.dll + False + + + ..\..\..\RimWorldWin64_Data\Managed\UnityEngine.AccessibilityModule.dll + False + + + ..\..\..\RimWorldWin64_Data\Managed\UnityEngine.AIModule.dll + False + + + ..\..\..\RimWorldWin64_Data\Managed\UnityEngine.AndroidJNIModule.dll + False + + + ..\..\..\RimWorldWin64_Data\Managed\UnityEngine.AnimationModule.dll + False + + + ..\..\..\RimWorldWin64_Data\Managed\UnityEngine.ARModule.dll + False + + + ..\..\..\RimWorldWin64_Data\Managed\UnityEngine.AssetBundleModule.dll + False + + + ..\..\..\RimWorldWin64_Data\Managed\UnityEngine.AudioModule.dll + False + + + ..\..\..\RimWorldWin64_Data\Managed\UnityEngine.ClothModule.dll + False + + + ..\..\..\RimWorldWin64_Data\Managed\UnityEngine.ClusterInputModule.dll + False + + + ..\..\..\RimWorldWin64_Data\Managed\UnityEngine.ClusterRendererModule.dll + False + + + ..\..\..\RimWorldWin64_Data\Managed\UnityEngine.CoreModule.dll + False + + + ..\..\..\RimWorldWin64_Data\Managed\UnityEngine.CrashReportingModule.dll + False + + + ..\..\..\RimWorldWin64_Data\Managed\UnityEngine.DirectorModule.dll + False + + + ..\..\..\RimWorldWin64_Data\Managed\UnityEngine.DSPGraphModule.dll + False + + + ..\..\..\RimWorldWin64_Data\Managed\UnityEngine.FileSystemHttpModule.dll + False + + + ..\..\..\RimWorldWin64_Data\Managed\UnityEngine.GameCenterModule.dll + False + + + ..\..\..\RimWorldWin64_Data\Managed\UnityEngine.GridModule.dll + False + + + ..\..\..\RimWorldWin64_Data\Managed\UnityEngine.HotReloadModule.dll + False + + + ..\..\..\RimWorldWin64_Data\Managed\UnityEngine.ImageConversionModule.dll + False + + + ..\..\..\RimWorldWin64_Data\Managed\UnityEngine.IMGUIModule.dll + False + + + ..\..\..\RimWorldWin64_Data\Managed\UnityEngine.InputLegacyModule.dll + False + + + ..\..\..\RimWorldWin64_Data\Managed\UnityEngine.InputModule.dll + False + + + ..\..\..\RimWorldWin64_Data\Managed\UnityEngine.JSONSerializeModule.dll + False + + + ..\..\..\RimWorldWin64_Data\Managed\UnityEngine.LocalizationModule.dll + False + + + ..\..\..\RimWorldWin64_Data\Managed\UnityEngine.ParticleSystemModule.dll + False + + + ..\..\..\RimWorldWin64_Data\Managed\UnityEngine.PerformanceReportingModule.dll + False + + + ..\..\..\RimWorldWin64_Data\Managed\UnityEngine.Physics2DModule.dll + False + + + ..\..\..\RimWorldWin64_Data\Managed\UnityEngine.PhysicsModule.dll + False + + + ..\..\..\RimWorldWin64_Data\Managed\UnityEngine.ProfilerModule.dll + False + + + ..\..\..\RimWorldWin64_Data\Managed\UnityEngine.ScreenCaptureModule.dll + False + + + ..\..\..\RimWorldWin64_Data\Managed\UnityEngine.SharedInternalsModule.dll + False + + + ..\..\..\RimWorldWin64_Data\Managed\UnityEngine.SpriteMaskModule.dll + False + + + ..\..\..\RimWorldWin64_Data\Managed\UnityEngine.SpriteShapeModule.dll + False + + + ..\..\..\RimWorldWin64_Data\Managed\UnityEngine.StreamingModule.dll + False + + + ..\..\..\RimWorldWin64_Data\Managed\UnityEngine.SubstanceModule.dll + False + + + ..\..\..\RimWorldWin64_Data\Managed\UnityEngine.TerrainModule.dll + False + + + ..\..\..\RimWorldWin64_Data\Managed\UnityEngine.TerrainPhysicsModule.dll + False + + + ..\..\..\RimWorldWin64_Data\Managed\UnityEngine.TextCoreModule.dll + False + + + ..\..\..\RimWorldWin64_Data\Managed\UnityEngine.TextRenderingModule.dll + False + + + ..\..\..\RimWorldWin64_Data\Managed\UnityEngine.TilemapModule.dll + False + + + ..\..\..\RimWorldWin64_Data\Managed\UnityEngine.TLSModule.dll + False + + + ..\..\..\RimWorldWin64_Data\Managed\UnityEngine.UI.dll + False + + + ..\..\..\RimWorldWin64_Data\Managed\UnityEngine.UIElementsModule.dll + False + + + ..\..\..\RimWorldWin64_Data\Managed\UnityEngine.UIModule.dll + False + + + ..\..\..\RimWorldWin64_Data\Managed\UnityEngine.UmbraModule.dll + False + + + ..\..\..\RimWorldWin64_Data\Managed\UnityEngine.UNETModule.dll + False + + + ..\..\..\RimWorldWin64_Data\Managed\UnityEngine.UnityAnalyticsModule.dll + False + + + ..\..\..\RimWorldWin64_Data\Managed\UnityEngine.UnityConnectModule.dll + False + + + ..\..\..\RimWorldWin64_Data\Managed\UnityEngine.UnityTestProtocolModule.dll + False + + + ..\..\..\RimWorldWin64_Data\Managed\UnityEngine.UnityWebRequestAssetBundleModule.dll + False + + + ..\..\..\RimWorldWin64_Data\Managed\UnityEngine.UnityWebRequestAudioModule.dll + False + + + ..\..\..\RimWorldWin64_Data\Managed\UnityEngine.UnityWebRequestModule.dll + False + + + ..\..\..\RimWorldWin64_Data\Managed\UnityEngine.UnityWebRequestTextureModule.dll + False + + + ..\..\..\RimWorldWin64_Data\Managed\UnityEngine.UnityWebRequestWWWModule.dll + False + + + ..\..\..\RimWorldWin64_Data\Managed\UnityEngine.VehiclesModule.dll + False + + + ..\..\..\RimWorldWin64_Data\Managed\UnityEngine.VFXModule.dll + False + + + ..\..\..\RimWorldWin64_Data\Managed\UnityEngine.VideoModule.dll + False + + + ..\..\..\RimWorldWin64_Data\Managed\UnityEngine.VRModule.dll + False + + + ..\..\..\RimWorldWin64_Data\Managed\UnityEngine.WindModule.dll + False + + + ..\..\..\RimWorldWin64_Data\Managed\UnityEngine.XRModule.dll + False + + + + +