Remove milk module files and update LoadFolders.xml for 1.5

2024-08-14 22:46:52 +00:00 · 2024-03-15 08:00:39 -07:00 · 2024-03-15 08:00:39 -07:00 · 0004822059
commit 0004822059
parent e447d1cc26
6 changed files with 4 additions and 288 deletions
--- a/1.5/source/RJW_Menstruation/MilkModule/JobDriver_MilkSelf.cs
+++ b/1.5/source/RJW_Menstruation/MilkModule/JobDriver_MilkSelf.cs
@ -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<CompHyperMilkableHuman>();
            }
            else
            {
                result = pawn.TryGetComp<CompMilkableHuman>();
            }
            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<Toil> 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<CompHyperMilkableHuman>();
    //        }
    //        else
    //        {
    //            result = pawn.TryGetComp<CompMilkableHuman>();
    //        }
    //        return result;
    //    }
    //
    //
    //}
 }
--- a/1.5/source/RJW_Menstruation/MilkModule/MilkModule.csproj
+++ b/1.5/source/RJW_Menstruation/MilkModule/MilkModule.csproj
@ -1,104 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
    <ProjectGuid>{3591B3C1-EB57-44BF-AB69-A613E097A7F8}</ProjectGuid>
    <OutputType>Library</OutputType>
    <AppDesignerFolder>Properties</AppDesignerFolder>
    <RootNamespace>MilkModule</RootNamespace>
    <AssemblyName>MilkModule</AssemblyName>
    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <Deterministic>true</Deterministic>
    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <DebugSymbols>true</DebugSymbols>
    <DebugType>full</DebugType>
    <Optimize>false</Optimize>
    <OutputPath>..\..\..\MilkModule\Assemblies\</OutputPath>
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <DebugType>pdbonly</DebugType>
    <Optimize>true</Optimize>
    <OutputPath>..\..\..\MilkModule\Assemblies\</OutputPath>
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="Assembly-CSharp">
      <HintPath>..\..\..\..\..\..\RimWorldWin64_Data\Managed\Assembly-CSharp.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="Milk">
      <HintPath>..\..\..\..\..\rjw-mc\1.3\Assemblies\Milk.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Core" />
    <Reference Include="System.Xml.Linq" />
    <Reference Include="System.Data.DataSetExtensions" />
    <Reference Include="Microsoft.CSharp" />
    <Reference Include="System.Data" />
    <Reference Include="System.Net.Http" />
    <Reference Include="System.Xml" />
    <Reference Include="UnityEngine">
      <HintPath>..\..\..\..\..\..\RimWorldWin64_Data\Managed\UnityEngine.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="UnityEngine.CoreModule">
      <HintPath>..\..\..\..\..\..\RimWorldWin64_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="UnityEngine.IMGUIModule">
      <HintPath>..\..\..\..\..\..\RimWorldWin64_Data\Managed\UnityEngine.IMGUIModule.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="UnityEngine.TextCoreModule">
      <HintPath>..\..\..\..\..\..\RimWorldWin64_Data\Managed\UnityEngine.TextCoreModule.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="UnityEngine.TextRenderingModule">
      <HintPath>..\..\..\..\..\..\RimWorldWin64_Data\Managed\UnityEngine.TextRenderingModule.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="UnityEngine.UI">
      <HintPath>..\..\..\..\..\..\RimWorldWin64_Data\Managed\UnityEngine.UI.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="UnityEngine.UIElementsModule">
      <HintPath>..\..\..\..\..\..\RimWorldWin64_Data\Managed\UnityEngine.UIElementsModule.dll</HintPath>
      <Private>False</Private>
    </Reference>
    <Reference Include="UnityEngine.UIModule">
      <HintPath>..\..\..\..\..\..\RimWorldWin64_Data\Managed\UnityEngine.UIModule.dll</HintPath>
      <Private>False</Private>
    </Reference>
  </ItemGroup>
  <ItemGroup>
    <Compile Include="JobDriver_MilkSelf.cs" />
    <Compile Include="Milk_Patch.cs" />
    <Compile Include="Properties\AssemblyInfo.cs" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\RJW_Menstruation\RJW_Menstruation.csproj">
      <Project>{eed2f3b9-8c20-4194-919e-8d151b29f70b}</Project>
      <Name>RJW_Menstruation</Name>
      <Private>False</Private>
    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="Lib.Harmony">
      <Version>2.2.2</Version>
      <ExcludeAssets>runtime</ExcludeAssets>
      <IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
--- a/1.5/source/RJW_Menstruation/MilkModule/Milk_Patch.cs
+++ b/1.5/source/RJW_Menstruation/MilkModule/Milk_Patch.cs
@ -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);
        }
    }
 }
--- a/1.5/source/RJW_Menstruation/MilkModule/Properties/AssemblyInfo.cs
+++ b/1.5/source/RJW_Menstruation/MilkModule/Properties/AssemblyInfo.cs
@ -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")]
--- a/1.5/source/RJW_Menstruation/MilkModule/packages.config
+++ b/1.5/source/RJW_Menstruation/MilkModule/packages.config
@ -1,2 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages />
--- a/LoadFolders.xml
+++ b/LoadFolders.xml
@ -15,4 +15,8 @@
 		<li>1.4</li>
 		<li IfModActive="ASMR.RJW.RaceSupport">1.4/RJW Menstruation Race Support</li>
 	</v1.4>
  <v1.5>
    <li>1.5</li>
    <li IfModActive="ASMR.RJW.RaceSupport">1.5/RJW Menstruation Race Support</li>
  </v1.5>
 </loadFolders>
		`@ -1,2 +0,0 @@`
			`<?xml version="1.0" encoding="utf-8"?>`
			`<packages />`