diff --git a/About/About.xml b/About/About.xml index 478b4ee..84cd010 100644 --- a/About/About.xml +++ b/About/About.xml @@ -36,6 +36,7 @@ This is a submod for RJW that adds: Credits: moreorganstodump Original Author c0ffee RJW 4.9.0 update -Vegapnk Cum-Per-Penis, Multifilling Cumbuckets, Sex fills Cumbucket]]> +Vegapnk Cum-Per-Penis, Multifilling Cumbuckets, Sex fills Cumbucket +Rain Vanilla Skils Expanded integration]]> \ No newline at end of file diff --git a/LoadFolders.xml b/LoadFolders.xml index 0b16636..cdc98d1 100644 --- a/LoadFolders.xml +++ b/LoadFolders.xml @@ -2,6 +2,7 @@
  • /
    • -
  • RJWSexperience_Ideology
    • +
  • Mod Compatibility/Vanilla Skills Expanded
    • +
  • Mod Compatibility/RJW Cum
    •      \ No newline at end of file diff --git a/Defs/JobDefs/Jobs_CleanSelfwithBucket.xml b/Mod Compatibility/RJW Cum/Defs/JobDefs/Jobs_CleanSelfwithBucket.xml similarity index 63% rename from Defs/JobDefs/Jobs_CleanSelfwithBucket.xml rename to Mod Compatibility/RJW Cum/Defs/JobDefs/Jobs_CleanSelfwithBucket.xml index 38c83ae..81c9df5 100644 --- a/Defs/JobDefs/Jobs_CleanSelfwithBucket.xml +++ b/Mod Compatibility/RJW Cum/Defs/JobDefs/Jobs_CleanSelfwithBucket.xml @@ -1,9 +1,9 @@ - + CleanSelfwithBucket - RJWSexperience.JobDriver_CleanSelfWithBucket + RJWSexperienceCum.JobDriver_CleanSelfWithBucket collecting cum true diff --git a/Defs/WorkGiverDefs/WorkGivers_CleanSelf.xml b/Mod Compatibility/RJW Cum/Defs/WorkGiverDefs/WorkGivers_CleanSelf.xml similarity index 78% rename from Defs/WorkGiverDefs/WorkGivers_CleanSelf.xml rename to Mod Compatibility/RJW Cum/Defs/WorkGiverDefs/WorkGivers_CleanSelf.xml index bb1b239..33dc067 100644 --- a/Defs/WorkGiverDefs/WorkGivers_CleanSelf.xml +++ b/Mod Compatibility/RJW Cum/Defs/WorkGiverDefs/WorkGivers_CleanSelf.xml @@ -1,9 +1,9 @@ - + CleanSelfwithBucket - RJWSexperience.Cum.WorkGiver_CleanSelfWithBucket + RJWSexperienceCum.WorkGiver_CleanSelfWithBucket BasicWorker collect cum into a collecting cum into a diff --git a/Mod Compatibility/Vanilla Skills Expanded/Defs/ExpertiseDefs/ExpertiseSex.xml b/Mod Compatibility/Vanilla Skills Expanded/Defs/ExpertiseDefs/ExpertiseSex.xml new file mode 100644 index 0000000..885c7ea --- /dev/null +++ b/Mod Compatibility/Vanilla Skills Expanded/Defs/ExpertiseDefs/ExpertiseSex.xml @@ -0,0 +1,78 @@ + + + + + Sensualist + + Sex + An expert in sex and sensuous activities. + + 0.05 + + + + + Rapist + + Sex + An experienced rapist. + + -0.025 + + 0.025 + + + + + Victim + + Sex + An expertise in getting raped. + + 0.025 + -0.025 + + + + + Submissive + + Sex + An expert in sexual submission. + + 0.025 + 0.025 + + + + + Dominant + + Sex + An expert in sexual domination. + + -0.025 + 0.025 + + + + + Hypersexuality + + Sex + A sex craved individual. + + 0.05 + + + + + Prude + + Sex + An experienced person in sex but decided they do not like it. + + -0.05 + + + \ No newline at end of file diff --git a/RJWSexperience/RJWSexperience.sln b/RJWSexperience/RJWSexperience.sln index 497354e..d4b374c 100644 --- a/RJWSexperience/RJWSexperience.sln +++ b/RJWSexperience/RJWSexperience.sln @@ -1,10 +1,12 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.31424.327 +# Visual Studio Version 17 +VisualStudioVersion = 17.2.32630.192 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RJWSexperience", "RJWSexperience\RJWSexperience.csproj", "{9C728E06-573B-4B04-A07F-ACBF60CB424D}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RJWSexperienceCum", "RJWSexperienceCum\RJWSexperienceCum.csproj", "{73CB4597-22BD-4A3E-A3CE-6D65DD080F65}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -15,6 +17,10 @@ Global {9C728E06-573B-4B04-A07F-ACBF60CB424D}.Debug|Any CPU.Build.0 = Debug|Any CPU {9C728E06-573B-4B04-A07F-ACBF60CB424D}.Release|Any CPU.ActiveCfg = Release|Any CPU {9C728E06-573B-4B04-A07F-ACBF60CB424D}.Release|Any CPU.Build.0 = Release|Any CPU + {73CB4597-22BD-4A3E-A3CE-6D65DD080F65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {73CB4597-22BD-4A3E-A3CE-6D65DD080F65}.Debug|Any CPU.Build.0 = Debug|Any CPU + {73CB4597-22BD-4A3E-A3CE-6D65DD080F65}.Release|Any CPU.ActiveCfg = Release|Any CPU + {73CB4597-22BD-4A3E-A3CE-6D65DD080F65}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/RJWSexperience/RJWSexperience/Cum/JobGiver_UseBucket.cs b/RJWSexperience/RJWSexperience/Cum/JobGiver_UseBucket.cs deleted file mode 100644 index 6e16796..0000000 --- a/RJWSexperience/RJWSexperience/Cum/JobGiver_UseBucket.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; -using Verse; -using Verse.AI; - -namespace RJWSexperience.Cum -{ - public class JobGiver_UseBucket : ThinkNode_JobGiver - { - protected override Job TryGiveJob(Pawn pawn) - { - throw new NotImplementedException(); - } - } -} diff --git a/RJWSexperience/RJWSexperience/RJWSexperience.csproj b/RJWSexperience/RJWSexperience/RJWSexperience.csproj index 149af57..36c0229 100644 --- a/RJWSexperience/RJWSexperience/RJWSexperience.csproj +++ b/RJWSexperience/RJWSexperience/RJWSexperience.csproj @@ -45,8 +45,6 @@ - - @@ -56,7 +54,6 @@ - diff --git a/RJWSexperience/RJWSexperience/VariousDefOf.cs b/RJWSexperience/RJWSexperience/VariousDefOf.cs index 8940ffb..3f03d67 100644 --- a/RJWSexperience/RJWSexperience/VariousDefOf.cs +++ b/RJWSexperience/RJWSexperience/VariousDefOf.cs @@ -28,14 +28,10 @@ namespace RJWSexperience public static readonly ChemicalDef Cum; public static readonly NeedDef Chemical_Cum; public static readonly TraitDef Virgin; - public static readonly JobDef CleanSelfwithBucket; public static readonly KeyBindingDef OpenSexStatistics; public static readonly StatDef SexAbility; public static readonly HediffDef CumAddiction; public static readonly HediffDef CumTolerance; - [MayRequire("rjw.cum")] public static readonly HediffDef Hediff_CumController; - [MayRequire("rjw.cum")] public static readonly HediffDef Hediff_Cum; //for humans & animals - [MayRequire("rjw.cum")] public static readonly HediffDef Hediff_InsectSpunk; } } diff --git a/RJWSexperience/RJWSexperienceCum/HediffDefOf.cs b/RJWSexperience/RJWSexperienceCum/HediffDefOf.cs new file mode 100644 index 0000000..5f15c22 --- /dev/null +++ b/RJWSexperience/RJWSexperienceCum/HediffDefOf.cs @@ -0,0 +1,13 @@ +using RimWorld; +using Verse; + +namespace RJWSexperienceCum +{ + [DefOf] + public static class HediffDefOf + { + public static readonly HediffDef Hediff_CumController; + public static readonly HediffDef Hediff_Cum; + public static readonly HediffDef Hediff_InsectSpunk; + } +} diff --git a/RJWSexperience/RJWSexperienceCum/JobDefOf.cs b/RJWSexperience/RJWSexperienceCum/JobDefOf.cs new file mode 100644 index 0000000..ef219ec --- /dev/null +++ b/RJWSexperience/RJWSexperienceCum/JobDefOf.cs @@ -0,0 +1,11 @@ +using RimWorld; +using Verse; + +namespace RJWSexperienceCum +{ + [DefOf] + public static class JobDefOf + { + public static readonly JobDef CleanSelfwithBucket; + } +} diff --git a/RJWSexperience/RJWSexperience/Cum/JobDriver_CleanSelfWithBucket.cs b/RJWSexperience/RJWSexperienceCum/JobDriver_CleanSelfWithBucket.cs similarity index 86% rename from RJWSexperience/RJWSexperience/Cum/JobDriver_CleanSelfWithBucket.cs rename to RJWSexperience/RJWSexperienceCum/JobDriver_CleanSelfWithBucket.cs index 5678b81..ba2fb57 100644 --- a/RJWSexperience/RJWSexperience/Cum/JobDriver_CleanSelfWithBucket.cs +++ b/RJWSexperience/RJWSexperienceCum/JobDriver_CleanSelfWithBucket.cs @@ -1,9 +1,9 @@ -using RimWorld; +using RJWSexperience; using System.Collections.Generic; using Verse; using Verse.AI; -namespace RJWSexperience // Used in Menstruation with this namespace +namespace RJWSexperienceCum { public class JobDriver_CleanSelfWithBucket : JobDriver { @@ -31,7 +31,7 @@ namespace RJWSexperience // Used in Menstruation with this namespace this.FailOn(delegate { List hediffs = pawn.health.hediffSet.hediffs; - return !hediffs.Exists(x => x.def == VariousDefOf.Hediff_CumController); + return !hediffs.Exists(x => x.def == HediffDefOf.Hediff_CumController); }); yield return Toils_Goto.GotoThing(TargetIndex.B, PathEndMode.ClosestTouch); Toil cleaning = new Toil @@ -48,7 +48,7 @@ namespace RJWSexperience // Used in Menstruation with this namespace protected void CleaningInit() { - hediffcache = pawn.health.hediffSet.hediffs.Find(x => x.def == VariousDefOf.Hediff_Cum || x.def == VariousDefOf.Hediff_InsectSpunk); + hediffcache = pawn.health.hediffSet.hediffs.Find(x => x.def == HediffDefOf.Hediff_Cum || x.def == HediffDefOf.Hediff_InsectSpunk); if (hediffcache == null) { pawn.jobs.EndCurrentJob(JobCondition.Succeeded); @@ -84,7 +84,7 @@ namespace RJWSexperience // Used in Menstruation with this namespace protected void Finish() { - if (pawn.CurJobDef == JobDefOf.Wait_MaintainPosture) + if (pawn.CurJobDef == RimWorld.JobDefOf.Wait_MaintainPosture) { pawn.jobs.EndCurrentJob(JobCondition.InterruptForced); } diff --git a/RJWSexperience/RJWSexperienceCum/Properties/AssemblyInfo.cs b/RJWSexperience/RJWSexperienceCum/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..4795d5c --- /dev/null +++ b/RJWSexperience/RJWSexperienceCum/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("RJWSexperienceCum")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("RJWSexperienceCum")] +[assembly: AssemblyCopyright("Copyright © 2022")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("73cb4597-22bd-4a3e-a3ce-6d65dd080f65")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/RJWSexperience/RJWSexperienceCum/RJWSexperienceCum.csproj b/RJWSexperience/RJWSexperienceCum/RJWSexperienceCum.csproj new file mode 100644 index 0000000..c5f1072 --- /dev/null +++ b/RJWSexperience/RJWSexperienceCum/RJWSexperienceCum.csproj @@ -0,0 +1,61 @@ + + + + + Debug + AnyCPU + {73CB4597-22BD-4A3E-A3CE-6D65DD080F65} + Library + Properties + RJWSexperienceCum + RJWSexperienceCum + v4.7.2 + 512 + true + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + ..\..\Mod Compatibility\RJW Cum\Assemblies\ + TRACE + prompt + 4 + + + + + + + + + + + + + + + + + + + 1.3.3389 + + + + + {9c728e06-573b-4b04-a07f-acbf60cb424d} + RJWSexperience + False + + + + \ No newline at end of file diff --git a/RJWSexperience/RJWSexperienceCum/ThingDefOf.cs b/RJWSexperience/RJWSexperienceCum/ThingDefOf.cs new file mode 100644 index 0000000..7c921fa --- /dev/null +++ b/RJWSexperience/RJWSexperienceCum/ThingDefOf.cs @@ -0,0 +1,12 @@ +using RimWorld; +using Verse; + +namespace RJWSexperienceCum +{ + [DefOf] + public static class ThingDefOf + { + public static readonly ThingDef GatheredCum; + public static readonly ThingDef CumBucket; + } +} diff --git a/RJWSexperience/RJWSexperience/Cum/WorkGiver_CleanSelfWithBucket.cs b/RJWSexperience/RJWSexperienceCum/WorkGiver_CleanSelfWithBucket.cs similarity index 61% rename from RJWSexperience/RJWSexperience/Cum/WorkGiver_CleanSelfWithBucket.cs rename to RJWSexperience/RJWSexperienceCum/WorkGiver_CleanSelfWithBucket.cs index 8a1ba96..8c60b0c 100644 --- a/RJWSexperience/RJWSexperience/Cum/WorkGiver_CleanSelfWithBucket.cs +++ b/RJWSexperience/RJWSexperienceCum/WorkGiver_CleanSelfWithBucket.cs @@ -1,16 +1,17 @@ using RimWorld; +using RJWSexperience; using Verse; using Verse.AI; -namespace RJWSexperience.Cum +namespace RJWSexperienceCum { public class WorkGiver_CleanSelfWithBucket : WorkGiver_Scanner { - public override ThingRequest PotentialWorkThingRequest => ThingRequest.ForDef(VariousDefOf.CumBucket); + public override ThingRequest PotentialWorkThingRequest => ThingRequest.ForDef(ThingDefOf.CumBucket); public override PathEndMode PathEndMode => PathEndMode.ClosestTouch; public override bool ShouldSkip(Pawn pawn, bool forced = false) { - return VariousDefOf.Hediff_CumController == null || !pawn.health.hediffSet.HasHediff(VariousDefOf.Hediff_CumController); + return HediffDefOf.Hediff_CumController == null || !pawn.health.hediffSet.HasHediff(HediffDefOf.Hediff_CumController); } public override bool HasJobOnThing(Pawn pawn, Thing t, bool forced = false) @@ -18,12 +19,12 @@ namespace RJWSexperience.Cum if (!(t is Building_CumBucket bucket)) return false; - return bucket.StoredStackCount < VariousDefOf.GatheredCum.stackLimit; + return bucket.StoredStackCount < ThingDefOf.GatheredCum.stackLimit; } public override Job JobOnThing(Pawn pawn, Thing t, bool forced = false) { - return JobMaker.MakeJob(VariousDefOf.CleanSelfwithBucket, pawn, t); + return JobMaker.MakeJob(JobDefOf.CleanSelfwithBucket, pawn, t); } } }