From 162cc1e35b399b11f9d539cdbf3f66779ce6856e Mon Sep 17 00:00:00 2001
From: Starwalker <Starwalker@4f8fa57e-7814-0410-bad4-adc449f26b7c>
Date: Thu, 7 Dec 2006 08:51:22 +0000
Subject: [PATCH] added several guns in .454 Casull caliber: item 770  Thompson
 Contender Encore item 771  Ruger Super Redhawk Alaskan item 772  Freedom Arms
 Model 83 Premier Grade

changed Foregrip on HK UMP from built-in to default attachment.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@614 4f8fa57e-7814-0410-bad4-adc449f26b7c
---
 gamedir/Data-1.13/TableData/Attachments.xml |  70 +++++++++
 gamedir/Data-1.13/TableData/Items.xml       | 154 ++++++++++----------
 gamedir/Data-1.13/TableData/Weapons.xml     | 110 +++++++++++++-
 3 files changed, 256 insertions(+), 78 deletions(-)

diff --git a/gamedir/Data-1.13/TableData/Attachments.xml b/gamedir/Data-1.13/TableData/Attachments.xml
index 84fb4f7e9..802d8e9f8 100644
--- a/gamedir/Data-1.13/TableData/Attachments.xml
+++ b/gamedir/Data-1.13/TableData/Attachments.xml
@@ -3755,6 +3755,21 @@
 		<itemIndex>769</itemIndex>
 		<APCost>5</APCost>
 	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>241</attachmentIndex>
+		<itemIndex>770</itemIndex>
+		<APCost>5</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>241</attachmentIndex>
+		<itemIndex>771</itemIndex>
+		<APCost>5</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>241</attachmentIndex>
+		<itemIndex>772</itemIndex>
+		<APCost>5</APCost>
+	</ATTACHMENT>
 	<ATTACHMENT>
 		<attachmentIndex>242</attachmentIndex>
 		<itemIndex>856</itemIndex>
@@ -8295,6 +8310,16 @@
 		<itemIndex>768</itemIndex>
 		<APCost>5</APCost>
 	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1003</attachmentIndex>
+		<itemIndex>770</itemIndex>
+		<APCost>5</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1003</attachmentIndex>
+		<itemIndex>772</itemIndex>
+		<APCost>5</APCost>
+	</ATTACHMENT>
 	<ATTACHMENT>
 		<attachmentIndex>1004</attachmentIndex>
 		<itemIndex>12</itemIndex>
@@ -9875,6 +9900,21 @@
 		<itemIndex>769</itemIndex>
 		<APCost>5</APCost>
 	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1005</attachmentIndex>
+		<itemIndex>770</itemIndex>
+		<APCost>5</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1005</attachmentIndex>
+		<itemIndex>771</itemIndex>
+		<APCost>5</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1005</attachmentIndex>
+		<itemIndex>772</itemIndex>
+		<APCost>5</APCost>
+	</ATTACHMENT>
 	<ATTACHMENT>
 		<attachmentIndex>1006</attachmentIndex>
 		<itemIndex>1</itemIndex>
@@ -10750,6 +10790,21 @@
 		<itemIndex>769</itemIndex>
 		<APCost>5</APCost>
 	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1006</attachmentIndex>
+		<itemIndex>770</itemIndex>
+		<APCost>5</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1006</attachmentIndex>
+		<itemIndex>771</itemIndex>
+		<APCost>5</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1006</attachmentIndex>
+		<itemIndex>772</itemIndex>
+		<APCost>5</APCost>
+	</ATTACHMENT>
 	<ATTACHMENT>
 		<attachmentIndex>1007</attachmentIndex>
 		<itemIndex>12</itemIndex>
@@ -11835,6 +11890,11 @@
 		<itemIndex>672</itemIndex>
 		<APCost>5</APCost>
 	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1011</attachmentIndex>
+		<itemIndex>677</itemIndex>
+		<APCost>5</APCost>
+	</ATTACHMENT>
 	<ATTACHMENT>
 		<attachmentIndex>1011</attachmentIndex>
 		<itemIndex>680</itemIndex>
@@ -13730,4 +13790,14 @@
 		<itemIndex>769</itemIndex>
 		<APCost>5</APCost>
 	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1029</attachmentIndex>
+		<itemIndex>770</itemIndex>
+		<APCost>5</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1029</attachmentIndex>
+		<itemIndex>772</itemIndex>
+		<APCost>5</APCost>
+	</ATTACHMENT>
 </ATTACHMENTLIST>
\ No newline at end of file
diff --git a/gamedir/Data-1.13/TableData/Items.xml b/gamedir/Data-1.13/TableData/Items.xml
index 75f4b1fe3..eabb0a2b1 100644
--- a/gamedir/Data-1.13/TableData/Items.xml
+++ b/gamedir/Data-1.13/TableData/Items.xml
@@ -82646,8 +82646,8 @@
 		<RateOfFireBonus>0</RateOfFireBonus>
 		<BulletSpeedBonus>0</BulletSpeedBonus>
 		<BurstSizeBonus>0</BurstSizeBonus>
-		<BurstToHitBonus>5</BurstToHitBonus>
-		<AutoFireToHitBonus>5</AutoFireToHitBonus>
+		<BurstToHitBonus>0</BurstToHitBonus>
+		<AutoFireToHitBonus>0</AutoFireToHitBonus>
 		<APBonus>0</APBonus>
 		<PercentBurstFireAPReduction>0</PercentBurstFireAPReduction>
 		<PercentAutofireAPReduction>0</PercentAutofireAPReduction>
@@ -82667,7 +82667,7 @@
 		<DiscardedLauncherItem>0</DiscardedLauncherItem>
 		<RocketRifle>0</RocketRifle>
 		<Cannon>0</Cannon>
-		<DefaultAttachment>0</DefaultAttachment>
+		<DefaultAttachment>1011</DefaultAttachment>
 		<BrassKnuckles>0</BrassKnuckles>
 		<Crowbar>0</Crowbar>
 		<BloodiedItem>0</BloodiedItem>
@@ -93942,32 +93942,32 @@
 	</ITEM>
 	<ITEM>
 		<uiIndex>770</uiIndex>
-		<szItemName>Nada</szItemName>
-		<szLongItemName>Nothing</szLongItemName>
-		<szItemDesc>Index 770</szItemDesc>
-		<szBRName>Nothing</szBRName>
-		<szBRDesc>Nothing</szBRDesc>
-		<usItemClass>1</usItemClass>
-		<ubClassIndex>0</ubClassIndex>
-		<ubCursor>0</ubCursor>
+		<szItemName>Encore</szItemName>
+		<szLongItemName>Thompson Contender Encore</szLongItemName>
+		<szItemDesc>The Contender pistol exists in a wide variety of calibers, this one is chambered for .454 Casull.</szItemDesc>
+		<szBRName>Contender Encore</szBRName>
+		<szBRDesc>The Thompson Contender Encore is a one-shot targetpistol that can also be used for hunting, if equipped with a suitable scope. Chambered for .454 Casull, this is a most powerful gun.</szBRDesc>
+		<usItemClass>2</usItemClass>
+		<ubClassIndex>770</ubClassIndex>
+		<ubCursor>3</ubCursor>
 		<bSoundType>0</bSoundType>
 		<ubGraphicType>0</ubGraphicType>
-		<ubGraphicNum>0</ubGraphicNum>
-		<ubWeight>0</ubWeight>
+		<ubGraphicNum>282</ubGraphicNum>
+		<ubWeight>22</ubWeight>
 		<ubPerPocket>0</ubPerPocket>
-		<usPrice>0</usPrice>
-		<ubCoolness>0</ubCoolness>
-		<bReliability>0</bReliability>
-		<bRepairEase>0</bRepairEase>
-		<Damageable>0</Damageable>
-		<Repairable>0</Repairable>
-		<WaterDamages>0</WaterDamages>
-		<Metal>0</Metal>
-		<Sinks>0</Sinks>
-		<ShowStatus>0</ShowStatus>
+		<usPrice>705</usPrice>
+		<ubCoolness>2</ubCoolness>
+		<bReliability>1</bReliability>
+		<bRepairEase>1</bRepairEase>
+		<Damageable>1</Damageable>
+		<Repairable>1</Repairable>
+		<WaterDamages>1</WaterDamages>
+		<Metal>1</Metal>
+		<Sinks>1</Sinks>
+		<ShowStatus>1</ShowStatus>
 		<HiddenAddon>0</HiddenAddon>
 		<TwoHanded>0</TwoHanded>
-		<NotBuyable>1</NotBuyable>
+		<NotBuyable>0</NotBuyable>
 		<Attachment>0</Attachment>
 		<HiddenAttachment>0</HiddenAttachment>
 		<BigGunList>0</BigGunList>
@@ -93977,9 +93977,9 @@
 		<Unaerodynamic>0</Unaerodynamic>
 		<Electronic>0</Electronic>
 		<Inseparable>0</Inseparable>
-		<BR_NewInventory>0</BR_NewInventory>
-		<BR_UsedInventory>0</BR_UsedInventory>
-		<BR_ROF>0</BR_ROF>
+		<BR_NewInventory>2</BR_NewInventory>
+		<BR_UsedInventory>1</BR_UsedInventory>
+		<BR_ROF>10</BR_ROF>
 		<PercentNoiseReduction>0</PercentNoiseReduction>
 		<HideMuzzleFlash>0</HideMuzzleFlash>
 		<Bipod>0</Bipod>
@@ -94064,32 +94064,32 @@
 	</ITEM>
 	<ITEM>
 		<uiIndex>771</uiIndex>
-		<szItemName>Nada</szItemName>
-		<szLongItemName>Nothing</szLongItemName>
-		<szItemDesc>Index 771</szItemDesc>
-		<szBRName>Nothing</szBRName>
-		<szBRDesc>Nothing</szBRDesc>
-		<usItemClass>1</usItemClass>
-		<ubClassIndex>0</ubClassIndex>
-		<ubCursor>0</ubCursor>
+		<szItemName>Alaskan</szItemName>
+		<szLongItemName>Ruger S. Redhawk Alaskan</szLongItemName>
+		<szItemDesc>The preferred backup weapon of big-game hunters, though it can be a little rough on your wrist.</szItemDesc>
+		<szBRName>Ruger SR Alaskan</szBRName>
+		<szBRDesc>The Ruger Super Redhawk Alaskan is a snubnosed .454 Casull revolver, a neat "little" surprise to anyone who wants you ill.</szBRDesc>
+		<usItemClass>2</usItemClass>
+		<ubClassIndex>771</ubClassIndex>
+		<ubCursor>3</ubCursor>
 		<bSoundType>0</bSoundType>
 		<ubGraphicType>0</ubGraphicType>
-		<ubGraphicNum>0</ubGraphicNum>
-		<ubWeight>0</ubWeight>
-		<ubPerPocket>0</ubPerPocket>
-		<usPrice>0</usPrice>
-		<ubCoolness>0</ubCoolness>
-		<bReliability>0</bReliability>
-		<bRepairEase>0</bRepairEase>
-		<Damageable>0</Damageable>
-		<Repairable>0</Repairable>
-		<WaterDamages>0</WaterDamages>
-		<Metal>0</Metal>
-		<Sinks>0</Sinks>
-		<ShowStatus>0</ShowStatus>
+		<ubGraphicNum>283</ubGraphicNum>
+		<ubWeight>11</ubWeight>
+		<ubPerPocket>1</ubPerPocket>
+		<usPrice>790</usPrice>
+		<ubCoolness>3</ubCoolness>
+		<bReliability>1</bReliability>
+		<bRepairEase>2</bRepairEase>
+		<Damageable>1</Damageable>
+		<Repairable>1</Repairable>
+		<WaterDamages>1</WaterDamages>
+		<Metal>1</Metal>
+		<Sinks>1</Sinks>
+		<ShowStatus>1</ShowStatus>
 		<HiddenAddon>0</HiddenAddon>
 		<TwoHanded>0</TwoHanded>
-		<NotBuyable>1</NotBuyable>
+		<NotBuyable>0</NotBuyable>
 		<Attachment>0</Attachment>
 		<HiddenAttachment>0</HiddenAttachment>
 		<BigGunList>0</BigGunList>
@@ -94099,9 +94099,9 @@
 		<Unaerodynamic>0</Unaerodynamic>
 		<Electronic>0</Electronic>
 		<Inseparable>0</Inseparable>
-		<BR_NewInventory>0</BR_NewInventory>
-		<BR_UsedInventory>0</BR_UsedInventory>
-		<BR_ROF>0</BR_ROF>
+		<BR_NewInventory>2</BR_NewInventory>
+		<BR_UsedInventory>1</BR_UsedInventory>
+		<BR_ROF>20</BR_ROF>
 		<PercentNoiseReduction>0</PercentNoiseReduction>
 		<HideMuzzleFlash>0</HideMuzzleFlash>
 		<Bipod>0</Bipod>
@@ -94186,32 +94186,32 @@
 	</ITEM>
 	<ITEM>
 		<uiIndex>772</uiIndex>
-		<szItemName>Nada</szItemName>
-		<szLongItemName>Nothing</szLongItemName>
-		<szItemDesc>Index 772</szItemDesc>
-		<szBRName>Nothing</szBRName>
-		<szBRDesc>Nothing</szBRDesc>
-		<usItemClass>1</usItemClass>
-		<ubClassIndex>0</ubClassIndex>
-		<ubCursor>0</ubCursor>
+		<szItemName>FA M83</szItemName>
+		<szLongItemName>Fr. Arms M83 Premier Grade</szLongItemName>
+		<szItemDesc>A retro-style revolver, in a not-so-retro caliber.</szItemDesc>
+		<szBRName>Fr. Arms M83 PG</szBRName>
+		<szBRDesc>The Freedom Arms Model 83 Premier Grade may look like one of the very first revolvers that used cartridges, but it is quite new, and fires the all-powerful .454 Casull ammo.</szBRDesc>
+		<usItemClass>2</usItemClass>
+		<ubClassIndex>772</ubClassIndex>
+		<ubCursor>3</ubCursor>
 		<bSoundType>0</bSoundType>
 		<ubGraphicType>0</ubGraphicType>
-		<ubGraphicNum>0</ubGraphicNum>
-		<ubWeight>0</ubWeight>
-		<ubPerPocket>0</ubPerPocket>
-		<usPrice>0</usPrice>
-		<ubCoolness>0</ubCoolness>
-		<bReliability>0</bReliability>
-		<bRepairEase>0</bRepairEase>
-		<Damageable>0</Damageable>
-		<Repairable>0</Repairable>
-		<WaterDamages>0</WaterDamages>
-		<Metal>0</Metal>
-		<Sinks>0</Sinks>
-		<ShowStatus>0</ShowStatus>
+		<ubGraphicNum>284</ubGraphicNum>
+		<ubWeight>15</ubWeight>
+		<ubPerPocket>1</ubPerPocket>
+		<usPrice>920</usPrice>
+		<ubCoolness>3</ubCoolness>
+		<bReliability>1</bReliability>
+		<bRepairEase>2</bRepairEase>
+		<Damageable>1</Damageable>
+		<Repairable>1</Repairable>
+		<WaterDamages>1</WaterDamages>
+		<Metal>1</Metal>
+		<Sinks>1</Sinks>
+		<ShowStatus>1</ShowStatus>
 		<HiddenAddon>0</HiddenAddon>
 		<TwoHanded>0</TwoHanded>
-		<NotBuyable>1</NotBuyable>
+		<NotBuyable>0</NotBuyable>
 		<Attachment>0</Attachment>
 		<HiddenAttachment>0</HiddenAttachment>
 		<BigGunList>0</BigGunList>
@@ -94221,9 +94221,9 @@
 		<Unaerodynamic>0</Unaerodynamic>
 		<Electronic>0</Electronic>
 		<Inseparable>0</Inseparable>
-		<BR_NewInventory>0</BR_NewInventory>
-		<BR_UsedInventory>0</BR_UsedInventory>
-		<BR_ROF>0</BR_ROF>
+		<BR_NewInventory>2</BR_NewInventory>
+		<BR_UsedInventory>1</BR_UsedInventory>
+		<BR_ROF>20</BR_ROF>
 		<PercentNoiseReduction>0</PercentNoiseReduction>
 		<HideMuzzleFlash>0</HideMuzzleFlash>
 		<Bipod>0</Bipod>
diff --git a/gamedir/Data-1.13/TableData/Weapons.xml b/gamedir/Data-1.13/TableData/Weapons.xml
index 28d7b929b..a3d2a7faa 100644
--- a/gamedir/Data-1.13/TableData/Weapons.xml
+++ b/gamedir/Data-1.13/TableData/Weapons.xml
@@ -9786,7 +9786,7 @@
 	</WEAPON>
 	<WEAPON>
 		<uiIndex>769</uiIndex>
-		<szWeaponName>Diemaco C7CT</szWeaponName>
+		<szWeaponName>ColtCanada C7CT</szWeaponName>
 		<ubWeaponClass>3</ubWeaponClass>
 		<ubWeaponType>5</ubWeaponType>
 		<ubCalibre>8</ubCalibre>
@@ -9820,6 +9820,114 @@
 		<APsToReloadManually>0</APsToReloadManually>
 		<ManualReloadSound>476</ManualReloadSound>
 	</WEAPON>
+	<WEAPON>
+		<uiIndex>770</uiIndex>
+		<szWeaponName>Thompson Contender Encore</szWeaponName>
+		<ubWeaponClass>1</ubWeaponClass>
+		<ubWeaponType>1</ubWeaponType>
+		<ubCalibre>36</ubCalibre>
+		<ubReadyTime>0</ubReadyTime>
+		<ubShotsPer4Turns>10</ubShotsPer4Turns>
+		<ubShotsPerBurst>0</ubShotsPerBurst>
+		<ubBurstPenalty>0</ubBurstPenalty>
+		<ubBulletSpeed>20</ubBulletSpeed>
+		<ubImpact>33</ubImpact>
+		<ubDeadliness>21</ubDeadliness>
+		<bAccuracy>2</bAccuracy>
+		<ubMagSize>1</ubMagSize>
+		<usRange>170</usRange>
+		<usReloadDelay>200</usReloadDelay>
+		<BurstAniDelay>100</BurstAniDelay>
+		<ubAttackVolume>60</ubAttackVolume>
+		<ubHitVolume>5</ubHitVolume>
+		<sSound>423</sSound>
+		<sBurstSound>0</sBurstSound>
+		<sSilencedBurstSound>111</sSilencedBurstSound>
+		<sReloadSound>100</sReloadSound>
+		<sLocknLoadSound>106</sLocknLoadSound>
+		<SilencedSound>157</SilencedSound>
+		<bBurstAP>5</bBurstAP>
+		<bAutofireShotsPerFiveAP>0</bAutofireShotsPerFiveAP>
+		<APsToReload>6</APsToReload>
+		<SwapClips>0</SwapClips>
+		<MaxDistForMessyDeath>7</MaxDistForMessyDeath>
+		<AutoPenalty>0</AutoPenalty>
+		<NoSemiAuto>0</NoSemiAuto>
+		<APsToReloadManually>0</APsToReloadManually>
+		<ManualReloadSound>480</ManualReloadSound>
+	</WEAPON>
+	<WEAPON>
+		<uiIndex>771</uiIndex>
+		<szWeaponName>Ruger Super Redhawk Alaskan</szWeaponName>
+		<ubWeaponClass>1</ubWeaponClass>
+		<ubWeaponType>1</ubWeaponType>
+		<ubCalibre>36</ubCalibre>
+		<ubReadyTime>0</ubReadyTime>
+		<ubShotsPer4Turns>11</ubShotsPer4Turns>
+		<ubShotsPerBurst>0</ubShotsPerBurst>
+		<ubBurstPenalty>0</ubBurstPenalty>
+		<ubBulletSpeed>20</ubBulletSpeed>
+		<ubImpact>30</ubImpact>
+		<ubDeadliness>19</ubDeadliness>
+		<bAccuracy>0</bAccuracy>
+		<ubMagSize>5</ubMagSize>
+		<usRange>100</usRange>
+		<usReloadDelay>200</usReloadDelay>
+		<BurstAniDelay>100</BurstAniDelay>
+		<ubAttackVolume>65</ubAttackVolume>
+		<ubHitVolume>5</ubHitVolume>
+		<sSound>423</sSound>
+		<sBurstSound>0</sBurstSound>
+		<sSilencedBurstSound>111</sSilencedBurstSound>
+		<sReloadSound>100</sReloadSound>
+		<sLocknLoadSound>106</sLocknLoadSound>
+		<SilencedSound>157</SilencedSound>
+		<bBurstAP>5</bBurstAP>
+		<bAutofireShotsPerFiveAP>0</bAutofireShotsPerFiveAP>
+		<APsToReload>5</APsToReload>
+		<SwapClips>0</SwapClips>
+		<MaxDistForMessyDeath>7</MaxDistForMessyDeath>
+		<AutoPenalty>0</AutoPenalty>
+		<NoSemiAuto>0</NoSemiAuto>
+		<APsToReloadManually>0</APsToReloadManually>
+		<ManualReloadSound>480</ManualReloadSound>
+	</WEAPON>
+	<WEAPON>
+		<uiIndex>772</uiIndex>
+		<szWeaponName>Freedom Arms M83 Premier Grade</szWeaponName>
+		<ubWeaponClass>1</ubWeaponClass>
+		<ubWeaponType>1</ubWeaponType>
+		<ubCalibre>36</ubCalibre>
+		<ubReadyTime>0</ubReadyTime>
+		<ubShotsPer4Turns>10</ubShotsPer4Turns>
+		<ubShotsPerBurst>0</ubShotsPerBurst>
+		<ubBurstPenalty>0</ubBurstPenalty>
+		<ubBulletSpeed>20</ubBulletSpeed>
+		<ubImpact>32</ubImpact>
+		<ubDeadliness>20</ubDeadliness>
+		<bAccuracy>0</bAccuracy>
+		<ubMagSize>5</ubMagSize>
+		<usRange>150</usRange>
+		<usReloadDelay>200</usReloadDelay>
+		<BurstAniDelay>100</BurstAniDelay>
+		<ubAttackVolume>60</ubAttackVolume>
+		<ubHitVolume>5</ubHitVolume>
+		<sSound>423</sSound>
+		<sBurstSound>0</sBurstSound>
+		<sSilencedBurstSound>111</sSilencedBurstSound>
+		<sReloadSound>100</sReloadSound>
+		<sLocknLoadSound>106</sLocknLoadSound>
+		<SilencedSound>157</SilencedSound>
+		<bBurstAP>5</bBurstAP>
+		<bAutofireShotsPerFiveAP>0</bAutofireShotsPerFiveAP>
+		<APsToReload>5</APsToReload>
+		<SwapClips>0</SwapClips>
+		<MaxDistForMessyDeath>7</MaxDistForMessyDeath>
+		<AutoPenalty>0</AutoPenalty>
+		<NoSemiAuto>0</NoSemiAuto>
+		<APsToReloadManually>0</APsToReloadManually>
+		<ManualReloadSound>480</ManualReloadSound>
+	</WEAPON>
 	<WEAPON>
 		<uiIndex>901</uiIndex>
 		<szWeaponName>Commando Mortar</szWeaponName>