From d48fd12dbafb892ebb38cb186515fa9f8ce815bd Mon Sep 17 00:00:00 2001
From: MaddMugsy <MaddMugsy@4f8fa57e-7814-0410-bad4-adc449f26b7c>
Date: Mon, 14 Aug 2006 16:02:37 +0000
Subject: [PATCH] -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
---
 Data-1.13/BigItems/GUN269.sti            | Bin 0 -> 2134 bytes
 Data-1.13/Interface/MDGUNS.sti           | Bin 148300 -> 148769 bytes
 Data-1.13/TableData/Attachments.xml      |   8 ------
 Data-1.13/TableData/EnemyGunChoices.xml  |   4 +--
 Data-1.13/TableData/EnemyItemChoices.xml |   4 +--
 Data-1.13/TableData/Items.xml            |  30 +++++++++++------------
 Data-1.13/TableData/Weapons.xml          |   8 +++---
 Data-1.13/tilesets/0/smguns.sti          | Bin 53418 -> 53538 bytes
 8 files changed, 23 insertions(+), 31 deletions(-)
 create mode 100644 Data-1.13/BigItems/GUN269.sti

diff --git a/Data-1.13/BigItems/GUN269.sti b/Data-1.13/BigItems/GUN269.sti
new file mode 100644
index 0000000000000000000000000000000000000000..f501b7fae571d2429f0172c3bfc1181616e9d439
GIT binary patch
literal 2134
zcmY*ZZERE589wgTi(BO68sgx9^Wo$s@dc7#oDe%z8g?i+n9z_A2AIN<nS~O!y*V|a
zbS?~t^Qk~R&1<qWTBUiBR!W34HJUaFRg<RZ-2On?pZf!(=={4nS64#fPvk$#-eZ@3
zyyyD*-sil}`+e@|p(DqSIT4axMMVj~ojGp5f*c4grxUimmmfcW527tULjOZ39u7ym
z&UdO^vRA%#$QNkx_Xd<W4o<z@A^RikU0t!`ePbv3vZJR`sdzA!IDaAW(cswf$4Q(_
z-O_F(Ml$pBnZN#VF_B*W$Ad3Zxz+Xc$C;J&jddgUc*8W!6=T!ka6H-EdcL*Q==NM}
zt+^WP=nHmvgR$Gc989E>vE+Pu{L|lOmhwxFzJBoUHFHaLpdiF7J7a!l)%Mrk@>U$E
zuJj`>@_P69_MG<l!p(I~uj*A*98nLnv?OD}9yN3Wcg6=JM|<8p({uPYhYzPuzIE};
zaX*fAg-?!O8n|$5FcKR~oIc;zf8pxL@cq%@)Y#QXJbAY7y^+!P2NS7OIz@)BkA3jT
z+;4BDKbeT9=4Wo+TbjG~htED+URhrHH2>)H{5M~({p+9q`R}*i8irvS=C*B8^J`L@
z`}H!H>*Ow1O_dz+%cBkQfPY6-Sw-06ar(V6)tlV6`xkY-;d)>5?&_eY_DXx*P-|nY
zujycI6Nv<dgR0uFzxO~(xTEcCYp`Ao1wx^tk@jDAwTJeHyF*=S1V=E&F+6n^A3Ats
zBzAP@<gpWP_TD(wKXht9jSS9SJbmumxgd@c$P!;%93R1hi917=FQ32i;iY$PT^mdP
zN}IVpj^n9IL)T|6-?%n<d;Ft`-z6s}GLzXmQ{(T=CDQXZr?NLcUYNeO@Wu3EGPAs}
z{FnS<J~_VvvYKCATU$*pul@buT6*R2`s4Na)hFhYjpcQ7W5ayD@!X4$Dx-*uoX8<N
zf9{u^*z2s=vAwy>6?VHqyUMXFt6mxV<#^N1GIzy5RYhf`r?J}8TkGleRn~ZR?Q8T#
zRBwO7o{n1I8MV5luEt+iTd}*&>Gym6{&V&9@3+<mYLo-bN>5|sp_aymK%l2ZRfB4$
zviDTm{+fo?@V?e7;nu^Uws$((f=$6&vEcO+2ZN!|Kq%DxM(Be#+V=)Jjs`p4?&?Ha
zu!<tijstB&`%n-120ePksJf3P9OR1%t}8+)r3%JTN^=;K8FV+K1M-6u_u&;3g>q3}
zyuvDBnx^qP4h+n8#w>2z+~%B%ZH)ln>UX>Qb1u#;i^0Vh=XTU0g!J3Rw^?+zquUY`
zA(my^1s9kA0XvphMHY~`<pP5QxWbPG4iAB`mtxs2+h#TgCl>4iSD3IsH=A?2EzSus
z3JlEHWcnveyO;+p8Wql7#tESc$yT{@3Tc5SFbm91s_PQurfG!IQm))Cg(#@s2_agy
zcoeZx!0o~mx*MihA<<kk%4q=?3fV%zW?+UAN<^LEfl)$qQE4F>AsiCUPYQ0avc)=)
zV$LGcl0$<qu{4^G_9=8Iap9p`VH(ph&JqsXh{LwwY{AdAO57jv1fme|uTfYcEkYII
z#x~`|$e@V`z`Cwen2Mri@unN1mj;6iGKASt6b5<_K5-Wmnl*Gz^a*r-uVGmHS?7n(
z#7rr|H+)kJFab2s1_o4;>Wngb8ZEp^o^t&9l!xfWs5DK{B*GP)L>1<qL5n}boXqUB
zC?g8gmof<q={li&7X8VAXLnd!vqbp>o3Tx%8FQr#W>L(cU(kMN34?(Z8_#BTa_ElE
zq5J~p@J8qyT5?3EJlJBKTHpxW6wQHC@U!I5Co6TRJAvL8d7H4^%d!faMW63cuubd&
zwhZz#3aLjW#tlg-aEU6j=x^mw7(z+R?~50@o5BQtStgDGBa*b4gFgk3ayP^-28S~a
z^)aT=gEF8I#>H?GNudIH3P?dzlN+1~q#Qhhju7aHW=#o57umir*`}C63Xlv(Try3l
zH<&k}B$Mc?@+h%bme{Oda>=9=Ai1A&sTjixF6N460Q)m#oNN+<fF5*(WY9xdSD?&X
zGE6vLN8pn%0T_qD=_MusjGLTNz}&oGE8v(IoG1mRDEeIhq4hQ=CScMg_@lH0Do|XF
zF`Gd^FeC!ZL%bwM6|Hzk7D^yC#O#RCD;*us{Avdba<+hT*+Mp(gNpKJ;AwUH%ku=P
I)9?-aKgR(XzyJUM

literal 0
HcmV?d00001

diff --git a/Data-1.13/Interface/MDGUNS.sti b/Data-1.13/Interface/MDGUNS.sti
index 38941ff06d91ee47487aa14b914641e0130de062..af4d34e540646e0ceb2871652124b9db0bfe6767 100644
GIT binary patch
delta 505
zcmYLFJxc^J5S`s(a96x7JOoegsvtIU*lVN3Vy*wcHccwaQ}<BtqdLXfpJ3%LkOamq
zT#8t@^|FmvT@#$Fhz}C-^4`qk<^3vqzR8BiCx=I$rvS-r3K849>f}6y1fcga{9Y~g
z#wolpi&%qERrIfme)3xM)BSNWn0;*xCR5ljRF<VDqlJzTLQ5e8Qy(hWMCYBuwrRaT
zb9`brPe_P^a2aLR(RXm{VX&bzys<nq>_g2Rx<Wo%W31#MTAOeIqX}_=lMXwb43b=5
zNGaIj9R(N}2I;tSOGJv3t(Mj{j+B9w@DFuR_0W)!Vvh33vjDegP}3YyN+r29=ZQDf
zvL_y)sJ4@McUJ_Z3>t@08O0B;;J*0n`@v<kbeglwvOtE|(~&%Qn%D6gIL0gwCD$$y
y3T6*^aF!HBXCxeo7E$UHr&LS!S5ac8`yg!KF$<1#D>!+yX@zrae7T6iAK(Ywn)wz0

delta 53
zcmZ43#d)TUQ#Lrn+4Fuf1A~n|69Win0PzFH1||kZ1_s`ZvY&;U6-3$<L>RX#h%njc
F0{~r93&#Ke

diff --git a/Data-1.13/TableData/Attachments.xml b/Data-1.13/TableData/Attachments.xml
index f60fb8316..690cca3b6 100644
--- a/Data-1.13/TableData/Attachments.xml
+++ b/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>
diff --git a/Data-1.13/TableData/EnemyGunChoices.xml b/Data-1.13/TableData/EnemyGunChoices.xml
index c0efdff17..b51339e23 100644
--- a/Data-1.13/TableData/EnemyGunChoices.xml
+++ b/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>
diff --git a/Data-1.13/TableData/EnemyItemChoices.xml b/Data-1.13/TableData/EnemyItemChoices.xml
index e0a002cc4..e91d85b1c 100644
--- a/Data-1.13/TableData/EnemyItemChoices.xml
+++ b/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>
diff --git a/Data-1.13/TableData/Items.xml b/Data-1.13/TableData/Items.xml
index b9d67a0d3..06bd81337 100644
--- a/Data-1.13/TableData/Items.xml
+++ b/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_UsedInventory>0</BR_UsedInventory>
+		<BR_NewInventory>5</BR_NewInventory>
+		<BR_UsedInventory>1</BR_UsedInventory>
 		<BR_ROF>36</BR_ROF>
 		<PercentNoiseReduction>0</PercentNoiseReduction>
 		<HideMuzzleFlash>0</HideMuzzleFlash>
diff --git a/Data-1.13/TableData/Weapons.xml b/Data-1.13/TableData/Weapons.xml
index 730fc72c0..ff461c67a 100644
--- a/Data-1.13/TableData/Weapons.xml
+++ b/Data-1.13/TableData/Weapons.xml
@@ -872,8 +872,8 @@
 		<ubCalibre>8</ubCalibre>
 		<ubReadyTime>3</ubReadyTime>
 		<ubShotsPer4Turns>15</ubShotsPer4Turns>
-		<ubShotsPerBurst>0</ubShotsPerBurst>
-		<ubBurstPenalty>8</ubBurstPenalty>
+		<ubShotsPerBurst>3</ubShotsPerBurst>
+		<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>
diff --git a/Data-1.13/tilesets/0/smguns.sti b/Data-1.13/tilesets/0/smguns.sti
index 45b6d230b57d9ce37a8ec07cb1c23e30fb3d6da7..2c06385a827b1308d2d6ea07529ecb44e09a0134 100644
GIT binary patch
delta 69
zcmZ3rka^J}X4&8nXHQcl1_q|R3}B!EBp)y~FflMPFz{`Z{VdEsYYziM22hljft7)i
Ufp_u+*PWYBh&<XoIdNJB03Hbu-T(jq

delta 49
zcmZ3qh<VjQX4&8nXHQcl28LOC7{EXSNIqa}U}9ioVBp;-`&oGML)RUfZ-_kF4FEi5
B4y^zH