Fix deadlife verb, turret pack housekeeping

CombatExtended-Continued · Jun 21, 2024 · f675f2d · f675f2d
1 parent f949bbf
commit f675f2d
Showing 1 changed file with 9 additions and 39 deletions.
diff --git a/Anomaly/Patches/ThingDefs_Misc/Apparel_Packs.xml b/Anomaly/Patches/ThingDefs_Misc/Apparel_Packs.xml
@@ -83,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>
@@ -111,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>
 
@@ -137,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>
@@ -177,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>