Merge CE

up to CombatExtended-Continued/CombatExtended@d4bd0f8
masakitenchi · Jun 23, 2024 · 95669a1 · 95669a1
1 parent 235b51e
commit 95669a1
Show file tree

Hide file tree

Showing 11 changed files with 81 additions and 70 deletions.
diff --git a/Mods/CombatExtended/Anomaly/Defs/Ammo/NerveSpikerBolt.xml b/Mods/CombatExtended/Anomaly/Defs/Ammo/NerveSpikerBolt.xml
@@ -23,9 +23,9 @@
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="AmmoCrossbowBoltBase">
 		<defName>Ammo_NerveSpikerBolt</defName>
 		<label>nerve spiker bolt</label>
-		<description>A bolt of bioferrite, tipped with biotoxin and shaped to be fired from a nerve spiker.\n\nThough simple to make, these bolts are brittle and tend to deform or break on impact, making them impossible to reuse.</description>		
+		<description>A heavy bioferrite bolt, tipped with biotoxin and shaped to be fired from a nerve spiker.\n\nThough simple to make, these bolts are brittle and tend to deform or break on impact, making them impossible to reuse.</description>		
 		<graphicData>
-			<texPath>Things/Ammo/Medieval/Bolt/Steel</texPath>
+			<texPath>Things/Ammo/Neolithic/Arrow/Bioferrite</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>
@@ -49,7 +49,7 @@
 		<defName>Projectile_NerveSpikerBolt</defName>
 		<label>nerve spiker bolt</label>
 		<graphicData>
-			<texPath>Things/Projectile/NerveSpikerShot</texPath>
+			<texPath>Things/Projectile/Arrows/Arrow_Bioferrite</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
 		</graphicData>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">

diff --git a/Mods/CombatExtended/Anomaly/Patches/AbilityDefs/Abilities_Anomaly.xml b/Mods/CombatExtended/Anomaly/Patches/AbilityDefs/Abilities_Anomaly.xml
@@ -75,7 +75,7 @@
 		<value>
 			<verbProperties Class="CombatExtended.VerbPropertiesCE">		
 				<soundCast>Gorehulk_Spine_Launch</soundCast>
-				<range>18.9</range>
+				<range>27.9</range>
 				<defaultProjectile>Spine_Gorehulk</defaultProjectile>
 			</verbProperties>	
 		</value>
@@ -114,7 +114,9 @@
 				<defaultProjectile>Bullet_Heatspike</defaultProjectile>
 				<ticksBetweenBurstShots>6</ticksBetweenBurstShots>
 				<warmupTime>0</warmupTime>
-				<burstShotCount>12</burstShotCount>				
+				<burstShotCount>12</burstShotCount>
+				<stopBurstWithoutLos>false</stopBurstWithoutLos>
+				<recoilAmount>3</recoilAmount> <!-- Abilities can't use ShotSpread, so give high recoil. -->
 			</verbProperties>	
 		</value>
 	</Operation>

diff --git a/Mods/CombatExtended/Anomaly/Patches/ThingDefs_Misc/Apparel_Anomaly.xml b/Mods/CombatExtended/Anomaly/Patches/ThingDefs_Misc/Apparel_Anomaly.xml
@@ -25,6 +25,8 @@
 		<xpath>Defs/ThingDef[defName="Apparel_CultistMask"]/statBases/StuffEffectMultiplierArmor</xpath>
 		<value>
 			<StuffEffectMultiplierArmor>1</StuffEffectMultiplierArmor> <!-- Made of Bioferrite.-->
+			<Bulk>1</Bulk>
+			<WornBulk>0</WornBulk>
 		</value>
 	</Operation>
 
@@ -35,6 +37,8 @@
 		<xpath>Defs/ThingDef[defName="Apparel_CeremonialCultistMask"]/statBases/StuffEffectMultiplierArmor</xpath>
 		<value>
 			<StuffEffectMultiplierArmor>2</StuffEffectMultiplierArmor>
+			<Bulk>1</Bulk>
+			<WornBulk>0</WornBulk>
 		</value>
 	</Operation>
 
@@ -65,4 +69,18 @@
 		</value>
 	</Operation>
 
+	<!-- ========== Prevent the autopatcher touching the lances. ========== -->
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[
+			defName="Apparel_ShardPsychicShockLance" or
+			defName="Apparel_ShardPsychicInsanityLance" or
+			defName="Apparel_BiomutationLance"
+			]/statBases</xpath>
+		<value>
+			<Bulk>1</Bulk>
+			<WornBulk>0</WornBulk>
+		</value>
+	</Operation>
+
 </Patch>
diff --git a/Mods/CombatExtended/Anomaly/Patches/ThingDefs_Misc/Apparel_Packs.xml b/Mods/CombatExtended/Anomaly/Patches/ThingDefs_Misc/Apparel_Packs.xml
@@ -3,6 +3,14 @@
 
 	<!-- ========== Disruptor Flare Pack ========== -->
 
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_DisruptorFlarePack"]/statBases</xpath>
+		<value>
+			<Bulk>10</Bulk>
+			<WornBulk>2</WornBulk>
+		</value>
+	</Operation>
+
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="Apparel_DisruptorFlarePack"]/verbs</xpath>
 		<value>
@@ -75,7 +83,7 @@
 			<verbs>
 				<li Class="CombatExtended.VerbPropertiesCE">
 					<label>deploy turret</label>
-					<verbClass>Verb_LaunchProjectileStaticOneUse</verbClass>
+      				<verbClass>CombatExtended.Verb_ShootCEOneUseStatic</verbClass>
 					<hasStandardCommand>true</hasStandardCommand>
 					<onlyManualCast>True</onlyManualCast>
 					<warmupTime>1</warmupTime>
@@ -103,13 +111,13 @@
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="Grenade_TurretPack"]/projectile</xpath>
 		<value>
-		<projectile Class="CombatExtended.ProjectilePropertiesCE">
-			<dropsCasings>false</dropsCasings>
-			<dangerFactor>0</dangerFactor>
-			<airborneSuppressionFactor>0</airborneSuppressionFactor>
-			<speed>12</speed>
-			<spawnsThingDef>Turret_TacticalTurret</spawnsThingDef>
-		</projectile>
+			<projectile Class="CombatExtended.ProjectilePropertiesCE">
+				<dropsCasings>false</dropsCasings>
+				<dangerFactor>0</dangerFactor>
+				<airborneSuppressionFactor>0</airborneSuppressionFactor>
+				<speed>12</speed>
+				<spawnsThingDef>Turret_TacticalTurret</spawnsThingDef>
+			</projectile>
 		</value>
 	</Operation>
 
@@ -129,7 +137,7 @@
 			<verbs>
 				<li Class="CombatExtended.VerbPropertiesCE">
 					<label>deploy deadlife dust</label>
-					<verbClass>CombatExtended.Verb_LaunchProjectileStaticCE</verbClass>
+      				<verbClass>CombatExtended.Verb_ShootCEOneUseStatic</verbClass>
 					<hasStandardCommand>true</hasStandardCommand>
 					<onlyManualCast>True</onlyManualCast>
 					<warmupTime>1.5</warmupTime>
@@ -169,34 +177,4 @@
 		</value>
 	</Operation>
 
-
-  <!--PackTurret-->
-  <!--Apparel-->
-  <Operation Class="PatchOperationAttributeSet">
-    <xpath>Defs/ThingDef[defName="Apparel_PackTurret"]/verbs/li[label="deploy turret"]</xpath>
-    <attribute>Class</attribute>
-    <value>CombatExtended.VerbPropertiesCE</value>
-  </Operation>
-  <Operation Class="PatchOperationReplace">
-    <xpath>Defs/ThingDef[defName="Apparel_PackTurret"]/verbs/li[label="deploy turret"]/verbClass</xpath>
-    <value>
-      <verbClass>CombatExtended.Verb_ShootCEOneUseStatic</verbClass>
-    </value>
-  </Operation>
-
-  <!--Projectile-->
-
-  <Operation Class="PatchOperationAttributeSet">
-    <xpath>Defs/ThingDef[defName="Grenade_TurretPack"]/projectile</xpath>
-    <attribute>Class</attribute>
-    <value>CombatExtended.ProjectilePropertiesCE</value>
-  </Operation>
-
-  <Operation Class="PatchOperationReplace">
-    <xpath>Defs/ThingDef[defName="Grenade_TurretPack"]/thingClass</xpath>
-    <value>
-      <thingClass>CombatExtended.ProjectileCE_SpawnsThing</thingClass>
-    </value>
-  </Operation>
-
 </Patch>
diff --git a/Mods/CombatExtended/Anomaly/Patches/ThingDefs_Races/Races_Entities_Misc.xml b/Mods/CombatExtended/Anomaly/Patches/ThingDefs_Races/Races_Entities_Misc.xml
@@ -17,8 +17,8 @@
 			<MeleeDodgeChance>1</MeleeDodgeChance>
 			<MeleeCritChance>0.5</MeleeCritChance>
 			<MeleeParryChance>0</MeleeParryChance>
-			<AimingAccuracy>1.3</AimingAccuracy>
-			<ShootingAccuracyPawn>1.25</ShootingAccuracyPawn>			
+			<AimingAccuracy>1</AimingAccuracy>
+			<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
 		</value>
 	</Operation>
 
@@ -93,7 +93,7 @@
 		<value>
 			<MeleeDodgeChance>1.2</MeleeDodgeChance>
 			<MeleeCritChance>1</MeleeCritChance>
-			<MeleeParryChance>1</MeleeParryChance>
+			<MeleeParryChance>0.8</MeleeParryChance>
 		</value>
 	</Operation>
 
@@ -276,14 +276,14 @@
 		</value>
 	</Operation>
 
-	<Operation Class="PatchOperationAdd">
+	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="Noctol"]/statBases/ArmorRating_Sharp</xpath>
 		<value>
 			<ArmorRating_Sharp>3.5</ArmorRating_Sharp>
 		</value>
 	</Operation>
 
-	<Operation Class="PatchOperationAdd">
+	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="Noctol"]/statBases/ArmorRating_Blunt</xpath>
 		<value>
 			<ArmorRating_Blunt>7</ArmorRating_Blunt>
@@ -394,8 +394,8 @@
 			<MeleeDodgeChance>0.8</MeleeDodgeChance>
 			<MeleeCritChance>0.65</MeleeCritChance>
 			<MeleeParryChance>0.1</MeleeParryChance>
-			<AimingAccuracy>1.3</AimingAccuracy>
-			<ShootingAccuracyPawn>1.25</ShootingAccuracyPawn>
+			<AimingAccuracy>1</AimingAccuracy>
+			<ShootingAccuracyPawn>1</ShootingAccuracyPawn>
 		</value>
 	</Operation>
 

diff --git a/Mods/CombatExtended/Anomaly/Patches/ThingTreeDefs/ThinkTreeDefs_Anomaly.xml b/Mods/CombatExtended/Anomaly/Patches/ThingTreeDefs/ThinkTreeDefs_Anomaly.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+
+	<!-- ========== Gorehulk ========== -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThinkTreeDef[defName="Gorehulk"]/thinkRoot/subNodes/li[@Class="JobGiver_FleeForDistance"]</xpath>
+		<value>
+			<li Class="JobGiver_FleeForDistance">
+				<enemyDistToFleeRange>3.9~14.9</enemyDistToFleeRange>
+				<fleeDistRange>15.5~24</fleeDistRange>
+			  </li>
+		</value>
+	</Operation>
+
+</Patch>
diff --git a/Mods/CombatExtended/Biotech/Patches/ThingDefs_Races/Races_Mechanoids_Medium.xml b/Mods/CombatExtended/Biotech/Patches/ThingDefs_Races/Races_Mechanoids_Medium.xml
@@ -149,6 +149,13 @@
 		</value>
 	</Operation>
 
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mech_Scorcher"]/race/baseHealthScale</xpath>
+		<value>
+			<baseHealthScale>1.0</baseHealthScale>
+		</value>
+	</Operation>
+
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="Mech_Scorcher"]/tools</xpath>
 		<value>

diff --git a/Mods/CombatExtended/Defs/ThingDefs_Misc/Weapons_Ranged.xml b/Mods/CombatExtended/Defs/ThingDefs_Misc/Weapons_Ranged.xml
@@ -198,7 +198,6 @@
 		</tools>
 		<modExtensions>
 			<li Class="CombatExtended.GunDrawExtension">
-				<DrawSize>1.0,1.0</DrawSize>
 				<DrawOffset>-0.3,0.0</DrawOffset>
 			</li>
 		</modExtensions>
@@ -480,14 +479,6 @@
 				<linkedBodyPartsGroup>Muzzle</linkedBodyPartsGroup>
 			</li>
 		</tools>
-		<modExtensions>
-			<!--	
-      <li Class="CombatExtended.GunDrawExtension">
-<DrawSize>0.93,0.93</DrawSize>
-<DrawOffset>0.0,0.0</DrawOffset>
-      </li>
-    -->
-		</modExtensions>
 	</ThingDef>
 
 	<!-- ==================== Minigun (Mechanoid) ==================== -->
@@ -500,6 +491,7 @@
 		<graphicData>
 			<texPath>Things/Weapons/MechanoidMinigun</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
+			<drawSize>(1.4,1.4)</drawSize>
 		</graphicData>
 		<soundInteract>Interact_Rifle</soundInteract>
 		<statBases>
@@ -557,10 +549,6 @@
 			</li>
 		</tools>
 		<modExtensions>
-			<li Class="CombatExtended.GunDrawExtension">
-				<DrawSize>1.4,1.4</DrawSize>
-				<DrawOffset>0.0,0.0</DrawOffset>
-			</li>
 			<li Class="CombatExtended.ThingDefExtensionCE">
 				<MenuHidden>True</MenuHidden>
 			</li>

diff --git a/Mods/CombatExtended/Defs/ThingDefs_Misc/Weapons_Spotting.xml b/Mods/CombatExtended/Defs/ThingDefs_Misc/Weapons_Spotting.xml
@@ -24,6 +24,7 @@
 		<graphicData>
 			<texPath>Things/Weapons/CE_BinocularsRadio</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
+			<drawSize>(0.87,0.87)</drawSize>
 		</graphicData>
 		<generateAllowChance>0</generateAllowChance>
 		<soundInteract>Interact_Rifle</soundInteract>
@@ -70,12 +71,6 @@
 				<linkedBodyPartsGroup>Base</linkedBodyPartsGroup>
 			</li>
 		</tools>
-		<modExtensions>
-			<li Class="CombatExtended.GunDrawExtension">
-				<DrawSize>0.87,0.87</DrawSize>
-				<DrawOffset>0.0,0.0</DrawOffset>
-			</li>
-		</modExtensions>
 	</ThingDef>
 
 </Defs>
diff --git a/Mods/CombatExtended/LoadFolders.xml b/Mods/CombatExtended/LoadFolders.xml
@@ -14,6 +14,7 @@
 		<li IfModActive="ADE.AdvancedTurretsA.copy.Mod">ModPatches/ADE Advanced turrets PLUS</li>
 		<li IfModActive="ADE.pulseTurrets.Mod">ModPatches/ADE Pulse Turrets PLUS</li>
 		<li IfModActive="spoonshortage.ADogSaidAnimalProsthetics">ModPatches/ADogSaid</li>
+    	<li IfModActive="SamBucher.ADogSaidAnimalProsthetics2">ModPatches/ADogSaid2</li>
 		<li IfModActive="Ravvy.AMW">ModPatches/Advanced Mechanoid Warfare</li>
 		<li IfModActive="Mlie.AdvancedMortar">ModPatches/Advanced Mortar</li>
 		<li IfModActive="EV.all.tech.melee">ModPatches/All-Tech Melee</li>

diff --git a/Mods/CombatExtended/Patches/Core/ThingDefs_Races/Races_Mechanoid.xml b/Mods/CombatExtended/Patches/Core/ThingDefs_Races/Races_Mechanoid.xml
@@ -339,6 +339,13 @@
 		</value>
 	</Operation>
 
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Mech_Lancer"]/race/baseHealthScale</xpath>
+		<value>
+			<baseHealthScale>1.0</baseHealthScale>
+		</value>
+	</Operation>
+
 	<Operation Class="PatchOperationReplace">
 		<xpath>Defs/ThingDef[defName="Mech_Lancer"]/tools</xpath>
 		<value>