Merge pull request #1136 from N7Huntsman/Royalty-Patches

Patch fixes, new gun textures.
CombatExtendedRWMod · Mar 26, 2020 · ccf1282 · ccf1282
2 parents 502f528 + dd8c3af
commit ccf1282
Show file tree

Hide file tree

Showing 6 changed files with 295 additions and 205 deletions.
diff --git a/Defs/ThingDefs_Misc/Weapons_Ranged.xml b/Defs/ThingDefs_Misc/Weapons_Ranged.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Defs>
 
-  <!-- ==================== M97 Grenade Launcher ==================== -->
+  <!-- ==================== Grenade Launcher ==================== -->
 
   <ThingDef ParentName="BaseMakeableGun">
     <defName>CE_GrenadeLauncher</defName>
-    <label>Grenade Launcher</label>
+    <label>grenade launcher</label>
     <description>A simple, locally produced break-action grenade launcher, capable of firing a variety of different projectiles.</description>
     <graphicData>
       <texPath>Things/Weapons/GrenadeLauncher</texPath>
@@ -102,7 +102,7 @@
 
   <ThingDef ParentName="BaseGunWithQuality">
     <defName>CE_ExplosiveBoltProjector</defName>
-    <label>Explosive Bolt Projector</label>
+    <label>explosive bolt projector</label>
     <description>A low-velocity, high-trajectory fire support system deployed by mechanoid Pikeman. While inaccurate and slow-firing, it remains a potent weapon against static targets.</description>
     <graphicData>
       <texPath>Things/Item/Equipment/WeaponRanged/NeedleGun</texPath>

diff --git a/Patches/Nihal/PawnKinds_NiHal.xml b/Patches/Nihal/PawnKinds_NiHal.xml
@@ -25,7 +25,7 @@
 					<shieldTags>
 					  <li>OutlanderShield</li>
 					</shieldTags>
-					<shieldChance>0.5</shieldChance>
+					<shieldChance>0.25</shieldChance>
 					<sidearms>
 					  <li>
 						<generateChance>0.5</generateChance>
@@ -41,6 +41,15 @@
 				  </li>
 				</value>
 			</li>
+			<li Class="PatchOperationReplace">
+				<xpath>/Defs/PawnKindDef[defName="NihalPeasant"]/weaponMoney</xpath>
+				<value>
+					<weaponMoney>
+					  <min>350</min>
+					  <max>800</max>
+					</weaponMoney>
+				</value>
+			</li>			
 			<li Class="PatchOperationAddModExtension">
 				<xpath>/Defs/PawnKindDef[defName="NihalSlave"]</xpath>
 				<value>
@@ -118,7 +127,7 @@
 					<shieldTags>
 					  <li>OutlanderShield</li>
 					</shieldTags>
-					<shieldChance>0.5</shieldChance>
+					<shieldChance>0.25</shieldChance>
 					<sidearms>
 					  <li>
 						<generateChance>0.5</generateChance>
@@ -134,6 +143,15 @@
 				  </li>
 				</value>
 			</li>
+			<li Class="PatchOperationAdd">
+				<xpath>/Defs/PawnKindDef[defName="NihalTownCouncilman"]</xpath>
+				<value>
+					<weaponMoney>
+					  <min>400</min>
+					  <max>800</max>
+					</weaponMoney>
+				</value>
+			</li>			
 			<li Class="PatchOperationAddModExtension">
 				<xpath>/Defs/PawnKindDef[defName="NihalSniper"]</xpath>
 				<value>