From bcafd02500c6bf1079981629a7fc294dab646a98 Mon Sep 17 00:00:00 2001
From: MaddMugsy <MaddMugsy@4f8fa57e-7814-0410-bad4-adc449f26b7c>
Date: Thu, 7 Sep 2006 00:20:20 +0000
Subject: [PATCH] -renamed Colt M16A2 Commando to Colt M4 Commando -lowered
 after armour impact of glaser ammo -disabled subsonic glaser ammo

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@485 4f8fa57e-7814-0410-bad4-adc449f26b7c
---
 gamedir/Data-1.13/TableData/AmmoTypes.xml |  4 +--
 gamedir/Data-1.13/TableData/Items.xml     | 40 +++++++++++------------
 gamedir/Data-1.13/TableData/Weapons.xml   |  2 +-
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/gamedir/Data-1.13/TableData/AmmoTypes.xml b/gamedir/Data-1.13/TableData/AmmoTypes.xml
index 12ab6cfe0..680dccea6 100644
--- a/gamedir/Data-1.13/TableData/AmmoTypes.xml
+++ b/gamedir/Data-1.13/TableData/AmmoTypes.xml
@@ -446,7 +446,7 @@
 		<armourImpactReductionDivisor>1</armourImpactReductionDivisor>
 		<beforeArmourDamageMultiplier>1</beforeArmourDamageMultiplier>
 		<beforeArmourDamageDivisor>1</beforeArmourDamageDivisor>
-		<afterArmourDamageMultiplier>34</afterArmourDamageMultiplier>
+		<afterArmourDamageMultiplier>30</afterArmourDamageMultiplier>
 		<afterArmourDamageDivisor>10</afterArmourDamageDivisor>
 		<zeroMinimumDamage>1</zeroMinimumDamage>
 		<canGoThrough>0</canGoThrough>
@@ -725,7 +725,7 @@
 		<armourImpactReductionDivisor>1</armourImpactReductionDivisor>
 		<beforeArmourDamageMultiplier>1</beforeArmourDamageMultiplier>
 		<beforeArmourDamageDivisor>1</beforeArmourDamageDivisor>
-		<afterArmourDamageMultiplier>32</afterArmourDamageMultiplier>
+		<afterArmourDamageMultiplier>26</afterArmourDamageMultiplier>
 		<afterArmourDamageDivisor>10</afterArmourDamageDivisor>
 		<zeroMinimumDamage>1</zeroMinimumDamage>
 		<canGoThrough>0</canGoThrough>
diff --git a/gamedir/Data-1.13/TableData/Items.xml b/gamedir/Data-1.13/TableData/Items.xml
index b14d4f8fb..8de334450 100644
--- a/gamedir/Data-1.13/TableData/Items.xml
+++ b/gamedir/Data-1.13/TableData/Items.xml
@@ -1455,9 +1455,9 @@
 	<ITEM>
 		<uiIndex>12</uiIndex>
 		<szItemName>Commando</szItemName>
-		<szLongItemName>Colt M16A2 Commando</szLongItemName>
-		<szItemDesc>This mini version of the M-16 is a prized tool for knocking off noisy neighbors and petty dictators.</szItemDesc>
-		<szBRName>Colt M16A2 Commando</szBRName>
+		<szLongItemName>Colt M4 Commando</szLongItemName>
+		<szItemDesc>This mini version of the M16 is a prized tool for knocking off noisy neighbors and petty dictators.</szItemDesc>
+		<szBRName>Colt M4 Commando</szBRName>
 		<szBRDesc>Very small, and yet, very deadly. The Colt 635 Commando is an attractively short and concealable assault rifle that was based on the M16 design. It is extremely popular among several US armed forces.</szBRDesc>
 		<usItemClass>2</usItemClass>
 		<ubClassIndex>12</ubClassIndex>
@@ -43818,7 +43818,7 @@
 		<ubWeight>1</ubWeight>
 		<ubPerPocket>8</ubPerPocket>
 		<usPrice>51</usPrice>
-		<ubCoolness>3</ubCoolness>
+		<ubCoolness>0</ubCoolness>
 		<bReliability>0</bReliability>
 		<bRepairEase>0</bRepairEase>
 		<Damageable>0</Damageable>
@@ -43838,7 +43838,7 @@
 		<Unaerodynamic>0</Unaerodynamic>
 		<Electronic>0</Electronic>
 		<Inseparable>0</Inseparable>
-		<BR_NewInventory>8</BR_NewInventory>
+		<BR_NewInventory>0</BR_NewInventory>
 		<BR_UsedInventory>0</BR_UsedInventory>
 		<BR_ROF>0</BR_ROF>
 		<PercentNoiseReduction>40</PercentNoiseReduction>
@@ -44786,7 +44786,7 @@
 		<ubWeight>2</ubWeight>
 		<ubPerPocket>8</ubPerPocket>
 		<usPrice>95</usPrice>
-		<ubCoolness>3</ubCoolness>
+		<ubCoolness>0</ubCoolness>
 		<bReliability>0</bReliability>
 		<bRepairEase>0</bRepairEase>
 		<Damageable>0</Damageable>
@@ -44806,7 +44806,7 @@
 		<Unaerodynamic>0</Unaerodynamic>
 		<Electronic>0</Electronic>
 		<Inseparable>0</Inseparable>
-		<BR_NewInventory>8</BR_NewInventory>
+		<BR_NewInventory>0</BR_NewInventory>
 		<BR_UsedInventory>0</BR_UsedInventory>
 		<BR_ROF>0</BR_ROF>
 		<PercentNoiseReduction>40</PercentNoiseReduction>
@@ -45754,7 +45754,7 @@
 		<ubWeight>4</ubWeight>
 		<ubPerPocket>4</ubPerPocket>
 		<usPrice>189</usPrice>
-		<ubCoolness>4</ubCoolness>
+		<ubCoolness>0</ubCoolness>
 		<bReliability>0</bReliability>
 		<bRepairEase>0</bRepairEase>
 		<Damageable>0</Damageable>
@@ -45774,7 +45774,7 @@
 		<Unaerodynamic>0</Unaerodynamic>
 		<Electronic>0</Electronic>
 		<Inseparable>0</Inseparable>
-		<BR_NewInventory>7</BR_NewInventory>
+		<BR_NewInventory>0</BR_NewInventory>
 		<BR_UsedInventory>0</BR_UsedInventory>
 		<BR_ROF>0</BR_ROF>
 		<PercentNoiseReduction>40</PercentNoiseReduction>
@@ -51804,7 +51804,7 @@
 		<ubWeight>2</ubWeight>
 		<ubPerPocket>6</ubPerPocket>
 		<usPrice>105</usPrice>
-		<ubCoolness>5</ubCoolness>
+		<ubCoolness>0</ubCoolness>
 		<bReliability>0</bReliability>
 		<bRepairEase>0</bRepairEase>
 		<Damageable>0</Damageable>
@@ -51824,7 +51824,7 @@
 		<Unaerodynamic>0</Unaerodynamic>
 		<Electronic>0</Electronic>
 		<Inseparable>0</Inseparable>
-		<BR_NewInventory>6</BR_NewInventory>
+		<BR_NewInventory>0</BR_NewInventory>
 		<BR_UsedInventory>0</BR_UsedInventory>
 		<BR_ROF>0</BR_ROF>
 		<PercentNoiseReduction>40</PercentNoiseReduction>
@@ -52530,7 +52530,7 @@
 		<ubWeight>5</ubWeight>
 		<ubPerPocket>4</ubPerPocket>
 		<usPrice>315</usPrice>
-		<ubCoolness>5</ubCoolness>
+		<ubCoolness>0</ubCoolness>
 		<bReliability>0</bReliability>
 		<bRepairEase>0</bRepairEase>
 		<Damageable>0</Damageable>
@@ -52550,7 +52550,7 @@
 		<Unaerodynamic>0</Unaerodynamic>
 		<Electronic>0</Electronic>
 		<Inseparable>0</Inseparable>
-		<BR_NewInventory>6</BR_NewInventory>
+		<BR_NewInventory>0</BR_NewInventory>
 		<BR_UsedInventory>0</BR_UsedInventory>
 		<BR_ROF>0</BR_ROF>
 		<PercentNoiseReduction>40</PercentNoiseReduction>
@@ -54950,7 +54950,7 @@
 		<ubWeight>1</ubWeight>
 		<ubPerPocket>6</ubPerPocket>
 		<usPrice>79</usPrice>
-		<ubCoolness>3</ubCoolness>
+		<ubCoolness>0</ubCoolness>
 		<bReliability>0</bReliability>
 		<bRepairEase>0</bRepairEase>
 		<Damageable>0</Damageable>
@@ -54970,7 +54970,7 @@
 		<Unaerodynamic>0</Unaerodynamic>
 		<Electronic>0</Electronic>
 		<Inseparable>0</Inseparable>
-		<BR_NewInventory>8</BR_NewInventory>
+		<BR_NewInventory>0</BR_NewInventory>
 		<BR_UsedInventory>0</BR_UsedInventory>
 		<BR_ROF>0</BR_ROF>
 		<PercentNoiseReduction>40</PercentNoiseReduction>
@@ -55918,7 +55918,7 @@
 		<ubWeight>3</ubWeight>
 		<ubPerPocket>6</ubPerPocket>
 		<usPrice>158</usPrice>
-		<ubCoolness>6</ubCoolness>
+		<ubCoolness>0</ubCoolness>
 		<bReliability>0</bReliability>
 		<bRepairEase>0</bRepairEase>
 		<Damageable>0</Damageable>
@@ -55938,7 +55938,7 @@
 		<Unaerodynamic>0</Unaerodynamic>
 		<Electronic>0</Electronic>
 		<Inseparable>0</Inseparable>
-		<BR_NewInventory>5</BR_NewInventory>
+		<BR_NewInventory>0</BR_NewInventory>
 		<BR_UsedInventory>0</BR_UsedInventory>
 		<BR_ROF>0</BR_ROF>
 		<PercentNoiseReduction>40</PercentNoiseReduction>
@@ -56644,7 +56644,7 @@
 		<ubWeight>7</ubWeight>
 		<ubPerPocket>4</ubPerPocket>
 		<usPrice>315</usPrice>
-		<ubCoolness>5</ubCoolness>
+		<ubCoolness>0</ubCoolness>
 		<bReliability>0</bReliability>
 		<bRepairEase>0</bRepairEase>
 		<Damageable>0</Damageable>
@@ -56664,7 +56664,7 @@
 		<Unaerodynamic>0</Unaerodynamic>
 		<Electronic>0</Electronic>
 		<Inseparable>0</Inseparable>
-		<BR_NewInventory>6</BR_NewInventory>
+		<BR_NewInventory>0</BR_NewInventory>
 		<BR_UsedInventory>0</BR_UsedInventory>
 		<BR_ROF>0</BR_ROF>
 		<PercentNoiseReduction>40</PercentNoiseReduction>
@@ -120276,7 +120276,7 @@
 	<ITEM>
 		<uiIndex>994</uiIndex>
 		<szItemName>Flashbang</szItemName>
-		<szLongItemName>Flashbang</szLongItemName>
+		<szLongItemName>Flashbang Grenade</szLongItemName>
 		<szItemDesc>Flashbangs are used to confuse and disorient a potential threat for up to five seconds.  They work best indoors, and are only partially effective outdoors at night.</szItemDesc>
 		<szBRName>Flashbang Grenade</szBRName>
 		<szBRDesc>The flash of light from this grenade momentarily activates all sensory pigment in the retina, making vision impossible for approximately five seconds until the eye restores the pigment to its original, unstimulated state. </szBRDesc>
diff --git a/gamedir/Data-1.13/TableData/Weapons.xml b/gamedir/Data-1.13/TableData/Weapons.xml
index 3f50f03b2..4d13e6a98 100644
--- a/gamedir/Data-1.13/TableData/Weapons.xml
+++ b/gamedir/Data-1.13/TableData/Weapons.xml
@@ -434,7 +434,7 @@
 	</WEAPON>
 	<WEAPON>
 		<uiIndex>12</uiIndex>
-		<szWeaponName>Colt M16A2 Commando</szWeaponName>
+		<szWeaponName>Colt M4 Commando</szWeaponName>
 		<ubWeaponClass>3</ubWeaponClass>
 		<ubWeaponType>6</ubWeaponType>
 		<ubCalibre>8</ubCalibre>