From 630a4a61407632d25d338131c621131c707a32d5 Mon Sep 17 00:00:00 2001
From: Sevenfm <Sevenfm@4f8fa57e-7814-0410-bad4-adc449f26b7c>
Date: Sun, 18 Apr 2021 04:09:41 +0000
Subject: [PATCH] FIX: cleaned duplicated attributes (by impulseUK). FIX:
 cleaned duplicated attributes (by impulseUK).

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2586 4f8fa57e-7814-0410-bad4-adc449f26b7c
---
 Data-1.13/TableData/Backgrounds.xml   | 12 +--------
 Data-1.13/TableData/Items/Weapons.xml | 39 +++++++++------------------
 2 files changed, 14 insertions(+), 37 deletions(-)

diff --git a/Data-1.13/TableData/Backgrounds.xml b/Data-1.13/TableData/Backgrounds.xml
index d10547efc..ccf10cf64 100644
--- a/Data-1.13/TableData/Backgrounds.xml
+++ b/Data-1.13/TableData/Backgrounds.xml
@@ -1003,7 +1003,6 @@
 		<szName>Mad Slasher</szName>
 		<szShortName>Mad Slasher</szShortName>
 		<szDescription>There is something extremely not right here, but he has obviously &#10;useful talents for this business.</szDescription>
-		<leadership>-5</leadership>
 		<strength>3</strength>
 		<dexterity>6</dexterity>
 		<agility>6</agility>
@@ -1738,7 +1737,6 @@
 		<dexterity>3</dexterity>
 		<agility>3</agility>
 		<leadership>-2</leadership>
-		<cth_blades>6</cth_blades>
 		<meleedamage>3</meleedamage>
 		<ap_assault>6</ap_assault>
 		<stealth>10</stealth>
@@ -2508,10 +2506,9 @@
 		<ap_airdrop>-5</ap_airdrop>
 		<ap_assault>-5</ap_assault>
 		<betterprices_guns>3</betterprices_guns>
-		<betterprices>10</betterprices>
+		<betterprices>8</betterprices>
 		<dexterity>8</dexterity>
 		<mechanical>8</mechanical>
-		<betterprices>8</betterprices>
 		<ap_inventory>-10</ap_inventory> 
 		<no_male>1</no_male>
 		<no_female>1</no_female>
@@ -3293,7 +3290,6 @@
 		<resistance_suppression>3</resistance_suppression>
 		<speed_bandaging>25</speed_bandaging>
 		<speed_run>3</speed_run>
-		<ap_inventory>-5</ap_inventory>
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 	</BACKGROUND>
@@ -3661,7 +3657,6 @@
 		<ap_coastal>3</ap_coastal>
 		<ap_tropical>3</ap_tropical>
 		<ap_swamp>3</ap_swamp>
-		<ap_tropical>3</ap_tropical>
 		<ap_swimming>-10</ap_swimming>
 		<travel_boat>5</travel_boat>
 		<speed_run>10</speed_run>
@@ -4137,7 +4132,6 @@
 		<szName>Veteran Mercenary/Car Mechanic</szName>
 		<szShortName>Vet Merc/Mechanic</szShortName>
 		<szDescription>A car mechanic is very useful, as long as you actually have a car.</szDescription>
-		<ap_fortify>-5</ap_fortify>
 		<ap_assault>8</ap_assault>
 		<ap_urban>3</ap_urban>
 		<ap_fortify>-2</ap_fortify>
@@ -4349,7 +4343,6 @@
 		<resistance_fear>3</resistance_fear>
 		<resistance_suppression>5</resistance_suppression>
 		<resistance_alcohol>10</resistance_alcohol>
-		<traplevel>1</traplevel>
 		<druguse>1</druguse>
 		<insurance>100</insurance>
 		<no_male>1</no_male>
@@ -4824,7 +4817,6 @@
 		<ap_artillery>10</ap_artillery>
 		<ap_inventory>-10</ap_inventory>
 		<ap_airdrop>-3</ap_airdrop>
-		<ap_assault>-5</ap_assault>
 		<resistance_fear>5</resistance_fear>
 		<speed_bandaging>30</speed_bandaging>
 		<approach_friendly>10</approach_friendly>
@@ -5399,8 +5391,6 @@
 		<szDescription>A sapper can only make two mistakes in his life. The first one is his &#10;career choice.</szDescription>
 		<dexterity>3</dexterity>
 		<mechanical>3</mechanical>
-		<explosives>5</explosives>
-		<ap_fortify>-20</ap_fortify>
 		<ap_fortify>10</ap_fortify>
 		<ap_artillery>-3</ap_artillery>
 		<ap_inventory>-5</ap_inventory>
diff --git a/Data-1.13/TableData/Items/Weapons.xml b/Data-1.13/TableData/Items/Weapons.xml
index de7cf095f..ab2a898b2 100644
--- a/Data-1.13/TableData/Items/Weapons.xml
+++ b/Data-1.13/TableData/Items/Weapons.xml
@@ -210,7 +210,7 @@
 		<ubMagSize>6</ubMagSize>
 		<usRange>105</usRange>
 		<usReloadDelay>200</usReloadDelay>
-		<BurstAniDelay>100</BurstAniDelay>
+		<BurstAniDelay>60</BurstAniDelay>
 		<ubAttackVolume>45</ubAttackVolume>
 		<ubHitVolume>3</ubHitVolume>
 		<sSound>459</sSound>
@@ -231,7 +231,6 @@
 		<fBurstOnlyByFanTheHammer>1</fBurstOnlyByFanTheHammer>
 		<ubShotsPerBurst>6</ubShotsPerBurst>
 		<ubBurstPenalty>8</ubBurstPenalty>
-		<BurstAniDelay>60</BurstAniDelay>
 		<sBurstSound>54</sBurstSound>
 		<sSilencedBurstSound>111</sSilencedBurstSound>
 		<bBurstAP>10</bBurstAP>
@@ -253,7 +252,7 @@
 		<ubMagSize>6</ubMagSize>
 		<usRange>110</usRange>
 		<usReloadDelay>200</usReloadDelay>
-		<BurstAniDelay>100</BurstAniDelay>
+		<BurstAniDelay>60</BurstAniDelay>
 		<ubAttackVolume>60</ubAttackVolume>
 		<ubHitVolume>5</ubHitVolume>
 		<sSound>423</sSound>
@@ -274,7 +273,6 @@
 		<fBurstOnlyByFanTheHammer>1</fBurstOnlyByFanTheHammer>
 		<ubShotsPerBurst>6</ubShotsPerBurst>
 		<ubBurstPenalty>8</ubBurstPenalty>
-		<BurstAniDelay>60</BurstAniDelay>
 		<sBurstSound>54</sBurstSound>
 		<sSilencedBurstSound>111</sSilencedBurstSound>
 		<bBurstAP>10</bBurstAP>
@@ -2072,7 +2070,7 @@
 		<ubMagSize>6</ubMagSize>
 		<usRange>170</usRange>
 		<usReloadDelay>200</usReloadDelay>
-		<BurstAniDelay>100</BurstAniDelay>
+		<BurstAniDelay>60</BurstAniDelay>
 		<ubAttackVolume>60</ubAttackVolume>
 		<ubHitVolume>3</ubHitVolume>
 		<sSound>423</sSound>
@@ -2093,7 +2091,6 @@
 		<fBurstOnlyByFanTheHammer>1</fBurstOnlyByFanTheHammer>
 		<ubShotsPerBurst>6</ubShotsPerBurst>
 		<ubBurstPenalty>8</ubBurstPenalty>
-		<BurstAniDelay>60</BurstAniDelay>
 		<sBurstSound>54</sBurstSound>
 		<sSilencedBurstSound>111</sSilencedBurstSound>
 		<bBurstAP>10</bBurstAP>
@@ -7322,7 +7319,7 @@
 		<ubMagSize>6</ubMagSize>
 		<usRange>150</usRange>
 		<usReloadDelay>200</usReloadDelay>
-		<BurstAniDelay>100</BurstAniDelay>
+		<BurstAniDelay>60</BurstAniDelay>
 		<ubAttackVolume>54</ubAttackVolume>
 		<ubHitVolume>3</ubHitVolume>
 		<sSound>409</sSound>
@@ -7343,7 +7340,6 @@
 		<fBurstOnlyByFanTheHammer>1</fBurstOnlyByFanTheHammer>
 		<ubShotsPerBurst>6</ubShotsPerBurst>
 		<ubBurstPenalty>8</ubBurstPenalty>
-		<BurstAniDelay>60</BurstAniDelay>
 		<sBurstSound>54</sBurstSound>
 		<sSilencedBurstSound>111</sSilencedBurstSound>
 		<bBurstAP>10</bBurstAP>
@@ -8418,7 +8414,7 @@
 		<ubMagSize>6</ubMagSize>
 		<usRange>140</usRange>
 		<usReloadDelay>200</usReloadDelay>
-		<BurstAniDelay>100</BurstAniDelay>
+		<BurstAniDelay>60</BurstAniDelay>
 		<ubAttackVolume>54</ubAttackVolume>
 		<ubHitVolume>5</ubHitVolume>
 		<sSound>409</sSound>
@@ -8439,7 +8435,6 @@
 		<fBurstOnlyByFanTheHammer>1</fBurstOnlyByFanTheHammer>
 		<ubShotsPerBurst>6</ubShotsPerBurst>
 		<ubBurstPenalty>8</ubBurstPenalty>
-		<BurstAniDelay>60</BurstAniDelay>
 		<sBurstSound>54</sBurstSound>
 		<sSilencedBurstSound>111</sSilencedBurstSound>
 		<bBurstAP>10</bBurstAP>
@@ -9748,7 +9743,7 @@
 		<ubMagSize>5</ubMagSize>
 		<usRange>100</usRange>
 		<usReloadDelay>200</usReloadDelay>
-		<BurstAniDelay>100</BurstAniDelay>
+		<BurstAniDelay>60</BurstAniDelay>
 		<ubAttackVolume>65</ubAttackVolume>
 		<ubHitVolume>5</ubHitVolume>
 		<sSound>426</sSound>
@@ -9769,7 +9764,6 @@
 		<fBurstOnlyByFanTheHammer>1</fBurstOnlyByFanTheHammer>
 		<ubShotsPerBurst>5</ubShotsPerBurst>
 		<ubBurstPenalty>8</ubBurstPenalty>
-		<BurstAniDelay>60</BurstAniDelay>
 		<sBurstSound>54</sBurstSound>
 		<sSilencedBurstSound>111</sSilencedBurstSound>
 		<bBurstAP>8</bBurstAP>
@@ -9790,7 +9784,7 @@
 		<ubMagSize>5</ubMagSize>
 		<usRange>150</usRange>
 		<usReloadDelay>200</usReloadDelay>
-		<BurstAniDelay>100</BurstAniDelay>
+		<BurstAniDelay>60</BurstAniDelay>
 		<ubAttackVolume>60</ubAttackVolume>
 		<ubHitVolume>5</ubHitVolume>
 		<sSound>426</sSound>
@@ -9811,7 +9805,6 @@
 		<fBurstOnlyByFanTheHammer>1</fBurstOnlyByFanTheHammer>
 		<ubShotsPerBurst>5</ubShotsPerBurst>
 		<ubBurstPenalty>8</ubBurstPenalty>
-		<BurstAniDelay>60</BurstAniDelay>
 		<sBurstSound>54</sBurstSound>
 		<sSilencedBurstSound>111</sSilencedBurstSound>
 		<bBurstAP>8</bBurstAP>
@@ -10887,7 +10880,7 @@
 		<ubMagSize>6</ubMagSize>
 		<usRange>135</usRange>
 		<usReloadDelay>200</usReloadDelay>
-		<BurstAniDelay>100</BurstAniDelay>
+		<BurstAniDelay>60</BurstAniDelay>
 		<ubAttackVolume>60</ubAttackVolume>
 		<ubHitVolume>5</ubHitVolume>
 		<sSound>316</sSound>
@@ -10908,7 +10901,6 @@
 		<fBurstOnlyByFanTheHammer>1</fBurstOnlyByFanTheHammer>
 		<ubShotsPerBurst>6</ubShotsPerBurst>
 		<ubBurstPenalty>8</ubBurstPenalty>
-		<BurstAniDelay>60</BurstAniDelay>
 		<sBurstSound>54</sBurstSound>
 		<sSilencedBurstSound>111</sSilencedBurstSound>
 		<bBurstAP>10</bBurstAP>
@@ -10930,7 +10922,7 @@
 		<ubMagSize>6</ubMagSize>
 		<usRange>135</usRange>
 		<usReloadDelay>200</usReloadDelay>
-		<BurstAniDelay>100</BurstAniDelay>
+		<BurstAniDelay>60</BurstAniDelay>
 		<ubAttackVolume>60</ubAttackVolume>
 		<ubHitVolume>5</ubHitVolume>
 		<sSound>423</sSound>
@@ -10951,7 +10943,6 @@
 		<fBurstOnlyByFanTheHammer>1</fBurstOnlyByFanTheHammer>
 		<ubShotsPerBurst>6</ubShotsPerBurst>
 		<ubBurstPenalty>8</ubBurstPenalty>
-		<BurstAniDelay>60</BurstAniDelay>
 		<sBurstSound>54</sBurstSound>
 		<sSilencedBurstSound>111</sSilencedBurstSound>
 		<bBurstAP>10</bBurstAP>
@@ -11078,7 +11069,7 @@
 		<ubMagSize>6</ubMagSize>
 		<usRange>135</usRange>
 		<usReloadDelay>200</usReloadDelay>
-		<BurstAniDelay>100</BurstAniDelay>
+		<BurstAniDelay>60</BurstAniDelay>
 		<ubAttackVolume>60</ubAttackVolume>
 		<ubHitVolume>5</ubHitVolume>
 		<sSound>316</sSound>
@@ -11099,7 +11090,6 @@
 		<fBurstOnlyByFanTheHammer>1</fBurstOnlyByFanTheHammer>
 		<ubShotsPerBurst>6</ubShotsPerBurst>
 		<ubBurstPenalty>8</ubBurstPenalty>
-		<BurstAniDelay>60</BurstAniDelay>
 		<sBurstSound>54</sBurstSound>
 		<sSilencedBurstSound>111</sSilencedBurstSound>
 		<bBurstAP>10</bBurstAP>
@@ -11121,7 +11111,7 @@
 		<ubMagSize>6</ubMagSize>
 		<usRange>160</usRange>
 		<usReloadDelay>200</usReloadDelay>
-		<BurstAniDelay>100</BurstAniDelay>
+		<BurstAniDelay>60</BurstAniDelay>
 		<ubAttackVolume>60</ubAttackVolume>
 		<ubHitVolume>5</ubHitVolume>
 		<sSound>316</sSound>
@@ -11141,7 +11131,6 @@
 		<fBurstOnlyByFanTheHammer>1</fBurstOnlyByFanTheHammer>
 		<ubShotsPerBurst>6</ubShotsPerBurst>
 		<ubBurstPenalty>8</ubBurstPenalty>
-		<BurstAniDelay>60</BurstAniDelay>
 		<sBurstSound>54</sBurstSound>
 		<sSilencedBurstSound>111</sSilencedBurstSound>
 		<bBurstAP>10</bBurstAP>
@@ -11163,7 +11152,7 @@
 		<ubMagSize>6</ubMagSize>
 		<usRange>110</usRange>
 		<usReloadDelay>200</usReloadDelay>
-		<BurstAniDelay>100</BurstAniDelay>
+		<BurstAniDelay>60</BurstAniDelay>
 		<ubAttackVolume>60</ubAttackVolume>
 		<ubHitVolume>5</ubHitVolume>
 		<sSound>423</sSound>
@@ -11184,7 +11173,6 @@
 		<fBurstOnlyByFanTheHammer>1</fBurstOnlyByFanTheHammer>
 		<ubShotsPerBurst>6</ubShotsPerBurst>
 		<ubBurstPenalty>8</ubBurstPenalty>
-		<BurstAniDelay>60</BurstAniDelay>
 		<sBurstSound>54</sBurstSound>
 		<sSilencedBurstSound>111</sSilencedBurstSound>
 		<bBurstAP>10</bBurstAP>
@@ -12887,7 +12875,7 @@
 		<ubMagSize>6</ubMagSize>
 		<usRange>110</usRange>
 		<usReloadDelay>200</usReloadDelay>
-		<BurstAniDelay>100</BurstAniDelay>
+		<BurstAniDelay>60</BurstAniDelay>
 		<ubAttackVolume>60</ubAttackVolume>
 		<ubHitVolume>5</ubHitVolume>
 		<sSound>423</sSound>
@@ -12908,7 +12896,6 @@
 		<fBurstOnlyByFanTheHammer>1</fBurstOnlyByFanTheHammer>
 		<ubShotsPerBurst>6</ubShotsPerBurst>
 		<ubBurstPenalty>8</ubBurstPenalty>
-		<BurstAniDelay>60</BurstAniDelay>
 		<sBurstSound>54</sBurstSound>
 		<sSilencedBurstSound>111</sSilencedBurstSound>
 		<bBurstAP>10</bBurstAP>