mirror of
https://github.com/amevarashi/RJW-Sexperience.git
synced 2024-08-14 23:54:08 +00:00
Compare commits
No commits in common. "master" and "1.4.1.0" have entirely different histories.
26 changed files with 475 additions and 520 deletions
Binary file not shown.
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||
<Manifest>
|
||||
<identifier>RJWSexperience</identifier>
|
||||
<version>1.4.1.3</version>
|
||||
<version>1.4.1.0</version>
|
||||
<dependencies>
|
||||
<li>RimJobWorld >= 5.3.0</li>
|
||||
</dependencies>
|
||||
|
|
15
CHANGELOG.md
15
CHANGELOG.md
|
@ -1,16 +1,11 @@
|
|||
### 1.4.1.3
|
||||
* Prisoners use buckets to clean themselves
|
||||
|
||||
### 1.4.1.2
|
||||
* Fixed IsVirgin check for pawns with children
|
||||
|
||||
### 1.4.1.1
|
||||
* Fixed exception when pawn uses a bucket
|
||||
* Marked Sex History button shrinkable and lowered its UI order
|
||||
|
||||
### 1.4.1.0
|
||||
|
||||
* Changed to a new versioning system. Now the first two digits are a Rimworld version, followed by the major and minor version of the mod.
|
||||
|
||||
##### by Luciferus666
|
||||
|
||||
* Added sex skill icons for VRE - Android and VRE - Genie
|
||||
|
||||
##### by yiyuandian
|
||||
|
||||
* Added ChineseSimplified Translation
|
|
@ -85,10 +85,6 @@
|
|||
<RSOption_EnableSexHistory_Desc>* Needs a game restart\n\nEnables Sex History window, information collection for the said window and save/load of this information. Also enables sex partners count in the pawn's records.\n\n[Caution] Disabling this mid save will result in the loss of previously collected histories.</RSOption_EnableSexHistory_Desc>
|
||||
<RSOption_HideGizmoWhenDrafted_Label>Hide Sex History button when drafted</RSOption_HideGizmoWhenDrafted_Label>
|
||||
<RSOption_HideGizmoWhenDrafted_Desc>Hides Sex History Gizmo for currently drafted pawns</RSOption_HideGizmoWhenDrafted_Desc>
|
||||
<RSOption_VirginityCheck_M2M_Label>Remove virginity with anal sex (for male/male sex)</RSOption_VirginityCheck_M2M_Label>
|
||||
<RSOption_VirginityCheck_M2M_Desc>Remove virginity with anal sex (for male/male sex)</RSOption_VirginityCheck_M2M_Desc>
|
||||
<RSOption_VirginityCheck_F2F_Label>Remove virginity with scissoring sex (for female/female sex)</RSOption_VirginityCheck_F2F_Label>
|
||||
<RSOption_VirginityCheck_F2F_Desc>Remove virginity with scissoring sex (for female/female sex)</RSOption_VirginityCheck_F2F_Desc>
|
||||
|
||||
<!-- Mod settings: Debug -->
|
||||
<RSOption_Debug_Label>Debug</RSOption_Debug_Label>
|
||||
|
|
Binary file not shown.
|
@ -1,19 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
|
||||
<Defs>
|
||||
<ThinkTreeDef>
|
||||
<defName>CleanSelfWithBucket</defName>
|
||||
<insertTag>Humanlike_PostDuty</insertTag>
|
||||
<insertPriority>100</insertPriority>
|
||||
<thinkRoot Class="ThinkNode_Priority">
|
||||
<subNodes>
|
||||
<li Class="ThinkNode_ConditionalPrisoner">
|
||||
<leaveJoinableLordIfIssuesJob>true</leaveJoinableLordIfIssuesJob>
|
||||
<subNodes>
|
||||
<li Class="RJWSexperienceCum.JobGiver_CleanSelfWithBucket"/>
|
||||
</subNodes>
|
||||
</li>
|
||||
</subNodes>
|
||||
</thinkRoot>
|
||||
</ThinkTreeDef>
|
||||
</Defs>
|
|
@ -25,9 +25,6 @@ namespace RJWSexperience
|
|||
public readonly SettingHandle<bool> EnableSexHistory = new SettingHandle<bool>("EnableSexHistory", true);
|
||||
public readonly SettingHandle<bool> HideGizmoWhenDrafted = new SettingHandle<bool>("HideGizmoWhenDrafted", true);
|
||||
|
||||
public readonly SettingHandle<bool> VirginityCheck_M2M_Anal = new SettingHandle<bool>("VirginityCheck_M2M_Anal", true);
|
||||
public readonly SettingHandle<bool> VirginityCheck_F2F_Scissoring = new SettingHandle<bool>("VirginityCheck_F2F_Scissoring", false);
|
||||
|
||||
public readonly SettingHandle<bool> DevMode = new SettingHandle<bool>("DevMode", false);
|
||||
|
||||
public readonly SettingHandle<bool> SelectionLocked = new SettingHandle<bool>("SelectionLocked", false);
|
||||
|
|
|
@ -145,15 +145,14 @@ namespace RJWSexperience.Cum
|
|||
if (!sexFillsCumbuckets)
|
||||
return;
|
||||
|
||||
// Enumerable throws System.InvalidOperationException: Collection was modified; enumeration operation may not execute.
|
||||
List<Building_CumBucket> buckets = props.pawn.GetAdjacentBuildings<Building_CumBucket>().ToList();
|
||||
IEnumerable<Building_CumBucket> buckets = props.pawn.GetAdjacentBuildings<Building_CumBucket>();
|
||||
|
||||
if (buckets?.Count > 0)
|
||||
if (buckets?.EnumerableCount() > 0)
|
||||
{
|
||||
var initialCum = GetCumVolume(props.pawn);
|
||||
var initialCum = CumUtility.GetCumVolume(props.pawn);
|
||||
foreach (Building_CumBucket bucket in buckets)
|
||||
{
|
||||
bucket.AddCum(initialCum / buckets.Count);
|
||||
bucket.AddCum(initialCum / buckets.EnumerableCount());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -54,8 +54,8 @@ namespace RJWSexperience
|
|||
/// </summary>
|
||||
public static bool IsVirgin(this Pawn pawn)
|
||||
{
|
||||
return pawn.records.GetValue(RsDefOf.Record.VaginalSexCount) == 0 &&
|
||||
(pawn.relations?.ChildrenCount ?? 0) < 1; // Male is a virgins unless he stick into vagina? Not sure it should work this way
|
||||
return pawn.records.GetValue(RsDefOf.Record.VaginalSexCount) == 0 ||
|
||||
pawn.relations?.ChildrenCount > 0; // Male is a virgins unless he stick into vagina? Not sure it should work this way
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
|
@ -98,10 +98,6 @@ namespace RJWSexperience
|
|||
public static readonly string Option_HideGizmoWithRJW_Label = "RSOption_HideGizmoWithRJW_Label".Translate();
|
||||
public static readonly string Option_HideGizmoWithRJW_Desc = "RSOption_HideGizmoWithRJW_Desc".Translate();
|
||||
public static readonly string Button_ResetToDefault = "Button_ResetToDefault".Translate();
|
||||
public static readonly string Option_VirginityCheck_M2M_Label = "RSOption_VirginityCheck_M2M_Label".Translate();
|
||||
public static readonly string Option_VirginityCheck_M2M_Desc = "RSOption_VirginityCheck_M2M_Desc".Translate();
|
||||
public static readonly string Option_VirginityCheck_F2F_Label = "RSOption_VirginityCheck_F2F_Label".Translate();
|
||||
public static readonly string Option_VirginityCheck_F2F_Desc = "RSOption_VirginityCheck_F2F_Desc".Translate();
|
||||
|
||||
public static string Translate(this PartnerOrderMode mode)
|
||||
{
|
||||
|
|
|
@ -94,43 +94,10 @@ namespace RJWSexperience
|
|||
{
|
||||
public static void Postfix(JobDriver_SexBaseInitiator __instance)
|
||||
{
|
||||
if (__instance.Sexprops.hasPartner())
|
||||
if (__instance.Sexprops.hasPartner() && __instance.Sexprops.sexType == xxx.rjwSextype.Vaginal)
|
||||
{
|
||||
// remove hetero virginity
|
||||
if((__instance.Sexprops.sexType == xxx.rjwSextype.Vaginal || __instance.Sexprops.sexType == xxx.rjwSextype.DoublePenetration))
|
||||
{
|
||||
__instance.pawn.TryRemoveVirginity(__instance.Partner, __instance.Sexprops);
|
||||
__instance.Partner.TryRemoveVirginity(__instance.pawn, __instance.Sexprops);
|
||||
} else if(__instance.Sexprops.sexType == xxx.rjwSextype.Fisting)
|
||||
{
|
||||
//check if receiver is a virgin female..
|
||||
Pawn receiver = __instance.Sexprops.IsInitiator() ? __instance.Partner : __instance.pawn;
|
||||
if (receiver != null && receiver.gender == Gender.Female && receiver.IsVirgin())
|
||||
{
|
||||
Pawn initiator = __instance.Sexprops.IsInitiator() ? __instance.pawn : __instance.Partner;
|
||||
receiver.TryRemoveVirginity(initiator, __instance.Sexprops);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// check if both pawn are male -> anal used as alternative virginity remover
|
||||
if(SexperienceMod.Settings.VirginityCheck_M2M_Anal &&
|
||||
__instance.Sexprops.sexType == xxx.rjwSextype.Anal
|
||||
&& __instance.pawn.gender == Gender.Male && __instance.Partner.gender == Gender.Male)
|
||||
{
|
||||
__instance.pawn.TryRemoveVirginity(__instance.Partner, __instance.Sexprops);
|
||||
__instance.Partner.TryRemoveVirginity(__instance.pawn, __instance.Sexprops);
|
||||
}
|
||||
|
||||
// check if both pawn are female -> scissoring used as alternative virginity remover
|
||||
if(SexperienceMod.Settings.VirginityCheck_F2F_Scissoring &&
|
||||
__instance.Sexprops.sexType == xxx.rjwSextype.Scissoring
|
||||
&& __instance.pawn.gender == Gender.Female && __instance.Partner.gender == Gender.Female)
|
||||
{
|
||||
__instance.pawn.TryRemoveVirginity(__instance.Partner, __instance.Sexprops);
|
||||
__instance.Partner.TryRemoveVirginity(__instance.pawn, __instance.Sexprops);
|
||||
}
|
||||
}
|
||||
__instance.pawn.TryRemoveVirginity(__instance.Partner, __instance.Sexprops);
|
||||
__instance.Partner.TryRemoveVirginity(__instance.pawn, __instance.Sexprops);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,31 +1,116 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<?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>{9C728E06-573B-4B04-A07F-ACBF60CB424D}</ProjectGuid>
|
||||
<TargetFramework>net472</TargetFramework>
|
||||
<OutputType>Library</OutputType>
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>RJWSexperience</RootNamespace>
|
||||
<AssemblyName>RJWSexperience</AssemblyName>
|
||||
<OutputPath>..\..\1.4\Assemblies\</OutputPath>
|
||||
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
|
||||
<Company>amevarashi</Company>
|
||||
<Optimize>True</Optimize>
|
||||
<GenerateAssemblyInfo>False</GenerateAssemblyInfo>
|
||||
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<Deterministic>true</Deterministic>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<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' ">
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<Optimize>true</Optimize>
|
||||
<OutputPath>..\..\1.4\Assemblies\</OutputPath>
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Krafs.Rimworld.Ref">
|
||||
<Version>1.4.*</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Lib.Harmony">
|
||||
<Version>2.*</Version>
|
||||
<ExcludeAssets>runtime</ExcludeAssets>
|
||||
<IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||
</PackageReference>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Reference Include="RJW">
|
||||
<HintPath>..\..\..\rjw\1.4\Assemblies\RJW.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="System.Data.DataSetExtensions" />
|
||||
<Reference Include="Microsoft.CSharp" />
|
||||
<Reference Include="System.Data" />
|
||||
<Reference Include="System.Net.Http" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="Cum\Building_Cumbucket.cs" />
|
||||
<Compile Include="Configurations.cs" />
|
||||
<Compile Include="Cum\CumUtility.cs" />
|
||||
<Compile Include="DebugAction.cs" />
|
||||
<Compile Include="ExtensionMethods\PawnExtensions.cs" />
|
||||
<Compile Include="ExtensionMethods\SexPropsExtensions.cs" />
|
||||
<Compile Include="Cum\FilterWorkers\SpecialThingFilterWorker_CumBase.cs" />
|
||||
<Compile Include="Cum\FilterWorkers\SpecialThingFilterWorker_NoCum.cs" />
|
||||
<Compile Include="GlobalSuppressions.cs" />
|
||||
<Compile Include="Harmony.cs" />
|
||||
<Compile Include="Cum\IngestionOutcomeDoer_RecordEatenCum.cs" />
|
||||
<Compile Include="Cum\Interactions\CumAddictPartKindUsageRule.cs" />
|
||||
<Compile Include="Logs\DebugLogProvider.cs" />
|
||||
<Compile Include="Logs\LogManager.cs" />
|
||||
<Compile Include="LustUtility.cs" />
|
||||
<Compile Include="Patches\ConditionalDefLoad.cs" />
|
||||
<Compile Include="Patches\DefInjection.cs" />
|
||||
<Compile Include="Settings\ISettingHandle.cs" />
|
||||
<Compile Include="Settings\SettingHandle.cs" />
|
||||
<Compile Include="Settings\SettingsContainer.cs" />
|
||||
<Compile Include="Settings\SettingsTab.cs" />
|
||||
<Compile Include="Settings\SettingsTabMain.cs" />
|
||||
<Compile Include="SexHistory\UI\BarInfo.cs" />
|
||||
<Compile Include="SexHistory\UI\PartnerPortraitInfo.cs" />
|
||||
<Compile Include="SexHistory\UI\PreferedRaceCard.cs" />
|
||||
<Compile Include="SexHistory\UI\InfoCard.cs" />
|
||||
<Compile Include="SexHistory\UI\PartnerOrderMode.cs" />
|
||||
<Compile Include="SexHistory\UI\SexStatusViewModel.cs" />
|
||||
<Compile Include="Virginity\Recipe_HymenSurgery.cs" />
|
||||
<Compile Include="Settings\SettingsTabHistory.cs" />
|
||||
<Compile Include="Settings\SettingsTabDebug.cs" />
|
||||
<Compile Include="Settings\IResettable.cs" />
|
||||
<Compile Include="Settings\ITab.cs" />
|
||||
<Compile Include="Settings\SettingsWidgets.cs" />
|
||||
<Compile Include="SexHistory\RecordRandomizer.cs" />
|
||||
<Compile Include="RJWUtility.cs" />
|
||||
<Compile Include="SexHistory\HistoryUtility.cs" />
|
||||
<Compile Include="SexHistory\SexHistoryComp.cs" />
|
||||
<Compile Include="SexHistory\SexPartnerHistoryRecord.cs" />
|
||||
<Compile Include="PawnRelationWorker_Bastard.cs" />
|
||||
<Compile Include="Keyed.cs" />
|
||||
<Compile Include="Patches\Rimworld_Patch.cs" />
|
||||
<Compile Include="Patches\RJW_Patch.cs" />
|
||||
<Compile Include="SexperienceMod.cs" />
|
||||
<Compile Include="Cum\FilterWorkers\SpecialThingFilterWorker_Cum.cs" />
|
||||
<Compile Include="StatParts.cs" />
|
||||
<Compile Include="Thoughts\ThoughtDefExtension_StageFromRecord.cs" />
|
||||
<Compile Include="Cum\Thought_AteCum.cs" />
|
||||
<Compile Include="Thoughts\Thought_Recordbased.cs" />
|
||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
<Compile Include="SexHistory\UI\UIUtility.cs" />
|
||||
<Compile Include="SexHistory\UI\SexStatusWindow.cs" />
|
||||
<Compile Include="Utility.cs" />
|
||||
<Compile Include="RsDefOf.cs" />
|
||||
<Compile Include="Virginity\TraitDegree.cs" />
|
||||
<Compile Include="Virginity\TraitHandler.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Krafs.Rimworld.Ref">
|
||||
<Version>1.4.3641</Version>
|
||||
</PackageReference>
|
||||
<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>
|
|
@ -3,7 +3,6 @@ using rjw;
|
|||
using rjw.Modules.Interactions.Enums;
|
||||
using rjw.Modules.Interactions.Helpers;
|
||||
using rjw.Modules.Interactions.Objects;
|
||||
using RJWSexperience.Logs;
|
||||
using System.Collections.Generic;
|
||||
using Verse;
|
||||
using Verse.AI;
|
||||
|
@ -12,7 +11,6 @@ namespace RJWSexperience
|
|||
{
|
||||
public static class RJWUtility
|
||||
{
|
||||
private static readonly rjw.Modules.Shared.Logs.ILog s_log = LogManager.GetLogger<DebugLogProvider>("RJWUtility");
|
||||
/// <summary>
|
||||
/// For ideo patch
|
||||
/// </summary>
|
||||
|
@ -157,28 +155,21 @@ namespace RJWSexperience
|
|||
public static Building_CumBucket FindClosestBucket(this Pawn pawn)
|
||||
{
|
||||
List<Building> buckets = pawn.Map.listerBuildings.allBuildingsColonist.FindAll(x => x is Building_CumBucket bucket && bucket.StoredStackCount < RsDefOf.Thing.GatheredCum.stackLimit);
|
||||
if (buckets.Count == 0)
|
||||
{
|
||||
s_log.Message("FindClosestBucket: No buckets on the map or buckets are full");
|
||||
if (buckets.NullOrEmpty())
|
||||
return null;
|
||||
}
|
||||
|
||||
Dictionary<Building, float> targets = new Dictionary<Building, float>();
|
||||
for (int i = 0; i < buckets.Count; i++)
|
||||
{
|
||||
if (pawn.CanReach(buckets[i], PathEndMode.ClosestTouch, Danger.Some))
|
||||
if (pawn.CanReach(buckets[i], PathEndMode.ClosestTouch, Danger.None))
|
||||
{
|
||||
targets.Add(buckets[i], pawn.Position.DistanceTo(buckets[i].Position));
|
||||
}
|
||||
}
|
||||
if (targets.Count > 0)
|
||||
if (!targets.NullOrEmpty())
|
||||
{
|
||||
return (Building_CumBucket)targets.MinBy(x => x.Value).Key;
|
||||
}
|
||||
else
|
||||
{
|
||||
s_log.Message("FindClosestBucket: No reachable buckets");
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -31,9 +31,7 @@ namespace RJWSexperience.Settings
|
|||
settings.VirginRatio,
|
||||
settings.SlavesBeenRapedExp,
|
||||
settings.EnableSexHistory,
|
||||
settings.HideGizmoWhenDrafted,
|
||||
settings.VirginityCheck_M2M_Anal,
|
||||
settings.VirginityCheck_F2F_Scissoring
|
||||
settings.HideGizmoWhenDrafted
|
||||
}
|
||||
);
|
||||
}
|
||||
|
|
|
@ -21,9 +21,7 @@ namespace RJWSexperience.Settings
|
|||
settings.VirginRatio,
|
||||
settings.SlavesBeenRapedExp,
|
||||
settings.EnableSexHistory,
|
||||
settings.HideGizmoWhenDrafted,
|
||||
settings.VirginityCheck_M2M_Anal,
|
||||
settings.VirginityCheck_F2F_Scissoring
|
||||
settings.HideGizmoWhenDrafted
|
||||
}
|
||||
) { }
|
||||
|
||||
|
@ -65,9 +63,6 @@ namespace RJWSexperience.Settings
|
|||
{
|
||||
listmain.CheckboxLabeled(Keyed.Option_HideGizmoWhenDrafted_Label, settings.HideGizmoWhenDrafted, Keyed.Option_HideGizmoWhenDrafted_Desc);
|
||||
}
|
||||
|
||||
listmain.CheckboxLabeled(Keyed.Option_VirginityCheck_M2M_Label, settings.VirginityCheck_M2M_Anal, Keyed.Option_VirginityCheck_M2M_Desc);
|
||||
listmain.CheckboxLabeled(Keyed.Option_VirginityCheck_F2F_Label, settings.VirginityCheck_F2F_Scissoring, Keyed.Option_VirginityCheck_F2F_Label);
|
||||
|
||||
if (listmain.ButtonText(Keyed.Button_ResetToDefault))
|
||||
{
|
||||
|
|
|
@ -15,8 +15,6 @@ namespace RJWSexperience.Settings
|
|||
settings.LustLimit,
|
||||
settings.MaxSingleLustChange,
|
||||
settings.SexCanFillBuckets,
|
||||
settings.VirginityCheck_M2M_Anal,
|
||||
settings.VirginityCheck_F2F_Scissoring
|
||||
}
|
||||
) { }
|
||||
|
||||
|
@ -29,8 +27,6 @@ namespace RJWSexperience.Settings
|
|||
listmain.SliderOption(Keyed.Option_MaxSingleLustChange_Label + " {0}", Keyed.Option_MaxSingleLustChange_Desc, settings.MaxSingleLustChange, new FloatRange(0f, 10f), 0.05f);
|
||||
listmain.CheckboxLabeled(Keyed.Option_EnableBastardRelation_Label, settings.EnableBastardRelation, Keyed.Option_EnableBastardRelation_Desc);
|
||||
listmain.CheckboxLabeled(Keyed.Option_SexCanFillBuckets_Label, settings.SexCanFillBuckets, Keyed.Option_SexCanFillBuckets_Desc);
|
||||
listmain.CheckboxLabeled(Keyed.Option_VirginityCheck_M2M_Label, settings.VirginityCheck_M2M_Anal, Keyed.Option_VirginityCheck_M2M_Desc);
|
||||
listmain.CheckboxLabeled(Keyed.Option_VirginityCheck_F2F_Label, settings.VirginityCheck_F2F_Scissoring, Keyed.Option_VirginityCheck_F2F_Desc);
|
||||
|
||||
if (settings.DevMode)
|
||||
LustUtility.DrawGraph(listmain.GetRect(300f));
|
||||
|
|
|
@ -429,8 +429,6 @@ namespace RJWSexperience.SexHistory
|
|||
icon = HistoryUtility.HistoryIcon,
|
||||
defaultIconColor = HistoryUtility.HistoryColor,
|
||||
hotKey = RsDefOf.KeyBinding.OpenSexStatistics,
|
||||
shrinkable = true,
|
||||
Order = 5,
|
||||
action = () => UI.SexStatusWindow.ToggleWindow(this)
|
||||
};
|
||||
}
|
||||
|
|
|
@ -3,49 +3,33 @@ using Verse;
|
|||
|
||||
namespace RJWSexperience.SexHistory.UI
|
||||
{
|
||||
public class BarInfo
|
||||
public readonly struct BarInfo
|
||||
{
|
||||
private string _label;
|
||||
private float _fillPercent;
|
||||
private string _labelRight;
|
||||
public readonly string label;
|
||||
public readonly float fillPercent;
|
||||
public readonly Texture2D fillTexture;
|
||||
public readonly TipSignal tooltip;
|
||||
public readonly string labelRight;
|
||||
public readonly Texture2D border;
|
||||
|
||||
public string Label
|
||||
public BarInfo(string label, float fillPercent, Texture2D fillTexture, TipSignal tooltip, string labelRight = "", Texture2D border = null)
|
||||
{
|
||||
get => _label;
|
||||
set => _label = value.CapitalizeFirst();
|
||||
}
|
||||
public float FillPercent
|
||||
{
|
||||
get => _fillPercent;
|
||||
set => _fillPercent = Mathf.Clamp01(value);
|
||||
}
|
||||
public Texture2D FillTexture { get; set; }
|
||||
public TipSignal Tooltip { get; set; }
|
||||
public string LabelRight
|
||||
{
|
||||
get => _labelRight;
|
||||
set => _labelRight = value.CapitalizeFirst();
|
||||
}
|
||||
public Texture2D Border { get; set; }
|
||||
|
||||
public BarInfo()
|
||||
{
|
||||
_label = "";
|
||||
_fillPercent = 0f;
|
||||
FillTexture = Texture2D.grayTexture;
|
||||
Tooltip = default;
|
||||
_labelRight = "";
|
||||
Border = null;
|
||||
this.label = label.CapitalizeFirst();
|
||||
this.fillPercent = Mathf.Clamp01(fillPercent);
|
||||
this.fillTexture = fillTexture;
|
||||
this.tooltip = tooltip;
|
||||
this.labelRight = labelRight.CapitalizeFirst();
|
||||
this.border = border;
|
||||
}
|
||||
|
||||
public BarInfo(Texture2D fillTexture)
|
||||
public BarInfo(string label, float fillPercent, Texture2D fillTexture, string labelRight = "")
|
||||
{
|
||||
_label = "";
|
||||
_fillPercent = 0f;
|
||||
FillTexture = fillTexture;
|
||||
Tooltip = default;
|
||||
_labelRight = "";
|
||||
Border = null;
|
||||
this.label = label.CapitalizeFirst();
|
||||
this.fillPercent = Mathf.Clamp01(fillPercent);
|
||||
this.fillTexture = fillTexture;
|
||||
this.tooltip = default;
|
||||
this.labelRight = labelRight.CapitalizeFirst();
|
||||
this.border = null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,93 +1,86 @@
|
|||
using RimWorld;
|
||||
using rjw;
|
||||
using System;
|
||||
using UnityEngine;
|
||||
using Verse;
|
||||
|
||||
namespace RJWSexperience.SexHistory.UI
|
||||
{
|
||||
public class InfoCard
|
||||
public readonly struct InfoCard
|
||||
{
|
||||
private readonly Pawn _pawn;
|
||||
private readonly string _tooltipLabel;
|
||||
public readonly SexPartnerHistoryRecord partnerRecord;
|
||||
public readonly string label;
|
||||
public readonly string lastSexTime;
|
||||
public readonly string name;
|
||||
public readonly string sexCount;
|
||||
public readonly string orgasms;
|
||||
public readonly string relations;
|
||||
public readonly BarInfo bestSextype;
|
||||
public readonly PartnerPortraitInfo portraitInfo;
|
||||
public readonly TipSignal tooltip;
|
||||
|
||||
public string Label { get; }
|
||||
public string LastSexTime { get; set; }
|
||||
public string Name { get; private set; }
|
||||
public string SexCount { get; private set; }
|
||||
public string Orgasms { get; private set; }
|
||||
public string Relations { get; private set; }
|
||||
public BarInfo BestSextype { get; }
|
||||
public SexPartnerHistoryRecord PartnerRecord { get; private set; }
|
||||
public PartnerPortraitInfo PortraitInfo { get; }
|
||||
public TipSignal Tooltip { get; private set; }
|
||||
|
||||
public InfoCard(Pawn pawn, string label, string tooltipLabel)
|
||||
public InfoCard(Pawn pawn, SexPartnerHistoryRecord partnerRecord, string label, string tooltipLabel, int lastSexTimeTicks)
|
||||
{
|
||||
Label = label;
|
||||
_pawn = pawn;
|
||||
_tooltipLabel = tooltipLabel;
|
||||
BestSextype = new BarInfo();
|
||||
PortraitInfo = new PartnerPortraitInfo(_pawn);
|
||||
}
|
||||
this.partnerRecord = partnerRecord;
|
||||
this.label = label;
|
||||
|
||||
public void UpdatePartnerRecord(SexPartnerHistoryRecord partnerRecord)
|
||||
{
|
||||
PartnerRecord = partnerRecord;
|
||||
PortraitInfo.UpdatePartnerRecord(partnerRecord);
|
||||
lastSexTime = UIUtility.GetSexDays(lastSexTimeTicks);
|
||||
portraitInfo = new PartnerPortraitInfo(pawn, partnerRecord);
|
||||
|
||||
if (partnerRecord == null)
|
||||
if (partnerRecord != null)
|
||||
{
|
||||
Name = Keyed.Unknown;
|
||||
SexCount = Keyed.RS_Sex_Count + "?";
|
||||
Orgasms = Keyed.RS_Orgasms + "?";
|
||||
Relations = string.Empty;
|
||||
Tooltip = default;
|
||||
name = partnerRecord.Partner?.Name?.ToStringFull ?? partnerRecord.Label.CapitalizeFirst();
|
||||
sexCount = Keyed.RS_Sex_Count + partnerRecord.TotalSexCount;
|
||||
|
||||
BestSextype.Label = Keyed.RS_Best_Sextype + ": " + Keyed.Sextype[(int)xxx.rjwSextype.None];
|
||||
BestSextype.FillPercent = 0f;
|
||||
BestSextype.FillTexture = Texture2D.linearGrayTexture;
|
||||
BestSextype.LabelRight = "";
|
||||
return;
|
||||
}
|
||||
|
||||
Name = partnerRecord.Partner?.Name?.ToStringFull ?? partnerRecord.Label.CapitalizeFirst();
|
||||
SexCount = Keyed.RS_Sex_Count + partnerRecord.TotalSexCount;
|
||||
|
||||
if (partnerRecord.Raped > 0)
|
||||
{
|
||||
SexCount += " " + Keyed.RS_Raped + partnerRecord.Raped;
|
||||
}
|
||||
if (partnerRecord.RapedMe > 0)
|
||||
{
|
||||
SexCount += " " + Keyed.RS_RapedMe + partnerRecord.RapedMe;
|
||||
}
|
||||
|
||||
Orgasms = Keyed.RS_Orgasms + partnerRecord.OrgasmCount;
|
||||
Relations = _pawn.GetRelationsString(partnerRecord.Partner);
|
||||
Tooltip = new TipSignal(() =>
|
||||
{
|
||||
string completeTip = _tooltipLabel;
|
||||
|
||||
if (partnerRecord.Incest)
|
||||
if (partnerRecord.Raped > 0)
|
||||
{
|
||||
completeTip += " - " + Keyed.Incest;
|
||||
sexCount += " " + Keyed.RS_Raped + partnerRecord.Raped;
|
||||
}
|
||||
if (partnerRecord.IamFirst)
|
||||
if (partnerRecord.RapedMe > 0)
|
||||
{
|
||||
completeTip += "\n" + Keyed.RS_LostVirgin(partnerRecord.Label, _pawn.LabelShort);
|
||||
sexCount += " " + Keyed.RS_RapedMe + partnerRecord.RapedMe;
|
||||
}
|
||||
if (partnerRecord.BestSexTickAbs != 0)
|
||||
{
|
||||
completeTip += "\n" + Keyed.RS_HadBestSexDaysAgo(partnerRecord.BestSexElapsedTicks.ToStringTicksToDays() + " " + Keyed.RS_Ago);
|
||||
}
|
||||
return completeTip;
|
||||
}, _tooltipLabel.GetHashCode());
|
||||
|
||||
float relativeBestSatisfaction = partnerRecord.BestSatisfaction / UIUtility.BASESAT;
|
||||
BestSextype.Label = Keyed.RS_Best_Sextype + ": " + Keyed.Sextype[(int)partnerRecord.BestSextype];
|
||||
BestSextype.FillPercent = relativeBestSatisfaction / 2;
|
||||
BestSextype.FillTexture = HistoryUtility.SextypeColor[(int)partnerRecord.BestSextype];
|
||||
BestSextype.LabelRight = relativeBestSatisfaction.ToStringPercent();
|
||||
orgasms = Keyed.RS_Orgasms + partnerRecord.OrgasmCount;
|
||||
relations = pawn.GetRelationsString(partnerRecord.Partner);
|
||||
tooltip = new TipSignal(() =>
|
||||
{
|
||||
string completeTip = tooltipLabel;
|
||||
|
||||
if (partnerRecord.Incest)
|
||||
{
|
||||
completeTip += " - " + Keyed.Incest;
|
||||
}
|
||||
if (partnerRecord.IamFirst)
|
||||
{
|
||||
completeTip += "\n" + Keyed.RS_LostVirgin(partnerRecord.Label, pawn.LabelShort);
|
||||
}
|
||||
if (partnerRecord.BestSexTickAbs != 0)
|
||||
{
|
||||
completeTip += "\n" + Keyed.RS_HadBestSexDaysAgo(partnerRecord.BestSexElapsedTicks.ToStringTicksToDays() + " " + Keyed.RS_Ago);
|
||||
}
|
||||
return completeTip;
|
||||
}, tooltipLabel.GetHashCode());
|
||||
|
||||
float relativeBestSatisfaction = partnerRecord.BestSatisfaction / UIUtility.BASESAT;
|
||||
bestSextype = new BarInfo(
|
||||
label: Keyed.RS_Best_Sextype + ": " + Keyed.Sextype[(int)partnerRecord.BestSextype],
|
||||
fillPercent: relativeBestSatisfaction / 2,
|
||||
fillTexture: HistoryUtility.SextypeColor[(int)partnerRecord.BestSextype],
|
||||
labelRight: relativeBestSatisfaction.ToStringPercent());
|
||||
}
|
||||
else
|
||||
{
|
||||
name = Keyed.Unknown;
|
||||
sexCount = Keyed.RS_Sex_Count + "?";
|
||||
orgasms = Keyed.RS_Orgasms + "?";
|
||||
relations = string.Empty;
|
||||
tooltip = default;
|
||||
bestSextype = new BarInfo(
|
||||
label: String.Format(Keyed.RS_Best_Sextype + ": {0}", Keyed.Sextype[(int)xxx.rjwSextype.None]),
|
||||
fillPercent: 0f,
|
||||
fillTexture: Texture2D.linearGrayTexture);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -5,43 +5,29 @@ using Verse;
|
|||
|
||||
namespace RJWSexperience.SexHistory.UI
|
||||
{
|
||||
public class PartnerPortraitInfo
|
||||
public readonly struct PartnerPortraitInfo
|
||||
{
|
||||
private readonly Pawn _pawn;
|
||||
|
||||
public SexPartnerHistoryRecord PartnerRecord { get; private set; }
|
||||
public bool Lover { get; private set; }
|
||||
public Func<Vector2, Texture> PortraitGetter { get; private set; }
|
||||
|
||||
public PartnerPortraitInfo(Pawn pawn)
|
||||
{
|
||||
_pawn = pawn;
|
||||
}
|
||||
public readonly SexPartnerHistoryRecord partnerRecord;
|
||||
public readonly bool lover;
|
||||
public readonly Func<Vector2, Texture> portraitGetter;
|
||||
|
||||
public PartnerPortraitInfo(Pawn pawn, SexPartnerHistoryRecord partnerRecord)
|
||||
{
|
||||
_pawn = pawn;
|
||||
UpdatePartnerRecord(partnerRecord);
|
||||
}
|
||||
|
||||
public void UpdatePartnerRecord(SexPartnerHistoryRecord partnerRecord)
|
||||
{
|
||||
PartnerRecord = partnerRecord;
|
||||
this.partnerRecord = partnerRecord;
|
||||
lover = false;
|
||||
|
||||
if (partnerRecord?.Partner != null)
|
||||
{
|
||||
PortraitGetter = (size) => PortraitsCache.Get(partnerRecord.Partner, size, Rot4.South, default, 1, true, true, false, false);
|
||||
Lover = LovePartnerRelationUtility.LovePartnerRelationExists(_pawn, partnerRecord.Partner);
|
||||
portraitGetter = (size) => PortraitsCache.Get(partnerRecord.Partner, size, Rot4.South, default, 1, true, true, false, false);
|
||||
lover = LovePartnerRelationUtility.LovePartnerRelationExists(pawn, partnerRecord.Partner);
|
||||
}
|
||||
else if (partnerRecord?.Race?.uiIcon != null)
|
||||
{
|
||||
PortraitGetter = (_) => partnerRecord.Race.uiIcon;
|
||||
Lover = false;
|
||||
portraitGetter = (_) => partnerRecord.Race.uiIcon;
|
||||
}
|
||||
else
|
||||
{
|
||||
PortraitGetter = (_) => HistoryUtility.UnknownPawn;
|
||||
Lover = false;
|
||||
portraitGetter = (_) => HistoryUtility.UnknownPawn;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -3,58 +3,53 @@ using UnityEngine;
|
|||
|
||||
namespace RJWSexperience.SexHistory.UI
|
||||
{
|
||||
public class PreferedRaceCard
|
||||
public readonly struct PreferedRaceCard
|
||||
{
|
||||
private readonly SexHistoryComp _sexHistory;
|
||||
|
||||
public string PreferRaceLabel { get; private set; }
|
||||
public string PreferRaceTypeLabel { get; private set; }
|
||||
public string SexCount { get; private set; }
|
||||
public BarInfo BarInfo { get; } = new BarInfo(Texture2D.linearGrayTexture);
|
||||
public Func<Vector2, Texture> PortraitGetter { get; private set; }
|
||||
public readonly string preferRaceLabel;
|
||||
public readonly string preferRaceTypeLabel;
|
||||
public readonly string sexCount;
|
||||
public readonly BarInfo? barInfo;
|
||||
public readonly Func<Vector2, Texture> portraitGetter;
|
||||
|
||||
public PreferedRaceCard(SexHistoryComp sexHistory)
|
||||
{
|
||||
_sexHistory = sexHistory;
|
||||
}
|
||||
|
||||
public void Update()
|
||||
{
|
||||
if (_sexHistory.PreferRace == null)
|
||||
if (sexHistory.PreferRace == null)
|
||||
{
|
||||
PreferRaceLabel = Keyed.None;
|
||||
PreferRaceTypeLabel = null;
|
||||
SexCount = null;
|
||||
BarInfo.Label = null;
|
||||
BarInfo.FillPercent = 0f;
|
||||
PortraitGetter = (_) => HistoryUtility.UnknownPawn;
|
||||
preferRaceLabel = Keyed.None;
|
||||
preferRaceTypeLabel = null;
|
||||
sexCount = null;
|
||||
barInfo = null;
|
||||
portraitGetter = (_) => HistoryUtility.UnknownPawn;
|
||||
return;
|
||||
}
|
||||
|
||||
PreferRaceLabel = _sexHistory.PreferRace.LabelCap;
|
||||
SexCount = Keyed.RS_Sex_Count + _sexHistory.PreferRaceSexCount;
|
||||
PortraitGetter = (size) => UIUtility.GetRaceIcon(_sexHistory.PreferRacePawn, size);
|
||||
preferRaceLabel = sexHistory.PreferRace.LabelCap;
|
||||
sexCount = Keyed.RS_Sex_Count + sexHistory.PreferRaceSexCount;
|
||||
portraitGetter = (size) => UIUtility.GetRaceIcon(sexHistory.PreferRacePawn, size);
|
||||
|
||||
if (_sexHistory.PreferRace != _sexHistory.ParentPawn.def)
|
||||
if (sexHistory.PreferRace != sexHistory.ParentPawn.def)
|
||||
{
|
||||
if (_sexHistory.PreferRace.race.Animal != _sexHistory.ParentPawn.def.race.Animal)
|
||||
if (sexHistory.PreferRace.race.Animal != sexHistory.ParentPawn.def.race.Animal)
|
||||
{
|
||||
PreferRaceTypeLabel = Keyed.RS_Bestiality;
|
||||
BarInfo.Label = Keyed.RS_SexInfo(Keyed.RS_Bestiality, _sexHistory.BestialityCount);
|
||||
BarInfo.FillPercent = _sexHistory.BestialityCount / 100f;
|
||||
preferRaceTypeLabel = Keyed.RS_Bestiality;
|
||||
barInfo = new BarInfo(
|
||||
label: Keyed.RS_SexInfo(Keyed.RS_Bestiality, sexHistory.BestialityCount),
|
||||
fillPercent: sexHistory.BestialityCount / 100f,
|
||||
fillTexture: Texture2D.linearGrayTexture);
|
||||
}
|
||||
else
|
||||
{
|
||||
PreferRaceTypeLabel = Keyed.RS_Interspecies;
|
||||
BarInfo.Label = Keyed.RS_SexInfo(Keyed.RS_Interspecies, _sexHistory.InterspeciesCount);
|
||||
BarInfo.FillPercent = _sexHistory.InterspeciesCount / 100f;
|
||||
preferRaceTypeLabel = Keyed.RS_Interspecies;
|
||||
barInfo = new BarInfo(
|
||||
label: Keyed.RS_SexInfo(Keyed.RS_Interspecies, sexHistory.InterspeciesCount),
|
||||
fillPercent: sexHistory.InterspeciesCount / 100f,
|
||||
fillTexture: Texture2D.linearGrayTexture);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
PreferRaceTypeLabel = null;
|
||||
BarInfo.Label = null;
|
||||
BarInfo.FillPercent = 0f;
|
||||
preferRaceTypeLabel = null;
|
||||
barInfo = null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
using RimWorld;
|
||||
using rjw;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
|
@ -48,43 +49,27 @@ namespace RJWSexperience.SexHistory.UI
|
|||
{
|
||||
AgeAndTitle = Pawn.ageTracker.AgeBiologicalYears + ", " + Pawn.def.label;
|
||||
}
|
||||
|
||||
for (int i = 0; i < Sextype.Length; i++)
|
||||
{
|
||||
int sexIndex = Sextype[i];
|
||||
SexTypes.Add(new BarInfo(HistoryUtility.SextypeColor[sexIndex]));
|
||||
}
|
||||
|
||||
InfoCards.Add(new InfoCard(Pawn, Keyed.RS_Recent_Sex_Partner, Keyed.RS_Recent_Sex_Partner_ToolTip));
|
||||
InfoCards.Add(new InfoCard(Pawn, Keyed.RS_First_Sex_Partner, Keyed.RS_First_Sex_Partner_ToolTip));
|
||||
InfoCards.Add(new InfoCard(Pawn, Keyed.RS_Most_Sex_Partner, Keyed.RS_Most_Sex_Partner_ToolTip));
|
||||
InfoCards.Add(new InfoCard(Pawn, Keyed.RS_Best_Sex_Partner, Keyed.RS_Best_Sex_Partner_ToolTip));
|
||||
|
||||
SelectedPartnerCard = new InfoCard(Pawn, Keyed.RS_Selected_Partner, Keyed.RS_Selected_Partner);
|
||||
PreferedRaceCard = new PreferedRaceCard(_history);
|
||||
}
|
||||
|
||||
public Pawn Pawn => _history.ParentPawn;
|
||||
public string Name { get; }
|
||||
public string AgeAndTitle { get; }
|
||||
public List<InfoCard> InfoCards { get; } = new List<InfoCard>();
|
||||
public InfoCard SelectedPartnerCard { get; }
|
||||
public PreferedRaceCard PreferedRaceCard { get; }
|
||||
public InfoCard SelectedPartnerCard { get; private set; }
|
||||
public PreferedRaceCard PreferedRaceCard { get; private set; }
|
||||
public List<BarInfo> SexTypes { get; } = new List<BarInfo>();
|
||||
public BarInfo PartnerCount { get; } = new BarInfo(HistoryUtility.Partners);
|
||||
public BarInfo VirginsTaken { get; } = new BarInfo(HistoryUtility.Partners);
|
||||
public BarInfo TotalSex { get; } = new BarInfo(HistoryUtility.TotalSex);
|
||||
public BarInfo Lust { get; } = new BarInfo(HistoryUtility.Slaanesh);
|
||||
public BarInfo BestSextype { get; } = new BarInfo();
|
||||
public BarInfo RecentSextype { get; } = new BarInfo();
|
||||
public BarInfo Necro { get; } = new BarInfo(HistoryUtility.Nurgle);
|
||||
public BarInfo Incest { get; } = new BarInfo(HistoryUtility.Nurgle);
|
||||
public BarInfo ConsumedCum { get; } = new BarInfo(Texture2D.linearGrayTexture);
|
||||
public BarInfo CumHediff { get; } = new BarInfo(Texture2D.linearGrayTexture);
|
||||
public BarInfo BeenRaped { get; } = new BarInfo(Texture2D.grayTexture);
|
||||
public BarInfo Raped { get; } = new BarInfo(HistoryUtility.Khorne);
|
||||
public BarInfo SexSatisfaction { get; } = new BarInfo(HistoryUtility.Satisfaction);
|
||||
public BarInfo SexSkill { get; } = new BarInfo(HistoryUtility.Tzeentch);
|
||||
public BarInfo TotalSex { get; private set; }
|
||||
public BarInfo Lust { get; private set; }
|
||||
public BarInfo BestSextype { get; private set; }
|
||||
public BarInfo RecentSextype { get; private set; }
|
||||
public BarInfo Necro { get; private set; }
|
||||
public BarInfo Incest { get; private set; }
|
||||
public BarInfo ConsumedCum { get; private set; }
|
||||
public BarInfo? CumHediff { get; private set; }
|
||||
public BarInfo BeenRaped { get; private set; }
|
||||
public BarInfo Raped { get; private set; }
|
||||
public BarInfo SexSatisfaction { get; private set; }
|
||||
public BarInfo SexSkill { get; private set; }
|
||||
public string VirginLabel { get; private set; }
|
||||
public string SexualityLabel { get; private set; }
|
||||
public string QuirksLabel { get; private set; }
|
||||
|
@ -103,7 +88,7 @@ namespace RJWSexperience.SexHistory.UI
|
|||
UpdateBars();
|
||||
UpdateQuirks();
|
||||
UpdateVirginAndSexuality();
|
||||
PreferedRaceCard.Update();
|
||||
PreferedRaceCard = new PreferedRaceCard(_history);
|
||||
|
||||
int tickRateMultiplier = (int)Find.TickManager.TickRateMultiplier;
|
||||
if (tickRateMultiplier == 0) // Paused
|
||||
|
@ -117,21 +102,35 @@ namespace RJWSexperience.SexHistory.UI
|
|||
|
||||
private void UpdateInfoCards()
|
||||
{
|
||||
InfoCard recentSexPartner = InfoCards[0];
|
||||
recentSexPartner.LastSexTime = UIUtility.GetSexDays(_history.RecentSexTickAbs);
|
||||
recentSexPartner.UpdatePartnerRecord(_history.RecentPartnerRecord);
|
||||
InfoCards.Clear();
|
||||
|
||||
InfoCard firstSexPartner = InfoCards[1];
|
||||
firstSexPartner.LastSexTime = UIUtility.GetSexDays(_history.FirstSexTickAbs);
|
||||
firstSexPartner.UpdatePartnerRecord(_history.FirstPartnerRecord);
|
||||
InfoCards.Add(new InfoCard(
|
||||
pawn: Pawn,
|
||||
partnerRecord: _history.RecentPartnerRecord,
|
||||
label: Keyed.RS_Recent_Sex_Partner,
|
||||
tooltipLabel: Keyed.RS_Recent_Sex_Partner_ToolTip,
|
||||
lastSexTimeTicks: _history.RecentSexTickAbs));
|
||||
|
||||
InfoCard mostSexPartner = InfoCards[2];
|
||||
mostSexPartner.LastSexTime = UIUtility.GetSexDays(_history.MostSexTickAbs);
|
||||
mostSexPartner.UpdatePartnerRecord(_history.MostPartnerRecord);
|
||||
InfoCards.Add(new InfoCard(
|
||||
pawn: Pawn,
|
||||
partnerRecord: _history.FirstPartnerRecord,
|
||||
label: Keyed.RS_First_Sex_Partner,
|
||||
tooltipLabel: Keyed.RS_First_Sex_Partner_ToolTip,
|
||||
lastSexTimeTicks: _history.FirstSexTickAbs));
|
||||
|
||||
InfoCard bestSexPartner = InfoCards[3];
|
||||
bestSexPartner.LastSexTime = UIUtility.GetSexDays(_history.BestSexTickAbs);
|
||||
bestSexPartner.UpdatePartnerRecord(_history.BestSexPartnerRecord);
|
||||
InfoCards.Add(new InfoCard(
|
||||
pawn: Pawn,
|
||||
partnerRecord: _history.MostPartnerRecord,
|
||||
label: Keyed.RS_Most_Sex_Partner,
|
||||
tooltipLabel: Keyed.RS_Most_Sex_Partner_ToolTip,
|
||||
lastSexTimeTicks: _history.MostSexTickAbs));
|
||||
|
||||
InfoCards.Add(new InfoCard(
|
||||
pawn: Pawn,
|
||||
partnerRecord: _history.BestSexPartnerRecord,
|
||||
label: Keyed.RS_Best_Sex_Partner,
|
||||
tooltipLabel: Keyed.RS_Best_Sex_Partner_ToolTip,
|
||||
lastSexTimeTicks: _history.BestSexTickAbs));
|
||||
|
||||
if (SelectedPartner != null)
|
||||
{
|
||||
|
@ -147,102 +146,124 @@ namespace RJWSexperience.SexHistory.UI
|
|||
maxSatisfaction = UIUtility.BASESAT;
|
||||
}
|
||||
|
||||
SexTypes.Clear();
|
||||
|
||||
for (int i = 0; i < Sextype.Length; i++)
|
||||
{
|
||||
int sexIndex = Sextype[i];
|
||||
float AverageSatisfaction = _history.GetAVGSat(sexIndex);
|
||||
float relativeSat = AverageSatisfaction / maxSatisfaction;
|
||||
float satisfactionRelativeToBase = AverageSatisfaction / UIUtility.BASESAT;
|
||||
|
||||
BarInfo sexTypeBar = SexTypes[i];
|
||||
sexTypeBar.Label = Keyed.RS_SexInfo(Keyed.Sextype[sexIndex], _history.GetSexCount(sexIndex));
|
||||
sexTypeBar.FillPercent = relativeSat;
|
||||
sexTypeBar.Tooltip = Keyed.RS_LastSex + ": " + UIUtility.GetSexDays(_history.GetSextypeRecentTickAbs(sexIndex), true);
|
||||
sexTypeBar.LabelRight = Keyed.RS_SatAVG(satisfactionRelativeToBase);
|
||||
SexTypes.Add(new BarInfo(
|
||||
label: Keyed.RS_SexInfo(Keyed.Sextype[sexIndex], _history.GetSexCount(sexIndex)),
|
||||
fillPercent: relativeSat,
|
||||
fillTexture: HistoryUtility.SextypeColor[sexIndex],
|
||||
tooltip: Keyed.RS_LastSex + ": " + UIUtility.GetSexDays(_history.GetSextypeRecentTickAbs(sexIndex), true),
|
||||
labelRight: Keyed.RS_SatAVG(satisfactionRelativeToBase)));
|
||||
}
|
||||
|
||||
PartnerCount.Label = string.Format(Keyed.RS_Sex_Partners + ": {0} ({1})", _history.PartnerCount, Pawn.records.GetValue(RsDefOf.Record.SexPartnerCount));
|
||||
PartnerCount.FillPercent = _history.PartnerCount / 50f;
|
||||
SexTypes.Add(new BarInfo(
|
||||
label: String.Format(Keyed.RS_Sex_Partners + ": {0} ({1})", _history.PartnerCount, Pawn.records.GetValue(RsDefOf.Record.SexPartnerCount)),
|
||||
fillPercent: _history.PartnerCount / 50,
|
||||
fillTexture: HistoryUtility.Partners));
|
||||
|
||||
VirginsTaken.Label = string.Format(Keyed.RS_VirginsTaken + ": {0:0}", _history.VirginsTaken);
|
||||
VirginsTaken.FillPercent = _history.VirginsTaken / 100f;
|
||||
SexTypes.Add(new BarInfo(
|
||||
label: String.Format(Keyed.RS_VirginsTaken + ": {0:0}", _history.VirginsTaken),
|
||||
fillPercent: _history.VirginsTaken / 100,
|
||||
fillTexture: HistoryUtility.Partners));
|
||||
|
||||
TotalSex.Label = string.Format(Keyed.RS_TotalSexHad + ": {0:0} ({1:0})", _history.TotalSexHad, Pawn.records.GetValue(xxx.CountOfSex));
|
||||
TotalSex.FillPercent = _history.TotalSexHad / 100f;
|
||||
TotalSex.LabelRight = Keyed.RS_SatAVG(_history.AVGSat);
|
||||
TotalSex = new BarInfo(
|
||||
label: String.Format(Keyed.RS_TotalSexHad + ": {0:0} ({1:0})", _history.TotalSexHad, Pawn.records.GetValue(xxx.CountOfSex)),
|
||||
fillPercent: _history.TotalSexHad / 100,
|
||||
fillTexture: HistoryUtility.TotalSex,
|
||||
labelRight: Keyed.RS_SatAVG(_history.AVGSat));
|
||||
|
||||
float lust = Pawn.records.GetValue(RsDefOf.Record.Lust);
|
||||
float sexDrive = GetStatValue(xxx.sex_drive_stat);
|
||||
float lustLimit = SexperienceMod.Settings.LustLimit * 3f;
|
||||
Lust.Label = string.Format(Keyed.Lust + ": {0:0.00}", lust);
|
||||
Lust.FillPercent = lust.Normalization(-lustLimit, lustLimit);
|
||||
Lust.Tooltip = GetStatTooltip(xxx.sex_drive_stat, sexDrive);
|
||||
Lust.LabelRight = xxx.sex_drive_stat.LabelCap + ": " + sexDrive.ToStringPercent();
|
||||
Lust = new BarInfo(
|
||||
label: String.Format(Keyed.Lust + ": {0:0.00}", lust),
|
||||
fillPercent: Mathf.Clamp01(lust.Normalization(-lustLimit, lustLimit)),
|
||||
fillTexture: HistoryUtility.Slaanesh,
|
||||
tooltip: GetStatTooltip(xxx.sex_drive_stat, sexDrive),
|
||||
labelRight: xxx.sex_drive_stat.LabelCap + ": " + sexDrive.ToStringPercent());
|
||||
|
||||
float bestSextypeRelativeSatisfaction = _history.GetBestSextype(out xxx.rjwSextype bestSextype) / UIUtility.BASESAT;
|
||||
BestSextype.Label = string.Format(Keyed.RS_Best_Sextype + ": {0}", Keyed.Sextype[(int)bestSextype]);
|
||||
BestSextype.FillPercent = bestSextypeRelativeSatisfaction / 2;
|
||||
BestSextype.FillTexture = HistoryUtility.SextypeColor[(int)bestSextype];
|
||||
BestSextype.LabelRight = Keyed.RS_SatAVG(bestSextypeRelativeSatisfaction);
|
||||
BestSextype = new BarInfo(
|
||||
label: String.Format(Keyed.RS_Best_Sextype + ": {0}", Keyed.Sextype[(int)bestSextype]),
|
||||
fillPercent: bestSextypeRelativeSatisfaction / 2,
|
||||
fillTexture: HistoryUtility.SextypeColor[(int)bestSextype],
|
||||
labelRight: Keyed.RS_SatAVG(bestSextypeRelativeSatisfaction));
|
||||
|
||||
float recentSextypeRelativeSatisfaction = _history.GetRecentSextype(out xxx.rjwSextype recentSextype) / UIUtility.BASESAT;
|
||||
RecentSextype.Label = string.Format(Keyed.RS_Recent_Sextype + ": {0}", Keyed.Sextype[(int)recentSextype]);
|
||||
RecentSextype.FillPercent = recentSextypeRelativeSatisfaction / 2;
|
||||
RecentSextype.FillTexture = HistoryUtility.SextypeColor[(int)recentSextype];
|
||||
RecentSextype.LabelRight = recentSextypeRelativeSatisfaction.ToStringPercent();
|
||||
RecentSextype = new BarInfo(
|
||||
label: String.Format(Keyed.RS_Recent_Sextype + ": {0}", Keyed.Sextype[(int)recentSextype]),
|
||||
fillPercent: recentSextypeRelativeSatisfaction / 2,
|
||||
fillTexture: HistoryUtility.SextypeColor[(int)recentSextype],
|
||||
labelRight: recentSextypeRelativeSatisfaction.ToStringPercent());
|
||||
|
||||
Necro.Label = string.Format(Keyed.RS_Necrophile + ": {0}", _history.CorpseFuckCount);
|
||||
Necro.FillPercent = _history.CorpseFuckCount / 50f;
|
||||
Necro = new BarInfo(
|
||||
label: String.Format(Keyed.RS_Necrophile + ": {0}", _history.CorpseFuckCount),
|
||||
fillPercent: _history.CorpseFuckCount / 50,
|
||||
fillTexture: HistoryUtility.Nurgle);
|
||||
|
||||
Incest.Label = string.Format(Keyed.Incest + ": {0}", _history.IncestuousCount);
|
||||
Incest.FillPercent = _history.IncestuousCount / 50f;
|
||||
Incest = new BarInfo(
|
||||
label: String.Format(Keyed.Incest + ": {0}", _history.IncestuousCount),
|
||||
fillPercent: _history.IncestuousCount / 50,
|
||||
fillTexture: HistoryUtility.Nurgle);
|
||||
|
||||
float amountofEatenCum = Pawn.records.GetValue(RsDefOf.Record.AmountofEatenCum);
|
||||
ConsumedCum.Label = string.Format(Keyed.RS_Cum_Swallowed + ": {0} mL, {1} " + Keyed.RS_NumofTimes, amountofEatenCum, Pawn.records.GetValue(RsDefOf.Record.NumofEatenCum));
|
||||
ConsumedCum.FillPercent = amountofEatenCum / 1000;
|
||||
ConsumedCum = new BarInfo(
|
||||
label: String.Format(Keyed.RS_Cum_Swallowed + ": {0} mL, {1} " + Keyed.RS_NumofTimes, amountofEatenCum, Pawn.records.GetValue(RsDefOf.Record.NumofEatenCum)),
|
||||
fillPercent: amountofEatenCum / 1000,
|
||||
fillTexture: Texture2D.linearGrayTexture);
|
||||
|
||||
Hediff cumHediff = Pawn.health.hediffSet.GetFirstHediffOfDef(RsDefOf.Hediff.CumAddiction)
|
||||
?? Pawn.health.hediffSet.GetFirstHediffOfDef(RsDefOf.Hediff.CumTolerance);
|
||||
if (cumHediff != null)
|
||||
{
|
||||
CumHediff.Label = $"{cumHediff.Label}: {cumHediff.Severity.ToStringPercent()}";
|
||||
CumHediff.FillPercent = cumHediff.Severity;
|
||||
CumHediff.Tooltip = new TipSignal(() => cumHediff.GetTooltip(Pawn, false), cumHediff.Label.GetHashCode());
|
||||
}
|
||||
else
|
||||
{
|
||||
CumHediff.Label = "";
|
||||
CumHediff.FillPercent = 0f;
|
||||
CumHediff.Tooltip = default;
|
||||
CumHediff = new BarInfo(
|
||||
label: $"{cumHediff.Label}: {cumHediff.Severity.ToStringPercent()}",
|
||||
fillPercent: cumHediff.Severity,
|
||||
fillTexture: Texture2D.linearGrayTexture,
|
||||
tooltip: new TipSignal(() => cumHediff.GetTooltip(Pawn, false), cumHediff.Label.GetHashCode()));
|
||||
}
|
||||
|
||||
float vulnerability = GetStatValue(xxx.vulnerability_stat);
|
||||
string vulnerabilityLabel = xxx.vulnerability_stat.LabelCap + ": " + vulnerability.ToStringPercent();
|
||||
TipSignal vulnerabilityTip = GetStatTooltip(xxx.vulnerability_stat, vulnerability);
|
||||
|
||||
Raped.Label = string.Format(Keyed.RS_RapedSomeone + ": {0}", _history.RapedCount);
|
||||
Raped.FillPercent = _history.RapedCount / 50f;
|
||||
Raped.Tooltip = vulnerabilityTip;
|
||||
Raped.LabelRight = vulnerabilityLabel;
|
||||
Raped = new BarInfo(
|
||||
label: String.Format(Keyed.RS_RapedSomeone + ": {0}", _history.RapedCount),
|
||||
fillPercent: _history.RapedCount / 50,
|
||||
fillTexture: HistoryUtility.Khorne,
|
||||
tooltip: vulnerabilityTip,
|
||||
labelRight: vulnerabilityLabel);
|
||||
|
||||
BeenRaped.Label = string.Format(Keyed.RS_BeenRaped + ": {0}", _history.BeenRapedCount);
|
||||
BeenRaped.FillPercent = _history.BeenRapedCount / 50f;
|
||||
BeenRaped.Tooltip = vulnerabilityTip;
|
||||
BeenRaped.LabelRight = vulnerabilityLabel;
|
||||
BeenRaped = new BarInfo(
|
||||
label: String.Format(Keyed.RS_BeenRaped + ": {0}", _history.BeenRapedCount),
|
||||
fillPercent: _history.BeenRapedCount / 50,
|
||||
fillTexture: Texture2D.grayTexture,
|
||||
tooltip: vulnerabilityTip,
|
||||
labelRight: vulnerabilityLabel);
|
||||
|
||||
float sexSatisfaction = GetStatValue(xxx.sex_satisfaction);
|
||||
SexSatisfaction.Label = xxx.sex_satisfaction.LabelCap + ": " + sexSatisfaction.ToStringPercent();
|
||||
SexSatisfaction.FillPercent = sexSatisfaction / 2;
|
||||
SexSatisfaction.Tooltip = GetStatTooltip(xxx.sex_satisfaction, sexSatisfaction);
|
||||
SexSatisfaction = new BarInfo(
|
||||
label: xxx.sex_satisfaction.LabelCap + ": " + sexSatisfaction.ToStringPercent(),
|
||||
fillPercent: sexSatisfaction / 2,
|
||||
fillTexture: HistoryUtility.Satisfaction,
|
||||
tooltip: GetStatTooltip(xxx.sex_satisfaction, sexSatisfaction));
|
||||
|
||||
SkillRecord skill = Pawn.skills?.GetSkill(RsDefOf.Skill.Sex);
|
||||
float sexSkillLevel = skill?.Level ?? 0f;
|
||||
float sexStat = Pawn.GetSexStat();
|
||||
SexSkill.Label = $"{Keyed.RS_SexSkill}: {sexSkillLevel}, {skill?.xpSinceLastLevel / skill?.XpRequiredForLevelUp:P2}";
|
||||
SexSkill.FillPercent = sexSkillLevel / 20;
|
||||
SexSkill.Tooltip = GetStatTooltip(RsDefOf.Stat.SexAbility, sexStat);
|
||||
SexSkill.LabelRight = RsDefOf.Stat.SexAbility.LabelCap + ": " + sexStat.ToStringPercent();
|
||||
SexSkill.Border = HistoryUtility.GetPassionBG(skill?.passion);
|
||||
SexSkill = new BarInfo(
|
||||
label: $"{Keyed.RS_SexSkill}: {sexSkillLevel}, {skill?.xpSinceLastLevel / skill?.XpRequiredForLevelUp:P2}",
|
||||
fillPercent: sexSkillLevel / 20,
|
||||
fillTexture: HistoryUtility.Tzeentch,
|
||||
tooltip: GetStatTooltip(RsDefOf.Stat.SexAbility, sexStat),
|
||||
labelRight: RsDefOf.Stat.SexAbility.LabelCap + ": " + sexStat.ToStringPercent(),
|
||||
border: HistoryUtility.GetPassionBG(skill?.passion));
|
||||
}
|
||||
|
||||
private void UpdateQuirks()
|
||||
|
@ -304,13 +325,13 @@ namespace RJWSexperience.SexHistory.UI
|
|||
Partners = partners;
|
||||
break;
|
||||
case PartnerOrderMode.Recent:
|
||||
Partners = partners.OrderBy(x => x.PartnerRecord.RecentSexTickAbs);
|
||||
Partners = partners.OrderBy(x => x.partnerRecord.RecentSexTickAbs);
|
||||
break;
|
||||
case PartnerOrderMode.Most:
|
||||
Partners = partners.OrderBy(x => x.PartnerRecord.TotalSexCount);
|
||||
Partners = partners.OrderBy(x => x.partnerRecord.TotalSexCount);
|
||||
break;
|
||||
case PartnerOrderMode.Name:
|
||||
Partners = partners.OrderBy(x => x.PartnerRecord.Label);
|
||||
Partners = partners.OrderBy(x => x.partnerRecord.Label);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
@ -323,16 +344,18 @@ namespace RJWSexperience.SexHistory.UI
|
|||
|
||||
private void UpdateSelectedPartnerCard()
|
||||
{
|
||||
SelectedPartnerCard.UpdatePartnerRecord(SelectedPartner);
|
||||
|
||||
if (SelectedPartner == null)
|
||||
{
|
||||
SelectedPartnerCard.LastSexTime = null;
|
||||
}
|
||||
else
|
||||
{
|
||||
SelectedPartnerCard.LastSexTime = UIUtility.GetSexDays(SelectedPartner.RecentSexTickAbs);
|
||||
SelectedPartnerCard = default;
|
||||
return;
|
||||
}
|
||||
|
||||
SelectedPartnerCard = new InfoCard(
|
||||
pawn: Pawn,
|
||||
partnerRecord: SelectedPartner,
|
||||
label: Keyed.RS_Selected_Partner,
|
||||
tooltipLabel: Keyed.RS_Selected_Partner,
|
||||
lastSexTimeTicks: SelectedPartner.RecentSexTickAbs);
|
||||
}
|
||||
|
||||
private float GetStatValue(StatDef statDef) => Pawn.Dead ? 0f : Pawn.GetStatValue(statDef);
|
||||
|
|
|
@ -17,6 +17,9 @@ namespace RJWSexperience.SexHistory.UI
|
|||
public const float BASESAT = UIUtility.BASESAT;
|
||||
public const float ICONSIZE = UIUtility.ICONSIZE;
|
||||
|
||||
private static GUIStyle fontStyleCenter;
|
||||
private static GUIStyle fontStyleRight;
|
||||
private static GUIStyle fontStyleLeft;
|
||||
private static GUIStyle boxStyle;
|
||||
private static GUIStyle buttonStyle;
|
||||
|
||||
|
@ -29,13 +32,17 @@ namespace RJWSexperience.SexHistory.UI
|
|||
|
||||
private static void InitStyles()
|
||||
{
|
||||
if (boxStyle != null)
|
||||
if (fontStyleCenter != null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
GUIStyleState fontStyleState = new GUIStyleState() { textColor = Color.white };
|
||||
GUIStyleState boxStyleState = GUI.skin.textArea.normal;
|
||||
GUIStyleState buttonStyleState = GUI.skin.button.normal;
|
||||
fontStyleCenter = new GUIStyle() { alignment = TextAnchor.MiddleCenter, normal = fontStyleState };
|
||||
fontStyleRight = new GUIStyle() { alignment = TextAnchor.MiddleRight, normal = fontStyleState };
|
||||
fontStyleLeft = new GUIStyle() { alignment = TextAnchor.MiddleLeft, normal = fontStyleState };
|
||||
boxStyle = new GUIStyle(GUI.skin.textArea) { hover = boxStyleState, onHover = boxStyleState, onNormal = boxStyleState };
|
||||
buttonStyle = new GUIStyle(GUI.skin.button) { hover = buttonStyleState, onHover = buttonStyleState, onNormal = buttonStyleState };
|
||||
}
|
||||
|
@ -154,13 +161,13 @@ namespace RJWSexperience.SexHistory.UI
|
|||
Rect sexinfoRect2 = new Rect(rect.x + portraitRect.width, rect.y + (FONTHEIGHT * 2), rect.width - portraitRect.width, FONTHEIGHT);
|
||||
Rect bestsexRect = new Rect(rect.x + 2f, rect.y + (FONTHEIGHT * 3), rect.width - 4f, FONTHEIGHT - 2f);
|
||||
|
||||
if (context.PartnerRecord != null)
|
||||
if (context.partnerRecord != null)
|
||||
{
|
||||
DrawPartnerPortrait(portraitRect, context.PortraitInfo);
|
||||
DrawPartnerPortrait(portraitRect, context.portraitInfo);
|
||||
Widgets.DrawHighlightIfMouseover(portraitRect);
|
||||
if (Widgets.ButtonInvisible(portraitRect))
|
||||
{
|
||||
SexHistoryComp partnerHistory = context.PartnerRecord.Partner?.TryGetComp<SexHistoryComp>();
|
||||
SexHistoryComp partnerHistory = context.partnerRecord.Partner?.TryGetComp<SexHistoryComp>();
|
||||
if (partnerHistory != null)
|
||||
{
|
||||
ChangePawn(partnerHistory);
|
||||
|
@ -172,29 +179,24 @@ namespace RJWSexperience.SexHistory.UI
|
|||
}
|
||||
}
|
||||
|
||||
Text.Anchor = TextAnchor.MiddleRight;
|
||||
Widgets.Label(sexinfoRect2, context.Relations + " ");
|
||||
GenUI.ResetLabelAlign();
|
||||
TooltipHandler.TipRegion(rect, context.Tooltip);
|
||||
GUI.Label(sexinfoRect2, context.relations + " ", fontStyleRight);
|
||||
TooltipHandler.TipRegion(rect, context.tooltip);
|
||||
}
|
||||
else
|
||||
{
|
||||
Widgets.DrawTextureFitted(portraitRect, HistoryUtility.UnknownPawn, 1.0f);
|
||||
}
|
||||
Widgets.Label(nameRect, context.Name);
|
||||
Widgets.Label(sexinfoRect, context.SexCount);
|
||||
Widgets.Label(sexinfoRect2, context.Orgasms);
|
||||
UIUtility.FillableBarLabeled(bestsexRect, context.BestSextype);
|
||||
Widgets.Label(nameRect, context.name);
|
||||
Widgets.Label(sexinfoRect, context.sexCount);
|
||||
Widgets.Label(sexinfoRect2, context.orgasms);
|
||||
UIUtility.FillableBarLabeled(bestsexRect, context.bestSextype);
|
||||
}
|
||||
|
||||
protected void DrawSexInfoCard(Rect rect, InfoCard context)
|
||||
{
|
||||
rect.SplitHorizontally(FONTHEIGHT, out Rect labelRect, out Rect infoRect);
|
||||
Text.Anchor = TextAnchor.MiddleLeft;
|
||||
Widgets.Label(labelRect, context.Label);
|
||||
Text.Anchor = TextAnchor.MiddleRight;
|
||||
Widgets.Label(labelRect, context.LastSexTime);
|
||||
GenUI.ResetLabelAlign();
|
||||
GUI.Label(labelRect, context.label, fontStyleLeft);
|
||||
GUI.Label(labelRect, context.lastSexTime, fontStyleRight);
|
||||
DrawInfoWithPortrait(infoRect, context);
|
||||
}
|
||||
|
||||
|
@ -209,9 +211,7 @@ namespace RJWSexperience.SexHistory.UI
|
|||
{
|
||||
DrawSexInfoCard(listmain.GetRect(CARDHEIGHT), infoCard);
|
||||
}
|
||||
Text.Anchor = TextAnchor.MiddleLeft;
|
||||
listmain.Label(Keyed.RS_PreferRace);
|
||||
GenUI.ResetLabelAlign();
|
||||
GUI.Label(listmain.GetRect(FONTHEIGHT), Keyed.RS_PreferRace, fontStyleLeft);
|
||||
DrawPreferRace(listmain.GetRect(66f + 15f), _context.PreferedRaceCard);
|
||||
listmain.End();
|
||||
}
|
||||
|
@ -225,27 +225,22 @@ namespace RJWSexperience.SexHistory.UI
|
|||
Rect infoRect2 = new Rect(infoRect.x, infoRect.y + FONTHEIGHT, infoRect.width, FONTHEIGHT);
|
||||
Rect infoRect3 = new Rect(infoRect.x, infoRect.y + (FONTHEIGHT * 2), infoRect.width - 2f, FONTHEIGHT);
|
||||
|
||||
Widgets.DrawTextureFitted(portraitRect, preferedRaceCard.PortraitGetter(portraitRect.size), 1.0f);
|
||||
Widgets.DrawTextureFitted(portraitRect, preferedRaceCard.portraitGetter(portraitRect.size), 1.0f);
|
||||
GUI.Label(infoRect1, preferedRaceCard.preferRaceLabel, fontStyleLeft);
|
||||
|
||||
Text.Anchor = TextAnchor.MiddleLeft;
|
||||
Widgets.Label(infoRect1, preferedRaceCard.PreferRaceLabel);
|
||||
|
||||
if (preferedRaceCard.SexCount != null)
|
||||
if (preferedRaceCard.preferRaceTypeLabel != null)
|
||||
{
|
||||
Widgets.Label(infoRect2, preferedRaceCard.SexCount);
|
||||
GUI.Label(infoRect1, preferedRaceCard.preferRaceTypeLabel + " ", fontStyleRight);
|
||||
}
|
||||
|
||||
GenUI.ResetLabelAlign();
|
||||
|
||||
if (preferedRaceCard.PreferRaceTypeLabel != null)
|
||||
if (preferedRaceCard.sexCount != null)
|
||||
{
|
||||
Text.Anchor = TextAnchor.MiddleRight;
|
||||
Widgets.Label(infoRect1, preferedRaceCard.PreferRaceTypeLabel + " ");
|
||||
GUI.Label(infoRect2, preferedRaceCard.sexCount, fontStyleLeft);
|
||||
}
|
||||
|
||||
if (preferedRaceCard.BarInfo.Label != null)
|
||||
if (preferedRaceCard.barInfo != null)
|
||||
{
|
||||
UIUtility.FillableBarLabeled(infoRect3, preferedRaceCard.BarInfo);
|
||||
UIUtility.FillableBarLabeled(infoRect3, (BarInfo)preferedRaceCard.barInfo);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -285,10 +280,8 @@ namespace RJWSexperience.SexHistory.UI
|
|||
}
|
||||
|
||||
GUI.Box(nameRect, "", boxStyle);
|
||||
Text.Anchor = TextAnchor.MiddleCenter;
|
||||
Widgets.Label(nameRect.TopHalf(), _context.Name);
|
||||
Widgets.Label(nameRect.BottomHalf(), _context.AgeAndTitle);
|
||||
GenUI.ResetLabelAlign();
|
||||
GUI.Label(nameRect.TopHalf(), _context.Name, fontStyleCenter);
|
||||
GUI.Label(nameRect.BottomHalf(), _context.AgeAndTitle, fontStyleCenter);
|
||||
|
||||
Listing_Standard listmain = new Listing_Standard();
|
||||
listmain.Begin(infoRect);
|
||||
|
@ -299,9 +292,7 @@ namespace RJWSexperience.SexHistory.UI
|
|||
GUI.color = Color.red;
|
||||
GUI.Box(tmp, "", boxStyle);
|
||||
GUI.color = Color.white;
|
||||
Text.Anchor = TextAnchor.MiddleCenter;
|
||||
Widgets.Label(tmp, _context.VirginLabel);
|
||||
GenUI.ResetLabelAlign();
|
||||
GUI.Label(tmp, _context.VirginLabel, fontStyleCenter);
|
||||
listmain.Gap(1f);
|
||||
}
|
||||
else
|
||||
|
@ -313,7 +304,7 @@ namespace RJWSexperience.SexHistory.UI
|
|||
listmain.FillableBarLabeled(_context.BestSextype);
|
||||
listmain.FillableBarLabeled(_context.RecentSextype);
|
||||
|
||||
if (_context.Incest.FillPercent < _context.Necro.FillPercent)
|
||||
if (_context.Incest.fillPercent < _context.Necro.fillPercent)
|
||||
{
|
||||
listmain.FillableBarLabeled(_context.Necro);
|
||||
}
|
||||
|
@ -324,16 +315,16 @@ namespace RJWSexperience.SexHistory.UI
|
|||
|
||||
listmain.FillableBarLabeled(_context.ConsumedCum);
|
||||
|
||||
if (_context.CumHediff.Label != "")
|
||||
if (_context.CumHediff != null)
|
||||
{
|
||||
listmain.FillableBarLabeled(_context.CumHediff);
|
||||
listmain.FillableBarLabeled((BarInfo)_context.CumHediff);
|
||||
}
|
||||
else
|
||||
{
|
||||
listmain.Gap(FONTHEIGHT + 1f);
|
||||
}
|
||||
|
||||
if (_context.Raped.FillPercent < _context.BeenRaped.FillPercent)
|
||||
if (_context.Raped.fillPercent < _context.BeenRaped.fillPercent)
|
||||
{
|
||||
listmain.FillableBarLabeled(_context.BeenRaped);
|
||||
}
|
||||
|
@ -391,9 +382,7 @@ namespace RJWSexperience.SexHistory.UI
|
|||
listmain.Begin(rect);
|
||||
|
||||
//Sex statistics
|
||||
Text.Anchor = TextAnchor.MiddleLeft;
|
||||
listmain.Label(" " + Keyed.RS_Statistics);
|
||||
GenUI.ResetLabelAlign();
|
||||
GUI.Label(listmain.GetRect(FONTHEIGHT), " " + Keyed.RS_Statistics, fontStyleLeft);
|
||||
listmain.Gap(1f);
|
||||
|
||||
for (int i = 0; i < _context.SexTypes.Count; i++)
|
||||
|
@ -401,15 +390,10 @@ namespace RJWSexperience.SexHistory.UI
|
|||
listmain.FillableBarLabeled(_context.SexTypes[i]);
|
||||
}
|
||||
|
||||
listmain.FillableBarLabeled(_context.PartnerCount);
|
||||
listmain.FillableBarLabeled(_context.VirginsTaken);
|
||||
|
||||
//Partner list
|
||||
Rect listLabelRect = listmain.GetRect(FONTHEIGHT);
|
||||
Rect sortbtnRect = new Rect(listLabelRect.xMax - 80f, listLabelRect.y, 80f, listLabelRect.height);
|
||||
Text.Anchor = TextAnchor.MiddleLeft;
|
||||
Widgets.Label(listLabelRect, " " + Keyed.RS_PartnerList);
|
||||
GenUI.ResetLabelAlign();
|
||||
GUI.Label(listLabelRect, " " + Keyed.RS_PartnerList, fontStyleLeft);
|
||||
if (Widgets.ButtonText(sortbtnRect, orderMode.Translate()))
|
||||
{
|
||||
SoundDefOf.Click.PlayOneShotOnCamera();
|
||||
|
@ -445,17 +429,13 @@ namespace RJWSexperience.SexHistory.UI
|
|||
|
||||
DrawPartnerPortrait(pawnRect, partner);
|
||||
Widgets.DrawHighlightIfMouseover(pawnRect);
|
||||
|
||||
Text.Anchor = TextAnchor.MiddleCenter;
|
||||
Widgets.Label(labelRect, partner.PartnerRecord.Label);
|
||||
GenUI.ResetLabelAlign();
|
||||
|
||||
GUI.Label(labelRect, partner.partnerRecord.Label, fontStyleCenter);
|
||||
if (Widgets.ButtonInvisible(pawnRect))
|
||||
{
|
||||
_context.SetSelectedPartner(partner.PartnerRecord);
|
||||
_context.SetSelectedPartner(partner.partnerRecord);
|
||||
SoundDefOf.Click.PlayOneShotOnCamera();
|
||||
}
|
||||
if (partner.PartnerRecord == _context.SelectedPartner)
|
||||
if (partner.partnerRecord == _context.SelectedPartner)
|
||||
{
|
||||
Widgets.DrawHighlightSelected(pawnRect);
|
||||
}
|
||||
|
@ -467,22 +447,22 @@ namespace RJWSexperience.SexHistory.UI
|
|||
protected void DrawPartnerPortrait(Rect rect, PartnerPortraitInfo context)
|
||||
{
|
||||
Rect iconRect = new Rect(rect.x + (rect.width * 3 / 4), rect.y, rect.width / 4, rect.height / 4);
|
||||
Texture img = context.PortraitGetter(rect.size);
|
||||
Texture img = context.portraitGetter(rect.size);
|
||||
|
||||
if (context.PartnerRecord.IamFirst)
|
||||
if (context.partnerRecord.IamFirst)
|
||||
{
|
||||
GUI.color = HistoryUtility.HistoryColor;
|
||||
Widgets.DrawTextureFitted(rect, HistoryUtility.FirstOverlay, 1.0f);
|
||||
GUI.color = Color.white;
|
||||
}
|
||||
|
||||
if (context.PartnerRecord.Incest)
|
||||
if (context.partnerRecord.Incest)
|
||||
{
|
||||
Widgets.DrawTextureFitted(iconRect, HistoryUtility.Incest, 1.0f);
|
||||
iconRect.x -= iconRect.width;
|
||||
}
|
||||
Widgets.DrawTextureFitted(rect, img, 1.0f);
|
||||
if (context.Lover)
|
||||
if (context.lover)
|
||||
{
|
||||
Widgets.DrawTextureFitted(iconRect, HistoryUtility.Heart, 1.0f);
|
||||
}
|
||||
|
|
|
@ -52,22 +52,22 @@ namespace RJWSexperience.SexHistory.UI
|
|||
|
||||
public static void FillableBarLabeled(Rect rect, BarInfo context)
|
||||
{
|
||||
Widgets.FillableBar(rect, context.FillPercent, context.FillTexture, null, true);
|
||||
Widgets.FillableBar(rect, context.fillPercent, context.fillTexture, null, true);
|
||||
Rect labelRect = rect.ContractedBy(4f, 0f);
|
||||
Text.Anchor = TextAnchor.MiddleLeft;
|
||||
Widgets.Label(labelRect, context.Label);
|
||||
if (context.LabelRight != "")
|
||||
Widgets.Label(labelRect, context.label);
|
||||
if (context.labelRight != "")
|
||||
{
|
||||
Text.Anchor = TextAnchor.MiddleRight;
|
||||
Widgets.Label(labelRect, context.LabelRight);
|
||||
Widgets.Label(labelRect, context.labelRight);
|
||||
}
|
||||
GenUI.ResetLabelAlign();
|
||||
Widgets.DrawHighlightIfMouseover(rect);
|
||||
TooltipHandler.TipRegion(rect, context.Tooltip);
|
||||
TooltipHandler.TipRegion(rect, context.tooltip);
|
||||
|
||||
if (context.Border != null)
|
||||
if (context.border != null)
|
||||
{
|
||||
rect.DrawBorder(context.Border, 2f);
|
||||
rect.DrawBorder(context.border, 2f);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -1,27 +0,0 @@
|
|||
using RJWSexperience;
|
||||
using Verse;
|
||||
using Verse.AI;
|
||||
|
||||
namespace RJWSexperienceCum
|
||||
{
|
||||
public class JobGiver_CleanSelfWithBucket : ThinkNode_JobGiver
|
||||
{
|
||||
protected override Job TryGiveJob(Pawn pawn)
|
||||
{
|
||||
if (HediffDefOf.Hediff_CumController == null || !pawn.health.hediffSet.HasHediff(HediffDefOf.Hediff_CumController))
|
||||
{
|
||||
// Nothing to clean
|
||||
return null;
|
||||
}
|
||||
|
||||
Building_CumBucket bucket = pawn.FindClosestBucket();
|
||||
|
||||
if (bucket == null)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
return JobMaker.MakeJob(JobDefOf.CleanSelfwithBucket, pawn, bucket);
|
||||
}
|
||||
}
|
||||
}
|
|
@ -1,29 +1,55 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<?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>{73CB4597-22BD-4A3E-A3CE-6D65DD080F65}</ProjectGuid>
|
||||
<TargetFramework>net472</TargetFramework>
|
||||
<OutputType>Library</OutputType>
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>RJWSexperienceCum</RootNamespace>
|
||||
<AssemblyName>RJWSexperienceCum</AssemblyName>
|
||||
<OutputPath>..\..\Mod Compatibility\RJW Cum\Assemblies\</OutputPath>
|
||||
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
|
||||
<Company>amevarashi</Company>
|
||||
<Optimize>True</Optimize>
|
||||
<GenerateAssemblyInfo>False</GenerateAssemblyInfo>
|
||||
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<Deterministic>true</Deterministic>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
<Optimize>false</Optimize>
|
||||
<OutputPath>bin\Debug\</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>..\..\Mod Compatibility\RJW Cum\Assemblies\</OutputPath>
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="System.Data.DataSetExtensions" />
|
||||
<Reference Include="Microsoft.CSharp" />
|
||||
<Reference Include="System.Data" />
|
||||
<Reference Include="System.Net.Http" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="JobDefOf.cs" />
|
||||
<Compile Include="ThingDefOf.cs" />
|
||||
<Compile Include="JobDriver_CleanSelfWithBucket.cs" />
|
||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
<Compile Include="HediffDefOf.cs" />
|
||||
<Compile Include="WorkGiver_CleanSelfWithBucket.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Krafs.Rimworld.Ref">
|
||||
<Version>1.4.*</Version>
|
||||
<Version>1.4.3641</Version>
|
||||
</PackageReference>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Reference Include="RJW">
|
||||
<HintPath>..\..\..\rjw\1.4\Assemblies\RJW.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\RJWSexperience\RJWSexperience.csproj">
|
||||
<Project>{9c728e06-573b-4b04-a07f-acbf60cb424d}</Project>
|
||||
|
@ -31,4 +57,5 @@
|
|||
<Private>False</Private>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
</Project>
|
Loading…
Reference in a new issue