diff --git a/1.5/source/RJW_Menstruation/MilkModule/JobDriver_MilkSelf.cs b/1.5/source/RJW_Menstruation/MilkModule/JobDriver_MilkSelf.cs deleted file mode 100644 index 1a1cfd4..0000000 --- a/1.5/source/RJW_Menstruation/MilkModule/JobDriver_MilkSelf.cs +++ /dev/null @@ -1,119 +0,0 @@ -using Milk; -using RJW_Menstruation; -using Verse; - -namespace MilkModule -{ - public class JobDriver_MilkSelf_MC : JobDriver_MilkSelf - { - HumanCompHasGatherableBodyResource comp; - HediffComp_Breast breastcomp; - - protected override float Fullness - { - get - { - return comp?.Fullness ?? 0f; - } - } - - protected override void PreMakeNewToils() - { - comp = GetMilkComp(pawn); - breastcomp = pawn.GetBreastComp(); - } - - protected override void Gathered() - { - comp?.Gathered(pawn); - } - - protected override void PostTickAction() - { - breastcomp?.AdjustNippleProgress(Rand.Range(0.0f, 0.000005f) * Configurations.MaxNippleIncrementFactor); - } - - - public static HumanCompHasGatherableBodyResource GetMilkComp(Pawn pawn) - { - HumanCompHasGatherableBodyResource result; - if (pawn.health.hediffSet.HasHediff(VariousDefOf.Hediff_Heavy_Lactating_Permanent)) - { - result = pawn.TryGetComp(); - - } - else - { - result = pawn.TryGetComp(); - } - return result; - } - - - - } - - - //public class JobDriver_HumanMilkSelf : JobDriver - //{ - // const float milkingTime = 250f;//ticks - 120 = 2 real seconds, 3 in-game minutes - // - // public override bool TryMakePreToilReservations(bool errorOnFailed) - // { - // return pawn.Reserve(pawn, job, 1, -1, null, errorOnFailed); - // } - // - // protected override IEnumerable MakeNewToils() - // { - // - // HumanCompHasGatherableBodyResource Comp = GetMilkComp(pawn); - // HediffComp_Breast breastcomp = pawn.GetBreastComp(); - // this.FailOn(delegate - // { - // return !(Comp.Fullness > 0.01f); - // }); - // Toil milking = Toils_General.Wait((int)(50 + milkingTime * Comp.Fullness), TargetIndex.None);//duration of - // - // milking.WithProgressBarToilDelay(TargetIndex.A); - // milking.tickAction = delegate () - // { - // if (breastcomp != null) - // { - // breastcomp.AdjustAreolaSize(Rand.Range(0.0f,0.0001f * Configurations.NipplePermanentTransitionVariance)); - // breastcomp.AdjustNippleSize(Rand.Range(0.0f,0.0001f * Configurations.NipplePermanentTransitionVariance)); - // } - // - // }; - // yield return milking; - // yield return new Toil() - // { - // initAction = delegate () - // { - // Comp.Gathered(pawn); - // } - // }; - // //yield return excreting; - // yield break; - // - // } - // - // - // public static HumanCompHasGatherableBodyResource GetMilkComp(Pawn pawn) - // { - // HumanCompHasGatherableBodyResource result; - // if (pawn.health.hediffSet.HasHediff(VariousDefOf.Hediff_Heavy_Lactating_Permanent)) - // { - // result = pawn.TryGetComp(); - // } - // else - // { - // result = pawn.TryGetComp(); - // } - // return result; - // } - // - // - //} - - -} diff --git a/1.5/source/RJW_Menstruation/MilkModule/MilkModule.csproj b/1.5/source/RJW_Menstruation/MilkModule/MilkModule.csproj deleted file mode 100644 index 646ba34..0000000 --- a/1.5/source/RJW_Menstruation/MilkModule/MilkModule.csproj +++ /dev/null @@ -1,104 +0,0 @@ - - - - - Debug - AnyCPU - {3591B3C1-EB57-44BF-AB69-A613E097A7F8} - Library - Properties - MilkModule - MilkModule - v4.8 - 512 - true - - - - true - full - false - ..\..\..\MilkModule\Assemblies\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - ..\..\..\MilkModule\Assemblies\ - TRACE - prompt - 4 - - - - ..\..\..\..\..\..\RimWorldWin64_Data\Managed\Assembly-CSharp.dll - False - - - ..\..\..\..\..\rjw-mc\1.3\Assemblies\Milk.dll - False - - - - - - - - - - - ..\..\..\..\..\..\RimWorldWin64_Data\Managed\UnityEngine.dll - False - - - ..\..\..\..\..\..\RimWorldWin64_Data\Managed\UnityEngine.CoreModule.dll - False - - - ..\..\..\..\..\..\RimWorldWin64_Data\Managed\UnityEngine.IMGUIModule.dll - False - - - ..\..\..\..\..\..\RimWorldWin64_Data\Managed\UnityEngine.TextCoreModule.dll - False - - - ..\..\..\..\..\..\RimWorldWin64_Data\Managed\UnityEngine.TextRenderingModule.dll - False - - - ..\..\..\..\..\..\RimWorldWin64_Data\Managed\UnityEngine.UI.dll - False - - - ..\..\..\..\..\..\RimWorldWin64_Data\Managed\UnityEngine.UIElementsModule.dll - False - - - ..\..\..\..\..\..\RimWorldWin64_Data\Managed\UnityEngine.UIModule.dll - False - - - - - - - - - - {eed2f3b9-8c20-4194-919e-8d151b29f70b} - RJW_Menstruation - False - - - - - 2.2.2 - runtime - compile; build; native; contentfiles; analyzers; buildtransitive - - - - \ No newline at end of file diff --git a/1.5/source/RJW_Menstruation/MilkModule/Milk_Patch.cs b/1.5/source/RJW_Menstruation/MilkModule/Milk_Patch.cs deleted file mode 100644 index 3167822..0000000 --- a/1.5/source/RJW_Menstruation/MilkModule/Milk_Patch.cs +++ /dev/null @@ -1,28 +0,0 @@ -using HarmonyLib; -using Milk; -using RJW_Menstruation; -using System.Reflection; -using Verse; - -namespace MilkModule -{ - internal static class First - { - static First() - { - Harmony har = new Harmony("RJW_Menstruation_MilkModule"); - har.PatchAll(Assembly.GetExecutingAssembly()); - } - } - - [HarmonyPatch(typeof(HumanCompHasGatherableBodyResource), nameof(HumanCompHasGatherableBodyResource.Gathered))] - public static class Milk_Patch - { - public static void Postfix(HumanCompHasGatherableBodyResource __instance) - { - if (__instance.parent is Pawn pawn) - pawn.GetBreastComp()?.AdjustNippleProgress(Rand.Range(0.0f, 0.005f) * Configurations.MaxNippleIncrementFactor); - } - - } -} diff --git a/1.5/source/RJW_Menstruation/MilkModule/Properties/AssemblyInfo.cs b/1.5/source/RJW_Menstruation/MilkModule/Properties/AssemblyInfo.cs deleted file mode 100644 index c526740..0000000 --- a/1.5/source/RJW_Menstruation/MilkModule/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// 어셈블리에 대한 일반 정보는 다음 특성 집합을 통해 -// 제어됩니다. 어셈블리와 관련된 정보를 수정하려면 -// 이러한 특성 값을 변경하세요. -[assembly: AssemblyTitle("MilkModule")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("MilkModule")] -[assembly: AssemblyCopyright("Copyright © 2021")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// ComVisible을 false로 설정하면 이 어셈블리의 형식이 COM 구성 요소에 -// 표시되지 않습니다. COM에서 이 어셈블리의 형식에 액세스하려면 -// 해당 형식에 대해 ComVisible 특성을 true로 설정하세요. -[assembly: ComVisible(false)] - -// 이 프로젝트가 COM에 노출되는 경우 다음 GUID는 typelib의 ID를 나타냅니다. -[assembly: Guid("3591b3c1-eb57-44bf-ab69-a613e097a7f8")] - -// 어셈블리의 버전 정보는 다음 네 가지 값으로 구성됩니다. -// -// 주 버전 -// 부 버전 -// 빌드 번호 -// 수정 버전 -// -// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호를 -// 기본값으로 할 수 있습니다. -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/1.5/source/RJW_Menstruation/MilkModule/packages.config b/1.5/source/RJW_Menstruation/MilkModule/packages.config deleted file mode 100644 index 3299dfc..0000000 --- a/1.5/source/RJW_Menstruation/MilkModule/packages.config +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/LoadFolders.xml b/LoadFolders.xml index f711d5c..852eda7 100644 --- a/LoadFolders.xml +++ b/LoadFolders.xml @@ -15,4 +15,8 @@
  • 1.4
  • 1.4/RJW Menstruation Race Support
  • + +
  • 1.5
  • +
  • 1.5/RJW Menstruation Race Support
  • +
    \ No newline at end of file