Compare commits
16 Commits
cc4e36e3ce
...
e9f047b9af
| Author | SHA1 | Date |
|---|---|---|
amevarashi
|
e9f047b9af | |
|
amevarashi
|
b99b74e27b | |
|
amevarashi
|
3c4060f8bd | |
|
amevarashi
|
0743575d56 | |
|
amevarashi
|
190c6fc3d6 | |
|
amevarashi
|
4265e3c3e1 | |
|
amevarashi
|
9e21992d9b | |
|
amevarashi
|
cfee907258 | |
amevarashi
|
814f35772e | |
|
amevarashi
|
57fe883be0 | |
|
amevarashi
|
ffe6a9b7f7 | |
|
amevarashi
|
bed83e1eca | |
|
amevarashi
|
5138e11cb2 | |
|
amevarashi
|
4e44d42c4f | |
|
amevarashi
|
2c225a2d41 | |
|
amevarashi
|
811162875d |
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.0</version>
|
||||
<version>1.4.1.3</version>
|
||||
<dependencies>
|
||||
<li>RimJobWorld >= 5.3.0</li>
|
||||
</dependencies>
|
||||
|
|
|
|||
15
CHANGELOG.md
15
CHANGELOG.md
|
|
@ -1,11 +1,16 @@
|
|||
### 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
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LanguageData>
|
||||
|
||||
<CumAddiction.label>精液依存症</CumAddiction.label> <!-- Seieki isonshō -->
|
||||
|
||||
</LanguageData>
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<LanguageData>
|
||||
<AteCum.stages.0.label>精液を食べた</AteCum.stages.0.label>
|
||||
<AteCum.stages.0.description>こんな胸が悪くなるようなものを二度と食べたくはない.</AteCum.stages.0.description> <!-- AteInsectMeatDirect.stages.ate_insect_meat.description -->
|
||||
<AteCum.stages.1.label>精液を食べた</AteCum.stages.1.label>
|
||||
<AteCum.stages.1.description>臭くてまずいです.</AteCum.stages.1.description>
|
||||
<AteCum.stages.2.label>精液を食べた</AteCum.stages.2.label>
|
||||
<AteCum.stages.2.description>味はまずい. But I liked it.</AteCum.stages.2.description>
|
||||
</LanguageData>
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LanguageData>
|
||||
|
||||
<!--<Virgin.degreeDatas.0.label>damaged virgin</Virgin.degreeDatas.0.label>
|
||||
<Virgin.degreeDatas.0.description>[PAWN_nameDef] never experienced. However, her hymen had damaged for some reason.</Virgin.degreeDatas.0.description>-->
|
||||
<Virgin.degreeDatas.1.label>童貞</Virgin.degreeDatas.1.label>
|
||||
<!--<Virgin.degreeDatas.1.description>[PAWN_nameDef] never experienced.</Virgin.degreeDatas.1.description>-->
|
||||
<Virgin.degreeDatas.2.label>処女?</Virgin.degreeDatas.2.label>
|
||||
<!--<Virgin.degreeDatas.2.description>[PAWN_nameDef] looks experienced. But the hymen is still threre.</Virgin.degreeDatas.2.description>-->
|
||||
<Virgin.degreeDatas.3.label>処女</Virgin.degreeDatas.3.label>
|
||||
<!--<Virgin.degreeDatas.3.description>[PAWN_nameDef] never experienced.</Virgin.degreeDatas.3.description>-->
|
||||
|
||||
</LanguageData>
|
||||
|
|
@ -0,0 +1,137 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LanguageData>
|
||||
<!-- Big thanks to HERAJIKA for RJW Japanese translation. Many parts are taken from their translation -->
|
||||
<RS_Mod_Title>RJW Sexperience</RS_Mod_Title>
|
||||
|
||||
<!-- Sex status screen -->
|
||||
<RSTotalGatheredCum>合計集まった精液: </RSTotalGatheredCum>
|
||||
<RS_LostVirgin>{1}は{0}の初めてを取りました</RS_LostVirgin>
|
||||
<RS_Best_Sextype>最高のタイプ</RS_Best_Sextype>
|
||||
<RS_Recent_Sextype>最近のタイプ</RS_Recent_Sextype>
|
||||
<!-- <RS_Sex_Partners>Sex partners</RS_Sex_Partners>
|
||||
<RS_Cum_Swallowed>Cum swallowed</RS_Cum_Swallowed>
|
||||
<RS_Selected_Partner>Selected Partner's Info</RS_Selected_Partner> -->
|
||||
<RS_Sex_Info>{0}: {1}回</RS_Sex_Info>
|
||||
<RS_SAT_AVG>平均: {0}</RS_SAT_AVG>
|
||||
<RS_Sex_Count>セックス回数: </RS_Sex_Count>
|
||||
<RS_Orgasms>オガズム回数: </RS_Orgasms>
|
||||
<RS_Recent_Sex_Partner>最近の相手</RS_Recent_Sex_Partner>
|
||||
<!-- <RS_Recent_Sex_Partner_ToolTip>A recent sex partner.</RS_Recent_Sex_Partner_ToolTip> -->
|
||||
<RS_First_Sex_Partner>初めての相手</RS_First_Sex_Partner>
|
||||
<!-- <RS_First_Sex_Partner_ToolTip>The first sex partner.</RS_First_Sex_Partner_ToolTip> -->
|
||||
<RS_Most_Sex_Partner>最回の相手</RS_Most_Sex_Partner>
|
||||
<!-- <RS_Most_Sex_Partner_ToolTip>The most sex partner.</RS_Most_Sex_Partner_ToolTip> -->
|
||||
<RS_Best_Sex_Partner>最高の相手</RS_Best_Sex_Partner>
|
||||
<!-- <RS_Best_Sex_Partner_ToolTip>The partner who had most satisfying sex.</RS_Best_Sex_Partner_ToolTip>
|
||||
<RS_VirginsTaken>Taken virgins</RS_VirginsTaken> -->
|
||||
<RS_TotalSexHad>合計セックス回数</RS_TotalSexHad>
|
||||
<RS_TotalSexHad_ToolTip>セックスした回数。</RS_TotalSexHad_ToolTip>
|
||||
<RS_Raped>強姦: </RS_Raped>
|
||||
<RS_RapedMe>強姦した: </RS_RapedMe>
|
||||
<!-- <RS_Sex_History>Sex History</RS_Sex_History> -->
|
||||
<RS_Statistics>セックス統計</RS_Statistics>
|
||||
<RS_PartnerList>相手リスト</RS_PartnerList>
|
||||
<RS_Sexuality>セクシャリティ</RS_Sexuality>
|
||||
<RS_BeenRaped>レイプされた</RS_BeenRaped>
|
||||
<RS_RapedSomeone>レイプした</RS_RapedSomeone>
|
||||
<RS_PreferRace>種族の好み</RS_PreferRace>
|
||||
<RS_Bestiality>獣姦</RS_Bestiality>
|
||||
<RS_Interspecies>種間</RS_Interspecies>
|
||||
<!-- <RS_Normal>Normal</RS_Normal> -->
|
||||
<RS_Necrophile>死姦</RS_Necrophile>
|
||||
<!-- <RS_SexSkill>Sex skill</RS_SexSkill> -->
|
||||
<RS_NumofTimes>回</RS_NumofTimes>
|
||||
<RS_Ago>前</RS_Ago>
|
||||
<!-- <RS_LastSex>last sex</RS_LastSex>
|
||||
<RS_HadBestSexDaysAgo>Had best sex {0}.</RS_HadBestSexDaysAgo>
|
||||
<RS_PawnLockDesc>Lock displayed pawn.\n\nWhen unlocked, window will automatically switch to a currently selected pawn.</RS_PawnLockDesc> -->
|
||||
|
||||
<!-- Settings tab labels -->
|
||||
<RSTabLabelMain>メイン</RSTabLabelMain>
|
||||
<RSTabLabelHistory>セックス記録</RSTabLabelHistory>
|
||||
<RSTabLabelDebug>デバッグ</RSTabLabelDebug>
|
||||
|
||||
<!-- Mod settings: Main -->
|
||||
<!-- <RSOption_2_Label>Lust effect power</RSOption_2_Label>
|
||||
<RSOption_2_Desc>Set how much lust affect to sex drive.</RSOption_2_Desc>
|
||||
<RSOption_8_Label>Lust Limit</RSOption_8_Label>
|
||||
<RSOption_8_Desc>Set limitation of lust.\nIf absolute value of lust close to or larger than this value, lust will be less likely to change.</RSOption_8_Desc>
|
||||
<RSOption_MaxSingleLustChange_Label>Maximum lust change per sex</RSOption_MaxSingleLustChange_Label>
|
||||
<RSOption_MaxSingleLustChange_Desc>Set how much lust can change from a single sex act</RSOption_MaxSingleLustChange_Desc>
|
||||
<RSOption_SexCanFillBuckets_Label>Sex can fill buckets</RSOption_SexCanFillBuckets_Label>
|
||||
<RSOption_SexCanFillBuckets_Desc>If enabled boobjobs, footjobs and handjobs that happens near cum bucket will fill it</RSOption_SexCanFillBuckets_Desc> -->
|
||||
|
||||
<!-- Mod settings: Sex records -->
|
||||
<!-- <RSOption_1_Label>Enable record randomizer</RSOption_1_Label>
|
||||
<RSOption_1_Desc>Randomize pawn's sex records.</RSOption_1_Desc>
|
||||
<RSOption_3_Label>Maximum lust deviation</RSOption_3_Label>
|
||||
<RSOption_3_Desc>Set maximum deviation of lust.\nThe lust value can be negative depending on its average.</RSOption_3_Desc>
|
||||
<RSOption_4_Label>Average Lust</RSOption_4_Label>
|
||||
<RSOption_4_Desc>Set average of lust.</RSOption_4_Desc>
|
||||
<RSOption_5_Label>Maximum sex count deviation</RSOption_5_Label>
|
||||
<RSOption_5_Desc>Set maximum deviation of sex count.</RSOption_5_Desc>
|
||||
<RSOption_6_Label>Average sex count per year</RSOption_6_Label>
|
||||
<RSOption_6_Desc>Set average sex count.</RSOption_6_Desc>
|
||||
<RSOption_7_Label>Enable slaves get raped experience</RSOption_7_Label>
|
||||
<RSOption_7_Desc>Slaves will have experience of being raped</RSOption_7_Desc>
|
||||
<RSOption_9_Label>Minimum age can have sex</RSOption_9_Label>
|
||||
<RSOption_9_Desc>Set minimum sexable age. This value is not related to RJW's minimum sex age. Only used for generating records.</RSOption_9_Desc>
|
||||
<RSOption_10_Label>Virgin ratio</RSOption_10_Label>
|
||||
<RSOption_10_Desc>Set probability of virgin regardless of age.</RSOption_10_Desc>
|
||||
<RSOption_MinSexableFromLifestage_Label>Minimum sexable age from life stages</RSOption_MinSexableFromLifestage_Label>
|
||||
<RSOption_MinSexableFromLifestage_Desc>Only used for generating records. Get minimum sexable age from the first reproductive life stage. Works better for races with a long lifespan</RSOption_MinSexableFromLifestage_Desc>
|
||||
<RSOption_EnableBastardRelation_Label>Enable Bastard relation</RSOption_EnableBastardRelation_Label>
|
||||
<RSOption_EnableBastardRelation_Desc>Child is marked as a bastard if they have only one parent or their parents are not (or was not) married</RSOption_EnableBastardRelation_Desc>
|
||||
<RSOption_EnableSexHistory_Label>[警告] Sex Historyを有効にする*</RSOption_EnableSexHistory_Label> -->
|
||||
<RSOption_EnableSexHistory_Desc>* ゲームの再起動が必要\n\nEnables Sex History window, information collection for the said window and save/load of this information. Also enables sex partners count in pawn's records.\n\n[警告] 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> -->
|
||||
|
||||
<!-- Mod settings: Debug -->
|
||||
<!-- <RSOption_Debug_Label>Debug</RSOption_Debug_Label>
|
||||
<RSOption_Debug_Desc>Enable debug logs</RSOption_Debug_Desc> -->
|
||||
|
||||
<Button_ResetToDefault>デフォルトにリセット</Button_ResetToDefault>
|
||||
|
||||
<!-- Sex types -->
|
||||
<Vaginal>膣挿入</Vaginal>
|
||||
<Anal>肛門挿入</Anal>
|
||||
<Oral>Oral</Oral>
|
||||
<Masturbation>オナニー</Masturbation>
|
||||
<DoublePenetration>二穴挿入</DoublePenetration>
|
||||
<Boobjob>パイズリ</Boobjob>
|
||||
<Handjob>手コキ</Handjob>
|
||||
<Footjob>足コキ</Footjob>
|
||||
<Fingering>手マン</Fingering>
|
||||
<Scissoring>シザリング</Scissoring>
|
||||
<MutualMasturbation>相互オナニー</MutualMasturbation>
|
||||
<Fisting>アナルフィスティング</Fisting>
|
||||
<MechImplant>メカノイドインプラント</MechImplant>
|
||||
<Rimming>アナル舐め</Rimming>
|
||||
<Fellatio>フェラチオ</Fellatio>
|
||||
<Cunnilingus>クンニ</Cunnilingus>
|
||||
<Sixtynine>69</Sixtynine>
|
||||
|
||||
<!-- Sexuality -->
|
||||
<None>None</None>
|
||||
<Asexual>無性愛者</Asexual>
|
||||
<!-- <Pansexual>Pansexual</Pansexual> -->
|
||||
<Heterosexual>異性愛者</Heterosexual>
|
||||
<!-- <MostlyHeterosexual>Mostly hetero</MostlyHeterosexual>
|
||||
<LeaningHeterosexual>Bisexual, leaning hetero</LeaningHeterosexual> -->
|
||||
<Bisexual>両性愛者</Bisexual>
|
||||
<!-- <LeaningHomosexual>Bisexual, leaning gay</LeaningHomosexual> -->
|
||||
<MostlyHomosexual>Mostly gay</MostlyHomosexual>
|
||||
<Homosexual>同性愛者</Homosexual>
|
||||
|
||||
<!-- Misc -->
|
||||
<Lust>性欲</Lust>
|
||||
<Unknown>不明</Unknown>
|
||||
<Incest>近親相姦</Incest> <!--Konshinsōkan-->
|
||||
|
||||
<!-- Order mode -->
|
||||
<RS_PONormal>順序不同</RS_PONormal> <!--Junjofudō-->
|
||||
<RS_PoRecent>最近</RS_PoRecent>
|
||||
<RS_PoMost>最回</RS_PoMost>
|
||||
<RS_PoName>名前</RS_PoName>
|
||||
</LanguageData>
|
||||
Binary file not shown.
|
|
@ -0,0 +1,19 @@
|
|||
<?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>
|
||||
|
|
@ -145,14 +145,15 @@ namespace RJWSexperience.Cum
|
|||
if (!sexFillsCumbuckets)
|
||||
return;
|
||||
|
||||
IEnumerable<Building_CumBucket> buckets = props.pawn.GetAdjacentBuildings<Building_CumBucket>();
|
||||
// Enumerable throws System.InvalidOperationException: Collection was modified; enumeration operation may not execute.
|
||||
List<Building_CumBucket> buckets = props.pawn.GetAdjacentBuildings<Building_CumBucket>().ToList();
|
||||
|
||||
if (buckets?.EnumerableCount() > 0)
|
||||
if (buckets?.Count > 0)
|
||||
{
|
||||
var initialCum = CumUtility.GetCumVolume(props.pawn);
|
||||
var initialCum = GetCumVolume(props.pawn);
|
||||
foreach (Building_CumBucket bucket in buckets)
|
||||
{
|
||||
bucket.AddCum(initialCum / buckets.EnumerableCount());
|
||||
bucket.AddCum(initialCum / buckets.Count);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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; // 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) < 1; // Male is a virgins unless he stick into vagina? Not sure it should work this way
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
|
|||
|
|
@ -27,16 +27,25 @@ namespace RJWSexperience
|
|||
[HarmonyPatch(typeof(ParentRelationUtility), nameof(ParentRelationUtility.SetMother))]
|
||||
public static class Rimworld_Patch_RemoveVirginOnSetMother
|
||||
{
|
||||
/// <summary>
|
||||
/// Retcon virginity if game desides to generate a child for the pawn
|
||||
/// </summary>
|
||||
public static void Postfix(Pawn pawn, Pawn newMother)
|
||||
{
|
||||
if (!pawn.relations.DirectRelationExists(PawnRelationDefOf.Parent, newMother))
|
||||
return;
|
||||
return; // Failed to add relation?
|
||||
|
||||
Trait virgin = newMother.story?.traits?.GetTrait(RsDefOf.Trait.Virgin, Virginity.TraitDegree.FemaleVirgin);
|
||||
if (virgin != null)
|
||||
{
|
||||
newMother.story.traits.RemoveTrait(virgin);
|
||||
newMother.story.traits.GainTrait(new Trait(RsDefOf.Trait.Virgin, Virginity.TraitDegree.FemaleAfterSurgery));
|
||||
|
||||
// Player may notice the missing trait on their pawns.
|
||||
// Doing this for all pawns results in up to a half of tribal raid generating with "virgin?"
|
||||
if (newMother.IsColonist || newMother.IsPrisonerOfColony)
|
||||
{
|
||||
newMother.story.traits.GainTrait(new Trait(RsDefOf.Trait.Virgin, Virginity.TraitDegree.FemaleAfterSurgery));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,116 +1,31 @@
|
|||
<?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')" />
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProjectGuid>{9C728E06-573B-4B04-A07F-ACBF60CB424D}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<TargetFramework>net472</TargetFramework>
|
||||
<RootNamespace>RJWSexperience</RootNamespace>
|
||||
<AssemblyName>RJWSexperience</AssemblyName>
|
||||
<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>
|
||||
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
|
||||
<Company>amevarashi</Company>
|
||||
<Optimize>True</Optimize>
|
||||
<GenerateAssemblyInfo>False</GenerateAssemblyInfo>
|
||||
</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,6 +3,7 @@ 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;
|
||||
|
|
@ -11,6 +12,7 @@ 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>
|
||||
|
|
@ -155,21 +157,28 @@ 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.NullOrEmpty())
|
||||
if (buckets.Count == 0)
|
||||
{
|
||||
s_log.Message("FindClosestBucket: No buckets on the map or buckets are full");
|
||||
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.None))
|
||||
if (pawn.CanReach(buckets[i], PathEndMode.ClosestTouch, Danger.Some))
|
||||
{
|
||||
targets.Add(buckets[i], pawn.Position.DistanceTo(buckets[i].Position));
|
||||
}
|
||||
}
|
||||
if (!targets.NullOrEmpty())
|
||||
if (targets.Count > 0)
|
||||
{
|
||||
return (Building_CumBucket)targets.MinBy(x => x.Value).Key;
|
||||
}
|
||||
else
|
||||
{
|
||||
s_log.Message("FindClosestBucket: No reachable buckets");
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ using Verse;
|
|||
using RimWorld;
|
||||
using UnityEngine;
|
||||
using RJWSexperience.Logs;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace RJWSexperience.SexHistory
|
||||
{
|
||||
|
|
@ -17,137 +18,167 @@ namespace RJWSexperience.SexHistory
|
|||
{
|
||||
log.Message($"Randomize request for {pawn.NameShortColored}");
|
||||
|
||||
int avgsex = -500;
|
||||
bool isvirgin = Rand.Chance(Settings.VirginRatio);
|
||||
int totalsex = 0;
|
||||
int totalbirth = 0;
|
||||
int avgSexPerYear = -500;
|
||||
bool isVirgin = Rand.Chance(Settings.VirginRatio);
|
||||
|
||||
if (isvirgin)
|
||||
if (isVirgin)
|
||||
log.Message("Rand.Chance rolled virgin");
|
||||
|
||||
if (pawn.story != null)
|
||||
if (pawn.story == null)
|
||||
{
|
||||
int sexableage = 0;
|
||||
int minsexage = 0;
|
||||
if (Settings.MinSexableFromLifestage)
|
||||
{
|
||||
LifeStageAge lifeStageAges = pawn.RaceProps.lifeStageAges.Find(x => x.def.reproductive);
|
||||
if (lifeStageAges == null)
|
||||
{
|
||||
log.Message($"No reproductive life stage! {pawn.NameShortColored}'s randomization cancelled");
|
||||
return false;
|
||||
}
|
||||
minsexage = (int)lifeStageAges.minAge;
|
||||
}
|
||||
else
|
||||
{
|
||||
minsexage = (int)(pawn.RaceProps.lifeExpectancy * Settings.MinSexablePercent);
|
||||
}
|
||||
|
||||
log.Message($"Min sex age is {minsexage}");
|
||||
|
||||
float lust = RandomizeLust(pawn);
|
||||
log.Message($"Lust set to {lust}");
|
||||
|
||||
if (pawn.ageTracker.AgeBiologicalYears > minsexage)
|
||||
{
|
||||
sexableage = pawn.ageTracker.AgeBiologicalYears - minsexage;
|
||||
avgsex = (int)(sexableage * Settings.SexPerYear * LustUtility.GetLustFactor(lust));
|
||||
}
|
||||
|
||||
log.Message($"Generating {sexableage} years of sex life");
|
||||
log.Message($"Average sex/year: {avgsex}");
|
||||
|
||||
if (pawn.relations != null && pawn.gender == Gender.Female)
|
||||
{
|
||||
totalbirth += pawn.relations.ChildrenCount;
|
||||
totalsex += totalbirth;
|
||||
pawn.records?.AddTo(xxx.CountOfSexWithHumanlikes, totalbirth);
|
||||
pawn.records?.SetTo(xxx.CountOfBirthHuman, totalbirth);
|
||||
if (totalbirth > 0) isvirgin = false;
|
||||
}
|
||||
if (!isvirgin)
|
||||
{
|
||||
totalsex += GeneratePartnerTypeRecords(pawn, avgsex);
|
||||
|
||||
if (Settings.SlavesBeenRapedExp && pawn.IsSlave)
|
||||
{
|
||||
totalsex += RandomizeRecord(pawn, xxx.CountOfBeenRapedByAnimals, Rand.Range(-50, 10), Rand.Range(0, 10) * sexableage);
|
||||
totalsex += RandomizeRecord(pawn, xxx.CountOfBeenRapedByHumanlikes, 0, Rand.Range(0, 100) * sexableage);
|
||||
}
|
||||
}
|
||||
log.Error("Tried to randomize records for a pawn without a story");
|
||||
return false;
|
||||
}
|
||||
pawn.records?.SetTo(xxx.CountOfSex, totalsex);
|
||||
log.Message($"Splitting {totalsex} sex acts between sex types");
|
||||
GenerateSextypeRecords(pawn, totalsex);
|
||||
|
||||
int sexLifeYears = 0;
|
||||
int minsexage = GetMinSexAge(pawn, out string errorMessage);
|
||||
|
||||
if (minsexage < 0)
|
||||
{
|
||||
log.Error(errorMessage);
|
||||
return false;
|
||||
}
|
||||
|
||||
log.Message($"Min sex age is {minsexage}");
|
||||
|
||||
float lust = RandomizeLust(pawn);
|
||||
log.Message($"Lust set to {lust}");
|
||||
|
||||
if (pawn.ageTracker.AgeBiologicalYears > minsexage)
|
||||
{
|
||||
sexLifeYears = pawn.ageTracker.AgeBiologicalYears - minsexage;
|
||||
avgSexPerYear = (int)(sexLifeYears * Settings.SexPerYear * LustUtility.GetLustFactor(lust));
|
||||
}
|
||||
|
||||
log.Message($"Generating {sexLifeYears} years of sex life");
|
||||
log.Message($"Average sex/year: {avgSexPerYear}");
|
||||
|
||||
int totalSexCount = 0;
|
||||
|
||||
if (pawn.relations != null && pawn.gender == Gender.Female)
|
||||
{
|
||||
// Make sure pawn had at least as much sex as ChildrenCount
|
||||
// TODO: make sure the sex is vaginal
|
||||
// TODO: children may be not humanlike
|
||||
totalSexCount += pawn.relations.ChildrenCount;
|
||||
pawn.records.AddTo(xxx.CountOfSexWithHumanlikes, pawn.relations.ChildrenCount);
|
||||
pawn.records.Set(xxx.CountOfBirthHuman, pawn.relations.ChildrenCount);
|
||||
|
||||
if (pawn.relations.ChildrenCount > 0)
|
||||
isVirgin = false;
|
||||
}
|
||||
|
||||
if (!isVirgin)
|
||||
{
|
||||
Dictionary<RecordDef, int> generatedRecords = GeneratePartnerTypeRecords(pawn, avgSexPerYear, sexLifeYears);
|
||||
|
||||
foreach(KeyValuePair<RecordDef, int> record in generatedRecords)
|
||||
{
|
||||
pawn.records.Set(record.Key, record.Value);
|
||||
totalSexCount += record.Value;
|
||||
}
|
||||
|
||||
if (totalSexCount > 0)
|
||||
pawn.records.AddTo(RsDefOf.Record.SexPartnerCount, Math.Max(1, Rand.Range(0, totalSexCount / 7)));
|
||||
}
|
||||
|
||||
pawn.records.Set(xxx.CountOfSex, totalSexCount);
|
||||
log.Message($"Splitting {totalSexCount} sex acts between sex types");
|
||||
GenerateSextypeRecords(pawn, totalSexCount);
|
||||
log.Message($"{pawn.NameShortColored} randomized");
|
||||
return true;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Assign a new random value to the Lust record of the <paramref name="pawn"/>
|
||||
/// </summary>
|
||||
/// <param name="pawn"></param>
|
||||
/// <returns>Assigned value</returns>
|
||||
public static float RandomizeLust(Pawn pawn)
|
||||
{
|
||||
float value = Utility.RandGaussianLike(Settings.AvgLust - Settings.MaxLustDeviation, Settings.AvgLust + Settings.MaxLustDeviation);
|
||||
float minValue;
|
||||
|
||||
if (xxx.is_nympho(pawn))
|
||||
minValue = 0;
|
||||
else
|
||||
minValue = float.MinValue;
|
||||
value = Mathf.Clamp(value, 0, float.MaxValue);
|
||||
|
||||
value = Mathf.Clamp(value, minValue, float.MaxValue);
|
||||
float recordvalue = pawn.records.GetValue(RsDefOf.Record.Lust);
|
||||
pawn.records.AddTo(RsDefOf.Record.Lust, value - recordvalue);
|
||||
pawn.records.SetTo(RsDefOf.Record.Lust, value);
|
||||
|
||||
return value;
|
||||
}
|
||||
|
||||
private static int RandomizeRecord(Pawn pawn, RecordDef record, int avg, int dist, int min = 0, int max = int.MaxValue)
|
||||
/// <summary>
|
||||
/// Get minimal biological age the pawn can begin sex life
|
||||
/// </summary>
|
||||
/// <param name="pawn"></param>
|
||||
/// <param name="errorMessage">null if no error</param>
|
||||
/// <returns>-1 means error. <paramref name="errorMessage"/> should be not null in that case</returns>
|
||||
private static int GetMinSexAge(Pawn pawn, out string errorMessage)
|
||||
{
|
||||
int value = (int)Mathf.Clamp(Utility.RandGaussianLike(avg - dist, avg + dist), min, max);
|
||||
int recordvalue = pawn.records.GetAsInt(record);
|
||||
pawn.records.AddTo(record, value - recordvalue);
|
||||
errorMessage = null;
|
||||
|
||||
return value;
|
||||
if (!Settings.MinSexableFromLifestage)
|
||||
{
|
||||
// Legacy approach. Does not account for long-lived races with human-like aging curve
|
||||
return (int)(pawn.RaceProps.lifeExpectancy * Settings.MinSexablePercent);
|
||||
}
|
||||
|
||||
LifeStageAge lifeStageAges = pawn.RaceProps.lifeStageAges.Find(x => x.def.reproductive);
|
||||
if (lifeStageAges == null)
|
||||
{
|
||||
errorMessage = $"No reproductive life stage! {pawn.NameShortColored}'s randomization cancelled";
|
||||
return -1;
|
||||
}
|
||||
return (int)lifeStageAges.minAge;
|
||||
}
|
||||
|
||||
private static int GeneratePartnerTypeRecords(Pawn pawn, int avgsex)
|
||||
private static int Randomize(int avg, int dist, int min = 0, int max = int.MaxValue) => (int)Mathf.Clamp(Utility.RandGaussianLike(avg - dist, avg + dist), min, max);
|
||||
|
||||
private static Dictionary<RecordDef, int> GeneratePartnerTypeRecords(Pawn pawn, int avgSexPerYear, int sexLifeYears)
|
||||
{
|
||||
Dictionary<RecordDef, int> generatedRecords = new Dictionary<RecordDef, int>();
|
||||
int deviation = (int)Settings.MaxSexCountDeviation;
|
||||
int totalSexCount = 0;
|
||||
|
||||
if (xxx.is_rapist(pawn))
|
||||
{
|
||||
if (xxx.is_zoophile(pawn))
|
||||
{
|
||||
if (pawn.Has(Quirk.ChitinLover)) totalSexCount += RandomizeRecord(pawn, xxx.CountOfRapedInsects, avgsex, deviation);
|
||||
else totalSexCount += RandomizeRecord(pawn, xxx.CountOfRapedAnimals, avgsex, deviation);
|
||||
if (pawn.Has(Quirk.ChitinLover))
|
||||
generatedRecords.Add(xxx.CountOfRapedInsects, Randomize(avgSexPerYear, deviation));
|
||||
else
|
||||
generatedRecords.Add(xxx.CountOfRapedAnimals, Randomize(avgSexPerYear, deviation));
|
||||
}
|
||||
else
|
||||
{
|
||||
totalSexCount += RandomizeRecord(pawn, xxx.CountOfRapedHumanlikes, avgsex, deviation);
|
||||
generatedRecords.Add(xxx.CountOfRapedHumanlikes, Randomize(avgSexPerYear, deviation));
|
||||
}
|
||||
|
||||
avgsex /= 8;
|
||||
avgSexPerYear /= 8;
|
||||
}
|
||||
|
||||
if (xxx.is_zoophile(pawn))
|
||||
{
|
||||
if (pawn.Has(Quirk.ChitinLover)) totalSexCount += RandomizeRecord(pawn, xxx.CountOfRapedInsects, avgsex, deviation);
|
||||
else totalSexCount += RandomizeRecord(pawn, xxx.CountOfSexWithAnimals, avgsex, deviation);
|
||||
avgsex /= 10;
|
||||
if (pawn.Has(Quirk.ChitinLover))
|
||||
generatedRecords.Add(xxx.CountOfRapedInsects, Randomize(avgSexPerYear, deviation));
|
||||
else
|
||||
generatedRecords.Add(xxx.CountOfSexWithAnimals, Randomize(avgSexPerYear, deviation));
|
||||
|
||||
avgSexPerYear /= 10;
|
||||
}
|
||||
else if (xxx.is_necrophiliac(pawn))
|
||||
{
|
||||
totalSexCount += RandomizeRecord(pawn, xxx.CountOfSexWithCorpse, avgsex, deviation);
|
||||
avgsex /= 4;
|
||||
generatedRecords.Add(xxx.CountOfSexWithCorpse, Randomize(avgSexPerYear, deviation));
|
||||
avgSexPerYear /= 4;
|
||||
}
|
||||
|
||||
totalSexCount += RandomizeRecord(pawn, xxx.CountOfSexWithHumanlikes, avgsex, deviation);
|
||||
generatedRecords.Add(xxx.CountOfSexWithHumanlikes, Randomize(avgSexPerYear, deviation));
|
||||
|
||||
if (totalSexCount > 0)
|
||||
pawn.records.AddTo(RsDefOf.Record.SexPartnerCount, Math.Max(1, Rand.Range(0, totalSexCount / 7)));
|
||||
if (Settings.SlavesBeenRapedExp && pawn.IsSlave)
|
||||
{
|
||||
generatedRecords.Add(xxx.CountOfBeenRapedByAnimals, Randomize(Rand.Range(-50, 10), Rand.Range(0, 10) * sexLifeYears));
|
||||
generatedRecords.Add(xxx.CountOfBeenRapedByHumanlikes, Randomize(0, Rand.Range(0, 100) * sexLifeYears));
|
||||
}
|
||||
|
||||
return totalSexCount;
|
||||
return generatedRecords;
|
||||
}
|
||||
|
||||
private static void GenerateSextypeRecords(Pawn pawn, int totalsex)
|
||||
|
|
@ -238,10 +269,7 @@ namespace RJWSexperience.SexHistory
|
|||
if (xxx.is_homosexual(pawn))
|
||||
return pawn.gender;
|
||||
|
||||
if (pawn.gender == Gender.Male)
|
||||
return Gender.Female;
|
||||
else
|
||||
return Gender.Male;
|
||||
return pawn.gender.Opposite();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -429,6 +429,8 @@ namespace RJWSexperience.SexHistory
|
|||
icon = HistoryUtility.HistoryIcon,
|
||||
defaultIconColor = HistoryUtility.HistoryColor,
|
||||
hotKey = RsDefOf.KeyBinding.OpenSexStatistics,
|
||||
shrinkable = true,
|
||||
Order = 5,
|
||||
action = () => UI.SexStatusWindow.ToggleWindow(this)
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,33 +3,49 @@ using Verse;
|
|||
|
||||
namespace RJWSexperience.SexHistory.UI
|
||||
{
|
||||
public readonly struct BarInfo
|
||||
public class BarInfo
|
||||
{
|
||||
public readonly string label;
|
||||
public readonly float fillPercent;
|
||||
public readonly Texture2D fillTexture;
|
||||
public readonly TipSignal tooltip;
|
||||
public readonly string labelRight;
|
||||
public readonly Texture2D border;
|
||||
private string _label;
|
||||
private float _fillPercent;
|
||||
private string _labelRight;
|
||||
|
||||
public BarInfo(string label, float fillPercent, Texture2D fillTexture, TipSignal tooltip, string labelRight = "", Texture2D border = null)
|
||||
public string Label
|
||||
{
|
||||
this.label = label.CapitalizeFirst();
|
||||
this.fillPercent = Mathf.Clamp01(fillPercent);
|
||||
this.fillTexture = fillTexture;
|
||||
this.tooltip = tooltip;
|
||||
this.labelRight = labelRight.CapitalizeFirst();
|
||||
this.border = border;
|
||||
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;
|
||||
}
|
||||
|
||||
public BarInfo(string label, float fillPercent, Texture2D fillTexture, string labelRight = "")
|
||||
public BarInfo(Texture2D fillTexture)
|
||||
{
|
||||
this.label = label.CapitalizeFirst();
|
||||
this.fillPercent = Mathf.Clamp01(fillPercent);
|
||||
this.fillTexture = fillTexture;
|
||||
this.tooltip = default;
|
||||
this.labelRight = labelRight.CapitalizeFirst();
|
||||
this.border = null;
|
||||
_label = "";
|
||||
_fillPercent = 0f;
|
||||
FillTexture = fillTexture;
|
||||
Tooltip = default;
|
||||
_labelRight = "";
|
||||
Border = null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,86 +1,93 @@
|
|||
using RimWorld;
|
||||
using rjw;
|
||||
using System;
|
||||
using UnityEngine;
|
||||
using Verse;
|
||||
|
||||
namespace RJWSexperience.SexHistory.UI
|
||||
{
|
||||
public readonly struct InfoCard
|
||||
public class InfoCard
|
||||
{
|
||||
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;
|
||||
private readonly Pawn _pawn;
|
||||
private readonly string _tooltipLabel;
|
||||
|
||||
public InfoCard(Pawn pawn, SexPartnerHistoryRecord partnerRecord, string label, string tooltipLabel, int lastSexTimeTicks)
|
||||
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)
|
||||
{
|
||||
this.partnerRecord = partnerRecord;
|
||||
this.label = label;
|
||||
Label = label;
|
||||
_pawn = pawn;
|
||||
_tooltipLabel = tooltipLabel;
|
||||
BestSextype = new BarInfo();
|
||||
PortraitInfo = new PartnerPortraitInfo(_pawn);
|
||||
}
|
||||
|
||||
lastSexTime = UIUtility.GetSexDays(lastSexTimeTicks);
|
||||
portraitInfo = new PartnerPortraitInfo(pawn, partnerRecord);
|
||||
public void UpdatePartnerRecord(SexPartnerHistoryRecord partnerRecord)
|
||||
{
|
||||
PartnerRecord = partnerRecord;
|
||||
PortraitInfo.UpdatePartnerRecord(partnerRecord);
|
||||
|
||||
if (partnerRecord != null)
|
||||
if (partnerRecord == null)
|
||||
{
|
||||
name = partnerRecord.Partner?.Name?.ToStringFull ?? partnerRecord.Label.CapitalizeFirst();
|
||||
sexCount = Keyed.RS_Sex_Count + partnerRecord.TotalSexCount;
|
||||
Name = Keyed.Unknown;
|
||||
SexCount = Keyed.RS_Sex_Count + "?";
|
||||
Orgasms = Keyed.RS_Orgasms + "?";
|
||||
Relations = string.Empty;
|
||||
Tooltip = default;
|
||||
|
||||
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)
|
||||
{
|
||||
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());
|
||||
BestSextype.Label = Keyed.RS_Best_Sextype + ": " + Keyed.Sextype[(int)xxx.rjwSextype.None];
|
||||
BestSextype.FillPercent = 0f;
|
||||
BestSextype.FillTexture = Texture2D.linearGrayTexture;
|
||||
BestSextype.LabelRight = "";
|
||||
return;
|
||||
}
|
||||
else
|
||||
|
||||
Name = partnerRecord.Partner?.Name?.ToStringFull ?? partnerRecord.Label.CapitalizeFirst();
|
||||
SexCount = Keyed.RS_Sex_Count + partnerRecord.TotalSexCount;
|
||||
|
||||
if (partnerRecord.Raped > 0)
|
||||
{
|
||||
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);
|
||||
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)
|
||||
{
|
||||
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.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();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,29 +5,43 @@ using Verse;
|
|||
|
||||
namespace RJWSexperience.SexHistory.UI
|
||||
{
|
||||
public readonly struct PartnerPortraitInfo
|
||||
public class PartnerPortraitInfo
|
||||
{
|
||||
public readonly SexPartnerHistoryRecord partnerRecord;
|
||||
public readonly bool lover;
|
||||
public readonly Func<Vector2, Texture> portraitGetter;
|
||||
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 PartnerPortraitInfo(Pawn pawn, SexPartnerHistoryRecord partnerRecord)
|
||||
{
|
||||
this.partnerRecord = partnerRecord;
|
||||
lover = false;
|
||||
_pawn = pawn;
|
||||
UpdatePartnerRecord(partnerRecord);
|
||||
}
|
||||
|
||||
public void UpdatePartnerRecord(SexPartnerHistoryRecord partnerRecord)
|
||||
{
|
||||
PartnerRecord = partnerRecord;
|
||||
|
||||
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;
|
||||
PortraitGetter = (_) => partnerRecord.Race.uiIcon;
|
||||
Lover = false;
|
||||
}
|
||||
else
|
||||
{
|
||||
portraitGetter = (_) => HistoryUtility.UnknownPawn;
|
||||
PortraitGetter = (_) => HistoryUtility.UnknownPawn;
|
||||
Lover = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,53 +3,58 @@ using UnityEngine;
|
|||
|
||||
namespace RJWSexperience.SexHistory.UI
|
||||
{
|
||||
public readonly struct PreferedRaceCard
|
||||
public class PreferedRaceCard
|
||||
{
|
||||
public readonly string preferRaceLabel;
|
||||
public readonly string preferRaceTypeLabel;
|
||||
public readonly string sexCount;
|
||||
public readonly BarInfo? barInfo;
|
||||
public readonly Func<Vector2, Texture> portraitGetter;
|
||||
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 PreferedRaceCard(SexHistoryComp sexHistory)
|
||||
{
|
||||
if (sexHistory.PreferRace == null)
|
||||
_sexHistory = sexHistory;
|
||||
}
|
||||
|
||||
public void Update()
|
||||
{
|
||||
if (_sexHistory.PreferRace == null)
|
||||
{
|
||||
preferRaceLabel = Keyed.None;
|
||||
preferRaceTypeLabel = null;
|
||||
sexCount = null;
|
||||
barInfo = null;
|
||||
portraitGetter = (_) => HistoryUtility.UnknownPawn;
|
||||
PreferRaceLabel = Keyed.None;
|
||||
PreferRaceTypeLabel = null;
|
||||
SexCount = null;
|
||||
BarInfo.Label = null;
|
||||
BarInfo.FillPercent = 0f;
|
||||
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 = new BarInfo(
|
||||
label: Keyed.RS_SexInfo(Keyed.RS_Bestiality, sexHistory.BestialityCount),
|
||||
fillPercent: sexHistory.BestialityCount / 100f,
|
||||
fillTexture: Texture2D.linearGrayTexture);
|
||||
PreferRaceTypeLabel = Keyed.RS_Bestiality;
|
||||
BarInfo.Label = Keyed.RS_SexInfo(Keyed.RS_Bestiality, _sexHistory.BestialityCount);
|
||||
BarInfo.FillPercent = _sexHistory.BestialityCount / 100f;
|
||||
}
|
||||
else
|
||||
{
|
||||
preferRaceTypeLabel = Keyed.RS_Interspecies;
|
||||
barInfo = new BarInfo(
|
||||
label: Keyed.RS_SexInfo(Keyed.RS_Interspecies, sexHistory.InterspeciesCount),
|
||||
fillPercent: sexHistory.InterspeciesCount / 100f,
|
||||
fillTexture: Texture2D.linearGrayTexture);
|
||||
PreferRaceTypeLabel = Keyed.RS_Interspecies;
|
||||
BarInfo.Label = Keyed.RS_SexInfo(Keyed.RS_Interspecies, _sexHistory.InterspeciesCount);
|
||||
BarInfo.FillPercent = _sexHistory.InterspeciesCount / 100f;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
preferRaceTypeLabel = null;
|
||||
barInfo = null;
|
||||
PreferRaceTypeLabel = null;
|
||||
BarInfo.Label = null;
|
||||
BarInfo.FillPercent = 0f;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
using RimWorld;
|
||||
using rjw;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
|
|
@ -49,27 +48,43 @@ 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; private set; }
|
||||
public PreferedRaceCard PreferedRaceCard { get; private set; }
|
||||
public InfoCard SelectedPartnerCard { get; }
|
||||
public PreferedRaceCard PreferedRaceCard { get; }
|
||||
public List<BarInfo> SexTypes { get; } = new List<BarInfo>();
|
||||
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 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 string VirginLabel { get; private set; }
|
||||
public string SexualityLabel { get; private set; }
|
||||
public string QuirksLabel { get; private set; }
|
||||
|
|
@ -88,7 +103,7 @@ namespace RJWSexperience.SexHistory.UI
|
|||
UpdateBars();
|
||||
UpdateQuirks();
|
||||
UpdateVirginAndSexuality();
|
||||
PreferedRaceCard = new PreferedRaceCard(_history);
|
||||
PreferedRaceCard.Update();
|
||||
|
||||
int tickRateMultiplier = (int)Find.TickManager.TickRateMultiplier;
|
||||
if (tickRateMultiplier == 0) // Paused
|
||||
|
|
@ -102,35 +117,21 @@ namespace RJWSexperience.SexHistory.UI
|
|||
|
||||
private void UpdateInfoCards()
|
||||
{
|
||||
InfoCards.Clear();
|
||||
InfoCard recentSexPartner = InfoCards[0];
|
||||
recentSexPartner.LastSexTime = UIUtility.GetSexDays(_history.RecentSexTickAbs);
|
||||
recentSexPartner.UpdatePartnerRecord(_history.RecentPartnerRecord);
|
||||
|
||||
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 firstSexPartner = InfoCards[1];
|
||||
firstSexPartner.LastSexTime = UIUtility.GetSexDays(_history.FirstSexTickAbs);
|
||||
firstSexPartner.UpdatePartnerRecord(_history.FirstPartnerRecord);
|
||||
|
||||
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 mostSexPartner = InfoCards[2];
|
||||
mostSexPartner.LastSexTime = UIUtility.GetSexDays(_history.MostSexTickAbs);
|
||||
mostSexPartner.UpdatePartnerRecord(_history.MostPartnerRecord);
|
||||
|
||||
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));
|
||||
InfoCard bestSexPartner = InfoCards[3];
|
||||
bestSexPartner.LastSexTime = UIUtility.GetSexDays(_history.BestSexTickAbs);
|
||||
bestSexPartner.UpdatePartnerRecord(_history.BestSexPartnerRecord);
|
||||
|
||||
if (SelectedPartner != null)
|
||||
{
|
||||
|
|
@ -146,124 +147,102 @@ 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;
|
||||
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)));
|
||||
|
||||
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: String.Format(Keyed.RS_Sex_Partners + ": {0} ({1})", _history.PartnerCount, Pawn.records.GetValue(RsDefOf.Record.SexPartnerCount)),
|
||||
fillPercent: _history.PartnerCount / 50,
|
||||
fillTexture: HistoryUtility.Partners));
|
||||
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_VirginsTaken + ": {0:0}", _history.VirginsTaken),
|
||||
fillPercent: _history.VirginsTaken / 100,
|
||||
fillTexture: HistoryUtility.Partners));
|
||||
VirginsTaken.Label = string.Format(Keyed.RS_VirginsTaken + ": {0:0}", _history.VirginsTaken);
|
||||
VirginsTaken.FillPercent = _history.VirginsTaken / 100f;
|
||||
|
||||
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));
|
||||
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);
|
||||
|
||||
float lust = Pawn.records.GetValue(RsDefOf.Record.Lust);
|
||||
float sexDrive = GetStatValue(xxx.sex_drive_stat);
|
||||
float lustLimit = SexperienceMod.Settings.LustLimit * 3f;
|
||||
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());
|
||||
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();
|
||||
|
||||
float bestSextypeRelativeSatisfaction = _history.GetBestSextype(out xxx.rjwSextype bestSextype) / UIUtility.BASESAT;
|
||||
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));
|
||||
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);
|
||||
|
||||
float recentSextypeRelativeSatisfaction = _history.GetRecentSextype(out xxx.rjwSextype recentSextype) / UIUtility.BASESAT;
|
||||
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());
|
||||
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();
|
||||
|
||||
Necro = new BarInfo(
|
||||
label: String.Format(Keyed.RS_Necrophile + ": {0}", _history.CorpseFuckCount),
|
||||
fillPercent: _history.CorpseFuckCount / 50,
|
||||
fillTexture: HistoryUtility.Nurgle);
|
||||
Necro.Label = string.Format(Keyed.RS_Necrophile + ": {0}", _history.CorpseFuckCount);
|
||||
Necro.FillPercent = _history.CorpseFuckCount / 50f;
|
||||
|
||||
Incest = new BarInfo(
|
||||
label: String.Format(Keyed.Incest + ": {0}", _history.IncestuousCount),
|
||||
fillPercent: _history.IncestuousCount / 50,
|
||||
fillTexture: HistoryUtility.Nurgle);
|
||||
Incest.Label = string.Format(Keyed.Incest + ": {0}", _history.IncestuousCount);
|
||||
Incest.FillPercent = _history.IncestuousCount / 50f;
|
||||
|
||||
float amountofEatenCum = Pawn.records.GetValue(RsDefOf.Record.AmountofEatenCum);
|
||||
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);
|
||||
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;
|
||||
|
||||
Hediff cumHediff = Pawn.health.hediffSet.GetFirstHediffOfDef(RsDefOf.Hediff.CumAddiction)
|
||||
?? Pawn.health.hediffSet.GetFirstHediffOfDef(RsDefOf.Hediff.CumTolerance);
|
||||
if (cumHediff != null)
|
||||
{
|
||||
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()));
|
||||
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;
|
||||
}
|
||||
|
||||
float vulnerability = GetStatValue(xxx.vulnerability_stat);
|
||||
string vulnerabilityLabel = xxx.vulnerability_stat.LabelCap + ": " + vulnerability.ToStringPercent();
|
||||
TipSignal vulnerabilityTip = GetStatTooltip(xxx.vulnerability_stat, vulnerability);
|
||||
|
||||
Raped = new BarInfo(
|
||||
label: String.Format(Keyed.RS_RapedSomeone + ": {0}", _history.RapedCount),
|
||||
fillPercent: _history.RapedCount / 50,
|
||||
fillTexture: HistoryUtility.Khorne,
|
||||
tooltip: vulnerabilityTip,
|
||||
labelRight: vulnerabilityLabel);
|
||||
Raped.Label = string.Format(Keyed.RS_RapedSomeone + ": {0}", _history.RapedCount);
|
||||
Raped.FillPercent = _history.RapedCount / 50f;
|
||||
Raped.Tooltip = vulnerabilityTip;
|
||||
Raped.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);
|
||||
BeenRaped.Label = string.Format(Keyed.RS_BeenRaped + ": {0}", _history.BeenRapedCount);
|
||||
BeenRaped.FillPercent = _history.BeenRapedCount / 50f;
|
||||
BeenRaped.Tooltip = vulnerabilityTip;
|
||||
BeenRaped.LabelRight = vulnerabilityLabel;
|
||||
|
||||
float sexSatisfaction = GetStatValue(xxx.sex_satisfaction);
|
||||
SexSatisfaction = new BarInfo(
|
||||
label: xxx.sex_satisfaction.LabelCap + ": " + sexSatisfaction.ToStringPercent(),
|
||||
fillPercent: sexSatisfaction / 2,
|
||||
fillTexture: HistoryUtility.Satisfaction,
|
||||
tooltip: GetStatTooltip(xxx.sex_satisfaction, sexSatisfaction));
|
||||
SexSatisfaction.Label = xxx.sex_satisfaction.LabelCap + ": " + sexSatisfaction.ToStringPercent();
|
||||
SexSatisfaction.FillPercent = sexSatisfaction / 2;
|
||||
SexSatisfaction.Tooltip = GetStatTooltip(xxx.sex_satisfaction, sexSatisfaction);
|
||||
|
||||
SkillRecord skill = Pawn.skills?.GetSkill(RsDefOf.Skill.Sex);
|
||||
float sexSkillLevel = skill?.Level ?? 0f;
|
||||
float sexStat = Pawn.GetSexStat();
|
||||
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));
|
||||
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);
|
||||
}
|
||||
|
||||
private void UpdateQuirks()
|
||||
|
|
@ -325,13 +304,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;
|
||||
}
|
||||
}
|
||||
|
|
@ -344,18 +323,16 @@ namespace RJWSexperience.SexHistory.UI
|
|||
|
||||
private void UpdateSelectedPartnerCard()
|
||||
{
|
||||
SelectedPartnerCard.UpdatePartnerRecord(SelectedPartner);
|
||||
|
||||
if (SelectedPartner == null)
|
||||
{
|
||||
SelectedPartnerCard = default;
|
||||
return;
|
||||
SelectedPartnerCard.LastSexTime = null;
|
||||
}
|
||||
else
|
||||
{
|
||||
SelectedPartnerCard.LastSexTime = UIUtility.GetSexDays(SelectedPartner.RecentSexTickAbs);
|
||||
}
|
||||
|
||||
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,9 +17,6 @@ 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;
|
||||
|
||||
|
|
@ -32,17 +29,13 @@ namespace RJWSexperience.SexHistory.UI
|
|||
|
||||
private static void InitStyles()
|
||||
{
|
||||
if (fontStyleCenter != null)
|
||||
if (boxStyle != 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 };
|
||||
}
|
||||
|
|
@ -125,6 +118,7 @@ namespace RJWSexperience.SexHistory.UI
|
|||
{
|
||||
Find.Selector.ClearSelection();
|
||||
_context = new SexStatusViewModel(history, orderMode);
|
||||
_context.Update();
|
||||
if (!_context.Pawn.DestroyedOrNull() && Find.CurrentMap == _context.Pawn.Map)
|
||||
{
|
||||
Find.Selector.Select(_context.Pawn);
|
||||
|
|
@ -161,13 +155,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);
|
||||
|
|
@ -179,24 +173,29 @@ namespace RJWSexperience.SexHistory.UI
|
|||
}
|
||||
}
|
||||
|
||||
GUI.Label(sexinfoRect2, context.relations + " ", fontStyleRight);
|
||||
TooltipHandler.TipRegion(rect, context.tooltip);
|
||||
Text.Anchor = TextAnchor.MiddleRight;
|
||||
Widgets.Label(sexinfoRect2, context.Relations + " ");
|
||||
GenUI.ResetLabelAlign();
|
||||
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);
|
||||
GUI.Label(labelRect, context.label, fontStyleLeft);
|
||||
GUI.Label(labelRect, context.lastSexTime, fontStyleRight);
|
||||
Text.Anchor = TextAnchor.MiddleLeft;
|
||||
Widgets.Label(labelRect, context.Label);
|
||||
Text.Anchor = TextAnchor.MiddleRight;
|
||||
Widgets.Label(labelRect, context.LastSexTime);
|
||||
GenUI.ResetLabelAlign();
|
||||
DrawInfoWithPortrait(infoRect, context);
|
||||
}
|
||||
|
||||
|
|
@ -211,7 +210,9 @@ namespace RJWSexperience.SexHistory.UI
|
|||
{
|
||||
DrawSexInfoCard(listmain.GetRect(CARDHEIGHT), infoCard);
|
||||
}
|
||||
GUI.Label(listmain.GetRect(FONTHEIGHT), Keyed.RS_PreferRace, fontStyleLeft);
|
||||
Text.Anchor = TextAnchor.MiddleLeft;
|
||||
listmain.Label(Keyed.RS_PreferRace);
|
||||
GenUI.ResetLabelAlign();
|
||||
DrawPreferRace(listmain.GetRect(66f + 15f), _context.PreferedRaceCard);
|
||||
listmain.End();
|
||||
}
|
||||
|
|
@ -225,22 +226,27 @@ 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);
|
||||
GUI.Label(infoRect1, preferedRaceCard.preferRaceLabel, fontStyleLeft);
|
||||
Widgets.DrawTextureFitted(portraitRect, preferedRaceCard.PortraitGetter(portraitRect.size), 1.0f);
|
||||
|
||||
if (preferedRaceCard.preferRaceTypeLabel != null)
|
||||
Text.Anchor = TextAnchor.MiddleLeft;
|
||||
Widgets.Label(infoRect1, preferedRaceCard.PreferRaceLabel);
|
||||
|
||||
if (preferedRaceCard.SexCount != null)
|
||||
{
|
||||
GUI.Label(infoRect1, preferedRaceCard.preferRaceTypeLabel + " ", fontStyleRight);
|
||||
Widgets.Label(infoRect2, preferedRaceCard.SexCount);
|
||||
}
|
||||
|
||||
if (preferedRaceCard.sexCount != null)
|
||||
GenUI.ResetLabelAlign();
|
||||
|
||||
if (preferedRaceCard.PreferRaceTypeLabel != null)
|
||||
{
|
||||
GUI.Label(infoRect2, preferedRaceCard.sexCount, fontStyleLeft);
|
||||
Text.Anchor = TextAnchor.MiddleRight;
|
||||
Widgets.Label(infoRect1, preferedRaceCard.PreferRaceTypeLabel + " ");
|
||||
}
|
||||
|
||||
if (preferedRaceCard.barInfo != null)
|
||||
if (preferedRaceCard.BarInfo.Label != null)
|
||||
{
|
||||
UIUtility.FillableBarLabeled(infoRect3, (BarInfo)preferedRaceCard.barInfo);
|
||||
UIUtility.FillableBarLabeled(infoRect3, preferedRaceCard.BarInfo);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -280,8 +286,10 @@ namespace RJWSexperience.SexHistory.UI
|
|||
}
|
||||
|
||||
GUI.Box(nameRect, "", boxStyle);
|
||||
GUI.Label(nameRect.TopHalf(), _context.Name, fontStyleCenter);
|
||||
GUI.Label(nameRect.BottomHalf(), _context.AgeAndTitle, fontStyleCenter);
|
||||
Text.Anchor = TextAnchor.MiddleCenter;
|
||||
Widgets.Label(nameRect.TopHalf(), _context.Name);
|
||||
Widgets.Label(nameRect.BottomHalf(), _context.AgeAndTitle);
|
||||
GenUI.ResetLabelAlign();
|
||||
|
||||
Listing_Standard listmain = new Listing_Standard();
|
||||
listmain.Begin(infoRect);
|
||||
|
|
@ -292,7 +300,9 @@ namespace RJWSexperience.SexHistory.UI
|
|||
GUI.color = Color.red;
|
||||
GUI.Box(tmp, "", boxStyle);
|
||||
GUI.color = Color.white;
|
||||
GUI.Label(tmp, _context.VirginLabel, fontStyleCenter);
|
||||
Text.Anchor = TextAnchor.MiddleCenter;
|
||||
Widgets.Label(tmp, _context.VirginLabel);
|
||||
GenUI.ResetLabelAlign();
|
||||
listmain.Gap(1f);
|
||||
}
|
||||
else
|
||||
|
|
@ -304,7 +314,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);
|
||||
}
|
||||
|
|
@ -315,16 +325,16 @@ namespace RJWSexperience.SexHistory.UI
|
|||
|
||||
listmain.FillableBarLabeled(_context.ConsumedCum);
|
||||
|
||||
if (_context.CumHediff != null)
|
||||
if (_context.CumHediff.Label != "")
|
||||
{
|
||||
listmain.FillableBarLabeled((BarInfo)_context.CumHediff);
|
||||
listmain.FillableBarLabeled(_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);
|
||||
}
|
||||
|
|
@ -382,7 +392,9 @@ namespace RJWSexperience.SexHistory.UI
|
|||
listmain.Begin(rect);
|
||||
|
||||
//Sex statistics
|
||||
GUI.Label(listmain.GetRect(FONTHEIGHT), " " + Keyed.RS_Statistics, fontStyleLeft);
|
||||
Text.Anchor = TextAnchor.MiddleLeft;
|
||||
listmain.Label(" " + Keyed.RS_Statistics);
|
||||
GenUI.ResetLabelAlign();
|
||||
listmain.Gap(1f);
|
||||
|
||||
for (int i = 0; i < _context.SexTypes.Count; i++)
|
||||
|
|
@ -390,10 +402,15 @@ 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);
|
||||
GUI.Label(listLabelRect, " " + Keyed.RS_PartnerList, fontStyleLeft);
|
||||
Text.Anchor = TextAnchor.MiddleLeft;
|
||||
Widgets.Label(listLabelRect, " " + Keyed.RS_PartnerList);
|
||||
GenUI.ResetLabelAlign();
|
||||
if (Widgets.ButtonText(sortbtnRect, orderMode.Translate()))
|
||||
{
|
||||
SoundDefOf.Click.PlayOneShotOnCamera();
|
||||
|
|
@ -429,13 +446,17 @@ namespace RJWSexperience.SexHistory.UI
|
|||
|
||||
DrawPartnerPortrait(pawnRect, partner);
|
||||
Widgets.DrawHighlightIfMouseover(pawnRect);
|
||||
GUI.Label(labelRect, partner.partnerRecord.Label, fontStyleCenter);
|
||||
|
||||
Text.Anchor = TextAnchor.MiddleCenter;
|
||||
Widgets.Label(labelRect, partner.PartnerRecord.Label);
|
||||
GenUI.ResetLabelAlign();
|
||||
|
||||
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);
|
||||
}
|
||||
|
|
@ -447,22 +468,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);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -18,13 +18,25 @@ namespace RJWSexperience
|
|||
|
||||
return ((float)res).Denormalization(min, max);
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Set exact <paramref name="value"/> for the <paramref name="record"/>
|
||||
/// </summary>
|
||||
public static void SetTo(this Pawn_RecordsTracker records, RecordDef record, float value)
|
||||
{
|
||||
float recordval = records.GetValue(record);
|
||||
records.AddTo(record, value - recordval);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Set exact <paramref name="value"/> for the <paramref name="record"/>
|
||||
/// </summary>
|
||||
public static void Set(this Pawn_RecordsTracker records, RecordDef record, int value)
|
||||
{
|
||||
int currentValue = records.GetAsInt(record);
|
||||
records.AddTo(record, value - currentValue);
|
||||
}
|
||||
|
||||
public static float Normalization(this float num, float min, float max)
|
||||
{
|
||||
return (num - min) / (max - min);
|
||||
|
|
|
|||
|
|
@ -14,7 +14,9 @@ namespace RJWSexperience.Virginity
|
|||
|
||||
if (pawn.gender == Gender.Female && !pawn.IsVirgin())
|
||||
{
|
||||
if (Rand.Chance(hymenSurgeryChance))
|
||||
TechLevel techLevel = pawn.Faction?.def.techLevel ?? TechLevel.Industrial;
|
||||
|
||||
if (techLevel >= TechLevel.Industrial && Rand.Chance(hymenSurgeryChance))
|
||||
{
|
||||
Trait virgin = new Trait(RsDefOf.Trait.Virgin, TraitDegree.FemaleAfterSurgery, true);
|
||||
pawn.story.traits.GainTrait(virgin);
|
||||
|
|
|
|||
|
|
@ -0,0 +1,27 @@
|
|||
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,55 +1,29 @@
|
|||
<?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')" />
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProjectGuid>{73CB4597-22BD-4A3E-A3CE-6D65DD080F65}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<TargetFramework>net472</TargetFramework>
|
||||
<RootNamespace>RJWSexperienceCum</RootNamespace>
|
||||
<AssemblyName>RJWSexperienceCum</AssemblyName>
|
||||
<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>
|
||||
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
|
||||
<Company>amevarashi</Company>
|
||||
<Optimize>True</Optimize>
|
||||
<GenerateAssemblyInfo>False</GenerateAssemblyInfo>
|
||||
</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.3641</Version>
|
||||
<Version>1.4.*</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>
|
||||
|
|
@ -57,5 +31,4 @@
|
|||
<Private>False</Private>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
</Project>
|
||||
Loading…
Reference in New Issue