From 7d087804028e5381eea733c73dec31f94c7c4c8e Mon Sep 17 00:00:00 2001
From: "ProjectKoi-Kalo\\Kalo" <kalospacer@gmail.com>
Date: Tue, 4 Jun 2024 14:18:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 1.5/1.5/Defs/Factions/DRM_Factions.xml        | 40 +++++++++----------
 .../Defs/RoyalTitles/DRM_RoyalPermits.xml     | 32 +++++++--------
 .../Defs/RoyalTitles/DRM_RoyalTitles.xml      |  2 +-
 3 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/1.5/1.5/Defs/Factions/DRM_Factions.xml b/1.5/1.5/Defs/Factions/DRM_Factions.xml
index 4761510..e2333a4 100644
--- a/1.5/1.5/Defs/Factions/DRM_Factions.xml
+++ b/1.5/1.5/Defs/Factions/DRM_Factions.xml
@@ -40,26 +40,6 @@
 
 		<melaninRange>0</melaninRange>
 
-		<!-- royalty content begin-->
-		<royalFavorLabel>honor</royalFavorLabel>
-		<royalFavorIconPath>UI/Icons/RoyalFavor</royalFavorIconPath>
-		<royalTitleTags>
-			<li>Dragonian_Royal_Title</li>
-		</royalTitleTags>
-		<royalTitleInheritanceWorkerClass>RoyalTitleInheritanceWorker</royalTitleInheritanceWorkerClass>
-		<royalTitleInheritanceRelations>
-			<li>Child</li>
-			<li>Grandchild</li>
-			<li>GreatGrandchild</li>
-			<li>NephewOrNiece</li>
-			<li>Spouse</li>
-			<li>Sibling</li>
-			<li>HalfSibling</li>
-			<li>Cousin</li>
-			<li>Parent</li>
-			<li>UncleOrAunt</li>
-		</royalTitleInheritanceRelations>
-		<!-- royalty content end-->
 		<xenotypeSet>
 			<xenotypeChances>
 				<DragonianXenotype MayRequire="Ludeon.RimWorld.Biotech">1</DragonianXenotype>
@@ -254,6 +234,26 @@
 		<defName>Dragonian_NPC</defName>
 		<label>Dragonian</label>
 		<description>Dragonian settlement</description>
+		<!-- royalty content begin-->
+		<royalFavorLabel>honor</royalFavorLabel>
+		<royalFavorIconPath>UI/Icons/RoyalFavor</royalFavorIconPath>
+		<royalTitleTags>
+			<li>Dragonian_Royal_Title</li>
+		</royalTitleTags>
+		<royalTitleInheritanceWorkerClass>RoyalTitleInheritanceWorker</royalTitleInheritanceWorkerClass>
+		<royalTitleInheritanceRelations>
+			<li>Child</li>
+			<li>Grandchild</li>
+			<li>GreatGrandchild</li>
+			<li>NephewOrNiece</li>
+			<li>Spouse</li>
+			<li>Sibling</li>
+			<li>HalfSibling</li>
+			<li>Cousin</li>
+			<li>Parent</li>
+			<li>UncleOrAunt</li>
+		</royalTitleInheritanceRelations>
+		<!-- royalty content end-->
 	</FactionDef>
 
 	<FactionDef ParentName="Dragonian_NPCFactionBase">
diff --git a/1.5/Royal1.5/Defs/RoyalTitles/DRM_RoyalPermits.xml b/1.5/Royal1.5/Defs/RoyalTitles/DRM_RoyalPermits.xml
index 504c1f5..3fffc94 100644
--- a/1.5/Royal1.5/Defs/RoyalTitles/DRM_RoyalPermits.xml
+++ b/1.5/Royal1.5/Defs/RoyalTitles/DRM_RoyalPermits.xml
@@ -25,7 +25,7 @@
 
   <RoyalTitlePermitDef Name="DRM_DropResourcesBase" Abstract="True">
     <workerClass>RoyalTitlePermitWorker_DropResources</workerClass>
-    <faction>Dragonian_Clans</faction>
+    <faction>Dragonian_NPC</faction>
     <permitPointCost>1</permitPointCost>
     <cooldownDays>45</cooldownDays>
     <usableOnWorldMap>true</usableOnWorldMap>
@@ -39,7 +39,7 @@
     <label>steel drop</label>
     <description>Call for a drop of 250 steel.</description>
     <minTitle>DRM_Freeholder</minTitle>
-    <faction>Dragonian_Clans</faction>
+    <faction>Dragonian_NPC</faction>
     <permitPointCost>1</permitPointCost>
     <uiPosition>(0,0)</uiPosition>
     <royalAid>
@@ -98,7 +98,7 @@
     <description>Call a group of 4 laborers to assist you for 4 days. These workers can only do general labor tasks. You can control them as though they were your own colonists. You are required to keep them safe.</description>
     <workerClass>RoyalTitlePermitWorker_CallLaborers</workerClass>
     <minTitle>DRM_Freeholder</minTitle>
-    <faction>Dragonian_Clans</faction>
+    <faction>Dragonian_NPC</faction>
     <permitPointCost>1</permitPointCost>
     <uiPosition>(0,2)</uiPosition>
     <royalAid>
@@ -118,9 +118,9 @@
     <description>Call a group of 8 laborers to assist you for 4 days. These workers can only do general labor tasks. You can control them as though they were your own colonists. You are required to keep them safe.</description>
     <workerClass>RoyalTitlePermitWorker_CallLaborers</workerClass>
     <minTitle>DRM_Freeholder</minTitle>
-    <faction>Dragonian_Clans</faction>
+    <faction>Dragonian_NPC</faction>
     <permitPointCost>1</permitPointCost>
-    <prerequisite>CallLaborerTeam</prerequisite>
+    <prerequisite>DRM_CallLaborerTeam</prerequisite>
     <uiPosition>(1,2)</uiPosition>
     <royalAid>
       <favorCost>8</favorCost>
@@ -138,11 +138,11 @@
 
   <RoyalTitlePermitDef>
     <defName>DRM_CallMilitaryAidSmall</defName>
-    <label>call trooper squad</label>
+    <label>call guard squad</label>
     <description>Call a group of 4 light troopers to aid you in battle.</description>
     <workerClass>RoyalTitlePermitWorker_CallAid</workerClass>
     <minTitle>DRM_Freeholder</minTitle>
-    <faction>Dragonian_Clans</faction>
+    <faction>Dragonian_NPC</faction>
     <permitPointCost>1</permitPointCost>
     <uiPosition>(0,3)</uiPosition>
     <royalAid>
@@ -156,16 +156,16 @@
 
   <RoyalTitlePermitDef>
     <defName>DRM_CallMilitaryAidLarge</defName>
-    <label>call Royal Hunter squad</label>
+    <label>call hunter squad</label>
     <description>Call a group of 4 professional janissaries to aid you in battle.</description>
     <workerClass>RoyalTitlePermitWorker_CallAid</workerClass>
     <minTitle>DRM_Freeholder</minTitle>
-    <faction>Dragonian_Clans</faction>
+    <faction>Dragonian_NPC</faction>
     <permitPointCost>1</permitPointCost>
     <uiPosition>(0,7)</uiPosition>
     <royalAid>
       <favorCost>6</favorCost>
-      <pawnKindDef>Dragonian_Royal_Hunter</pawnKindDef>
+      <pawnKindDef>Dragonian_Clan_Hunter</pawnKindDef>
       <pawnCount>4</pawnCount>
       <targetingRange>39.9</targetingRange>
     </royalAid>
@@ -174,13 +174,13 @@
 
   <RoyalTitlePermitDef>
     <defName>DRM_CallMilitaryAidGrand</defName>
-    <label>call cataphract squad</label>
+    <label>call royal guard group</label>
     <description>Call a group of 4 heavy cataphracts to aid you in battle.</description>
     <workerClass>RoyalTitlePermitWorker_CallAid</workerClass>
     <minTitle>DRM_Freeholder</minTitle>
-    <faction>Dragonian_Clans</faction>
+    <faction>Dragonian_NPC</faction>
     <permitPointCost>1</permitPointCost>
-    <prerequisite>CallMilitaryAidLarge</prerequisite>
+    <prerequisite>DRM_CallMilitaryAidLarge</prerequisite>
     <uiPosition>(1,7)</uiPosition>
     <royalAid>
       <favorCost>8</favorCost>
@@ -197,7 +197,7 @@
     <description>Call a single-impact aerodrone strike at a target position.</description>
     <workerClass>RoyalTitlePermitWorker_OrbitalStrike</workerClass>
     <minTitle>DRM_Freeholder</minTitle>
-    <faction>Dragonian_Clans</faction>
+    <faction>Dragonian_NPC</faction>
     <permitPointCost>1</permitPointCost>
     <cooldownDays>45</cooldownDays>
     <uiPosition>(0,5)</uiPosition>
@@ -218,7 +218,7 @@
     <description>Call a salvo of aerodrone strikes around a target position.</description>
     <workerClass>RoyalTitlePermitWorker_OrbitalStrike</workerClass>
     <minTitle>DRM_Freeholder</minTitle>
-    <faction>Dragonian_Clans</faction>
+    <faction>Dragonian_NPC</faction>
     <permitPointCost>1</permitPointCost>
     <prerequisite>CallOrbitalStrike</prerequisite>
     <cooldownDays>60</cooldownDays>
@@ -243,7 +243,7 @@
     <description>Call a shuttle for your own use. It will transport colonists, items, and animals anywhere you like within 70 world tiles.</description>
     <workerClass>RoyalTitlePermitWorker_CallShuttle</workerClass>
     <minTitle>DRM_Freeholder</minTitle>
-    <faction>Dragonian_Clans</faction>
+    <faction>Dragonian_NPC</faction>
     <permitPointCost>1</permitPointCost>
     <cooldownDays>40</cooldownDays>
     <usableOnWorldMap>true</usableOnWorldMap>
diff --git a/1.5/Royal1.5/Defs/RoyalTitles/DRM_RoyalTitles.xml b/1.5/Royal1.5/Defs/RoyalTitles/DRM_RoyalTitles.xml
index 57322af..69da99e 100644
--- a/1.5/Royal1.5/Defs/RoyalTitles/DRM_RoyalTitles.xml
+++ b/1.5/Royal1.5/Defs/RoyalTitles/DRM_RoyalTitles.xml
@@ -20,4 +20,4 @@
         <awardWorkerClass>RoyalTitleAwardWorker_Instant</awardWorkerClass>
     </RoyalTitleDef>
 
-<Defs>
\ No newline at end of file
+</Defs>
\ No newline at end of file