자회사 팩션 관련

1.3/Defs/FactionDefs/Factions_PnL.xml

@@ -18,58 +18,101 @@
       <li>Offworld</li>
     </backstoryCategories>
     <allowedCultures>
-      <li>Astropolitan</li>
+      <li>PN_PnLindistryCulture</li>
     </allowedCultures>
     <allowedMemes>
-      <li MayRequire="Ludeon.RimWorld.Ideology">Structure_Archist</li>
+      <li MayRequire="Ludeon.RimWorld.Ideology">PN_Structure</li>
-      <li MayRequire="Ludeon.RimWorld.Ideology">HumanPrimacy</li>
       <li MayRequire="Ludeon.RimWorld.Ideology">Loyalist</li>
+      <li MayRequire="Ludeon.RimWorld.Ideology">Collectivist</li>
+      <li MayRequire="Ludeon.RimWorld.Ideology">Transhumanist</li>
+      <li MayRequire="Ludeon.RimWorld.Ideology">HumanPrimacy</li>
     </allowedMemes>
     <requiredMemes>
-      <li MayRequire="Ludeon.RimWorld.Ideology">Structure_Archist</li>
+      <li MayRequire="Ludeon.RimWorld.Ideology">PN_Structure</li>
-      <li MayRequire="Ludeon.RimWorld.Ideology">HumanPrimacy</li>
       <li MayRequire="Ludeon.RimWorld.Ideology">Loyalist</li>
+      <li MayRequire="Ludeon.RimWorld.Ideology">Collectivist</li>
+      <li MayRequire="Ludeon.RimWorld.Ideology">Transhumanist</li>
+      <li MayRequire="Ludeon.RimWorld.Ideology">HumanPrimacy</li>
     </requiredMemes>
     <disallowedPrecepts>
       <li MayRequire="Ludeon.RimWorld.Ideology">ApparelDesired_Strong_Subordinate</li>
       <li MayRequire="Ludeon.RimWorld.Ideology">ApparelDesired_Soft_Subordinate</li>
     </disallowedPrecepts>
+    <!--<caravanTraderKinds>
+      <li>PN_Caravan_PnLindustry</li>
+    </caravanTraderKinds>
+    <pawnGroupMakers>
+      <li>
+        <kindDef>Trader</kindDef>
+        <traders>
+          <Town_Trader>1</Town_Trader>
+        </traders>
+        <carriers>
+          <Muffalo>6</Muffalo>
+          <Dromedary>5</Dromedary>
+          <Alpaca>2</Alpaca>
+          <Elephant>1</Elephant>
+        </carriers>
+        <guards>
+          <Villager>3</Villager>
+          <Town_Guard>10</Town_Guard>
+          <Grenadier_Destructive>1.5</Grenadier_Destructive>
+          <Mercenary_Slasher>7</Mercenary_Slasher>
+          <Mercenary_Gunner>10</Mercenary_Gunner>
+          <Mercenary_Elite>10</Mercenary_Elite>
+        </guards>
+      </li>
+    </pawnGroupMakers>
+    <maxPawnCostPerTotalPointsCurve>
+      <points>
+        <li>(0,35)</li>
+        <li>(70, 50)</li>
+        <li>(700, 100)</li>
+        <li>(1300, 150)</li>
+        <li>(100000, 10000)</li>
+      </points>
+    </maxPawnCostPerTotalPointsCurve>-->
   </FactionDef>
 
   <!--행성지부(NPC)-->
-  <!--<FactionDef ParentName="FactionBase">
+  <FactionDef ParentName="FactionBase">
     <defName>PN_SubsidiaryFaction</defName>
-    <label>PnL Subsidiary</label>
+    <label>PnL Subsidiary Company</label>
     <pawnSingular>Employee</pawnSingular>
     <pawnsPlural>Employees</pawnsPlural>
     <listOrderPriority>50</listOrderPriority>
-    <settlementGenerationWeight>0.20</settlementGenerationWeight>
+    <settlementGenerationWeight>0</settlementGenerationWeight>
     <requiredCountAtGameStart>1</requiredCountAtGameStart>
+    <maxCountAtGameStart>1</maxCountAtGameStart>
     <canMakeRandomly>true</canMakeRandomly>
     <canSiege>true</canSiege>
     <canStageAttacks>true</canStageAttacks>
     <leaderTitle>CEO</leaderTitle>
-    <factionIconPath>World/WorldObjects/Expanding/Town</factionIconPath>
+    <factionIconPath>Icon/Paniel_PlayerIcon</factionIconPath>
     <colorSpectrum>
-      <li>(0.35, 0.30, 0.60)</li>
+      <li>(1, 1, 1)</li>
-      <li>(0.45, 0.40, 0.90)</li>
+      <li>(1, 1, 1)</li>
     </colorSpectrum>
     <classicIdeo>false</classicIdeo>
     <maxConfigurableAtWorldCreation>9999</maxConfigurableAtWorldCreation>
     <configurationListOrderPriority>50</configurationListOrderPriority>
     <techLevel>Spacer</techLevel>
-    <factionNameMaker>NamerFactionPnLSub</factionNameMaker>
+    <fixedName>PnL Logistics</fixedName>
     <settlementNameMaker>NamerSettlementPnLSub</settlementNameMaker>
     <allowedCultures>
       <li>PN_PnLindistryCulture</li>
     </allowedCultures>
     <allowedMemes>
-      <li MayRequire="Ludeon.RimWorld.Ideology">Structure_Ideological</li>
+      <li MayRequire="Ludeon.RimWorld.Ideology">PN_Structure</li>
+      <li MayRequire="Ludeon.RimWorld.Ideology">Loyalist</li>
+      <li MayRequire="Ludeon.RimWorld.Ideology">Collectivist</li>
       <li MayRequire="Ludeon.RimWorld.Ideology">Transhumanist</li>
       <li MayRequire="Ludeon.RimWorld.Ideology">HumanPrimacy</li>
     </allowedMemes>
     <requiredMemes>
-      <li MayRequire="Ludeon.RimWorld.Ideology">Structure_Ideological</li>
+      <li MayRequire="Ludeon.RimWorld.Ideology">PN_Structure</li>
+      <li MayRequire="Ludeon.RimWorld.Ideology">Loyalist</li>
+      <li MayRequire="Ludeon.RimWorld.Ideology">Collectivist</li>
       <li MayRequire="Ludeon.RimWorld.Ideology">Transhumanist</li>
       <li MayRequire="Ludeon.RimWorld.Ideology">HumanPrimacy</li>
     </requiredMemes>
@@ -85,7 +128,6 @@
       <li>PN_Caravan_PnLindustry</li>
     </caravanTraderKinds>
     <visitorTraderKinds>
-      <li>Visitor_Outlander_Standard</li>
     </visitorTraderKinds>
     <baseTraderKinds>
       <li>Base_Outlander_Standard</li>
@@ -183,7 +225,7 @@
         </options>
       </li>
     </pawnGroupMakers>
-    <settlementTexturePath>World/WorldObjects/DefaultSettlement</settlementTexturePath>
+    <settlementTexturePath>Icon/Paniel_PlayerIcon</settlementTexturePath>
   </FactionDef>
 
   <ThingSetMakerDef>
@@ -203,35 +245,12 @@
     </root>
   </ThingSetMakerDef>
 
-  <RulePackDef>
-    <defName>NamerFactionPnLSub</defName>
-    <rulePack>
-      <rulesStrings>
-        <li>r_name->PnL Subsidiary</li>
-      </rulesStrings>
-    </rulePack>
-  </RulePackDef>
-
   <RulePackDef>
     <defName>NamerSettlementPnLSub</defName>
     <rulePack>
       <rulesStrings>
-        <li>r_name(p=12)->[townname_wordgen]</li>
+        <li>r_name->logistics center</li>
-        <li>r_name(p=4)->[townname_combo]</li>
-
-        <li>townname_combo(p=2)->[concept_positive] [PNSub]</li>
-        <li>townname_combo(p=3)->[Character]'s [PNSub]</li>
-
-        <li>nearnameinitial->[townname_wordgen]</li>
-
-        <li>townname_wordgen(p=2)->[SylE] [PNSub]</li>
-        <li>townname_wordgen(p=2)->[SylE][SylE] [PNSub]</li>
-        <li>townname_wordgen->[TerrainFeature] [PNSub]</li>
-        <li>PNSub->branch</li>
       </rulesStrings>
-      <rulesFiles>
-        <li>concept_positive->Words/Nouns/Concepts_Positive</li>
-      </rulesFiles>
     </rulePack>
   </RulePackDef>
 
@@ -247,8 +266,8 @@
     <allowedPlaceTags>
       <li>OriginSpacer</li>
     </allowedPlaceTags>
-    <iconPath>UI/Cultures/Astropolitan</iconPath>
+    <iconPath>Icon/Paniel_PlayerIcon</iconPath>
-    <iconColor>(0.8, 0.8, 0.8)</iconColor>
+    <iconColor>(1, 1, 1)</iconColor>
     <styleItemTags>
       <li>
         <tag>Urban</tag>
@@ -272,9 +291,9 @@
     <defName>NamerIdeo_PnLindistry</defName>
     <rulePack>
       <rulesStrings>
-        <li>r_ideoName->PnL Industry Culture</li>
+        <li>r_ideoName->PnL bylaws</li>
-        <li>r_ideoAdjective->PnLic</li>
+        <li>r_ideoAdjective->PnL</li>
-        <li>r_memberName->Employee</li>
+        <li>r_memberName->PnL Employee</li>
       </rulesStrings>
     </rulePack>
   </RulePackDef>
@@ -304,5 +323,5 @@
         <li>r_leaderTitle->CEO</li>
       </rulesStrings>
     </rulePack>
-  </RulePackDef>-->
+  </RulePackDef>
 </Defs>

1.3/Defs/ThingDef/ThingDef_Apparel.xml

@@ -20,6 +20,7 @@
       <defaultOutfitTags Inherit="false">
         <li>PNApparel</li>
       </defaultOutfitTags>
+      <canBeDesiredForIdeo>false</canBeDesiredForIdeo>
     </apparel>
     <thingCategories Inherit="False">
       <li>PNApparel</li>
@@ -912,6 +913,7 @@
         <li>RoyalTier6</li>
         <li>RoyalTier7</li>
       </tags>
+      <canBeDesiredForIdeo>false</canBeDesiredForIdeo>
     </apparel>
     <thingCategories Inherit="False">
       <li>PNRoyalApparel</li>

1.3/Defs/TraderKindDefs/TraderKinds_Base.xml

@@ -1,9 +1,230 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
-  <!--<TraderKindDef ParentName="BaseOutlanderTraderKind">
+  <TraderKindDef>
     <defName>PN_Base_PnLindustry</defName>
     <stockGenerators>
 
+
+      <!-- Resources -->
+      <li Class="StockGenerator_SingleDef">
+        <thingDef>Silver</thingDef>
+        <countRange>8000~30000</countRange>
+      </li>
+      <li Class="StockGenerator_SingleDef">
+        <thingDef>ComponentIndustrial</thingDef>
+        <countRange>20~70</countRange>
+      </li>
+      <li Class="StockGenerator_SingleDef">
+        <thingDef>ComponentSpacer</thingDef>
+        <countRange>1~6</countRange>
+      </li>
+      <li Class="StockGenerator_SingleDef">
+        <thingDef>Steel</thingDef>
+        <countRange>500~800</countRange>
+      </li>
+      <li Class="StockGenerator_SingleDef">
+        <thingDef>WoodLog</thingDef>
+        <countRange>400~700</countRange>
+      </li>
+      <li Class="StockGenerator_SingleDef">
+        <thingDef>Plasteel</thingDef>
+        <countRange>100~250</countRange>
+      </li>
+      <li Class="StockGenerator_SingleDef">
+        <thingDef>Uranium</thingDef>
+        <countRange>40~200</countRange>
+      </li>
+      <li Class="StockGenerator_SingleDef">
+        <thingDef>Cloth</thingDef>
+        <countRange>400~600</countRange>
+      </li>
+      <li Class="StockGenerator_SingleDef">
+        <thingDef>Gold</thingDef>
+        <countRange>100~200</countRange>
+      </li>
+      <li Class="StockGenerator_SingleDef">
+        <thingDef>Neutroamine</thingDef>
+        <countRange>50~200</countRange>
+      </li>
+      <li Class="StockGenerator_SingleDef">
+        <thingDef>Chemfuel</thingDef>
+        <countRange>300~500</countRange>
+      </li>
+      <li Class="StockGenerator_SingleDef">
+        <thingDef>Chocolate</thingDef>
+        <countRange>-30~70</countRange>
+      </li>
+      <li Class="StockGenerator_SingleDef">
+        <thingDef>Beer</thingDef>
+        <countRange>-40~100</countRange>
+      </li>
+      <li Class="StockGenerator_SingleDef">
+        <thingDef>MedicineIndustrial</thingDef>
+        <countRange>25~50</countRange>
+      </li>
+      <li Class="StockGenerator_ReinforcedBarrels">
+        <countRange>1~4</countRange>
+      </li>
+      <li Class="StockGenerator_Tag">
+        <tradeTag>MortarShell</tradeTag>
+        <thingDefCountRange>1~2</thingDefCountRange>
+        <countRange>20~40</countRange>
+      </li>
+      <li Class="StockGenerator_Category">
+        <categoryDef>Textiles</categoryDef>
+        <thingDefCountRange>1~2</thingDefCountRange>
+        <totalPriceRange>400~800</totalPriceRange>
+      </li>
+      <li Class="StockGenerator_Category">
+        <categoryDef>ResourcesRaw</categoryDef>
+        <thingDefCountRange>2~4</thingDefCountRange>
+        <totalPriceRange>400~800</totalPriceRange>
+      </li>
+      <li Class="StockGenerator_Category">
+        <categoryDef>FoodRaw</categoryDef>
+        <excludedCategories>
+          <li>EggsFertilized</li>
+        </excludedCategories>
+        <thingDefCountRange>2~4</thingDefCountRange>
+        <totalPriceRange>400~800</totalPriceRange>
+      </li>
+      <li Class="StockGenerator_Category">
+        <categoryDef>FoodMeals</categoryDef>
+        <thingDefCountRange>1~2</thingDefCountRange>
+        <countRange>12~50</countRange>
+      </li>
+      <li Class="StockGenerator_MultiDef">
+        <thingDefs>
+          <li>Kibble</li>
+          <li>Pemmican</li>
+        </thingDefs>
+      </li>
+
+      <!-- Drugs -->
+      <li Class="StockGenerator_Category">
+        <categoryDef>Drugs</categoryDef>
+        <thingDefCountRange>3~4</thingDefCountRange>
+        <totalPriceRange>700~1500</totalPriceRange>
+      </li>
+
+      <!-- Techprints -->
+      <li Class="StockGenerator_Techprints">
+        <countChances>
+          <li>
+            <count>2</count>
+            <chance>0.5</chance>
+          </li>
+          <li>
+            <count>3</count>
+            <chance>0.5</chance>
+          </li>
+        </countChances>
+      </li>
+
+      <!-- Weapons -->
+      <li Class="StockGenerator_WeaponsRanged">
+        <countRange>3~6</countRange>
+      </li>
+      <li Class="StockGenerator_Category">
+        <categoryDef>WeaponsMelee</categoryDef>
+        <thingDefCountRange>3~4</thingDefCountRange>
+        <countRange>1~2</countRange>
+      </li>
+
+      <!-- Apparel -->
+      <li Class="StockGenerator_Clothes">
+        <countRange>10~16</countRange>
+      </li>
+      <li Class="StockGenerator_Armor">
+        <countRange>2~4</countRange>
+      </li>
+
+      <!-- Implants -->
+      <li Class="StockGenerator_Tag">
+        <tradeTag>TechHediff</tradeTag>
+        <thingDefCountRange>2~4</thingDefCountRange>
+        <countRange>1~1</countRange>
+      </li>
+
+      <!-- Buildings -->
+      <li Class="StockGenerator_Category">
+        <categoryDef>BuildingsFurniture</categoryDef>
+        <thingDefCountRange>3~4</thingDefCountRange>
+        <countRange>1~2</countRange>
+      </li>
+      <li Class="StockGenerator_Art">
+        <countRange>5~10</countRange>
+      </li>
+      <li Class="StockGenerator_Tag">
+        <tradeTag>Television</tradeTag>
+        <thingDefCountRange>1~2</thingDefCountRange>
+        <countRange>1~2</countRange>
+      </li>
+      <li Class="StockGenerator_SingleDef">
+        <thingDef>Telescope</thingDef>
+        <countRange>0~1</countRange>
+      </li>
+
+      <!-- Exotic -->
+      <li Class="StockGenerator_Tag">
+        <tradeTag>Artifact</tradeTag>
+        <thingDefCountRange>1~4</thingDefCountRange>
+        <countRange>1~1</countRange>
+      </li>
+      <li Class="StockGenerator_Tag">
+        <tradeTag>ExoticMisc</tradeTag>
+        <thingDefCountRange>1~4</thingDefCountRange>
+        <countRange>1~2</countRange>
+        <excludedThingDefs>
+          <li>Luciferium</li>          <!-- already handled by drugs -->
+          <li>ComponentSpacer</li>          <!-- already handled by single def -->
+        </excludedThingDefs>
+        <customCountRanges>
+          <MedicineUltratech>2~15</MedicineUltratech>
+          <Hyperweave>50~200</Hyperweave>
+        </customCountRanges>
+      </li>
+
+      <!-- Slaves -->
+      <li Class="StockGenerator_Slaves">
+        <respectPopulationIntent>true</respectPopulationIntent>
+        <countRange>-1~2</countRange>
+      </li>
+
+      <!-- Animals -->
+      <li Class="StockGenerator_Animals">
+        <tradeTagsSell>
+          <li>AnimalFarm</li>
+          <li>AnimalPet</li>
+        </tradeTagsSell>
+        <tradeTagsBuy>
+          <li>AnimalUncommon</li>
+          <li>AnimalExotic</li>
+        </tradeTagsBuy>
+        <kindCountRange>2~4</kindCountRange>
+        <countRange>3~8</countRange>
+        <createMatingPair>
+          <li>AnimalFarm</li>
+        </createMatingPair>
+      </li>
+
+      <!-- Buying -->
+      <li Class="StockGenerator_BuyExpensiveSimple" />
+      <li Class="StockGenerator_BuyTradeTag">
+        <tag>Art</tag>
+      </li>
+      <li Class="StockGenerator_BuyTradeTag">
+        <tag>ImplantEmpireCommon</tag>
+      </li>
+      <li Class="StockGenerator_BuyTradeTag">
+        <tag>ImplantEmpireRoyal</tag>
+      </li>
+      <li Class="StockGenerator_BuyTradeTag">
+        <tag>MusicalInstrument</tag>
+      </li>
+
+      <!--PnL-->
+
       <li Class="StockGenerator_SingleDef">
         <thingDef>Hyperweave</thingDef>
         <countRange>10~15</countRange>
@@ -49,5 +270,5 @@
       </li>
 
     </stockGenerators>
-  </TraderKindDef>-->
+  </TraderKindDef>
 </Defs>

1.3/Patches/Vanilla.xml

@@ -8,12 +8,6 @@
     </value>
   </Operation>
 
-  <!--<Operation Class="PatchOperationAttributeAdd">
-    <xpath>Defs/TraderKindDef[defName="Base_Outlander_Standard"]</xpath>
-    <attribute>Name</attribute>
-    <value>BaseOutlanderTraderKind</value>
-  </Operation>-->
-
   <Operation Class="PatchOperationConditional">
     <xpath>Defs/FactionDef[defName = "OutlanderCivil"]/caravanTraderKinds</xpath>
     <nomatch Class="PatchOperationAdd">

Ideology/Defs/MemeDefs/Memes_PnL.xml

@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+
+<!--Structure-->
+
+  <MemeDef>
+    <defName>PN_Structure</defName>
+    <label>PnL bylaws</label>
+    <description>...</description>
+    <category>Structure</category>
+    <iconPath>Icon/Paniel_PlayerIcon</iconPath>
+    <impact>0</impact>
+    <worshipRoomLabel>Conference room</worshipRoomLabel>
+    <deityCount>0</deityCount>
+    <generalRules>
+      <rulesStrings>
+        <li>memeLeaderNoun->CEO</li>
+        <li>memeMoralist->Personnel Manager</li>
+      </rulesStrings>
+    </generalRules>
+    <descriptionMaker>
+      <rules>
+        <rulesStrings>
+          <li>episode(tag=meme_PN_Structure)  ->...</li>
+        </rulesStrings>
+      </rules>
+      <patterns>
+        <li>
+          <def>PN_IdeoStoryPattern</def>
+        </li>
+      </patterns>
+      <constants>
+        <li>
+          <key>PN_Structure</key>
+          <value>true</value>
+        </li>
+      </constants>
+    </descriptionMaker>
+    <symbolPacks>
+      <li>
+        <ideoName>PnL bylaws</ideoName>
+        <theme>PnL</theme>
+        <adjective>PnL</adjective>
+        <member>PnL Employee</member>
+      </li>
+    </symbolPacks>
+    <requireOne>
+      <li>
+        <li>BodyMod_Approved</li>
+      </li>
+      <li>
+        <li>OrganUse_Acceptable</li>
+      </li>
+      <li>
+        <li>Apostasy_Abhorrent</li>
+      </li>
+      <li>
+        <li>IdeoDiversity_Abhorrent</li>
+      </li>
+      <li>
+        <li>Nudity_Female_UncoveredGroinOrChestDisapproved</li>
+      </li>
+      <li>
+        <li>Nudity_Male_UncoveredGroinOrChestDisapproved</li>
+      </li>
+      <li>
+        <li>Execution_DontCare</li>
+      </li>
+      <li>
+        <li>Scarification_Horrible</li>
+      </li>
+      <li>
+        <li>Slavery_Abhorrent</li>
+      </li>
+      <li>
+        <li>HAR_AlienSlavery_Abhorrent</li>
+      </li>
+      <li>
+        <li>Cannibalism_Horrible</li>
+      </li>
+      <li>
+        <li>HAR_EatingAliens_Abhorrent</li>
+      </li>
+    </requireOne>
+  </MemeDef>
+
+  <IdeoStoryPatternDef>
+    <defName>PN_IdeoStoryPattern</defName>
+    <segments>
+      <li>episode</li>
+    </segments>
+    <rules>
+      <include>
+        <li>IdeoDescriptionGlobal</li>
+      </include>
+    </rules>
+  </IdeoStoryPatternDef>
+
+  <IdeoIconDef>
+    <defName>PN_IdeoIcon</defName>
+    <iconPath>Icon/Paniel_PlayerIcon</iconPath>
+    <memes>
+      <li>PN_Structure</li>
+    </memes>
+  </IdeoIconDef>
+
+</Defs>