Various updates

Defs/FactionDefs/ReviaMarauders.xml

@@ -44,33 +44,43 @@
     </maxPawnCostPerTotalPointsCurve>
     <pawnGroupMakers>
       <li>
-        <!--Type 1 - high quantity, low quality-->
+        <!--Type 1 - Smaller scouting raid-->
         <kindDef>Combat</kindDef>
-        <commonality>30</commonality>
+        <commonality>60</commonality>
         <options>
-          <ReviaRaceRaider>20</ReviaRaceRaider>
-          <ReviaRaceMarauder>5</ReviaRaceMarauder>
+          <ReviaRaceRaider>5</ReviaRaceRaider>
+          <ReviaRaceMarauder>1</ReviaRaceMarauder>
         </options>
       </li>
       <li>
-        <!--Type 2 - high quality, low quantity-->
+        <!--Type 2 - Moderate sized raid-->
         <kindDef>Combat</kindDef>
         <commonality>30</commonality>
         <options>
           <ReviaRaceMarauder>5</ReviaRaceMarauder>
-          <ReviaRaceBerserker>5</ReviaRaceBerserker>
-          <ReviaRaceSkullshatterer>5</ReviaRaceSkullshatterer>
+          <ReviaRaceBerserker>2</ReviaRaceBerserker>
         </options>
       </li>
       <li>
-        <!--Type 3 - balanced-->
+        <!--Type 3 - Heavy assault raid-->
         <kindDef>Combat</kindDef>
-        <commonality>30</commonality>
+        <commonality>15</commonality>
         <options>
           <ReviaRaceRaider>10</ReviaRaceRaider>
           <ReviaRaceMarauder>5</ReviaRaceMarauder>
-          <ReviaRaceBerserker>3</ReviaRaceBerserker>
-          <ReviaRaceSkullshatterer>3</ReviaRaceSkullshatterer>
+          <ReviaRaceBerserker>2</ReviaRaceBerserker>
+          <ReviaRaceSkullshatterer>1</ReviaRaceSkullshatterer>
+        </options>
+      </li>
+      <li>
+        <!--Type 4 - Base siege -->
+        <kindDef>Combat</kindDef>
+        <commonality>5</commonality>
+        <options>
+          <ReviaRaceRaider>15</ReviaRaceRaider>
+          <ReviaRaceMarauder>10</ReviaRaceMarauder>
+          <ReviaRaceBerserker>5</ReviaRaceBerserker>
+          <ReviaRaceSkullshatterer>1</ReviaRaceSkullshatterer>
         </options>
       </li>
       <li>
@@ -80,7 +90,7 @@
           <ReviaRaceMarauder>15</ReviaRaceMarauder>
           <ReviaRaceRaider>15</ReviaRaceRaider>
           <ReviaRaceBerserker>5</ReviaRaceBerserker>
-          <ReviaRaceSkullshatterer>5</ReviaRaceSkullshatterer>
+          <ReviaRaceSkullshatterer>1</ReviaRaceSkullshatterer>
         </options>
       </li>
     </pawnGroupMakers>

Defs/FactionDefs/ReviaTemplars.xml

@@ -58,9 +58,19 @@
       <li>
         <!--You done goofed-->
         <kindDef>Combat</kindDef>
+        <commonality>15</commonality>
         <options>
-          <ReviaRaceTemplar>25</ReviaRaceTemplar>
-          <ReviaRaceHighTemplar>3</ReviaRaceHighTemplar>
+          <ReviaRaceTemplar>7</ReviaRaceTemplar>
+          <ReviaRaceHighTemplar>1</ReviaRaceHighTemplar>
+        </options>
+      </li>
+      <li>
+        <!--Scouting party-->
+        <kindDef>Combat</kindDef>
+        <commonality>60</commonality>
+        <options>
+          <ReviaRaceInitiate>5</ReviaRaceInitiate>
+          <ReviaRaceTemplar>2</ReviaRaceTemplar>
         </options>
       </li>
       <li>
@@ -93,9 +103,9 @@
       <li>
         <kindDef>Settlement</kindDef>
         <options>
-          <ReviaRaceInitiate>50</ReviaRaceInitiate>
-          <ReviaRaceTemplar>30</ReviaRaceTemplar>
-          <ReviaRaceHighTemplar>5</ReviaRaceHighTemplar>
+          <ReviaRaceInitiate>20</ReviaRaceInitiate>
+          <ReviaRaceTemplar>20</ReviaRaceTemplar>
+          <ReviaRaceHighTemplar>3</ReviaRaceHighTemplar>
         </options>
       </li>
     </pawnGroupMakers>

Defs/NeedDefs/RedHazeNeed.xml

@@ -6,6 +6,6 @@
     <label>Red Haze</label>
     <description>A strange, almost rabid bloodthirst grips this person. \n\nBloodstone powder appears to keep this almost uncontrollable fury away. Without it, however, this person degenerates into a berserk fury, attacking anyone and everyone around.</description>
     <listPriority>44</listPriority>
-    <fallPerDay>0.195</fallPerDay>
+    <fallPerDay>0.240</fallPerDay>
   </NeedDef>
 </Defs>

Defs/PawnKindDefs/ReviaMarauder/ReviaBerserker.xml

@@ -5,9 +5,10 @@
     <label>revia berserker</label>
     <race>ReviaRaceAlien</race>
     <defaultFactionType>ReviaMarauderFaction</defaultFactionType>
-    <combatPower>75</combatPower>
+    <combatPower>95</combatPower>
     <baseRecruitDifficulty>1.00</baseRecruitDifficulty>
     <itemQuality>Excellent</itemQuality>
+    <gearHealthRange>0.6~1.5</gearHealthRange>
     <apparelTags>
       <li>Neolithic</li>
       <li>Medieval</li>

Defs/PawnKindDefs/ReviaMarauder/ReviaMarauder.xml

@@ -5,10 +5,11 @@
     <label>revia marauder</label>
     <race>ReviaRaceAlien</race>
     <defaultFactionType>ReviaMarauderFaction</defaultFactionType>
-    <combatPower>55</combatPower>
+    <combatPower>75</combatPower>
     <canBeSapper>true</canBeSapper>
     <baseRecruitDifficulty>0.95</baseRecruitDifficulty>
     <itemQuality>Good</itemQuality>
+    <gearHealthRange>0.4~1.1</gearHealthRange>
     <apparelTags>
       <li>Neolithic</li>
       <li>Medieval</li>

Defs/PawnKindDefs/ReviaMarauder/ReviaRaider.xml

@@ -5,7 +5,7 @@
     <label>revia raider</label>
     <race>ReviaRaceAlien</race>
     <defaultFactionType>ReviaMarauderFaction</defaultFactionType>
-    <combatPower>35</combatPower>
+    <combatPower>55</combatPower>
     <baseRecruitDifficulty>0.65</baseRecruitDifficulty>
     <itemQuality>Poor</itemQuality>
     <apparelTags>

Defs/PawnKindDefs/ReviaMarauder/ReviaSkullshatterer.xml

@@ -5,7 +5,7 @@
     <label>revia skullshatterer</label>
     <race>ReviaRaceAlien</race>
     <defaultFactionType>ReviaMarauderFaction</defaultFactionType>
-    <combatPower>100</combatPower>
+    <combatPower>350</combatPower>
     <isFighter>true</isFighter>
     <factionLeader>true</factionLeader>
     <baseRecruitDifficulty>1.00</baseRecruitDifficulty>

Defs/PawnKindDefs/ReviaTemplar/ReviaHighTemplar.xml

@@ -5,7 +5,7 @@
     <label>Revia High Templar</label>
     <defaultFactionType>ReviaTemplarFaction</defaultFactionType>
     <race>ReviaRaceAlien</race>
-    <combatPower>100</combatPower>
+    <combatPower>350</combatPower>
     <factionLeader>true</factionLeader>
     <minGenerationAge>30</minGenerationAge>
     <baseRecruitDifficulty>1.0</baseRecruitDifficulty>

Defs/PawnKindDefs/ReviaTemplar/ReviaInitiate.xml

@@ -5,7 +5,7 @@
     <label>Revia Initiate</label>
     <defaultFactionType>ReviaTemplarFaction</defaultFactionType>
     <race>ReviaRaceAlien</race>
-    <combatPower>50</combatPower>
+    <combatPower>55</combatPower>
     <baseRecruitDifficulty>1.0</baseRecruitDifficulty>
     <itemQuality>Excellent</itemQuality>
     <apparelTags>

Defs/PawnKindDefs/ReviaTemplar/ReviaQuartermaster.xml

@@ -5,7 +5,7 @@
     <label>Revia quartermaster</label>
     <defaultFactionType>ReviaTemplarFaction</defaultFactionType>
     <race>ReviaRaceAlien</race>
-    <combatPower>55</combatPower>
+    <combatPower>80</combatPower>
     <baseRecruitDifficulty>1.0</baseRecruitDifficulty>
     <itemQuality>Excellent</itemQuality>
     <apparelTags>

Defs/PawnKindDefs/ReviaTemplar/ReviaTemplar.xml

@@ -5,7 +5,7 @@
     <label>Revia Templar</label>
     <defaultFactionType>ReviaTemplarFaction</defaultFactionType>
     <race>ReviaRaceAlien</race>
-    <combatPower>75</combatPower>
+    <combatPower>125</combatPower>
     <baseRecruitDifficulty>1.0</baseRecruitDifficulty>
     <itemQuality>Excellent</itemQuality>
     <apparelTags>

Defs/RecipeDefs/HumanlikeSacrifice.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Defs>
   <RecipeDef>
+    <workerClass>ReviaRace.Workers.SacrificeWorker</workerClass>
     <defName>ReviaRaceSacrificeCorpse</defName>
     <label>sacrifice humanlike</label>
     <description>Sacrifice a humanlike corpse to honour the bloody gods of the Revian pantheon.</description>

Languages/English/Keyed/Comps.xml

@@ -16,6 +16,7 @@
   <ReviaRaceSettingsSacrificeCostGrowthStartTier>Cost growth start tier</ReviaRaceSettingsSacrificeCostGrowthStartTier>
   <ReviaRaceSettingsSacrificeCostGrowthMode>Cost growth mode</ReviaRaceSettingsSacrificeCostGrowthMode>
   <ReviaRaceSettingsEnableRandomSoulReapTier>Assign random Soul Reap tier on spawn</ReviaRaceSettingsEnableRandomSoulReapTier>
+  <ReviaRaceSettingsEnableStripOnSacrifice>Strip corpses on sacrifice</ReviaRaceSettingsEnableStripOnSacrifice>
   <ReviaRaceSettingsSacrificeCostGreater>Bloodstone costs with current settings: {0}, {1}, {2}, {3}, {4}, {5}, {6}, {7}</ReviaRaceSettingsSacrificeCostGreater>
   <ReviaRaceSettingsSacrificeCostLesser>Palestone costs with current settings: {0}, {1}, {2}, {3}, {4}, {5}, {6}, {7}</ReviaRaceSettingsSacrificeCostLesser>
   <Linear>Linear</Linear>

Source/Helpers/Strings.cs

@@ -26,6 +26,7 @@ internal static class Strings
         internal static string SettingsSacrificeCostGrowthStartTier => "ReviaRaceSettingsSacrificeCostGrowthStartTier";
         internal static string SettingsSacrificeCostGrowthMode => "ReviaRaceSettingsSacrificeCostGrowthMode";
         internal static string SettingsSacrificeEnableRandomSoulReapTier => "ReviaRaceSettingsEnableRandomSoulReapTier";
+        internal static string SettingsSacrificeEnableStripOnSacrifice => "ReviaRaceSettingsEnableStripOnSacrifice";
         internal static string SettingsSacrificeCostGreater => "ReviaRaceSettingsSacrificeCostGreater";
         internal static string SettingsSacrificeCostLesser => "ReviaRaceSettingsSacrificeCostLesser";
         internal static string SettingsSacrificeCostHeader => "ReviaRaceSettingsSacrificeCostHeader";

Source/JobDrivers/SacrificePrisonerJobDriver.cs

@@ -127,7 +127,7 @@ protected override IEnumerable<Toil> MakeNewToils()
                             mapPawn.needs.mood.thoughts.memories.TryGainMemory(Defs.SacrificedPositive);
                         }
                         else if (mapPawn.IsColonist &&
-                                 mapPawn.IsCannibal() || mapPawn.IsPsychopath() || mapPawn.IsBloodlust())
+                                 !(mapPawn.IsCannibal() || mapPawn.IsPsychopath() || mapPawn.IsBloodlust()))
                         {
                             mapPawn.needs.mood.thoughts.memories.TryGainMemory(Defs.SacrificedNegative);
                         }

Source/PersistentData/ReviaSettings.cs

@@ -1,4 +1,5 @@
 using ReviaRace.Comps;
+using ReviaRace.Workers;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -27,6 +28,7 @@ public void ApplySettings()
             InvokeBlessing.CostGrowthMode = CostGrowthMode;
             InvokeBlessing.CostGrowthStartTier = CostGrowthStartTier;
             SoulReaper.EnableRandomSoulReapTier = EnableRandomSoulReapTier;
+            SacrificeWorker.EnableCorpseStripOnSacrifice = EnableCorpseStripOnSacrifice;
         }
 
         public float CostBase
@@ -62,13 +64,21 @@ public bool EnableRandomSoulReapTier
         }
         internal bool _enableRandomSoulReapTier;
 
+        public bool EnableCorpseStripOnSacrifice
+        {
+            get => _enableCorpseStripOnSacrifice;
+            set => _enableCorpseStripOnSacrifice = value;
+        }
+        internal bool _enableCorpseStripOnSacrifice;
+
         public override void ExposeData()
         {
             Scribe_Values.Look(ref _costBase, GetLabel(nameof(CostBase)), 1);
             Scribe_Values.Look(ref _costGrowthFactor, GetLabel(nameof(CostGrowthFactor)), 2);
             Scribe_Values.Look(ref _costGrowthStartTier, GetLabel(nameof(CostGrowthStartTier)), 1);
             Scribe_Values.Look(ref _costGrowthMode, GetLabel(nameof(CostGrowthMode)), SacrificeCostGrowth.Exponential);
             Scribe_Values.Look(ref _enableRandomSoulReapTier, GetLabel(nameof(EnableRandomSoulReapTier)), false);
+            Scribe_Values.Look(ref _enableCorpseStripOnSacrifice, GetLabel(nameof(EnableCorpseStripOnSacrifice)), true);
 
             ApplySettings();
         }

Source/ReviaRace.csproj

@@ -92,6 +92,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ReviaRaceMod.cs" />
     <Compile Include="RoomRoleWorkers\SkarneChapel.cs" />
+    <Compile Include="Workers\SacrificeWorker.cs" />
     <Compile Include="WorkGivers\SacrificePrisonerWorkGiver.cs" />
   </ItemGroup>
   <ItemGroup />

Source/ReviaRaceMod.cs

@@ -49,7 +49,7 @@ public override void DoSettingsWindowContents(Rect inRect)
             var sacrificeList = new Listing_Standard();
             var height
                 = 3 * 10
-                + (bodyStyle.lineHeight + 8) * 6
+                + (bodyStyle.lineHeight + 8) * 10
                 + (headerStyle.lineHeight);
 
             var sacrificeGroupRect = new Rect(inRect.x + 10, inRect.y + 10, inRect.width - 20, height);
@@ -69,6 +69,7 @@ var height
             DrawTextFieldWithLabel(sacrificeList.GetRect(lineHeight), Strings.SettingsSacrificeCostGrowthFactor, ref Settings._costGrowthFactor, ref _growthFactorBuf, 0, 10);
             DrawTextFieldWithLabel(sacrificeList.GetRect(lineHeight), Strings.SettingsSacrificeCostGrowthStartTier, ref Settings._costGrowthStartTier, ref _growthStartTierBuf, 1, 8);
             DrawCheckBoxWithLabel(sacrificeList.GetRect(lineHeight), Strings.SettingsSacrificeEnableRandomSoulReapTier, ref Settings._enableRandomSoulReapTier);
+            DrawCheckBoxWithLabel(sacrificeList.GetRect(lineHeight), Strings.SettingsSacrificeEnableStripOnSacrifice, ref Settings._enableCorpseStripOnSacrifice);
 
             sacrificeList.Gap(10);
             DrawCostCalculationLabel(sacrificeList.GetRect(lineHeight), typeof(InvokeGreaterBlessing));

Source/Workers/SacrificeWorker.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+
+namespace ReviaRace.Workers
+{
+    public class SacrificeWorker : RecipeWorker
+    {
+        public static bool EnableCorpseStripOnSacrifice { get; set; }
+
+        public override void ConsumeIngredient(Thing ingredient, RecipeDef recipe, Map map)
+        {
+            if (EnableCorpseStripOnSacrifice)
+            {
+                var corpse = ingredient as Corpse;
+                corpse.Strip();
+            }
+
+            base.ConsumeIngredient(ingredient, recipe, map);
+        }
+    }
+}