diff --git a/1.3/Assemblies/RJWSexperience.dll b/1.3/Assemblies/RJWSexperience.dll new file mode 100644 index 0000000..d07dbbe Binary files /dev/null and b/1.3/Assemblies/RJWSexperience.dll differ diff --git a/Defs/KeyBindings/KeyBindings_Sexperience.xml b/1.3/Defs/KeyBindings/KeyBindings_Sexperience.xml similarity index 100% rename from Defs/KeyBindings/KeyBindings_Sexperience.xml rename to 1.3/Defs/KeyBindings/KeyBindings_Sexperience.xml diff --git a/Defs/PawnRelationDefs/PawnRelations_Bastard.xml b/1.3/Defs/PawnRelationDefs/PawnRelations_Bastard.xml similarity index 100% rename from Defs/PawnRelationDefs/PawnRelations_Bastard.xml rename to 1.3/Defs/PawnRelationDefs/PawnRelations_Bastard.xml diff --git a/Defs/Recipe_Surgery/Recipes_Surgery_Hymen.xml b/1.3/Defs/Recipe_Surgery/Recipes_Surgery_Hymen.xml similarity index 100% rename from Defs/Recipe_Surgery/Recipes_Surgery_Hymen.xml rename to 1.3/Defs/Recipe_Surgery/Recipes_Surgery_Hymen.xml diff --git a/Defs/RecordDefs/Records_Sexperiences.xml b/1.3/Defs/RecordDefs/Records_Sexperiences.xml similarity index 100% rename from Defs/RecordDefs/Records_Sexperiences.xml rename to 1.3/Defs/RecordDefs/Records_Sexperiences.xml diff --git a/Defs/RecordDefs/Records_Sextypes.xml b/1.3/Defs/RecordDefs/Records_Sextypes.xml similarity index 100% rename from Defs/RecordDefs/Records_Sextypes.xml rename to 1.3/Defs/RecordDefs/Records_Sextypes.xml diff --git a/Defs/RulePackDefs/RulePacks_VSIE.xml b/1.3/Defs/RulePackDefs/RulePacks_VSIE.xml similarity index 100% rename from Defs/RulePackDefs/RulePacks_VSIE.xml rename to 1.3/Defs/RulePackDefs/RulePacks_VSIE.xml diff --git a/Defs/SkillDefs/SexSkills.xml b/1.3/Defs/SkillDefs/SexSkills.xml similarity index 100% rename from Defs/SkillDefs/SexSkills.xml rename to 1.3/Defs/SkillDefs/SexSkills.xml diff --git a/Defs/StatDefs/SexAbility.xml b/1.3/Defs/StatDefs/SexAbility.xml similarity index 100% rename from Defs/StatDefs/SexAbility.xml rename to 1.3/Defs/StatDefs/SexAbility.xml diff --git a/Defs/ThingDefs/Buildings_Cum.xml b/1.3/Defs/ThingDefs/Buildings_Cum.xml similarity index 100% rename from Defs/ThingDefs/Buildings_Cum.xml rename to 1.3/Defs/ThingDefs/Buildings_Cum.xml diff --git a/Defs/ThingDefs/Items_Resource_Cum.xml b/1.3/Defs/ThingDefs/Items_Resource_Cum.xml similarity index 100% rename from Defs/ThingDefs/Items_Resource_Cum.xml rename to 1.3/Defs/ThingDefs/Items_Resource_Cum.xml diff --git a/Defs/ThoughtDefs/Thoughts_ate.xml b/1.3/Defs/ThoughtDefs/Thoughts_ate.xml similarity index 100% rename from Defs/ThoughtDefs/Thoughts_ate.xml rename to 1.3/Defs/ThoughtDefs/Thoughts_ate.xml diff --git a/Defs/TraitDefs/Traits_sex.xml b/1.3/Defs/TraitDefs/Traits_sex.xml similarity index 100% rename from Defs/TraitDefs/Traits_sex.xml rename to 1.3/Defs/TraitDefs/Traits_sex.xml diff --git a/Patches/RJW_StatDefs.xml b/1.3/Patches/RJW_StatDefs.xml similarity index 100% rename from Patches/RJW_StatDefs.xml rename to 1.3/Patches/RJW_StatDefs.xml diff --git a/Patches/RJW_ThingDefs.xml b/1.3/Patches/RJW_ThingDefs.xml similarity index 100% rename from Patches/RJW_ThingDefs.xml rename to 1.3/Patches/RJW_ThingDefs.xml diff --git a/1.4/Assemblies/RJWSexperience.dll b/1.4/Assemblies/RJWSexperience.dll new file mode 100644 index 0000000..d07dbbe Binary files /dev/null and b/1.4/Assemblies/RJWSexperience.dll differ diff --git a/1.4/Defs/KeyBindings/KeyBindings_Sexperience.xml b/1.4/Defs/KeyBindings/KeyBindings_Sexperience.xml new file mode 100644 index 0000000..977f08a --- /dev/null +++ b/1.4/Defs/KeyBindings/KeyBindings_Sexperience.xml @@ -0,0 +1,8 @@ + + + + + OpenSexStatistics + + + diff --git a/1.4/Defs/PawnRelationDefs/PawnRelations_Bastard.xml b/1.4/Defs/PawnRelationDefs/PawnRelations_Bastard.xml new file mode 100644 index 0000000..6c99329 --- /dev/null +++ b/1.4/Defs/PawnRelationDefs/PawnRelations_Bastard.xml @@ -0,0 +1,16 @@ + + + + + RJWSexperience.PawnRelationWorker_Bastard + Bastard + + bastard + 185 + -10 + 0.0 + true + true + + + diff --git a/1.4/Defs/Recipe_Surgery/Recipes_Surgery_Hymen.xml b/1.4/Defs/Recipe_Surgery/Recipes_Surgery_Hymen.xml new file mode 100644 index 0000000..0d3d68b --- /dev/null +++ b/1.4/Defs/Recipe_Surgery/Recipes_Surgery_Hymen.xml @@ -0,0 +1,36 @@ + + + + Surgery_RestoreHymen + + Disguises as virgin. + RJWSexperience.Virginity.Recipe_HymenSurgery + restoring hymen + Surgery + Recipe_Surgery + MedicalOperationSpeed + Medicine + 0.2 + 400 + false + +
  • Human
    • +     + 100 + +
  • + + +
  • Medicine
    • + + + 1 + +     + + +
  • Medicine
    • +     +     +     +     diff --git a/1.4/Defs/RecordDefs/Records_Sexperiences.xml b/1.4/Defs/RecordDefs/Records_Sexperiences.xml new file mode 100644 index 0000000..731d4a9 --- /dev/null +++ b/1.4/Defs/RecordDefs/Records_Sexperiences.xml @@ -0,0 +1,26 @@ + + + + + NumofEatenCum + + The number of times that i swallowed cum. + Int + + + + AmountofEatenCum + + The amount of cum that i swallowed. + Int + + + + Lust + + How lustful i am. + Float + + + + diff --git a/1.4/Defs/RecordDefs/Records_Sextypes.xml b/1.4/Defs/RecordDefs/Records_Sextypes.xml new file mode 100644 index 0000000..2e98b49 --- /dev/null +++ b/1.4/Defs/RecordDefs/Records_Sextypes.xml @@ -0,0 +1,87 @@ + + + + + VaginalSexCount + + The number of times of vaginal sex. + Int + + + + AnalSexCount + + The number of times of anal sex. + Int + + + + OralSexCount + + The number of times of received oral sex. + Int + + + + BlowjobCount + + The number of times of blowjob. + Int + + + + CunnilingusCount + + The number of times of cunnilingus. + Int + + + + GenitalCaressCount + + The number of times of handjob/fingering. + Int + + + + HandjobCount + + The number of times of handjob. + Int + + + + FingeringCount + + The number of times of fingering. + Int + + + + FootjobCount + + The number of times of footjob. + Int + + + + MiscSexualBehaviorCount + + The number of times of something sexual. + Int + + + + OrgasmCount + + The number of times of orgasm. + Int + + + + SexPartnerCount + + The number of sex partners. + Int + + diff --git a/1.4/Defs/RulePackDefs/RulePacks_VSIE.xml b/1.4/Defs/RulePackDefs/RulePacks_VSIE.xml new file mode 100644 index 0000000..3ec83d2 --- /dev/null +++ b/1.4/Defs/RulePackDefs/RulePacks_VSIE.xml @@ -0,0 +1,31 @@ + + + + + VSIE_Teaching_Sex + + +
  • SexTopic->Words/TeachingWords/SexSkill
    • +     + +
  • r_logentry->[INITIATOR_nameDef] and [RECIPIENT_nameDef] [talkedabout] [SexTopic].
    • +
  • r_logentry->[INITIATOR_nameDef] [talkedabout] [SexTopic] with [RECIPIENT_nameDef].
    • +
  • r_logentry(p=0.8)->[INITIATOR_nameDef] [commentedabout] [SexTopic] to [RECIPIENT_nameDef].
    • + +
  • talkedabout(p=4)->chatted about
    • +
  • talkedabout->shared a word about
    • +
  • talkedabout->spoke about
    • +
  • talkedabout->gabbed about
    • +
  • talkedabout->talked about
    • +
  • talkedabout->joked about
    • +
  • talkedabout->quipped about
    • + +
  • commentedabout->said something about
    • +
  • commentedabout->said a word about
    • +
  • commentedabout->made a comment about
    • +
  • commentedabout->commented about
    • +
  • commentedabout->told a joke about
    • +     +     +     +     \ No newline at end of file diff --git a/1.4/Defs/SkillDefs/SexSkills.xml b/1.4/Defs/SkillDefs/SexSkills.xml new file mode 100644 index 0000000..d0669a1 --- /dev/null +++ b/1.4/Defs/SkillDefs/SexSkills.xml @@ -0,0 +1,10 @@ + + + + Sex + Sex skill. + sex + 5 + + + \ No newline at end of file diff --git a/1.4/Defs/StatDefs/SexAbility.xml b/1.4/Defs/StatDefs/SexAbility.xml new file mode 100644 index 0000000..dc0c906 --- /dev/null +++ b/1.4/Defs/StatDefs/SexAbility.xml @@ -0,0 +1,42 @@ + + + + + SexAbility + + Measures whether or not a pawn is capable of sex, and how good they are at it + PawnSocial + 1.0 + 0.0 + PercentTwo + + +
  • + Sex + 0.40 + 0.15 +
    • +     + +
  • + 0.9 + 0.8 +
    • +
  • + 0.9 + 0.7 + 0.5 +
    • +     +     +     \ No newline at end of file diff --git a/1.4/Defs/ThingDefs/Buildings_Cum.xml b/1.4/Defs/ThingDefs/Buildings_Cum.xml new file mode 100644 index 0000000..b79b5b6 --- /dev/null +++ b/1.4/Defs/ThingDefs/Buildings_Cum.xml @@ -0,0 +1,61 @@ + + + + + CumBucket + + A bucket for collecting cums. + RJWSexperience.Building_CumBucket + + Things/Item/CumBucket + Graphic_Multi + (1,1) + + Building + PassThroughOnly + 0.4 + true + 50 + false + +
  • Metallic
    • +
  • Woody
    • +
  • Stony
    • +     + 10 + + 50 + 8 + 200 + 1.0 + -5 + + (1,1) + + true + true + + + true + +
  • GatheredCum
    • +     +     +     + + Low + + +
  • GatheredCum
    • +     +     +     +     + +
  • ITab_Storage
    • +     + Item + false +     + +     diff --git a/1.4/Defs/ThingDefs/Items_Resource_Cum.xml b/1.4/Defs/ThingDefs/Items_Resource_Cum.xml new file mode 100644 index 0000000..09f0495 --- /dev/null +++ b/1.4/Defs/ThingDefs/Items_Resource_Cum.xml @@ -0,0 +1,158 @@ + + + + GatheredCum + + Gathered cum. + +
  • AnimalProductRaw
    • +     + + Things/Item/GatheredCum + 1 + Graphic_StackCount + + true + + 0.1 + 0.1 + 0.01 + -5 + -1 + 0.00 + 60 + 0.1 + + + Fluid, AnimalProduct + DesperateOnlyForHumanlikes + Any + AteCum + AteCum + -10 + -10 + +
  • + CumTolerance + 0.032 + true +
    • +
  • + 0.05 +
    • +
  • + + + + +
  • GatheredCum
    • + + + +
  • + Cum + 0.050 + 0.8 + 0.1 + 1 + 30 +
    • +     +     + + + + Cum + + CumAddiction + CumTolerance + false + + + + Chemical_Cum + Need_Chemical + + Addicted to cum. + 10 + + + + CumTolerance + + More likely to get addicted to cum. + false + +
  • + -0.020 +
    • +     +     + + + CumAddiction + Hediff_Addiction + + cum addiction. + Chemical_Cum + +
  • + -0.1 + true +
    • +     + +
  • + + 0.25 + 0.25 + 0.5 + +
    • +
  • + + + 0.25 + 1.0 + +
    • +     +     + + + CumWithdrawal + ThoughtWorker_Hediff + CumAddiction + true + +
  • + false +
    • +
  • + + I need it. + -5 +
    • +     +     + + + AllowWithCum + + Allow food that was spiced up by adding sexual fluids. + Foods + true + allowWithCum + RJWSexperience.Cum.FilterWorkers.SpecialThingFilterWorker_Cum + + + + AllowWithoutCum + + Allow food normal food. + Foods + true + allowWithoutCum + RJWSexperience.Cum.FilterWorkers.SpecialThingFilterWorker_NoCum + +     \ No newline at end of file diff --git a/1.4/Defs/ThoughtDefs/Thoughts_ate.xml b/1.4/Defs/ThoughtDefs/Thoughts_ate.xml new file mode 100644 index 0000000..0bbeb15 --- /dev/null +++ b/1.4/Defs/ThoughtDefs/Thoughts_ate.xml @@ -0,0 +1,44 @@ + + + + + AteCum + 0.5 + 1 + 0.4 + RJWSexperience.Thought_AteCum + +
  • + + Disgusting. + -5 +
    • +
  • + + Tastes bad and stinky. + -2 +
    • +
  • + + Tastes bad. But i liked it. + 1 +
    • +
  • + + Delicious. + 3 +
    • +     + +
  • + NumofEatenCum + +
  • 0
    • +
  • 10
    • +
  • 60
    • +
  • 120
    • + + +     +     +     diff --git a/1.4/Defs/TraitDefs/Traits_sex.xml b/1.4/Defs/TraitDefs/Traits_sex.xml new file mode 100644 index 0000000..08a85b5 --- /dev/null +++ b/1.4/Defs/TraitDefs/Traits_sex.xml @@ -0,0 +1,75 @@ + + + + + Virgin + 0.0 + 0.0 + +
  • + + BUGGED! MALE CANNOT HAS THIS TRAIT + [PAWN_nameDef] never experienced. However, her hymen had damaged for some reason. + -1 + 0.05 + + -0.2 + + +
  • + Sex + -4 +
    • + + +
  • + + [PAWN_nameDef] never experienced. + 0 + + 0.2 + + +
  • + Sex + -4 +
    • + + +
  • + + BUGGED! MALE CANNOT HAS THIS TRAIT + [PAWN_nameDef] looks experienced. But the hymen is still threre. + 0.10 + 1 +
    • +
  • + + BUGGED! MALE CANNOT HAS THIS TRAIT + [PAWN_nameDef] never experienced. + 2 + + -0.2 + + +
  • + Sex + -4 +
    • + + 0.20 + +     + + +
  • + +
  • -1, 10
    • +
  • 0, 0
    • +
  • 1, 10
    • +
  • 2, 10
    • + + +     +     +     \ No newline at end of file diff --git a/1.4/Patches/RJW_StatDefs.xml b/1.4/Patches/RJW_StatDefs.xml new file mode 100644 index 0000000..52b44de --- /dev/null +++ b/1.4/Patches/RJW_StatDefs.xml @@ -0,0 +1,19 @@ + + + + + Defs/StatDef[defName="SexFrequency"]/parts + +
  • + + + + + Defs/StatDef[defName="Vulnerability"]/parts + +
  • + 3.0 +
    • +     +     +     \ No newline at end of file diff --git a/1.4/Patches/RJW_ThingDefs.xml b/1.4/Patches/RJW_ThingDefs.xml new file mode 100644 index 0000000..78feb4a --- /dev/null +++ b/1.4/Patches/RJW_ThingDefs.xml @@ -0,0 +1,75 @@ + + + + + + Defs/ThingDef[defName="UsedCondom"]/ingestible/outcomeDoers + + Defs/ThingDef[defName="UsedCondom"]/ingestible + + +
  • + CumTolerance + 0.032 + true +
    • +
  • + 0.05 +
    • +
  • + 5.2 +
    • +     +     +     + + Defs/ThingDef[defName="UsedCondom"]/ingestible/outcomeDoers + +
  • + CumTolerance + 0.032 + true +
    • +
  • + 0.05 +
    • +
  • + 5.2 +
    • +     +     +     + + + Defs/ThingDef[defName="UsedCondom"]/comps + + Defs/ThingDef[defName="UsedCondom"] + + +
  • + Cum + 0.050 + 0.8 + 0.1 + 1 + 30 +
    • +     +     +     + + Defs/ThingDef[defName="UsedCondom"]/comps + +
  • + Cum + 0.050 + 0.8 + 0.1 + 1 + 30 +
    • +     +     +     + +     \ No newline at end of file diff --git a/About/About.xml b/About/About.xml index 84cd010..c42ffa6 100644 --- a/About/About.xml +++ b/About/About.xml @@ -4,6 +4,7 @@ amevarashi
  • 1.3
    • +
  • 1.4
    •
  • diff --git a/About/Manifest.xml b/About/Manifest.xml index abb28e8..fae56f8 100644 --- a/About/Manifest.xml +++ b/About/Manifest.xml @@ -1,9 +1,9 @@ RJWSexperience - 1.1.1.1 + 1.1.2.0 -
  • RimJobWorld >= 5.0.0.0
    • +
  • RimJobWorld >= 5.3.0
    • diff --git a/Assemblies/RJWSexperience.dll b/Assemblies/RJWSexperience.dll deleted file mode 100644 index 91fe97f..0000000 Binary files a/Assemblies/RJWSexperience.dll and /dev/null differ diff --git a/LoadFolders.xml b/LoadFolders.xml index cdc98d1..2e89bba 100644 --- a/LoadFolders.xml +++ b/LoadFolders.xml @@ -2,7 +2,14 @@
  • /
    • +
  • 1.3
  • Mod Compatibility/Vanilla Skills Expanded
  • Mod Compatibility/RJW Cum
    •  + +
  • /
    • +
  • 1.4
    • +
  • Mod Compatibility/Vanilla Skills Expanded
    • +
  • Mod Compatibility/RJW Cum
    • +     \ No newline at end of file diff --git a/Mod Compatibility/RJW Cum/Assemblies/RJWSexperienceCum.dll b/Mod Compatibility/RJW Cum/Assemblies/RJWSexperienceCum.dll index c917690..1e02e43 100644 Binary files a/Mod Compatibility/RJW Cum/Assemblies/RJWSexperienceCum.dll and b/Mod Compatibility/RJW Cum/Assemblies/RJWSexperienceCum.dll differ diff --git a/Source/RJWSexperience/Patches/Rimworld_Patch.cs b/Source/RJWSexperience/Patches/Rimworld_Patch.cs index 24b7ee8..fed0646 100644 --- a/Source/RJWSexperience/Patches/Rimworld_Patch.cs +++ b/Source/RJWSexperience/Patches/Rimworld_Patch.cs @@ -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.History.EnableRecordRandomizer && __result.DevelopmentalStage != DevelopmentalStage.Newborn && xxx.is_human(__result)) doVirginTrait = SexHistory.RecordRandomizer.Randomize(__result); if (doVirginTrait) diff --git a/Source/RJWSexperience/RJWSexperience.csproj b/Source/RJWSexperience/RJWSexperience.csproj index 36c0229..e51312d 100644 --- a/Source/RJWSexperience/RJWSexperience.csproj +++ b/Source/RJWSexperience/RJWSexperience.csproj @@ -25,14 +25,14 @@ pdbonly true - ..\..\Assemblies\ + ..\..\1.4\Assemblies\ TRACE prompt 4 - ..\..\..\rjw\1.3\Assemblies\RJW.dll + ..\..\..\rjw\1.4\Assemblies\RJW.dll False @@ -90,10 +90,10 @@ - 1.3.3389 + 1.4.3524 - 2.2.1 + 2.2.2 runtime compile; build; native; contentfiles; analyzers; buildtransitive diff --git a/Source/RJWSexperienceCum/RJWSexperienceCum.csproj b/Source/RJWSexperienceCum/RJWSexperienceCum.csproj index c5f1072..e137ffe 100644 --- a/Source/RJWSexperienceCum/RJWSexperienceCum.csproj +++ b/Source/RJWSexperienceCum/RJWSexperienceCum.csproj @@ -47,7 +47,7 @@ - 1.3.3389 + 1.4.3524 diff --git a/Textures/UI/Icons/Genes/Skills/Sex/Poor.png b/Textures/UI/Icons/Genes/Skills/Sex/Poor.png new file mode 100644 index 0000000..eb151c8 Binary files /dev/null and b/Textures/UI/Icons/Genes/Skills/Sex/Poor.png differ diff --git a/Textures/UI/Icons/Genes/Skills/Sex/Remarkable.png b/Textures/UI/Icons/Genes/Skills/Sex/Remarkable.png new file mode 100644 index 0000000..10182e4 Binary files /dev/null and b/Textures/UI/Icons/Genes/Skills/Sex/Remarkable.png differ diff --git a/Textures/UI/Icons/Genes/Skills/Sex/Strong.png b/Textures/UI/Icons/Genes/Skills/Sex/Strong.png new file mode 100644 index 0000000..f39c651 Binary files /dev/null and b/Textures/UI/Icons/Genes/Skills/Sex/Strong.png differ diff --git a/Textures/UI/Icons/Genes/Skills/Sex/Terrible.png b/Textures/UI/Icons/Genes/Skills/Sex/Terrible.png new file mode 100644 index 0000000..ae1c753 Binary files /dev/null and b/Textures/UI/Icons/Genes/Skills/Sex/Terrible.png differ diff --git a/changelogs.txt b/changelogs.txt index 0442592..18e35d0 100644 --- a/changelogs.txt +++ b/changelogs.txt @@ -1,3 +1,6 @@ +Version 1.1.2.0 + - Rimworld 1.4 + Version 1.1.1.1 - Fix sex history window crashing for a pawns with a modded passion