Mod no longer hard dependent on biotech, it only will not have any content without it.

This commit is contained in:
Shabakur 2022-11-25 09:34:33 +01:00
parent 1483959f92
commit 6edcae2dcf
58 changed files with 44 additions and 15 deletions

Binary file not shown.

View File

@ -75,8 +75,7 @@ namespace RJW_More_Genes
} }
} }
IEnumerator<Pawn> enumerator = null; //IEnumerator<Pawn> enumerator = null;
yield break;
yield break; yield break;
} }
public override void DrawEffectPreview(LocalTargetInfo target) public override void DrawEffectPreview(LocalTargetInfo target)

View File

@ -11,6 +11,7 @@ namespace RJW_More_Genes
[DefOf] [DefOf]
public static class GeneDefOf public static class GeneDefOf
{ {
[MayRequireBiotech]
public static readonly GeneDef rjw_genes_pussyhealer; public static readonly GeneDef rjw_genes_pussyhealer;
} }
} }

View File

@ -5,6 +5,7 @@ using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using Verse; using Verse;
using HarmonyLib; using HarmonyLib;
using rjw;
namespace RJW_More_Genes namespace RJW_More_Genes
@ -16,6 +17,11 @@ namespace RJW_More_Genes
{ {
Harmony harmony = new Harmony("RJW_More_Genes"); Harmony harmony = new Harmony("RJW_More_Genes");
harmony.PatchAll(); harmony.PatchAll();
if (ModsConfig.BiotechActive)
{
harmony.Patch(typeof(SexUtility).GetMethod("ProcessSex"), new HarmonyMethod(typeof(PatchProcessSex), "Postfix", null));
}
} }
} }
} }

View File

@ -11,6 +11,7 @@ namespace RJW_More_Genes
[DefOf] [DefOf]
public static class HediffDefOf public static class HediffDefOf
{ {
[MayRequireBiotech]
public static readonly HediffDef SexFrenzy; public static readonly HediffDef SexFrenzy;
} }
} }

View File

@ -5,14 +5,18 @@ using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using HarmonyLib; using HarmonyLib;
using rjw; using rjw;
using RimWorld;
using Verse;
namespace RJW_More_Genes namespace RJW_More_Genes
{ {
[HarmonyPatch(typeof(SexUtility), "ProcessSex")] //[HarmonyPatch(typeof(SexUtility), "ProcessSex")]
class PatchProcessSex class PatchProcessSex
{ {
[HarmonyPostfix]
public static void ProcessSexGenes(SexProps props) //[HarmonyPostfix]
public static void Postfix(SexProps props)
{ {
Log.Message("triggered");
AbilityUtility.PussyHeal(props); AbilityUtility.PussyHeal(props);
} }
} }

View File

@ -17,7 +17,7 @@
<DebugSymbols>false</DebugSymbols> <DebugSymbols>false</DebugSymbols>
<DebugType>none</DebugType> <DebugType>none</DebugType>
<Optimize>false</Optimize> <Optimize>false</Optimize>
<OutputPath>..\..\Common\Assemblies\</OutputPath> <OutputPath>..\..\Assemblies\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
@ -32,15 +32,15 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="0Harmony"> <Reference Include="0Harmony">
<HintPath>..\..\..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\RimWorld\Mods\Shaba_Addons\Assemblies\0Harmony.dll</HintPath> <HintPath>..\..\..\..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\RimWorld\Mods\Shaba_Addons\Assemblies\0Harmony.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="Assembly-CSharp"> <Reference Include="Assembly-CSharp">
<HintPath>..\..\..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\RimWorld\RimWorldWin64_Data\Managed\Assembly-CSharp.dll</HintPath> <HintPath>..\..\..\..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\RimWorld\RimWorldWin64_Data\Managed\Assembly-CSharp.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="RJW"> <Reference Include="RJW">
<HintPath>..\..\..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\RimWorld\Mods\rjw-master\1.3\Assemblies\RJW.dll</HintPath> <HintPath>..\..\..\..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\RimWorld\Mods\RJW\1.4\Assemblies\RJW.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
@ -52,7 +52,7 @@
<Reference Include="System.Net.Http" /> <Reference Include="System.Net.Http" />
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
<Reference Include="UnityEngine.CoreModule"> <Reference Include="UnityEngine.CoreModule">
<HintPath>..\..\..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\RimWorld\RimWorldWin64_Data\Managed\UnityEngine.CoreModule.dll</HintPath> <HintPath>..\..\..\..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\RimWorld\RimWorldWin64_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
</ItemGroup> </ItemGroup>
@ -75,5 +75,8 @@
<Compile Include="SexInteractionUtility.cs" /> <Compile Include="SexInteractionUtility.cs" />
<Compile Include="ThoughtDefOf.cs" /> <Compile Include="ThoughtDefOf.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<WCFMetadata Include="Connected Services\" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project> </Project>

View File

@ -11,6 +11,7 @@ namespace RJW_More_Genes
[DefOf] [DefOf]
public static class ThoughtDefOf public static class ThoughtDefOf
{ {
[MayRequireBiotech]
public static readonly ThoughtDef Pussy_Healed; public static readonly ThoughtDef Pussy_Healed;
} }
} }

View File

@ -0,0 +1 @@
f59e2df566da23df4599eff4fecc10000904942f

View File

@ -6,3 +6,8 @@ C:\Users\tyrob\OneDrive\Documenten\GitHub\RJW_More_Genes\RJW_More_Genes\Common\A
C:\Users\tyrob\OneDrive\Documenten\GitHub\RJW_More_Genes\RJW_More_Genes\Source\RJW_More_Genes\obj\Debug\RJW_More_Genes.csproj.AssemblyReference.cache C:\Users\tyrob\OneDrive\Documenten\GitHub\RJW_More_Genes\RJW_More_Genes\Source\RJW_More_Genes\obj\Debug\RJW_More_Genes.csproj.AssemblyReference.cache
C:\Users\tyrob\OneDrive\Documenten\GitHub\RJW_More_Genes\RJW_More_Genes\Source\RJW_More_Genes\obj\Debug\RJW_More_Genes.csproj.CoreCompileInputs.cache C:\Users\tyrob\OneDrive\Documenten\GitHub\RJW_More_Genes\RJW_More_Genes\Source\RJW_More_Genes\obj\Debug\RJW_More_Genes.csproj.CoreCompileInputs.cache
C:\Users\tyrob\OneDrive\Documenten\GitHub\RJW_More_Genes\RJW_More_Genes\Source\RJW_More_Genes\obj\Debug\RJW_More_Genes.dll C:\Users\tyrob\OneDrive\Documenten\GitHub\RJW_More_Genes\RJW_More_Genes\Source\RJW_More_Genes\obj\Debug\RJW_More_Genes.dll
C:\Users\tyrob\OneDrive\Documenten\GitHub\RJW_More_Genes\RJW_More_Genes\1.4\Assemblies\RJW_More_Genes.dll
C:\Users\tyrob\OneDrive\Documenten\GitHub\RJW_More_Genes\RJW_More_Genes\1.4\1.4\Assemblies\RJW_More_Genes.dll
C:\Users\tyrob\OneDrive\Documenten\GitHub\RJW_More_Genes\RJW_More_Genes\1.4\Source\RJW_More_Genes\obj\Debug\RJW_More_Genes.csproj.AssemblyReference.cache
C:\Users\tyrob\OneDrive\Documenten\GitHub\RJW_More_Genes\RJW_More_Genes\1.4\Source\RJW_More_Genes\obj\Debug\RJW_More_Genes.csproj.CoreCompileInputs.cache
C:\Users\tyrob\OneDrive\Documenten\GitHub\RJW_More_Genes\RJW_More_Genes\1.4\Source\RJW_More_Genes\obj\Debug\RJW_More_Genes.dll

View File

@ -7,10 +7,10 @@
</supportedVersions> </supportedVersions>
<description>Adds additional more genes connected to RJW to the game</description> <description>Adds additional more genes connected to RJW to the game</description>
<modDependencies> <modDependencies>
<li> <!-- <li>
<packageId>ludeon.rimworld.biotech</packageId> <packageId>ludeon.rimworld.biotech</packageId>
<displayName>Biotech</displayName> <displayName>Biotech</displayName>
</li> </li> -->
<li> <li>
<packageId>rim.job.world</packageId> <packageId>rim.job.world</packageId>
<displayName>RimJobWorld</displayName> <displayName>RimJobWorld</displayName>
@ -24,8 +24,8 @@
</li> </li>
</modDependencies> </modDependencies>
<loadAfter> <loadAfter>
<li>rim.job.world</li>
<li>brrainz.harmony</li> <li>brrainz.harmony</li>
<li>ludeon.rimworld.biotech</li> <!-- <li>ludeon.rimworld.biotech</li> -->
<li>rim.job.world</li>
</loadAfter> </loadAfter>
</ModMetaData> </ModMetaData>

View File

@ -1 +0,0 @@
1d1d2f5a3658f55aaa88d8cc24b3d4d7c5755ab0

View File

@ -0,0 +1,9 @@
<loadFolders>
<v1.4>
<li>/</li>
<li>1.4</li>
<li IfModActive="Ludeon.RimWorld.Biotech">1.4/Mods/Biotech</li>
</v1.4>
</loadFolders>