From 4c93b428e1678db7570e756fd6917f956fe7255d Mon Sep 17 00:00:00 2001
From: Cocopomel <79386233+Cocopomel@users.noreply.github.com>
Date: Sun, 5 Feb 2023 14:14:29 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B0=94=EC=9D=B4=EC=98=A4=ED=85=A4=20?=
 =?UTF-8?q?=EC=97=85=EB=8E=83=202?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Ideo_AbilityDef_Industrial.xml            |  4 +-
 .../Ideo_Hediffs_Cast_Industrial.xml          | 14 +++--
 .../HediffDefs/Ideo_Hediffs_Cast_Spacer.xml   |  2 +
 .../HediffDefs/Hediffs_AutomatonGrade.xml     | 57 ++++++++++++++++++-
 .../HediffDefs/Hediffs_AutomatonGrade_PA.xml  |  4 +-
 .../PawnKindsDef_Paniel/PawnKind_Faction.xml  | 46 +++++++++++----
 1.4/Defs/RecipeDefs/Recipes_Surgery.xml       |  2 +-
 1.4/Defs/ThingDef/ThingDef_Apparel_TierA.xml  | 13 +++++
 1.4/Defs/ThingDef/ThingDef_Apparel_TierB.xml  |  2 +-
 1.4/Defs/ThingDef/ThingDef_Apparel_TierC.xml  |  3 +-
 1.4/Defs/ThingDef/ThingDef_Item.xml           |  8 +--
 1.4/Defs/ThingDef/ThingDef_Module.xml         | 17 +++---
 12 files changed, 132 insertions(+), 40 deletions(-)

diff --git a/1.4 Ideology/Defs/AbilityDefs/Ideo_AbilityDef_Industrial.xml b/1.4 Ideology/Defs/AbilityDefs/Ideo_AbilityDef_Industrial.xml
index dc3fe00..9b9133e 100644
--- a/1.4 Ideology/Defs/AbilityDefs/Ideo_AbilityDef_Industrial.xml	
+++ b/1.4 Ideology/Defs/AbilityDefs/Ideo_AbilityDef_Industrial.xml	
@@ -27,7 +27,7 @@
     <uiOrder>3</uiOrder>
     <warmupStartSound>CombatCommand_Warmup</warmupStartSound>
     <statBases>
-      <Ability_Duration>84</Ability_Duration>
+      <Ability_Duration>167</Ability_Duration>
     </statBases>
     <verbProperties>
       <verbClass>Verb_CastAbility</verbClass>
@@ -76,7 +76,7 @@
     <uiOrder>3</uiOrder>
     <warmupStartSound>CombatCommand_Warmup</warmupStartSound>
     <statBases>
-      <Ability_Duration>84</Ability_Duration>
+      <Ability_Duration>167</Ability_Duration>
     </statBases>
     <verbProperties>
       <verbClass>Verb_CastAbility</verbClass>
diff --git a/1.4 Ideology/Defs/HediffDefs/Ideo_Hediffs_Cast_Industrial.xml b/1.4 Ideology/Defs/HediffDefs/Ideo_Hediffs_Cast_Industrial.xml
index 59cf1ac..f6c777a 100644
--- a/1.4 Ideology/Defs/HediffDefs/Ideo_Hediffs_Cast_Industrial.xml	
+++ b/1.4 Ideology/Defs/HediffDefs/Ideo_Hediffs_Cast_Industrial.xml	
@@ -88,9 +88,10 @@
           </li>
         </capMods>
         <statOffsets>
-          <MeleeHitChance>4</MeleeHitChance>
-          <MeleeDodgeChance>4</MeleeDodgeChance>
-          <ShootingAccuracyPawn>-4</ShootingAccuracyPawn>
+          <MeleeHitChance>2</MeleeHitChance>
+          <MeleeDodgeChance>2</MeleeDodgeChance>
+          <IncomingDamageFactor>-0.15</IncomingDamageFactor>
+          <MeleeDamageFactor MayRequire="Ludeon.RimWorld.Biotech">0.10</MeleeDamageFactor>
         </statOffsets>
       </li>
     </stages>
@@ -134,9 +135,10 @@
           </li>
         </capMods>
         <statOffsets>
-          <MeleeHitChance>-3</MeleeHitChance>
-          <MeleeDodgeChance>-3</MeleeDodgeChance>
-          <ShootingAccuracyPawn>-4</ShootingAccuracyPawn>
+          <MeleeHitChance>-4</MeleeHitChance>
+          <MeleeDodgeChance>-4</MeleeDodgeChance>
+          <IncomingDamageFactor>-0.25</IncomingDamageFactor>
+          <MeleeDamageFactor MayRequire="Ludeon.RimWorld.Biotech">-0.20</MeleeDamageFactor>
         </statOffsets>
       </li>
     </stages>
diff --git a/1.4 Ideology/Defs/HediffDefs/Ideo_Hediffs_Cast_Spacer.xml b/1.4 Ideology/Defs/HediffDefs/Ideo_Hediffs_Cast_Spacer.xml
index 41d7ed4..f9bcc92 100644
--- a/1.4 Ideology/Defs/HediffDefs/Ideo_Hediffs_Cast_Spacer.xml	
+++ b/1.4 Ideology/Defs/HediffDefs/Ideo_Hediffs_Cast_Spacer.xml	
@@ -34,6 +34,7 @@
       <li>
         <statOffsets>
           <ShootingAccuracyPawn>2</ShootingAccuracyPawn>
+          <MeleeDamageFactor MayRequire="Ludeon.RimWorld.Biotech">0.10</MeleeDamageFactor>
         </statOffsets>
         <statFactors>
           <AimingDelayFactor>0.80</AimingDelayFactor>
@@ -70,6 +71,7 @@
       <li>
         <statOffsets>
           <ShootingAccuracyPawn>2</ShootingAccuracyPawn>
+          <MeleeDamageFactor MayRequire="Ludeon.RimWorld.Biotech">0.10</MeleeDamageFactor>
         </statOffsets>
         <statFactors>
           <AimingDelayFactor>0.80</AimingDelayFactor>
diff --git a/1.4/Defs/HediffDefs/Hediffs_AutomatonGrade.xml b/1.4/Defs/HediffDefs/Hediffs_AutomatonGrade.xml
index 26ffd9a..0454734 100644
--- a/1.4/Defs/HediffDefs/Hediffs_AutomatonGrade.xml
+++ b/1.4/Defs/HediffDefs/Hediffs_AutomatonGrade.xml
@@ -111,6 +111,54 @@
 
   <!--전투형 베이스-->
 
+  <HediffDef ParentName="PN_Sync_Base" Abstract="True" Name="PN_SyncNormal_Base_C">
+    <description>This pawn is an automaton.\nAfter production, it was rated normal grade.</description>
+    <stages>
+      <li>
+        <capMods>
+          <li>
+            <capacity>Moving</capacity>
+            <offset>0.05</offset>
+          </li>
+          <li>
+            <capacity>Sight</capacity>
+            <offset>0.05</offset>
+          </li>
+          <li>
+            <capacity>Manipulation</capacity>
+            <offset>0.05</offset>
+          </li>
+        </capMods>
+      </li>
+    </stages>
+  </HediffDef>
+
+  <HediffDef ParentName="PN_Sync_Base" Abstract="True" Name="PN_SyncGood_Base_C">
+    <description>This pawn is an automaton.\nAfter production, it was rated good grade.</description>
+    <stages>
+      <li>
+        <capMods>
+          <li>
+            <capacity>Consciousness</capacity>
+            <offset>0.05</offset>
+          </li>
+          <li>
+            <capacity>Moving</capacity>
+            <offset>0.10</offset>
+          </li>
+          <li>
+            <capacity>Sight</capacity>
+            <offset>0.10</offset>
+          </li>
+          <li>
+            <capacity>Manipulation</capacity>
+            <offset>0.10</offset>
+          </li>
+        </capMods>
+      </li>
+    </stages>
+  </HediffDef>
+
   <HediffDef ParentName="PN_Sync_Base" Abstract="True" Name="PN_SyncExcellent_Base_C">
     <description>This pawn is an automaton.\nAfter production, it was rated excellent grade.</description>
     <stages>
@@ -135,6 +183,7 @@
         </capMods>
         <statOffsets>
           <IncomingDamageFactor>-0.10</IncomingDamageFactor>
+          <MeleeDamageFactor MayRequire="Ludeon.RimWorld.Biotech">0.10</MeleeDamageFactor>
         </statOffsets>
       </li>
     </stages>
@@ -164,6 +213,7 @@
         </capMods>
         <statOffsets>
           <IncomingDamageFactor>-0.20</IncomingDamageFactor>
+          <MeleeDamageFactor MayRequire="Ludeon.RimWorld.Biotech">0.20</MeleeDamageFactor>
           <AimingDelayFactor>-0.10</AimingDelayFactor>
           <MentalBreakThreshold>-0.04</MentalBreakThreshold>
         </statOffsets>
@@ -194,7 +244,8 @@
           </li>
         </capMods>
         <statOffsets>
-          <IncomingDamageFactor>-0.40</IncomingDamageFactor>
+          <IncomingDamageFactor>-0.35</IncomingDamageFactor>
+          <MeleeDamageFactor MayRequire="Ludeon.RimWorld.Biotech">0.35</MeleeDamageFactor>
           <AimingDelayFactor>-0.25</AimingDelayFactor>
           <MentalBreakThreshold>-0.08</MentalBreakThreshold>
         </statOffsets>
@@ -315,7 +366,7 @@
     </comps>
   </HediffDef>
 
-  <HediffDef ParentName="PN_SyncNormal_Base">
+  <HediffDef ParentName="PN_SyncNormal_Base_C">
     <defName>PN_SyncNormal_Combat</defName>
     <label>Combat model (norm)</label>
   </HediffDef>
@@ -340,7 +391,7 @@
     </comps>
   </HediffDef>
 
-  <HediffDef ParentName="PN_SyncGood_Base">
+  <HediffDef ParentName="PN_SyncGood_Base_C">
     <defName>PN_SyncGood_Combat</defName>
     <label>Combat model (good)</label>
   </HediffDef>
diff --git a/1.4/Defs/HediffDefs/Hediffs_AutomatonGrade_PA.xml b/1.4/Defs/HediffDefs/Hediffs_AutomatonGrade_PA.xml
index 7fa0dac..cca3c10 100644
--- a/1.4/Defs/HediffDefs/Hediffs_AutomatonGrade_PA.xml
+++ b/1.4/Defs/HediffDefs/Hediffs_AutomatonGrade_PA.xml
@@ -61,7 +61,7 @@
     </comps>
   </HediffDef>
 
-  <HediffDef ParentName="PN_SyncNormal_Base">
+  <HediffDef ParentName="PN_SyncNormal_Base_C">
     <defName>PN_SyncNormal_Combat_PA</defName>
     <label>Combat model (norm)</label>
   </HediffDef>
@@ -89,7 +89,7 @@
     </comps>
   </HediffDef>
 
-  <HediffDef ParentName="PN_SyncGood_Base">
+  <HediffDef ParentName="PN_SyncGood_Base_C">
     <defName>PN_SyncGood_Combat_PA</defName>
     <label>Combat model (good)</label>
   </HediffDef>
diff --git a/1.4/Defs/PawnKindsDef_Paniel/PawnKind_Faction.xml b/1.4/Defs/PawnKindsDef_Paniel/PawnKind_Faction.xml
index add152c..ac9dfce 100644
--- a/1.4/Defs/PawnKindsDef_Paniel/PawnKind_Faction.xml
+++ b/1.4/Defs/PawnKindsDef_Paniel/PawnKind_Faction.xml
@@ -65,9 +65,12 @@
     <useFactionXenotypes>false</useFactionXenotypes>
     <xenotypeSet>
       <xenotypeChances>
-        <Neanderthal MayRequire="Ludeon.RimWorld.Biotech">0.75</Neanderthal>
-        <Hussar MayRequire="Ludeon.RimWorld.Biotech">0.03</Hussar>
-        <Genie MayRequire="Ludeon.RimWorld.Biotech">0.03</Genie>
+        <Pigskin MayRequire="Ludeon.RimWorld.Biotech">0.1</Pigskin>
+				<Neanderthal MayRequire="Ludeon.RimWorld.Biotech">0.1</Neanderthal>
+        <Impid MayRequire="Ludeon.RimWorld.Biotech">0.1</Impid>
+        <Genie MayRequire="Ludeon.RimWorld.Biotech">0.05</Genie>
+				<Yttakin MayRequire="Ludeon.RimWorld.Biotech">0.1</Yttakin>
+        <Highmate MayRequire="Ludeon.RimWorld.Biotech">0.05</Highmate>
       </xenotypeChances>
     </xenotypeSet>
 	</PawnKindDef>
@@ -258,9 +261,9 @@
     <useFactionXenotypes>false</useFactionXenotypes>
     <xenotypeSet>
       <xenotypeChances>
-        <Neanderthal MayRequire="Ludeon.RimWorld.Biotech">0.05</Neanderthal>
-        <Hussar MayRequire="Ludeon.RimWorld.Biotech">0.05</Hussar>
-        <Genie MayRequire="Ludeon.RimWorld.Biotech">0.05</Genie>
+        <Yttakin MayRequire="Ludeon.RimWorld.Biotech">0.2</Yttakin>
+        <Highmate MayRequire="Ludeon.RimWorld.Biotech">0.2</Highmate>
+        <Genie MayRequire="Ludeon.RimWorld.Biotech">0.2</Genie>
       </xenotypeChances>
     </xenotypeSet>
 	</PawnKindDef>
@@ -375,9 +378,9 @@
     <useFactionXenotypes>false</useFactionXenotypes>
     <xenotypeSet>
       <xenotypeChances>
-        <Neanderthal MayRequire="Ludeon.RimWorld.Biotech">0.05</Neanderthal>
-        <Hussar MayRequire="Ludeon.RimWorld.Biotech">0.05</Hussar>
-        <Genie MayRequire="Ludeon.RimWorld.Biotech">0.05</Genie>
+				<Yttakin MayRequire="Ludeon.RimWorld.Biotech">0.2</Yttakin>
+        <Highmate MayRequire="Ludeon.RimWorld.Biotech">0.2</Highmate>
+        <Genie MayRequire="Ludeon.RimWorld.Biotech">0.2</Genie>
       </xenotypeChances>
     </xenotypeSet>
 	</PawnKindDef>
@@ -411,9 +414,9 @@
 		<useFactionXenotypes>false</useFactionXenotypes>
     <xenotypeSet>
       <xenotypeChances>
-        <Neanderthal MayRequire="Ludeon.RimWorld.Biotech">0.05</Neanderthal>
-        <Hussar MayRequire="Ludeon.RimWorld.Biotech">0.05</Hussar>
-        <Genie MayRequire="Ludeon.RimWorld.Biotech">0.05</Genie>
+        <Yttakin MayRequire="Ludeon.RimWorld.Biotech">0.2</Yttakin>
+        <Highmate MayRequire="Ludeon.RimWorld.Biotech">0.2</Highmate>
+        <Genie MayRequire="Ludeon.RimWorld.Biotech">0.2</Genie>
       </xenotypeChances>
     </xenotypeSet>
 	</PawnKindDef>
@@ -474,6 +477,12 @@
 		</techHediffsTags>
 		<initialWillRange>1~3</initialWillRange>
 		<initialResistanceRange>15~24</initialResistanceRange>
+		<xenotypeSet>
+      <xenotypeChances>
+        <Neanderthal MayRequire="Ludeon.RimWorld.Biotech">0.25</Neanderthal>
+        <Impid MayRequire="Ludeon.RimWorld.Biotech">0.25</Impid>
+      </xenotypeChances>
+    </xenotypeSet>
 	</PawnKindDef>
 
 	<PawnKindDef ParentName="PN_PanielBasePawnKind">
@@ -663,6 +672,7 @@
 		</disallowedTraits>
 		<apparelRequired>
 			<li>Apparel_ShieldBelt</li>
+			<li>PN_CQCModule</li>
 		</apparelRequired>
 	</PawnKindDef>
 
@@ -675,6 +685,9 @@
 		<apparelTags>
 			<li>BeltDefensePop</li>
 		</apparelTags>
+		<apparelRequired>
+			<li>PN_RapidFireModule</li>
+		</apparelRequired>
 		<weaponMoney>1100~2500</weaponMoney>
 		<disallowedTraits>
 			<li>Brawler</li>
@@ -690,6 +703,9 @@
 		<apparelTags>
 			<li>BeltDefensePop</li>
 		</apparelTags>
+		<apparelRequired>
+			<li>PN_RapidFireModule</li>
+		</apparelRequired>
 		<weaponMoney>1100~2500</weaponMoney>
 		<disallowedTraits>
 			<li>Brawler</li>
@@ -702,6 +718,12 @@
 		<weaponTags>
 			<li>PN_Cannon</li>
 		</weaponTags>
+		<apparelTags>
+			<li>BeltDefensePop</li>
+		</apparelTags>
+		<apparelRequired>
+			<li>PN_RapidFireModule</li>
+		</apparelRequired>
 		<weaponMoney>1100~2500</weaponMoney>
 		<disallowedTraits>
 			<li>Brawler</li>
diff --git a/1.4/Defs/RecipeDefs/Recipes_Surgery.xml b/1.4/Defs/RecipeDefs/Recipes_Surgery.xml
index 7a47f25..ab2d83d 100644
--- a/1.4/Defs/RecipeDefs/Recipes_Surgery.xml
+++ b/1.4/Defs/RecipeDefs/Recipes_Surgery.xml
@@ -66,7 +66,7 @@
             <li>PN_RepairKit</li>
           </thingDefs>
         </filter>
-        <count>2</count>
+        <count>1</count>
       </li>
     </ingredients>
   </RecipeDef>
diff --git a/1.4/Defs/ThingDef/ThingDef_Apparel_TierA.xml b/1.4/Defs/ThingDef/ThingDef_Apparel_TierA.xml
index 68f5eb0..4a29f06 100644
--- a/1.4/Defs/ThingDef/ThingDef_Apparel_TierA.xml
+++ b/1.4/Defs/ThingDef/ThingDef_Apparel_TierA.xml
@@ -46,6 +46,11 @@
   <ThingDef ParentName="PN_ApparelBase">
     <defName>PN_ApparelBasic</defName>
     <label>PnL basic shirt and boots</label>
+    <recipeMaker>
+      <recipeUsers>
+        <li>PN_AutomatonBench</li>
+      </recipeUsers>
+    </recipeMaker>
     <description>This is a basic paniel costume. It consists of a shirt and boots.</description>
     <graphicData>
       <texPath>Things/Apparel/PNBasic1</texPath>
@@ -109,6 +114,11 @@
   <ThingDef ParentName="PN_HatBase">
     <defName>PN_ApparelBasicHat</defName>
     <label>PnL basic hat</label>
+    <recipeMaker>
+      <recipeUsers>
+        <li>PN_AutomatonBench</li>
+      </recipeUsers>
+    </recipeMaker>
     <description>This is a basic paniel hat.</description>
     <graphicData>
       <texPath>Things/Apparel/hats/PNbasichat1</texPath>
@@ -174,6 +184,9 @@
     <label>PnL cape</label>
     <recipeMaker>
       <researchPrerequisite>ComplexClothing</researchPrerequisite>
+      <recipeUsers>
+        <li>PN_AutomatonBench</li>
+      </recipeUsers>
     </recipeMaker>
     <graphicData>
       <texPath>Things/Apparel/PNCape1</texPath>
diff --git a/1.4/Defs/ThingDef/ThingDef_Apparel_TierB.xml b/1.4/Defs/ThingDef/ThingDef_Apparel_TierB.xml
index 2032acc..c6347c1 100644
--- a/1.4/Defs/ThingDef/ThingDef_Apparel_TierB.xml
+++ b/1.4/Defs/ThingDef/ThingDef_Apparel_TierB.xml
@@ -42,7 +42,7 @@
     <equippedStatOffsets>
       <WorkSpeedGlobal>-0.15</WorkSpeedGlobal>
       <MeleeDodgeChance>1</MeleeDodgeChance>
-      <Flammability>-0.20</Flammability>
+      <Flammability>-0.60</Flammability>
     </equippedStatOffsets>
     <apparel>
       <bodyPartGroups>
diff --git a/1.4/Defs/ThingDef/ThingDef_Apparel_TierC.xml b/1.4/Defs/ThingDef/ThingDef_Apparel_TierC.xml
index 30a33da..a10e961 100644
--- a/1.4/Defs/ThingDef/ThingDef_Apparel_TierC.xml
+++ b/1.4/Defs/ThingDef/ThingDef_Apparel_TierC.xml
@@ -84,7 +84,8 @@
     <equippedStatOffsets>
       <WorkSpeedGlobal>-0.35</WorkSpeedGlobal>
       <MeleeDodgeChance>3</MeleeDodgeChance>
-      <Flammability>-0.35</Flammability>
+      <IncomingDamageFactor>-0.1</IncomingDamageFactor>
+      <Flammability>-0.60</Flammability>
     </equippedStatOffsets>
     <apparel>
       <bodyPartGroups>
diff --git a/1.4/Defs/ThingDef/ThingDef_Item.xml b/1.4/Defs/ThingDef/ThingDef_Item.xml
index 8d5ec4a..0180ab9 100644
--- a/1.4/Defs/ThingDef/ThingDef_Item.xml
+++ b/1.4/Defs/ThingDef/ThingDef_Item.xml
@@ -277,10 +277,10 @@
       <li>PNKit</li>
     </thingCategories>
     <costList>
-      <ComponentIndustrial>1</ComponentIndustrial>
-      <Steel>15</Steel>
-      <Chemfuel>5</Chemfuel>
-      <Leather_Automaton>10</Leather_Automaton>
+      <ComponentIndustrial>2</ComponentIndustrial>
+      <Steel>30</Steel>
+      <Chemfuel>10</Chemfuel>
+      <Leather_Automaton>20</Leather_Automaton>
     </costList>
     <recipeMaker>
       <workSpeedStat>GeneralLaborSpeed</workSpeedStat>
diff --git a/1.4/Defs/ThingDef/ThingDef_Module.xml b/1.4/Defs/ThingDef/ThingDef_Module.xml
index 8609f08..0a20630 100644
--- a/1.4/Defs/ThingDef/ThingDef_Module.xml
+++ b/1.4/Defs/ThingDef/ThingDef_Module.xml
@@ -125,7 +125,7 @@
     <label>rapid fire module</label>
     <description>[CAUTION]\nThis module can only be installed on compatible models.\nAlso, the module system must be stable.\n\n[compatible models list]\n\nCombat model (legd), (mast), (exc)\n\nThis module allows automaton to use rapid fire ability.</description>
     <descriptionHyperlinks>
-      <!--<AbilityDef>PN_RapidFireAbility</AbilityDef>-->
+      <AbilityDef MayRequire="Ludeon.RimWorld.Ideology">PN_RapidFireAbility</AbilityDef>
       <HediffDef>PN_RapidFireModuleHediff</HediffDef>
     </descriptionHyperlinks>
     <costList>
@@ -169,9 +169,9 @@
       </li>
     </stages>
     <comps>
-      <!--<li Class="HediffCompProperties_GiveAbility">
+      <li Class="HediffCompProperties_GiveAbility" MayRequire="Ludeon.RimWorld.Ideology">
         <abilityDef>PN_RapidFireAbility</abilityDef>
-      </li>-->
+      </li>
     </comps>
   </HediffDef>
 
@@ -181,7 +181,7 @@
     <label>CQC module</label>
     <description>[CAUTION]\nThis module can only be installed on compatible models.\nAlso, the module system must be stable.\n\n[compatible models list]\n\nCombat model (legd), (mast), (exc)\n\nThis module increases the automaton's close quarters combat stat, and allows automaton to use CQC ability.</description>
     <descriptionHyperlinks>
-      <!--<AbilityDef>PN_CQCAbility</AbilityDef>-->
+      <AbilityDef MayRequire="Ludeon.RimWorld.Ideology">PN_CQCAbility</AbilityDef>
       <HediffDef>PN_CQCModuleHediff</HediffDef>
     </descriptionHyperlinks>
     <costList>
@@ -202,7 +202,7 @@
       </tags>
     </apparel>
     <comps>
-      <li Class="CompProperties_CauseHediff_Apparel">
+      <li Class="CompProperties_CauseHediff_Apparel" MayRequire="Ludeon.RimWorld.Ideology">
         <hediff>PN_CQCModuleHediff</hediff>
         <part>PNTorso</part>
       </li>
@@ -222,14 +222,15 @@
           <MeleeHitChance>3</MeleeHitChance>
           <MeleeDodgeChance>3</MeleeDodgeChance>
           <ShootingAccuracyPawn>-6</ShootingAccuracyPawn>
-          <IncomingDamageFactor>-0.15</IncomingDamageFactor>
+          <IncomingDamageFactor>-0.20</IncomingDamageFactor>
+          <MeleeDamageFactor MayRequire="Ludeon.RimWorld.Biotech">0.15</MeleeDamageFactor>
         </statOffsets>
       </li>
     </stages>
     <comps>
-      <!--<li Class="HediffCompProperties_GiveAbility">
+      <li Class="HediffCompProperties_GiveAbility" MayRequire="Ludeon.RimWorld.Ideology">
         <abilityDef>PN_CQCAbility</abilityDef>
-      </li>-->
+      </li>
     </comps>
   </HediffDef>