mirror of
				https://github.com/vegapnk/RJW-Genes.git
				synced 2024-08-15 00:23:31 +00:00 
			
		
		
		
	Resolve Merge conflicts
This commit is contained in:
		
						commit
						bf5617ffe0
					
				
					 35 changed files with 641 additions and 123 deletions
				
			
		| 
						 | 
				
			
			@ -16,6 +16,6 @@ namespace RJW_BGS
 | 
			
		|||
        public List<string> raceNames;
 | 
			
		||||
        public List<string> pawnKindNames;
 | 
			
		||||
        public List<BestialityGeneInheritanceDef> genes;
 | 
			
		||||
        public String hybridName;
 | 
			
		||||
        public string hybridName;
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -28,13 +28,16 @@ namespace RJW_BGS
 | 
			
		|||
				ModLog.Warning($"Error looking up PawnKindDef for {pawn.Name} - Could not lookup Animal Inheritance Genes");
 | 
			
		||||
				return null;
 | 
			
		||||
			}
 | 
			
		||||
			
 | 
			
		||||
			string raceName = kindDef.race.defName;
 | 
			
		||||
			string pawnKindName = kindDef.defName;
 | 
			
		||||
			//Wild animals have no name, so we will use pawnkindname instead
 | 
			
		||||
			string pawnName = pawn.Name != null ? pawn.Name.ToStringFull : pawnKindName; 
 | 
			
		||||
			PawnData pawnData = SaveStorage.DataStore.GetPawnData(pawn);
 | 
			
		||||
			RaceGroupDef raceGroupDef = pawnData.RaceSupportDef;
 | 
			
		||||
 | 
			
		||||
			if (RJW_BGSSettings.rjw_bgs_detailed_debug)
 | 
			
		||||
				ModLog.Message($"Looking up Animal-Inheritable Genes for {pawn.Name} with KindDef {kindDef.defName},RaceName {raceName}, PawnKind {pawnKindName} and RaceGroup {raceGroupDef.defName}");
 | 
			
		||||
				ModLog.Message($"Looking up Animal-Inheritable Genes for {pawnName} with KindDef {kindDef.defName},RaceName {raceName}, PawnKind {pawnKindName} and RaceGroup {raceGroupDef.defName}");
 | 
			
		||||
 | 
			
		||||
			IEnumerable<RaceGeneDef> allDefs = DefDatabase<RaceGeneDef>.AllDefs;
 | 
			
		||||
			List<RaceGeneDef> pawnKindDefs = allDefs.Where(delegate (RaceGeneDef group)
 | 
			
		||||
| 
						 | 
				
			
			@ -44,11 +47,11 @@ namespace RJW_BGS
 | 
			
		|||
			}).ToList<RaceGeneDef>();
 | 
			
		||||
			if (pawnKindDefs.Count() > 0)
 | 
			
		||||
            {
 | 
			
		||||
				DebugPrintRaceGeneDefs("PawnKindDefs",pawn.Name.ToStringFull,pawnKindDefs);
 | 
			
		||||
				DebugPrintRaceGeneDefs("PawnKindDefs", pawnName,pawnKindDefs);
 | 
			
		||||
				return pawnKindDefs;
 | 
			
		||||
			}
 | 
			
		||||
			else if (RJW_BGSSettings.rjw_bgs_detailed_debug)
 | 
			
		||||
				ModLog.Message($"Did not find PawnKindDefs for {pawn.Name.ToStringFull}");
 | 
			
		||||
				ModLog.Message($"Did not find PawnKindDefs for {pawnName}");
 | 
			
		||||
 | 
			
		||||
			List<RaceGeneDef> raceKindDefs = allDefs.Where(delegate (RaceGeneDef group)
 | 
			
		||||
			{
 | 
			
		||||
| 
						 | 
				
			
			@ -57,11 +60,11 @@ namespace RJW_BGS
 | 
			
		|||
			}).ToList<RaceGeneDef>();
 | 
			
		||||
			if (raceKindDefs.Count() > 0)
 | 
			
		||||
			{
 | 
			
		||||
				DebugPrintRaceGeneDefs("PawnKindDefs", pawn.Name.ToStringFull, raceKindDefs);
 | 
			
		||||
				DebugPrintRaceGeneDefs("PawnKindDefs", pawnName, raceKindDefs);
 | 
			
		||||
				return raceKindDefs;
 | 
			
		||||
			}
 | 
			
		||||
			else if (RJW_BGSSettings.rjw_bgs_detailed_debug)
 | 
			
		||||
				ModLog.Message($"Did not find RaceKindDefs for {pawn.Name.ToStringFull}");
 | 
			
		||||
				ModLog.Message($"Did not find RaceKindDefs for {pawnName}");
 | 
			
		||||
 | 
			
		||||
			List<RaceGeneDef> raceGroupDefs = new List<RaceGeneDef>();
 | 
			
		||||
			if (raceGroupDef != null)
 | 
			
		||||
| 
						 | 
				
			
			@ -77,13 +80,13 @@ namespace RJW_BGS
 | 
			
		|||
			
 | 
			
		||||
			if (raceGroupDefs.Count() > 0)
 | 
			
		||||
            {
 | 
			
		||||
				DebugPrintRaceGeneDefs("RaceKindDefs", pawn.Name.ToStringFull, raceGroupDefs);
 | 
			
		||||
				DebugPrintRaceGeneDefs("RaceKindDefs", pawnName, raceGroupDefs);
 | 
			
		||||
				return raceGroupDefs;
 | 
			
		||||
			}
 | 
			
		||||
			else if (RJW_BGSSettings.rjw_bgs_detailed_debug)
 | 
			
		||||
				ModLog.Message($"Did not find RaceGroupDefs for {pawn.Name.ToStringFull}");
 | 
			
		||||
				ModLog.Message($"Did not find RaceGroupDefs for {pawnName}");
 | 
			
		||||
 | 
			
		||||
			ModLog.Message($"Did not find any Genes inheritable for {pawn.Name.ToStringFull}");
 | 
			
		||||
			ModLog.Message($"Did not find any Genes inheritable for {pawnName}");
 | 
			
		||||
			return new List<RaceGeneDef>();
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -23,7 +23,7 @@ namespace RJW_Genes
 | 
			
		|||
        //Summary//
 | 
			
		||||
        //Adds our own partpreferences to rjw's list. Our partpreferences are under Interactions.GenesPartKindUsageRule
 | 
			
		||||
        //
 | 
			
		||||
        private static void AddtoIPartPreferenceRule()
 | 
			
		||||
        private static void InjectIntoRjwInteractionServices()
 | 
			
		||||
        {
 | 
			
		||||
            List<IPartPreferenceRule> partPreferenceRules = Unprivater.GetProtectedValue<List<IPartPreferenceRule>>("_partKindUsageRules", typeof(PartPreferenceDetectorService));
 | 
			
		||||
            partPreferenceRules.Add(new Interactions.GenesPartKindUsageRule());
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -0,0 +1,59 @@
 | 
			
		|||
using System;
 | 
			
		||||
using System.Collections.Generic;
 | 
			
		||||
using System.Linq;
 | 
			
		||||
using System.Text;
 | 
			
		||||
using System.Threading.Tasks;
 | 
			
		||||
using Verse;
 | 
			
		||||
using RimWorld;
 | 
			
		||||
using Verse.AI;
 | 
			
		||||
using rjw;
 | 
			
		||||
 | 
			
		||||
namespace RJW_Genes
 | 
			
		||||
{
 | 
			
		||||
	//Summary//
 | 
			
		||||
	//Returns invalid if a pawn is not naked
 | 
			
		||||
	//Summary//
 | 
			
		||||
	public class CompAbilityEffect_CasterIsNaked : CompAbilityEffect_WithDest
 | 
			
		||||
	{
 | 
			
		||||
		private new CompProperties_CasterIsNaked Props
 | 
			
		||||
		{
 | 
			
		||||
			get
 | 
			
		||||
			{
 | 
			
		||||
				return (CompProperties_CasterIsNaked)this.props;
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		public override bool GizmoDisabled(out string reason)
 | 
			
		||||
		{
 | 
			
		||||
			Pawn pawn = this.CasterPawn;
 | 
			
		||||
			if (pawn != null)
 | 
			
		||||
			{
 | 
			
		||||
				//Copied from ThoughtWorker_NudistNude.CurrentStateInternal
 | 
			
		||||
				List<Apparel> wornApparel = pawn.apparel.WornApparel;
 | 
			
		||||
				for (int i = 0; i < wornApparel.Count; i++)
 | 
			
		||||
				{
 | 
			
		||||
					Apparel apparel = wornApparel[i];
 | 
			
		||||
					if (apparel.def.apparel.countsAsClothingForNudity)
 | 
			
		||||
					{
 | 
			
		||||
						for (int j = 0; j < apparel.def.apparel.bodyPartGroups.Count; j++)
 | 
			
		||||
						{
 | 
			
		||||
							if (apparel.def.apparel.bodyPartGroups[j] == BodyPartGroupDefOf.Torso)
 | 
			
		||||
							{
 | 
			
		||||
								reason = pawn.Name + " is not naked";
 | 
			
		||||
								return true;
 | 
			
		||||
							}
 | 
			
		||||
							if (apparel.def.apparel.bodyPartGroups[j] == BodyPartGroupDefOf.Legs)
 | 
			
		||||
							{
 | 
			
		||||
								reason = pawn.Name + " is not naked";
 | 
			
		||||
								return true;
 | 
			
		||||
 | 
			
		||||
							}
 | 
			
		||||
						}
 | 
			
		||||
					}
 | 
			
		||||
				}
 | 
			
		||||
			}
 | 
			
		||||
			reason = null;
 | 
			
		||||
			return false;
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			@ -0,0 +1,19 @@
 | 
			
		|||
using System;
 | 
			
		||||
using System.Collections.Generic;
 | 
			
		||||
using System.Linq;
 | 
			
		||||
using System.Text;
 | 
			
		||||
using System.Threading.Tasks;
 | 
			
		||||
using Verse;
 | 
			
		||||
using RimWorld;
 | 
			
		||||
 | 
			
		||||
namespace RJW_Genes
 | 
			
		||||
{
 | 
			
		||||
	public class CompProperties_CasterIsNaked : CompProperties_EffectWithDest
 | 
			
		||||
	{
 | 
			
		||||
		public CompProperties_CasterIsNaked()
 | 
			
		||||
		{
 | 
			
		||||
			this.compClass = typeof(CompAbilityEffect_CasterIsNaked);
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -24,6 +24,11 @@ namespace RJW_Genes
 | 
			
		|||
            {
 | 
			
		||||
                return false;
 | 
			
		||||
            }
 | 
			
		||||
            if (!RJW_GenesSettings.rjw_genes_sexdemon_visit_incubi && !RJW_GenesSettings.rjw_genes_sexdemon_visit_succubi)
 | 
			
		||||
            {
 | 
			
		||||
                return false;
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
            foreach (Pawn pawn in map.mapPawns.FreeColonistsAndPrisonersSpawned)
 | 
			
		||||
            {
 | 
			
		||||
                if (pawn.jobs.curDriver.asleep && xxx.need_some_sex(pawn) > 1f)
 | 
			
		||||
| 
						 | 
				
			
			@ -38,46 +43,68 @@ namespace RJW_Genes
 | 
			
		|||
        protected override bool TryExecuteWorker(IncidentParms parms)
 | 
			
		||||
        {
 | 
			
		||||
            Map map = (Map)parms.target;
 | 
			
		||||
            Pawn victim = ValidVictims(map).RandomElement();
 | 
			
		||||
            if (victim == null)
 | 
			
		||||
            List < Pawn > victims = ValidVictims(map).ToList();
 | 
			
		||||
            if(victims.NullOrEmpty())
 | 
			
		||||
            {
 | 
			
		||||
                return false;
 | 
			
		||||
            }
 | 
			
		||||
            IntVec3 loc = victim.Position;
 | 
			
		||||
            Faction faction;
 | 
			
		||||
            if (!this.TryFindFormerFaction(out faction))
 | 
			
		||||
            {
 | 
			
		||||
                return false;
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
            //Spawn succubus at pawn
 | 
			
		||||
            Pawn succubus = PawnGenerator.GeneratePawn(new PawnGenerationRequest(PawnKindDef.Named("rjw_genes_succubus"), faction, PawnGenerationContext.NonPlayer, -1, 
 | 
			
		||||
                false, false, false, true, false, 1f, false, true, false, true, true, false, false, false, false, 0f, 0f, null, 1f, null, null, 
 | 
			
		||||
                null, null, null, null, null, null, null, null, null, null, false, false, false, false, null, null, null, null, null, 0f,
 | 
			
		||||
                DevelopmentalStage.Adult, null, null, null, false));
 | 
			
		||||
            succubus.SetFaction(null, null);
 | 
			
		||||
            GenSpawn.Spawn(succubus, loc, map, WipeMode.Vanish);
 | 
			
		||||
 | 
			
		||||
            //Set succubus behaviour
 | 
			
		||||
            List<Pawn> list = new List<Pawn> {succubus};
 | 
			
		||||
            LordMaker.MakeNewLord(parms.faction, this.CreateLordJob(parms, succubus, victim), map, list);
 | 
			
		||||
 | 
			
		||||
            //Make succubus rape victim.
 | 
			
		||||
            if (RJWSettings.rape_enabled)
 | 
			
		||||
            int pawn_amount = RJW_GenesSettings.rjw_genes_sexdemon_visit_groups ? Rand.Range(1, victims.Count) : 1;
 | 
			
		||||
            List<Pawn> new_sexdemons = new List<Pawn>();
 | 
			
		||||
            for (int i = 0; i < pawn_amount; i++)
 | 
			
		||||
            {
 | 
			
		||||
                succubus.pather.StopDead(); 
 | 
			
		||||
                succubus.jobs.StopAll();
 | 
			
		||||
                Job newJob = JobMaker.MakeJob(xxx.RapeRandom, victim);
 | 
			
		||||
                succubus.jobs.StartJob(newJob, JobCondition.InterruptForced, null, false, true, null, null, false, false, null, false, true);
 | 
			
		||||
            }
 | 
			
		||||
                Pawn victim = victims.RandomElement();
 | 
			
		||||
                IntVec3 loc = victim.Position;
 | 
			
		||||
 | 
			
		||||
            //Broken for now
 | 
			
		||||
            //Sends letter
 | 
			
		||||
            //string value = succubus.DevelopmentalStage.Child() ? "FeralChild".Translate().ToString() : succubus.KindLabel;
 | 
			
		||||
            //TaggedString value2 = succubus.DevelopmentalStage.Child() ? "Child".Translate() : "Person".Translate();
 | 
			
		||||
            //TaggedString baseLetterLabel = this.def.letterLabel.Formatted(value).CapitalizeFirst();
 | 
			
		||||
            //TaggedString baseLetterText = this.def.letterText.Formatted(succubus.NameShortColored, value2, succubus.Named("PAWN")).AdjustedFor(succubus, "PAWN", true).CapitalizeFirst();
 | 
			
		||||
            //PawnRelationUtility.TryAppendRelationsWithColonistsInfo(ref baseLetterText, ref baseLetterLabel, succubus);
 | 
			
		||||
                PawnKindDef pawnKindDef;
 | 
			
		||||
                Gender gender;
 | 
			
		||||
                if (victim.gender == Gender.Male || !RJW_GenesSettings.rjw_genes_sexdemon_visit_incubi)
 | 
			
		||||
                {
 | 
			
		||||
 | 
			
		||||
                }
 | 
			
		||||
                if ((Rand.Bool && RJW_GenesSettings.rjw_genes_sexdemon_visit_succubi) || !RJW_GenesSettings.rjw_genes_sexdemon_visit_incubi)
 | 
			
		||||
                {
 | 
			
		||||
                    pawnKindDef = PawnKindDef.Named("rjw_genes_succubus");
 | 
			
		||||
                    gender = Gender.Female;
 | 
			
		||||
                }
 | 
			
		||||
                else
 | 
			
		||||
                {
 | 
			
		||||
                    pawnKindDef = PawnKindDef.Named("rjw_genes_incubus");
 | 
			
		||||
                    gender = Gender.Male;
 | 
			
		||||
                }
 | 
			
		||||
 | 
			
		||||
                //Spawn succubus at pawn
 | 
			
		||||
                Pawn sexdemon = PawnGenerator.GeneratePawn(new PawnGenerationRequest(pawnKindDef, faction, PawnGenerationContext.NonPlayer, -1,
 | 
			
		||||
                    false, false, false, true, false, 1f, false, true, false, true, true, false, false, false, false, 0f, 0f, null, 1f, null, null,
 | 
			
		||||
                    null, null, null, null, null, gender, null, null, null, null, false, false, false, false, null, null, null, null, null, 0f,
 | 
			
		||||
                    DevelopmentalStage.Adult, null, null, null, false));
 | 
			
		||||
                sexdemon.SetFaction(null, null);
 | 
			
		||||
                GenSpawn.Spawn(sexdemon, loc, map, WipeMode.Vanish);
 | 
			
		||||
                List<Pawn> sexdemons = new List<Pawn> { sexdemon };
 | 
			
		||||
                new_sexdemons.Add(sexdemon);
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
                LordMaker.MakeNewLord(Faction.OfPlayer, this.CreateLordJob(parms, sexdemon, victim), map, sexdemons);
 | 
			
		||||
 | 
			
		||||
                //Make succubus rape victim.
 | 
			
		||||
                if (RJWSettings.rape_enabled)
 | 
			
		||||
                {
 | 
			
		||||
                    //follow rjw rules
 | 
			
		||||
                    if (SexAppraiser.would_fuck(sexdemon,victim) > 0f)
 | 
			
		||||
                    {
 | 
			
		||||
                        sexdemon.pather.StopDead();
 | 
			
		||||
                        sexdemon.jobs.StopAll();
 | 
			
		||||
                        Job newJob = JobMaker.MakeJob(xxx.RapeRandom, victim);
 | 
			
		||||
                        sexdemon.jobs.StartJob(newJob, JobCondition.InterruptForced, null, false, true, null, null, false, false, null, false, true);
 | 
			
		||||
                    }
 | 
			
		||||
 | 
			
		||||
                }
 | 
			
		||||
            }
 | 
			
		||||
            Find.LetterStack.ReceiveLetter("rjw_genes_sexdemon_visit_incident_label".Translate(), "rjw_genes_sexdemon_visit_incident_description".Translate(), LetterDefOf.PositiveEvent, new_sexdemons, null, null, null, null);
 | 
			
		||||
            //base.SendStandardLetter(baseLetterLabel, baseLetterText, this.def.letterDef, parms, succubus, Array.Empty<NamedArgument>());
 | 
			
		||||
 | 
			
		||||
            return true;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -7,6 +7,7 @@ using Verse;
 | 
			
		|||
using Verse.AI;
 | 
			
		||||
using Verse.AI.Group;
 | 
			
		||||
using RimWorld;
 | 
			
		||||
using rjw;
 | 
			
		||||
namespace RJW_Genes
 | 
			
		||||
{
 | 
			
		||||
    //Based on LordJob_VisitColony
 | 
			
		||||
| 
						 | 
				
			
			@ -52,8 +53,7 @@ namespace RJW_Genes
 | 
			
		|||
                tickLimit = Rand.Range(60000, 180000); //~1-3 days
 | 
			
		||||
            }
 | 
			
		||||
            transition1.AddTrigger(new Trigger_TicksPassed(tickLimit));
 | 
			
		||||
 | 
			
		||||
            transition1.AddPreAction(new TransitionAction_Message("SuccubusLeaving".Translate(), null, 1f));
 | 
			
		||||
            transition1.AddPreAction(new TransitionAction_Custom(new Action(this.SuccubiLeave))); //Join or leave colony
 | 
			
		||||
            stateGraph.AddTransition(transition1);
 | 
			
		||||
 | 
			
		||||
            //If they become hostile
 | 
			
		||||
| 
						 | 
				
			
			@ -84,7 +84,26 @@ namespace RJW_Genes
 | 
			
		|||
            Scribe_Values.Look<int?>(ref this.durationTicks, "durationTicks", null, false);
 | 
			
		||||
            Scribe_References.Look<Pawn>(ref this.target, "target", false);
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        public void SuccubiLeave()
 | 
			
		||||
        {
 | 
			
		||||
            foreach (Pawn pawn in this.lord.ownedPawns)
 | 
			
		||||
            {
 | 
			
		||||
                if(colonyJoiners.Contains(pawn))
 | 
			
		||||
                {
 | 
			
		||||
                    RecruitUtility.Recruit(pawn, Faction.OfPlayer);
 | 
			
		||||
                    Find.LetterStack.ReceiveLetter("Guest Joins", string.Format("{0} enjoys it here and has decided to stay", xxx.get_pawnname(pawn)), LetterDefOf.PositiveEvent, pawn, null, null, null, null);
 | 
			
		||||
                }
 | 
			
		||||
                else
 | 
			
		||||
                {
 | 
			
		||||
                    Messages.Message("SuccubusLeaving".Translate(xxx.get_pawnname(pawn)), pawn, MessageTypeDefOf.NeutralEvent, true);
 | 
			
		||||
                }
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        public Pawn target;
 | 
			
		||||
        private int? durationTicks;
 | 
			
		||||
        public List<Pawn> colonyJoiners = new List<Pawn>();
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -49,6 +49,7 @@ namespace RJW_Genes
 | 
			
		|||
				if (this.Pawn.genes.HasGene(GeneDefOf.rjw_genes_cum_eater)
 | 
			
		||||
				|| this.Pawn.genes.HasGene(GeneDefOf.rjw_genes_vaginal_absorber) || this.Pawn.genes.HasGene(GeneDefOf.rjw_genes_anal_absorber) || this.Pawn.genes.HasGene(GeneDefOf.rjw_genes_drainer))
 | 
			
		||||
				{
 | 
			
		||||
					//TODO: use mentalstatedef instead of mentalbreakdef
 | 
			
		||||
					MentalBreakDef randomrape = GeneDefOf.rjw_genes_lifeforce_randomrape;
 | 
			
		||||
					if (ModsConfig.BiotechActive &&
 | 
			
		||||
						this.Pawn.Spawned && !this.Pawn.InMentalState && !this.Pawn.Downed &&
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -34,8 +34,9 @@ namespace RJW_Genes
 | 
			
		|||
			toil.socialMode = RandomSocialMode.Off;
 | 
			
		||||
			yield return toil;
 | 
			
		||||
			yield return this.InteractToil();
 | 
			
		||||
			Toil toil1 = Toils_General.Wait(600, TargetIndex.A);
 | 
			
		||||
			Toil toil1 = Toils_General.Wait(300, TargetIndex.A);
 | 
			
		||||
			toil1.socialMode = RandomSocialMode.Off;
 | 
			
		||||
			yield return toil1;
 | 
			
		||||
			yield break;
 | 
			
		||||
		}
 | 
			
		||||
		private Toil InteractToil()
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -41,7 +41,6 @@ namespace RJW_Genes
 | 
			
		|||
			yield break;
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		// Token: 0x06000420 RID: 1056 RVA: 0x00024190 File Offset: 0x00022390
 | 
			
		||||
		private Toil MakeSexToil()
 | 
			
		||||
		{
 | 
			
		||||
			Toil toil = new Toil();
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -14,7 +14,7 @@ namespace RJW_Genes
 | 
			
		|||
		protected override Job TryGiveJob(Pawn pawn)
 | 
			
		||||
		{
 | 
			
		||||
			Pawn target = pawn.mindState.duty.focus.Pawn;
 | 
			
		||||
			if (pawn.CanReach(target, PathEndMode.InteractionCell, Danger.Deadly))
 | 
			
		||||
			if (pawn.CanReach(target, PathEndMode.InteractionCell, Danger.Deadly) && !target.jobs.curDriver.asleep)
 | 
			
		||||
            {
 | 
			
		||||
				return JobMaker.MakeJob(JobDefOf.rjw_genes_flirt, target);
 | 
			
		||||
			}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -4,9 +4,12 @@ using System.Linq;
 | 
			
		|||
using System.Text;
 | 
			
		||||
using System.Threading.Tasks;
 | 
			
		||||
using rjw;
 | 
			
		||||
using RJWSexperience;
 | 
			
		||||
using RimWorld;
 | 
			
		||||
using Verse;
 | 
			
		||||
using Verse.AI;
 | 
			
		||||
using Verse.AI.Group;
 | 
			
		||||
using UnityEngine;
 | 
			
		||||
namespace RJW_Genes
 | 
			
		||||
{
 | 
			
		||||
    public class JobGiver_TryQuickieWith : ThinkNode_JobGiver
 | 
			
		||||
| 
						 | 
				
			
			@ -20,13 +23,29 @@ namespace RJW_Genes
 | 
			
		|||
			//can reserve eachother
 | 
			
		||||
			if (pawn.CanReserveAndReach(target, PathEndMode.InteractionCell, Danger.Some) && target.CanReserve(pawn, 1, 0, null, false))				
 | 
			
		||||
			{
 | 
			
		||||
				//target is not busy
 | 
			
		||||
				//Dont interrupt player
 | 
			
		||||
				if (!(((jobs != null) ? jobs.curJob : null) != null && jobs.curJob.playerForced))
 | 
			
		||||
                {
 | 
			
		||||
					float willingness = TargetWillingness(pawn, target);
 | 
			
		||||
					if (Rand.Chance(willingness))
 | 
			
		||||
                    {
 | 
			
		||||
						return JobMaker.MakeJob(xxx.quick_sex, target);
 | 
			
		||||
						Job newJob =JobMaker.MakeJob(xxx.quick_sex, target);
 | 
			
		||||
						
 | 
			
		||||
						//Pawn joins faction when lordJob ends instead of leaving
 | 
			
		||||
						//in the future determine the chance of this another way
 | 
			
		||||
						if (Rand.Chance(JoinChance(pawn, target)))
 | 
			
		||||
                        {
 | 
			
		||||
							Lord lord = pawn.GetLord();
 | 
			
		||||
							LordJob_SuccubusVisit lordJob = lord == null? null : lord.LordJob as LordJob_SuccubusVisit;
 | 
			
		||||
							if (lordJob != null)
 | 
			
		||||
                            {
 | 
			
		||||
								if (!lordJob.colonyJoiners.Contains(pawn))
 | 
			
		||||
                                {
 | 
			
		||||
									lordJob.colonyJoiners.Add(pawn);
 | 
			
		||||
                                }
 | 
			
		||||
                            }
 | 
			
		||||
						}
 | 
			
		||||
						return newJob;
 | 
			
		||||
					}
 | 
			
		||||
					else
 | 
			
		||||
                    {
 | 
			
		||||
| 
						 | 
				
			
			@ -40,7 +59,7 @@ namespace RJW_Genes
 | 
			
		|||
                {
 | 
			
		||||
					if (RJWSettings.DebugLogJoinInBed) //change this when we have our own settigns
 | 
			
		||||
					{
 | 
			
		||||
						ModLog.Message(string.Format(" find_pawn_to_fuck({0}): lover has important job ({1}), skipping", pawn_name, target.jobs.curJob.def));
 | 
			
		||||
						//ModLog.Message(string.Format(" find_pawn_to_fuck({0}): lover has important job ({1}), skipping", pawn_name, target.jobs.curJob.def));
 | 
			
		||||
					}
 | 
			
		||||
				}
 | 
			
		||||
			}
 | 
			
		||||
| 
						 | 
				
			
			@ -80,7 +99,7 @@ namespace RJW_Genes
 | 
			
		|||
						{
 | 
			
		||||
							ModLog.Message(" find_partner(" + pawn_name + "): I interested in banging but that's cheating");
 | 
			
		||||
						}
 | 
			
		||||
						//Succubus has a small chance to seduce even if target is in relationship, maybe setting like succubus can homewreck
 | 
			
		||||
						//Succubus has a small chance to seduce even if target is in relationship
 | 
			
		||||
						willingness *= 0.1f;
 | 
			
		||||
					}
 | 
			
		||||
                    else
 | 
			
		||||
| 
						 | 
				
			
			@ -95,5 +114,75 @@ namespace RJW_Genes
 | 
			
		|||
			}
 | 
			
		||||
			return willingness;
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
		public static float JoinChance(Pawn pawn ,Pawn target)
 | 
			
		||||
        {
 | 
			
		||||
 | 
			
		||||
			float chance = 0.1f;
 | 
			
		||||
 | 
			
		||||
			//Sex satisfaction, how good the target is at sex
 | 
			
		||||
			chance *= xxx.get_sex_satisfaction(target); 
 | 
			
		||||
			
 | 
			
		||||
			//Succubus mood
 | 
			
		||||
			if (pawn.needs != null && pawn.needs.mood != null)
 | 
			
		||||
            {
 | 
			
		||||
				chance *= pawn.needs.mood.CurLevelPercentage + 0.5f; 
 | 
			
		||||
			}
 | 
			
		||||
			
 | 
			
		||||
			//Size of genitals
 | 
			
		||||
			bool size_matters = true; //To be placed in modsettings
 | 
			
		||||
			if (size_matters)
 | 
			
		||||
            {
 | 
			
		||||
				//The larger the penis to greater the chance
 | 
			
		||||
				if (RelationsUtility.AttractedToGender(pawn, Gender.Male))
 | 
			
		||||
				{
 | 
			
		||||
					chance *= GetGenitalSize(target, true) + 0.5f;
 | 
			
		||||
				}
 | 
			
		||||
 | 
			
		||||
				//The tighter the vagine the greater the chance, a size above 1 is considered as 1
 | 
			
		||||
				if (RelationsUtility.AttractedToGender(pawn, Gender.Female))
 | 
			
		||||
				{
 | 
			
		||||
					chance *= 1f - Mathf.Min(GetGenitalSize(target, false),1f) + 0.5f;
 | 
			
		||||
				}
 | 
			
		||||
			}
 | 
			
		||||
 | 
			
		||||
			//Sex ability from sexperience
 | 
			
		||||
			if (ModsConfig.IsActive("rjw.sexperience"))
 | 
			
		||||
            {
 | 
			
		||||
				chance *= RJWSexperience.PawnExtensions.GetSexStat(pawn);
 | 
			
		||||
            }
 | 
			
		||||
			return Mathf.Max(chance,0f);
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
		//Gets the size of the largest penis or the tightest vagina
 | 
			
		||||
		public static float GetGenitalSize(Pawn pawn, bool penis_else_vagina)
 | 
			
		||||
        {
 | 
			
		||||
			List<Hediff> genitals = rjw.PawnExtensions.GetGenitalsList(pawn);
 | 
			
		||||
			if(!genitals.NullOrEmpty())
 | 
			
		||||
            {
 | 
			
		||||
				if (penis_else_vagina)
 | 
			
		||||
				{
 | 
			
		||||
					List<Hediff> penises = genitals.Where(genital => Genital_Helper.is_penis(genital)).ToList();
 | 
			
		||||
					{
 | 
			
		||||
						if (!penises.NullOrEmpty())
 | 
			
		||||
						{
 | 
			
		||||
							return penises.Max(genital => genital.Severity);
 | 
			
		||||
						}
 | 
			
		||||
					}
 | 
			
		||||
				}
 | 
			
		||||
				else
 | 
			
		||||
                {
 | 
			
		||||
					List<Hediff> vaginas = genitals.Where(genital => Genital_Helper.is_vagina(genital)).ToList();
 | 
			
		||||
					{
 | 
			
		||||
						if (!vaginas.NullOrEmpty())
 | 
			
		||||
						{
 | 
			
		||||
							return vaginas.Min(genital => genital.Severity);
 | 
			
		||||
						}
 | 
			
		||||
					}
 | 
			
		||||
				}
 | 
			
		||||
			}
 | 
			
		||||
			return 0f;
 | 
			
		||||
			
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -61,10 +61,8 @@ namespace RJW_Genes
 | 
			
		|||
			return AlertReport.CulpritsAre(this.Targets);
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		// Token: 0x04004B5C RID: 19292
 | 
			
		||||
		private List<GlobalTargetInfo> targets = new List<GlobalTargetInfo>();
 | 
			
		||||
 | 
			
		||||
		// Token: 0x04004B5D RID: 19293
 | 
			
		||||
		private List<string> targetLabels = new List<string>();
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										56
									
								
								Source/RJW_GenesSettings.cs
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										56
									
								
								Source/RJW_GenesSettings.cs
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,56 @@
 | 
			
		|||
using System;
 | 
			
		||||
using System.Collections.Generic;
 | 
			
		||||
using System.Linq;
 | 
			
		||||
using System.Text;
 | 
			
		||||
using System.Threading.Tasks;
 | 
			
		||||
using Verse;
 | 
			
		||||
using UnityEngine;
 | 
			
		||||
namespace RJW_Genes
 | 
			
		||||
{
 | 
			
		||||
    public class RJW_GenesSettings : ModSettings
 | 
			
		||||
    {
 | 
			
		||||
        public static void DoWindowContents(Rect inRect)
 | 
			
		||||
        {   
 | 
			
		||||
            Rect outRect = new Rect(0f, 30f, inRect.width, inRect.height - 30f);
 | 
			
		||||
            Rect rect = new Rect(0f, 0f, inRect.width - 16f, inRect.height + 300f);
 | 
			
		||||
            //Widgets.BeginScrollView(outRect, ref RJWSettings.scrollPosition, rect, true);
 | 
			
		||||
            Listing_Standard listing_Standard = new Listing_Standard();
 | 
			
		||||
            listing_Standard.maxOneColumn = true;
 | 
			
		||||
            listing_Standard.ColumnWidth = rect.width / 2.05f;
 | 
			
		||||
            listing_Standard.Begin(rect);
 | 
			
		||||
            listing_Standard.Gap(30);
 | 
			
		||||
            listing_Standard.CheckboxLabeled("Sexdemon Visits", ref rjw_genes_sexdemon_visit, "If enabled, incubi and succubi can spawn in through an event.", 0f, 1f);
 | 
			
		||||
            if (rjw_genes_sexdemon_visit)
 | 
			
		||||
            {
 | 
			
		||||
                listing_Standard.Gap(3f);
 | 
			
		||||
                listing_Standard.CheckboxLabeled("  Size matters", ref rjw_genes_sexdemon_join_size_matters, "Incubi and succubi will consider size/tightness of partners genital for deciding if they want to join", 0f, 1f);
 | 
			
		||||
                listing_Standard.Gap(3f);
 | 
			
		||||
                listing_Standard.CheckboxLabeled("  Sexdemon groups", ref rjw_genes_sexdemon_visit_groups, "Multiple sexdemons can spawn during a event", 0f, 1f);
 | 
			
		||||
                listing_Standard.Gap(3f);
 | 
			
		||||
                listing_Standard.CheckboxLabeled("  Succubi", ref rjw_genes_sexdemon_visit_succubi, "Allow incubi to spawn through this even", 0f, 1f);
 | 
			
		||||
                listing_Standard.Gap(3f);
 | 
			
		||||
                listing_Standard.CheckboxLabeled("  Incubi", ref rjw_genes_sexdemon_visit_incubi, "Allow incubi to spawn through this even", 0f, 1f);
 | 
			
		||||
 | 
			
		||||
            }
 | 
			
		||||
            //listing_Standard.CheckboxLabeled("sexfrenzy", ref sexfrenzy, "disable the effects", 0f, 1f);
 | 
			
		||||
            listing_Standard.Gap(10f);
 | 
			
		||||
            listing_Standard.End();
 | 
			
		||||
        }
 | 
			
		||||
        public override void ExposeData()
 | 
			
		||||
        {
 | 
			
		||||
            base.ExposeData();
 | 
			
		||||
            Scribe_Values.Look<bool>(ref RJW_GenesSettings.rjw_genes_sexdemon_visit, "rjw_genes_sexdemon_visit", RJW_GenesSettings.rjw_genes_sexdemon_visit, true);
 | 
			
		||||
            Scribe_Values.Look<bool>(ref RJW_GenesSettings.rjw_genes_sexdemon_join_size_matters, "rjw_genes_sexdemon_join_size_matters", RJW_GenesSettings.rjw_genes_sexdemon_join_size_matters, true);
 | 
			
		||||
            Scribe_Values.Look<bool>(ref RJW_GenesSettings.rjw_genes_sexdemon_visit_groups, "rjw_genes_sexdemon_groups", RJW_GenesSettings.rjw_genes_sexdemon_visit_groups, true);
 | 
			
		||||
            Scribe_Values.Look<bool>(ref RJW_GenesSettings.rjw_genes_sexdemon_visit_succubi, "rjw_genes_sexdemon_succubi", RJW_GenesSettings.rjw_genes_sexdemon_visit_succubi, true);
 | 
			
		||||
            Scribe_Values.Look<bool>(ref RJW_GenesSettings.rjw_genes_sexdemon_visit_incubi, "rjw_genes_sexdemon_incubi", RJW_GenesSettings.rjw_genes_sexdemon_visit_incubi, true);
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        public static bool rjw_genes_sexdemon_visit = true;
 | 
			
		||||
        public static bool rjw_genes_sexdemon_join_size_matters = true;
 | 
			
		||||
        public static bool rjw_genes_sexdemon_visit_groups = true;
 | 
			
		||||
        public static bool rjw_genes_sexdemon_visit_succubi = true;
 | 
			
		||||
        public static bool rjw_genes_sexdemon_visit_incubi = true;
 | 
			
		||||
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										26
									
								
								Source/RJW_GenesSettingsControllercs.cs
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										26
									
								
								Source/RJW_GenesSettingsControllercs.cs
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,26 @@
 | 
			
		|||
using System;
 | 
			
		||||
using System.Collections.Generic;
 | 
			
		||||
using System.Linq;
 | 
			
		||||
using System.Text;
 | 
			
		||||
using System.Threading.Tasks;
 | 
			
		||||
using Verse;
 | 
			
		||||
using UnityEngine;
 | 
			
		||||
namespace RJW_Genes
 | 
			
		||||
{
 | 
			
		||||
    public class RJW_GenesSettingsControllercs : Mod
 | 
			
		||||
    {
 | 
			
		||||
        public RJW_GenesSettingsControllercs(ModContentPack content) : base(content)
 | 
			
		||||
        {
 | 
			
		||||
            base.GetSettings<RJW_GenesSettings>();
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        public override string SettingsCategory()
 | 
			
		||||
        {
 | 
			
		||||
            return "RJW Genes";
 | 
			
		||||
        }
 | 
			
		||||
        public override void DoSettingsWindowContents(Rect inRect)
 | 
			
		||||
        {
 | 
			
		||||
            RJW_GenesSettings.DoWindowContents(inRect);
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			@ -38,6 +38,10 @@
 | 
			
		|||
      <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\RimWorld\Mods\rjw-master\1.4\Assemblies\RJW.dll</HintPath>
 | 
			
		||||
      <Private>False</Private>
 | 
			
		||||
    </Reference>
 | 
			
		||||
    <Reference Include="RJWSexperience">
 | 
			
		||||
      <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\RimWorld\Mods\RJW-Sexperience-master\1.4\Assemblies\RJWSexperience.dll</HintPath>
 | 
			
		||||
      <Private>False</Private>
 | 
			
		||||
    </Reference>
 | 
			
		||||
    <Reference Include="System" />
 | 
			
		||||
    <Reference Include="System.Core" />
 | 
			
		||||
    <Reference Include="System.Xml.Linq" />
 | 
			
		||||
| 
						 | 
				
			
			@ -122,6 +126,8 @@
 | 
			
		|||
    <Compile Include="Genes\Genitalia\GenitaliaChanger.cs" />
 | 
			
		||||
    <Compile Include="Genes\Life_Force\Abilities\AbilityUtility.cs" />
 | 
			
		||||
    <Compile Include="Genes\Life_Force\UI\Alert_LowFertilin.cs" />
 | 
			
		||||
    <Compile Include="Genes\Life_Force\Abilities\CompAbilityEffect_CasterIsNaked.cs" />
 | 
			
		||||
    <Compile Include="Genes\Life_Force\Abilities\CompProperties_CasterIsNaked.cs" />
 | 
			
		||||
    <Compile Include="Genes\Life_Force\Abilities\CompAbilityEffect_Seduce.cs" />
 | 
			
		||||
    <Compile Include="Genes\Life_Force\Abilities\CompAbilityEffect_LifeForceCost.cs" />
 | 
			
		||||
    <Compile Include="Genes\Life_Force\Abilities\CompAbilityEffect_CockEater.cs" />
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue