From fe1bed45d12dd95b53c6f3848139de9ad8c94c76 Mon Sep 17 00:00:00 2001
From: Flugente <Flugente@4f8fa57e-7814-0410-bad4-adc449f26b7c>
Date: Sat, 15 Mar 2014 17:55:11 +0000
Subject: [PATCH] - New feature: Ammotype flag AMMO_ANTIMATERIEL
 (<ammoflag>4</ammoflag>) gives bullets the ability to destroy walls and other
 structures. - Fix: Charlie's ammo was not fitting

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1984 4f8fa57e-7814-0410-bad4-adc449f26b7c
---
 .../TableData/Inventory/MercStartingGear.xml  |   2 +-
 Data-1.13/TableData/Items/AmmoTypes.xml       |  36 ++++++++++++++++++
 Data-1.13/TableData/Items/Magazines.xml       |  12 +++---
 Data/Interface/ItemInfoSecondaryIcons.sti     | Bin 13661 -> 13939 bytes
 4 files changed, 43 insertions(+), 7 deletions(-)

diff --git a/Data-1.13/TableData/Inventory/MercStartingGear.xml b/Data-1.13/TableData/Inventory/MercStartingGear.xml
index 3f427d063..49f038fd5 100644
--- a/Data-1.13/TableData/Inventory/MercStartingGear.xml
+++ b/Data-1.13/TableData/Inventory/MercStartingGear.xml
@@ -13643,7 +13643,7 @@
 			<mWeapon>26</mWeapon>
 			<mWeaponDrop>1</mWeaponDrop>
 			<mWeaponStatus>89</mWeaponStatus>
-			<mBig0>92</mBig0>
+			<mBig0>97</mBig0>
 			<mBig0Status>100</mBig0Status>
 			<mBig0Quantity>1</mBig0Quantity>
 			<mBig0Drop>1</mBig0Drop>
diff --git a/Data-1.13/TableData/Items/AmmoTypes.xml b/Data-1.13/TableData/Items/AmmoTypes.xml
index 60160f4d9..9f4b6bb75 100644
--- a/Data-1.13/TableData/Items/AmmoTypes.xml
+++ b/Data-1.13/TableData/Items/AmmoTypes.xml
@@ -1086,4 +1086,40 @@
 		<temperatureModificator>0</temperatureModificator>
 		<ammoflag>2</ammoflag>
 	</AMMOTYPE>
+	<AMMOTYPE>
+		<uiIndex>31</uiIndex>
+		<name>SAP, anti-material</name>
+		<fontColour>163</fontColour>
+		<grayed>8</grayed>
+		<offNormal>5</offNormal>
+		<onNormal>7</onNormal>
+		<structureImpactReductionMultiplier>1</structureImpactReductionMultiplier>
+		<structureImpactReductionDivisor>2</structureImpactReductionDivisor>
+		<armourImpactReductionMultiplier>1</armourImpactReductionMultiplier>
+		<armourImpactReductionDivisor>2</armourImpactReductionDivisor>
+		<beforeArmourDamageMultiplier>1</beforeArmourDamageMultiplier>
+		<beforeArmourDamageDivisor>1</beforeArmourDamageDivisor>
+		<afterArmourDamageMultiplier>1</afterArmourDamageMultiplier>
+		<afterArmourDamageDivisor>1</afterArmourDamageDivisor>
+		<zeroMinimumDamage>0</zeroMinimumDamage>
+		<canGoThrough>1</canGoThrough>
+		<standardIssue>1</standardIssue>
+		<numberOfBullets>1</numberOfBullets>
+		<multipleBulletDamageMultiplier>1</multipleBulletDamageMultiplier>
+		<multipleBulletDamageDivisor>1</multipleBulletDamageDivisor>
+		<highExplosive>0</highExplosive>
+		<explosionSize>0</explosionSize>
+		<antiTank>0</antiTank>
+		<dart>0</dart>
+		<knife>0</knife>
+		<monsterSpit>0</monsterSpit>
+		<acidic>0</acidic>
+		<ignoreArmour>0</ignoreArmour>
+		<lockBustingPower>0</lockBustingPower>
+		<tracerEffect>0</tracerEffect>
+		<spreadPattern />
+		<temperatureModificator>0.3</temperatureModificator>
+		<dirtModificator>0.2</dirtModificator>
+		<ammoflag>4</ammoflag>
+	</AMMOTYPE>
 </AMMOTYPELIST>
\ No newline at end of file
diff --git a/Data-1.13/TableData/Items/Magazines.xml b/Data-1.13/TableData/Items/Magazines.xml
index c8c458cc0..148d9e52b 100644
--- a/Data-1.13/TableData/Items/Magazines.xml
+++ b/Data-1.13/TableData/Items/Magazines.xml
@@ -2426,21 +2426,21 @@
 		<uiIndex>346</uiIndex>
 		<ubCalibre>17</ubCalibre>
 		<ubMagSize>5</ubMagSize>
-		<ubAmmoType>3</ubAmmoType>
+		<ubAmmoType>31</ubAmmoType>
 		<ubMagType>0</ubMagType>
 	</MAGAZINE>
 	<MAGAZINE>
 		<uiIndex>347</uiIndex>
 		<ubCalibre>17</ubCalibre>
 		<ubMagSize>10</ubMagSize>
-		<ubAmmoType>3</ubAmmoType>
+		<ubAmmoType>31</ubAmmoType>
 		<ubMagType>0</ubMagType>
 	</MAGAZINE>
 	<MAGAZINE>
 		<uiIndex>348</uiIndex>
 		<ubCalibre>17</ubCalibre>
 		<ubMagSize>15</ubMagSize>
-		<ubAmmoType>3</ubAmmoType>
+		<ubAmmoType>31</ubAmmoType>
 		<ubMagType>2</ubMagType>
 	</MAGAZINE>
 	<MAGAZINE>
@@ -2741,21 +2741,21 @@
 		<uiIndex>391</uiIndex>
 		<ubCalibre>21</ubCalibre>
 		<ubMagSize>5</ubMagSize>
-		<ubAmmoType>3</ubAmmoType>
+		<ubAmmoType>31</ubAmmoType>
 		<ubMagType>0</ubMagType>
 	</MAGAZINE>
 	<MAGAZINE>
 		<uiIndex>392</uiIndex>
 		<ubCalibre>21</ubCalibre>
 		<ubMagSize>15</ubMagSize>
-		<ubAmmoType>3</ubAmmoType>
+		<ubAmmoType>31</ubAmmoType>
 		<ubMagType>2</ubMagType>
 	</MAGAZINE>
 	<MAGAZINE>
 		<uiIndex>393</uiIndex>
 		<ubCalibre>21</ubCalibre>
 		<ubMagSize>300</ubMagSize>
-		<ubAmmoType>3</ubAmmoType>
+		<ubAmmoType>31</ubAmmoType>
 		<ubMagType>3</ubMagType>
 	</MAGAZINE>
 	<MAGAZINE>
diff --git a/Data/Interface/ItemInfoSecondaryIcons.sti b/Data/Interface/ItemInfoSecondaryIcons.sti
index f5366d4436c6ef9795b176abcefc434ba660185f..b00c449fb5102bdce64dbfc5fb341af03d2d234d 100644
GIT binary patch
delta 324
zcmYk1O-=(b427TPj|zdjo<*0H*tOCeffZ}I^Rl~!I}AzFb`T(hSaA&0^AuI;5qg2z
z>4?FJEywT6i?Uyyp2m;!`v+(oXI6nb%>zAWAYk${UX;9_0+pUDYSg>7{GGPn7}gs}
z$V579Nmj(Z5OJ=<hB%OT-Gy@|2Wr+TlM6lJv!;o;h|VPBiK!b4Gmz8`1xEXd&C9i`
z!P8%H;>DM$*~{_vLK&G{b#Q6ZWg~9>5&VL9{Ri+X;;2{o9kEIZe;^h*<xj+ndGyu)
F{|t%fSpon6

delta 43
tcmeyIb2m#iIK<hL0SNBugGdGj4IqBN*uccV$iSeoQ8t-%^90tr`T*>y3OxV-