changed whoring tab to show all pawns

changed column descriptions
changed comfort prisoner column into prisoners/slaves
added experience column

Defs/MainTab/PawnColumnDefs/PawnColumns.xml

@@ -2,21 +2,31 @@
 <Defs>
 	<PawnColumnDef>
 		<defName>IsWhore</defName>
-		<headerTip>indicates whether pawn is whore</headerTip>
+		<headerTip>pawn is a whore</headerTip>
 		<headerIcon>UI/Tab/Service_off</headerIcon>
 		<workerClass>rjw.MainTab.PawnColumnWorker_IsWhore</workerClass>
+		<sortable>true</sortable>
 		<width>80</width>
 	</PawnColumnDef>
 	<PawnColumnDef>
-		<defName>IsComfortPrisoner</defName>
-		<headerTip>indicates whether pawn is comfort prisoner</headerTip>
+		<defName>IsPrisoner</defName>
+		<headerTip>pawn is prisoner or slave</headerTip>
 		<headerIcon>UI/Tab/ComfortPrisoner_off</headerIcon>
-		<workerClass>rjw.MainTab.PawnColumnWorker_IsComfortPrisoner</workerClass>
+		<workerClass>rjw.MainTab.PawnColumnWorker_IsPrisoner</workerClass>
+		<sortable>true</sortable>
 		<width>80</width>
 	</PawnColumnDef>
+	<PawnColumnDef>
+		<defName>WhoreExperience</defName>
+		<headerTip>whoring experience</headerTip>
+		<label>Experience</label>
+		<workerClass>rjw.MainTab.PawnColumnWorker_WhoreExperience</workerClass>
+		<sortable>true</sortable>
+		<width>100</width>
+	</PawnColumnDef>
 	<PawnColumnDef>
 		<defName>RoomAdjustmentOfWhore</defName>
-		<headerTip>room adjustment value of whore</headerTip>
+		<headerTip>whoring room impressiveness -> price modifier</headerTip>
 		<label>Room</label>
 		<workerClass>rjw.MainTab.PawnColumnWorker_RoomAdjustmentOfWhore</workerClass>
 		<sortable>true</sortable>
@@ -32,7 +42,7 @@
 	</PawnColumnDef>
 	<PawnColumnDef>
 		<defName>EarnedMoneyByWhore</defName>
-		<headerTip>money earned by whore</headerTip>
+		<headerTip>money earned(total)</headerTip>
 		<label>Earned</label>
 		<workerClass>rjw.MainTab.PawnColumnWorker_EarnedMoneyByWhore</workerClass>
 		<sortable>true</sortable>
@@ -48,7 +58,7 @@
 	</PawnColumnDef>
 	<PawnColumnDef>
 		<defName>AverageMoneyByWhore</defName>
-		<headerTip>average money earned by whore</headerTip>
+		<headerTip>money earned(average)</headerTip>
 		<label>Average</label>
 		<workerClass>rjw.MainTab.PawnColumnWorker_AverageMoneyByWhore</workerClass>
 		<sortable>true</sortable>

Defs/MainTab/PawnTableDefs.xml

@@ -7,12 +7,13 @@
 		<columns>
 			<li>Label</li>
 			<li>IsWhore</li>
-			<li>IsComfortPrisoner</li>
+			<li>IsPrisoner</li>
 			<li>Mood</li>
 			<li>GapTiny</li>
 			<li>CountOfWhore</li>
 			<li>EarnedMoneyByWhore</li>
 			<li>AverageMoneyByWhore</li>
+			<li>WhoreExperience</li>
 			<li>GapTiny</li>
 			<li>PriceRangeOfWhore</li>
 			<li>RoomAdjustmentOfWhore</li>

RimJobWorld.Main.csproj

@@ -64,6 +64,7 @@
     <Compile Include="Source\Harmony\SocialCardUtilityPatch.cs" />
     <Compile Include="Source\Hediffs\Hediff_PartBase.cs" />
     <Compile Include="Source\JobDrivers\JobDriver_Sex.cs" />
+    <Compile Include="Source\MainTab\PawnColumnWorker_WhoreExperience.cs" />
     <Compile Include="Source\Modules\Androids\AndroidsCompatibility.cs" />
     <Compile Include="Source\Modules\Bondage\bondage_gear.cs" />
     <Compile Include="Source\Common\Helpers\Breeder_Helper.cs" />
@@ -242,7 +243,7 @@
     <Compile Include="Source\MainTab\PawnColumnWorker_PriceRangeOfWhore.cs" />
     <Compile Include="Source\MainTab\PawnColumnWorker_AverageMoneyByWhore.cs" />
     <Compile Include="Source\MainTab\PawnColumnWorker_TextCenter.cs" />
-    <Compile Include="Source\MainTab\PawnColumnWorker_IsComfortPrisoner.cs" />
+    <Compile Include="Source\MainTab\PawnColumnWorker_IsPrisoner.cs" />
     <Compile Include="Source\MainTab\PawnColumnWorker_EarnedMoneyByWhore.cs" />
   </ItemGroup>
   <ItemGroup>

Source/MainTab/MainTabWindow_Brothel.cs

@@ -13,8 +13,7 @@ namespace rjw.MainTab
 
 		protected override PawnTableDef PawnTableDef => pawnTableDef ?? (pawnTableDef = DefDatabase<PawnTableDef>.GetNamed("Brothel"));
 
-		protected override IEnumerable<Pawn> Pawns => Find.CurrentMap.mapPawns.AllPawns.Where(p => p.IsDesignatedService() || p.IsDesignatedComfort());
-
+		protected override IEnumerable<Pawn> Pawns => Find.CurrentMap.mapPawns.AllPawns.Where(p => xxx.is_human(p) && p.Faction != null && p.Faction.IsPlayer);
 
 		public override void PostOpen()
 		{

Source/MainTab/PawnColumnWorker_IsComfortPrisoner.cs → Source/MainTab/PawnColumnWorker_IsPrisoner.cs

@@ -9,14 +9,14 @@ using Verse;
 namespace rjw.MainTab
 {
 	[StaticConstructorOnStartup]
-	public class PawnColumnWorker_IsComfortPrisoner : PawnColumnWorker_Icon
+	public class PawnColumnWorker_IsPrisoner : PawnColumnWorker_Icon
 	{
 		private static readonly Texture2D comfortOn = ContentFinder<Texture2D>.Get("UI/Tab/ComfortPrisoner_on");
 		private readonly Texture2D comfortOff = ContentFinder<Texture2D>.Get("UI/Tab/ComfortPrisoner_off");
 
 		protected override Texture2D GetIconFor(Pawn pawn)
 		{
-			return pawn.IsDesignatedComfort() ? comfortOn : null;
+			return pawn.IsPrisonerOfColony || xxx.is_slave(pawn) ? comfortOn : null;
 		}
 	}
 }
\ No newline at end of file

Source/MainTab/PawnColumnWorker_WhoreExperience.cs

+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using RimWorld;
+using RimWorld.Planet;
+using UnityEngine;
+using Verse;
+
+namespace rjw.MainTab
+{
+	[StaticConstructorOnStartup]
+	public class PawnColumnWorker_WhoreExperience : PawnColumnWorker_TextCenter
+	{
+		public static readonly RecordDef CountOfWhore = DefDatabase<RecordDef>.GetNamed("CountOfWhore");
+		
+		public static readonly HashSet<string> backstories = new HashSet<string>(DefDatabase<StringListDef>.GetNamed("WhoreBackstories").strings);
+
+		protected override string GetTextFor(Pawn pawn)
+		{
+
+			int b = backstories.Contains(pawn.story?.adulthood?.titleShort) ? 30 : 0;
+			int score = pawn.records.GetAsInt(CountOfWhore);
+			return (score + b).ToString();
+		}
+	}
+}
\ No newline at end of file