Compare commits

...

44 Commits

Author SHA1 Message Date
amevarashi 37927f19b3
Merge pull request #12 from Angedore/virginityadditionalremovers
additional sex acts remove the virginity trait
2024-04-30 13:09:57 +05:00
Angedore 25a4e0786c - fisting removes the virginity of the receiving virgin female partner 2023-12-03 12:24:42 +01:00
Angedore b6d34be263 - configurable virginity removal for male/male for anal sex
- configurable virginity removal for female/female scissoring sex
- added double penetration to actions for virginity removal
2023-12-03 12:24:28 +01:00
amevarashi 190c6fc3d6 Fixed some labels in SexStatusWindow not respecting custom fonts 2023-10-28 12:58:02 +05:00
amevarashi 4265e3c3e1 1.4.1.3 2023-10-03 22:14:07 +05:00
amevarashi 9e21992d9b Prisoners use buckets to clean themselves 2023-10-03 21:52:39 +05:00
amevarashi cfee907258 Migrate SDK projects 2023-09-26 19:48:30 +05:00
amevarashi 814f35772e 1.4.1.2 2023-07-24 20:52:53 +05:00
amevarashi 57fe883be0 Fix IsVirgin check 2023-07-24 20:47:56 +05:00
amevarashi ffe6a9b7f7 More of reusing objects in SexStatusViewModel 2023-07-24 20:47:00 +05:00
amevarashi bed83e1eca 1.4.1.1 2023-07-09 14:29:02 +05:00
amevarashi 5138e11cb2 Started reusing objects in SexStatusViewModel 2023-07-09 12:02:20 +05:00
amevarashi 4e44d42c4f Marked Sex History button shrinkable and lowered its UI order 2023-07-09 09:55:13 +05:00
amevarashi 2c225a2d41 Fixed exception when pawn uses a bucket 2023-07-09 09:49:51 +05:00
amevarashi 811162875d Updated Rimworld refs version 2023-07-08 20:12:08 +05:00
amevarashi cc4e36e3ce 1.4.1.0 2023-07-02 13:03:15 +05:00
amevarashi e3c712572d Added sex skill icons for VRE - Android and VRE - Genie 2023-07-02 13:02:40 +05:00
amevarashi e300cc5077
Merge pull request #11 from yiyuandian/master
Add ChineseSimplified Translations
2023-07-02 12:49:49 +05:00
yiyuandian 64e7ff15e1 add chinese translation
补充其它中文翻译
2023-05-14 17:54:19 +08:00
yiyuandian 2a7532d305 add chinese translation
补充其它中文翻译
2023-05-14 17:40:08 +08:00
yiyuandian 1774f80730 部分翻译 2023-05-13 00:00:20 +08:00
yiyuandian e46d1c93e4 修改错字 Modify typos
敬业→精液 dedicated→semen
2023-05-06 21:57:02 +08:00
yiyuandian b64f78c6c2 文本修改 2023-05-06 21:52:26 +08:00
amevarashi 3ef5faf86b 1.1.4.0 2023-04-22 12:35:52 +05:00
amevarashi cd9647f999 Simplified GetAdjacentBuilding methods 2023-04-21 20:52:32 +05:00
amevarashi ab485c677f Simplified virginity checks
Updated names in the SexHistoryComp
2023-04-21 20:19:37 +05:00
amevarashi 67c2328ad6 Change VariousDefOf to RsDefOf
Fix some IDE messages
2023-04-17 16:34:35 +05:00
amevarashi 8a48d2e463 Optimized Ate Cum thought 2023-04-17 14:17:07 +05:00
amevarashi cdc79acfa3 Refactored/optimized SexStatusWindow 2023-04-16 12:09:50 +05:00
amevarashi e9ca084680 1.1.3.0 2023-03-25 19:35:58 +05:00
amevarashi 50f48bdeb5 Fixed #7 masturbation counted as sex with a partner
Updated selection of place near bucket to masturbate
2023-03-25 19:33:47 +05:00
amevarashi 6bb4c091d4 Removed HideGizmoWithRJW setting 2023-03-25 14:17:47 +05:00
amevarashi f363ed6c49 Removed GetGizmos patch. CompGetGizmosExtra now works for non-colonists! 2023-03-24 23:06:24 +05:00
amevarashi 9e0a461db3 Use Prepare instead DoConditionalPatch 2023-03-24 20:56:21 +05:00
amevarashi 8d49addd63 New settings handling 2023-03-24 20:22:54 +05:00
amevarashi fed4b54915 Fixed GetAdjacentBuildings error when called at map edge 2023-03-24 17:32:34 +05:00
amevarashi e37f45399e Added pawn.Spawned check before spawning blood filth 2022-11-12 10:45:17 +05:00
amevarashi e79b0d7fec 1.1.2.1 2022-11-02 20:01:42 +05:00
amevarashi 442f2870e0 1.1.2.0 2022-10-27 21:25:40 +05:00
amevarashi 5dcca34ee7 1.1.1.1 2022-10-09 14:26:31 +05:00
amevarashi 85dcfd538c Fix history window crashing from a modded passion 2022-10-09 14:16:22 +05:00
amevarashi 1b5da7bde8 1.1.1.0 2022-09-08 20:11:35 +05:00
amevarashi a4c046a841 Rename source folder 2022-09-08 19:59:25 +05:00
amevarashi 0a412a0060 Separate RJW Cum integration, add Vanilla Skills Expanded integration 2022-09-08 19:42:19 +05:00
135 changed files with 3296 additions and 1704 deletions

Binary file not shown.

Binary file not shown.

View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8" ?>
<Defs>
<KeyBindingDef ParentName="GameKeyBinding">
<defName>OpenSexStatistics</defName>
<label>sexperience: open sex history</label>
</KeyBindingDef>
</Defs>

View File

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8" ?>
<Defs>
<PawnRelationDef>
<workerClass>RJWSexperience.PawnRelationWorker_Bastard</workerClass>
<defName>Bastard</defName>
<label>bastard</label>
<labelFemale>bastard</labelFemale>
<importance>185</importance>
<opinionOffset>-10</opinionOffset>
<generationChanceFactor>0.0</generationChanceFactor>
<implied>true</implied>
<familyByBloodRelation>true</familyByBloodRelation>
</PawnRelationDef>
</Defs>

View File

@ -0,0 +1,36 @@
<?xml version="1.0" encoding="utf-8" ?>
<Defs>
<RecipeDef>
<defName>Surgery_RestoreHymen</defName>
<label>hymenoplasty</label>
<description>Disguises as virgin.</description>
<workerClass>RJWSexperience.Virginity.Recipe_HymenSurgery</workerClass>
<jobString>restoring hymen</jobString>
<effectWorking>Surgery</effectWorking>
<soundWorking>Recipe_Surgery</soundWorking>
<workSpeedStat>MedicalOperationSpeed</workSpeedStat>
<workSkill>Medicine</workSkill>
<workSkillLearnFactor>0.2</workSkillLearnFactor>
<workAmount>400</workAmount>
<anesthetize>false</anesthetize>
<recipeUsers>
<li>Human</li>
</recipeUsers>
<surgerySuccessChanceFactor>100</surgerySuccessChanceFactor>
<ingredients>
<li>
<filter>
<categories>
<li>Medicine</li>
</categories>
</filter>
<count>1</count>
</li>
</ingredients>
<fixedIngredientFilter>
<categories>
<li>Medicine</li>
</categories>
</fixedIngredientFilter>
</RecipeDef>
</Defs>

View File

@ -0,0 +1,26 @@
<?xml version="1.0" encoding="utf-8" ?>
<Defs>
<RecordDef>
<defName>NumofEatenCum</defName>
<label>swallowed cum</label>
<description>The number of times that i swallowed cum.</description>
<type>Int</type>
</RecordDef>
<RecordDef>
<defName>AmountofEatenCum</defName>
<label>swallowed cum(mL)</label>
<description>The amount of cum that i swallowed.</description>
<type>Int</type>
</RecordDef>
<RecordDef>
<defName>Lust</defName>
<label>lust</label>
<description>How lustful i am.</description>
<type>Float</type>
</RecordDef>
</Defs>

View File

@ -0,0 +1,87 @@
<?xml version="1.0" encoding="utf-8" ?>
<Defs>
<RecordDef>
<defName>VaginalSexCount</defName>
<label>vaginal intercourses</label>
<description>The number of times of vaginal sex.</description>
<type>Int</type>
</RecordDef>
<RecordDef>
<defName>AnalSexCount</defName>
<label>anal intercourses</label>
<description>The number of times of anal sex.</description>
<type>Int</type>
</RecordDef>
<RecordDef>
<defName>OralSexCount</defName>
<label>oral intercourses</label>
<description>The number of times of received oral sex.</description>
<type>Int</type>
</RecordDef>
<RecordDef>
<defName>BlowjobCount</defName>
<label>blowjobs</label>
<description>The number of times of blowjob.</description>
<type>Int</type>
</RecordDef>
<RecordDef>
<defName>CunnilingusCount</defName>
<label>cunnilingus</label>
<description>The number of times of cunnilingus.</description>
<type>Int</type>
</RecordDef>
<RecordDef>
<defName>GenitalCaressCount</defName>
<label>genital touched</label>
<description>The number of times of handjob/fingering.</description>
<type>Int</type>
</RecordDef>
<RecordDef>
<defName>HandjobCount</defName>
<label>handjobs</label>
<description>The number of times of handjob.</description>
<type>Int</type>
</RecordDef>
<RecordDef>
<defName>FingeringCount</defName>
<label>fingerings</label>
<description>The number of times of fingering.</description>
<type>Int</type>
</RecordDef>
<RecordDef>
<defName>FootjobCount</defName>
<label>footjob</label>
<description>The number of times of footjob.</description>
<type>Int</type>
</RecordDef>
<RecordDef>
<defName>MiscSexualBehaviorCount</defName>
<label>misc. intercourses</label>
<description>The number of times of something sexual.</description>
<type>Int</type>
</RecordDef>
<RecordDef>
<defName>OrgasmCount</defName>
<label>orgasms</label>
<description>The number of times of orgasm.</description>
<type>Int</type>
</RecordDef>
<RecordDef>
<defName>SexPartnerCount</defName>
<label>sex partners</label>
<description>The number of sex partners.</description>
<type>Int</type>
</RecordDef>
</Defs>

View File

@ -0,0 +1,31 @@
<?xml version="1.0" encoding="utf-8" ?>
<Defs>
<!-- Teaching from Vanilla Social Interactions Expanded selects a random skill and doesn't checks if a rule pack for selected skill exists -->
<RulePackDef MayRequire="VanillaExpanded.VanillaSocialInteractionsExpanded">
<defName>VSIE_Teaching_Sex</defName>
<rulePack>
<rulesFiles>
<li>SexTopic->Words/TeachingWords/SexSkill</li>
</rulesFiles>
<rulesStrings>
<li>r_logentry->[INITIATOR_nameDef] and [RECIPIENT_nameDef] [talkedabout] [SexTopic].</li>
<li>r_logentry->[INITIATOR_nameDef] [talkedabout] [SexTopic] with [RECIPIENT_nameDef].</li>
<li>r_logentry(p=0.8)->[INITIATOR_nameDef] [commentedabout] [SexTopic] to [RECIPIENT_nameDef].</li>
<li>talkedabout(p=4)->chatted about</li>
<li>talkedabout->shared a word about</li>
<li>talkedabout->spoke about</li>
<li>talkedabout->gabbed about</li>
<li>talkedabout->talked about</li>
<li>talkedabout->joked about</li>
<li>talkedabout->quipped about</li>
<li>commentedabout->said something about</li>
<li>commentedabout->said a word about</li>
<li>commentedabout->made a comment about</li>
<li>commentedabout->commented about</li>
<li>commentedabout->told a joke about</li>
</rulesStrings>
</rulePack>
</RulePackDef>
</Defs>

View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8" ?>
<Defs>
<SkillDef>
<defName>Sex</defName>
<description>Sex skill.</description>
<skillLabel>sex</skillLabel>
<listOrder>5</listOrder>
</SkillDef>
</Defs>

View File

@ -0,0 +1,42 @@
<?xml version="1.0" encoding="utf-8" ?>
<Defs>
<StatDef>
<defName>SexAbility</defName>
<label>sex ability</label>
<description>Measures whether or not a pawn is capable of sex, and how good they are at it</description>
<category>PawnSocial</category>
<defaultBaseValue>1.0</defaultBaseValue>
<minValue>0.0</minValue>
<toStringStyle>PercentTwo</toStringStyle>
<!--<capacityFactors>
<li>
<capacity>Manipulation</capacity>
<weight>0.5</weight>
<max>1.5</max>
</li>
<li>
<capacity>Consciousness</capacity>
<weight>1.0</weight>
</li>
</capacityFactors>-->
<skillNeedFactors>
<li Class="SkillNeed_BaseBonus">
<skill>Sex</skill>
<baseValue>0.40</baseValue>
<bonusPerLevel>0.15</bonusPerLevel>
</li>
</skillNeedFactors>
<parts>
<li Class="StatPart_Food">
<factorUrgentlyHungry>0.9</factorUrgentlyHungry>
<factorStarving>0.8</factorStarving>
</li>
<li Class="StatPart_Rest">
<factorTired>0.9</factorTired>
<factorVeryTired>0.7</factorVeryTired>
<factorExhausted>0.5</factorExhausted>
</li>
</parts>
</StatDef>
</Defs>

View File

@ -0,0 +1,61 @@
<?xml version="1.0" encoding="utf-8" ?>
<Defs>
<ThingDef ParentName="FurnitureWithQualityBase">
<defName>CumBucket</defName>
<label>cum bucket</label>
<description>A bucket for collecting cums.</description>
<thingClass>RJWSexperience.Building_CumBucket</thingClass>
<graphicData>
<texPath>Things/Item/CumBucket</texPath>
<graphicClass>Graphic_Multi</graphicClass>
<drawSize>(1,1)</drawSize>
</graphicData>
<altitudeLayer>Building</altitudeLayer>
<passability>PassThroughOnly</passability>
<fillPercent>0.4</fillPercent>
<castEdgeShadows>true</castEdgeShadows>
<pathCost>50</pathCost>
<rotatable>false</rotatable>
<stuffCategories>
<li>Metallic</li>
<li>Woody</li>
<li>Stony</li>
</stuffCategories>
<costStuffCount>10</costStuffCount>
<statBases>
<MaxHitPoints>50</MaxHitPoints>
<Mass>8</Mass>
<WorkToBuild>200</WorkToBuild>
<Flammability>1.0</Flammability>
<Beauty>-5</Beauty>
</statBases>
<size>(1,1)</size>
<building>
<preventDeteriorationOnTop>true</preventDeteriorationOnTop>
<ignoreStoredThingsBeauty>true</ignoreStoredThingsBeauty>
<fixedStorageSettings>
<filter>
<disallowNotEverStorable>true</disallowNotEverStorable>
<thingDefs>
<li>GatheredCum</li>
</thingDefs>
</filter>
</fixedStorageSettings>
<defaultStorageSettings>
<priority>Low</priority>
<filter>
<thingDefs>
<li>GatheredCum</li>
</thingDefs>
</filter>
</defaultStorageSettings>
</building>
<inspectorTabs>
<li>ITab_Storage</li>
</inspectorTabs>
<surfaceType>Item</surfaceType>
<canOverlapZones>false</canOverlapZones>
</ThingDef>
</Defs>

View File

@ -0,0 +1,158 @@
<?xml version="1.0" encoding="utf-8" ?>
<Defs>
<ThingDef Name="GatheredCum" ParentName="OrganicProductBase">
<defName>GatheredCum</defName>
<label>cum</label>
<description>Gathered cum.</description>
<thingCategories>
<li>AnimalProductRaw</li>
</thingCategories>
<graphicData>
<texPath>Things/Item/GatheredCum</texPath>
<drawSize>1</drawSize>
<graphicClass>Graphic_StackCount</graphicClass>
</graphicData>
<socialPropernessMatters>true</socialPropernessMatters>
<statBases>
<MarketValue>0.1</MarketValue>
<Mass>0.1</Mass>
<Nutrition>0.01</Nutrition>
<Beauty>-5</Beauty>
<Cleanliness>-1</Cleanliness>
<FoodPoisonChanceFixedHuman>0.00</FoodPoisonChanceFixedHuman>
<DeteriorationRate>60</DeteriorationRate>
<Flammability>0.1</Flammability>
</statBases>
<ingestible>
<foodType>Fluid, AnimalProduct</foodType>
<preferability>DesperateOnlyForHumanlikes</preferability>
<drugCategory>Any</drugCategory>
<tasteThought>AteCum</tasteThought>
<specialThoughtAsIngredient>AteCum</specialThoughtAsIngredient>
<optimalityOffsetHumanlikes>-10</optimalityOffsetHumanlikes>
<optimalityOffsetFeedingAnimals>-10</optimalityOffsetFeedingAnimals>
<outcomeDoers>
<li Class="IngestionOutcomeDoer_GiveHediff">
<hediffDef>CumTolerance</hediffDef>
<severity>0.032</severity>
<divideByBodySize>true</divideByBodySize>
</li>
<li Class="IngestionOutcomeDoer_OffsetPsyfocus">
<offset>0.05</offset>
</li>
<li Class="RJWSexperience.Cum.IngestionOutcomeDoer_RecordEatenCum"/>
</outcomeDoers>
</ingestible>
<ingredient>
<mergeCompatibilityTags>
<li MayRequire="Ludeon.RimWorld.Ideology">GatheredCum</li>
</mergeCompatibilityTags>
</ingredient>
<comps>
<li Class="CompProperties_Drug">
<chemical>Cum</chemical>
<addictiveness>0.050</addictiveness>
<minToleranceToAddict>0.8</minToleranceToAddict>
<existingAddictionSeverityOffset>0.1</existingAddictionSeverityOffset>
<needLevelOffset>1</needLevelOffset>
<listOrder>30</listOrder>
</li>
</comps>
</ThingDef>
<ChemicalDef>
<defName>Cum</defName>
<label>cum</label>
<addictionHediff>CumAddiction</addictionHediff>
<toleranceHediff>CumTolerance</toleranceHediff>
<generateAddictionGenes>false</generateAddictionGenes>
</ChemicalDef>
<NeedDef ParentName="DrugAddictionNeedBase">
<defName>Chemical_Cum</defName>
<needClass>Need_Chemical</needClass>
<label>cum</label>
<description>Addicted to cum.</description>
<listPriority>10</listPriority>
</NeedDef>
<HediffDef ParentName="DrugToleranceBase">
<defName>CumTolerance</defName>
<label>cum addictiveness</label>
<description>More likely to get addicted to cum.</description>
<isBad>false</isBad>
<comps>
<li Class="HediffCompProperties_SeverityPerDay">
<severityPerDay>-0.020</severityPerDay>
</li>
</comps>
</HediffDef>
<HediffDef ParentName="AddictionBase">
<defName>CumAddiction</defName>
<hediffClass>Hediff_Addiction</hediffClass>
<label>cum addiction</label>
<description>cum addiction.</description>
<causesNeed>Chemical_Cum</causesNeed>
<comps>
<li Class="HediffCompProperties_SeverityPerDay">
<severityPerDay>-0.1</severityPerDay>
<showDaysToRecover>true</showDaysToRecover>
</li>
</comps>
<stages>
<li>
<statOffsets>
<SexSatisfaction>0.25</SexSatisfaction>
<SexFrequency>0.25</SexFrequency>
<Vulnerability>0.5</Vulnerability>
</statOffsets>
</li>
<li>
<label>withdrawal</label>
<statOffsets>
<SexSatisfaction>0.25</SexSatisfaction>
<SexFrequency>1.0</SexFrequency>
</statOffsets>
</li>
</stages>
</HediffDef>
<ThoughtDef>
<defName>CumWithdrawal</defName>
<workerClass>ThoughtWorker_Hediff</workerClass>
<hediff>CumAddiction</hediff>
<validWhileDespawned>true</validWhileDespawned>
<stages>
<li>
<visible>false</visible>
</li>
<li>
<label>cum withdrawal</label>
<description>I need it.</description>
<baseMoodEffect>-5</baseMoodEffect>
</li>
</stages>
</ThoughtDef>
<SpecialThingFilterDef>
<defName>AllowWithCum</defName>
<label>allow food with cum</label>
<description>Allow food that was spiced up by adding sexual fluids.</description>
<parentCategory>Foods</parentCategory>
<allowedByDefault>true</allowedByDefault>
<saveKey>allowWithCum</saveKey>
<workerClass>RJWSexperience.Cum.FilterWorkers.SpecialThingFilterWorker_Cum</workerClass>
</SpecialThingFilterDef>
<SpecialThingFilterDef>
<defName>AllowWithoutCum</defName>
<label>allow food without cum</label>
<description>Allow food normal food.</description>
<parentCategory>Foods</parentCategory>
<allowedByDefault>true</allowedByDefault>
<saveKey>allowWithoutCum</saveKey>
<workerClass>RJWSexperience.Cum.FilterWorkers.SpecialThingFilterWorker_NoCum</workerClass>
</SpecialThingFilterDef>
</Defs>

View File

@ -0,0 +1,44 @@
<?xml version="1.0" encoding="utf-8" ?>
<Defs>
<ThoughtDef>
<defName>AteCum</defName>
<durationDays>0.5</durationDays>
<stackLimit>1</stackLimit>
<stackedEffectMultiplier>0.4</stackedEffectMultiplier>
<thoughtClass>RJWSexperience.Thought_AteCum</thoughtClass>
<stages>
<li>
<label>ate cum</label>
<description>Disgusting.</description>
<baseMoodEffect>-5</baseMoodEffect>
</li>
<li>
<label>ate cum</label>
<description>It's stinky and tastes bad.</description>
<baseMoodEffect>-2</baseMoodEffect>
</li>
<li>
<label>ate cum</label>
<description>Tastes bad. But I liked it.</description>
<baseMoodEffect>1</baseMoodEffect>
</li>
<li>
<label>ate cum</label>
<description>Delicious.</description>
<baseMoodEffect>3</baseMoodEffect>
</li>
</stages>
<modExtensions>
<li Class="RJWSexperience.ThoughtDefExtension_StageFromRecord">
<recordDef>NumofEatenCum</recordDef>
<minimumValueforStage>
<li>0</li>
<li>10</li>
<li>60</li>
<li>120</li>
</minimumValueforStage>
</li>
</modExtensions>
</ThoughtDef>
</Defs>

View File

@ -0,0 +1,75 @@
<?xml version="1.0" encoding="utf-8" ?>
<Defs>
<TraitDef>
<defName>Virgin</defName>
<commonality>0.0</commonality>
<commonalityFemale>0.0</commonalityFemale>
<degreeDatas>
<li>
<label>damaged virgin</label>
<labelMale>BUGGED! MALE CANNOT HAS THIS TRAIT</labelMale>
<description>[PAWN_nameDef] never experienced. However, her hymen had damaged for some reason.</description>
<degree>-1</degree>
<marketValueFactorOffset>0.05</marketValueFactorOffset>
<statOffsets>
<SexFrequency>-0.2</SexFrequency>
</statOffsets>
<skillGains>
<li>
<key>Sex</key>
<value>-4</value>
</li>
</skillGains>
</li>
<li>
<label>virgin</label>
<description>[PAWN_nameDef] never experienced.</description>
<degree>0</degree>
<statOffsets>
<SexFrequency>0.2</SexFrequency>
</statOffsets>
<skillGains>
<li>
<key>Sex</key>
<value>-4</value>
</li>
</skillGains>
</li>
<li>
<label>virgin?</label>
<labelMale>BUGGED! MALE CANNOT HAS THIS TRAIT</labelMale>
<description>[PAWN_nameDef] looks experienced. But the hymen is still threre.</description>
<marketValueFactorOffset>0.10</marketValueFactorOffset>
<degree>1</degree>
</li>
<li>
<label>virgin</label>
<labelMale>BUGGED! MALE CANNOT HAS THIS TRAIT</labelMale>
<description>[PAWN_nameDef] never experienced.</description>
<degree>2</degree>
<statOffsets>
<SexFrequency>-0.2</SexFrequency>
</statOffsets>
<skillGains>
<li>
<key>Sex</key>
<value>-4</value>
</li>
</skillGains>
<marketValueFactorOffset>0.20</marketValueFactorOffset>
</li>
</degreeDatas>
<modExtensions>
<!-- Compatibility with [SYR] Trait Value by AerosAtar -->
<li Class="SyrTraitValue.TraitValueExtension" MayRequire="syrchalis.traitvalue">
<traitValues>
<li>-1, 10</li>
<li>0, 0</li>
<li>1, 10</li>
<li>2, 10</li>
</traitValues>
</li>
</modExtensions>
</TraitDef>
</Defs>

View File

@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<Patch>
<Operation Class="PatchOperationAdd">
<xpath>Defs/StatDef[defName="SexFrequency"]/parts</xpath>
<value>
<li Class="RJWSexperience.StatPart_Lust" />
</value>
</Operation>
<Operation Class="PatchOperationAdd">
<xpath>Defs/StatDef[defName="Vulnerability"]/parts</xpath>
<value>
<li Class="RJWSexperience.StatPart_Slave">
<factor>3.0</factor>
</li>
</value>
</Operation>
</Patch>

View File

@ -0,0 +1,75 @@
<?xml version="1.0" encoding="UTF-8"?>
<Patch>
<Operation Class="PatchOperationConditional">
<xpath>Defs/ThingDef[defName="UsedCondom"]/ingestible/outcomeDoers</xpath>
<nomatch Class="PatchOperationAdd">
<xpath>Defs/ThingDef[defName="UsedCondom"]/ingestible</xpath>
<value>
<outcomeDoers>
<li Class="IngestionOutcomeDoer_GiveHediff">
<hediffDef>CumTolerance</hediffDef>
<severity>0.032</severity>
<divideByBodySize>true</divideByBodySize>
</li>
<li Class="IngestionOutcomeDoer_OffsetPsyfocus">
<offset>0.05</offset>
</li>
<li Class="RJWSexperience.Cum.IngestionOutcomeDoer_RecordEatenCum">
<unitAmount>5.2</unitAmount>
</li>
</outcomeDoers>
</value>
</nomatch>
<match Class="PatchOperationAdd">
<xpath>Defs/ThingDef[defName="UsedCondom"]/ingestible/outcomeDoers</xpath>
<value>
<li Class="IngestionOutcomeDoer_GiveHediff">
<hediffDef>CumTolerance</hediffDef>
<severity>0.032</severity>
<divideByBodySize>true</divideByBodySize>
</li>
<li Class="IngestionOutcomeDoer_OffsetPsyfocus">
<offset>0.05</offset>
</li>
<li Class="RJWSexperience.Cum.IngestionOutcomeDoer_RecordEatenCum">
<unitAmount>5.2</unitAmount>
</li>
</value>
</match>
</Operation>
<Operation Class="PatchOperationConditional">
<xpath>Defs/ThingDef[defName="UsedCondom"]/comps</xpath>
<nomatch Class="PatchOperationAdd">
<xpath>Defs/ThingDef[defName="UsedCondom"]</xpath>
<value>
<comps>
<li Class="CompProperties_Drug">
<chemical>Cum</chemical>
<addictiveness>0.050</addictiveness>
<minToleranceToAddict>0.8</minToleranceToAddict>
<existingAddictionSeverityOffset>0.1</existingAddictionSeverityOffset>
<needLevelOffset>1</needLevelOffset>
<listOrder>30</listOrder>
</li>
</comps>
</value>
</nomatch>
<match Class="PatchOperationAdd">
<xpath>Defs/ThingDef[defName="UsedCondom"]/comps</xpath>
<value>
<li Class="CompProperties_Drug">
<chemical>Cum</chemical>
<addictiveness>0.050</addictiveness>
<minToleranceToAddict>0.8</minToleranceToAddict>
<existingAddictionSeverityOffset>0.1</existingAddictionSeverityOffset>
<needLevelOffset>1</needLevelOffset>
<listOrder>30</listOrder>
</li>
</value>
</match>
</Operation>
</Patch>

View File

@ -4,6 +4,7 @@
<author>amevarashi</author>
<supportedVersions>
<li>1.3</li>
<li>1.4</li>
</supportedVersions>
<modDependencies>
<li>
@ -36,6 +37,7 @@ This is a submod for RJW that adds:
Credits:
moreorganstodump Original Author
c0ffee RJW 4.9.0 update
Vegapnk Cum-Per-Penis, Multifilling Cumbuckets, Sex fills Cumbucket]]>
Vegapnk Cum-Per-Penis, Multifilling Cumbuckets, Sex fills Cumbucket
Rain Vanilla Skils Expanded integration]]>
</description>
</ModMetaData>

View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<Manifest>
<identifier>RJWSexperience</identifier>
<version>1.1.0.1</version>
<version>1.4.1.3</version>
<dependencies>
<li>RimJobWorld >= 5.0.0.0</li>
<li>RimJobWorld >= 5.3.0</li>
</dependencies>
<incompatibleWith />
<loadAfter>

Binary file not shown.

16
CHANGELOG.md Normal file
View File

@ -0,0 +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

View File

@ -5,7 +5,7 @@
<NumofEatenCum.description>我吃了多少次精液。</NumofEatenCum.description>
<Lust.label>色欲</Lust.label>
<Lust.description>我多</Lust.description>
<Lust.description>我多淫荡</Lust.description>
</LanguageData>

View File

@ -5,7 +5,7 @@
<GatheredCum.description>收集起来的精液</GatheredCum.description>
<UsedCondom.label>用过的套套</UsedCondom.label>
<UsedCondom.description>装满了敬业的套套。嗯!真好吃!</UsedCondom.description>
<UsedCondom.description>装满了精液的套套。嗯!真好吃!</UsedCondom.description>
</LanguageData>

View File

@ -2,14 +2,73 @@
<LanguageData>
<RS_Mod_Title>RJW 性经验</RS_Mod_Title>
<Lust>性欲</Lust>
<!-- 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>炮友</RS_Sex_Partners>
<RS_Cum_Swallowed>吞下精液量</RS_Cum_Swallowed>
<RS_Selected_Partner>所选性伴侣信息</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>最近做爱对象.</RS_Recent_Sex_Partner_ToolTip>
<RS_First_Sex_Partner>第一次做爱对象</RS_First_Sex_Partner>
<RS_First_Sex_Partner_ToolTip>第一次做爱的对象.</RS_First_Sex_Partner_ToolTip>
<RS_Most_Sex_Partner>最多次做爱对象</RS_Most_Sex_Partner>
<RS_Most_Sex_Partner_ToolTip>做了最多次的对象.</RS_Most_Sex_Partner_ToolTip>
<RS_Best_Sex_Partner>最舒适的做爱对象</RS_Best_Sex_Partner>
<RS_Best_Sex_Partner_ToolTip>做爱时最舒服的对象.</RS_Best_Sex_Partner_ToolTip>
<RS_VirginsTaken>夺走处女数</RS_VirginsTaken>
<RS_TotalSexHad>总做爱次数</RS_TotalSexHad>
<RS_TotalSexHad_ToolTip>做爱次数.</RS_TotalSexHad_ToolTip>
<RS_Raped>被强奸: </RS_Raped>
<RS_RapedMe>强奸了我: </RS_RapedMe>
<RS_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>正常</RS_Normal>
<RS_Necrophile>恋尸癖</RS_Necrophile>
<RS_SexSkill>性技</RS_SexSkill>
<RS_NumofTimes></RS_NumofTimes>
<RS_Ago>以前</RS_Ago>
<RS_LastSex>上次做爱</RS_LastSex>
<RS_HadBestSexDaysAgo>最爱性伴侣 {0}.</RS_HadBestSexDaysAgo>
<RS_PawnLockDesc>锁定显示的小人.\n\n非锁定状态下,窗口显示内容将会自动切换到选择的小人</RS_PawnLockDesc>
<RSOption_1_Label>开启随机性记录</RSOption_1_Label>
<RSOption_1_Desc>随机化小人的性记录。</RSOption_1_Desc>
<!-- Settings tab labels -->
<!-- 设置-选项卡标题 -->
<RSTabLabelMain>主要</RSTabLabelMain>
<RSTabLabelHistory>做爱记录</RSTabLabelHistory>
<RSTabLabelDebug>调试</RSTabLabelDebug>
<!-- Mod settings: Main -->
<!-- mod设置: 主体设置 -->
<RSOption_2_Label>色欲值的影响</RSOption_2_Label>
<RSOption_2_Desc>设置色欲值对性冲动的影响。</RSOption_2_Desc>
<RSOption_8_Label>限制欲望</RSOption_8_Label>
<RSOption_8_Desc>设置欲望的限制。\n如果欲望的绝对值接近或大于这个值欲望将不太可能改变。</RSOption_8_Desc>
<RSOption_MaxSingleLustChange_Label>每种做爱的最大性欲变化值</RSOption_MaxSingleLustChange_Label>
<RSOption_MaxSingleLustChange_Desc>设置一次性行为可以改变多少性欲</RSOption_MaxSingleLustChange_Desc>
<RSOption_SexCanFillBuckets_Label>精液能装桶</RSOption_SexCanFillBuckets_Label>
<RSOption_SexCanFillBuckets_Desc>如果在精液桶附近进行了乳交、足交、打手枪将填满它</RSOption_SexCanFillBuckets_Desc>
<!-- Mod settings: Sex records -->
<!-- mod设置: 做爱记录 -->
<RSOption_1_Label>开启随机性记录</RSOption_1_Label>
<RSOption_1_Desc>随机化小人的性记录。</RSOption_1_Desc>
<RSOption_3_Label>最大色欲值偏差</RSOption_3_Label>
<RSOption_3_Desc>设置色欲的最大偏差。根据平均值的不同,色欲值可能为负。</RSOption_3_Desc>
<RSOption_3_Desc>设置色欲的最大偏差。&#10;根据平均值的不同,色欲值可能为负。</RSOption_3_Desc>
<RSOption_4_Label>平均色欲值</RSOption_4_Label>
<RSOption_4_Desc>设置色欲值的均值。</RSOption_4_Desc>
<RSOption_5_Label>最大性交次数偏差</RSOption_5_Label>
@ -18,5 +77,69 @@
<RSOption_6_Desc>设置平均每年的性交次数</RSOption_6_Desc>
<RSOption_7_Label>允许奴隶被强奸获得性经验</RSOption_7_Label>
<RSOption_7_Desc>奴隶被强奸获得性经验</RSOption_7_Desc>
<RSOption_9_Label>最小可做爱年龄</RSOption_9_Label>
<RSOption_9_Desc>设置最小的可以做爱的年龄.&#10;此值与RJW的最低性年龄无关。仅用于生成记录.</RSOption_9_Desc>
<RSOption_10_Label>处女比例</RSOption_10_Label>
<RSOption_10_Desc>不分年龄设置处女概率.</RSOption_10_Desc>
<RSOption_MinSexableFromLifestage_Label>最小可做爱年龄阶段</RSOption_MinSexableFromLifestage_Label>
<RSOption_MinSexableFromLifestage_Desc>仅用于生成记录. 在生命第一阶段即可生成做爱记录. 更适合长寿种族</RSOption_MinSexableFromLifestage_Desc>
<RSOption_EnableBastardRelation_Label>启用野种</RSOption_EnableBastardRelation_Label>
<RSOption_EnableBastardRelation_Desc>单亲或亲生父母非婚姻关系(或还未结婚)的小孩将被视作野种</RSOption_EnableBastardRelation_Desc>
<RSOption_EnableSexHistory_Label>[Caution] 启用做爱历史*</RSOption_EnableSexHistory_Label>
<RSOption_EnableSexHistory_Desc>* 重启游戏生效\n\n启用性记录窗口, 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] 禁用此项将导致之前已保存的记录也会丢失。</RSOption_EnableSexHistory_Desc>
<RSOption_HideGizmoWhenDrafted_Label>征召时隐藏性历史菜单</RSOption_HideGizmoWhenDrafted_Label>
<RSOption_HideGizmoWhenDrafted_Desc>隐藏当前所选的小人的性历史功能</RSOption_HideGizmoWhenDrafted_Desc>
<!-- Mod settings: Debug -->
<!-- mod设置——debug -->
<RSOption_Debug_Label>调试</RSOption_Debug_Label>
<RSOption_Debug_Desc>启用调试日志</RSOption_Debug_Desc>
<Button_ResetToDefault>重置为默认</Button_ResetToDefault>
<!-- Sex types -->
<!-- 做爱姿势 -->
<Vaginal>阴道</Vaginal>
<Anal>菊花</Anal>
<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>
<Asexual>无性恋</Asexual>
<Pansexual>泛性恋</Pansexual>
<Heterosexual>异性恋</Heterosexual>
<MostlyHeterosexual>主要是异性恋</MostlyHeterosexual>
<LeaningHeterosexual>双性恋,倾向异性恋</LeaningHeterosexual>
<Bisexual>双性恋</Bisexual>
<LeaningHomosexual>双性恋,倾向同性恋</LeaningHomosexual>
<MostlyHomosexual>主要是同性恋</MostlyHomosexual>
<Homosexual>同性恋</Homosexual>
<!-- Misc -->
<!-- 杂项 -->
<Lust>性欲</Lust>
<Unknown>未知</Unknown>
<Incest>乱伦</Incest>
<!-- Order mode -->
<!-- 排序规则 -->
<RS_PONormal>无序</RS_PONormal>
<RS_PoRecent>时间</RS_PoRecent>
<RS_PoMost>次数</RS_PoMost>
<RS_PoName>名字</RS_PoName>
</LanguageData>

View File

@ -43,6 +43,7 @@
<RS_Ago>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>Main</RSTabLabelMain>
@ -84,8 +85,10 @@
<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_HideGizmoWithRJW_Label>Hide Sex History button with RJW designators</RSOption_HideGizmoWithRJW_Label>
<RSOption_HideGizmoWithRJW_Desc>Hides Sex History Gizmo if RJW designators are hidden</RSOption_HideGizmoWithRJW_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>

View File

@ -2,6 +2,16 @@
<loadFolders>
<v1.3>
<li>/</li>
<li IfModActive="Ludeon.RimWorld.Ideology">RJWSexperience_Ideology</li>
<li>1.3</li>
<li IfModActive="vanillaexpanded.skills">Mod Compatibility/Vanilla Skills Expanded</li>
<li IfModActive="rjw.cum">Mod Compatibility/RJW Cum</li>
</v1.3>
<v1.4>
<li>/</li>
<li>1.4</li>
<li IfModActive="vanillaexpanded.skills">Mod Compatibility/Vanilla Skills Expanded</li>
<li IfModActive="vanillaracesexpanded.android">Mod Compatibility/Vanilla Races Expanded - Android</li>
<li IfModActive="vanillaracesexpanded.genie">Mod Compatibility/Vanilla Races Expanded - Genie</li>
<li IfModActive="rjw.cum">Mod Compatibility/RJW Cum</li>
</v1.4>
</loadFolders>

View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8" ?>
<Defs>
<JobDef MayRequire="rjw.cum">
<JobDef>
<defName>CleanSelfwithBucket</defName>
<driverClass>RJWSexperience.JobDriver_CleanSelfWithBucket</driverClass>
<driverClass>RJWSexperienceCum.JobDriver_CleanSelfWithBucket</driverClass>
<reportString>collecting cum</reportString>
<casualInterruptible>true</casualInterruptible>
</JobDef>

View File

@ -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>

View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8" ?>
<Defs>
<WorkGiverDef MayRequire="rjw.cum">
<WorkGiverDef>
<defName>CleanSelfwithBucket</defName>
<label>collect cum into a bucket</label>
<giverClass>RJWSexperience.Cum.WorkGiver_CleanSelfWithBucket</giverClass>
<giverClass>RJWSexperienceCum.WorkGiver_CleanSelfWithBucket</giverClass>
<workType>BasicWorker</workType>
<verb>collect cum into a</verb>
<gerund>collecting cum into a</gerund>

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.9 KiB

View File

@ -0,0 +1,78 @@
<?xml version="1.0" encoding="UTF-8"?>
<Defs>
<!-- Sex ExpertiseDefs by Rain -->
<VSE.Expertise.ExpertiseDef>
<defName>Sensualist</defName>
<label>Sensualising</label>
<skill>Sex</skill>
<description>An expert in sex and sensuous activities.</description>
<statOffsets>
<SexAbility>0.05</SexAbility>
</statOffsets>
</VSE.Expertise.ExpertiseDef>
<VSE.Expertise.ExpertiseDef>
<defName>Rapist</defName>
<label>Raping</label>
<skill>Sex</skill>
<description>An experienced rapist.</description>
<statOffsets>
<Vulnerability>-0.025</Vulnerability>
<!-- Pawn gets more out of sex but isn't necessarily good at sex -->
<SexSatisfaction>0.025</SexSatisfaction>
</statOffsets>
</VSE.Expertise.ExpertiseDef>
<VSE.Expertise.ExpertiseDef>
<defName>Victim</defName>
<label>Rapee</label>
<skill>Sex</skill>
<description>An expertise in getting raped.</description>
<statOffsets>
<Vulnerability>0.025</Vulnerability>
<SexSatisfaction>-0.025</SexSatisfaction>
</statOffsets>
</VSE.Expertise.ExpertiseDef>
<VSE.Expertise.ExpertiseDef>
<defName>Submissive</defName>
<label>Submitting</label>
<skill>Sex</skill>
<description>An expert in sexual submission.</description>
<statOffsets>
<Vulnerability>0.025</Vulnerability>
<SexSatisfaction>0.025</SexSatisfaction>
</statOffsets>
</VSE.Expertise.ExpertiseDef>
<VSE.Expertise.ExpertiseDef>
<defName>Dominant</defName>
<label>Dominating</label>
<skill>Sex</skill>
<description>An expert in sexual domination.</description>
<statOffsets>
<Vulnerability>-0.025</Vulnerability>
<SexSatisfaction>0.025</SexSatisfaction>
</statOffsets>
</VSE.Expertise.ExpertiseDef>
<VSE.Expertise.ExpertiseDef>
<defName>Hypersexuality</defName>
<label>Sexualizing</label>
<skill>Sex</skill>
<description>A sex craved individual.</description>
<statOffsets>
<SexFrequency>0.05</SexFrequency>
</statOffsets>
</VSE.Expertise.ExpertiseDef>
<VSE.Expertise.ExpertiseDef>
<defName>Prude</defName>
<label>Pruding</label>
<skill>Sex</skill>
<description>An experienced person in sex but decided they do not like it.</description>
<statOffsets>
<SexFrequency>-0.05</SexFrequency>
</statOffsets>
</VSE.Expertise.ExpertiseDef>
</Defs>

View File

@ -1,106 +0,0 @@
using UnityEngine;
using Verse;
using RJWSexperience.Settings;
namespace RJWSexperience
{
public class Configurations : ModSettings, ITab
{
public string Label => Keyed.TabLabelMain;
public const int CurrentSettingsVersion = 1;
// Defaults
public const float LustEffectPowerDefault = 0.5f;
public const bool EnableBastardRelationDefault = true;
public const float LustLimitDefault = SettingsTabHistory.MaxLustDeviationDefault / 3f;
public const float MaxSingleLustChangeDefault = 0.5f;
public const bool SexCanFillBucketsDefault = false;
public const bool selectionLockedDefault = false;
// Private attributes
private float lustEffectPower = LustEffectPowerDefault;
private bool enableBastardRelation = EnableBastardRelationDefault;
private float lustLimit = LustLimitDefault;
private float maxSingleLustChange = MaxSingleLustChangeDefault;
private bool sexCanFillBuckets = SexCanFillBucketsDefault;
private bool selectionLocked = selectionLockedDefault;
private SettingsTabHistory history = SettingsTabHistory.CreateDefault();
private SettingsTabDebug debug = new SettingsTabDebug();
//Public read-only properties
public float LustEffectPower => lustEffectPower;
public bool EnableBastardRelation => enableBastardRelation;
public float LustLimit => lustLimit;
public float MaxSingleLustChange => maxSingleLustChange;
public bool SexCanFillBuckets => sexCanFillBuckets;
public SettingsTabHistory History => history;
public SettingsTabDebug Debug => debug;
[System.Diagnostics.CodeAnalysis.SuppressMessage("Minor Code Smell", "S2292:Trivial properties should be auto-implemented", Justification = "Can't scribe property")]
public bool SelectionLocked { get => selectionLocked; set => selectionLocked = value; }
public void ResetToDefault()
{
lustEffectPower = LustEffectPowerDefault;
enableBastardRelation = EnableBastardRelationDefault;
lustLimit = LustLimitDefault;
maxSingleLustChange = MaxSingleLustChangeDefault;
sexCanFillBuckets = SexCanFillBucketsDefault;
}
public override void ExposeData()
{
int version = CurrentSettingsVersion;
Scribe_Values.Look(ref version, "SettingsVersion", 0);
Scribe_Values.Look(ref lustEffectPower, "LustEffectPower", LustEffectPowerDefault);
Scribe_Values.Look(ref enableBastardRelation, "EnableBastardRelation", EnableBastardRelationDefault);
Scribe_Values.Look(ref lustLimit, "LustLimit", LustLimitDefault);
Scribe_Values.Look(ref maxSingleLustChange, "maxSingleLustChange", MaxSingleLustChangeDefault);
Scribe_Values.Look(ref selectionLocked, "SelectionLocked", selectionLockedDefault);
Scribe_Values.Look(ref sexCanFillBuckets, "SexCanFillBuckets", SexCanFillBucketsDefault);
Scribe_Deep.Look(ref history, "History");
Scribe_Deep.Look(ref debug, "Debug");
base.ExposeData();
if (Scribe.mode != LoadSaveMode.LoadingVars)
return;
if (history == null)
{
history = new SettingsTabHistory();
// Previously history settings were in Configurations. Direct call to try read old data
history.ExposeData();
}
if (debug == null)
{
debug = new SettingsTabDebug();
debug.Reset();
}
}
public void DoTabContents(Rect inRect)
{
const float lineHeight = SettingsWidgets.lineHeight;
Listing_Standard listmain = new Listing_Standard();
listmain.maxOneColumn = true;
listmain.Begin(inRect);
SettingsWidgets.SliderOption(listmain.GetRect(lineHeight * 2f), Keyed.Option_2_Label + " x" + lustEffectPower, Keyed.Option_2_Desc, ref lustEffectPower, 0f, 2f, 0.01f);
SettingsWidgets.SliderOption(listmain.GetRect(lineHeight * 2f), Keyed.Option_8_Label + " " + lustLimit, Keyed.Option_8_Desc, ref lustLimit, 0f, 5000f, 1f);
SettingsWidgets.SliderOption(listmain.GetRect(lineHeight * 2f), Keyed.Option_MaxSingleLustChange_Label + " " + maxSingleLustChange, Keyed.Option_MaxSingleLustChange_Desc, ref maxSingleLustChange, 0f, 10f, 0.05f);
listmain.CheckboxLabeled(Keyed.Option_EnableBastardRelation_Label, ref enableBastardRelation, Keyed.Option_EnableBastardRelation_Desc);
listmain.CheckboxLabeled(Keyed.Option_SexCanFillBuckets_Label, ref sexCanFillBuckets, Keyed.Option_SexCanFillBuckets_Desc);
if (SexperienceMod.Settings.Debug.DevMode)
LustUtility.DrawGraph(listmain.GetRect(300f));
if (listmain.ButtonText(Keyed.Button_ResetToDefault))
{
ResetToDefault();
}
listmain.End();
}
}
}

View File

@ -1,14 +0,0 @@
using System;
using Verse;
using Verse.AI;
namespace RJWSexperience.Cum
{
public class JobGiver_UseBucket : ThinkNode_JobGiver
{
protected override Job TryGiveJob(Pawn pawn)
{
throw new NotImplementedException();
}
}
}

View File

@ -1,39 +0,0 @@
using RimWorld;
namespace RJWSexperience // Change in namespace will lead to save incompatibility
{
public class Thought_AteCum : Thought_Recordbased
{
public override int CurStageIndex
{
get
{
if (pawn?.health?.hediffSet?.HasHediff(VariousDefOf.CumAddiction) ?? false)
return def.stages.Count - 1;
return base.CurStageIndex;
}
}
public override bool TryMergeWithExistingMemory(out bool showBubble)
{
ThoughtHandler thoughts = pawn.needs.mood.thoughts;
if (thoughts.memories.NumMemoriesInGroup(this) >= def.stackLimit)
{
Thought_AteCum thought_Memory = (Thought_AteCum)thoughts.memories.OldestMemoryInGroup(this);
if (thought_Memory != null)
{
showBubble = thought_Memory.age > thought_Memory.def.DurationTicks / 2;
thought_Memory.Merged();
return true;
}
}
showBubble = true;
return false;
}
protected virtual void Merged()
{
age = 0;
}
}
}

View File

@ -1,52 +0,0 @@
using HarmonyLib;
using RJWSexperience.Logs;
using RJWSexperience.SexHistory;
using System.Collections.Generic;
using System.Reflection;
using Verse;
namespace RJWSexperience
{
public static class Pawn_GetGizmos
{
private static Settings.SettingsTabHistory Settings => SexperienceMod.Settings.History;
public static void DoConditionalPatch(Harmony harmony)
{
if (!Settings.EnableSexHistory)
return;
MethodInfo original = typeof(Pawn).GetMethod(nameof(Pawn.GetGizmos));
MethodInfo postfix = typeof(Pawn_GetGizmos).GetMethod(nameof(Pawn_GetGizmos.Postfix));
harmony.Patch(original, postfix: new HarmonyMethod(postfix));
LogManager.GetLogger<DebugLogProvider>(nameof(Pawn_GetGizmos)).Message("Applied conditional patch to Pawn.GetGizmos()");
}
public static void Postfix(ref IEnumerable<Gizmo> __result, Pawn __instance)
{
if (Settings.HideGizmoWhenDrafted && __instance.Drafted)
return;
if (Find.Selector.NumSelected > 1)
return;
if (Settings.HideGizmoWithRJW && !rjw.RJWSettings.show_RJW_designation_box)
return;
SexHistoryComp history = __instance.TryGetComp<SexHistoryComp>();
if (history == null)
return;
__result = AddHistoryGizmo(history.Gizmo, __result);
}
private static IEnumerable<Gizmo> AddHistoryGizmo(Gizmo historyGizmo, IEnumerable<Gizmo> gizmos)
{
foreach (Gizmo gizmo in gizmos)
yield return gizmo;
yield return historyGizmo;
}
}
}

View File

@ -1,105 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{9C728E06-573B-4B04-A07F-ACBF60CB424D}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<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>..\..\Assemblies\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="RJW">
<HintPath>..\..\..\rjw\1.3\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="Cum\JobGiver_UseBucket.cs" />
<Compile Include="Cum\WorkGiver_CleanSelfWithBucket.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="Cum\JobDriver_CleanSelfWithBucket.cs" />
<Compile Include="Logs\DebugLogProvider.cs" />
<Compile Include="Logs\LogManager.cs" />
<Compile Include="LustUtility.cs" />
<Compile Include="Patches\DefInjection.cs" />
<Compile Include="Patches\GetGizmos.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\RJWUIUtility.cs" />
<Compile Include="SexHistory\UI\SexStatus.cs" />
<Compile Include="Utility.cs" />
<Compile Include="VariousDefOf.cs" />
<Compile Include="Virginity\TraitDegree.cs" />
<Compile Include="Virginity\TraitHandler.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Krafs.Rimworld.Ref">
<Version>1.3.3389</Version>
</PackageReference>
<PackageReference Include="Lib.Harmony">
<Version>2.2.1</Version>
<ExcludeAssets>runtime</ExcludeAssets>
<IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

View File

@ -1,42 +0,0 @@
using UnityEngine;
using Verse;
namespace RJWSexperience.Settings
{
public class SettingsTabDebug : IExposable, IResettable, ITab
{
public string Label => Keyed.TabLabelDebug;
// Defaults
public const bool DevModeDefault = false;
// Private attributes
private bool devMode;
//Public read-only properties
public bool DevMode => devMode;
public void Reset()
{
devMode = DevModeDefault;
}
public void ExposeData()
{
Scribe_Values.Look(ref devMode, "DevMode", DevModeDefault);
}
public void DoTabContents(Rect inRect)
{
Listing_Standard listmain = new Listing_Standard();
listmain.Begin(inRect);
listmain.CheckboxLabeled(Keyed.Option_Debug_Label, ref devMode, Keyed.Option_Debug_Desc);
if (listmain.ButtonText(Keyed.Button_ResetToDefault))
{
Reset();
}
listmain.End();
}
}
}

View File

@ -1,139 +0,0 @@
using RimWorld;
using UnityEngine;
using Verse;
namespace RJWSexperience.Settings
{
public class SettingsTabHistory : IExposable, IResettable, ITab
{
public string Label => Keyed.TabLabelHistory;
// Defaults
public const bool EnableStatRandomizerDefault = true;
public const float MaxLustDeviationDefault = 400f;
public const float AvgLustDefault = 0f;
public const float MaxSexCountDeviationDefault = 90f;
public const float SexPerYearDefault = 30f;
public const bool MinSexableFromLifestageDefault = true;
public const float MinSexablePercentDefault = 0.2f;
public const float VirginRatioDefault = 0.01f;
public const bool SlavesBeenRapedExpDefault = true;
public const bool EnableSexHistoryDefault = true;
public const bool HideGizmoWhenDraftedDefault = true;
public const bool HideGizmoWithRJWDefault = true;
// Private attributes
private bool enableRecordRandomizer = EnableStatRandomizerDefault;
private float maxLustDeviation = MaxLustDeviationDefault;
private float avgLust = AvgLustDefault;
private float maxSexCountDeviation = MaxSexCountDeviationDefault;
private float sexPerYear = SexPerYearDefault;
private bool minSexableFromLifestage = MinSexableFromLifestageDefault;
private float minSexablePercent = MinSexablePercentDefault;
private float virginRatio = VirginRatioDefault;
private bool slavesBeenRapedExp = SlavesBeenRapedExpDefault;
private bool enableSexHistory = EnableSexHistoryDefault;
private bool hideGizmoWhenDrafted = HideGizmoWhenDraftedDefault;
private bool hideGizmoWithRJW = HideGizmoWithRJWDefault;
//Public read-only properties
public bool EnableRecordRandomizer => enableRecordRandomizer;
public float MaxLustDeviation => maxLustDeviation;
public float AvgLust => avgLust;
public float MaxSexCountDeviation => maxSexCountDeviation;
public float SexPerYear => sexPerYear;
public bool MinSexableFromLifestage => minSexableFromLifestage;
public float MinSexablePercent => minSexablePercent;
public float VirginRatio => virginRatio;
public bool SlavesBeenRapedExp => slavesBeenRapedExp;
public bool EnableSexHistory => enableSexHistory;
public bool HideGizmoWhenDrafted => hideGizmoWhenDrafted;
public bool HideGizmoWithRJW => hideGizmoWithRJW;
public static SettingsTabHistory CreateDefault()
{
SettingsTabHistory history = new SettingsTabHistory();
history.Reset();
return history;
}
public void Reset()
{
enableRecordRandomizer = EnableStatRandomizerDefault;
maxLustDeviation = MaxLustDeviationDefault;
avgLust = AvgLustDefault;
maxSexCountDeviation = MaxSexCountDeviationDefault;
sexPerYear = SexPerYearDefault;
minSexableFromLifestage = MinSexableFromLifestageDefault;
minSexablePercent = MinSexablePercentDefault;
virginRatio = VirginRatioDefault;
slavesBeenRapedExp = SlavesBeenRapedExpDefault;
enableSexHistory = EnableSexHistoryDefault;
hideGizmoWhenDrafted = HideGizmoWhenDraftedDefault;
hideGizmoWithRJW = HideGizmoWithRJWDefault;
}
public void ExposeData()
{
Scribe_Values.Look(ref enableRecordRandomizer, "EnableRecordRandomizer", EnableStatRandomizerDefault);
Scribe_Values.Look(ref maxLustDeviation, "MaxLustDeviation", MaxLustDeviationDefault);
Scribe_Values.Look(ref avgLust, "AvgLust", AvgLustDefault);
Scribe_Values.Look(ref maxSexCountDeviation, "MaxSexCountDeviation", MaxSexCountDeviationDefault);
Scribe_Values.Look(ref sexPerYear, "SexPerYear", SexPerYearDefault);
Scribe_Values.Look(ref minSexableFromLifestage, "MinSexableFromLifestage", MinSexableFromLifestageDefault);
Scribe_Values.Look(ref minSexablePercent, "MinSexablePercent", MinSexablePercentDefault);
Scribe_Values.Look(ref virginRatio, "VirginRatio", VirginRatioDefault);
Scribe_Values.Look(ref slavesBeenRapedExp, "SlavesBeenRapedExp", SlavesBeenRapedExpDefault);
Scribe_Values.Look(ref enableSexHistory, "EnableSexHistory", EnableSexHistoryDefault);
Scribe_Values.Look(ref hideGizmoWhenDrafted, "HideGizmoWhenDrafted", HideGizmoWhenDraftedDefault);
Scribe_Values.Look(ref hideGizmoWithRJW, "HideGizmoWithRJW", HideGizmoWithRJWDefault);
}
public void DoTabContents(Rect inRect)
{
const float lineHeight = SettingsWidgets.lineHeight;
Listing_Standard listmain = new Listing_Standard();
listmain.Begin(inRect);
listmain.CheckboxLabeled(Keyed.Option_1_Label, ref enableRecordRandomizer, Keyed.Option_1_Desc);
if (enableRecordRandomizer)
{
float sectionHeight = 12f;
if (!minSexableFromLifestage)
sectionHeight += 2f;
Listing_Standard section = listmain.BeginSection(lineHeight * sectionHeight);
SettingsWidgets.SliderOption(section.GetRect(lineHeight * 2f), Keyed.Option_3_Label + " " + maxLustDeviation, Keyed.Option_3_Desc, ref maxLustDeviation, 0f, 2000f, 1f);
SettingsWidgets.SliderOption(section.GetRect(lineHeight * 2f), Keyed.Option_4_Label + " " + avgLust, Keyed.Option_4_Desc, ref avgLust, -1000f, 1000f, 1f);
SettingsWidgets.SliderOption(section.GetRect(lineHeight * 2f), Keyed.Option_5_Label + " " + maxSexCountDeviation, Keyed.Option_5_Desc, ref maxSexCountDeviation, 0f, 2000f, 1f);
SettingsWidgets.SliderOption(section.GetRect(lineHeight * 2f), Keyed.Option_6_Label + " " + sexPerYear, Keyed.Option_6_Desc, ref sexPerYear, 0f, 2000f, 1f);
section.CheckboxLabeled(Keyed.Option_MinSexableFromLifestage_Label, ref minSexableFromLifestage, Keyed.Option_MinSexableFromLifestage_Desc);
if (!minSexableFromLifestage)
SettingsWidgets.SliderOption(section.GetRect(lineHeight * 2f), $"{Keyed.Option_9_Label} {minSexablePercent:P1} {ThingDefOf.Human.race.lifeExpectancy * minSexablePercent} human years", Keyed.Option_9_Desc, ref minSexablePercent, 0, 1, 0.001f);
SettingsWidgets.SliderOption(section.GetRect(lineHeight * 2f), $"{Keyed.Option_10_Label} {virginRatio:P1}", Keyed.Option_10_Desc, ref virginRatio, 0f, 1f, 0.001f);
section.CheckboxLabeled(Keyed.Option_7_Label, ref slavesBeenRapedExp, Keyed.Option_7_Desc);
listmain.EndSection(section);
}
listmain.CheckboxLabeled(Keyed.Option_EnableSexHistory_Label, ref enableSexHistory, Keyed.Option_EnableSexHistory_Desc);
if (enableSexHistory)
{
listmain.CheckboxLabeled(Keyed.Option_HideGizmoWhenDrafted_Label, ref hideGizmoWhenDrafted, Keyed.Option_HideGizmoWhenDrafted_Desc);
listmain.CheckboxLabeled(Keyed.Option_HideGizmoWithRJW_Label, ref hideGizmoWithRJW, Keyed.Option_HideGizmoWithRJW_Desc);
}
if (listmain.ButtonText(Keyed.Button_ResetToDefault))
{
Reset();
}
listmain.End();
}
}
}

View File

@ -1,36 +0,0 @@
using UnityEngine;
using Verse;
namespace RJWSexperience.Settings
{
public static class SettingsWidgets
{
public const float lineHeight = 24f;
public static void LabelwithTextfield(Rect rect, string label, string tooltip, ref float value, float min, float max)
{
Rect textfieldRect = new Rect(rect.xMax - 100f, rect.y, 100f, rect.height);
string valuestr = value.ToString();
Widgets.Label(rect, label);
Widgets.TextFieldNumeric(textfieldRect, ref value, ref valuestr, min, max);
Widgets.DrawHighlightIfMouseover(rect);
TooltipHandler.TipRegion(rect, tooltip);
}
public static void SliderOption(Rect doublerect, string label, string tooltip, ref float value, float min, float max, float roundTo)
{
// Slider was fighting with textfield for "correct" decimals. Causes a repeating slider move sound
float fieldValue = value;
float sliderValue = value;
float minChange = roundTo / 10f;
LabelwithTextfield(doublerect.TopHalf(), label, tooltip, ref fieldValue, min, max);
sliderValue = Widgets.HorizontalSlider(doublerect.BottomHalf(), sliderValue, min, max, roundTo: roundTo);
if (Mathf.Abs(fieldValue - value) > minChange)
value = fieldValue;
else
value = sliderValue;
}
}
}

View File

@ -1,101 +0,0 @@
using RimWorld;
using rjw;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using UnityEngine;
using Verse;
namespace RJWSexperience.SexHistory.UI
{
public static class RJWUIUtility
{
public const float FONTHEIGHT = 22f;
public const float CARDHEIGHT = 110f;
public const float LISTPAWNSIZE = 100f;
public const float BASESAT = 0.40f;
public const float ICONSIZE = 30f;
public static void DrawQuirk(this Rect rect, Pawn pawn)
{
List<Quirk> quirks = Quirk.All.FindAll(x => pawn.Has(x));
string quirkstr = quirks.Select(x => x.Key).ToCommaList();
string tooltip = "";
Widgets.Label(rect, "Quirks".Translate() + quirkstr);
if (Mouse.IsOver(rect))
{
if (quirks.NullOrEmpty())
{
tooltip = "NoQuirks".Translate();
}
else
{
StringBuilder stringBuilder = new StringBuilder();
foreach (var q in quirks)
{
stringBuilder.AppendLine(q.Key.Colorize(Color.yellow));
stringBuilder.AppendLine(q.LocaliztionKey.Translate(pawn.Named("pawn")).AdjustedFor(pawn).Resolve());
stringBuilder.AppendLine("");
}
tooltip = stringBuilder.ToString().TrimEndNewlines();
}
Widgets.DrawHighlight(rect);
}
TooltipHandler.TipRegion(rect, tooltip);
}
public static void DrawSexuality(this Rect rect, CompRJW comp)
{
if (comp != null)
{
string sexuality = Keyed.Sexuality[(int)comp.orientation];
Widgets.Label(rect, Keyed.RS_Sexuality + ": " + sexuality);
Widgets.DrawHighlightIfMouseover(rect);
}
}
public static string GetRelationsString(this Pawn pawn, Pawn otherpawn)
{
if (otherpawn != null)
{
IEnumerable<PawnRelationDef> relations = pawn.GetRelations(otherpawn);
if (!relations.EnumerableNullOrEmpty()) return relations.Select(x => x.GetGenderSpecificLabel(otherpawn)).ToCommaList().CapitalizeFirst();
}
return "";
}
public static void DrawBorder(this Rect rect, Texture border, float thickness = 1f)
{
GUI.DrawTexture(new Rect(rect.x, rect.y, rect.width, thickness), border);
GUI.DrawTexture(new Rect(rect.x + rect.width - thickness, rect.y, thickness, rect.height), border);
GUI.DrawTexture(new Rect(rect.x, rect.y + rect.height - thickness, rect.width, thickness), border);
GUI.DrawTexture(new Rect(rect.x, rect.y, thickness, rect.height), border);
}
public static string GetStatExplanation(Pawn pawn, StatDef stat, float val)
{
if (!pawn.Dead)
return stat.description + "\n" + stat.Worker.GetExplanationFull(StatRequest.For(pawn), ToStringNumberSense.Undefined, val);
return "Dead".Translate();
}
public static string GetSexDays(int absticks, bool printUnknown = false)
{
if (absticks != 0)
return GenDate.ToStringTicksToDays(GenTicks.TicksAbs - absticks) + " " + Keyed.RS_Ago;
else if (printUnknown)
return Keyed.Unknown;
return "";
}
public static Texture GetRaceIcon(Pawn pawn, Vector2 size)
{
if (pawn != null)
return PortraitsCache.Get(pawn, size, Rot4.South, default, 1, true, true, false, false);
return HistoryUtility.UnknownPawn;
}
}
}

View File

@ -1,654 +0,0 @@
using RimWorld;
using rjw;
using System;
using System.Collections.Generic;
using System.Linq;
using UnityEngine;
using Verse;
using Verse.Sound;
namespace RJWSexperience.SexHistory.UI
{
public enum PartnerOrderMode
{
Normal = 0,
Recent = 1,
Most = 2,
Name, MaxValue = 3
};
public static class PartnerOrderModeExtension
{
public static PartnerOrderMode Next(this PartnerOrderMode mode)
{
return (PartnerOrderMode)(((int)mode + 1) % ((int)PartnerOrderMode.MaxValue + 1));
}
}
public class SexStatusWindow : Window
{
public const float WINDOW_WIDTH = 900f;
public const float WINDOW_HEIGHT = 600f;
public const float FONTHEIGHT = RJWUIUtility.FONTHEIGHT;
public const float CARDHEIGHT = RJWUIUtility.CARDHEIGHT;
public const float LISTPAWNSIZE = RJWUIUtility.LISTPAWNSIZE;
public const float BASESAT = RJWUIUtility.BASESAT;
public const float ICONSIZE = RJWUIUtility.ICONSIZE;
public static readonly int[] Sextype =
{
(int)xxx.rjwSextype.Vaginal,
(int)xxx.rjwSextype.Anal,
(int)xxx.rjwSextype.Oral,
(int)xxx.rjwSextype.Fellatio,
(int)xxx.rjwSextype.Cunnilingus,
(int)xxx.rjwSextype.DoublePenetration,
(int)xxx.rjwSextype.Boobjob,
(int)xxx.rjwSextype.Handjob,
(int)xxx.rjwSextype.Footjob,
(int)xxx.rjwSextype.Fingering,
(int)xxx.rjwSextype.Scissoring,
(int)xxx.rjwSextype.MutualMasturbation,
(int)xxx.rjwSextype.Fisting,
(int)xxx.rjwSextype.Rimming,
(int)xxx.rjwSextype.Sixtynine
};
protected Pawn pawn;
protected SexPartnerHistoryRecord selectedPawn;
protected SexHistoryComp history;
protected CompRJW rjwcomp;
protected List<SexPartnerHistoryRecord> partnerList;
protected PartnerOrderMode orderMode;
private static GUIStyle fontStyleCenter;
private static GUIStyle fontStyleRight;
private static GUIStyle fontStyleLeft;
private static GUIStyle boxStyle;
private static GUIStyle buttonStyle;
private static Vector2 LastWindowPosition { get; set; }
private Vector2 scroll;
private static void InitStyles()
{
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 };
}
public SexStatusWindow(Pawn pawn, SexHistoryComp history)
{
this.pawn = pawn;
this.history = history;
this.selectedPawn = null;
this.rjwcomp = pawn.TryGetComp<CompRJW>();
this.partnerList = history?.PartnerList;
orderMode = PartnerOrderMode.Recent;
SortPartnerList(orderMode);
soundClose = SoundDefOf.CommsWindow_Close;
absorbInputAroundWindow = false;
forcePause = false;
preventCameraMotion = false;
draggable = true;
doCloseX = true;
}
protected override void SetInitialSizeAndPosition()
{
base.SetInitialSizeAndPosition();
if (LastWindowPosition == Vector2.zero)
return;
windowRect.x = LastWindowPosition.x;
windowRect.y = LastWindowPosition.y;
}
public override Vector2 InitialSize => new Vector2(WINDOW_WIDTH, WINDOW_HEIGHT);
public override void PreOpen()
{
base.PreOpen();
InitStyles();
}
public override void PreClose()
{
base.PreClose();
LastWindowPosition = windowRect.position;
}
public override void DoWindowContents(Rect inRect)
{
if (!SexperienceMod.Settings.SelectionLocked)
{
List<Pawn> selected = Find.Selector.SelectedPawns;
if (selected.Count == 1)
{
Pawn p = selected.First();
if (p != pawn)
{
SexHistoryComp h = p.TryGetComp<SexHistoryComp>();
if (h != null) ChangePawn(p, h);
}
}
}
DrawSexStatus(inRect, history);
}
public static void ToggleWindow(Pawn pawn, SexHistoryComp history)
{
SexStatusWindow window = (SexStatusWindow)Find.WindowStack.Windows.FirstOrDefault(x => x.GetType() == typeof(SexStatusWindow));
if (window != null)
{
if (window.pawn != pawn)
{
SoundDefOf.TabOpen.PlayOneShotOnCamera();
window.ChangePawn(pawn, history);
}
}
else
{
Find.WindowStack.Add(new SexStatusWindow(pawn, history));
}
}
public void ChangePawn(Pawn pawn, SexHistoryComp history)
{
List<Pawn> selected = Find.Selector.SelectedPawns;
if (!selected.NullOrEmpty())
{
foreach (Pawn p in selected)
{
Find.Selector.Deselect(p);
}
}
this.pawn = pawn;
this.history = history;
this.selectedPawn = null;
this.rjwcomp = pawn.TryGetComp<CompRJW>();
this.partnerList = history?.PartnerList;
if (!pawn.DestroyedOrNull() && Find.CurrentMap == pawn.Map) Find.Selector.Select(pawn);
SortPartnerList(orderMode);
}
public void SortPartnerList(PartnerOrderMode mode)
{
if (partnerList.NullOrEmpty()) return;
switch (mode)
{
default:
partnerList = history?.PartnerList;
break;
case PartnerOrderMode.Recent:
partnerList.Sort(new SexPartnerHistoryRecord.RecentOrderComparer());
break;
case PartnerOrderMode.Most:
partnerList.Sort(new SexPartnerHistoryRecord.MostOrderComparer());
break;
case PartnerOrderMode.Name:
partnerList.Sort(new SexPartnerHistoryRecord.NameOrderComparer());
break;
}
}
/// <summary>
/// Main contents
/// </summary>
protected void DrawSexStatus(Rect mainrect, SexHistoryComp history)
{
float sectionwidth = mainrect.width / 3;
Rect leftRect = new Rect(mainrect.x, mainrect.y, sectionwidth, mainrect.height);
Rect centerRect = new Rect(mainrect.x + sectionwidth, mainrect.y, sectionwidth, mainrect.height);
Rect rightRect = new Rect(mainrect.x + (sectionwidth * 2), mainrect.y, sectionwidth, mainrect.height);
if (history != null)
{
//Left section
DrawBaseSexInfoLeft(leftRect.ContractedBy(4f));
//Center section
DrawBaseSexInfoCenter(centerRect.ContractedBy(4f), history.parent as Pawn);
//Right section
DrawBaseSexInfoRight(rightRect.ContractedBy(4f));
}
}
protected void DrawInfoWithPortrait(Rect rect, SexPartnerHistoryRecord history, string tooltip = "")
{
Widgets.DrawMenuSection(rect);
string str = tooltip;
Rect portraitRect = new Rect(rect.x, rect.y, rect.height - FONTHEIGHT, rect.height - FONTHEIGHT);
Rect nameRect = new Rect(rect.x + portraitRect.width, rect.y, rect.width - portraitRect.width, FONTHEIGHT);
Rect sexinfoRect = new Rect(rect.x + portraitRect.width, rect.y + FONTHEIGHT, rect.width - portraitRect.width, FONTHEIGHT);
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 (history != null)
{
if (history.Incest) str += " - " + Keyed.Incest;
Pawn partner = history.Partner;
DrawPawn(portraitRect, history);
Widgets.DrawHighlightIfMouseover(portraitRect);
if (Widgets.ButtonInvisible(portraitRect))
{
SexHistoryComp pawnhistory = partner?.TryGetComp<SexHistoryComp>();
if (pawnhistory != null)
{
ChangePawn(partner, pawnhistory);
SoundDefOf.Click.PlayOneShotOnCamera();
}
else
{
SoundDefOf.ClickReject.PlayOneShotOnCamera();
}
}
string rapeInfo = "";
if (history.Raped > 0) rapeInfo += Keyed.RS_Raped + history.Raped + " ";
if (history.RapedMe > 0) rapeInfo += Keyed.RS_RapedMe + history.RapedMe;
GUI.Label(nameRect, partner?.Name?.ToStringFull ?? history.Label.CapitalizeFirst(), fontStyleLeft);
GUI.Label(sexinfoRect, Keyed.RS_Sex_Count + history.TotalSexCount + " " + rapeInfo, fontStyleLeft);
GUI.Label(sexinfoRect2, Keyed.RS_Orgasms + history.OrgasmCount, fontStyleLeft);
GUI.Label(sexinfoRect2, pawn.GetRelationsString(partner) + " ", fontStyleRight);
float p = history.BestSatisfaction / BASESAT;
FillableBarLabeled(bestsexRect, String.Format(Keyed.RS_Best_Sextype + ": {0}", Keyed.Sextype[(int)history.BestSextype]), p / 2, HistoryUtility.SextypeColor[(int)history.BestSextype], Texture2D.blackTexture, null, String.Format("{0:P2}", p));
if (history.IamFirst)
str += "\n" + Keyed.RS_LostVirgin(history.Label, pawn.LabelShort);
if (history.BestSexTickAbs != 0)
str += "\n" + Keyed.RS_HadBestSexDaysAgo(history.BestSexElapsedTicks.ToStringTicksToDays() + " " + Keyed.RS_Ago);
TooltipHandler.TipRegion(rect, str);
}
else
{
Widgets.DrawTextureFitted(portraitRect, HistoryUtility.UnknownPawn, 1.0f);
Widgets.Label(nameRect, Keyed.Unknown);
Widgets.Label(sexinfoRect, Keyed.RS_Sex_Count + "?");
Widgets.Label(sexinfoRect2, Keyed.RS_Orgasms + "?");
FillableBarLabeled(bestsexRect, String.Format(Keyed.RS_Best_Sextype + ": {0}", Keyed.Sextype[(int)xxx.rjwSextype.None]), 0, Texture2D.linearGrayTexture, Texture2D.blackTexture);
}
}
protected void DrawSexInfoCard(Rect rect, SexPartnerHistoryRecord history, string label, string tooltip, string rightlabel = "")
{
Rect labelRect = new Rect(rect.x, rect.y, rect.width, FONTHEIGHT);
Rect infoRect = new Rect(rect.x, rect.y + FONTHEIGHT, rect.width, rect.height - FONTHEIGHT);
GUI.Label(labelRect, label, fontStyleLeft);
GUI.Label(labelRect, rightlabel, fontStyleRight);
DrawInfoWithPortrait(infoRect, history, tooltip);
}
/// <summary>
/// Right section
/// </summary>
protected void DrawBaseSexInfoRight(Rect rect)
{
Listing_Standard listmain = new Listing_Standard();
listmain.Begin(rect.ContractedBy(4f));
DrawSexInfoCard(listmain.GetRect(CARDHEIGHT), history.GetRecentPartnersHistory, Keyed.RS_Recent_Sex_Partner, Keyed.RS_Recent_Sex_Partner_ToolTip, RJWUIUtility.GetSexDays(history.RecentSexTickAbs));
DrawSexInfoCard(listmain.GetRect(CARDHEIGHT), history.GetFirstPartnerHistory, Keyed.RS_First_Sex_Partner, Keyed.RS_First_Sex_Partner_ToolTip, RJWUIUtility.GetSexDays(history.FirstSexTickAbs));
DrawSexInfoCard(listmain.GetRect(CARDHEIGHT), history.GetMostPartnerHistory, Keyed.RS_Most_Sex_Partner, Keyed.RS_Most_Sex_Partner_ToolTip, RJWUIUtility.GetSexDays(history.MostSexTickAbs));
DrawSexInfoCard(listmain.GetRect(CARDHEIGHT), history.GetBestSexPartnerHistory, Keyed.RS_Best_Sex_Partner, Keyed.RS_Best_Sex_Partner_ToolTip, RJWUIUtility.GetSexDays(history.BestSexTickAbs));
GUI.Label(listmain.GetRect(FONTHEIGHT), Keyed.RS_PreferRace, fontStyleLeft);
DrawPreferRace(listmain.GetRect(66f + 15f));
listmain.GetRect(15f);
listmain.End();
}
protected void DrawPreferRace(Rect rect)
{
Widgets.DrawMenuSection(rect);
Rect portraitRect = new Rect(rect.x, rect.y, rect.height - 15f, rect.height - 15f);
Rect infoRect1 = new Rect(rect.x + portraitRect.width, rect.y, rect.width - portraitRect.width, FONTHEIGHT);
Rect infoRect2 = new Rect(rect.x + portraitRect.width, rect.y + FONTHEIGHT, rect.width - portraitRect.width, FONTHEIGHT);
Rect infoRect3 = new Rect(rect.x + portraitRect.width, rect.y + (FONTHEIGHT * 2), rect.width - portraitRect.width - 2f, FONTHEIGHT);
if (history.PreferRace != null)
{
Widgets.DrawTextureFitted(portraitRect, RJWUIUtility.GetRaceIcon(history.PreferRacePawn, portraitRect.size), 1.0f);
GUI.Label(infoRect1, history.PreferRace?.label.CapitalizeFirst() ?? Keyed.None, fontStyleLeft);
GUI.Label(infoRect2, Keyed.RS_Sex_Count + history.PreferRaceSexCount, fontStyleLeft);
if (history.PreferRace != pawn.def)
{
if (history.PreferRace.race.Animal ^ pawn.def.race.Animal)
{
GUI.Label(infoRect1, Keyed.RS_Bestiality + " ", fontStyleRight);
FillableBarLabeled(infoRect3, Keyed.RS_Sex_Info(Keyed.RS_Bestiality, history.BestialityCount.ToString()), history.BestialityCount / 100f, Texture2D.linearGrayTexture, Texture2D.blackTexture);
}
else
{
GUI.Label(infoRect1, Keyed.RS_Interspecies + " ", fontStyleRight);
FillableBarLabeled(infoRect3, Keyed.RS_Sex_Info(Keyed.RS_Interspecies, history.InterspeciesCount.ToString()), history.InterspeciesCount / 100f, Texture2D.linearGrayTexture, Texture2D.blackTexture);
}
}
}
else
{
Widgets.DrawTextureFitted(portraitRect, HistoryUtility.UnknownPawn, 1.0f);
GUI.Label(infoRect1, Keyed.None, fontStyleLeft);
}
}
/// <summary>
/// Center section
/// </summary>
protected void DrawBaseSexInfoCenter(Rect rect, Pawn pawn)
{
Rect portraitRect = new Rect(rect.x + (rect.width / 4), rect.y, rect.width / 2, rect.width / 1.5f);
Rect nameRect = new Rect(portraitRect.x, portraitRect.yMax - (FONTHEIGHT * 2), portraitRect.width, FONTHEIGHT * 2);
Rect infoRect = new Rect(rect.x, rect.y + portraitRect.height, rect.width, rect.height - portraitRect.height);
Rect lockRect = new Rect(portraitRect.xMax - ICONSIZE, portraitRect.y, ICONSIZE, ICONSIZE);
Rect tmp;
if (Mouse.IsOver(portraitRect))
{
Configurations settings = SexperienceMod.Settings;
Texture lockicon = settings.SelectionLocked ? HistoryUtility.Locked : HistoryUtility.Unlocked;
Widgets.DrawTextureFitted(lockRect, lockicon, 1.0f);
if (Widgets.ButtonInvisible(lockRect))
{
SoundDefOf.Click.PlayOneShotOnCamera();
settings.SelectionLocked = !settings.SelectionLocked;
}
}
GUI.Box(portraitRect, "", boxStyle);
Widgets.DrawTextureFitted(portraitRect, PortraitsCache.Get(pawn, portraitRect.size, Rot4.South, default, 1, true, true, false, false), 1.0f);
Widgets.DrawHighlightIfMouseover(portraitRect);
if (Widgets.ButtonInvisible(portraitRect))
{
SoundDefOf.Click.PlayOneShotOnCamera();
selectedPawn = null;
}
GUI.Box(nameRect, "", boxStyle);
GUI.Label(nameRect.TopHalf(), pawn.Name?.ToStringFull ?? pawn.Label, fontStyleCenter);
if (pawn.story != null) GUI.Label(nameRect.BottomHalf(), pawn.ageTracker.AgeBiologicalYears + ", " + pawn.story.Title, fontStyleCenter);
else GUI.Label(nameRect.BottomHalf(), pawn.ageTracker.AgeBiologicalYears + ", " + pawn.def.label, fontStyleCenter);
Listing_Standard listmain = new Listing_Standard();
listmain.Begin(infoRect);
listmain.Gap(20f);
float p;
Trait virginity = pawn.story?.traits?.GetTrait(VariousDefOf.Virgin);
if (virginity != null && virginity.Degree != Virginity.TraitDegree.FemaleAfterSurgery)
{
tmp = listmain.GetRect(FONTHEIGHT);
GUI.color = Color.red;
GUI.Box(tmp, "", boxStyle);
GUI.color = Color.white;
GUI.Label(tmp, virginity.Label, fontStyleCenter);
}
else
{
p = history.TotalSexHad;
FillableBarLabeled(listmain.GetRect(FONTHEIGHT), String.Format(Keyed.RS_TotalSexHad + ": {0:0} ({1:0})", p, pawn.records.GetValue(xxx.CountOfSex)), p / 100, HistoryUtility.TotalSex, Texture2D.blackTexture, null, Keyed.RS_SAT_AVG(String.Format("{0:P2}", history.AVGSat)));
}
listmain.Gap(1f);
tmp = listmain.GetRect(FONTHEIGHT);
p = pawn.records.GetValue(VariousDefOf.Lust);
FillableBarLabeled(tmp, String.Format(Keyed.Lust + ": {0:0.00}", p), Mathf.Clamp01(p.Normalization(-SexperienceMod.Settings.LustLimit * 3, SexperienceMod.Settings.LustLimit * 3)), HistoryUtility.Slaanesh, Texture2D.blackTexture, null, String.Format(xxx.sex_drive_stat.LabelCap.CapitalizeFirst() + ": {0:P2}", pawn.Dead ? 0 : pawn.GetStatValue(xxx.sex_drive_stat)));
listmain.Gap(1f);
if (Mouse.IsOver(tmp))
{
TooltipHandler.TipRegion(tmp, RJWUIUtility.GetStatExplanation(pawn, xxx.sex_drive_stat, pawn.Dead ? 0 : pawn.GetStatValue(xxx.sex_drive_stat)));
}
p = history.GetBestSextype(out xxx.rjwSextype sextype) / BASESAT;
FillableBarLabeled(listmain.GetRect(FONTHEIGHT), String.Format(Keyed.RS_Best_Sextype + ": {0}", Keyed.Sextype[(int)sextype]), p / 2, HistoryUtility.SextypeColor[(int)sextype], Texture2D.blackTexture, null, Keyed.RS_SAT_AVG(String.Format("{0:P2}", p)));
listmain.Gap(1f);
p = history.GetRecentSextype(out sextype) / BASESAT;
FillableBarLabeled(listmain.GetRect(FONTHEIGHT), String.Format(Keyed.RS_Recent_Sextype + ": {0}", Keyed.Sextype[(int)sextype]), p / 2, HistoryUtility.SextypeColor[(int)sextype], Texture2D.blackTexture, null, String.Format("{0:P2}", p));
listmain.Gap(1f);
if (history.IncestuousCount < history.CorpseFuckCount)
{
p = history.CorpseFuckCount;
FillableBarLabeled(listmain.GetRect(FONTHEIGHT), String.Format(Keyed.RS_Necrophile + ": {0}", p), p / 50, HistoryUtility.Nurgle, Texture2D.blackTexture);
listmain.Gap(1f);
}
else
{
p = history.IncestuousCount;
FillableBarLabeled(listmain.GetRect(FONTHEIGHT), String.Format(Keyed.Incest + ": {0}", p), p / 50, HistoryUtility.Nurgle, Texture2D.blackTexture);
listmain.Gap(1f);
}
p = pawn.records.GetValue(VariousDefOf.AmountofEatenCum);
FillableBarLabeled(listmain.GetRect(FONTHEIGHT), String.Format(Keyed.RS_Cum_Swallowed + ": {0} mL, {1} " + Keyed.RS_NumofTimes, p, pawn.records.GetValue(VariousDefOf.NumofEatenCum)), p / 1000, Texture2D.linearGrayTexture, Texture2D.blackTexture);
listmain.Gap(1f);
Hediff addiction = pawn.health.hediffSet.GetFirstHediffOfDef(VariousDefOf.CumAddiction)
?? pawn.health.hediffSet.GetFirstHediffOfDef(VariousDefOf.CumTolerance);
if (addiction != null)
{
p = addiction.Severity;
FillableBarLabeled(listmain.GetRect(FONTHEIGHT), $"{addiction.Label}: {p.ToStringPercent()}", p, Texture2D.linearGrayTexture, Texture2D.blackTexture, addiction.GetTooltip(pawn, false));
}
else
{
listmain.GetRect(FONTHEIGHT);
}
listmain.Gap(1f);
p = history.RapedCount;
tmp = listmain.GetRect(FONTHEIGHT);
if (p < history.BeenRapedCount)
{
p = history.BeenRapedCount;
FillableBarLabeled(tmp, String.Format(Keyed.RS_BeenRaped + ": {0}", p), p / 50, Texture2D.grayTexture, Texture2D.blackTexture, null, String.Format(xxx.vulnerability_stat.LabelCap.CapitalizeFirst() + ": {0:P2}", pawn.Dead ? 0 : pawn.GetStatValue(xxx.vulnerability_stat)));
listmain.Gap(1f);
}
else
{
FillableBarLabeled(tmp, String.Format(Keyed.RS_RapedSomeone + ": {0}", p), p / 50, HistoryUtility.Khorne, Texture2D.blackTexture, null, String.Format(xxx.vulnerability_stat.LabelCap.CapitalizeFirst() + ": {0:P2}", pawn.Dead ? 0 : pawn.GetStatValue(xxx.vulnerability_stat)));
listmain.Gap(1f);
}
if (Mouse.IsOver(tmp))
{
TooltipHandler.TipRegion(tmp, RJWUIUtility.GetStatExplanation(pawn, xxx.vulnerability_stat, pawn.Dead ? 0 : pawn.GetStatValue(xxx.vulnerability_stat)));
}
p = pawn.Dead ? 0 : pawn.GetStatValue(xxx.sex_satisfaction);
tmp = listmain.GetRect(FONTHEIGHT);
FillableBarLabeled(tmp, String.Format(xxx.sex_satisfaction.LabelCap.CapitalizeFirst() + ": {0:P2}", p), p / 2, HistoryUtility.Satisfaction, Texture2D.blackTexture);
listmain.Gap(1f);
if (Mouse.IsOver(tmp))
{
TooltipHandler.TipRegion(tmp, RJWUIUtility.GetStatExplanation(pawn, xxx.sex_satisfaction, pawn.Dead ? 0 : pawn.GetStatValue(xxx.sex_satisfaction)));
}
SkillRecord skill = pawn.skills?.GetSkill(VariousDefOf.Sex);
p = skill?.Level ?? 0;
tmp = listmain.GetRect(FONTHEIGHT);
FillableBarLabeled(tmp, $"{Keyed.RS_SexSkill}: {p}, {skill?.xpSinceLastLevel / skill?.XpRequiredForLevelUp:P2}", p / 20, HistoryUtility.Tzeentch, Texture2D.blackTexture, null, $"{VariousDefOf.SexAbility.LabelCap.CapitalizeFirst()}: {pawn.GetSexStat():P2}", HistoryUtility.PassionBG[(int)(skill?.passion ?? 0)]);
if (Mouse.IsOver(tmp))
{
TooltipHandler.TipRegion(tmp, RJWUIUtility.GetStatExplanation(pawn, VariousDefOf.SexAbility, pawn.GetSexStat()));
}
listmain.Gap(1f);
if (selectedPawn != null) DrawSexInfoCard(listmain.GetRect(CARDHEIGHT), selectedPawn, Keyed.RS_Selected_Partner, Keyed.RS_Selected_Partner, RJWUIUtility.GetSexDays(selectedPawn.RecentSexTickAbs));
else DrawExtraInfo(listmain.GetRect(CARDHEIGHT));
listmain.End();
}
protected void DrawExtraInfo(Rect rect)
{
Widgets.DrawMenuSection(rect);
Rect inRect = rect.ContractedBy(4f);
Listing_Standard listmain = new Listing_Standard();
listmain.Begin(inRect);
listmain.Gap(4f);
listmain.GetRect(FONTHEIGHT).DrawSexuality(rjwcomp);
listmain.Gap(1f);
listmain.GetRect(FONTHEIGHT * 3f).DrawQuirk(pawn);
listmain.End();
}
/// <summary>
/// Left section
/// </summary>
protected void DrawBaseSexInfoLeft(Rect rect)
{
Listing_Standard listmain = new Listing_Standard();
listmain.Begin(rect);
float p;
//Sex statistics
GUI.Label(listmain.GetRect(FONTHEIGHT), " " + Keyed.RS_Statistics, fontStyleLeft);
listmain.Gap(1f);
float maxSatisfaction = history.GetBestSextype(out _);
if (maxSatisfaction == 0f) maxSatisfaction = BASESAT;
for (int i = 0; i < Sextype.Length; i++)
{
int sexindex = Sextype[i];
float relativeSat = history.GetAVGSat(sexindex) / maxSatisfaction;
p = history.GetAVGSat(sexindex) / BASESAT;
string label = Keyed.RS_Sex_Info(Keyed.Sextype[sexindex], history.GetSexCount(sexindex).ToString());
Rect tmpRect = listmain.GetRect(FONTHEIGHT);
FillableBarLabeled(tmpRect, label, relativeSat, HistoryUtility.SextypeColor[sexindex], Texture2D.blackTexture, null, Keyed.RS_SAT_AVG(String.Format("{0:P2}", p)));
if (Mouse.IsOver(tmpRect))
{
TooltipHandler.TipRegion(tmpRect, Keyed.RS_LastSex.CapitalizeFirst() + ": " + RJWUIUtility.GetSexDays(history.GetSextypeRecentTickAbs(Sextype[i]), true));
}
listmain.Gap(1f);
}
p = history.PartnerCount;
FillableBarLabeled(listmain.GetRect(FONTHEIGHT), String.Format(Keyed.RS_Sex_Partners + ": {0} ({1})", p, pawn.records.GetValue(VariousDefOf.SexPartnerCount)), p / 50, HistoryUtility.Partners, Texture2D.blackTexture);
listmain.Gap(1f);
p = history.VirginsTaken;
FillableBarLabeled(listmain.GetRect(FONTHEIGHT), String.Format(Keyed.RS_VirginsTaken + ": {0:0}", p), p / 100, HistoryUtility.Partners, Texture2D.blackTexture);
listmain.Gap(1f);
//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);
if (Widgets.ButtonText(sortbtnRect, orderMode.Translate()))
{
SoundDefOf.Click.PlayOneShotOnCamera();
orderMode = orderMode.Next();
SortPartnerList(orderMode);
}
listmain.Gap(1f);
Rect scrollRect = listmain.GetRect(CARDHEIGHT + 1f);
GUI.Box(scrollRect, "", buttonStyle);
if (!partnerList.NullOrEmpty())
{
Rect listRect = new Rect(scrollRect.x, scrollRect.y, LISTPAWNSIZE * partnerList.Count, scrollRect.height - 30f);
Widgets.ScrollHorizontal(scrollRect, ref scroll, listRect);
Widgets.BeginScrollView(scrollRect, ref scroll, listRect);
DrawPartnerList(listRect, partnerList);
Widgets.EndScrollView();
}
listmain.End();
}
protected void DrawPartnerList(Rect rect, List<SexPartnerHistoryRecord> partnerList)
{
Rect pawnRect = new Rect(rect.x, rect.y, LISTPAWNSIZE, LISTPAWNSIZE);
for (int i = 0; i < partnerList.Count; i++)
{
Rect labelRect = new Rect(pawnRect.x, pawnRect.yMax - FONTHEIGHT, pawnRect.width, FONTHEIGHT);
DrawPawn(pawnRect, partnerList[i]);
Widgets.DrawHighlightIfMouseover(pawnRect);
GUI.Label(labelRect, partnerList[i].Label, fontStyleCenter);
if (Widgets.ButtonInvisible(pawnRect))
{
selectedPawn = partnerList[i];
SoundDefOf.Click.PlayOneShotOnCamera();
}
if (partnerList[i] == selectedPawn)
{
Widgets.DrawHighlightSelected(pawnRect);
}
pawnRect.x += LISTPAWNSIZE;
}
}
protected void DrawPawn(Rect rect, SexPartnerHistoryRecord history)
{
if (history != null)
{
bool drawheart = false;
Rect iconRect = new Rect(rect.x + (rect.width * 3 / 4), rect.y, rect.width / 4, rect.height / 4);
Texture img = HistoryUtility.UnknownPawn;
if (history.IamFirst)
{
GUI.color = HistoryUtility.HistoryColor;
Widgets.DrawTextureFitted(rect, HistoryUtility.FirstOverlay, 1.0f);
GUI.color = Color.white;
}
if (history.Partner != null)
{
img = PortraitsCache.Get(history.Partner, rect.size, Rot4.South, default, 1, true, true, false, false);
drawheart = LovePartnerRelationUtility.LovePartnerRelationExists(pawn, history.Partner);
}
else if (history.Race?.uiIcon != null)
{
img = history.Race.uiIcon;
}
if (history.Incest)
{
Widgets.DrawTextureFitted(iconRect, HistoryUtility.Incest, 1.0f);
iconRect.x -= iconRect.width;
}
Widgets.DrawTextureFitted(rect, img, 1.0f);
if (drawheart)
{
Widgets.DrawTextureFitted(iconRect, HistoryUtility.Heart, 1.0f);
iconRect.x -= iconRect.width;
}
}
}
public static void FillableBarLabeled(Rect rect, string label, float fillPercent, Texture2D filltexture, Texture2D bgtexture, string tooltip = null, string rightlabel = "", Texture2D border = null)
{
Widgets.FillableBar(rect, Math.Min(fillPercent, 1.0f), filltexture, bgtexture, true);
GUI.Label(rect, " " + label.CapitalizeFirst(), fontStyleLeft);
GUI.Label(rect, rightlabel.CapitalizeFirst() + " ", fontStyleRight);
Widgets.DrawHighlightIfMouseover(rect);
if (tooltip != null) TooltipHandler.TipRegion(rect, tooltip);
if (border != null)
{
rect.DrawBorder(border, 2f);
}
}
}
}

View File

@ -1,15 +0,0 @@
using RimWorld;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using Verse;
namespace RJWSexperience
{
public class ThoughtDefExtension_StageFromRecord : DefModExtension
{
[SuppressMessage("Minor Code Smell", "S1104:Fields should not have public accessibility", Justification = "Field value loaded from XML")]
public RecordDef recordDef;
[SuppressMessage("Minor Code Smell", "S1104:Fields should not have public accessibility", Justification = "Field value loaded from XML")]
public List<float> minimumValueforStage = new List<float>();
}
}

View File

@ -1,39 +0,0 @@
using RimWorld;
using System.Collections.Generic;
namespace RJWSexperience
{
/// <summary>
/// Thought class using record.
/// </summary>
public class Thought_Recordbased : Thought_Memory
{
private ThoughtDefExtension_StageFromRecord extension;
protected ThoughtDefExtension_StageFromRecord Extension
{
get
{
if (extension == null)
extension = def.GetModExtension<ThoughtDefExtension_StageFromRecord>();
return extension;
}
}
protected RecordDef RecordDef => Extension.recordDef;
protected List<float> MinimumValueforStage => Extension.minimumValueforStage;
public override int CurStageIndex
{
get
{
float value = pawn?.records?.GetValue(RecordDef) ?? 0f;
for (int i = MinimumValueforStage.Count - 1; i > 0; i--)
{
if (MinimumValueforStage[i] < value) return i;
}
return 0;
}
}
}
}

View File

@ -1,41 +0,0 @@
using RimWorld;
using Verse;
namespace RJWSexperience
{
[DefOf]
public static class VariousDefOf
{
public static readonly RecordDef NumofEatenCum;
public static readonly RecordDef AmountofEatenCum;
public static readonly RecordDef Lust;
public static readonly RecordDef VaginalSexCount;
public static readonly RecordDef AnalSexCount;
public static readonly RecordDef OralSexCount;
public static readonly RecordDef BlowjobCount;
public static readonly RecordDef CunnilingusCount;
public static readonly RecordDef GenitalCaressCount;
public static readonly RecordDef HandjobCount;
public static readonly RecordDef FingeringCount;
public static readonly RecordDef FootjobCount;
public static readonly RecordDef MiscSexualBehaviorCount;
public static readonly RecordDef SexPartnerCount;
public static readonly RecordDef OrgasmCount;
public static readonly SkillDef Sex;
public static readonly ThingDef CumBucket;
public static readonly ThingDef GatheredCum;
public static readonly ThingDef FilthCum;
public static readonly ChemicalDef Cum;
public static readonly NeedDef Chemical_Cum;
public static readonly TraitDef Virgin;
public static readonly JobDef CleanSelfwithBucket;
public static readonly KeyBindingDef OpenSexStatistics;
public static readonly StatDef SexAbility;
public static readonly HediffDef CumAddiction;
public static readonly HediffDef CumTolerance;
[MayRequire("rjw.cum")] public static readonly HediffDef Hediff_CumController;
[MayRequire("rjw.cum")] public static readonly HediffDef Hediff_Cum; //for humans & animals
[MayRequire("rjw.cum")] public static readonly HediffDef Hediff_InsectSpunk;
}
}

View File

@ -1,10 +1,12 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.31424.327
# Visual Studio Version 17
VisualStudioVersion = 17.2.32630.192
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RJWSexperience", "RJWSexperience\RJWSexperience.csproj", "{9C728E06-573B-4B04-A07F-ACBF60CB424D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RJWSexperienceCum", "RJWSexperienceCum\RJWSexperienceCum.csproj", "{73CB4597-22BD-4A3E-A3CE-6D65DD080F65}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -15,6 +17,10 @@ Global
{9C728E06-573B-4B04-A07F-ACBF60CB424D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9C728E06-573B-4B04-A07F-ACBF60CB424D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9C728E06-573B-4B04-A07F-ACBF60CB424D}.Release|Any CPU.Build.0 = Release|Any CPU
{73CB4597-22BD-4A3E-A3CE-6D65DD080F65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{73CB4597-22BD-4A3E-A3CE-6D65DD080F65}.Debug|Any CPU.Build.0 = Debug|Any CPU
{73CB4597-22BD-4A3E-A3CE-6D65DD080F65}.Release|Any CPU.ActiveCfg = Release|Any CPU
{73CB4597-22BD-4A3E-A3CE-6D65DD080F65}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

View File

@ -0,0 +1,60 @@
using Verse;
using RJWSexperience.Settings;
namespace RJWSexperience
{
public class Configurations : ModSettings
{
public const int CurrentSettingsVersion = 1;
public readonly SettingHandle<float> LustEffectPower = new SettingHandle<float>("LustEffectPower", 0.5f);
public readonly SettingHandle<bool> EnableBastardRelation = new SettingHandle<bool>("EnableBastardRelation", true);
public readonly SettingHandle<float> LustLimit = new SettingHandle<float>("LustLimit", 150f);
public readonly SettingHandle<float> MaxSingleLustChange = new SettingHandle<float>("maxSingleLustChange", 1f);
public readonly SettingHandle<bool> SexCanFillBuckets = new SettingHandle<bool>("SexCanFillBuckets", false);
public readonly SettingHandle<bool> EnableRecordRandomizer = new SettingHandle<bool>("EnableRecordRandomizer", true);
public readonly SettingHandle<float> MaxLustDeviation = new SettingHandle<float>("MaxLustDeviation", 200f);
public readonly SettingHandle<float> AvgLust = new SettingHandle<float>("AvgLust", 0f);
public readonly SettingHandle<float> MaxSexCountDeviation = new SettingHandle<float>("MaxSexCountDeviation", 90f);
public readonly SettingHandle<float> SexPerYear = new SettingHandle<float>("SexPerYear", 30f);
public readonly SettingHandle<bool> MinSexableFromLifestage = new SettingHandle<bool>("MinSexableFromLifestage", true);
public readonly SettingHandle<float> MinSexablePercent = new SettingHandle<float>("MinSexablePercent", 0.2f);
public readonly SettingHandle<float> VirginRatio = new SettingHandle<float>("VirginRatio", 0.01f);
public readonly SettingHandle<bool> SlavesBeenRapedExp = new SettingHandle<bool>("SlavesBeenRapedExp", true);
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);
public override void ExposeData()
{
SettingsContainer history = SettingsContainer.CreateHistoryContainer(this);
int version = CurrentSettingsVersion;
Scribe_Values.Look(ref version, "SettingsVersion", 0);
LustEffectPower.Scribe();
EnableBastardRelation.Scribe();
LustLimit.Scribe();
MaxSingleLustChange.Scribe();
SelectionLocked.Scribe();
SexCanFillBuckets.Scribe();
DevMode.Scribe();
Scribe_Deep.Look(ref history, "History", history.Handles);
base.ExposeData();
if (Scribe.mode != LoadSaveMode.LoadingVars)
return;
if (history == null)
{
// Previously history settings were in Configurations. Direct call to try read old data
SettingsContainer.CreateHistoryContainer(this).ExposeData();
}
}
}
}

View File

@ -39,11 +39,11 @@ namespace RJWSexperience // Used in Menstruation with this namespace
stringBuilder.Append(Keyed.RSTotalGatheredCum).AppendFormat("{0:0.##}ml", totalGathered);
if (SexperienceMod.Settings.Debug.DevMode)
if (SexperienceMod.Settings.DevMode)
{
stringBuilder.AppendLine();
stringBuilder.AppendLine($"[Debug] stored: {StoredStackCount}");
stringBuilder.Append($"[Debug] storedDecimalRemainder: {storedDecimalRemainder}");
stringBuilder.Append("[Debug] stored: ").Append(StoredStackCount).AppendLine();
stringBuilder.Append("[Debug] storedDecimalRemainder: ").Append(storedDecimalRemainder);
}
return stringBuilder.ToString();
@ -51,7 +51,7 @@ namespace RJWSexperience // Used in Menstruation with this namespace
public void AddCum(float amount)
{
AddCum(amount, VariousDefOf.GatheredCum);
AddCum(amount, RsDefOf.Thing.GatheredCum);
}
public void AddCum(float amount, ThingDef cumDef)
@ -69,7 +69,7 @@ namespace RJWSexperience // Used in Menstruation with this namespace
cum.stackCount = num;
if (cum.stackCount > 0 && !GenPlace.TryPlaceThing(cum, PositionHeld, Map, ThingPlaceMode.Direct, out Thing res))
{
FilthMaker.TryMakeFilth(PositionHeld, Map, VariousDefOf.FilthCum, num);
FilthMaker.TryMakeFilth(PositionHeld, Map, RsDefOf.Thing.FilthCum, num);
}
storedDecimalRemainder -= num;
}

View File

@ -125,7 +125,7 @@ namespace RJWSexperience.Cum
const float allOf = 1000f;
log.Message($"FeedCum({pawn.NameShortColored}, {amount})");
Thing cum = ThingMaker.MakeThing(VariousDefOf.GatheredCum);
Thing cum = ThingMaker.MakeThing(RsDefOf.Thing.GatheredCum);
cum.stackCount = (int)Math.Ceiling(amount);
log.Message($"Created a stack of {cum.stackCount} cum");
cum.Ingested(pawn, allOf);
@ -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);
}
}
}

View File

@ -6,7 +6,7 @@ namespace RJWSexperience.Cum.FilterWorkers
{
public override bool Matches(Thing t)
{
return IsCum(t) || IsFoodWithCum(t);
return IsCum(t.def) || IsFoodWithCum(t);
}
}
}

View File

@ -10,20 +10,18 @@ namespace RJWSexperience.Cum.FilterWorkers
return def.IsIngestible && def.IsProcessedFood;
}
protected bool IsCum(Thing t) => IsCum(t.def);
protected bool IsCum(ThingDef t) => t == VariousDefOf.GatheredCum;
protected bool IsCum(ThingDef t) => t == RsDefOf.Thing.GatheredCum;
protected bool IsFoodWithCum(Thing food)
{
CompIngredients compIngredients = food.TryGetComp<CompIngredients>();
if (compIngredients == null)
if (compIngredients?.ingredients == null)
return false;
foreach (ThingDef ingredient in compIngredients.ingredients)
for (int i = 0; i < compIngredients.ingredients.Count; i++)
{
if (IsCum(ingredient))
if (IsCum(compIngredients.ingredients[i]))
return true;
}

View File

@ -6,7 +6,7 @@ namespace RJWSexperience.Cum.FilterWorkers
{
public override bool Matches(Thing t)
{
return !IsCum(t) && !IsFoodWithCum(t);
return !IsCum(t.def) && !IsFoodWithCum(t);
}
}
}

View File

@ -12,8 +12,8 @@ namespace RJWSexperience.Cum
{
int amount = ingested.stackCount * (int)unitAmount;
Logs.LogManager.GetLogger<IngestionOutcomeDoer_RecordEatenCum, Logs.DebugLogProvider>().Message($"Record {pawn.NameShortColored} eating {amount} ml of cum");
pawn.records.Increment(VariousDefOf.NumofEatenCum);
pawn.records.AddTo(VariousDefOf.AmountofEatenCum, amount);
pawn.records.Increment(RsDefOf.Record.NumofEatenCum);
pawn.records.AddTo(RsDefOf.Record.AmountofEatenCum, amount);
}
}
}

View File

@ -17,7 +17,7 @@ namespace RJWSexperience.Cum.Interactions
if (context.Internals.Submissive.Parts.Penises.Any())
return GetForCumAddict(context.Internals.Dominant.Pawn);
if (AddictionUtility.IsAddicted(context.Internals.Submissive.Pawn, VariousDefOf.Cum))
if (AddictionUtility.IsAddicted(context.Internals.Submissive.Pawn, RsDefOf.Chemical.Cum))
return GetForPartner();
return Enumerable.Empty<Weighted<LewdablePartKind>>();
@ -28,7 +28,7 @@ namespace RJWSexperience.Cum.Interactions
if (context.Internals.Dominant.Parts.Penises.Any())
return GetForCumAddict(context.Internals.Submissive.Pawn);
if (AddictionUtility.IsAddicted(context.Internals.Dominant.Pawn, VariousDefOf.Cum))
if (AddictionUtility.IsAddicted(context.Internals.Dominant.Pawn, RsDefOf.Chemical.Cum))
return GetForPartner();
return Enumerable.Empty<Weighted<LewdablePartKind>>();
@ -42,7 +42,7 @@ namespace RJWSexperience.Cum.Interactions
var log = LogManager.GetLogger<CumAddictPartKindUsageRule, DebugLogProvider>();
log.Message($"Called for {pawn.NameShortColored}");
if (!(pawn.needs?.TryGetNeed(VariousDefOf.Chemical_Cum) is Need_Chemical cumNeed))
if (!(pawn.needs?.TryGetNeed(RsDefOf.Need.Chemical_Cum) is Need_Chemical cumNeed))
yield break;
log.Message($"{pawn.NameShortColored} is cum addict, current desire level: {cumNeed.CurCategory}");

View File

@ -0,0 +1,17 @@
namespace RJWSexperience // Change in namespace will lead to save incompatibility
{
public class Thought_AteCum : Thought_Recordbased
{
protected override void UpdateCurStage()
{
if (pawn?.health?.hediffSet?.HasHediff(RsDefOf.Hediff.CumAddiction) ?? false)
{
SetForcedStage(def.stages.Count - 1);
}
else
{
base.UpdateCurStage();
}
}
}
}

View File

@ -8,9 +8,9 @@ namespace RJWSexperience
public static class DebugToolsSexperience
{
[DebugAction("RJW Sexperience", "Reset pawn's record", false, false, actionType = DebugActionType.ToolMapForPawns, allowedGameStates = AllowedGameStates.PlayingOnMap)]
private static void ResetRecords(Pawn p)
public static void ResetRecords(Pawn p)
{
Trait virgin = p.story?.traits?.GetTrait(VariousDefOf.Virgin);
Trait virgin = p.story?.traits?.GetTrait(RsDefOf.Trait.Virgin);
if (virgin != null) p.story.traits.RemoveTrait(virgin);
ResetRecord(p, true);
if (ResetRecord(p, false))
@ -19,7 +19,7 @@ namespace RJWSexperience
}
[DebugAction("RJW Sexperience", "Reset pawn's record(virgin)", false, false, actionType = DebugActionType.ToolMapForPawns, allowedGameStates = AllowedGameStates.PlayingOnMap)]
private static void ResetRecordsZero(Pawn p)
public static void ResetRecordsZero(Pawn p)
{
ResetRecord(p, true);
Virginity.TraitHandler.AddVirginTrait(p);
@ -27,60 +27,59 @@ namespace RJWSexperience
}
[DebugAction("RJW Sexperience", "Reset lust", false, false, actionType = DebugActionType.ToolMapForPawns, allowedGameStates = AllowedGameStates.PlayingOnMap)]
private static void ResetLust(Pawn p)
public static void ResetLust(Pawn p)
{
float lust = RecordRandomizer.RandomizeLust(p);
MoteMaker.ThrowText(p.TrueCenter(), p.Map, "Lust: " + lust);
}
[DebugAction("RJW Sexperience", "Set lust to 0", false, false, actionType = DebugActionType.ToolMapForPawns, allowedGameStates = AllowedGameStates.PlayingOnMap)]
private static void SetLust(Pawn p)
public static void SetLust(Pawn p)
{
p.records.SetTo(VariousDefOf.Lust, 0);
p.records.SetTo(RsDefOf.Record.Lust, 0);
MoteMaker.ThrowText(p.TrueCenter(), p.Map, "Lust: 0");
}
[DebugAction("RJW Sexperience", "Add 10 to lust", false, false, actionType = DebugActionType.ToolMapForPawns, allowedGameStates = AllowedGameStates.PlayingOnMap)]
private static void AddLust(Pawn p)
public static void AddLust(Pawn p)
{
p.records.AddTo(VariousDefOf.Lust, 10);
MoteMaker.ThrowText(p.TrueCenter(), p.Map, "Lust: " + p.records.GetValue(VariousDefOf.Lust));
p.records.AddTo(RsDefOf.Record.Lust, 10);
MoteMaker.ThrowText(p.TrueCenter(), p.Map, "Lust: " + p.records.GetValue(RsDefOf.Record.Lust));
}
[DebugAction("RJW Sexperience", "Subtract 10 to lust", false, false, actionType = DebugActionType.ToolMapForPawns, allowedGameStates = AllowedGameStates.PlayingOnMap)]
private static void SubtractLust(Pawn p)
public static void SubtractLust(Pawn p)
{
p.records.AddTo(VariousDefOf.Lust, -10);
MoteMaker.ThrowText(p.TrueCenter(), p.Map, "Lust: " + p.records.GetValue(VariousDefOf.Lust));
p.records.AddTo(RsDefOf.Record.Lust, -10);
MoteMaker.ThrowText(p.TrueCenter(), p.Map, "Lust: " + p.records.GetValue(RsDefOf.Record.Lust));
}
private static bool ResetRecord(Pawn pawn, bool allzero)
{
if (!allzero)
{
if (SexperienceMod.Settings.History.EnableRecordRandomizer && xxx.is_human(pawn))
if (SexperienceMod.Settings.EnableRecordRandomizer && xxx.is_human(pawn))
{
return RecordRandomizer.Randomize(pawn);
}
}
else
{
pawn.records.SetTo(VariousDefOf.Lust, 0);
pawn.records.SetTo(VariousDefOf.NumofEatenCum, 0);
pawn.records.SetTo(VariousDefOf.AmountofEatenCum, 0);
pawn.records.SetTo(VariousDefOf.VaginalSexCount, 0);
pawn.records.SetTo(VariousDefOf.AnalSexCount, 0);
pawn.records.SetTo(VariousDefOf.OralSexCount, 0);
pawn.records.SetTo(VariousDefOf.BlowjobCount, 0);
pawn.records.SetTo(VariousDefOf.CunnilingusCount, 0);
pawn.records.SetTo(VariousDefOf.GenitalCaressCount, 0);
pawn.records.SetTo(VariousDefOf.HandjobCount, 0);
pawn.records.SetTo(VariousDefOf.FingeringCount, 0);
pawn.records.SetTo(VariousDefOf.FootjobCount, 0);
pawn.records.SetTo(VariousDefOf.MiscSexualBehaviorCount, 0);
pawn.records.SetTo(VariousDefOf.SexPartnerCount, 0);
pawn.records.SetTo(VariousDefOf.OrgasmCount, 0);
pawn.records.SetTo(RsDefOf.Record.Lust, 0);
pawn.records.SetTo(RsDefOf.Record.NumofEatenCum, 0);
pawn.records.SetTo(RsDefOf.Record.AmountofEatenCum, 0);
pawn.records.SetTo(RsDefOf.Record.VaginalSexCount, 0);
pawn.records.SetTo(RsDefOf.Record.AnalSexCount, 0);
pawn.records.SetTo(RsDefOf.Record.OralSexCount, 0);
pawn.records.SetTo(RsDefOf.Record.BlowjobCount, 0);
pawn.records.SetTo(RsDefOf.Record.CunnilingusCount, 0);
pawn.records.SetTo(RsDefOf.Record.GenitalCaressCount, 0);
pawn.records.SetTo(RsDefOf.Record.HandjobCount, 0);
pawn.records.SetTo(RsDefOf.Record.FingeringCount, 0);
pawn.records.SetTo(RsDefOf.Record.FootjobCount, 0);
pawn.records.SetTo(RsDefOf.Record.MiscSexualBehaviorCount, 0);
pawn.records.SetTo(RsDefOf.Record.SexPartnerCount, 0);
pawn.records.SetTo(RsDefOf.Record.OrgasmCount, 0);
pawn.records.SetTo(xxx.CountOfBeenRapedByAnimals, 0);
pawn.records.SetTo(xxx.CountOfBeenRapedByHumanlikes, 0);
pawn.records.SetTo(xxx.CountOfBeenRapedByInsects, 0);

View File

@ -13,7 +13,7 @@ namespace RJWSexperience
return false;
IEnumerable<PawnRelationDef> relations = pawn.GetRelations(otherpawn);
if (relations.EnumerableNullOrEmpty())
if (relations == null)
return false;
foreach (PawnRelationDef relation in relations)
@ -27,71 +27,54 @@ namespace RJWSexperience
public static float GetSexStat(this Pawn pawn)
{
if (xxx.is_human(pawn) && !pawn.Dead)
return pawn.GetStatValue(VariousDefOf.SexAbility);
return pawn.GetStatValue(RsDefOf.Stat.SexAbility);
return 1.0f;
}
public static T GetAdjacentBuilding<T>(this Pawn pawn) where T : Building
{
if (!pawn.Spawned)
return null;
EdificeGrid edifice = pawn.Map.edificeGrid;
if (edifice[pawn.Position] is T building)
return building;
foreach (IntVec3 pos in GenAdjFast.AdjacentCells8Way(pawn.Position))
{
if (edifice[pos] is T adjBuilding)
return adjBuilding;
}
return null;
}
public static T GetAdjacentBuilding<T>(this Pawn pawn) where T : Building => GetAdjacentBuildings<T>(pawn).FirstOrFallback();
public static IEnumerable<T> GetAdjacentBuildings<T>(this Pawn pawn) where T : Building
{
var results = new List<T>();
if (!pawn.Spawned)
return results;
yield break;
EdificeGrid edifice = pawn.Map.edificeGrid;
if (edifice[pawn.Position] is T building)
results.Add(building);
yield return building;
foreach (IntVec3 pos in GenAdjFast.AdjacentCells8Way(pawn.Position))
{
if (edifice[pos] is T adjBuilding)
results.Add(adjBuilding);
if (pos.InBounds(pawn.Map) && edifice[pos] is T adjBuilding)
yield return adjBuilding;
}
return results;
}
/// <summary>
/// If the pawn is virgin, return true.
/// Check if the pawn is virgin
/// </summary>
public static bool IsVirgin(this Pawn pawn)
{
return pawn.records.GetValue(VariousDefOf.VaginalSexCount) == 0;
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>
/// If pawn is virgin, lose his/her virginity.
/// Remove virginity if pawn is virgin and announce it
/// </summary>
public static void PoptheCherry(this Pawn pawn, Pawn partner, SexProps props)
public static void TryRemoveVirginity(this Pawn pawn, Pawn partner, SexProps props)
{
if (props?.sexType != xxx.rjwSextype.Vaginal)
return;
int? removedDegree = Virginity.TraitHandler.RemoveVirginTrait(pawn);
if (pawn.IsVirgin())
if (SexperienceMod.Settings.EnableSexHistory && pawn.IsVirgin())
{
pawn.TryGetComp<SexHistory.SexHistoryComp>()?.RecordFirst(partner, props);
if (removedDegree != null)
Messages.Message(Keyed.RS_LostVirgin(pawn.LabelShort, partner.LabelShort), MessageTypeDefOf.NeutralEvent, true);
pawn.TryGetComp<SexHistory.SexHistoryComp>()?.RecordFirst(partner);
}
if (removedDegree != null)
if (removedDegree != null && removedDegree != Virginity.TraitDegree.FemaleAfterSurgery)
{
Messages.Message(Keyed.RS_LostVirgin(pawn.LabelShort, partner.LabelShort), MessageTypeDefOf.NeutralEvent, true);
RJWUtility.ThrowVirginHistoryEvent(pawn, partner, props, (int)removedDegree);
}
}
}
}

View File

@ -19,11 +19,22 @@ namespace RJWSexperience.ExtensionMethods
public static bool IsBestiality(this SexProps props)
{
if (props.partner != null)
if (props.hasPartner())
{
return props.pawn.IsAnimal() ^ props.partner.IsAnimal();
}
return false;
}
/// <summary>
/// Get a not-so-unique ID. Same interaction between the same partners will return same ID
/// </summary>
public static int GetTempId(this SexProps props)
{
return props.pawn.GetHashCode() ^
(props.partner?.GetHashCode() ?? 0) ^
props.dictionaryKey.GetHashCode() ^
(props.isReceiver ? 0 : 1);
}
}
}

View File

@ -16,7 +16,6 @@ namespace RJWSexperience
{
var har = new Harmony("RJW_Sexperience");
har.PatchAll(Assembly.GetExecutingAssembly());
Pawn_GetGizmos.DoConditionalPatch(har);
InjectIntoRjwInteractionServices();
}

View File

@ -9,12 +9,14 @@ namespace RJWSexperience
public static class Keyed
{
public static string RS_LostVirgin(string pawn, string partner) => "RS_LostVirgin".Translate(pawn.Colorize(Color.yellow), partner.Colorize(Color.yellow));
public static string RS_Sex_Info(string sextype, string sexcount) => "RS_Sex_Info".Translate(sextype, sexcount);
public static string RS_SAT_AVG(string avgsat) => "RS_SAT_AVG".Translate(avgsat);
public static string RS_SexInfo(string sextype, int sexcount) => string.Format(RS_Sex_Info, sextype, sexcount);
public static string RS_SatAVG(float avgsat) => string.Format(RS_SAT_AVG, avgsat.ToStringPercent());
public static string RS_HadBestSexDaysAgo(string days) => "RS_HadBestSexDaysAgo".Translate(days);
public static readonly string Mod_Title = "RS_Mod_Title".Translate();
public static readonly string RSTotalGatheredCum = "RSTotalGatheredCum".Translate();
public static readonly string RS_Sex_Info = "RS_Sex_Info".Translate();
public static readonly string RS_SAT_AVG = "RS_SAT_AVG".Translate();
public static readonly string RS_Best_Sextype = "RS_Best_Sextype".Translate();
public static readonly string RS_Recent_Sextype = "RS_Recent_Sextype".Translate();
public static readonly string RS_Sex_Partners = "RS_Sex_Partners".Translate();
@ -51,7 +53,8 @@ namespace RJWSexperience
public static readonly string RS_SexSkill = "RS_SexSkill".Translate();
public static readonly string RS_NumofTimes = "RS_NumofTimes".Translate();
public static readonly string RS_Ago = "RS_Ago".Translate();
public static readonly string RS_LastSex = "RS_LastSex".Translate();
public static readonly string RS_LastSex = "RS_LastSex".Translate().CapitalizeFirst();
public static readonly string RS_PawnLockDesc = "RS_PawnLockDesc".Translate();
[MayRequireRoyalty] public static readonly string Slave = "Slave".Translate();
public static readonly string TabLabelMain = "RSTabLabelMain".Translate();
@ -95,6 +98,10 @@ 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)
{

View File

@ -4,6 +4,6 @@ namespace RJWSexperience.Logs
{
public class DebugLogProvider : ILogProvider
{
public bool IsActive => SexperienceMod.Settings.Debug.DevMode;
public bool IsActive => SexperienceMod.Settings.DevMode;
}
}

View File

@ -74,7 +74,7 @@ namespace RJWSexperience
public static void UpdateLust(SexProps props, float satisfaction, float baseSatisfaction)
{
float? lust = props.pawn.records?.GetValue(VariousDefOf.Lust);
float? lust = props.pawn.records?.GetValue(RsDefOf.Record.Lust);
if (lust == null)
return;
@ -97,7 +97,7 @@ namespace RJWSexperience
return;
LogManager.GetLogger<DebugLogProvider>("LustUtility").Message($"{props.pawn.NameShortColored}'s lust changed by {lustDelta} (from {lust})");
props.pawn.records.AddTo(VariousDefOf.Lust, lustDelta);
props.pawn.records.AddTo(RsDefOf.Record.Lust, lustDelta);
}
private static float LustIncrementFactor(float lust)

View File

@ -0,0 +1,37 @@
/*using HarmonyLib;
using System.Xml;
using Verse;
namespace RJWSexperience.Patches
{
public static class ConditionalDefLoad
{
public static void DoPatch()
{
Harmony harmony = new Harmony("RJW_SexperienceXmlLoad");
harmony.Patch(AccessTools.Method(typeof(DirectXmlLoader), nameof(DirectXmlLoader.DefFromNode)), new HarmonyMethod(typeof(ConditionalDefLoad), nameof(ConditionalDefLoad.Prefix)));
}
public static bool Prefix(XmlNode node, LoadableXmlAsset loadingAsset, ref Def __result)
{
if (node.NodeType != XmlNodeType.Element)
{
return true;
}
var settingName = node.Attributes?["RsLoadFlag"]?.Value;
if (settingName.NullOrEmpty())
{
return true;
}
if (SexperienceMod.Settings.GetValue<bool>(settingName))
{
__result = null;
return false;
}
return true;
}
}
}*/

View File

@ -11,19 +11,20 @@ namespace RJWSexperience
{
static DefInjection()
{
if (SexperienceMod.Settings.History.EnableSexHistory)
if (SexperienceMod.Settings.EnableSexHistory)
InjectRaces();
}
[System.Diagnostics.CodeAnalysis.SuppressMessage("Roslynator", "RCS1146:Use conditional access.", Justification = "race != null is needed")]
private static void InjectRaces()
{
IEnumerable<ThingDef> PawnDefs = DefDatabase<ThingDef>.AllDefs.Where(x => x.race != null && !x.race.IsMechanoid);
if (PawnDefs.EnumerableNullOrEmpty())
return;
CompProperties comp = new CompProperties(typeof(SexHistoryComp));
CompProperties compProperties = new CompProperties(typeof(SexHistoryComp));
foreach (ThingDef def in PawnDefs)
def.comps.Add(comp);
def.comps.Add(compProperties);
LogManager.GetLogger<DebugLogProvider>("StaticConstructorOnStartup").Message($"Injected SexHistoryComp into {PawnDefs.Count()} pawn Defs");
}

View File

@ -5,12 +5,13 @@ using RJWSexperience.Cum;
using RJWSexperience.Logs;
using RJWSexperience.SexHistory;
using System;
using System.Collections.Generic;
using UnityEngine;
using Verse;
namespace RJWSexperience
{
[HarmonyPatch(typeof(JobDriver_Sex), "Orgasm")]
[HarmonyPatch(typeof(JobDriver_Sex), "Orgasm")] // Despite the name, called every tick
public static class RJW_Patch_Orgasm
{
public static void Postfix(JobDriver_Sex __instance)
@ -19,17 +20,17 @@ namespace RJWSexperience
{
if (__instance.Sexprops.isRape && __instance.Sexprops.isReceiver)
{
__instance.pawn?.skills?.Learn(VariousDefOf.Sex, 0.05f, true);
__instance.pawn?.skills?.Learn(RsDefOf.Skill.Sex, 0.05f, true);
}
else
{
__instance.pawn?.skills?.Learn(VariousDefOf.Sex, 0.35f, true);
__instance.pawn?.skills?.Learn(RsDefOf.Skill.Sex, 0.35f, true);
}
}
}
}
[HarmonyPatch(typeof(SexUtility), nameof(SexUtility.SatisfyPersonal))]
[HarmonyPatch(typeof(SexUtility), nameof(SexUtility.SatisfyPersonal))] // Actual on orgasm method
public static class RJW_Patch_SatisfyPersonal
{
private const float base_sat_per_fuck = 0.4f;
@ -43,9 +44,9 @@ namespace RJWSexperience
{
LustUtility.UpdateLust(props, satisfaction, base_sat_per_fuck);
CumUtility.FillCumBuckets(props);
props.pawn.records?.Increment(VariousDefOf.OrgasmCount);
if (SexperienceMod.Settings.History.EnableSexHistory && props.partner != null)
props.pawn.TryGetComp<SexHistoryComp>()?.RecordSatisfaction(props.partner, props, satisfaction);
props.pawn.records?.Increment(RsDefOf.Record.OrgasmCount);
if (SexperienceMod.Settings.EnableSexHistory && props.hasPartner())
props.pawn.TryGetComp<SexHistoryComp>()?.RecordOrgasm(props.partner, props, satisfaction);
}
}
@ -63,7 +64,7 @@ namespace RJWSexperience
{
public static void Postfix(Pawn pawn)
{
SkillRecord sexskill = pawn.skills.GetSkill(VariousDefOf.Sex);
SkillRecord sexskill = pawn.skills.GetSkill(RsDefOf.Skill.Sex);
if (sexskill != null)
{
sexskill.passion = Passion.Major;
@ -80,7 +81,7 @@ namespace RJWSexperience
{
RJWUtility.UpdateSextypeRecords(props);
if (!SexperienceMod.Settings.History.EnableSexHistory || props.partner == null)
if (!SexperienceMod.Settings.EnableSexHistory || !props.hasPartner())
return;
props.pawn.TryGetComp<SexHistoryComp>()?.RecordSex(props.partner, props);
@ -93,10 +94,43 @@ namespace RJWSexperience
{
public static void Postfix(JobDriver_SexBaseInitiator __instance)
{
if (__instance.Partner != null)
if (__instance.Sexprops.hasPartner())
{
__instance.pawn.PoptheCherry(__instance.Partner, __instance.Sexprops);
__instance.Partner.PoptheCherry(__instance.pawn, __instance.Sexprops);
// 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);
}
}
}
}
}
@ -107,13 +141,11 @@ namespace RJWSexperience
/// <summary>
/// If masturbation and current map has a bucket, return location near the bucket
/// </summary>
/// <param name="pawn"></param>
/// <param name="partner"></param>
/// <param name="__result"></param>
/// <returns></returns>
/// <param name="__result">The place to stand near a bucket</param>
/// <returns>Run original method</returns>
public static bool Prefix(Pawn pawn, Pawn partner, ref IntVec3 __result)
{
if (partner != null)
if (partner != null && partner != pawn)
return true; // Not masturbation
var log = LogManager.GetLogger<DebugLogProvider>("RJW_Patch_CasualSex_Helper_FindSexLocation");
@ -129,13 +161,51 @@ namespace RJWSexperience
if (bucket == null)
{
log.Message("Bucket not found");
log.Message("404 Bucket not found");
return true;
}
__result = bucket.RandomAdjacentCell8Way();
log.Message($"Bucket location: {__result}");
return false;
Room bucketRoom = bucket.GetRoom();
List<IntVec3> cellsAroundBucket = GenAdjFast.AdjacentCells8Way(bucket.Position);
IntVec3 doorNearBucket = IntVec3.Invalid;
foreach (IntVec3 cell in cellsAroundBucket.InRandomOrder())
{
if (!cell.Standable(bucket.Map))
{
log.Message($"Discarded {cell}: not standable");
continue;
}
if (cell.GetRoom(bucket.Map) != bucketRoom)
{
if (cell.GetDoor(bucket.Map) != null)
{
doorNearBucket = cell;
}
else
{
log.Message($"Discarded {cell}: different room");
}
continue;
}
__result = cell;
log.Message($"Masturbate at location: {__result}");
return false;
}
if (doorNearBucket != IntVec3.Invalid)
{
__result = doorNearBucket;
log.Message($"No proper place found, go jack off in the doorway: {__result}");
return false;
}
log.Message($"Failed to find situable location near the bucket at {bucket.Position}");
return true;
}
}

View File

@ -9,14 +9,14 @@ namespace RJWSexperience
[HarmonyPatch(typeof(PawnGenerator), "GeneratePawn", new Type[] { typeof(PawnGenerationRequest) })]
public static class Rimworld_Patch_GeneratePawn
{
public static void Postfix(PawnGenerationRequest request, ref Pawn __result)
public static void Postfix(ref Pawn __result)
{
if (__result == null)
return;
bool doVirginTrait = true;
if (SexperienceMod.Settings.History.EnableRecordRandomizer && !request.Newborn && xxx.is_human(__result))
if (SexperienceMod.Settings.EnableRecordRandomizer && __result.DevelopmentalStage != DevelopmentalStage.Newborn && xxx.is_human(__result))
doVirginTrait = SexHistory.RecordRandomizer.Randomize(__result);
if (doVirginTrait)
@ -32,11 +32,11 @@ namespace RJWSexperience
if (!pawn.relations.DirectRelationExists(PawnRelationDefOf.Parent, newMother))
return;
Trait virgin = newMother.story?.traits?.GetTrait(VariousDefOf.Virgin, Virginity.TraitDegree.FemaleVirgin);
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(VariousDefOf.Virgin, Virginity.TraitDegree.FemaleAfterSurgery));
newMother.story.traits.GainTrait(new Trait(RsDefOf.Trait.Virgin, Virginity.TraitDegree.FemaleAfterSurgery));
}
}
}

View File

@ -0,0 +1,31 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<ProjectGuid>{9C728E06-573B-4B04-A07F-ACBF60CB424D}</ProjectGuid>
<TargetFramework>net472</TargetFramework>
<RootNamespace>RJWSexperience</RootNamespace>
<AssemblyName>RJWSexperience</AssemblyName>
<OutputPath>..\..\1.4\Assemblies\</OutputPath>
<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>
</ItemGroup>
</Project>

View File

@ -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,10 +12,12 @@ 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>
[System.Diagnostics.CodeAnalysis.SuppressMessage("Redundancy", "RCS1163:Unused parameter.", Justification = "All parameters are needed for the ideology patch")]
[System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0060:Remove unused parameter", Justification = "All parameters are needed for the ideology patch")]
public static void ThrowVirginHistoryEvent(Pawn exVirgin, Pawn partner, SexProps props, int degree)
{
//for non-ideo
@ -57,52 +60,52 @@ namespace RJWSexperience
{
case xxx.rjwSextype.Vaginal:
case xxx.rjwSextype.Scissoring:
IncreaseSameRecords(pawn, partner, VariousDefOf.VaginalSexCount);
IncreaseSameRecords(pawn, partner, RsDefOf.Record.VaginalSexCount);
break;
case xxx.rjwSextype.Anal:
IncreaseSameRecords(pawn, partner, VariousDefOf.AnalSexCount);
IncreaseSameRecords(pawn, partner, RsDefOf.Record.AnalSexCount);
break;
case xxx.rjwSextype.Oral:
case xxx.rjwSextype.Fellatio:
if (Genital_Helper.has_penis_fertile(giver) || Genital_Helper.has_penis_infertile(giver))
{
IncreaseRecords(giver, receiver, VariousDefOf.OralSexCount, VariousDefOf.BlowjobCount);
IncreaseRecords(giver, receiver, RsDefOf.Record.OralSexCount, RsDefOf.Record.BlowjobCount);
}
else if (Genital_Helper.has_penis_fertile(receiver) || Genital_Helper.has_penis_infertile(receiver))
{
IncreaseRecords(giver, receiver, VariousDefOf.BlowjobCount, VariousDefOf.OralSexCount);
IncreaseRecords(giver, receiver, RsDefOf.Record.BlowjobCount, RsDefOf.Record.OralSexCount);
}
break;
case xxx.rjwSextype.Sixtynine:
IncreaseSameRecords(pawn, partner, VariousDefOf.OralSexCount);
IncreaseSameRecords(pawn, partner, RsDefOf.Record.OralSexCount);
RecordDef recordpawn, recordpartner;
if (Genital_Helper.has_penis_fertile(pawn) || Genital_Helper.has_penis_infertile(pawn))
{
recordpartner = VariousDefOf.BlowjobCount;
recordpartner = RsDefOf.Record.BlowjobCount;
}
else
{
recordpartner = VariousDefOf.CunnilingusCount;
recordpartner = RsDefOf.Record.CunnilingusCount;
}
if (Genital_Helper.has_penis_fertile(partner) || Genital_Helper.has_penis_infertile(partner))
{
recordpawn = VariousDefOf.BlowjobCount;
recordpawn = RsDefOf.Record.BlowjobCount;
}
else
{
recordpawn = VariousDefOf.CunnilingusCount;
recordpawn = RsDefOf.Record.CunnilingusCount;
}
IncreaseRecords(pawn, partner, recordpawn, recordpartner);
break;
case xxx.rjwSextype.Cunnilingus:
if (Genital_Helper.has_vagina(giver))
{
IncreaseRecords(giver, receiver, VariousDefOf.OralSexCount, VariousDefOf.CunnilingusCount);
IncreaseRecords(giver, receiver, RsDefOf.Record.OralSexCount, RsDefOf.Record.CunnilingusCount);
}
else if (Genital_Helper.has_vagina(receiver))
{
IncreaseRecords(giver, receiver, VariousDefOf.CunnilingusCount, VariousDefOf.OralSexCount);
IncreaseRecords(giver, receiver, RsDefOf.Record.CunnilingusCount, RsDefOf.Record.OralSexCount);
}
break;
case xxx.rjwSextype.Masturbation:
@ -110,29 +113,29 @@ namespace RJWSexperience
case xxx.rjwSextype.Handjob:
if (Genital_Helper.has_penis_fertile(giver) || Genital_Helper.has_penis_infertile(giver))
{
IncreaseRecords(giver, receiver, VariousDefOf.GenitalCaressCount, VariousDefOf.HandjobCount);
IncreaseRecords(giver, receiver, RsDefOf.Record.GenitalCaressCount, RsDefOf.Record.HandjobCount);
}
else
{
IncreaseRecords(giver, receiver, VariousDefOf.HandjobCount, VariousDefOf.GenitalCaressCount);
IncreaseRecords(giver, receiver, RsDefOf.Record.HandjobCount, RsDefOf.Record.GenitalCaressCount);
}
break;
case xxx.rjwSextype.Fingering:
case xxx.rjwSextype.Fisting:
if (Genital_Helper.has_vagina(giver))
{
IncreaseRecords(giver, receiver, VariousDefOf.GenitalCaressCount, VariousDefOf.FingeringCount);
IncreaseRecords(giver, receiver, RsDefOf.Record.GenitalCaressCount, RsDefOf.Record.FingeringCount);
}
else
{
IncreaseRecords(giver, receiver, VariousDefOf.FingeringCount, VariousDefOf.GenitalCaressCount);
IncreaseRecords(giver, receiver, RsDefOf.Record.FingeringCount, RsDefOf.Record.GenitalCaressCount);
}
break;
case xxx.rjwSextype.Footjob:
IncreaseSameRecords(pawn, partner, VariousDefOf.FootjobCount);
IncreaseSameRecords(pawn, partner, RsDefOf.Record.FootjobCount);
break;
default:
IncreaseSameRecords(pawn, partner, VariousDefOf.MiscSexualBehaviorCount);
IncreaseSameRecords(pawn, partner, RsDefOf.Record.MiscSexualBehaviorCount);
break;
}
}
@ -153,22 +156,29 @@ namespace RJWSexperience
// Moved this method back because of Menstruation
public static Building_CumBucket FindClosestBucket(this Pawn pawn)
{
List<Building> buckets = pawn.Map.listerBuildings.allBuildingsColonist.FindAll(x => x is Building_CumBucket bucket && bucket.StoredStackCount < VariousDefOf.GatheredCum.stackLimit);
if (buckets.NullOrEmpty())
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");
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;
}
}

View File

@ -0,0 +1,78 @@
using RimWorld;
using Verse;
namespace RJWSexperience
{
public static class RsDefOf
{
[DefOf]
public static class Record
{
public static readonly RecordDef NumofEatenCum;
public static readonly RecordDef AmountofEatenCum;
public static readonly RecordDef Lust;
public static readonly RecordDef VaginalSexCount;
public static readonly RecordDef AnalSexCount;
public static readonly RecordDef OralSexCount;
public static readonly RecordDef BlowjobCount;
public static readonly RecordDef CunnilingusCount;
public static readonly RecordDef GenitalCaressCount;
public static readonly RecordDef HandjobCount;
public static readonly RecordDef FingeringCount;
public static readonly RecordDef FootjobCount;
public static readonly RecordDef MiscSexualBehaviorCount;
public static readonly RecordDef SexPartnerCount;
public static readonly RecordDef OrgasmCount;
}
[DefOf]
public static class Skill
{
public static readonly SkillDef Sex;
}
[DefOf]
public static class Thing
{
public static readonly ThingDef GatheredCum;
public static readonly ThingDef FilthCum;
}
[DefOf]
public static class Chemical
{
public static readonly ChemicalDef Cum;
}
[DefOf]
public static class Need
{
public static readonly NeedDef Chemical_Cum;
}
[DefOf]
public static class Trait
{
public static readonly TraitDef Virgin;
}
[DefOf]
public static class KeyBinding
{
public static readonly KeyBindingDef OpenSexStatistics;
}
[DefOf]
public static class Stat
{
public static readonly StatDef SexAbility;
}
[DefOf]
public static class Hediff
{
public static readonly HediffDef CumAddiction;
public static readonly HediffDef CumTolerance;
}
}
}

View File

@ -1,6 +1,6 @@
namespace RJWSexperience.Settings
{
internal interface IResettable
public interface IResettable
{
void Reset();
}

View File

@ -0,0 +1,7 @@
namespace RJWSexperience.Settings
{
public interface ISettingHandle : IResettable
{
void Scribe();
}
}

View File

@ -0,0 +1,35 @@
using Verse;
namespace RJWSexperience.Settings
{
public class SettingHandle<T> : ISettingHandle
{
public T Value { get; set; }
public readonly string XmlLabel;
public readonly T DefaultValue;
public SettingHandle(string xmlLabel, T defaultValue)
{
XmlLabel = xmlLabel;
DefaultValue = defaultValue;
Value = defaultValue;
}
public void Reset()
{
Value = DefaultValue;
}
public void Scribe()
{
T value = Value;
Scribe_Values.Look(ref value, XmlLabel, DefaultValue);
Value = value;
}
public static implicit operator T(SettingHandle<T> settingHandle)
{
return settingHandle.Value;
}
}
}

View File

@ -0,0 +1,40 @@
using System.Collections.Generic;
using Verse;
namespace RJWSexperience.Settings
{
public class SettingsContainer : IExposable
{
public List<ISettingHandle> Handles { get; }
public SettingsContainer(List<ISettingHandle> handles)
{
Handles = handles;
}
public void ExposeData()
{
foreach (ISettingHandle setting in Handles)
{
setting.Scribe();
}
}
public static SettingsContainer CreateHistoryContainer(Configurations settings) => new SettingsContainer(new List<ISettingHandle> {
settings.EnableRecordRandomizer,
settings.MaxLustDeviation,
settings.AvgLust,
settings.MaxSexCountDeviation,
settings.SexPerYear,
settings.MinSexableFromLifestage,
settings.MinSexablePercent,
settings.VirginRatio,
settings.SlavesBeenRapedExp,
settings.EnableSexHistory,
settings.HideGizmoWhenDrafted,
settings.VirginityCheck_M2M_Anal,
settings.VirginityCheck_F2F_Scissoring
}
);
}
}

View File

@ -0,0 +1,30 @@
using System.Collections.Generic;
using UnityEngine;
namespace RJWSexperience.Settings
{
public abstract class SettingsTab : ITab, IResettable
{
protected readonly List<ISettingHandle> tabSettings;
protected readonly Configurations settings;
public string Label { get; protected set; }
protected SettingsTab(Configurations settings, string label, List<ISettingHandle> tabSettings)
{
this.settings = settings;
Label = label;
this.tabSettings = tabSettings;
}
public void Reset()
{
foreach (ISettingHandle setting in tabSettings)
{
setting.Reset();
}
}
public abstract void DoTabContents(Rect inRect);
}
}

View File

@ -0,0 +1,24 @@
using System.Collections.Generic;
using UnityEngine;
using Verse;
namespace RJWSexperience.Settings
{
public class SettingsTabDebug : SettingsTab
{
public SettingsTabDebug(Configurations settings) : base(settings, Keyed.TabLabelDebug, new List<ISettingHandle> { settings.DevMode }) { }
public override void DoTabContents(Rect inRect)
{
Listing_Standard listmain = new Listing_Standard();
listmain.Begin(inRect);
listmain.CheckboxLabeled(Keyed.Option_Debug_Label, settings.DevMode, Keyed.Option_Debug_Desc);
if (listmain.ButtonText(Keyed.Button_ResetToDefault))
{
Reset();
}
listmain.End();
}
}
}

View File

@ -0,0 +1,79 @@
using RimWorld;
using System.Collections.Generic;
using UnityEngine;
using Verse;
namespace RJWSexperience.Settings
{
public class SettingsTabHistory : SettingsTab
{
public SettingsTabHistory(Configurations settings) : base(
settings,
Keyed.TabLabelHistory,
new List<ISettingHandle> {
settings.EnableRecordRandomizer,
settings.MaxLustDeviation,
settings.AvgLust,
settings.MaxSexCountDeviation,
settings.SexPerYear,
settings.MinSexableFromLifestage,
settings.MinSexablePercent,
settings.VirginRatio,
settings.SlavesBeenRapedExp,
settings.EnableSexHistory,
settings.HideGizmoWhenDrafted,
settings.VirginityCheck_M2M_Anal,
settings.VirginityCheck_F2F_Scissoring
}
) { }
public override void DoTabContents(Rect inRect)
{
const float lineHeight = SettingsWidgets.lineHeight;
Listing_Standard listmain = new Listing_Standard();
listmain.Begin(inRect);
listmain.CheckboxLabeled(Keyed.Option_1_Label, settings.EnableRecordRandomizer, Keyed.Option_1_Desc);
if (settings.EnableRecordRandomizer)
{
float sectionHeight = 12f;
if (!settings.MinSexableFromLifestage)
sectionHeight += 2f;
Listing_Standard section = listmain.BeginSection(lineHeight * sectionHeight);
section.SliderOption(Keyed.Option_3_Label + " {0}", Keyed.Option_3_Desc, settings.MaxLustDeviation, new FloatRange(0f, 1000f), 1f);
section.SliderOption(Keyed.Option_4_Label + " {0}", Keyed.Option_4_Desc, settings.AvgLust, new FloatRange(-200f, 200f), 1f);
section.SliderOption(Keyed.Option_5_Label + " {0}", Keyed.Option_5_Desc, settings.MaxSexCountDeviation, new FloatRange(0f, 1000f), 1f);
section.SliderOption(Keyed.Option_6_Label + " {0}", Keyed.Option_6_Desc, settings.SexPerYear, new FloatRange(0f, 2000f), 1f);
section.CheckboxLabeled(Keyed.Option_MinSexableFromLifestage_Label, settings.MinSexableFromLifestage, Keyed.Option_MinSexableFromLifestage_Desc);
if (!settings.MinSexableFromLifestage)
section.SliderOption($"{Keyed.Option_9_Label} {{0:P1}} {ThingDefOf.Human.race.lifeExpectancy * settings.MinSexablePercent} human years", Keyed.Option_9_Desc, settings.MinSexablePercent, FloatRange.ZeroToOne, 0.001f);
section.SliderOption(Keyed.Option_10_Label + " {0:P1}", Keyed.Option_10_Desc, settings.VirginRatio, FloatRange.ZeroToOne, 0.001f);
section.CheckboxLabeled(Keyed.Option_7_Label, settings.SlavesBeenRapedExp, Keyed.Option_7_Desc);
listmain.EndSection(section);
}
listmain.CheckboxLabeled(Keyed.Option_EnableSexHistory_Label, settings.EnableSexHistory, Keyed.Option_EnableSexHistory_Desc);
if (settings.EnableSexHistory)
{
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))
{
Reset();
}
listmain.End();
}
}
}

Some files were not shown because too many files have changed in this diff Show More