diff --git a/.gitignore b/.gitignore index e3bbdca..dfcfd56 100644 --- a/.gitignore +++ b/.gitignore @@ -1,16 +1,350 @@ +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore + +# User-specific files +*.rsuser *.suo -*.cache -*/Thumbs.db -/Source/.vs/* -/Source/CombatExtended/bin/* -/Source/CombatExtended/obj/* -/Source/CombatExtended/CombatExtended.csproj.user - +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Mono auto generated files +mono_crash.* + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ +[Ll]ogs/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUnit +*.VisualState.xml +TestResult.xml +nunit-*.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + # ReSharper is a .NET coding add-in _ReSharper*/ *.[Rr]e[Ss]harper *.DotSettings.user - -# Ignore RimWorld assemblies -Assembly-CSharp.dll -UnityEngine.dll + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# NuGet Symbol Packages +*.snupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx +*.appxbundle +*.appxupload + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!?*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser +*- [Bb]ackup.rdl +*- [Bb]ackup ([0-9]).rdl +*- [Bb]ackup ([0-9][0-9]).rdl + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ + +# BeatPulse healthcheck temp database +healthchecksdb + +# Backup folder for Package Reference Convert tool in Visual Studio 2017 +MigrationBackup/ + +# Ionide (cross platform F# VS Code tools) working folder +.ionide/ diff --git a/About/About.xml b/About/About.xml index a35796b..bbdcf11 100644 --- a/About/About.xml +++ b/About/About.xml @@ -2,8 +2,9 @@ Mass Graves NoImageAvailable + NoImageAvailable.MassGraves -
  • 1.0
  • +
  • 1.1
  • - v0.18.1.1\n\nAdds mass graves to allow easier disposing of raider corpses. + v1.1.0.0\n\nAdds mass graves to allow easier disposing of raider corpses.
    diff --git a/Assemblies/MassGraves.dll b/Assemblies/MassGraves.dll index 4e6f1c5..7832ef4 100644 Binary files a/Assemblies/MassGraves.dll and b/Assemblies/MassGraves.dll differ diff --git a/Source/.vs/MassGraves/v14/.suo b/Source/.vs/MassGraves/v14/.suo index ca65342..465d396 100644 Binary files a/Source/.vs/MassGraves/v14/.suo and b/Source/.vs/MassGraves/v14/.suo differ diff --git a/Source/MassGraves/Controller.cs b/Source/MassGraves/Controller.cs index d870479..cc5d9b5 100644 --- a/Source/MassGraves/Controller.cs +++ b/Source/MassGraves/Controller.cs @@ -6,7 +6,7 @@ using RimWorld; using Verse; using UnityEngine; -using Harmony; +using HarmonyLib; namespace MassGraves { @@ -17,7 +17,8 @@ public class Controller : Mod public Controller(ModContentPack content) : base(content) { settings = GetSettings(); - HarmonyInstance.Create("MassGraves.Harmony").PatchAll(Assembly.GetExecutingAssembly()); + var harmony = new Harmony("MassGraves.Harmony"); + harmony.PatchAll(Assembly.GetExecutingAssembly()); } public override string SettingsCategory() diff --git a/Source/MassGraves/Harmony-Designator_Build.cs b/Source/MassGraves/Harmony-Designator_Build.cs index ca79887..a526224 100644 --- a/Source/MassGraves/Harmony-Designator_Build.cs +++ b/Source/MassGraves/Harmony-Designator_Build.cs @@ -5,12 +5,12 @@ using RimWorld; using Verse; using UnityEngine; -using Harmony; +using HarmonyLib; namespace MassGraves { [HarmonyPatch(typeof(Designator_Build))] - [HarmonyPatch("Visible", PropertyMethod.Getter)] + [HarmonyPatch("Visible", MethodType.Getter)] public static class Harmony_Designator_Build { public static bool Prefix(Designator_Build __instance, ref bool __result) diff --git a/Source/MassGraves/MassGraves.csproj b/Source/MassGraves/MassGraves.csproj index 707469d..3817c35 100644 --- a/Source/MassGraves/MassGraves.csproj +++ b/Source/MassGraves/MassGraves.csproj @@ -9,7 +9,7 @@ Properties MassGraves MassGraves - v3.5 + v4.7.2 512 @@ -22,6 +22,7 @@ prompt 4 + false pdbonly @@ -30,27 +31,38 @@ TRACE prompt 4 + false False - ..\..\Assemblies\0Harmony.dll + ..\..\..\..\..\..\workshop\content\294100\2009463077\Assemblies\0Harmony.dll False - ..\..\..\..\RimWorld2150Win64_Data\Managed\Assembly-CSharp.dll + ..\..\..\..\RimWorldWin64_Data\Managed\Assembly-CSharp.dll False - - - ..\..\..\..\RimWorld2150Win64_Data\Managed\UnityEngine.dll + ..\..\..\..\RimWorldWin64_Data\Managed\UnityEngine.dll + False + + + ..\..\..\..\RimWorldWin64_Data\Managed\UnityEngine.CoreModule.dll + False + + + ..\..\..\..\RimWorldWin64_Data\Managed\UnityEngine.IMGUIModule.dll + False + + + ..\..\..\..\RimWorldWin64_Data\Managed\UnityEngine.TextRenderingModule.dll False diff --git a/Source/MassGraves/obj/Debug/MassGraves.csproj.FileListAbsolute.txt b/Source/MassGraves/obj/Debug/MassGraves.csproj.FileListAbsolute.txt index a155e37..25bb179 100644 --- a/Source/MassGraves/obj/Debug/MassGraves.csproj.FileListAbsolute.txt +++ b/Source/MassGraves/obj/Debug/MassGraves.csproj.FileListAbsolute.txt @@ -6,3 +6,7 @@ D:\Games\RimWorld2150Win64\Mods\MassGraves\Assemblies\MassGraves.dll D:\Games\RimWorld2150Win64\Mods\MassGraves\Source\MassGraves\obj\Debug\MassGraves.csprojResolveAssemblyReference.cache D:\Games\RimWorld2150Win64\Mods\MassGraves\Source\MassGraves\obj\Debug\MassGraves.csproj.CoreCompileInputs.cache D:\Games\RimWorld2150Win64\Mods\MassGraves\Source\MassGraves\obj\Debug\MassGraves.dll +E:\Games\Steam\steamapps\common\RimWorld\Mods\MassGraves\Source\MassGraves\obj\Debug\MassGraves.csprojAssemblyReference.cache +E:\Games\Steam\steamapps\common\RimWorld\Mods\MassGraves\Source\MassGraves\obj\Debug\MassGraves.csproj.CoreCompileInputs.cache +E:\Games\Steam\steamapps\common\RimWorld\Mods\MassGraves\Source\MassGraves\obj\Debug\MassGraves.dll +E:\Games\Steam\steamapps\common\RimWorld\Mods\MassGraves\Assemblies\MassGraves.dll diff --git a/Source/MassGraves/obj/Debug/MassGraves.dll b/Source/MassGraves/obj/Debug/MassGraves.dll index 4e6f1c5..7832ef4 100644 Binary files a/Source/MassGraves/obj/Debug/MassGraves.dll and b/Source/MassGraves/obj/Debug/MassGraves.dll differ