Updated /Data folder

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2364 4f8fa57e-7814-0410-bad4-adc449f26b7c

gamedir/Data/TableData/AIMAvailability.xml

@@ -1,217 +1,241 @@
-<!--
-
-In this file you can define, which mercs should be available on AIM website.
-This works for USE_PROFILE_DATA_FROM_XML = TRUE (using MercProfiles.xml) and FALSE (using BinaryData\Prof*.dat), but with FALSE, only the first 40 entries in this file will be used.
-Important: When USE_PROFILE_DATA_FROM_XML = FALSE, you can only remove mercs from AIM and cannot add new mercs to AIM.
-
-	uiIndex (0 - 254): 		Do not delete any entries from the file.
-
-	ProfileId (0 - 254):	Set this value to the matching profile from prof.dat/MercProfiles.xml. You should add the profile on the correct uiIndex (uiIndex = ProfileId)!
-							Set this value to -1, and the merc will not be available in AIM.
-
-	AimBioID: 				The matching record in BinaryData\AIMBIOS.EDT file
-							Set the value to -1, when no AIMBios entry is available for the merc.
-
--->
-
 <AIM_AVAILABLES>
 	<AIM>
 		<uiIndex>0</uiIndex>
+		<description>Barry</description>
 		<ProfilId>0</ProfilId>
 		<AimBioID>0</AimBioID>
 	</AIM>
 	<AIM>
 		<uiIndex>1</uiIndex>
+		<description>Blood</description>
 		<ProfilId>1</ProfilId>
 		<AimBioID>1</AimBioID>
 	</AIM>
 	<AIM>
 		<uiIndex>2</uiIndex>
+		<description>Lynx</description>
 		<ProfilId>2</ProfilId>
 		<AimBioID>2</AimBioID>
 	</AIM>
 	<AIM>
 		<uiIndex>3</uiIndex>
+		<description>Grizzly</description>
 		<ProfilId>3</ProfilId>
 		<AimBioID>3</AimBioID>
 	</AIM>
 	<AIM>
 		<uiIndex>4</uiIndex>
+		<description>Vicki</description>
 		<ProfilId>4</ProfilId>
 		<AimBioID>4</AimBioID>
 	</AIM>
 	<AIM>
 		<uiIndex>5</uiIndex>
+		<description>Trevor</description>
 		<ProfilId>5</ProfilId>
 		<AimBioID>5</AimBioID>
 	</AIM>
 	<AIM>
 		<uiIndex>6</uiIndex>
+		<description>Grunty</description>
 		<ProfilId>6</ProfilId>
 		<AimBioID>6</AimBioID>
 	</AIM>
 	<AIM>
 		<uiIndex>7</uiIndex>
+		<description>Ivan</description>
 		<ProfilId>7</ProfilId>
 		<AimBioID>7</AimBioID>
 	</AIM>
 	<AIM>
 		<uiIndex>8</uiIndex>
+		<description>Steroid</description>
 		<ProfilId>8</ProfilId>
 		<AimBioID>8</AimBioID>
 	</AIM>
 	<AIM>
 		<uiIndex>9</uiIndex>
+		<description>Igor</description>
 		<ProfilId>9</ProfilId>
 		<AimBioID>9</AimBioID>
 	</AIM>
 	<AIM>
 		<uiIndex>10</uiIndex>
+		<description>Shadow</description>
 		<ProfilId>10</ProfilId>
 		<AimBioID>10</AimBioID>
 	</AIM>
 	<AIM>
 		<uiIndex>11</uiIndex>
+		<description>Red</description>
 		<ProfilId>11</ProfilId>
 		<AimBioID>11</AimBioID>
 	</AIM>
 	<AIM>
 		<uiIndex>12</uiIndex>
+		<description>Reaper</description>
 		<ProfilId>12</ProfilId>
 		<AimBioID>12</AimBioID>
 	</AIM>
 	<AIM>
 		<uiIndex>13</uiIndex>
+		<description>Fidel</description>
 		<ProfilId>13</ProfilId>
 		<AimBioID>13</AimBioID>
 	</AIM>
 	<AIM>
 		<uiIndex>14</uiIndex>
+		<description>Fox</description>
 		<ProfilId>14</ProfilId>
 		<AimBioID>14</AimBioID>
 	</AIM>
 	<AIM>
 		<uiIndex>15</uiIndex>
+		<description>Sidney</description>
 		<ProfilId>15</ProfilId>
 		<AimBioID>15</AimBioID>
 	</AIM>
 	<AIM>
 		<uiIndex>16</uiIndex>
+		<description>Gus</description>
 		<ProfilId>16</ProfilId>
 		<AimBioID>16</AimBioID>
 	</AIM>
 	<AIM>
 		<uiIndex>17</uiIndex>
+		<description>Buns</description>
 		<ProfilId>17</ProfilId>
 		<AimBioID>17</AimBioID>
 	</AIM>
 	<AIM>
 		<uiIndex>18</uiIndex>
+		<description>Ice</description>
 		<ProfilId>18</ProfilId>
 		<AimBioID>18</AimBioID>
 	</AIM>
 	<AIM>
 		<uiIndex>19</uiIndex>
+		<description>Spider</description>
 		<ProfilId>19</ProfilId>
 		<AimBioID>19</AimBioID>
 	</AIM>
 	<AIM>
 		<uiIndex>20</uiIndex>
+		<description>Cliff</description>
 		<ProfilId>20</ProfilId>
 		<AimBioID>20</AimBioID>
 	</AIM>
 	<AIM>
 		<uiIndex>21</uiIndex>
+		<description>Bull</description>
 		<ProfilId>21</ProfilId>
 		<AimBioID>21</AimBioID>
 	</AIM>
 	<AIM>
 		<uiIndex>22</uiIndex>
+		<description>Hitman</description>
 		<ProfilId>22</ProfilId>
 		<AimBioID>22</AimBioID>
 	</AIM>
 	<AIM>
 		<uiIndex>23</uiIndex>
+		<description>Buzz</description>
 		<ProfilId>23</ProfilId>
 		<AimBioID>23</AimBioID>
 	</AIM>
 	<AIM>
 		<uiIndex>24</uiIndex>
+		<description>Raider</description>
 		<ProfilId>24</ProfilId>
 		<AimBioID>24</AimBioID>
 	</AIM>
 	<AIM>
 		<uiIndex>25</uiIndex>
+		<description>Raven</description>
 		<ProfilId>25</ProfilId>
 		<AimBioID>25</AimBioID>
 	</AIM>
 	<AIM>
 		<uiIndex>26</uiIndex>
+		<description>Static</description>
 		<ProfilId>26</ProfilId>
 		<AimBioID>26</AimBioID>
 	</AIM>
 	<AIM>
 		<uiIndex>27</uiIndex>
+		<description>Len</description>
 		<ProfilId>27</ProfilId>
 		<AimBioID>27</AimBioID>
 	</AIM>
 	<AIM>
 		<uiIndex>28</uiIndex>
+		<description>Danny</description>
 		<ProfilId>28</ProfilId>
 		<AimBioID>28</AimBioID>
 	</AIM>
 	<AIM>
 		<uiIndex>29</uiIndex>
+		<description>Magic</description>
 		<ProfilId>29</ProfilId>
 		<AimBioID>29</AimBioID>
 	</AIM>
 	<AIM>
 		<uiIndex>30</uiIndex>
+		<description>Stephen</description>
 		<ProfilId>30</ProfilId>
 		<AimBioID>30</AimBioID>
 	</AIM>
 	<AIM>
 		<uiIndex>31</uiIndex>
+		<description>Scully</description>
 		<ProfilId>31</ProfilId>
 		<AimBioID>31</AimBioID>
 	</AIM>
 	<AIM>
 		<uiIndex>32</uiIndex>
+		<description>Malice</description>
 		<ProfilId>32</ProfilId>
 		<AimBioID>32</AimBioID>
 	</AIM>
 	<AIM>
 		<uiIndex>33</uiIndex>
+		<description>Dr. Q</description>
 		<ProfilId>33</ProfilId>
 		<AimBioID>33</AimBioID>
 	</AIM>
 	<AIM>
 		<uiIndex>34</uiIndex>
+		<description>Nails</description>
 		<ProfilId>34</ProfilId>
 		<AimBioID>34</AimBioID>
 	</AIM>
 	<AIM>
 		<uiIndex>35</uiIndex>
+		<description>Thor</description>
 		<ProfilId>35</ProfilId>
 		<AimBioID>35</AimBioID>
 	</AIM>
 	<AIM>
 		<uiIndex>36</uiIndex>
+		<description>Scope</description>
 		<ProfilId>36</ProfilId>
 		<AimBioID>36</AimBioID>
 	</AIM>
 	<AIM>
 		<uiIndex>37</uiIndex>
+		<description>Wolf</description>
 		<ProfilId>37</ProfilId>
 		<AimBioID>37</AimBioID>
 	</AIM>
 	<AIM>
 		<uiIndex>38</uiIndex>
+		<description>MD</description>
 		<ProfilId>38</ProfilId>
 		<AimBioID>38</AimBioID>
 	</AIM>
 	<AIM>
 		<uiIndex>39</uiIndex>
+		<description>Meltdown</description>
 		<ProfilId>39</ProfilId>
 		<AimBioID>39</AimBioID>
 	</AIM>

gamedir/Data/TableData/Email/EmailMercLevelUp.xml

@@ -1,204 +1,213 @@
-<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+This file contains the email text for each merc (that is available on the M.E.R.C website), 
+when Speck sends us the mail, when the salary of a M.E.R.C merc increases.
+
+uiIndex:		This represents the merc index from MercProfiles.xml (Prof.dat)
+Subject:		The email subject
+Message:		The email message body
+
+-->
 
 <EMAIL_MERC_LEVEL_UP>
 	<EMAIL>
 		<uiIndex>0</uiIndex>
-		<Subject>Subject : None</Subject>
+		<Subject>Subject: None</Subject>
 		<Message>Message : None</Message>
 	</EMAIL>
 	<EMAIL>
 		<uiIndex>1</uiIndex>
-		<Subject>Subject : None</Subject>
+		<Subject>Subject: None</Subject>
 		<Message>Message : None</Message>
 	</EMAIL>
 	<EMAIL>
 		<uiIndex>2</uiIndex>
-		<Subject>Subject : None</Subject>
+		<Subject>Subject: None</Subject>
 		<Message>Message : None</Message>
 	</EMAIL>
 	<EMAIL>
 		<uiIndex>3</uiIndex>
-		<Subject>Subject : None</Subject>
+		<Subject>Subject: None</Subject>
 		<Message>Message : None</Message>
 	</EMAIL>
 	<EMAIL>
 		<uiIndex>4</uiIndex>
-		<Subject>Subject : None</Subject>
+		<Subject>Subject: None</Subject>
 		<Message>Message : None</Message>
 	</EMAIL>
 	<EMAIL>
 		<uiIndex>5</uiIndex>
-		<Subject>Subject : None</Subject>
+		<Subject>Subject: None</Subject>
 		<Message>Message : None</Message>
 	</EMAIL>
 	<EMAIL>
 		<uiIndex>6</uiIndex>
-		<Subject>Subject : None</Subject>
+		<Subject>Subject: None</Subject>
 		<Message>Message : None</Message>
 	</EMAIL>
 	<EMAIL>
 		<uiIndex>7</uiIndex>
-		<Subject>Subject : None</Subject>
+		<Subject>Subject: None</Subject>
 		<Message>Message : None</Message>
 	</EMAIL>
 	<EMAIL>
 		<uiIndex>8</uiIndex>
-		<Subject>Subject : None</Subject>
+		<Subject>Subject: None</Subject>
 		<Message>Message : None</Message>
 	</EMAIL>
 	<EMAIL>
 		<uiIndex>9</uiIndex>
-		<Subject>Subject : None</Subject>
+		<Subject>Subject: None</Subject>
 		<Message>Message : None</Message>
 	</EMAIL>
 	<EMAIL>
 		<uiIndex>10</uiIndex>
-		<Subject>Subject : None</Subject>
+		<Subject>Subject: None</Subject>
 		<Message>Message : None</Message>
 	</EMAIL>
 	<EMAIL>
 		<uiIndex>11</uiIndex>
-		<Subject>Subject : None</Subject>
+		<Subject>Subject: None</Subject>
 		<Message>Message : None</Message>
 	</EMAIL>
 	<EMAIL>
 		<uiIndex>12</uiIndex>
-		<Subject>Subject : None</Subject>
+		<Subject>Subject: None</Subject>
 		<Message>Message : None</Message>
 	</EMAIL>
 	<EMAIL>
 		<uiIndex>13</uiIndex>
-		<Subject>Subject : None</Subject>
+		<Subject>Subject: None</Subject>
 		<Message>Message : None</Message>
 	</EMAIL>
 	<EMAIL>
 		<uiIndex>14</uiIndex>
-		<Subject>Subject : None</Subject>
+		<Subject>Subject: None</Subject>
 		<Message>Message : None</Message>
 	</EMAIL>
 	<EMAIL>
 		<uiIndex>15</uiIndex>
-		<Subject>Subject : None</Subject>
+		<Subject>Subject: None</Subject>
 		<Message>Message : None</Message>
 	</EMAIL>
 	<EMAIL>
 		<uiIndex>16</uiIndex>
-		<Subject>Subject : None</Subject>
+		<Subject>Subject: None</Subject>
 		<Message>Message : None</Message>
 	</EMAIL>
 	<EMAIL>
 		<uiIndex>17</uiIndex>
-		<Subject>Subject : None</Subject>
+		<Subject>Subject: None</Subject>
 		<Message>Message : None</Message>
 	</EMAIL>
 	<EMAIL>
 		<uiIndex>18</uiIndex>
-		<Subject>Subject : None</Subject>
+		<Subject>Subject: None</Subject>
 		<Message>Message : None</Message>
 	</EMAIL>
 	<EMAIL>
 		<uiIndex>19</uiIndex>
-		<Subject>Subject : None</Subject>
+		<Subject>Subject: None</Subject>
 		<Message>Message : None</Message>
 	</EMAIL>
 	<EMAIL>
 		<uiIndex>20</uiIndex>
-		<Subject>Subject : None</Subject>
+		<Subject>Subject: None</Subject>
 		<Message>Message : None</Message>
 	</EMAIL>
 	<EMAIL>
 		<uiIndex>21</uiIndex>
-		<Subject>Subject : None</Subject>
+		<Subject>Subject: None</Subject>
 		<Message>Message : None</Message>
 	</EMAIL>
 	<EMAIL>
 		<uiIndex>22</uiIndex>
-		<Subject>Subject : None</Subject>
+		<Subject>Subject: None</Subject>
 		<Message>Message : None</Message>
 	</EMAIL>
 	<EMAIL>
 		<uiIndex>23</uiIndex>
-		<Subject>Subject : None</Subject>
+		<Subject>Subject: None</Subject>
 		<Message>Message : None</Message>
 	</EMAIL>
 	<EMAIL>
 		<uiIndex>24</uiIndex>
-		<Subject>Subject : None</Subject>
+		<Subject>Subject: None</Subject>
 		<Message>Message : None</Message>
 	</EMAIL>
 	<EMAIL>
 		<uiIndex>25</uiIndex>
-		<Subject>Subject : None</Subject>
+		<Subject>Subject: None</Subject>
 		<Message>Message : None</Message>
 	</EMAIL>
 	<EMAIL>
 		<uiIndex>26</uiIndex>
-		<Subject>Subject : None</Subject>
+		<Subject>Subject: None</Subject>
 		<Message>Message : None</Message>
 	</EMAIL>
 	<EMAIL>
 		<uiIndex>27</uiIndex>
-		<Subject>Subject : None</Subject>
+		<Subject>Subject: None</Subject>
 		<Message>Message : None</Message>
 	</EMAIL>
 	<EMAIL>
 		<uiIndex>28</uiIndex>
-		<Subject>Subject : None</Subject>
+		<Subject>Subject: None</Subject>
 		<Message>Message : None</Message>
 	</EMAIL>
 	<EMAIL>
 		<uiIndex>29</uiIndex>
-		<Subject>Subject : None</Subject>
+		<Subject>Subject: None</Subject>
 		<Message>Message : None</Message>
 	</EMAIL>
 	<EMAIL>
 		<uiIndex>30</uiIndex>
-		<Subject>Subject : None</Subject>
+		<Subject>Subject: None</Subject>
 		<Message>Message : None</Message>
 	</EMAIL>
 	<EMAIL>
 		<uiIndex>31</uiIndex>
-		<Subject>Subject : None</Subject>
+		<Subject>Subject: None</Subject>
 		<Message>Message : None</Message>
 	</EMAIL>
 	<EMAIL>
 		<uiIndex>32</uiIndex>
-		<Subject>Subject : None</Subject>
+		<Subject>Subject: None</Subject>
 		<Message>Message : None</Message>
 	</EMAIL>
 	<EMAIL>
 		<uiIndex>33</uiIndex>
-		<Subject>Subject : None</Subject>
+		<Subject>Subject: None</Subject>
 		<Message>Message : None</Message>
 	</EMAIL>
 	<EMAIL>
 		<uiIndex>34</uiIndex>
-		<Subject>Subject : None</Subject>
+		<Subject>Subject: None</Subject>
 		<Message>Message : None</Message>
 	</EMAIL>
 	<EMAIL>
 		<uiIndex>35</uiIndex>
-		<Subject>Subject : None</Subject>
+		<Subject>Subject: None</Subject>
 		<Message>Message : None</Message>
 	</EMAIL>
 	<EMAIL>
 		<uiIndex>36</uiIndex>
-		<Subject>Subject : None</Subject>
+		<Subject>Subject: None</Subject>
 		<Message>Message : None</Message>
 	</EMAIL>
 	<EMAIL>
 		<uiIndex>37</uiIndex>
-		<Subject>Subject : None</Subject>
+		<Subject>Subject: None</Subject>
 		<Message>Message : None</Message>
 	</EMAIL>
 	<EMAIL>
 		<uiIndex>38</uiIndex>
-		<Subject>Subject : None</Subject>
+		<Subject>Subject: None</Subject>
 		<Message>Message : None</Message>
 	</EMAIL>
 	<EMAIL>
 		<uiIndex>39</uiIndex>
-		<Subject>Subject : None</Subject>
+		<Subject>Subject: None</Subject>
 		<Message>Message : None</Message>
 	</EMAIL>
 	<EMAIL>
@@ -269,37 +278,37 @@
 	</EMAIL>
 	<EMAIL>
 		<uiIndex>51</uiIndex>
-		<Subject>Subject : None</Subject>
+		<Subject>Subject: None</Subject>
 		<Message>Message : None</Message>
 	</EMAIL>
 	<EMAIL>
 		<uiIndex>52</uiIndex>
-		<Subject>Subject : None</Subject>
+		<Subject>Subject: None</Subject>
 		<Message>Message : None</Message>
 	</EMAIL>
 	<EMAIL>
 		<uiIndex>53</uiIndex>
-		<Subject>Subject : None</Subject>
+		<Subject>Subject: None</Subject>
 		<Message>Message : None</Message>
 	</EMAIL>
 	<EMAIL>
 		<uiIndex>54</uiIndex>
-		<Subject>Subject : None</Subject>
+		<Subject>Subject: None</Subject>
 		<Message>Message : None</Message>
 	</EMAIL>
 	<EMAIL>
 		<uiIndex>55</uiIndex>
-		<Subject>Subject : None</Subject>
+		<Subject>Subject: None</Subject>
 		<Message>Message : None</Message>
 	</EMAIL>
 	<EMAIL>
 		<uiIndex>56</uiIndex>
-		<Subject>Subject : None</Subject>
+		<Subject>Subject: None</Subject>
 		<Message>Message : None</Message>
 	</EMAIL>
 	<EMAIL>
 		<uiIndex>57</uiIndex>
-		<Subject>Subject : None</Subject>
+		<Subject>Subject: None</Subject>
 		<Message>Message : None</Message>
 	</EMAIL>
 	<EMAIL>

gamedir/Data/TableData/Email/EmailSenderNameList.xml

@@ -231,11 +231,11 @@ Each A.I.M merc has an entry here in the file, mapped to a specific uiIndex.
 	</NAME>
 	<NAME>
 		<uiIndex>51</uiIndex>
-		<Name>None</Name>
+		<Name>Kerberus Inc</Name>
 	</NAME>
 	<NAME>
 		<uiIndex>52</uiIndex>
-		<Name>None</Name>
+		<Name>Angel DaSilva</Name>
 	</NAME>
 	<NAME>
 		<uiIndex>53</uiIndex>

gamedir/Data/TableData/FaceGear.xml

@@ -1095,8 +1095,8 @@
 	</ITEM>
 	<ITEM>
 		<uiIndex>212</uiIndex>
-		<Type>0</Type>
-		<szFile></szFile>
+		<Type>4</Type>
+		<szFile>FACES\FACESGEAR\Face_SunGoggles</szFile>
 	</ITEM>
 	<!-- Gas Mask -->
 	<ITEM>

gamedir/Data/TableData/Items/AmmoStrings.xml

@@ -107,8 +107,8 @@
 	</AMMO>
 	<AMMO>
 		<uiIndex>21</uiIndex>
-		<AmmoCaliber>12.7mm</AmmoCaliber>
-		<BRCaliber>12.7mm</BRCaliber>
+		<AmmoCaliber>12.7x108mm</AmmoCaliber>
+		<BRCaliber>12.7x108mm</BRCaliber>
 	</AMMO>
 	<AMMO>
 		<uiIndex>22</uiIndex>
@@ -122,8 +122,8 @@
 	</AMMO>
 	<AMMO>
 		<uiIndex>24</uiIndex>
-		<AmmoCaliber>7.62x54R</AmmoCaliber>
-		<BRCaliber>7.62x54R</BRCaliber>
+		<AmmoCaliber>7.62x54mmR</AmmoCaliber>
+		<BRCaliber>7.62x54mmR</BRCaliber>
 	</AMMO>
 	<AMMO>
 		<uiIndex>25</uiIndex>
@@ -137,8 +137,8 @@
 	</AMMO>
 	<AMMO>
 		<uiIndex>27</uiIndex>
-		<AmmoCaliber>10mm</AmmoCaliber>
-		<BRCaliber>10mm</BRCaliber>
+		<AmmoCaliber>10x25mm</AmmoCaliber>
+		<BRCaliber>10x25mm</BRCaliber>
 	</AMMO>
 	<AMMO>
 		<uiIndex>28</uiIndex>

gamedir/Data/TableData/Items/AmmoTypes.xml

@@ -1,4 +1,57 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!---
+	This xml defines the properties of different ammo types. 
+	
+	<uiIndex>			ammotype number. Referred to with <ubAmmoType> in Magazines.xml
+	<fontColour>		Colour used when displaying ammo count, taken from FONTS\\TINYFONT1.sti
+	
+	<grayed>			determines what picture to use for the ammo button (no, this doesn't make a lot of sense)
+	<offNormal>
+	<onNormal>
+	<structureImpactReductionMultiplier> / <structureImpactReductionDivisor>
+						modifies how much bullet damage is reduced when hitting a structure.
+						
+	<armourImpactReductionMultiplier> / <armourImpactReductionDivisor>
+						modifies protection value of body armour we hit with the bullet
+						
+	<beforeArmourDamageMultiplier> / <beforeArmourDamageDivisor>
+						modifies damage before armour is hit. Is only used if <highExplosive> is > 0
+	
+	<afterArmourDamageMultiplier> / <afterArmourDamageDivisor>
+						modifies damage after armour is hit. Not used against armed vehicles.
+						
+	<zeroMinimumDamage>	0/1 setting. If set to 1, bullet damage can be 0.
+	<usPiercePersonChanceModifier>
+						if > 0, extra chance for bullet to continue flying if gun isn't a rocket launcher or cannon (and bullet is still powerful enough)
+	<standardIssue>		0/1 setting. If set to 1, magazines  of this ammo are considered when determining ammo for the AI inventory.
+	<numberOfBullets>	number of projectiles fired per shot. If > 1, this is considered buckshot
+	
+	<multipleBulletDamageMultiplier> / <multipleBulletDamageDivisor>
+						modifies damage immediately when fired if > 1 projectile is fired per bullet
+						
+	<highExplosive>		number of explosive item used when exploding
+	<explosionSize>		explosion size: 0=none, 1=small, 2=medium, 3=large
+	<dart>				0/1 setting. If set to 1, damage dealt > 0, target is not an armed vehicle and is hit very accurate, target might be put to sleep.
+	<knife>				0/1 setting. If set to 1, target is seen by shooter, bullet is not a fragment, and this is a stealth attack, chance to instakill the target
+	<monsterSpit>		bullet gets increased damage according to creature gas items, can blind targets, damage head gear and spawn creature gas
+	<acidic>			0/1 setting. If set to 1, armour is destroyed 4 times as fast
+	<ignoreArmour>		0/1 setting. If set to 1, torso and leg armour is ignored
+	<lockBustingPower>	extra damage done to locks
+	<tracerEffect>		0/1 setting. If set to 1, bullets can be tracers. Flash suppressors don't work, not selected on AI single shot guns.
+	<spreadPattern />	spread pattern used from SpreadPatterns.xml
+	<temperatureModificator>	additive modifier for temperature generation. 1.0 means +100%
+	<dirtModificator>			additive modifier for dirt generation. 1.0 means +100%
+	<ammoflag>			flagmask for various ammo properties:
+							AMMO_CRYO			1			this ammo shock-freezes target (scifi)
+							AMMO_BLIND			2			this ammo will blind if it hits the head
+							AMMO_ANTIMATERIEL	4			this ammo is anti-materiel, bullets can destroy structures
+	<dDamageModifierLife>					multiplier for damage to health
+	<dDamageModifierBreath>					multiplier for damage to breath
+	<dDamageModifierTank>					additional multiplier for damage to health if target is a tank
+	<dDamageModifierArmouredVehicle>		additional multiplier for damage to health if target is not a tank but armed vehicle or robot
+	<dDamageModifierCivilianVehicle>		additional multiplier for damage to health if target is unarmed vehicle
+	<dDamageModifierZombie>					additional multiplier for damage to health if target is zombie
+-->	
 <AMMOTYPELIST>
 	<AMMOTYPE>
 		<uiIndex>0</uiIndex>
@@ -16,14 +69,13 @@
 		<afterArmourDamageMultiplier>1</afterArmourDamageMultiplier>
 		<afterArmourDamageDivisor>1</afterArmourDamageDivisor>
 		<zeroMinimumDamage>0</zeroMinimumDamage>
-		<canGoThrough>1</canGoThrough>
+		<usPiercePersonChanceModifier>1</usPiercePersonChanceModifier>
 		<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>
@@ -32,9 +84,15 @@
 		<lockBustingPower>0</lockBustingPower>
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
-		<temperatureModificator>1</temperatureModificator>
+		<temperatureModificator>0.0</temperatureModificator>
+		<dirtModificator>0.0</dirtModificator>
+		<ammoflag>0</ammoflag>
 		<dDamageModifierLife>1.0</dDamageModifierLife>
 		<dDamageModifierBreath>1.0</dDamageModifierBreath>
+		<dDamageModifierTank>0.0</dDamageModifierTank>
+		<dDamageModifierArmouredVehicle>0.0</dDamageModifierArmouredVehicle>
+		<dDamageModifierCivilianVehicle>1.0</dDamageModifierCivilianVehicle>
+		<dDamageModifierZombie>1.0</dDamageModifierZombie>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>1</uiIndex>
@@ -52,14 +110,13 @@
 		<afterArmourDamageMultiplier>17</afterArmourDamageMultiplier>
 		<afterArmourDamageDivisor>10</afterArmourDamageDivisor>
 		<zeroMinimumDamage>1</zeroMinimumDamage>
-		<canGoThrough>0</canGoThrough>
+		<usPiercePersonChanceModifier>0</usPiercePersonChanceModifier>
 		<standardIssue>0</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>
@@ -68,9 +125,15 @@
 		<lockBustingPower>0</lockBustingPower>
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
-		<temperatureModificator>1</temperatureModificator>
+		<temperatureModificator>-0.17</temperatureModificator>
+		<dirtModificator>0.1</dirtModificator>
+		<ammoflag>0</ammoflag>
 		<dDamageModifierLife>1.0</dDamageModifierLife>
 		<dDamageModifierBreath>1.0</dDamageModifierBreath>
+		<dDamageModifierTank>0.0</dDamageModifierTank>
+		<dDamageModifierArmouredVehicle>0.0</dDamageModifierArmouredVehicle>
+		<dDamageModifierCivilianVehicle>1.0</dDamageModifierCivilianVehicle>
+		<dDamageModifierZombie>1.0</dDamageModifierZombie>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>2</uiIndex>
@@ -88,14 +151,13 @@
 		<afterArmourDamageMultiplier>1</afterArmourDamageMultiplier>
 		<afterArmourDamageDivisor>1</afterArmourDamageDivisor>
 		<zeroMinimumDamage>0</zeroMinimumDamage>
-		<canGoThrough>1</canGoThrough>
+		<usPiercePersonChanceModifier>10</usPiercePersonChanceModifier>
 		<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>
@@ -104,9 +166,15 @@
 		<lockBustingPower>0</lockBustingPower>
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
-		<temperatureModificator>1</temperatureModificator>
+		<temperatureModificator>0.13</temperatureModificator>
+		<dirtModificator>0.2</dirtModificator>
+		<ammoflag>0</ammoflag>
 		<dDamageModifierLife>1.0</dDamageModifierLife>
 		<dDamageModifierBreath>1.0</dDamageModifierBreath>
+		<dDamageModifierTank>0.0</dDamageModifierTank>
+		<dDamageModifierArmouredVehicle>0.4</dDamageModifierArmouredVehicle>
+		<dDamageModifierCivilianVehicle>1.0</dDamageModifierCivilianVehicle>
+		<dDamageModifierZombie>1.0</dDamageModifierZombie>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>3</uiIndex>
@@ -124,14 +192,13 @@
 		<afterArmourDamageMultiplier>1</afterArmourDamageMultiplier>
 		<afterArmourDamageDivisor>1</afterArmourDamageDivisor>
 		<zeroMinimumDamage>0</zeroMinimumDamage>
-		<canGoThrough>1</canGoThrough>
+		<usPiercePersonChanceModifier>10</usPiercePersonChanceModifier>
 		<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>
@@ -140,9 +207,15 @@
 		<lockBustingPower>0</lockBustingPower>
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
-		<temperatureModificator>1</temperatureModificator>
+		<temperatureModificator>0.3</temperatureModificator>
+		<dirtModificator>0.2</dirtModificator>
+		<ammoflag>0</ammoflag>
 		<dDamageModifierLife>1.0</dDamageModifierLife>
 		<dDamageModifierBreath>1.0</dDamageModifierBreath>
+		<dDamageModifierTank>0.0</dDamageModifierTank>
+		<dDamageModifierArmouredVehicle>0.6</dDamageModifierArmouredVehicle>
+		<dDamageModifierCivilianVehicle>1.0</dDamageModifierCivilianVehicle>
+		<dDamageModifierZombie>1.0</dDamageModifierZombie>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>4</uiIndex>
@@ -160,14 +233,13 @@
 		<afterArmourDamageMultiplier>1</afterArmourDamageMultiplier>
 		<afterArmourDamageDivisor>1</afterArmourDamageDivisor>
 		<zeroMinimumDamage>1</zeroMinimumDamage>
-		<canGoThrough>1</canGoThrough>
+		<usPiercePersonChanceModifier>1</usPiercePersonChanceModifier>
 		<standardIssue>1</standardIssue>
 		<numberOfBullets>9</numberOfBullets>
 		<multipleBulletDamageMultiplier>1</multipleBulletDamageMultiplier>
 		<multipleBulletDamageDivisor>4</multipleBulletDamageDivisor>
 		<highExplosive>0</highExplosive>
 		<explosionSize>0</explosionSize>
-		<antiTank>0</antiTank>
 		<dart>0</dart>
 		<knife>0</knife>
 		<monsterSpit>0</monsterSpit>
@@ -175,10 +247,16 @@
 		<ignoreArmour>0</ignoreArmour>
 		<lockBustingPower>0</lockBustingPower>
 		<tracerEffect>0</tracerEffect>
-		<spreadPattern />
-		<temperatureModificator>1</temperatureModificator>
+		<spreadPattern>Buckshot</spreadPattern>
+		<temperatureModificator>0.0</temperatureModificator>
+		<dirtModificator>0.0</dirtModificator>
+		<ammoflag>0</ammoflag>
 		<dDamageModifierLife>1.0</dDamageModifierLife>
 		<dDamageModifierBreath>1.0</dDamageModifierBreath>
+		<dDamageModifierTank>0.0</dDamageModifierTank>
+		<dDamageModifierArmouredVehicle>0.0</dDamageModifierArmouredVehicle>
+		<dDamageModifierCivilianVehicle>1.0</dDamageModifierCivilianVehicle>
+		<dDamageModifierZombie>1.0</dDamageModifierZombie>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>5</uiIndex>
@@ -196,14 +274,13 @@
 		<afterArmourDamageMultiplier>1</afterArmourDamageMultiplier>
 		<afterArmourDamageDivisor>1</afterArmourDamageDivisor>
 		<zeroMinimumDamage>0</zeroMinimumDamage>
-		<canGoThrough>1</canGoThrough>
+		<usPiercePersonChanceModifier>50</usPiercePersonChanceModifier>
 		<standardIssue>0</standardIssue>
 		<numberOfBullets>6</numberOfBullets>
 		<multipleBulletDamageMultiplier>1</multipleBulletDamageMultiplier>
 		<multipleBulletDamageDivisor>3</multipleBulletDamageDivisor>
 		<highExplosive>0</highExplosive>
 		<explosionSize>0</explosionSize>
-		<antiTank>0</antiTank>
 		<dart>0</dart>
 		<knife>0</knife>
 		<monsterSpit>0</monsterSpit>
@@ -211,10 +288,16 @@
 		<ignoreArmour>0</ignoreArmour>
 		<lockBustingPower>0</lockBustingPower>
 		<tracerEffect>0</tracerEffect>
-		<spreadPattern />
-		<temperatureModificator>1</temperatureModificator>
+		<spreadPattern>Flechette</spreadPattern>
+		<temperatureModificator>0.03</temperatureModificator>
+		<dirtModificator>-0.25</dirtModificator>
+		<ammoflag>0</ammoflag>
 		<dDamageModifierLife>1.0</dDamageModifierLife>
 		<dDamageModifierBreath>1.0</dDamageModifierBreath>
+		<dDamageModifierTank>0.0</dDamageModifierTank>
+		<dDamageModifierArmouredVehicle>0.0</dDamageModifierArmouredVehicle>
+		<dDamageModifierCivilianVehicle>1.0</dDamageModifierCivilianVehicle>
+		<dDamageModifierZombie>1.0</dDamageModifierZombie>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>6</uiIndex>
@@ -232,14 +315,13 @@
 		<afterArmourDamageMultiplier>1</afterArmourDamageMultiplier>
 		<afterArmourDamageDivisor>1</afterArmourDamageDivisor>
 		<zeroMinimumDamage>0</zeroMinimumDamage>
-		<canGoThrough>0</canGoThrough>
+		<usPiercePersonChanceModifier>0</usPiercePersonChanceModifier>
 		<standardIssue>0</standardIssue>
 		<numberOfBullets>1</numberOfBullets>
 		<multipleBulletDamageMultiplier>1</multipleBulletDamageMultiplier>
 		<multipleBulletDamageDivisor>1</multipleBulletDamageDivisor>
 		<highExplosive>1</highExplosive>
 		<explosionSize>2</explosionSize>
-		<antiTank>0</antiTank>
 		<dart>0</dart>
 		<knife>0</knife>
 		<monsterSpit>0</monsterSpit>
@@ -248,9 +330,15 @@
 		<lockBustingPower>0</lockBustingPower>
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
-		<temperatureModificator>1</temperatureModificator>
+		<temperatureModificator>0.08</temperatureModificator>
+		<dirtModificator>0.0</dirtModificator>
+		<ammoflag>0</ammoflag>
 		<dDamageModifierLife>1.0</dDamageModifierLife>
 		<dDamageModifierBreath>1.0</dDamageModifierBreath>
+		<dDamageModifierTank>0.0</dDamageModifierTank>
+		<dDamageModifierArmouredVehicle>0.5</dDamageModifierArmouredVehicle>
+		<dDamageModifierCivilianVehicle>1.0</dDamageModifierCivilianVehicle>
+		<dDamageModifierZombie>1.0</dDamageModifierZombie>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>7</uiIndex>
@@ -268,14 +356,13 @@
 		<afterArmourDamageMultiplier>1</afterArmourDamageMultiplier>
 		<afterArmourDamageDivisor>1</afterArmourDamageDivisor>
 		<zeroMinimumDamage>0</zeroMinimumDamage>
-		<canGoThrough>0</canGoThrough>
+		<usPiercePersonChanceModifier>0</usPiercePersonChanceModifier>
 		<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>1</monsterSpit>
@@ -284,9 +371,15 @@
 		<lockBustingPower>0</lockBustingPower>
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
-		<temperatureModificator>1</temperatureModificator>
+		<temperatureModificator>0.0</temperatureModificator>
+		<dirtModificator>0.0</dirtModificator>
+		<ammoflag>0</ammoflag>
 		<dDamageModifierLife>1.0</dDamageModifierLife>
 		<dDamageModifierBreath>1.0</dDamageModifierBreath>
+		<dDamageModifierTank>0.0</dDamageModifierTank>
+		<dDamageModifierArmouredVehicle>0.0</dDamageModifierArmouredVehicle>
+		<dDamageModifierCivilianVehicle>0.0</dDamageModifierCivilianVehicle>
+		<dDamageModifierZombie>1.0</dDamageModifierZombie>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>8</uiIndex>
@@ -304,14 +397,13 @@
 		<afterArmourDamageMultiplier>1</afterArmourDamageMultiplier>
 		<afterArmourDamageDivisor>1</afterArmourDamageDivisor>
 		<zeroMinimumDamage>0</zeroMinimumDamage>
-		<canGoThrough>0</canGoThrough>
+		<usPiercePersonChanceModifier>0</usPiercePersonChanceModifier>
 		<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>1</knife>
 		<monsterSpit>0</monsterSpit>
@@ -320,9 +412,15 @@
 		<lockBustingPower>0</lockBustingPower>
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
-		<temperatureModificator>1</temperatureModificator>
+		<temperatureModificator>0.0</temperatureModificator>
+		<dirtModificator>0.0</dirtModificator>
+		<ammoflag>0</ammoflag>
 		<dDamageModifierLife>1.0</dDamageModifierLife>
 		<dDamageModifierBreath>1.0</dDamageModifierBreath>
+		<dDamageModifierTank>0.0</dDamageModifierTank>
+		<dDamageModifierArmouredVehicle>0.0</dDamageModifierArmouredVehicle>
+		<dDamageModifierCivilianVehicle>0.0</dDamageModifierCivilianVehicle>
+		<dDamageModifierZombie>1.0</dDamageModifierZombie>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>9</uiIndex>
@@ -340,14 +438,13 @@
 		<afterArmourDamageMultiplier>1</afterArmourDamageMultiplier>
 		<afterArmourDamageDivisor>1</afterArmourDamageDivisor>
 		<zeroMinimumDamage>0</zeroMinimumDamage>
-		<canGoThrough>0</canGoThrough>
+		<usPiercePersonChanceModifier>0</usPiercePersonChanceModifier>
 		<standardIssue>1</standardIssue>
 		<numberOfBullets>1</numberOfBullets>
 		<multipleBulletDamageMultiplier>1</multipleBulletDamageMultiplier>
 		<multipleBulletDamageDivisor>1</multipleBulletDamageDivisor>
 		<highExplosive>1</highExplosive>
 		<explosionSize>1</explosionSize>
-		<antiTank>0</antiTank>
 		<dart>0</dart>
 		<knife>0</knife>
 		<monsterSpit>0</monsterSpit>
@@ -356,9 +453,15 @@
 		<lockBustingPower>0</lockBustingPower>
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
-		<temperatureModificator>1</temperatureModificator>
+		<temperatureModificator>0.15</temperatureModificator>
+		<dirtModificator>0.0</dirtModificator>
+		<ammoflag>0</ammoflag>
 		<dDamageModifierLife>1.0</dDamageModifierLife>
 		<dDamageModifierBreath>1.0</dDamageModifierBreath>
+		<dDamageModifierTank>0.0</dDamageModifierTank>
+		<dDamageModifierArmouredVehicle>0.0</dDamageModifierArmouredVehicle>
+		<dDamageModifierCivilianVehicle>1.0</dDamageModifierCivilianVehicle>
+		<dDamageModifierZombie>1.0</dDamageModifierZombie>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>10</uiIndex>
@@ -376,14 +479,13 @@
 		<afterArmourDamageMultiplier>1</afterArmourDamageMultiplier>
 		<afterArmourDamageDivisor>1</afterArmourDamageDivisor>
 		<zeroMinimumDamage>0</zeroMinimumDamage>
-		<canGoThrough>0</canGoThrough>
+		<usPiercePersonChanceModifier>0</usPiercePersonChanceModifier>
 		<standardIssue>0</standardIssue>
 		<numberOfBullets>1</numberOfBullets>
 		<multipleBulletDamageMultiplier>1</multipleBulletDamageMultiplier>
 		<multipleBulletDamageDivisor>1</multipleBulletDamageDivisor>
 		<highExplosive>1</highExplosive>
 		<explosionSize>1</explosionSize>
-		<antiTank>1</antiTank>
 		<dart>0</dart>
 		<knife>0</knife>
 		<monsterSpit>0</monsterSpit>
@@ -392,9 +494,15 @@
 		<lockBustingPower>0</lockBustingPower>
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
-		<temperatureModificator>1</temperatureModificator>
+		<temperatureModificator>0.3</temperatureModificator>
+		<dirtModificator>0.4</dirtModificator>
+		<ammoflag>0</ammoflag>
 		<dDamageModifierLife>1.0</dDamageModifierLife>
 		<dDamageModifierBreath>1.0</dDamageModifierBreath>
+		<dDamageModifierTank>1.0</dDamageModifierTank>
+		<dDamageModifierArmouredVehicle>0.75</dDamageModifierArmouredVehicle>
+		<dDamageModifierCivilianVehicle>1.0</dDamageModifierCivilianVehicle>
+		<dDamageModifierZombie>1.0</dDamageModifierZombie>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>11</uiIndex>
@@ -412,14 +520,13 @@
 		<afterArmourDamageMultiplier>1</afterArmourDamageMultiplier>
 		<afterArmourDamageDivisor>1</afterArmourDamageDivisor>
 		<zeroMinimumDamage>1</zeroMinimumDamage>
-		<canGoThrough>0</canGoThrough>
+		<usPiercePersonChanceModifier>0</usPiercePersonChanceModifier>
 		<standardIssue>1</standardIssue>
 		<numberOfBullets>1</numberOfBullets>
 		<multipleBulletDamageMultiplier>1</multipleBulletDamageMultiplier>
 		<multipleBulletDamageDivisor>1</multipleBulletDamageDivisor>
 		<highExplosive>0</highExplosive>
 		<explosionSize>0</explosionSize>
-		<antiTank>0</antiTank>
 		<dart>1</dart>
 		<knife>0</knife>
 		<monsterSpit>0</monsterSpit>
@@ -428,9 +535,15 @@
 		<lockBustingPower>0</lockBustingPower>
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
-		<temperatureModificator>1</temperatureModificator>
+		<temperatureModificator>-0.1</temperatureModificator>
+		<dirtModificator>-0.5</dirtModificator>
+		<ammoflag>0</ammoflag>
 		<dDamageModifierLife>1.0</dDamageModifierLife>
 		<dDamageModifierBreath>1.0</dDamageModifierBreath>
+		<dDamageModifierTank>0.0</dDamageModifierTank>
+		<dDamageModifierArmouredVehicle>0.0</dDamageModifierArmouredVehicle>
+		<dDamageModifierCivilianVehicle>0.0</dDamageModifierCivilianVehicle>
+		<dDamageModifierZombie>1.0</dDamageModifierZombie>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>12</uiIndex>
@@ -448,14 +561,13 @@
 		<afterArmourDamageMultiplier>1</afterArmourDamageMultiplier>
 		<afterArmourDamageDivisor>1</afterArmourDamageDivisor>
 		<zeroMinimumDamage>0</zeroMinimumDamage>
-		<canGoThrough>1</canGoThrough>
+		<usPiercePersonChanceModifier>1</usPiercePersonChanceModifier>
 		<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>
@@ -464,9 +576,15 @@
 		<lockBustingPower>0</lockBustingPower>
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
-		<temperatureModificator>1</temperatureModificator>
+		<temperatureModificator>0.5</temperatureModificator>
+		<dirtModificator>0.8</dirtModificator>
+		<ammoflag>0</ammoflag>
 		<dDamageModifierLife>1.0</dDamageModifierLife>
 		<dDamageModifierBreath>1.0</dDamageModifierBreath>
+		<dDamageModifierTank>0.0</dDamageModifierTank>
+		<dDamageModifierArmouredVehicle>0.0</dDamageModifierArmouredVehicle>
+		<dDamageModifierCivilianVehicle>0.0</dDamageModifierCivilianVehicle>
+		<dDamageModifierZombie>1.0</dDamageModifierZombie>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>13</uiIndex>
@@ -484,14 +602,13 @@
 		<afterArmourDamageMultiplier>17</afterArmourDamageMultiplier>
 		<afterArmourDamageDivisor>10</afterArmourDamageDivisor>
 		<zeroMinimumDamage>0</zeroMinimumDamage>
-		<canGoThrough>1</canGoThrough>
+		<usPiercePersonChanceModifier>5</usPiercePersonChanceModifier>
 		<standardIssue>0</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>
@@ -500,9 +617,15 @@
 		<lockBustingPower>0</lockBustingPower>
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
-		<temperatureModificator>1</temperatureModificator>
+		<temperatureModificator>0.35</temperatureModificator>
+		<dirtModificator>0.3</dirtModificator>
+		<ammoflag>0</ammoflag>
 		<dDamageModifierLife>1.0</dDamageModifierLife>
 		<dDamageModifierBreath>1.0</dDamageModifierBreath>
+		<dDamageModifierTank>0.0</dDamageModifierTank>
+		<dDamageModifierArmouredVehicle>0.5</dDamageModifierArmouredVehicle>
+		<dDamageModifierCivilianVehicle>1.0</dDamageModifierCivilianVehicle>
+		<dDamageModifierZombie>1.0</dDamageModifierZombie>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>14</uiIndex>
@@ -520,14 +643,13 @@
 		<afterArmourDamageMultiplier>30</afterArmourDamageMultiplier>
 		<afterArmourDamageDivisor>10</afterArmourDamageDivisor>
 		<zeroMinimumDamage>1</zeroMinimumDamage>
-		<canGoThrough>0</canGoThrough>
+		<usPiercePersonChanceModifier>0</usPiercePersonChanceModifier>
 		<standardIssue>0</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>
@@ -536,9 +658,15 @@
 		<lockBustingPower>0</lockBustingPower>
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
-		<temperatureModificator>1</temperatureModificator>
+		<temperatureModificator>-0.2</temperatureModificator>
+		<dirtModificator>0.08</dirtModificator>
+		<ammoflag>0</ammoflag>
 		<dDamageModifierLife>1.0</dDamageModifierLife>
 		<dDamageModifierBreath>1.0</dDamageModifierBreath>
+		<dDamageModifierTank>0.0</dDamageModifierTank>
+		<dDamageModifierArmouredVehicle>0.0</dDamageModifierArmouredVehicle>
+		<dDamageModifierCivilianVehicle>0.3</dDamageModifierCivilianVehicle>
+		<dDamageModifierZombie>1.0</dDamageModifierZombie>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>15</uiIndex>
@@ -556,14 +684,13 @@
 		<afterArmourDamageMultiplier>1</afterArmourDamageMultiplier>
 		<afterArmourDamageDivisor>1</afterArmourDamageDivisor>
 		<zeroMinimumDamage>0</zeroMinimumDamage>
-		<canGoThrough>1</canGoThrough>
+		<usPiercePersonChanceModifier>1</usPiercePersonChanceModifier>
 		<standardIssue>0</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>
@@ -572,9 +699,15 @@
 		<lockBustingPower>0</lockBustingPower>
 		<tracerEffect>1</tracerEffect>
 		<spreadPattern />
-		<temperatureModificator>1</temperatureModificator>
+		<temperatureModificator>0.25</temperatureModificator>
+		<dirtModificator>0.4</dirtModificator>
+		<ammoflag>0</ammoflag>
 		<dDamageModifierLife>1.0</dDamageModifierLife>
 		<dDamageModifierBreath>1.0</dDamageModifierBreath>
+		<dDamageModifierTank>0.0</dDamageModifierTank>
+		<dDamageModifierArmouredVehicle>0.0</dDamageModifierArmouredVehicle>
+		<dDamageModifierCivilianVehicle>1.0</dDamageModifierCivilianVehicle>
+		<dDamageModifierZombie>1.0</dDamageModifierZombie>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>16</uiIndex>
@@ -592,14 +725,13 @@
 		<afterArmourDamageMultiplier>1</afterArmourDamageMultiplier>
 		<afterArmourDamageDivisor>1</afterArmourDamageDivisor>
 		<zeroMinimumDamage>0</zeroMinimumDamage>
-		<canGoThrough>1</canGoThrough>
+		<usPiercePersonChanceModifier>10</usPiercePersonChanceModifier>
 		<standardIssue>0</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>
@@ -608,9 +740,15 @@
 		<lockBustingPower>0</lockBustingPower>
 		<tracerEffect>1</tracerEffect>
 		<spreadPattern />
-		<temperatureModificator>1</temperatureModificator>
+		<temperatureModificator>0.35</temperatureModificator>
+		<dirtModificator>0.5</dirtModificator>
+		<ammoflag>0</ammoflag>
 		<dDamageModifierLife>1.0</dDamageModifierLife>
 		<dDamageModifierBreath>1.0</dDamageModifierBreath>
+		<dDamageModifierTank>0.0</dDamageModifierTank>
+		<dDamageModifierArmouredVehicle>0.4</dDamageModifierArmouredVehicle>
+		<dDamageModifierCivilianVehicle>1.0</dDamageModifierCivilianVehicle>
+		<dDamageModifierZombie>1.0</dDamageModifierZombie>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>17</uiIndex>
@@ -628,14 +766,13 @@
 		<afterArmourDamageMultiplier>1</afterArmourDamageMultiplier>
 		<afterArmourDamageDivisor>1</afterArmourDamageDivisor>
 		<zeroMinimumDamage>0</zeroMinimumDamage>
-		<canGoThrough>1</canGoThrough>
+		<usPiercePersonChanceModifier>5</usPiercePersonChanceModifier>
 		<standardIssue>0</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>
@@ -644,9 +781,15 @@
 		<lockBustingPower>0</lockBustingPower>
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
-		<temperatureModificator>1</temperatureModificator>
+		<temperatureModificator>0.08</temperatureModificator>
+		<dirtModificator>0.15</dirtModificator>
+		<ammoflag>0</ammoflag>
 		<dDamageModifierLife>1.0</dDamageModifierLife>
 		<dDamageModifierBreath>1.0</dDamageModifierBreath>
+		<dDamageModifierTank>0.0</dDamageModifierTank>
+		<dDamageModifierArmouredVehicle>0.0</dDamageModifierArmouredVehicle>
+		<dDamageModifierCivilianVehicle>1.0</dDamageModifierCivilianVehicle>
+		<dDamageModifierZombie>1.0</dDamageModifierZombie>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>18</uiIndex>
@@ -664,14 +807,13 @@
 		<afterArmourDamageMultiplier>1</afterArmourDamageMultiplier>
 		<afterArmourDamageDivisor>1</afterArmourDamageDivisor>
 		<zeroMinimumDamage>0</zeroMinimumDamage>
-		<canGoThrough>1</canGoThrough>
+		<usPiercePersonChanceModifier>15</usPiercePersonChanceModifier>
 		<standardIssue>0</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>
@@ -680,9 +822,15 @@
 		<lockBustingPower>0</lockBustingPower>
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
-		<temperatureModificator>1</temperatureModificator>
+		<temperatureModificator>0.18</temperatureModificator>
+		<dirtModificator>0.35</dirtModificator>
+		<ammoflag>0</ammoflag>
 		<dDamageModifierLife>1.0</dDamageModifierLife>
 		<dDamageModifierBreath>1.0</dDamageModifierBreath>
+		<dDamageModifierTank>0.0</dDamageModifierTank>
+		<dDamageModifierArmouredVehicle>0.4</dDamageModifierArmouredVehicle>
+		<dDamageModifierCivilianVehicle>1.0</dDamageModifierCivilianVehicle>
+		<dDamageModifierZombie>1.0</dDamageModifierZombie>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>19</uiIndex>
@@ -700,14 +848,13 @@
 		<afterArmourDamageMultiplier>95</afterArmourDamageMultiplier>
 		<afterArmourDamageDivisor>100</afterArmourDamageDivisor>
 		<zeroMinimumDamage>0</zeroMinimumDamage>
-		<canGoThrough>1</canGoThrough>
+		<usPiercePersonChanceModifier>1</usPiercePersonChanceModifier>
 		<standardIssue>0</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>
@@ -716,9 +863,15 @@
 		<lockBustingPower>0</lockBustingPower>
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
-		<temperatureModificator>1</temperatureModificator>
+		<temperatureModificator>-0.1</temperatureModificator>
+		<dirtModificator>-0.15</dirtModificator>
+		<ammoflag>0</ammoflag>
 		<dDamageModifierLife>1.0</dDamageModifierLife>
 		<dDamageModifierBreath>1.0</dDamageModifierBreath>
+		<dDamageModifierTank>0.0</dDamageModifierTank>
+		<dDamageModifierArmouredVehicle>0.0</dDamageModifierArmouredVehicle>
+		<dDamageModifierCivilianVehicle>1.0</dDamageModifierCivilianVehicle>
+		<dDamageModifierZombie>1.0</dDamageModifierZombie>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>20</uiIndex>
@@ -736,14 +889,13 @@
 		<afterArmourDamageMultiplier>16</afterArmourDamageMultiplier>
 		<afterArmourDamageDivisor>10</afterArmourDamageDivisor>
 		<zeroMinimumDamage>1</zeroMinimumDamage>
-		<canGoThrough>0</canGoThrough>
+		<usPiercePersonChanceModifier>0</usPiercePersonChanceModifier>
 		<standardIssue>0</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>
@@ -752,9 +904,15 @@
 		<lockBustingPower>0</lockBustingPower>
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
-		<temperatureModificator>1</temperatureModificator>
+		<temperatureModificator>-0.15</temperatureModificator>
+		<dirtModificator>-0.05</dirtModificator>
+		<ammoflag>0</ammoflag>
 		<dDamageModifierLife>1.0</dDamageModifierLife>
 		<dDamageModifierBreath>1.0</dDamageModifierBreath>
+		<dDamageModifierTank>0.0</dDamageModifierTank>
+		<dDamageModifierArmouredVehicle>0.0</dDamageModifierArmouredVehicle>
+		<dDamageModifierCivilianVehicle>1.0</dDamageModifierCivilianVehicle>
+		<dDamageModifierZombie>1.0</dDamageModifierZombie>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>21</uiIndex>
@@ -772,14 +930,13 @@
 		<afterArmourDamageMultiplier>75</afterArmourDamageMultiplier>
 		<afterArmourDamageDivisor>100</afterArmourDamageDivisor>
 		<zeroMinimumDamage>0</zeroMinimumDamage>
-		<canGoThrough>1</canGoThrough>
+		<usPiercePersonChanceModifier>5</usPiercePersonChanceModifier>
 		<standardIssue>0</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>
@@ -788,9 +945,15 @@
 		<lockBustingPower>0</lockBustingPower>
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
-		<temperatureModificator>1</temperatureModificator>
+		<temperatureModificator>0.04</temperatureModificator>
+		<dirtModificator>0.1</dirtModificator>
+		<ammoflag>0</ammoflag>
 		<dDamageModifierLife>1.0</dDamageModifierLife>
 		<dDamageModifierBreath>1.0</dDamageModifierBreath>
+		<dDamageModifierTank>0.0</dDamageModifierTank>
+		<dDamageModifierArmouredVehicle>0.2</dDamageModifierArmouredVehicle>
+		<dDamageModifierCivilianVehicle>1.0</dDamageModifierCivilianVehicle>
+		<dDamageModifierZombie>1.0</dDamageModifierZombie>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>22</uiIndex>
@@ -808,14 +971,13 @@
 		<afterArmourDamageMultiplier>75</afterArmourDamageMultiplier>
 		<afterArmourDamageDivisor>100</afterArmourDamageDivisor>
 		<zeroMinimumDamage>0</zeroMinimumDamage>
-		<canGoThrough>1</canGoThrough>
+		<usPiercePersonChanceModifier>10</usPiercePersonChanceModifier>
 		<standardIssue>0</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>
@@ -824,9 +986,15 @@
 		<lockBustingPower>0</lockBustingPower>
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
-		<temperatureModificator>1</temperatureModificator>
+		<temperatureModificator>0.07</temperatureModificator>
+		<dirtModificator>0.1</dirtModificator>
+		<ammoflag>0</ammoflag>
 		<dDamageModifierLife>1.0</dDamageModifierLife>
 		<dDamageModifierBreath>1.0</dDamageModifierBreath>
+		<dDamageModifierTank>0.0</dDamageModifierTank>
+		<dDamageModifierArmouredVehicle>0.3</dDamageModifierArmouredVehicle>
+		<dDamageModifierCivilianVehicle>1.0</dDamageModifierCivilianVehicle>
+		<dDamageModifierZombie>1.0</dDamageModifierZombie>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>23</uiIndex>
@@ -844,14 +1012,13 @@
 		<afterArmourDamageMultiplier>26</afterArmourDamageMultiplier>
 		<afterArmourDamageDivisor>10</afterArmourDamageDivisor>
 		<zeroMinimumDamage>1</zeroMinimumDamage>
-		<canGoThrough>0</canGoThrough>
+		<usPiercePersonChanceModifier>0</usPiercePersonChanceModifier>
 		<standardIssue>0</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>
@@ -860,9 +1027,15 @@
 		<lockBustingPower>0</lockBustingPower>
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
-		<temperatureModificator>1</temperatureModificator>
+		<temperatureModificator>-0.05</temperatureModificator>
+		<dirtModificator>-0.1</dirtModificator>
+		<ammoflag>0</ammoflag>
 		<dDamageModifierLife>1.0</dDamageModifierLife>
 		<dDamageModifierBreath>1.0</dDamageModifierBreath>
+		<dDamageModifierTank>0.0</dDamageModifierTank>
+		<dDamageModifierArmouredVehicle>0.0</dDamageModifierArmouredVehicle>
+		<dDamageModifierCivilianVehicle>1.0</dDamageModifierCivilianVehicle>
+		<dDamageModifierZombie>1.0</dDamageModifierZombie>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>24</uiIndex>
@@ -880,14 +1053,13 @@
 		<afterArmourDamageMultiplier>26</afterArmourDamageMultiplier>
 		<afterArmourDamageDivisor>10</afterArmourDamageDivisor>
 		<zeroMinimumDamage>1</zeroMinimumDamage>
-		<canGoThrough>0</canGoThrough>
+		<usPiercePersonChanceModifier>0</usPiercePersonChanceModifier>
 		<standardIssue>0</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>
@@ -896,9 +1068,15 @@
 		<lockBustingPower>0</lockBustingPower>
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
-		<temperatureModificator>1</temperatureModificator>
+		<temperatureModificator>0.13</temperatureModificator>
+		<dirtModificator>0.03</dirtModificator>
+		<ammoflag>0</ammoflag>
 		<dDamageModifierLife>1.0</dDamageModifierLife>
 		<dDamageModifierBreath>1.0</dDamageModifierBreath>
+		<dDamageModifierTank>0.0</dDamageModifierTank>
+		<dDamageModifierArmouredVehicle>0.0</dDamageModifierArmouredVehicle>
+		<dDamageModifierCivilianVehicle>1.0</dDamageModifierCivilianVehicle>
+		<dDamageModifierZombie>1.0</dDamageModifierZombie>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>25</uiIndex>
@@ -916,14 +1094,13 @@
 		<afterArmourDamageMultiplier>1</afterArmourDamageMultiplier>
 		<afterArmourDamageDivisor>1</afterArmourDamageDivisor>
 		<zeroMinimumDamage>0</zeroMinimumDamage>
-		<canGoThrough>0</canGoThrough>
+		<usPiercePersonChanceModifier>0</usPiercePersonChanceModifier>
 		<standardIssue>0</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>
@@ -932,9 +1109,15 @@
 		<lockBustingPower>100</lockBustingPower>
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
-		<temperatureModificator>1</temperatureModificator>
+		<temperatureModificator>0.06</temperatureModificator>
+		<dirtModificator>0.35</dirtModificator>
+		<ammoflag>0</ammoflag>
 		<dDamageModifierLife>1.0</dDamageModifierLife>
 		<dDamageModifierBreath>1.0</dDamageModifierBreath>
+		<dDamageModifierTank>0.0</dDamageModifierTank>
+		<dDamageModifierArmouredVehicle>0.3</dDamageModifierArmouredVehicle>
+		<dDamageModifierCivilianVehicle>1.0</dDamageModifierCivilianVehicle>
+		<dDamageModifierZombie>1.0</dDamageModifierZombie>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>26</uiIndex>
@@ -944,7 +1127,7 @@
 		<offNormal>21</offNormal>
 		<onNormal>23</onNormal>
 		<structureImpactReductionMultiplier>1</structureImpactReductionMultiplier>
-		<structureImpactReductionDivisor>2</structureImpactReductionDivisor>
+		<structureImpactReductionDivisor>4</structureImpactReductionDivisor>
 		<armourImpactReductionMultiplier>1</armourImpactReductionMultiplier>
 		<armourImpactReductionDivisor>2</armourImpactReductionDivisor>
 		<beforeArmourDamageMultiplier>3</beforeArmourDamageMultiplier>
@@ -952,14 +1135,13 @@
 		<afterArmourDamageMultiplier>1</afterArmourDamageMultiplier>
 		<afterArmourDamageDivisor>1</afterArmourDamageDivisor>
 		<zeroMinimumDamage>0</zeroMinimumDamage>
-		<canGoThrough>1</canGoThrough>
+		<usPiercePersonChanceModifier>60</usPiercePersonChanceModifier>
 		<standardIssue>0</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>
@@ -968,8 +1150,14 @@
 		<lockBustingPower>0</lockBustingPower>
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
-		<temperatureModificator>1</temperatureModificator>
+		<temperatureModificator>0.23</temperatureModificator>
+		<dirtModificator>0.27</dirtModificator>
+		<ammoflag>0</ammoflag>
 		<dDamageModifierLife>1.0</dDamageModifierLife>
 		<dDamageModifierBreath>1.0</dDamageModifierBreath>
+		<dDamageModifierTank>0.0</dDamageModifierTank>
+		<dDamageModifierArmouredVehicle>0.8</dDamageModifierArmouredVehicle>
+		<dDamageModifierCivilianVehicle>1.0</dDamageModifierCivilianVehicle>
+		<dDamageModifierZombie>1.0</dDamageModifierZombie>
 	</AMMOTYPE>
 </AMMOTYPELIST>

gamedir/Data/TableData/Items/Clothes.xml

@@ -24,7 +24,12 @@
 -->
 
 <CLOTHESLIST>
-	
+	<CLOTHES>
+		<uiIndex>0</uiIndex>
+		<szName>None</szName>
+		<Vest />
+		<Pants />
+	</CLOTHES>
 	<CLOTHES>
     <uiIndex>1</uiIndex>
 		<szName>YELLOWVEST</szName>

gamedir/Data/TableData/Items/ExplosionData.xml

@@ -97,7 +97,7 @@
 		<DamageKeyFrame>18</DamageKeyFrame>
 		<ExplosionSoundID>286</ExplosionSoundID>
 		<AltExplosionSoundID>-1</AltExplosionSoundID>
-		<BlastFilename>TILECACHE\FLAM_EXP.STI</BlastFilename>
+		<BlastFilename>TILECACHE\ZGRAV_C.STI</BlastFilename>
 		<BlastSpeed>80</BlastSpeed>
 	</EXPDATA>
 	<EXPDATA>

gamedir/Data/TableData/Items/Food.xml

@@ -1,11 +1,290 @@
 <FOODSLIST>
 	<FOOD>
 		<uiIndex>0</uiIndex>
-		<szName>None</szName>
+		<szName>(none)</szName>
 		<bFoodPoints>0</bFoodPoints>
 		<bDrinkPoints>0</bDrinkPoints>
-		<ubPortionSize>0</ubPortionSize>
-		<bMoraleMod>0</bMoraleMod>
+		<usDecayRate>0</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>1</uiIndex>
+		<szName>Canteen</szName>
+		<bFoodPoints>0</bFoodPoints>
+		<bDrinkPoints>2000</bDrinkPoints>
+		<usDecayRate>0</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>2</uiIndex>
+		<szName>Alcohol</szName>
+		<bFoodPoints>0</bFoodPoints>
+		<bDrinkPoints>6000</bDrinkPoints>
+		<usDecayRate>0</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>3</uiIndex>
+		<szName>Beer</szName>
+		<bFoodPoints>0</bFoodPoints>
+		<bDrinkPoints>2200</bDrinkPoints>
+		<usDecayRate>0</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>4</uiIndex>
+		<szName>Wine</szName>
+		<bFoodPoints>0</bFoodPoints>
+		<bDrinkPoints>4400</bDrinkPoints>
+		<usDecayRate>0</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>5</uiIndex>
+		<szName>Calory bars</szName>
+		<bFoodPoints>150</bFoodPoints>
+		<bDrinkPoints>0</bDrinkPoints>
+		<usDecayRate>0</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>6</uiIndex>
+		<szName>MRE</szName>
+		<bFoodPoints>1200</bFoodPoints>
+		<bDrinkPoints>0</bDrinkPoints>
+		<usDecayRate>0</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>7</uiIndex>
+		<szName>EPA</szName>
+		<bFoodPoints>1600</bFoodPoints>
+		<bDrinkPoints>0</bDrinkPoints>
+		<usDecayRate>0</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>8</uiIndex>
+		<szName>Calorie Mate</szName>
+		<bFoodPoints>100</bFoodPoints>
+		<bDrinkPoints>0</bDrinkPoints>
+		<usDecayRate>0</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>9</uiIndex>
+		<szName>Peak EPA</szName>
+		<bFoodPoints>80</bFoodPoints>
+		<bDrinkPoints>0</bDrinkPoints>
+		<usDecayRate>0</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>10</uiIndex>
+		<szName>Hotdog</szName>
+		<bFoodPoints>380</bFoodPoints>
+		<bDrinkPoints>0</bDrinkPoints>
+		<usDecayRate>1.8</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>11</uiIndex>
+		<szName>Hamburger</szName>
+		<bFoodPoints>420</bFoodPoints>
+		<bDrinkPoints>0</bDrinkPoints>
+		<usDecayRate>1.6</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>12</uiIndex>
+		<szName>Fries</szName>
+		<bFoodPoints>160</bFoodPoints>
+		<bDrinkPoints>0</bDrinkPoints>
+		<usDecayRate>1.5</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>13</uiIndex>
+		<szName>Pizza</szName>
+		<bFoodPoints>620</bFoodPoints>
+		<bDrinkPoints>0</bDrinkPoints>
+		<usDecayRate>1.8</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>14</uiIndex>
+		<szName>Spam</szName>
+		<bFoodPoints>600</bFoodPoints>
+		<bDrinkPoints>0</bDrinkPoints>
+		<usDecayRate>0</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>15</uiIndex>
+		<szName>Spam 2</szName>
+		<bFoodPoints>800</bFoodPoints>
+		<bDrinkPoints>0</bDrinkPoints>
+		<usDecayRate>0</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>16</uiIndex>
+		<szName>C. vegetables</szName>
+		<bFoodPoints>600</bFoodPoints>
+		<bDrinkPoints>0</bDrinkPoints>
+		<usDecayRate>0</usDecayRate>
+	</FOOD>
+<FOOD>
+		<uiIndex>17</uiIndex>
+		<szName>C. scorpions</szName>
+		<bFoodPoints>360</bFoodPoints>
+		<bDrinkPoints>0</bDrinkPoints>
+		<usDecayRate>0</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>18</uiIndex>
+		<szName>Cat food</szName>
+		<bFoodPoints>320</bFoodPoints>
+		<bDrinkPoints>0</bDrinkPoints>
+		<usDecayRate>80</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>19</uiIndex>
+		<szName>Baked beans</szName>
+		<bFoodPoints>620</bFoodPoints>
+		<bDrinkPoints>0</bDrinkPoints>
+		<usDecayRate>0</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>20</uiIndex>
+		<szName>Steak</szName>
+		<bFoodPoints>920</bFoodPoints>
+		<bDrinkPoints>0</bDrinkPoints>
+		<usDecayRate>2.1</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>21</uiIndex>
+		<szName>Bean stew</szName>
+		<bFoodPoints>800</bFoodPoints>
+		<bDrinkPoints>0</bDrinkPoints>
+		<usDecayRate>2.0</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>22</uiIndex>
+		<szName>French toast</szName>
+		<bFoodPoints>300</bFoodPoints>
+		<bDrinkPoints>0</bDrinkPoints>
+		<usDecayRate>1.6</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>23</uiIndex>
+		<szName>Crepes</szName>
+		<bFoodPoints>340</bFoodPoints>
+		<bDrinkPoints>0</bDrinkPoints>
+		<usDecayRate>1.9</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>24</uiIndex>
+		<szName>Pasta</szName>
+		<bFoodPoints>860</bFoodPoints>
+		<bDrinkPoints>0</bDrinkPoints>
+		<usDecayRate>2.2</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>25</uiIndex>
+		<szName>Omelet</szName>
+		<bFoodPoints>700</bFoodPoints>
+		<bDrinkPoints>0</bDrinkPoints>
+		<usDecayRate>2.1</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>26</uiIndex>
+		<szName>Cow meat</szName>
+		<bFoodPoints>2000</bFoodPoints>
+		<bDrinkPoints>0</bDrinkPoints>
+		<usDecayRate>3</usDecayRate>
+	</FOOD>
+  <FOOD>
+		<uiIndex>27</uiIndex>
+		<szName>Bloodcat meat</szName>
+		<bFoodPoints>2200</bFoodPoints>
+		<bDrinkPoints>0</bDrinkPoints>
+		<usDecayRate>3.2</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>28</uiIndex>
+		<szName>Bread</szName>
+		<bFoodPoints>550</bFoodPoints>
+		<bDrinkPoints>0</bDrinkPoints>
+		<usDecayRate>1</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>29</uiIndex>
+		<szName>Applepie</szName>
+		<bFoodPoints>600</bFoodPoints>
+		<bDrinkPoints>0</bDrinkPoints>
+		<usDecayRate>1.7</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>30</uiIndex>
+		<szName>Water drum</szName>
+		<bFoodPoints>0</bFoodPoints>
+		<bDrinkPoints>100000</bDrinkPoints>
+		<usDecayRate>0</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>31</uiIndex>
+		<szName>PET bottle</szName>
+		<bFoodPoints>0</bFoodPoints>
+		<bDrinkPoints>2000</bDrinkPoints>
+		<usDecayRate>0</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>32</uiIndex>
+		<szName>Vegetable juice</szName>
+		<bFoodPoints>60</bFoodPoints>
+		<bDrinkPoints>2000</bDrinkPoints>
+		<usDecayRate>1.2</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>33</uiIndex>
+		<szName>Milk</szName>
+		<bFoodPoints>10</bFoodPoints>
+		<bDrinkPoints>2000</bDrinkPoints>
+		<usDecayRate>1.8</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>34</uiIndex>
+		<szName>Energy drink</szName>
+		<bFoodPoints>0</bFoodPoints>
+		<bDrinkPoints>800</bDrinkPoints>
+		<usDecayRate>0</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>35</uiIndex>
+		<szName>Energy drink 2</szName>
+		<bFoodPoints>0</bFoodPoints>
+		<bDrinkPoints>700</bDrinkPoints>
+		<usDecayRate>0</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>36</uiIndex>
+		<szName>Coffee</szName>
+		<bFoodPoints>0</bFoodPoints>
+		<bDrinkPoints>600</bDrinkPoints>
+		<usDecayRate>0.2</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>37</uiIndex>
+		<szName>Oatmeal</szName>
+		<bFoodPoints>500</bFoodPoints>
+		<bDrinkPoints>0</bDrinkPoints>
+		<usDecayRate>2.3</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>38</uiIndex>
+		<szName>Bag of rice</szName>
+		<bFoodPoints>2000</bFoodPoints>
+		<bDrinkPoints>0</bDrinkPoints>
+		<usDecayRate>1.5</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>39</uiIndex>
+		<szName>bladder</szName>
+		<bFoodPoints>0</bFoodPoints>
+		<bDrinkPoints>4000</bDrinkPoints>
+		<bMoraleMod>1</bMoraleMod>
+		<usDecayRate>0</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>40</uiIndex>
+		<szName>Soda</szName>
+		<bFoodPoints>0</bFoodPoints>
+		<bDrinkPoints>600</bDrinkPoints>
 		<usDecayRate>0</usDecayRate>
 	</FOOD>
 </FOODSLIST>

gamedir/Data/TableData/Lookup/ItemFlag.xml

@@ -84,6 +84,10 @@
 		<id>262144</id>
 		<name>Jumping Grenade</name>
 	</ItemFlag>
+	<ItemFlag>
+		<id>419430</id>
+		<name>Scuba Mask</name>
+	</ItemFlag>
 	<ItemFlag>
 		<id>524288</id>
 		<name>Handcuffs</name>
@@ -96,10 +100,6 @@
 		<id>2097152</id>
 		<name>Scuba Bottle</name>
 	</ItemFlag>
-	<ItemFlag>
-		<id>419430</id>
-		<name>Scuba Mask</name>
-	</ItemFlag>
 	<ItemFlag>
 		<id>8388608</id>
 		<name>Scuba Fins</name>

gamedir/Data/TableData/Lookup/Silhouette.xml

@@ -195,5 +195,29 @@
 		<Silhouette>
 		<id>48</id>
 		<name>Grenade x2</name>
+	</Silhouette>
+			<Silhouette>
+		<id>49</id>
+		<name>Small Revolver</name>
+	</Silhouette>
+			<Silhouette>
+		<id>50</id>
+		<name>.50 Mag</name>
+	</Silhouette>
+	<Silhouette>
+		<id>51</id>
+		<name>Bladder</name>
+	</Silhouette>
+		<Silhouette>
+		<id>52</id>
+		<name>Drum</name>
+	</Silhouette>
+		<Silhouette>
+		<id>53</id>
+		<name>Throw Knife</name>
+	</Silhouette>
+			<Silhouette>
+		<id>54</id>
+		<name>Short Riflex1</name>
 	</Silhouette>
 </JA2Data>

gamedir/Data/TableData/Map/SamSites.xml

@@ -13,9 +13,9 @@ Fields index:
 	samHidden       	- defines whether sam site is hidden from player from the beginning
 				  of game. Changes in this field require starting a new game to take effect.
 			  	  Possible values: 0 - sam site is known and displayed, 1 - sam is hidden.
-	samOrientation    	- comment about this value in game sources signs: "Use 3 if / orientation,
-				  4 if \ orientation". But I didn't notice any difference between 3 and 4.
-				  Probably, this value in not used. Just provide 3 or 4 to this tag.
+	samOrientation    	- This value determines the orientation of the terminal if it is repaired.
+          Use 3 for '/' orientation - from the middle to the lower left
+          Use 4 for '\' orientation - from the middle to the lower right
 	samGridNoA        	- OK. Here is needed some theory to explain these two fields ;)
 	samGridNoB		  It is known that every sam in game should have a control terminal
 				  (its a terminal with blue rectangle on screen and large yellow
@@ -36,6 +36,8 @@ Fields index:
 There is air control table at the end on this file.
 The numbers indicate what sam site controls air space of sector.
 Zero (0) means neither of sams control this sector.
+Each sector now takes a flagmask indicating the SAMs. So 1 is for SAM 1, 2 for SAM 2, 4 for SAM 3, 8 for SAM 4 and so on.
+Add numbers to have mutliple SAMs covering a sector, so 3 means that both SAM 1 and 2 cover a sector.
 
 NOTE: Rows 0 and 17, and also columns 0 and 17 CANNOT BE USED.
       It is world borders.
@@ -86,31 +88,30 @@ Others not.
 				<y>14</y>
 			</samSector>
 			<samHidden>1</samHidden>
-			<samOrientation>3</samOrientation>
+			<samOrientation>4</samOrientation>
 			<samGridNoA>11913</samGridNoA>
 			<samGridNoB>11912</samGridNoB>
 		</SAM>
 	</SAMLIST>
+	
 	<SAM_CONTROLLED_SECTORS>
-		<!-- Column index: 0  1  2  3  4  5  6  7  8  9  10 11 12 13 14 15 16 17 -->
-		<!-- 									 -->
 		<MAP_ROW row="00"> 0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0 </MAP_ROW>
 		<MAP_ROW row="01"> 0  1  1  1  1  1  1  1  1  0  0  2  2  2  2  2  2  0 </MAP_ROW>
 		<MAP_ROW row="02"> 0  1  1  1  1  1  1  1  1  2  2  2  2  2  2  2  2  0 </MAP_ROW>
-		<MAP_ROW row="03"> 0  1  1  1  1  1  1  1  3  2  2  2  2  2  2  2  2  0 </MAP_ROW>
-		<MAP_ROW row="04"> 0  1  1  1  1  1  1  1  3  3  2  2  2  2  2  2  2  0 </MAP_ROW>
-		<MAP_ROW row="05"> 0  1  1  1  1  1  1  3  3  3  3  2  2  2  2  2  2  0 </MAP_ROW>
-		<MAP_ROW row="06"> 0  1  1  1  1  1  3  3  3  3  3  3  2  2  2  2  2  0 </MAP_ROW>
-		<MAP_ROW row="07"> 0  1  1  1  1  3  3  3  3  3  3  3  3  2  2  2  2  0 </MAP_ROW>
-		<MAP_ROW row="08"> 0  1  1  1  3  3  3  3  3  3  3  3  3  3  2  2  2  0 </MAP_ROW>
-		<MAP_ROW row="09"> 0  1  1  3  3  3  3  3  3  3  3  3  3  3  2  2  2  0 </MAP_ROW>
-		<MAP_ROW row="10"> 0  1  4  4  4  3  3  3  3  3  3  3  3  3  2  2  2  0 </MAP_ROW>
-		<MAP_ROW row="11"> 0  4  4  4  4  4  3  3  3  3  3  3  3  3  2  2  2  0 </MAP_ROW>
-		<MAP_ROW row="12"> 0  4  4  4  4  4  4  3  3  3  3  3  3  3  2  2  2  0 </MAP_ROW>
-		<MAP_ROW row="13"> 0  4  4  4  4  4  4  4  3  3  3  3  3  3  2  2  2  0 </MAP_ROW>
-		<MAP_ROW row="14"> 0  4  4  4  4  4  4  4  4  4  4  4  4  4  2  2  2  0 </MAP_ROW>
-		<MAP_ROW row="15"> 0  4  4  4  4  4  4  4  4  4  4  4  4  4  4  2  2  0 </MAP_ROW>
-		<MAP_ROW row="16"> 0  4  4  4  4  4  4  4  4  4  4  4  4  4  4  4  2  0 </MAP_ROW>
+		<MAP_ROW row="03"> 0  1  1  1  1  1  1  1  4  2  2  2  2  2  2  2  2  0 </MAP_ROW>
+		<MAP_ROW row="04"> 0  1  1  1  1  1  1  1  4  4  2  2  2  2  2  2  2  0 </MAP_ROW>
+		<MAP_ROW row="05"> 0  1  1  1  1  1  1  4  4  4  4  2  2  2  2  2  2  0 </MAP_ROW>
+		<MAP_ROW row="06"> 0  1  1  1  1  1  4  4  4  4  4  4  2  2  2  2  2  0 </MAP_ROW>
+		<MAP_ROW row="07"> 0  1  1  1  1  4  4  4  4  4  4  4  4  2  2  2  2  0 </MAP_ROW>
+		<MAP_ROW row="08"> 0  1  1  1  4  4  4  4  4  4  4  4  4  4  2  2  2  0 </MAP_ROW>
+		<MAP_ROW row="09"> 0  1  1  4  4  4  4  4  4  4  4  4  4  4  2  2  2  0 </MAP_ROW>
+		<MAP_ROW row="10"> 0  1  8  8  8  4  4  4  4  4  4  4  4  4  2  2  2  0 </MAP_ROW>
+		<MAP_ROW row="11"> 0  8  8  8  8  8  4  4  4  4  4  4  4  4  2  2  2  0 </MAP_ROW>
+		<MAP_ROW row="12"> 0  8  8  8  8  8  8  4  4  4  4  4  4  4  2  2  2  0 </MAP_ROW>
+		<MAP_ROW row="13"> 0  8  8  8  8  8  8  8  4  4  4  4  4  4  2  2  2  0 </MAP_ROW>
+		<MAP_ROW row="14"> 0  8  8  8  8  8  8  8  8  8  8  8  8  8  2  2  2  0 </MAP_ROW>
+		<MAP_ROW row="15"> 0  8  8  8  8  8  8  8  8  8  8  8  8  8  8  2  2  0 </MAP_ROW>
+		<MAP_ROW row="16"> 0  8  8  8  8  8  8  8  8  8  8  8  8  8  8  8  2  0 </MAP_ROW>
 		<MAP_ROW row="17"> 0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0 </MAP_ROW>
 	</SAM_CONTROLLED_SECTORS>
 </SAM_INFO>

gamedir/Data/TableData/Map/SectorLoadscreens.xml

@@ -199,12 +199,12 @@ szNighAlt			- Path to the alternate loadscreen image, which should be displayed
 	<SECTOR>
 		<uiIndex>18</uiIndex>
 		<szLocation>B2</szLocation>
-		<RandomAltSector>0</RandomAltSector>
+		<RandomAltSector>1</RandomAltSector>
 		<szImageFormat>STI</szImageFormat>
 		<szDay>Loadscreens\LS_DayChitzena</szDay>
 		<szNight>Loadscreens\LS_NightChitzena</szNight>
-		<szDayAlt></szDayAlt>
-		<szNightAlt></szNightAlt>		
+		<szDayAlt>Loadscreens\LS_MineDay</szDayAlt>
+		<szNightAlt>Loadscreens\LS_MineNight</szNightAlt>		
 	</SECTOR>
 	<SECTOR>
 		<uiIndex>19</uiIndex>
@@ -541,12 +541,12 @@ szNighAlt			- Path to the alternate loadscreen image, which should be displayed
 	<SECTOR>
 		<uiIndex>52</uiIndex>
 		<szLocation>D4</szLocation>
-		<RandomAltSector>0</RandomAltSector>
+		<RandomAltSector>1</RandomAltSector>
 		<szImageFormat>STI</szImageFormat>
 		<szDay>Loadscreens\LS_DayMine</szDay>
 		<szNight>Loadscreens\LS_NightMine</szNight>
-		<szDayAlt></szDayAlt>
-		<szNightAlt></szNightAlt>
+		<szDayAlt>Loadscreens\LS_MineDay</szDayAlt>
+		<szNightAlt>Loadscreens\LS_MineNight</szNightAlt>
 	</SECTOR>
 	<SECTOR>
 		<uiIndex>53</uiIndex>
@@ -1175,12 +1175,12 @@ szNighAlt			- Path to the alternate loadscreen image, which should be displayed
 	<SECTOR>
 		<uiIndex>115</uiIndex>
 		<szLocation>H3</szLocation>
-		<RandomAltSector>0</RandomAltSector>
+		<RandomAltSector>1</RandomAltSector>
 		<szImageFormat>STI</szImageFormat>
 		<szDay>Loadscreens\LS_DayMine</szDay>
 		<szNight>Loadscreens\LS_NightMine</szNight>
-		<szDayAlt></szDayAlt>
-		<szNightAlt></szNightAlt>
+		<szDayAlt>Loadscreens\LS_MineDay</szDayAlt>
+		<szNightAlt>Loadscreens\LS_MineNight</szNightAlt>
 	</SECTOR>
 	<SECTOR>
 		<uiIndex>116</uiIndex>
@@ -1225,12 +1225,12 @@ szNighAlt			- Path to the alternate loadscreen image, which should be displayed
 	<SECTOR>
 		<uiIndex>120</uiIndex>
 		<szLocation>H8</szLocation>
-		<RandomAltSector>0</RandomAltSector>
+		<RandomAltSector>1</RandomAltSector>
 		<szImageFormat>STI</szImageFormat>
 		<szDay>Loadscreens\LS_DayMine</szDay>
 		<szNight>Loadscreens\LS_NightMine</szNight>
-		<szDayAlt></szDayAlt>
-		<szNightAlt></szNightAlt>
+		<szDayAlt>Loadscreens\LS_MineDay</szDayAlt>
+		<szNightAlt>Loadscreens\LS_MineNight</szNightAlt>
 	</SECTOR>
 	<SECTOR>
 		<uiIndex>121</uiIndex>
@@ -1275,22 +1275,22 @@ szNighAlt			- Path to the alternate loadscreen image, which should be displayed
 	<SECTOR>
 		<uiIndex>125</uiIndex>
 		<szLocation>H13</szLocation>
-		<RandomAltSector>0</RandomAltSector>
+		<RandomAltSector>1</RandomAltSector>
 		<szImageFormat>STI</szImageFormat>
 		<szDay>Loadscreens\LS_DayMilitary</szDay>
 		<szNight>Loadscreens\LS_NightMilitary</szNight>
-		<szDayAlt></szDayAlt>
-		<szNightAlt></szNightAlt>
+		<szDayAlt>Loadscreens\LS_MissleDay</szDayAlt>
+		<szNightAlt>Loadscreens\LS_MissleNight</szNightAlt>
 	</SECTOR>
 	<SECTOR>
 		<uiIndex>126</uiIndex>
 		<szLocation>H14</szLocation>
-		<RandomAltSector>0</RandomAltSector>
+		<RandomAltSector>1</RandomAltSector>
 		<szImageFormat>STI</szImageFormat>
 		<szDay>Loadscreens\LS_DayMilitary</szDay>
 		<szNight>Loadscreens\LS_NightMilitary</szNight>
-		<szDayAlt></szDayAlt>
-		<szNightAlt></szNightAlt>
+		<szDayAlt>Loadscreens\LS_MissleDay</szDayAlt>
+		<szNightAlt>Loadscreens\LS_MissleNight</szNightAlt>
 	</SECTOR>
 	<SECTOR>
 		<uiIndex>127</uiIndex>
@@ -1436,12 +1436,12 @@ szNighAlt			- Path to the alternate loadscreen image, which should be displayed
 	<SECTOR>
 		<uiIndex>141</uiIndex>
 		<szLocation>I13</szLocation>
-		<RandomAltSector>0</RandomAltSector>
+		<RandomAltSector>1</RandomAltSector>
 		<szImageFormat>STI</szImageFormat>
 		<szDay>Loadscreens\LS_DayMilitary</szDay>
 		<szNight>Loadscreens\LS_NightMilitary</szNight>
-		<szDayAlt></szDayAlt>
-		<szNightAlt></szNightAlt>
+		<szDayAlt>Loadscreens\LS_MissleDay</szDayAlt>
+		<szNightAlt>Loadscreens\LS_MissleNight</szNightAlt>
 	</SECTOR>
 	<SECTOR>
 		<uiIndex>142</uiIndex>
@@ -2181,12 +2181,12 @@ szNighAlt			- Path to the alternate loadscreen image, which should be displayed
 	<SECTOR>
 		<uiIndex>215</uiIndex>
 		<szLocation>N7</szLocation>
-		<RandomAltSector>0</RandomAltSector>
+		<RandomAltSector>1</RandomAltSector>
 		<szImageFormat>STI</szImageFormat>
 		<szDay>Loadscreens\LS_DayMilitary</szDay>
 		<szNight>Loadscreens\LS_NightMilitary</szNight>
-		<szDayAlt></szDayAlt>
-		<szNightAlt></szNightAlt>
+		<szDayAlt>Loadscreens\LS_MissleDay</szDayAlt>
+		<szNightAlt>Loadscreens\LS_MissleNight</szNightAlt>
 	</SECTOR>
 	<SECTOR>
 		<uiIndex>216</uiIndex>

gamedir/Data/TableData/SquadNames.xml

@@ -80,4 +80,88 @@
     <uiIndex>19</uiIndex>
     <Squad>Tango</Squad>
   </SQUADNAME>
+  <SQUADNAME>
+    <uiIndex>20</uiIndex>
+    <Squad>Uniform</Squad>
+  </SQUADNAME>
+  <SQUADNAME>
+    <uiIndex>21</uiIndex>
+    <Squad>Victor</Squad>
+  </SQUADNAME>
+  <SQUADNAME>
+    <uiIndex>22</uiIndex>
+    <Squad>Whiskey</Squad>
+  </SQUADNAME>
+  <SQUADNAME>
+    <uiIndex>23</uiIndex>
+    <Squad>X-Ray</Squad>
+  </SQUADNAME>
+  <SQUADNAME>
+    <uiIndex>24</uiIndex>
+    <Squad>Yankee</Squad>
+  </SQUADNAME>
+  <SQUADNAME>
+    <uiIndex>25</uiIndex>
+    <Squad>Zulu</Squad>
+  </SQUADNAME>
+  <SQUADNAME>
+    <uiIndex>26</uiIndex>
+    <Squad>Beta</Squad>
+  </SQUADNAME>
+  <SQUADNAME>
+    <uiIndex>27</uiIndex>
+    <Squad>Gamma</Squad>
+  </SQUADNAME>
+  <SQUADNAME>
+    <uiIndex>28</uiIndex>
+    <Squad>Delta</Squad>
+  </SQUADNAME>
+  <SQUADNAME>
+    <uiIndex>29</uiIndex>
+    <Squad>Epsilon</Squad>
+  </SQUADNAME>
+  <SQUADNAME>
+    <uiIndex>30</uiIndex>
+    <Squad>Zeta</Squad>
+  </SQUADNAME>
+  <SQUADNAME>
+    <uiIndex>31</uiIndex>
+    <Squad>Eta</Squad>
+  </SQUADNAME>
+  <SQUADNAME>
+    <uiIndex>32</uiIndex>
+    <Squad>Theta</Squad>
+  </SQUADNAME>
+  <SQUADNAME>
+    <uiIndex>33</uiIndex>
+    <Squad>Iota</Squad>
+  </SQUADNAME>
+  <SQUADNAME>
+    <uiIndex>34</uiIndex>
+    <Squad>Kappa</Squad>
+  </SQUADNAME>
+  <SQUADNAME>
+    <uiIndex>35</uiIndex>
+    <Squad>Lambda</Squad>
+  </SQUADNAME>
+  <SQUADNAME>
+    <uiIndex>36</uiIndex>
+    <Squad>My</Squad>
+  </SQUADNAME>
+  <SQUADNAME>
+    <uiIndex>37</uiIndex>
+    <Squad>Ny</Squad>
+  </SQUADNAME>
+  <SQUADNAME>
+    <uiIndex>38</uiIndex>
+    <Squad>Xi</Squad>
+  </SQUADNAME>
+  <SQUADNAME>
+    <uiIndex>39</uiIndex>
+    <Squad>Omicron</Squad>
+  </SQUADNAME>
+  <SQUADNAME>
+    <uiIndex>40</uiIndex>
+    <Squad>Pi</Squad>
+  </SQUADNAME>
 </SQUAD_NAMES>