build commit Prevent automatc brothel bed claiming.

Prevent automatc brothel bed claiming.

See merge request Ed86/rjw-whoring!5

1.4/Defs/JobDefs/Jobs_Whoring.xml

@@ -4,14 +4,14 @@
 	<JobDef>
 		<defName>WhoreIsServingVisitors</defName>
 		<driverClass>rjwwhoring.JobDriver_WhoreIsServingVisitors</driverClass>
-		<reportString>serving visitors</reportString>
+		<reportString>servicing TargetA.</reportString>
 		<casualInterruptible>false</casualInterruptible>
 	</JobDef>
 
 	<JobDef>
 		<defName>WhoreInvitingVisitors</defName>
 		<driverClass>rjwwhoring.JobDriver_WhoreInvitingVisitors</driverClass>
-		<reportString>attempting hookup</reportString>
+		<reportString>soliciting TargetA.</reportString>
 		<casualInterruptible>false</casualInterruptible>
 	</JobDef>
 </Defs>

1.4/Defs/WhoringTab/PawnColumnDefs/PawnColumns.xml

@@ -49,4 +49,11 @@
 		<workerClass>rjwwhoring.MainTab.PawnColumnWorker_Mood</workerClass>
 		<width>100</width>
 	</PawnColumnDef>
+	<PawnColumnDef>
+		<defName>RJW_WhoringPolicy</defName>
+		<headerTip>Trade sex for benefits</headerTip>
+		<label>Payment type</label>
+		<workerClass>rjwwhoring.MainTab.PawnColumnWorker_WhoringPolicy</workerClass>
+		<width>100</width>
+	</PawnColumnDef>
 </Defs>

1.4/Defs/WhoringTab/PawnTableDefs.xml

@@ -21,6 +21,7 @@
 			<li>RJW_EarnedMoneyByWhore</li>
 			<li>RJW_AverageMoneyByWhore</li>
 			<li>RJW_PriceRangeOfWhore</li>
+			<li>RJW_WhoringPolicy</li>
 			<li>RemainingSpace</li>
 		</columns>
 		<modExtensions>

1.4/Languages/English/Keyed/Whoring.xml

@@ -24,7 +24,7 @@
 	<!--Whore designators-->
 	<ForService>Assign to whorin'</ForService> <!-- This field is not visible -->
 	<ForServiceDesc><![CDATA[Mark for whoring
-- Will try to hook up with visitors.
+- Will try to solicit visitors.
 - Entertains other colonists if not busy.
 - Tries to refrain from masturbation while on the job, may cause frustration.
 ]]></ForServiceDesc>

1.4/Source/Mod/Data/DataStore.cs

@@ -11,6 +11,7 @@ namespace rjwwhoring
 	public class DataStore : WorldComponent
 	{
 		public Dictionary<int, BedData> bedData = new Dictionary<int, BedData>();
+		public Dictionary<int, WhoringData> whoringData = new Dictionary<int, WhoringData>();
 
 		public DataStore(World world) : base(world)
 		{
@@ -21,13 +22,16 @@ namespace rjwwhoring
 			if (Scribe.mode == LoadSaveMode.Saving)
 			{
 				bedData.RemoveAll(item => item.Value == null || !item.Value.IsValid);
+				whoringData.RemoveAll(item => item.Value == null || !item.Value.IsValid);
 			}
 				
 			base.ExposeData();
 			Scribe_Collections.Look(ref bedData, "BedData", LookMode.Value, LookMode.Deep);
+			Scribe_Collections.Look(ref whoringData, "WhoringData", LookMode.Value, LookMode.Deep);
 			if (Scribe.mode == LoadSaveMode.LoadingVars)
 			{
 				if (bedData == null) bedData = new Dictionary<int, BedData>();
+				if (whoringData == null) whoringData = new Dictionary<int, WhoringData>();
 			}
 		}
 
@@ -46,5 +50,21 @@ namespace rjwwhoring
 			}
 			return res;
 		}
+
+		public WhoringData GetWhoringData(Pawn pawn)
+		{
+			WhoringData res;
+			var filled = whoringData.TryGetValue(pawn.thingIDNumber, out res);
+			if ((res == null) || (!res.IsValid))
+			{
+				if (filled)
+				{
+					whoringData.Remove(pawn.thingIDNumber);
+				}
+				res = new WhoringData(pawn);
+				whoringData.Add(pawn.thingIDNumber, res);
+			}
+			return res;
+		}
 	}
 }

1.4/Source/Mod/Data/PawnExtensions.cs

@@ -0,0 +1,17 @@
+using RimWorld;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Verse;
+
+namespace rjwwhoring
+{
+	public static class PawnExtensions
+	{
+		public static WhoringData WhoringData(this Pawn pawn)
+		{
+			return WhoringBase.DataStore.GetWhoringData(pawn);
+		}
+	}
+}

1.4/Source/Mod/Data/WhoringData.cs

@@ -0,0 +1,36 @@
+using System;
+using Verse;
+using System.Linq;
+using RimWorld;
+using static rjw.xxx;
+using System.Collections.ObjectModel;
+
+namespace rjwwhoring
+{
+	public class WhoringData : IExposable
+	{
+		public Pawn pawn;
+		public bool allowedForWhoringOwner = true;
+		public bool allowedForWhoringAll = false;
+		public int reservedForPawnID = 0;
+
+		public WhoringType WhoringPolicy = WhoringType.Silver;
+		public enum WhoringType { Silver, Goodwill };
+
+		public WhoringData() { }
+		public WhoringData(Pawn pawn)
+		{
+			this.pawn = pawn;
+		}
+
+		public void ExposeData()
+		{
+			Scribe_References.Look(ref pawn, "pawn");
+			Scribe_Values.Look(ref WhoringPolicy, "WhoringPolicy", WhoringType.Silver, true);
+			Scribe_Values.Look(ref allowedForWhoringOwner, "allowedForWhoringOwner", true, true);
+			Scribe_Values.Look(ref allowedForWhoringAll, "allowedForWhoringAll", false, true);
+		}
+
+		public bool IsValid { get { return pawn != null; } }
+	}
+}

1.4/Source/Mod/JobDrivers/JobDriver_WhoreIsServingVisitors.cs

@@ -143,26 +143,34 @@ namespace rjwwhoring
 
 					if (!(Partner.IsColonist && (pawn.IsPrisonerOfColony || pawn.IsColonist)))
 					{
-						int netPrice = (int) (basePrice * bedMult);
+						if (pawn.WhoringData().WhoringPolicy == WhoringData.WhoringType.Silver)
-						if (netPrice == 0)
-							netPrice += 1;
-						
-						int bedTip = netPrice - basePrice;
-						int defect = WhoringHelper.PayPriceToWhore(Partner, netPrice, pawn);
-						
-						if (WhoringBase.DebugWhoring)
 						{
-							ModLog.Message($"{GetType()}:afterSex toil - {Partner} tried to pay {basePrice}(whore price) + {bedTip}(room modifier) silver to {pawn}");
+							int netPrice = (int) (basePrice * bedMult);
+							if (netPrice == 0)
+								netPrice += 1;
 						
-							if (defect <= 0)
+							int bedTip = netPrice - basePrice;
-								ModLog.Message(" Paid full price");
+							int defect = WhoringHelper.PayPriceToWhore(Partner, netPrice, pawn);
-							else if (defect <= bedTip)
+						
-								ModLog.Message(" Could not pay full tip");
+							if (WhoringBase.DebugWhoring)
-							else
+							{
-								ModLog.Message(" Failed to pay base price");
+								ModLog.Message($"{GetType()}:afterSex toil - {Partner} tried to pay {basePrice}(whore price) + {bedTip}(room modifier) silver to {pawn}");
+
+								if (defect <= 0)
+									ModLog.Message(" Paid full price");
+								else if (defect <= bedTip)
+									ModLog.Message(" Could not pay full tip");
+								else
+									ModLog.Message(" Failed to pay base price");
+							}
+							WhoringHelper.UpdateRecords(pawn, netPrice - defect);
+						}
+						else
+						{
+							int bedTip = 1;
+							ModLog.Message($"{GetType()}:afterSex toil - {Partner} tried to pay {bedTip} goodwill to {pawn}");
+							WhoringHelper.PayRespectToWhore(Partner, bedTip, pawn);
 						}
-
-						WhoringHelper.UpdateRecords(pawn, netPrice - defect);
 					}
 
 					if (SexUtility.ConsiderCleaning(pawn))

1.4/Source/Mod/JobGivers/JobGiver_WhoreInvitingVisitors.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
+using HugsLib.Utils;
 using RimWorld;
 using rjw;
 using Verse;
@@ -18,6 +19,23 @@ namespace rjwwhoring
 			return val == null ? false : true;
 		}
 
+		public static Thought_Memory GetMemory(Pawn pawn, Pawn target, ThoughtDef thought)
+		{
+			Thought_Memory val = pawn.needs.mood.thoughts.memories.Memories.Find(
+				(Thought_Memory x) =>
+                {
+					if (x.def != thought)
+						return false;
+
+					if (x.otherPawn == null || x.otherPawn != target)
+						return false;
+
+					return true;
+				} 
+			);
+			return val;
+		}
+
 		//[SyncMethod]
 		private static bool Roll_to_skip(Pawn client, Pawn whore)
 		{
@@ -132,6 +150,7 @@ namespace rjwwhoring
 				&& !x.IsPrisoner
 				&& !xxx.is_slave(x)
 				&& !x.IsColonist
+				//&& (!x.IsColonist || x.guest?.GuestStatus == GuestStatus.Guest)
 				&& x.Position.DistanceTo(pos) < 100
 				&& xxx.is_healthy_enough(x));
 
@@ -146,6 +165,7 @@ namespace rjwwhoring
 			if (!potentialClients.Any()) return null;
 
 			if (WhoringBase.DebugWhoring) ModLog.Message($" FindAttractivePawn number of all potential clients {potentialClients.Count()}");
+			//if (WhoringBase.DebugWhoring) ModLog.Message($" FindAttractivePawn number of all potential clients {potentialClients.ListElements()}");
 
 			List<Pawn> valid_targets = new List<Pawn>();
 
@@ -165,6 +185,7 @@ namespace rjwwhoring
 				}
 
 			if (WhoringBase.DebugWhoring) ModLog.Message($" number of reachable clients {valid_targets.Count()}");
+			//if (WhoringBase.DebugWhoring) ModLog.Message($" number of reachable clients {valid_targets.ListElements()}");
 
 
 			//IEnumerable<Pawn> guestsSpawned = valid_targets.Where(x => x.Faction != whore.Faction
@@ -181,10 +202,29 @@ namespace rjwwhoring
 
 			//if (RJWSettings.DebugWhoring) ModLog.Message($" number of clients can memory OK {guestsSpawned.Count()}");
 
-			IEnumerable<Pawn> guestsSpawned = valid_targets.Where(x => x.Faction != whore.Faction
+			List<Pawn> guestsSpawned = new List<Pawn>();
-				&& !MemoryChecker(x, ThoughtDef.Named("RJWFailedSolicitation"))
+
-				&& WhoringHelper.CanAfford(x, whore, priceOfWhore)
+			foreach(Pawn x in valid_targets)
-				&& x != LovePartnerRelationUtility.ExistingLovePartner(whore));
+			{
+				bool canAfford = WhoringHelper.CanAfford(x, whore, priceOfWhore);
+				Thought_Memory refusedMmeory = GetMemory(x, whore, ThoughtDef.Named("RJWFailedSolicitation"));
+				bool refused = refusedMmeory != null;
+				DirectPawnRelation relationship = LovePartnerRelationUtility.ExistingLoveRealtionshipBetween(whore, x);
+				bool relation = relationship != null;
+				bool differentFaction = x.Faction != whore.Faction;
+
+				bool finalResult = canAfford && !refused && !relation && differentFaction;
+
+				if (WhoringBase.DebugWhoring)
+				{
+					ModLog.Message($"Pawn {x.Name} is an {(finalResult ? "acceptable" : "unacceptable")} client for {whore.Name}. Explanation: canAfford {canAfford.ToString()} refused: {refused.ToString()} relation: {relation.ToString()} differentFaction: {differentFaction.ToString()}");
+				}
+
+				if (canAfford && !refused && !relation && differentFaction)
+					guestsSpawned.Add(x);
+
+			}
+
 
 			if (guestsSpawned.Any())
 			{

1.4/Source/Mod/Whoring.csproj

@@ -78,6 +78,7 @@
     <Compile Include="Data\BedData.cs" />
     <Compile Include="Data\DataStore.cs" />
     <Compile Include="Data\StringListDef.cs" />
+    <Compile Include="Data\WhoringData.cs" />
     <Compile Include="DefOf\RecordDefDefOf.cs" />
     <Compile Include="harmony_Building_BedPatches.cs" />
     <Compile Include="harmony_AftersexPatch.cs" />
@@ -86,6 +87,8 @@
     <Compile Include="JobDrivers\JobDriver_WhoreIsServingVisitors.cs" />
     <Compile Include="JobGivers\JobGiver_WhoreInvitingVisitors.cs" />
     <Compile Include="Location\Brothel_Room.cs" />
+    <Compile Include="Data\PawnExtensions.cs" />
+    <Compile Include="WhoringTab\WhoringPolicyUIUtility.cs" />
     <Compile Include="WhoringTab\PawnColumnCheckbox_Whore.cs" />
     <Compile Include="WhoringTab\PawnColumnWorker_AverageMoneyByWhore.cs" />
     <Compile Include="WhoringTab\PawnColumnWorker_CountOfWhore.cs" />
@@ -95,6 +98,7 @@
     <Compile Include="WhoringTab\PawnColumnWorker_PriceRangeOfWhore.cs" />
     <Compile Include="WhoringTab\PawnColumnWorker_TextCenter.cs" />
     <Compile Include="WhoringTab\PawnColumnWorker_WhoreExperience.cs" />
+    <Compile Include="WhoringTab\PawnColumnWorker_WhoringPolicy.cs" />
     <Compile Include="WhoringTab\PawnTable_Whores.cs" />
     <Compile Include="WhoringTab\WhoreCheckbox.cs" />
     <Compile Include="ThinkTreeNodes\ThinkNode_ChancePerHour_Whore.cs" />

1.4/Source/Mod/WhoringTab/PawnColumnWorker_PriceRangeOfWhore.cs

@@ -16,8 +16,16 @@ namespace rjwwhoring.MainTab
 
 		protected override string GetTextFor(Pawn pawn)
 		{
-			min = WhoringHelper.WhoreMinPrice(pawn);
+			if (pawn.WhoringData().WhoringPolicy == WhoringData.WhoringType.Silver)
-			max = WhoringHelper.WhoreMaxPrice(pawn);
+			{
+				min = WhoringHelper.WhoreMinPrice(pawn);
+				max = WhoringHelper.WhoreMaxPrice(pawn);
+			}
+			else
+			{
+				min = 1;
+				max = 1;
+			}
 			return string.Format("{0} - {1}", min, max);
 		}
 
@@ -28,23 +36,30 @@ namespace rjwwhoring.MainTab
 
 		protected override string GetTip(Pawn pawn)
 		{
-			string minPriceTip = string.Format(
+			if (pawn.WhoringData().WhoringPolicy == WhoringData.WhoringType.Silver)
-				"  Base: {0}\n  Traits: {1}",
+			{
-				WhoringHelper.baseMinPrice,
+				string minPriceTip = string.Format(
-				(WhoringHelper.WhoreTraitAdjustmentMin(pawn) -1f).ToStringPercent()
+					"  Base: {0}\n  Traits: {1}",
-			);
+					WhoringHelper.baseMinPrice,
-			string maxPriceTip = string.Format(
+					(WhoringHelper.WhoreTraitAdjustmentMin(pawn) - 1f).ToStringPercent()
-				"  Base: {0}\n  Traits: {1}",
+				);
-				WhoringHelper.baseMaxPrice,
+				string maxPriceTip = string.Format(
-				(WhoringHelper.WhoreTraitAdjustmentMax(pawn) -1f).ToStringPercent()
+					"  Base: {0}\n  Traits: {1}",
-			);
+					WhoringHelper.baseMaxPrice,
-			string bothTip = string.Format(
+					(WhoringHelper.WhoreTraitAdjustmentMax(pawn) - 1f).ToStringPercent()
-				"  Gender: {0}\n  Age: {1}\n  Injuries: {2}",
+				);
-				(WhoringHelper.WhoreGenderAdjustment(pawn) - 1f).ToStringPercent(),
+				string bothTip = string.Format(
-				(WhoringHelper.WhoreAgeAdjustment(pawn) - 1f).ToStringPercent(),
+					"  Gender: {0}\n  Age: {1}\n  Injuries: {2}",
-				(WhoringHelper.WhoreInjuryAdjustment(pawn) - 1f).ToStringPercent()
+					(WhoringHelper.WhoreGenderAdjustment(pawn) - 1f).ToStringPercent(),
-			);
+					(WhoringHelper.WhoreAgeAdjustment(pawn) - 1f).ToStringPercent(),
-			return string.Format("Min:\n{0}\nMax:\n{1}\nBoth:\n{2}", minPriceTip, maxPriceTip, bothTip);
+					(WhoringHelper.WhoreInjuryAdjustment(pawn) - 1f).ToStringPercent()
+				);
+				return string.Format("Min:\n{0}\nMax:\n{1}\nBoth:\n{2}", minPriceTip, maxPriceTip, bothTip);
+			}
+			else
+			{
+				return string.Format("Raise Goodwill by 1");
+			}
 		}
 
 		private int GetValueToCompare(Pawn pawn)

1.4/Source/Mod/WhoringTab/PawnColumnWorker_WhoringPolicy.cs

@@ -0,0 +1,23 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using RimWorld;
+using RimWorld.Planet;
+using UnityEngine;
+using Verse;
+using Verse.Sound;
+
+namespace rjwwhoring.MainTab
+{
+	[StaticConstructorOnStartup]
+	public class PawnColumnWorker_WhoringPolicy : PawnColumnWorker
+	{
+		public override void DoCell(Rect rect, Pawn pawn, PawnTable table)
+		{
+			if (pawn.drugs != null)
+			{
+				WhoringPolicyUIUtility.DoAssignWhoringPolicyButtons(rect, pawn);
+			}
+		}
+	}
+}

1.4/Source/Mod/WhoringTab/WhoringPolicyUIUtility.cs

@@ -0,0 +1,45 @@
+using RimWorld;
+using System;
+using System.Collections.Generic;
+using UnityEngine;
+using Verse;
+
+namespace rjwwhoring
+{
+	public static class WhoringPolicyUIUtility
+	{
+		//public const string AssigningDrugsTutorHighlightTag = "ButtonAssignDrugs";
+
+		public static void DoAssignWhoringPolicyButtons(Rect rect, Pawn pawn)
+		{
+			int num = Mathf.FloorToInt(rect.width);
+			float x = rect.x;
+			Rect rect2 = new Rect(x, rect.y + 2f, num, rect.height - 4f);
+			string text = pawn.WhoringData().WhoringPolicy.ToStringSafe();
+
+			Widgets.Dropdown(rect2, pawn, (Pawn p) => p.WhoringData().WhoringPolicy, Button_GenerateMenu, text.Truncate(rect2.width), paintable: true);
+			//Widgets.Dropdown(rect2, pawn, (Pawn p) => p.drugs.CurrentPolicy, Button_GenerateMenu, text.Truncate(((Rect)(ref rect2)).get_width()), null, pawn.drugs.CurrentPolicy.label, null, delegate
+			//{
+			//	PlayerKnowledgeDatabase.KnowledgeDemonstrated(ConceptDefOf.DrugPolicies, KnowledgeAmount.Total);
+			//}, paintable: true);
+			x += num;
+			x += 4f;
+			//UIHighlighter.HighlightOpportunity(rect2, "ButtonAssignDrugs");
+		}
+
+		private static IEnumerable<Widgets.DropdownMenuElement<Enum>> Button_GenerateMenu(Pawn pawn)
+		{
+			foreach (WhoringData.WhoringType option in Enum.GetValues(typeof(WhoringData.WhoringType)))
+			{
+				yield return new Widgets.DropdownMenuElement<Enum>
+				{
+					option = new FloatMenuOption(option.ToString(), delegate
+					{
+						pawn.WhoringData().WhoringPolicy = option;
+					}),
+					payload = option
+				};
+			}
+		}
+	}
+}

1.4/Source/Mod/Whoring_Helper.cs

@@ -188,6 +188,8 @@ namespace rjwwhoring
 		public static bool CanAfford(Pawn targetPawn, Pawn whore, int priceOfWhore = -1)
 		{
 			//if (targetPawn.Faction == whore.Faction) return true;
+			if (whore.WhoringData().WhoringPolicy == WhoringData.WhoringType.Goodwill) return true;
+
 			if (WhoringBase.MoneyPrinting) return true;
 
 			//if (RJWSettings.DebugWhoring) ModLog.Message($"CanAfford for client {xxx.get_pawnname(targetPawn)}");
@@ -310,6 +312,19 @@ namespace rjwwhoring
 			return AmountLeft;
 		}
 
+		public static int PayRespectToWhore(Pawn targetPawn, int priceOfWhore, Pawn whore)
+		{
+			if ((targetPawn.Faction != whore.Faction && targetPawn.GuestStatus != GuestStatus.Guest))
+			{
+				if (WhoringBase.DebugWhoring) ModLog.Message($" No need to pay respect");
+				return 0;
+			}
+			targetPawn.Faction.TryAffectGoodwillWith(Faction.OfPlayer, priceOfWhore);
+			if (WhoringBase.DebugWhoring) ModLog.Message($" price: {priceOfWhore}, paid: {priceOfWhore}");
+
+			return priceOfWhore;
+		}
+
 		//[SyncMethod]
 		public static bool IsHookupAppealing(Pawn target, Pawn whore)
 		{

1.4/Source/Mod/harmony_Building_BedPatches.cs

@@ -10,7 +10,7 @@ using rjw;
 /// <summary>
 /// patches Building_Bed to add stuff for WhoreBeds
 /// 
-/// Also contains smaller patches for RoomRoleWorker_Barracks (don't count whore beds) (disabled) and Toils_LayDown.ApplyBedThoughts (slept in brothel thought)
+/// Also contains smaller patches for RoomRoleWorker_Barracks (don't count whore beds) (disabled), Toils_LayDown.ApplyBedThoughts (slept in brothel thought) and RestUtility (don't automatically claim brothel beds) 
 /// </summary>
 
 namespace rjwwhoring
@@ -288,5 +288,29 @@ namespace rjwwhoring
 				}
 			}
 		}
-	}
+
+        /// <summary>
+        ///Prevents automatic claiming of brothel beds (beds that allow anyone to use for whoring) 
+        ///Note, that intent is not verified here, and this works because bed usage for actual whoring does not rely on IsValidBedFor call.
+		///Should above change in future, this patch needs to be removed or adjusted
+		///If the bed is already claimed (for example - assigned manually to pawn), it will still be used. 
+		///<returns>Modifies __result to false, if bed is set to allow anyone for whroing AND is not already claimed.</returns>
+        /// </summary>
+        [HarmonyPatch(typeof(RestUtility), nameof(RestUtility.IsValidBedFor))]
+        public class RestUtility_IsValidBedFor_Patch
+        {
+            [HarmonyPostfix]
+            public static void Postfix(Pawn sleeper, Thing bedThing, ref bool __result)
+			{
+				if (!__result) return;
+                Building_Bed building_Bed = bedThing as Building_Bed;
+				bool isOwner = sleeper.ownership != null && sleeper.ownership.OwnedBed == bedThing; 
+                if (building_Bed.IsAllowedForWhoringAll() && !isOwner ) __result = false;  
+
+            }
+
+
+        }
+
+    }
 }

About/Manifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Manifest>
 	<identifier>RimJobWorld Whoring</identifier>
-	<version>1.0.2</version>
+	<version>1.0.6</version>
 	<dependencies>
 		<li>RimJobWorld</li>
 	</dependencies>