From fc4b80fa5477d327346adb0a98ff1d42117b2d31 Mon Sep 17 00:00:00 2001
From: Cocopomel <79386233+Cocopomel@users.noreply.github.com>
Date: Mon, 11 Jul 2022 23:21:27 +0900
Subject: [PATCH] =?UTF-8?q?=ED=80=98=EC=8A=A4=ED=8A=B8=20=EA=B4=80?=
 =?UTF-8?q?=EB=A0=A8=20=EC=A1=B0=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Royalty/Defs/PnLCareerLevel/Royal_Permits.xml | 66 +++++++++----------
 Royalty/Defs/PnLCareerLevel/Royal_Titles.xml  | 28 +++++---
 2 files changed, 52 insertions(+), 42 deletions(-)

diff --git a/Royalty/Defs/PnLCareerLevel/Royal_Permits.xml b/Royalty/Defs/PnLCareerLevel/Royal_Permits.xml
index 216284e..d9cb491 100644
--- a/Royalty/Defs/PnLCareerLevel/Royal_Permits.xml
+++ b/Royalty/Defs/PnLCareerLevel/Royal_Permits.xml
@@ -26,7 +26,7 @@
   <RoyalTitlePermitDef ParentName="PN_DropResourcesBase">
     <defName>PN_AnnualSalary_A</defName>
     <label>annual salary class A</label>
-    <description>This is the annual salary paid to PnL Logistics employees. can use PnL result point to receive advance payment.</description>
+    <description>This is the annual salary (800 Silver) paid to PnL Logistics employees. can use PnL result point to receive advance salary.</description>
     <minTitle>PN_Title_Associate</minTitle>
     <permitPointCost>1</permitPointCost>
     <uiPosition>(0,0)</uiPosition>
@@ -41,7 +41,7 @@
   <RoyalTitlePermitDef ParentName="PN_DropResourcesBase">
     <defName>PN_AnnualSalary_B</defName>
     <label>annual salary class B</label>
-    <description>This is the annual salary paid to PnL Logistics employees. can use PnL result point to receive advance payment.</description>
+    <description>This is the annual salary (3200 Silver) paid to PnL Logistics employees. can use PnL result point to receive advance salary.</description>
     <minTitle>PN_Title_Manager</minTitle>
     <permitPointCost>1</permitPointCost>
     <prerequisite>PN_AnnualSalary_A</prerequisite>
@@ -54,6 +54,22 @@
     </royalAid>
   </RoyalTitlePermitDef>
 
+  <!--OTP 지급-->
+  <RoyalTitlePermitDef ParentName="PN_DropResourcesBase">
+    <defName>PN_DropOTPCard</defName>
+    <label>request OTP card</label>
+    <description>Request for a drop of PnL OTP card.</description>
+    <minTitle>PN_Title_Senior</minTitle>
+    <permitPointCost>1</permitPointCost>
+    <uiPosition>(0,1)</uiPosition>
+    <royalAid>
+      <itemsToDrop>
+        <PN_OTPCard>1</PN_OTPCard>
+      </itemsToDrop>
+      <favorCost>2</favorCost>
+    </royalAid>
+  </RoyalTitlePermitDef>
+
   <!--전투니엘 지원 (근접)-->
   <RoyalTitlePermitDef>
     <defName>PN_RequestSecurityUnitClose</defName>
@@ -62,7 +78,7 @@
     <workerClass>RoyalTitlePermitWorker_CallAid</workerClass>
     <minTitle>PN_Title_Senior</minTitle>
     <permitPointCost>1</permitPointCost>
-    <uiPosition>(0,1)</uiPosition>
+    <uiPosition>(0,2)</uiPosition>
     <faction>PN_SubsidiaryFaction</faction>
     <royalAid>
       <favorCost>2</favorCost>
@@ -81,7 +97,7 @@
     <minTitle>PN_Title_SeniorManager</minTitle>
     <permitPointCost>1</permitPointCost>
     <prerequisite>PN_RequestSecurityUnitClose</prerequisite>
-    <uiPosition>(1,1)</uiPosition>
+    <uiPosition>(1,2)</uiPosition>
     <faction>PN_SubsidiaryFaction</faction>
     <royalAid>
       <favorCost>4</favorCost>
@@ -100,7 +116,7 @@
     <workerClass>RoyalTitlePermitWorker_CallAid</workerClass>
     <minTitle>PN_Title_Senior</minTitle>
     <permitPointCost>1</permitPointCost>
-    <uiPosition>(0,2)</uiPosition>
+    <uiPosition>(0,3)</uiPosition>
     <faction>PN_SubsidiaryFaction</faction>
     <royalAid>
       <favorCost>3</favorCost>
@@ -119,7 +135,7 @@
     <minTitle>PN_Title_SeniorManager</minTitle>
     <permitPointCost>1</permitPointCost>
     <prerequisite>PN_RequestSecurityUnitRange</prerequisite>
-    <uiPosition>(1,2)</uiPosition>
+    <uiPosition>(1,3)</uiPosition>
     <faction>PN_SubsidiaryFaction</faction>
     <royalAid>
       <favorCost>6</favorCost>
@@ -138,7 +154,7 @@
     <workerClass>RoyalTitlePermitWorker_CallLaborers</workerClass>
     <minTitle>PN_Title_Senior</minTitle>
     <permitPointCost>1</permitPointCost>
-    <uiPosition>(0,3)</uiPosition>
+    <uiPosition>(0,4)</uiPosition>
     <faction>PN_SubsidiaryFaction</faction>
     <royalAid>
       <favorCost>2</favorCost>
@@ -158,7 +174,7 @@
     <minTitle>PN_Title_SeniorManager</minTitle>
     <permitPointCost>1</permitPointCost>
     <prerequisite>PN_RequestEngineerUnit</prerequisite>
-    <uiPosition>(1,3)</uiPosition>
+    <uiPosition>(1,4)</uiPosition>
     <faction>PN_SubsidiaryFaction</faction>
     <royalAid>
       <favorCost>4</favorCost>
@@ -178,7 +194,7 @@
     <workerClass>RoyalTitlePermitWorker_CallLaborers</workerClass>
     <minTitle>PN_Title_Senior</minTitle>
     <permitPointCost>1</permitPointCost>
-    <uiPosition>(0,4)</uiPosition>
+    <uiPosition>(0,5)</uiPosition>
     <faction>PN_SubsidiaryFaction</faction>
     <royalAid>
       <favorCost>2</favorCost>
@@ -198,7 +214,7 @@
     <minTitle>PN_Title_SeniorManager</minTitle>
     <permitPointCost>1</permitPointCost>
     <prerequisite>PN_RequestDomesticUnit</prerequisite>
-    <uiPosition>(1,4)</uiPosition>
+    <uiPosition>(1,5)</uiPosition>
     <faction>PN_SubsidiaryFaction</faction>
     <royalAid>
       <favorCost>4</favorCost>
@@ -217,7 +233,7 @@
     <description>Request for a drop of 3 PnL Component.</description>
     <minTitle>PN_Title_Manager</minTitle>
     <permitPointCost>1</permitPointCost>
-    <uiPosition>(0,5)</uiPosition>
+    <uiPosition>(0,6)</uiPosition>
     <royalAid>
       <itemsToDrop>
         <PN_Component>3</PN_Component>
@@ -226,22 +242,6 @@
     </royalAid>
   </RoyalTitlePermitDef>
 
-  <!--OTP 지급-->
-  <RoyalTitlePermitDef ParentName="PN_DropResourcesBase">
-    <defName>PN_DropOTPCard</defName>
-    <label>request OTP card</label>
-    <description>Request for a drop of PnL OTP card.</description>
-    <minTitle>PN_Title_SeniorManager</minTitle>
-    <permitPointCost>1</permitPointCost>
-    <uiPosition>(1,5)</uiPosition>
-    <royalAid>
-      <itemsToDrop>
-        <PN_OTPCard>1</PN_OTPCard>
-      </itemsToDrop>
-      <favorCost>1</favorCost>
-    </royalAid>
-  </RoyalTitlePermitDef>
-
   <!--전투 오토마톤 상자-->
   <RoyalTitlePermitDef ParentName="PN_DropResourcesBase">
     <defName>PN_DropPackagedAutomatonSoldier</defName>
@@ -249,7 +249,7 @@
     <description>Request for a drop of PnL automaton™ (Combat) box.</description>
     <minTitle>PN_Title_Manager</minTitle>
     <permitPointCost>1</permitPointCost>
-    <uiPosition>(0,6)</uiPosition>
+    <uiPosition>(0,7)</uiPosition>
     <royalAid>
       <itemsToDrop>
         <Packaged_NormalAutomatonSoldier>1</Packaged_NormalAutomatonSoldier>
@@ -266,7 +266,7 @@
     <permitPointCost>1</permitPointCost>
     <cooldownDays>300</cooldownDays>
     <prerequisite>PN_DropPackagedAutomatonSoldier</prerequisite>
-    <uiPosition>(1,6)</uiPosition>
+    <uiPosition>(1,7)</uiPosition>
     <royalAid>
       <itemsToDrop>
         <Packaged_PremiumAutomatonSoldier>1</Packaged_PremiumAutomatonSoldier>
@@ -282,7 +282,7 @@
     <description>Request for a drop of PnL automaton™ (Engineer) box.</description>
     <minTitle>PN_Title_Manager</minTitle>
     <permitPointCost>1</permitPointCost>
-    <uiPosition>(0,7)</uiPosition>
+    <uiPosition>(0,8)</uiPosition>
     <royalAid>
       <itemsToDrop>
         <Packaged_NormalAutomatonWorker>1</Packaged_NormalAutomatonWorker>
@@ -299,7 +299,7 @@
     <permitPointCost>1</permitPointCost>
     <cooldownDays>300</cooldownDays>
     <prerequisite>PN_DropPackagedAutomatonWorker</prerequisite>
-    <uiPosition>(1,7)</uiPosition>
+    <uiPosition>(1,8)</uiPosition>
     <royalAid>
       <itemsToDrop>
         <Packaged_PremiumAutomatonWorker>1</Packaged_PremiumAutomatonWorker>
@@ -316,7 +316,7 @@
     <description>Request for a drop of PnL automaton™ (Domestic) box.</description>
     <minTitle>PN_Title_Manager</minTitle>
     <permitPointCost>1</permitPointCost>
-    <uiPosition>(0,8)</uiPosition>
+    <uiPosition>(0,9)</uiPosition>
     <royalAid>
       <itemsToDrop>
         <Packaged_NormalAutomatonMaid>1</Packaged_NormalAutomatonMaid>
@@ -333,7 +333,7 @@
     <permitPointCost>1</permitPointCost>
     <cooldownDays>300</cooldownDays>
     <prerequisite>PN_DropPackagedAutomatonMaid</prerequisite>
-    <uiPosition>(1,8)</uiPosition>
+    <uiPosition>(1,9)</uiPosition>
     <royalAid>
       <itemsToDrop>
         <Packaged_PremiumAutomatonMaid>1</Packaged_PremiumAutomatonMaid>
diff --git a/Royalty/Defs/PnLCareerLevel/Royal_Titles.xml b/Royalty/Defs/PnLCareerLevel/Royal_Titles.xml
index 91d568b..f0717f4 100644
--- a/Royalty/Defs/PnLCareerLevel/Royal_Titles.xml
+++ b/Royalty/Defs/PnLCareerLevel/Royal_Titles.xml
@@ -9,7 +9,6 @@
     <awardThought>PN_TitlePromotion</awardThought>
     <lostThought>PN_TitleDemotion</lostThought>
     <allowDignifiedMeditationFocus>False</allowDignifiedMeditationFocus>
-    <permitPointsAwarded>1</permitPointsAwarded>
     <awardWorkerClass>RoyalTitleAwardWorker_Instant</awardWorkerClass>
   </RoyalTitleDef>
 
@@ -20,7 +19,7 @@
     <description>Intern of PnL Logistics.</description>
     <seniority>0</seniority>
     <favorCost>1</favorCost>
-    <permitPointsAwarded>0</permitPointsAwarded>
+    <permitPointsAwarded>1</permitPointsAwarded>
     <changeHeirQuestPoints>1000</changeHeirQuestPoints>
   </RoyalTitleDef>
 
@@ -29,8 +28,9 @@
     <defName>PN_Title_Associate</defName>
     <label>Associate</label>
     <description>Associate of PnL Logistics.</description>
-    <seniority>100</seniority>
+    <seniority>1</seniority>
     <favorCost>6</favorCost>
+    <permitPointsAwarded>2</permitPointsAwarded>
     <changeHeirQuestPoints>1200</changeHeirQuestPoints>
     <recruitmentResistanceOffset>10</recruitmentResistanceOffset>
   </RoyalTitleDef>
@@ -40,8 +40,9 @@
     <defName>PN_Title_Senior</defName>
     <label>Senior</label>
     <description>Senior of PnL Logistics.</description>
-    <seniority>200</seniority>
+    <seniority>2</seniority>
     <favorCost>8</favorCost>
+    <permitPointsAwarded>2</permitPointsAwarded>
     <changeHeirQuestPoints>1600</changeHeirQuestPoints>
     <recruitmentResistanceOffset>25</recruitmentResistanceOffset>
     <requiredMinimumApparelQuality>Normal</requiredMinimumApparelQuality>
@@ -52,9 +53,9 @@
     <defName>PN_Title_Manager</defName>
     <label>Manager</label>
     <description>Manager of PnL Logistics.</description>
-    <seniority>300</seniority>
+    <seniority>3</seniority>
     <favorCost>12</favorCost>
-    <permitPointsAwarded>2</permitPointsAwarded>
+    <permitPointsAwarded>3</permitPointsAwarded>
     <minExpectation>Moderate</minExpectation>
     <changeHeirQuestPoints>2200</changeHeirQuestPoints>
     <recruitmentResistanceOffset>40</recruitmentResistanceOffset>
@@ -103,9 +104,12 @@
     <defName>PN_Title_SeniorManager</defName>
     <label>Senior Manager</label>
     <description>Senior Manager of PnL Logistics.</description>
-    <seniority>400</seniority>
+    <seniority>4</seniority>
     <favorCost>16</favorCost>
-    <permitPointsAwarded>2</permitPointsAwarded>
+    <permitPointsAwarded>3</permitPointsAwarded>
+    <permits>
+      <li>PN_TradeBenefit</li>
+    </permits>
     <minExpectation>Moderate</minExpectation>
     <changeHeirQuestPoints>2800</changeHeirQuestPoints>
     <recruitmentResistanceOffset>60</recruitmentResistanceOffset>
@@ -164,7 +168,10 @@
     <description>Director of PnL Logistics.</description>
     <seniority>500</seniority>
     <favorCost>22</favorCost>
-    <permitPointsAwarded>3</permitPointsAwarded>
+    <permitPointsAwarded>4</permitPointsAwarded>
+    <permits>
+      <li>PN_TradeBenefit</li>
+    </permits>
     <minExpectation>High</minExpectation>
     <changeHeirQuestPoints>3500</changeHeirQuestPoints>
     <recruitmentResistanceOffset>75</recruitmentResistanceOffset>
@@ -218,6 +225,9 @@
 
   <!--NPC Only-->
   <RoyalTitleDef ParentName="PN_TitleBase" Abstract="True" Name="PN_TitleBaseNPC">
+    <permits>
+      <li>PN_TradeBenefit</li>
+    </permits>
     <requiredMinimumApparelQuality>Normal</requiredMinimumApparelQuality>
     <bedroomRequirements>
       <li Class="RoomRequirement_Area">