From 7b454e4e7f5e62108ee06f4516fd5409483f25e2 Mon Sep 17 00:00:00 2001
From: Cocopomel <79386233+Cocopomel@users.noreply.github.com>
Date: Tue, 27 Jul 2021 23:43:25 +0900
Subject: [PATCH] =?UTF-8?q?1.3=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 1.3/Defs/FactionDefs/Factions_Player.xml      |  2 +-
 1.3/Defs/FactionDefs/Factions_PnL.xml         |  5 +-
 1.3/Defs/HairDefs/Hairs.xml                   | 53 ++++++++--------
 .../PawnKindsDef_Paniel/PawnKind_Player.xml   |  2 +
 1.3/Defs/ThingDef/ThingDef_Buildings.xml      |  7 +--
 1.3/Defs/ThingDef/ThingDef_Misc.xml           |  4 +-
 1.3/Defs/ThingDef/ThingDef_PanielRace.xml     | 60 ++++++++++++++-----
 1.3/Defs/ThingDef/ThingDef_Weapons.xml        | 13 ++--
 1.3/Patches/Ideology.xml                      | 23 +++++++
 9 files changed, 114 insertions(+), 55 deletions(-)
 create mode 100644 1.3/Patches/Ideology.xml

diff --git a/1.3/Defs/FactionDefs/Factions_Player.xml b/1.3/Defs/FactionDefs/Factions_Player.xml
index 32ffd6e..55fdf11 100644
--- a/1.3/Defs/FactionDefs/Factions_Player.xml
+++ b/1.3/Defs/FactionDefs/Factions_Player.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
-  <FactionDef Abstract="True" Name="Paniel_PlayerBase">
+  <FactionDef Abstract="True" Name="Paniel_PlayerBase" ParentName="FactionBase">
     <settlementTexturePath>Icon/Paniel_PlayerIcon</settlementTexturePath>
     <colorSpectrum>
       <li>(255, 255, 255)</li>
diff --git a/1.3/Defs/FactionDefs/Factions_PnL.xml b/1.3/Defs/FactionDefs/Factions_PnL.xml
index b1b2a68..a85cead 100644
--- a/1.3/Defs/FactionDefs/Factions_PnL.xml
+++ b/1.3/Defs/FactionDefs/Factions_PnL.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
-  <FactionDef>
+  <FactionDef ParentName="FactionBase">
     <defName>PN_indistryFaction</defName>
     <label>PnL_hidden</label>
     <pawnSingular>Automaton</pawnSingular>
@@ -11,9 +11,6 @@
     <hidden>true</hidden>
     <autoFlee>false</autoFlee>
     <techLevel>Industrial</techLevel>
-    <hairTags>
-      <li>PanielHair</li>
-    </hairTags>
     <backstoryFilters>
       <li>
         <categories>
diff --git a/1.3/Defs/HairDefs/Hairs.xml b/1.3/Defs/HairDefs/Hairs.xml
index ed23072..4c2ac58 100644
--- a/1.3/Defs/HairDefs/Hairs.xml
+++ b/1.3/Defs/HairDefs/Hairs.xml
@@ -1,82 +1,87 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
+  <StyleItemCategoryDef>
+    <defName>PanielHair</defName>
+    <label>Paniel hair</label>
+  </StyleItemCategoryDef>
+
   <HairDef>
     <defName>Paniel_HairA</defName>
     <label>Paniel HairA</label>
-    <hairGender>Any</hairGender>
+    <styleGender>Any</styleGender>
     <texPath>Paniel/Hair/Paniel_HairA</texPath>
-    <hairTags>
+    <styleTags>
       <li>PanielHair</li>
-    </hairTags>
+    </styleTags>
   </HairDef>
 
   <HairDef>
     <defName>Paniel_HairB</defName>
     <label>Paniel HairB</label>
-    <hairGender>Any</hairGender>
+    <styleGender>Any</styleGender>
     <texPath>Paniel/Hair/Paniel_HairB</texPath>
-    <hairTags>
+    <styleTags>
       <li>PanielHair</li>
-    </hairTags>
+    </styleTags>
   </HairDef>
 
   <HairDef>
     <defName>Paniel_HairC</defName>
     <label>Paniel HairC</label>
-    <hairGender>Any</hairGender>
+    <styleGender>Any</styleGender>
     <texPath>Paniel/Hair/Paniel_HairC</texPath>
-    <hairTags>
+    <styleTags>
       <li>PanielHair</li>
-    </hairTags>
+    </styleTags>
   </HairDef>
 
   <HairDef>
     <defName>Paniel_HairD</defName>
     <label>Paniel HairD</label>
-    <hairGender>Any</hairGender>
+    <styleGender>Any</styleGender>
     <texPath>Paniel/Hair/Paniel_HairD</texPath>
-    <hairTags>
+    <styleTags>
       <li>PanielHair</li>
-    </hairTags>
+    </styleTags>
   </HairDef>
 
   <HairDef>
     <defName>Paniel_HairE</defName>
     <label>Paniel HairE</label>
-    <hairGender>Any</hairGender>
+    <styleGender>Any</styleGender>
     <texPath>Paniel/Hair/Paniel_HairE</texPath>
-    <hairTags>
+    <styleTags>
       <li>PanielHair</li>
-    </hairTags>
+    </styleTags>
   </HairDef>
 
   <HairDef>
     <defName>Paniel_HairF</defName>
     <label>Paniel HairF</label>
-    <hairGender>Any</hairGender>
+    <styleGender>Any</styleGender>
     <texPath>Paniel/Hair/Paniel_HairF</texPath>
-    <hairTags>
+    <styleTags>
       <li>PanielHair</li>
-    </hairTags>
+    </styleTags>
   </HairDef>
 
   <HairDef>
     <defName>Paniel_HairG</defName>
     <label>Paniel HairG</label>
-    <hairGender>Any</hairGender>
+    <styleGender>Any</styleGender>
     <texPath>Paniel/Hair/Paniel_HairG</texPath>
-    <hairTags>
+    <styleTags>
       <li>PanielHair</li>
-    </hairTags>
+    </styleTags>
   </HairDef>
 
   <HairDef>
     <defName>Paniel_HairH</defName>
     <label>Paniel HairH</label>
-    <hairGender>Any</hairGender>
+    <styleGender>Any</styleGender>
     <texPath>Paniel/Hair/Paniel_HairH</texPath>
-    <hairTags>
+    <styleTags>
       <li>PanielHair</li>
-    </hairTags>
+    </styleTags>
   </HairDef>
 </Defs>
\ No newline at end of file
diff --git a/1.3/Defs/PawnKindsDef_Paniel/PawnKind_Player.xml b/1.3/Defs/PawnKindsDef_Paniel/PawnKind_Player.xml
index eda25af..33fc676 100644
--- a/1.3/Defs/PawnKindsDef_Paniel/PawnKind_Player.xml
+++ b/1.3/Defs/PawnKindsDef_Paniel/PawnKind_Player.xml
@@ -20,6 +20,8 @@
 		<backstoryCryptosleepCommonality>0</backstoryCryptosleepCommonality>
 		<minGenerationAge>1</minGenerationAge>
 		<maxGenerationAge>1</maxGenerationAge>
+		<initialWillRange>0~1</initialWillRange>
+		<initialResistanceRange>10~17</initialResistanceRange>
 	</PawnKindDef>
 
 	<!-- 정착민 -->
diff --git a/1.3/Defs/ThingDef/ThingDef_Buildings.xml b/1.3/Defs/ThingDef/ThingDef_Buildings.xml
index 0acc3cc..69bdef3 100644
--- a/1.3/Defs/ThingDef/ThingDef_Buildings.xml
+++ b/1.3/Defs/ThingDef/ThingDef_Buildings.xml
@@ -77,7 +77,7 @@
   </ThingDef>
 
   <!--==================================== 오토캐논 ====================================-->
-  <DesignatorDropdownGroupDef>
+  <!--<DesignatorDropdownGroupDef>
     <defName>PN_Artillery_Dropdown</defName>
     <label>PnL Auto Artillery</label>
   </DesignatorDropdownGroupDef>
@@ -155,7 +155,7 @@
     <building>
       <ai_combatDangerous>true</ai_combatDangerous>
       <turretGunDef>PN_Artillery_Turret</turretGunDef>
-      <turretBurstCooldownTime>10</turretBurstCooldownTime>      <!--사격 쿨타임-->
+      <turretBurstCooldownTime>10</turretBurstCooldownTime>
       <turretTopDrawSize>3.0</turretTopDrawSize>
       <turretTopOffset>(0, 0.35)</turretTopOffset>
     </building>
@@ -301,7 +301,6 @@
     <thingClass>Projectile_Explosive</thingClass>
     <projectile>
       <damageDef>Bomb</damageDef>
-      <!-- damage amount is the damage def default -->
       <speed>100</speed>
       <explosionRadius>3.9</explosionRadius>
       <flyOverhead>true</flyOverhead>
@@ -310,5 +309,5 @@
       <soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
       <soundAmbient>MortarRound_Ambient</soundAmbient>
     </projectile>
-  </ThingDef>
+  </ThingDef>-->
 </Defs>
\ No newline at end of file
diff --git a/1.3/Defs/ThingDef/ThingDef_Misc.xml b/1.3/Defs/ThingDef/ThingDef_Misc.xml
index 8d08771..61df0f2 100644
--- a/1.3/Defs/ThingDef/ThingDef_Misc.xml
+++ b/1.3/Defs/ThingDef/ThingDef_Misc.xml
@@ -105,7 +105,7 @@
     <defName>PN_Flesh</defName>
     <corpseCategory>PN_CorpseCategory</corpseCategory>
     <damageEffecter>Damage_HitMechanoid</damageEffecter>
-    <wounds>
+    <genericWounds>
       <li>
         <texture>Things/Pawn/Wounds/WoundMechA</texture>
       </li>
@@ -115,6 +115,6 @@
       <li>
         <texture>Things/Pawn/Wounds/WoundMechC</texture>
       </li>
-    </wounds>
+    </genericWounds>
   </FleshTypeDef>
 </Defs>
\ No newline at end of file
diff --git a/1.3/Defs/ThingDef/ThingDef_PanielRace.xml b/1.3/Defs/ThingDef/ThingDef_PanielRace.xml
index 11d1074..3b1fc1f 100644
--- a/1.3/Defs/ThingDef/ThingDef_PanielRace.xml
+++ b/1.3/Defs/ThingDef/ThingDef_PanielRace.xml
@@ -151,6 +151,7 @@
         <additionalTraits>0</additionalTraits>
         <immuneToXenophobia>true</immuneToXenophobia>
         <alienPartGenerator>
+          <atlasScale>2</atlasScale>
           <aliencrowntypes>
             <li>HeadsAverage_Normal</li>
           </aliencrowntypes>
@@ -197,19 +198,22 @@
               <inFrontOfBody>false</inFrontOfBody>
               <colorChannel>skin</colorChannel>
               <drawnInBed>false</drawnInBed>
-              <layerOffset>-0.268</layerOffset>
+              <defaultOffset>Tail</defaultOffset>
               <offsets>
                 <south>
+                  <layerOffset>-0.268</layerOffset>
                   <bodyTypes>
                     <Female>(-0.41,0.165)</Female>
                   </bodyTypes>
                 </south>
                 <north>
+                  <layerOffset>-0.268</layerOffset>
                   <bodyTypes>
                     <Female>(0,0.5)</Female>
                   </bodyTypes>
                 </north>
                 <east>
+                  <layerOffset>-0.268</layerOffset>
                   <bodyTypes>
                     <Female>(-0.41,0.15)</Female>
                   </bodyTypes>
@@ -225,20 +229,23 @@
               <inFrontOfBody>false</inFrontOfBody>
               <colorChannel>skin</colorChannel>
               <drawnInBed>true</drawnInBed>
-              <layerOffset>-0.268</layerOffset>
+              <defaultOffset>Tail</defaultOffset>
               <angle>0</angle>
               <offsets>
                 <south>
+                  <layerOffset>-0.268</layerOffset>
                   <bodyTypes>
                     <Female>(-0.43,0.565)</Female>
                   </bodyTypes>
                 </south>
                 <north>
+                  <layerOffset>-0.268</layerOffset>
                   <bodyTypes>
                     <Female>(0,0)</Female>
                   </bodyTypes>
                 </north>
                 <east>
+                  <layerOffset>-0.268</layerOffset>
                   <bodyTypes>
                     <Female>(0,0)</Female>
                   </bodyTypes>
@@ -254,20 +261,23 @@
               <inFrontOfBody>true</inFrontOfBody>
               <colorChannel>skin</colorChannel>
               <drawnInBed>true</drawnInBed>
-              <layerOffset>-0.268</layerOffset>
+              <defaultOffset>Tail</defaultOffset>
               <angle>0</angle>
               <offsets>
                 <south>
+                  <layerOffset>-0.268</layerOffset>
                   <bodyTypes>
                     <Female>(0,0)</Female>
                   </bodyTypes>
                 </south>
                 <north>
+                  <layerOffset>-0.268</layerOffset>
                   <bodyTypes>
                     <Female>(0,0.885)</Female>
                   </bodyTypes>
                 </north>
                 <east>
+                  <layerOffset>-0.268</layerOffset>
                   <bodyTypes>
                     <Female>(-0.41,0.565)</Female>
                   </bodyTypes>
@@ -283,20 +293,23 @@
               <inFrontOfBody>false</inFrontOfBody>
               <colorChannel>skin</colorChannel>
               <drawnInBed>true</drawnInBed>
-              <layerOffset>-0.268</layerOffset>
+              <defaultOffset>Tail</defaultOffset>
               <angle>0</angle>
               <offsets>
                 <south>
+                  <layerOffset>-0.268</layerOffset>
                   <bodyTypes>
                     <Female>(-0.41,0.565)</Female>
                   </bodyTypes>
                 </south>
                 <north>
+                  <layerOffset>-0.268</layerOffset>
                   <bodyTypes>
                     <Female>(0,0)</Female>
                   </bodyTypes>
                 </north>
                 <east>
+                  <layerOffset>-0.268</layerOffset>
                   <bodyTypes>
                     <Female>(0,0)</Female>
                   </bodyTypes>
@@ -312,20 +325,23 @@
               <inFrontOfBody>true</inFrontOfBody>
               <colorChannel>skin</colorChannel>
               <drawnInBed>true</drawnInBed>
-              <layerOffset>-0.268</layerOffset>
+              <defaultOffset>Tail</defaultOffset>
               <angle>0</angle>
               <offsets>
                 <south>
+                  <layerOffset>-0.268</layerOffset>
                   <bodyTypes>
                     <Female>(0,0)</Female>
                   </bodyTypes>
                 </south>
                 <north>
+                  <layerOffset>-0.268</layerOffset>
                   <bodyTypes>
                     <Female>(0,0.885)</Female>
                   </bodyTypes>
                 </north>
                 <east>
+                  <layerOffset>-0.268</layerOffset>
                   <bodyTypes>
                     <Female>(-0.41,0.565)</Female>
                   </bodyTypes>
@@ -333,7 +349,7 @@
               </offsets>
             </li>
 
-            <li Class="MoharCustomHAR.MoharBodyAddon">
+            <!--<li Class="MoharCustomHAR.MoharBodyAddon">
               <drawSize>1</drawSize>
               <path>Paniel/Face/Face</path>
               <bodyPart>head case</bodyPart>
@@ -388,7 +404,7 @@
                   </li>
                 </hideIfJob>
               </jobParams>
-            </li>
+            </li>-->
           </bodyAddons>
         </alienPartGenerator>
       </generalSettings>
@@ -399,12 +415,29 @@
           <skeleton>Things/Pawn/Humanlike/Bodies/Dessicated/Dessicated_Thin</skeleton>
         </li>
       </graphicPaths>
-      <hairSettings>
-        <hasHair>true</hasHair>
-        <hairTags>
-          <li>PanielHair</li>
-        </hairTags>
-      </hairSettings>
+      <styleSettings>
+        <li>
+          <key>HairDef</key>
+          <value>
+            <hasStyle>true</hasStyle>
+            <styleTags>
+              <li>PanielHair</li>
+            </styleTags>
+          </value>
+        </li>
+        <li>
+          <key>BeardDef</key>
+          <value>
+            <hasStyle>false</hasStyle>
+          </value>
+        </li>
+        <li>
+          <key>TattooDef</key>
+          <value>
+            <hasStyle>false</hasStyle>
+          </value>
+        </li>
+      </styleSettings>
       <thoughtSettings>
         <replacerList>
           <!--연료-->
@@ -455,7 +488,6 @@
           <!--memory eating-->
           <li>AteLavishMeal</li>
           <li>AteFineMeal</li>
-          <li>AteAwfulMeal</li>
           <li>AteRawFood</li>
           <li>AteHumanlikeMeatDirect</li>
           <li>AteHumanlikeMeatDirectCannibal</li>
diff --git a/1.3/Defs/ThingDef/ThingDef_Weapons.xml b/1.3/Defs/ThingDef/ThingDef_Weapons.xml
index 8329e6a..2f17b19 100644
--- a/1.3/Defs/ThingDef/ThingDef_Weapons.xml
+++ b/1.3/Defs/ThingDef/ThingDef_Weapons.xml
@@ -145,7 +145,7 @@
       <unfinishedThingDef>UnfinishedGun</unfinishedThingDef>
     </recipeMaker>
     <comps>
-      <li Class="CompProperties_BiocodableWeapon"/>
+      
     </comps>
   </ThingDef>
 
@@ -769,14 +769,15 @@
     <impactSoundType>Blunt</impactSoundType>
     <armorCategory>Sharp</armorCategory>
     <minDamageToFragment>15</minDamageToFragment>
-    <defaultDamage>32</defaultDamage>
+    <defaultDamage>50</defaultDamage>
     <defaultStoppingPower>0.5</defaultStoppingPower>
     <defaultArmorPenetration>0.10</defaultArmorPenetration>
-    <buildingDamageFactor>3.125</buildingDamageFactor>
-    <plantDamageFactor>3.125</plantDamageFactor>
+    <buildingDamageFactorImpassable>4</buildingDamageFactorImpassable>
+    <buildingDamageFactorPassable>2</buildingDamageFactorPassable>
+    <plantDamageFactor>4</plantDamageFactor>
     <explosionAffectOutsidePartsOnly>false</explosionAffectOutsidePartsOnly>
     <explosionHeatEnergyPerCell>5</explosionHeatEnergyPerCell>
-    <explosionCellMote>Mote_BlastDry</explosionCellMote>
+    <explosionCellFleck>BlastDry</explosionCellFleck>
     <explosionColorCenter>(1, 0.5, 0.3)</explosionColorCenter>
     <explosionColorEdge>(0.6, 0.5, 0.4)</explosionColorEdge>
     <soundExplosion>Explosion_Bomb</soundExplosion>
@@ -1129,7 +1130,7 @@
         <explosiveDamageType>Bomb</explosiveDamageType>
         <requiredDamageTypeToExplode>Flame</requiredDamageTypeToExplode>
       </li>
-      <li Class="CompProperties_BiocodableWeapon"/>
+      
     </comps>
     <equippedAngleOffset>45</equippedAngleOffset>
   </ThingDef>
diff --git a/1.3/Patches/Ideology.xml b/1.3/Patches/Ideology.xml
new file mode 100644
index 0000000..f854de5
--- /dev/null
+++ b/1.3/Patches/Ideology.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Patch>
+  <Operation Class="PatchOperationFindMod">
+    <mods>
+      <li>Ideology</li>
+    </mods>
+    <match Class="PatchOperationSequence">
+      <success>Always</success>
+      <operations>
+        <li Class="PatchOperationAdd">
+          <xpath>/Defs/CultureDef[defName = *]/styleItemTags</xpath>
+          <value>
+            <li>
+              <tag>PanielHair</tag>
+              <baseWeight>0.0001</baseWeight>
+              <weightFactor>0.0001</weightFactor>
+            </li>
+          </value>
+        </li>
+      </operations>
+    </match>
+  </Operation>
+</Patch>
\ No newline at end of file