-Fix for integrated bipods: changed Bipod tag in items.xml to an integer. It is now the to-hit bonus for the bipod. (exe to follow)

-added MAB PA-15
-FAMAS G2 now has integrated bipod and 3-rd burst (no more bipod or trigger group attachments)


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@360 4f8fa57e-7814-0410-bad4-adc449f26b7c

gamedir/Data-1.13/TableData/Attachments.xml

@@ -1084,10 +1084,6 @@
 		<attachmentIndex>209</attachmentIndex>
 		<itemIndex>23</itemIndex>
 	</ATTACHMENT>
-	<ATTACHMENT>
-		<attachmentIndex>209</attachmentIndex>
-		<itemIndex>24</itemIndex>
-	</ATTACHMENT>
 	<ATTACHMENT>
 		<attachmentIndex>209</attachmentIndex>
 		<itemIndex>25</itemIndex>
@@ -9348,10 +9344,6 @@
 		<attachmentIndex>1026</attachmentIndex>
 		<itemIndex>23</itemIndex>
 	</ATTACHMENT>
-	<ATTACHMENT>
-		<attachmentIndex>1026</attachmentIndex>
-		<itemIndex>24</itemIndex>
-	</ATTACHMENT>
 	<ATTACHMENT>
 		<attachmentIndex>1026</attachmentIndex>
 		<itemIndex>25</itemIndex>

gamedir/Data-1.13/TableData/EnemyGunChoices.xml

@@ -2,7 +2,7 @@
 <ENEMYGUNCHOICESLIST xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<ENEMYGUNCHOICES>
 		<uiIndex>0</uiIndex>
-		<ubChoices>13</ubChoices>
+		<ubChoices>14</ubChoices>
 		<bItemNo1>689</bItemNo1>
 		<bItemNo2>690</bItemNo2>
 		<bItemNo3>635</bItemNo3>
@@ -16,7 +16,7 @@
 		<bItemNo11>718</bItemNo11>
 		<bItemNo12>5</bItemNo12>
 		<bItemNo13>720</bItemNo13>
-		<bItemNo14>-1</bItemNo14>
+		<bItemNo14>759</bItemNo14>
 		<bItemNo15>-1</bItemNo15>
 		<bItemNo16>-1</bItemNo16>
 		<bItemNo17>-1</bItemNo17>

gamedir/Data-1.13/TableData/EnemyItemChoices.xml

@@ -542,9 +542,9 @@
 	</ENEMYITEMCHOICES>
 	<ENEMYITEMCHOICES>
 		<uiIndex>10</uiIndex>
-		<ubChoices>1</ubChoices>
+		<ubChoices>2</ubChoices>
 		<bItemNo1>41</bItemNo1>
-		<bItemNo2>-1</bItemNo2>
+		<bItemNo2>901</bItemNo2>
 		<bItemNo3>-1</bItemNo3>
 		<bItemNo4>-1</bItemNo4>
 		<bItemNo5>-1</bItemNo5>

gamedir/Data-1.13/TableData/Items.xml

@@ -2945,7 +2945,7 @@
 		<BR_ROF>1100</BR_ROF>
 		<PercentNoiseReduction>0</PercentNoiseReduction>
 		<HideMuzzleFlash>0</HideMuzzleFlash>
-		<Bipod>0</Bipod>
+		<Bipod>10</Bipod>
 		<RangeBonus>0</RangeBonus>
 		<ToHitBonus>0</ToHitBonus>
 		<BestLaserRange>0</BestLaserRange>
@@ -25330,9 +25330,9 @@
 		<BR_ROF>0</BR_ROF>
 		<PercentNoiseReduction>0</PercentNoiseReduction>
 		<HideMuzzleFlash>0</HideMuzzleFlash>
-		<Bipod>1</Bipod>
+		<Bipod>10</Bipod>
 		<RangeBonus>0</RangeBonus>
-		<ToHitBonus>10</ToHitBonus>
+		<ToHitBonus>0</ToHitBonus>
 		<BestLaserRange>0</BestLaserRange>
 		<AimBonus>0</AimBonus>
 		<MinRangeForAimBonus>0</MinRangeForAimBonus>
@@ -78811,7 +78811,7 @@
 		<BR_ROF>600</BR_ROF>
 		<PercentNoiseReduction>0</PercentNoiseReduction>
 		<HideMuzzleFlash>0</HideMuzzleFlash>
-		<Bipod>1</Bipod>
+		<Bipod>10</Bipod>
 		<RangeBonus>0</RangeBonus>
 		<ToHitBonus>-1</ToHitBonus>
 		<BestLaserRange>0</BestLaserRange>
@@ -78932,7 +78932,7 @@
 		<BR_ROF>600</BR_ROF>
 		<PercentNoiseReduction>0</PercentNoiseReduction>
 		<HideMuzzleFlash>0</HideMuzzleFlash>
-		<Bipod>1</Bipod>
+		<Bipod>10</Bipod>
 		<RangeBonus>0</RangeBonus>
 		<ToHitBonus>-1</ToHitBonus>
 		<BestLaserRange>0</BestLaserRange>
@@ -79053,7 +79053,7 @@
 		<BR_ROF>750</BR_ROF>
 		<PercentNoiseReduction>0</PercentNoiseReduction>
 		<HideMuzzleFlash>1</HideMuzzleFlash>
-		<Bipod>1</Bipod>
+		<Bipod>10</Bipod>
 		<RangeBonus>0</RangeBonus>
 		<ToHitBonus>-1</ToHitBonus>
 		<BestLaserRange>0</BestLaserRange>
@@ -79511,7 +79511,7 @@
 		<ubGraphicNum>210</ubGraphicNum>
 		<ubWeight>120</ubWeight>
 		<ubPerPocket>0</ubPerPocket>
-		<usPrice>10290</usPrice>
+		<usPrice>10640</usPrice>
 		<ubCoolness>10</ubCoolness>
 		<bReliability>0</bReliability>
 		<bRepairEase>-3</bRepairEase>
@@ -79554,7 +79554,7 @@
 		<PercentAutofireAPReduction>0</PercentAutofireAPReduction>
 		<PercentReadyTimeAPReduction>0</PercentReadyTimeAPReduction>
 		<PercentReloadTimeAPReduction>0</PercentReloadTimeAPReduction>
-		<PercentAPReduction>-7</PercentAPReduction>
+		<PercentAPReduction>0</PercentAPReduction>
 		<PercentStatusDrainReduction>0</PercentStatusDrainReduction>
 		<DamageBonus>0</DamageBonus>
 		<MeleeDamageBonus>0</MeleeDamageBonus>
@@ -80868,7 +80868,7 @@
 		<BR_ROF>750</BR_ROF>
 		<PercentNoiseReduction>0</PercentNoiseReduction>
 		<HideMuzzleFlash>0</HideMuzzleFlash>
-		<Bipod>1</Bipod>
+		<Bipod>10</Bipod>
 		<RangeBonus>0</RangeBonus>
 		<ToHitBonus>-1</ToHitBonus>
 		<BestLaserRange>0</BestLaserRange>
@@ -80989,7 +80989,7 @@
 		<BR_ROF>800</BR_ROF>
 		<PercentNoiseReduction>0</PercentNoiseReduction>
 		<HideMuzzleFlash>0</HideMuzzleFlash>
-		<Bipod>1</Bipod>
+		<Bipod>10</Bipod>
 		<RangeBonus>0</RangeBonus>
 		<ToHitBonus>-1</ToHitBonus>
 		<BestLaserRange>0</BestLaserRange>
@@ -85552,7 +85552,7 @@
 		<szLongItemName>Ruger Redhawk Revolver</szLongItemName>
 		<szItemDesc>Please read the following out loud, in a gravelly voice:  A Ruger Redhawk revolver, in good condition, with six bullets left.</szItemDesc>
 		<szBRName>Ruger Redhawk Revolver</szBRName>
-		<szBRDesc>The Redhawk is ideal for sportsmen using a handgun to hunt big game, and is also popular among metallic silhouette shooters.  This revolver is world-renowned for strength, safety, and rugged reliability.</szBRDesc>
+		<szBRDesc>The Super Redhawk is ideal for sportsmen using a handgun to hunt big game, and is also popular among metallic silhouette shooters.  This revolver is world-renowned for strength, safety, and rugged reliability.</szBRDesc>
 		<usItemClass>2</usItemClass>
 		<ubClassIndex>707</ubClassIndex>
 		<ubCursor>3</ubCursor>
@@ -91850,11 +91850,11 @@
 		<ubCursor>3</ubCursor>
 		<bSoundType>0</bSoundType>
 		<ubGraphicType>0</ubGraphicType>
-		<ubGraphicNum>0</ubGraphicNum>
+		<ubGraphicNum>269</ubGraphicNum>
 		<ubWeight>11</ubWeight>
 		<ubPerPocket>0</ubPerPocket>
 		<usPrice>460</usPrice>
-		<ubCoolness>0</ubCoolness>
+		<ubCoolness>1</ubCoolness>
 		<bReliability>0</bReliability>
 		<bRepairEase>-1</bRepairEase>
 		<Damageable>1</Damageable>
@@ -91874,8 +91874,8 @@
 		<Unaerodynamic>0</Unaerodynamic>
 		<Electronic>0</Electronic>
 		<Inseparable>0</Inseparable>
-		<BR_NewInventory>0</BR_NewInventory>
+		<BR_NewInventory>5</BR_NewInventory>
-		<BR_UsedInventory>0</BR_UsedInventory>
+		<BR_UsedInventory>1</BR_UsedInventory>
 		<BR_ROF>36</BR_ROF>
 		<PercentNoiseReduction>0</PercentNoiseReduction>
 		<HideMuzzleFlash>0</HideMuzzleFlash>

gamedir/Data-1.13/TableData/Weapons.xml

@@ -872,8 +872,8 @@
 		<ubCalibre>8</ubCalibre>
 		<ubReadyTime>3</ubReadyTime>
 		<ubShotsPer4Turns>15</ubShotsPer4Turns>
-		<ubShotsPerBurst>0</ubShotsPerBurst>
+		<ubShotsPerBurst>3</ubShotsPerBurst>
-		<ubBurstPenalty>8</ubBurstPenalty>
+		<ubBurstPenalty>7</ubBurstPenalty>
 		<ubBulletSpeed>22</ubBulletSpeed>
 		<ubImpact>30</ubImpact>
 		<ubDeadliness>29</ubDeadliness>
@@ -5772,7 +5772,7 @@
 		<ubBurstPenalty>0</ubBurstPenalty>
 		<ubBulletSpeed>22</ubBulletSpeed>
 		<ubImpact>58</ubImpact>
-		<ubDeadliness>80</ubDeadliness>
+		<ubDeadliness>82</ubDeadliness>
 		<bAccuracy>10</bAccuracy>
 		<ubMagSize>5</ubMagSize>
 		<usRange>1200</usRange>
@@ -7562,7 +7562,7 @@
 	</WEAPON>
 	<WEAPON>
 		<uiIndex>707</uiIndex>
-		<szWeaponName>Ruger Super Redhawk Revolver</szWeaponName>
+		<szWeaponName>Ruger Redhawk Revolver</szWeaponName>
 		<ubWeaponClass>1</ubWeaponClass>
 		<ubWeaponType>1</ubWeaponType>
 		<ubCalibre>26</ubCalibre>