Compare commits

..

No commits in common. "18ed15a2f538e20c5c49bebc7d2cc3aec7e7e314" and "07cfb8291f70f6e2cdfeb3102abdb9199d80fad2" have entirely different histories.

13 changed files with 10 additions and 4350 deletions

Binary file not shown.

Binary file not shown.

File diff suppressed because it is too large Load diff

Binary file not shown.

View file

@ -1,33 +0,0 @@
<?xml version="1.0" encoding="utf-8" ?>
<Defs>
<ThoughtDef>
<defName>RJW_Beautyfuck</defName>
<thoughtClass>Thought_Memory</thoughtClass>
<durationDays>0.5</durationDays>
<stackLimit>1</stackLimit>
<stackedEffectMultiplier>1.0</stackedEffectMultiplier>
<stages>
<li>
<label>Fucked staggeringly ugly</label>
<description>Had sex with staggeringly ugly pawn</description>
<baseMoodEffect>-4</baseMoodEffect>
</li>
<li>
<label>Fucked ugly</label>
<description>Had sex with ugly pawn</description>
<baseMoodEffect>-2</baseMoodEffect>
</li>
<li>
<label>Fucked pretty</label>
<description>Had sex with pretty pawn</description>
<baseMoodEffect>2</baseMoodEffect>
</li>
<li>
<label>Fucked beautiful</label>
<description>Had sex with beautiful pawn</description>
<baseMoodEffect>4</baseMoodEffect>
</li>
</stages>
</ThoughtDef>
</Defs>

View file

@ -1,22 +0,0 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26228.4
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FB", "FB\FB.csproj", "{3FC2D442-19B8-4CF9-9D35-CD13B6AC7B28}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{3FC2D442-19B8-4CF9-9D35-CD13B6AC7B28}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3FC2D442-19B8-4CF9-9D35-CD13B6AC7B28}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3FC2D442-19B8-4CF9-9D35-CD13B6AC7B28}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3FC2D442-19B8-4CF9-9D35-CD13B6AC7B28}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

View file

@ -1,36 +0,0 @@
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("RJWFB")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("RJWFB")]
[assembly: AssemblyCopyright("Copyright © 2020")]
[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("5b1a0ad6-cb29-4231-ae02-c352c6ac3500")]
// 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")]

View file

@ -1,65 +0,0 @@
using HarmonyLib;
using RimWorld;
using rjw;
using Verse;
using System;
using System.Reflection;
namespace rjwfb
{
[StaticConstructorOnStartup]
internal static class InitHarmonyPatches
{
static InitHarmonyPatches()
{
var har = new Harmony("rjw.FB");
har.PatchAll(Assembly.GetExecutingAssembly());
}
}
[HarmonyPatch(typeof(AfterSexUtility), "think_about_sex", new Type[] { typeof(Pawn), typeof(Pawn), typeof(bool), typeof(SexProps), typeof(bool) })]
[StaticConstructorOnStartup]
static class Beautyfuck_AfterSexUtility_think_about_sex
{
public static readonly ThoughtDef RJW_Beautyfuck = DefDatabase<ThoughtDef>.GetNamed("RJW_Beautyfuck");
[HarmonyPostfix]
public static void think_about_sex_Patch(Pawn pawn, Pawn partner, bool isReceiving, SexProps props, bool whoring = false)
{
try
{
if (pawn == null)
{
return;
}
if (partner == null)
{
return;
}
var p1 = pawn;
var p2 = partner;
var p2beauty = p2.GetStatValue(StatDefOf.PawnBeauty, true);
var beautystage = -1;
if (p2beauty != 0)
{
if (p2beauty <= -2)
beautystage = 0;
else if (p2beauty <= -1)
beautystage = 1;
else if (p2beauty < 2)
beautystage = 2;
else
beautystage = 3;
if (beautystage != -1)
p1?.needs?.mood?.thoughts?.memories?.TryGainMemory(ThoughtMaker.MakeThought(RJW_Beautyfuck, beautystage), null);
}
}
catch(Exception e)
{
Log.Error(e.ToString());
}
}
}
}

View file

@ -1,62 +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>{3FC2D442-19B8-4CF9-9D35-CD13B6AC7B28}</ProjectGuid>
<OutputType>Library</OutputType>
<RootNamespace>FB</RootNamespace>
<AssemblyName>FB</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\..\Assemblies\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>..\..\Assemblies\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="0Harmony, Version=2.4.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Lib.Harmony.2.4.1\lib\net472\0Harmony.dll</HintPath>
</Reference>
<Reference Include="Assembly-CSharp">
<HintPath>..\..\..\..\..\RimWorldWin64_Data\Managed\Assembly-CSharp.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="RJW">
<HintPath>..\..\..\..\rjw\1.6\Assemblies\RJW.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System.Runtime.InteropServices.RuntimeInformation" />
<Reference Include="UnityEngine.CoreModule">
<HintPath>..\..\..\..\..\RimWorldWin64_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
<Private>False</Private>
</Reference>
</ItemGroup>
<ItemGroup>
<AppDesigner Include="Properties\" />
</ItemGroup>
<ItemGroup>
<Compile Include="fb.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

View file

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Lib.Harmony" version="2.4.1" targetFramework="net472" />
</packages>

View file

@ -8,7 +8,6 @@
<li>1.3</li> <li>1.3</li>
<li>1.4</li> <li>1.4</li>
<li>1.5</li> <li>1.5</li>
<li>1.6</li>
</supportedVersions> </supportedVersions>
<packageId>rjw.FB</packageId> <packageId>rjw.FB</packageId>
<modDependencies> <modDependencies>
@ -23,9 +22,17 @@
<downloadUrl>https://github.com/pardeike/HarmonyRimWorld/releases/latest</downloadUrl> <downloadUrl>https://github.com/pardeike/HarmonyRimWorld/releases/latest</downloadUrl>
<steamWorkshopUrl>steam://url/CommunityFilePage/2009463077</steamWorkshopUrl> <steamWorkshopUrl>steam://url/CommunityFilePage/2009463077</steamWorkshopUrl>
</li> </li>
<li>
<packageId>UnlimitedHugs.HugsLib</packageId>
<displayName>HugsLib</displayName>
<downloadUrl>https://github.com/UnlimitedHugs/RimworldHugsLib/releases/latest</downloadUrl>
<steamWorkshopUrl>steam://url/CommunityFilePage/818773962</steamWorkshopUrl>
</li>
</modDependencies> </modDependencies>
<loadAfter> <loadAfter>
<li>brrainz.harmony</li> <li>brrainz.harmony</li>
<li>UnlimitedHugs.HugsLib</li>
<li>erdelf.HumanoidAlienRaces</li>
<li>rim.job.world</li> <li>rim.job.world</li>
</loadAfter> </loadAfter>
<description> <description>

View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<Manifest> <Manifest>
<identifier>RimJobWorld FB</identifier> <identifier>RimJobWorld FB</identifier>
<version>1.4.0</version> <version>1.3.0</version>
<dependencies> <dependencies>
<li>RimJobWorld</li> <li>RimJobWorld</li>
</dependencies> </dependencies>

View file

@ -11,6 +11,7 @@ LoversLab:
Requirements: Requirements:
Harmony Harmony
Hugslib
Rimjobworld (https://gitgud.io/Ed86/rjw) Rimjobworld (https://gitgud.io/Ed86/rjw)
Additional features to RimJobWorld: Additional features to RimJobWorld: