patch -p0 < armour_attachments.diff

Index: Build/Tactical/Interface_Items.cc
===================================================================
--- Build/Tactical/Interface_Items.cc	(revision 7055)
+++ Build/Tactical/Interface_Items.cc	(working copy)
@@ -2125,8 +2125,14 @@
 		// require as many APs as to reload
 		if ( gpItemPointer != NULL )
 		{
+			/* mgl: Armour attachments
+			 * mgl: You don't need to have enough APs
+			 * mgl: to attach things to armour.
+			 */
+			INT16 ap_cost = (gpItemDescObject && Item[gpItemDescObject->usItem].usItemClass == IC_ARMOUR)
+			                ? 0 : AP_RELOAD_GUN;
 			// nb pointer could be NULL because of inventory manipulation in mapscreen from sector inv
-			if ( !gpItemPointerSoldier || EnoughPoints( gpItemPointerSoldier, AP_RELOAD_GUN, 0, TRUE ) )
+			if ( !gpItemPointerSoldier || EnoughPoints( gpItemPointerSoldier, ap_cost, 0, TRUE ) )
 			{
 				if ( (Item[ gpItemPointer->usItem ].fFlags & ITEM_INSEPARABLE) && ValidAttachment( gpItemPointer->usItem, gpItemDescObject->usItem ) )
 				{
@@ -2140,7 +2146,13 @@
 		else
 		{
       // ATE: Make sure we have enough AP's to drop it if we pick it up!
-			if ( EnoughPoints( gpItemDescSoldier, ( AP_RELOAD_GUN + AP_PICKUP_ITEM ), 0, TRUE ) )
+			/* mgl: Armour attachments
+			 * mgl: You don't need to have enough APs
+			 * mgl: to detach things from armour.
+			 */
+			INT16 ap_cost = (gpItemDescObject && Item[gpItemDescObject->usItem].usItemClass == IC_ARMOUR)
+			                ? 0 : AP_RELOAD_GUN + AP_PICKUP_ITEM;
+			if (EnoughPoints(gpItemDescSoldier, ap_cost, 0, TRUE ))
 			{
 				// Get attachment if there is one
 				// The follwing function will handle if no attachment is here
@@ -2662,7 +2674,16 @@
 	// check for any AP costs
 	if ( ( gTacticalStatus.uiFlags & TURNBASED ) && ( gTacticalStatus.uiFlags & INCOMBAT ) )
 	{
-		if (gpAttachSoldier)
+		/* mgl: Armour attachments
+		 * mgl: Test on the item class of the object ("gpItemDescObject") added.
+		 * mgl: If it's an armour, no AP cost.
+		 * mgl: I want the armor to work like an inventory slot
+		 * mgl: and let the player freely move items to and out of it.
+		 */
+		if (gpAttachSoldier
+		    && gpItemDescObject
+		    && Item[gpItemDescObject->usItem].usItemClass != IC_ARMOUR 
+		   )
 		{
 			// check for change in attachments, starting with removed attachments
 			fAllFound = TRUE;
Index: Build/Tactical/Items.cc
===================================================================
--- Build/Tactical/Items.cc	(revision 7055)
+++ Build/Tactical/Items.cc	(working copy)
@@ -706,6 +706,69 @@
 	{CHEWING_GUM,			FUMBLE_PAK},
 	{BATTERIES,				XRAY_DEVICE},
 	{COPPER_WIRE,			LAME_BOY},
+
+	/* mgl: Armour attachments 
+	 * mgl: night_goggles xor UV_goggles xor sun_goggles -> helmet
+	 * mgl: camo kit, canteen ->leggings
+	 * mgl: gas_mask xor sun_goggles -> leggings
+	 * mgl: regen booster xor adrenaline booster -> leggings
+	 * mgl: 7.62 NATO 5 clips -> helmet for fun
+	 */
+	{CAMOUFLAGEKIT,	KEVLAR_LEGGINGS},
+	{CAMOUFLAGEKIT,	KEVLAR_LEGGINGS_18},
+	{CAMOUFLAGEKIT,	KEVLAR_LEGGINGS_Y},
+	{CAMOUFLAGEKIT,	SPECTRA_LEGGINGS},
+	{CAMOUFLAGEKIT,	SPECTRA_LEGGINGS_18},
+	{CAMOUFLAGEKIT,	SPECTRA_LEGGINGS_Y},
+	{CANTEEN,	KEVLAR_LEGGINGS},
+	{CANTEEN,	KEVLAR_LEGGINGS_18},
+	{CANTEEN,	KEVLAR_LEGGINGS_18},
+	{CANTEEN,	SPECTRA_LEGGINGS},
+	{CANTEEN,	SPECTRA_LEGGINGS_18},
+	{CANTEEN,	SPECTRA_LEGGINGS_Y},
+	{GASMASK,	KEVLAR_LEGGINGS},
+	{GASMASK,	KEVLAR_LEGGINGS_18},
+	{GASMASK,	KEVLAR_LEGGINGS_Y},
+	{GASMASK,	SPECTRA_LEGGINGS},
+	{GASMASK,	SPECTRA_LEGGINGS_18},
+	{GASMASK,	SPECTRA_LEGGINGS_Y},
+	{SUNGOGGLES,	KEVLAR_LEGGINGS},
+	{SUNGOGGLES,	KEVLAR_LEGGINGS_18},
+	{SUNGOGGLES,	KEVLAR_LEGGINGS_Y},
+	{SUNGOGGLES,	SPECTRA_LEGGINGS},
+	{SUNGOGGLES,	SPECTRA_LEGGINGS_18},
+	{SUNGOGGLES,	SPECTRA_LEGGINGS_Y},
+	{SUNGOGGLES,	KEVLAR_HELMET},
+	{SUNGOGGLES,	KEVLAR_HELMET_18},
+	{SUNGOGGLES,	KEVLAR_HELMET_Y},
+	{SUNGOGGLES,	SPECTRA_HELMET},
+	{SUNGOGGLES,	SPECTRA_HELMET_18},
+	{SUNGOGGLES,	SPECTRA_HELMET_Y},
+	{NIGHTGOGGLES,	KEVLAR_HELMET},
+	{NIGHTGOGGLES,	KEVLAR_HELMET_18},
+	{NIGHTGOGGLES,	KEVLAR_HELMET_Y},
+	{NIGHTGOGGLES,	SPECTRA_HELMET},
+	{NIGHTGOGGLES,	SPECTRA_HELMET_18},
+	{NIGHTGOGGLES,	SPECTRA_HELMET_Y},
+	{UVGOGGLES,	KEVLAR_HELMET},
+	{UVGOGGLES,	KEVLAR_HELMET_18},
+	{UVGOGGLES,	KEVLAR_HELMET_Y},
+	{UVGOGGLES,	SPECTRA_HELMET},
+	{UVGOGGLES,    	SPECTRA_HELMET_18},
+	{UVGOGGLES,    	SPECTRA_HELMET_Y},
+	{CLIP762N_5_AP, KEVLAR_HELMET},
+	{CLIP762N_5_AP, KEVLAR_HELMET_18},
+	{CLIP762N_5_AP, KEVLAR_HELMET_Y},
+	{CLIP762N_5_AP, SPECTRA_HELMET},
+	{CLIP762N_5_AP, SPECTRA_HELMET_18},
+	{CLIP762N_5_AP, SPECTRA_HELMET_Y},
+	{CLIP762N_5_HP, KEVLAR_HELMET},
+	{CLIP762N_5_HP, KEVLAR_HELMET_18},
+	{CLIP762N_5_HP, KEVLAR_HELMET_Y},
+	{CLIP762N_5_HP, SPECTRA_HELMET},
+	{CLIP762N_5_HP, SPECTRA_HELMET_18},
+	{CLIP762N_5_HP, SPECTRA_HELMET_Y},
+
 	{0, 0}
 };
 
@@ -875,6 +938,14 @@
 	{ 0,								0							 }
 };
 
+/* mgl: Armour attachments
+ * mgl: static variable to store the attach position in the armour
+ * mgl: with which the item on the mouse pointer must be swapped.
+ * mgl: The swap works as long as there are at most 3 items on the armour piece.
+ */
+static INT8 armour_attach_swap = ITEM_NOT_FOUND;
+
+
 BOOLEAN ItemIsLegal( UINT16 usItemIndex )
 {
 	//if the user has selected the reduced gun list
@@ -1385,6 +1456,9 @@
 	BOOLEAN		fSameItem = FALSE, fSimilarItems = FALSE;
 	UINT16		usSimilarItem = NOTHING;
 
+	/* mgl: Armour attachments: clear swap variable */
+	armour_attach_swap = ITEM_NOT_FOUND;
+
 	if ( !ValidAttachment( usAttachment, pObj->usItem ) )
 	{
 		// check for an underslung grenade launcher attached to the gun
@@ -1471,6 +1545,32 @@
 				fSameItem = TRUE;
 			}
 			break;
+
+		/* mgl: Armour attachments
+		 * mgl: To express that:
+		 * mgl: 1) the helmet can store only one of the 3 goggles,
+		 * mgl: 2) sun goggles conflict with a gas mask on the leggings,
+		 * mgl: we write that any face item excludes the others.
+		 * mgl: We also store the slot
+		 * mgl: where the conflicting item was found
+		 * mgl: so that the caller swaps them.
+		 */
+		case GASMASK:
+		case UVGOGGLES:
+		case NIGHTGOGGLES:
+		case SUNGOGGLES:
+			armour_attach_swap = FindAttachmentByClass(pObj, IC_FACE);
+			break;
+		/* mgl: Armour attachments
+		 * mgl: 7.62N AP/HP clips on the helmet exclude each other.
+		 */
+		case CLIP762N_5_AP:
+		case CLIP762N_5_HP:
+			usSimilarItem = (usAttachment == CLIP762N_5_AP)
+			                ? CLIP762N_5_HP : CLIP762N_5_AP;
+			armour_attach_swap = FindAttachment(pObj,
+			                                    usSimilarItem);
+			break;
 	}
 
 	if (fAttemptingAttachment)
@@ -2421,13 +2521,26 @@
 				INVTYPE const& tgt_item = Item[target.usItem];
 				SoundID const  sound    =
 					tgt_item.usItemClass & IC_WEAPON ? ATTACH_TO_GUN         :
+					/* mgl: Armour attachments
+					 * mgl: Disable the (never heard) sound
+					 * mgl: of ceramic plates
+					 */
+					#if 0
 					tgt_item.usItemClass & IC_ARMOUR ? ATTACH_CERAMIC_PLATES :
+					#endif
 					tgt_item.usItemClass & IC_BOMB   ? ATTACH_DETONATOR      :
 					NO_SOUND;
 				if (sound != NO_SOUND) PlayLocationJA2Sample(s->sGridNo, sound, MIDVOLUME, 1);
 			}
 		}
 
+		/* mgl: Armour attachments
+		 * mgl: Request to swap items if needed 
+		 */
+		if (armour_attach_swap != ITEM_NOT_FOUND)
+		{ 	attach_pos = armour_attach_swap;
+		}
+		
 		UINT16 const temp_item   = target.usAttachItem[attach_pos];
 		UINT16 const temp_status = target.bAttachStatus[attach_pos];