- bugfix: Wrong ammo & magazines when when "CUSTOM_DATA_LOCATION = Data" was selected in the ja2.ini. Mod now works correct with this setting.

- added German.Items.xml and German.AmmoStrings.xml to the "Data\TableData" folder.

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

Data/TableData/AmmoStrings.xml

@@ -10,24 +10,24 @@ Attribute Field Reference:
 -->
 <AMMOLIST>
 	<AMMO>
-		<AmmoCaliber></AmmoCaliber>
-		<BRCaliber></BRCaliber>
+		<AmmoCaliber>0</AmmoCaliber>
+		<BRCaliber>0</BRCaliber>
 	</AMMO>
 	<AMMO>
-		<AmmoCaliber>.38 cal</AmmoCaliber>
-		<BRCaliber>.38 cal</BRCaliber>
+		<AmmoCaliber>.38 Spc</AmmoCaliber>
+		<BRCaliber>.38 Spc</BRCaliber>
 	</AMMO>
 	<AMMO>
-		<AmmoCaliber>9mm</AmmoCaliber>
-		<BRCaliber>9mm</BRCaliber>
+		<AmmoCaliber>9x19mm</AmmoCaliber>
+		<BRCaliber>9x19mm</BRCaliber>
 	</AMMO>
 	<AMMO>
-		<AmmoCaliber>.45 cal</AmmoCaliber>
-		<BRCaliber>.45 cal</BRCaliber>
+		<AmmoCaliber>.45 ACP</AmmoCaliber>
+		<BRCaliber>.45 ACP</BRCaliber>
 	</AMMO>
 	<AMMO>
-		<AmmoCaliber>.357 cal</AmmoCaliber>
-		<BRCaliber>.357 cal</BRCaliber>
+		<AmmoCaliber>.357 Mag</AmmoCaliber>
+		<BRCaliber>.357 Mag</BRCaliber>
 	</AMMO>
 	<AMMO>
 		<AmmoCaliber>12 gauge</AmmoCaliber>
@@ -38,28 +38,28 @@ Attribute Field Reference:
 		<BRCaliber>CAWS</BRCaliber>
 	</AMMO>
 	<AMMO>
-		<AmmoCaliber>5.45mm</AmmoCaliber>
-		<BRCaliber>5.45mm</BRCaliber>
+		<AmmoCaliber>5.45x39mm</AmmoCaliber>
+		<BRCaliber>5.45x39mm</BRCaliber>
 	</AMMO>
 	<AMMO>
-		<AmmoCaliber>5.56mm</AmmoCaliber>
-		<BRCaliber>5.56mm</BRCaliber>
+		<AmmoCaliber>5.56x45mm</AmmoCaliber>
+		<BRCaliber>5.56x45mm</BRCaliber>
 	</AMMO>
 	<AMMO>
-		<AmmoCaliber>7.62mm NATO</AmmoCaliber>
-		<BRCaliber>7.62mm N.</BRCaliber>
+		<AmmoCaliber>7.62x51mm</AmmoCaliber>
+		<BRCaliber>7.62x51mm</BRCaliber>
 	</AMMO>
 	<AMMO>
-		<AmmoCaliber>7.62mm WP</AmmoCaliber>
-		<BRCaliber>7.62mm WP</BRCaliber>
+		<AmmoCaliber>7.62x39mm</AmmoCaliber>
+		<BRCaliber>7.62x39mm</BRCaliber>
 	</AMMO>
 	<AMMO>
-		<AmmoCaliber>4.7mm</AmmoCaliber>
-		<BRCaliber>4.7mm</BRCaliber>
+		<AmmoCaliber>4.7x33mm</AmmoCaliber>
+		<BRCaliber>4.7x33mm</BRCaliber>
 	</AMMO>
 	<AMMO>
-		<AmmoCaliber>5.7mm</AmmoCaliber>
-		<BRCaliber>5.7mm</BRCaliber>
+		<AmmoCaliber>5.7x28mm</AmmoCaliber>
+		<BRCaliber>5.7x28mm</BRCaliber>
 	</AMMO>
 	<AMMO>
 		<AmmoCaliber>Monster</AmmoCaliber>
@@ -75,6 +75,6 @@ Attribute Field Reference:
 	</AMMO>
 	<AMMO>
 		<AmmoCaliber>flame</AmmoCaliber>
-		<BRCaliber></BRCaliber>
+		<BRCaliber>flame</BRCaliber>
 	</AMMO>
 </AMMOLIST>

Data/TableData/AmmoTypes.xml

@@ -30,7 +30,7 @@ Attribute Field Reference:
 -->
 <AMMOTYPELIST>
 	<AMMOTYPE>
-		<uiIndex>0</uiIndex> <!-- Regular ammo -->
+		<uiIndex>0</uiIndex>
 		<fontColour>136</fontColour>
 		<grayed>4</grayed>
 		<offNormal>1</offNormal>
@@ -61,7 +61,7 @@ Attribute Field Reference:
 		<tracerEffect>0</tracerEffect>
 	</AMMOTYPE>
 	<AMMOTYPE>
-		<uiIndex>1</uiIndex> <!-- HP ammo -->
+		<uiIndex>1</uiIndex>
 		<fontColour>24</fontColour>
 		<grayed>12</grayed>
 		<offNormal>9</offNormal>
@@ -92,7 +92,7 @@ Attribute Field Reference:
 		<tracerEffect>0</tracerEffect>
 	</AMMOTYPE>
 	<AMMOTYPE>
-		<uiIndex>2</uiIndex> <!-- AP ammo -->
+		<uiIndex>2</uiIndex>
 		<fontColour>218</fontColour>
 		<grayed>8</grayed>
 		<offNormal>5</offNormal>
@@ -123,7 +123,7 @@ Attribute Field Reference:
 		<tracerEffect>0</tracerEffect>
 	</AMMOTYPE>
 	<AMMOTYPE>
-		<uiIndex>3</uiIndex> <!-- Super AP ammo -->
+		<uiIndex>3</uiIndex>
 		<fontColour>163</fontColour>
 		<grayed>8</grayed>
 		<offNormal>5</offNormal>
@@ -154,7 +154,7 @@ Attribute Field Reference:
 		<tracerEffect>0</tracerEffect>
 	</AMMOTYPE>
 	<AMMOTYPE>
-		<uiIndex>4</uiIndex> <!-- Buckshot ammo -->
+		<uiIndex>4</uiIndex>
 		<fontColour>125</fontColour>
 		<grayed>4</grayed>
 		<offNormal>1</offNormal>
@@ -167,7 +167,7 @@ Attribute Field Reference:
 		<beforeArmourDamageDivisor>1</beforeArmourDamageDivisor>
 		<afterArmourDamageMultiplier>1</afterArmourDamageMultiplier>
 		<afterArmourDamageDivisor>1</afterArmourDamageDivisor>
-		<zeroMinimumDamage>0</zeroMinimumDamage>
+		<zeroMinimumDamage>1</zeroMinimumDamage>
 		<canGoThrough>1</canGoThrough>
 		<standardIssue>1</standardIssue>
 		<numberOfBullets>9</numberOfBullets>
@@ -185,15 +185,15 @@ Attribute Field Reference:
 		<tracerEffect>0</tracerEffect>
 	</AMMOTYPE>
 	<AMMOTYPE>
-		<uiIndex>5</uiIndex> <!-- Flechette ammo -->
-		<fontColour>136</fontColour>
-		<grayed>4</grayed>
-		<offNormal>1</offNormal>
-		<onNormal>3</onNormal>
-		<structureImpactReductionMultiplier>1</structureImpactReductionMultiplier>
-		<structureImpactReductionDivisor>1</structureImpactReductionDivisor>
-		<armourImpactReductionMultiplier>1</armourImpactReductionMultiplier>
-		<armourImpactReductionDivisor>1</armourImpactReductionDivisor>
+		<uiIndex>5</uiIndex>
+		<fontColour>218</fontColour>
+		<grayed>8</grayed>
+		<offNormal>5</offNormal>
+		<onNormal>7</onNormal>
+		<structureImpactReductionMultiplier>4</structureImpactReductionMultiplier>
+		<structureImpactReductionDivisor>5</structureImpactReductionDivisor>
+		<armourImpactReductionMultiplier>4</armourImpactReductionMultiplier>
+		<armourImpactReductionDivisor>5</armourImpactReductionDivisor>
 		<beforeArmourDamageMultiplier>1</beforeArmourDamageMultiplier>
 		<beforeArmourDamageDivisor>1</beforeArmourDamageDivisor>
 		<afterArmourDamageMultiplier>1</afterArmourDamageMultiplier>
@@ -201,9 +201,9 @@ Attribute Field Reference:
 		<zeroMinimumDamage>0</zeroMinimumDamage>
 		<canGoThrough>1</canGoThrough>
 		<standardIssue>0</standardIssue>
-		<numberOfBullets>1</numberOfBullets>
+		<numberOfBullets>6</numberOfBullets>
 		<multipleBulletDamageMultiplier>1</multipleBulletDamageMultiplier>
-		<multipleBulletDamageDivisor>1</multipleBulletDamageDivisor>
+		<multipleBulletDamageDivisor>3</multipleBulletDamageDivisor>
 		<highExplosive>0</highExplosive>
 		<explosionSize>0</explosionSize>
 		<antiTank>0</antiTank>
@@ -216,7 +216,7 @@ Attribute Field Reference:
 		<tracerEffect>0</tracerEffect>
 	</AMMOTYPE>
 	<AMMOTYPE>
-		<uiIndex>6</uiIndex> <!-- Grenade ammo -->
+		<uiIndex>6</uiIndex>
 		<fontColour>75</fontColour>
 		<grayed>4</grayed>
 		<offNormal>1</offNormal>
@@ -247,7 +247,7 @@ Attribute Field Reference:
 		<tracerEffect>0</tracerEffect>
 	</AMMOTYPE>
 	<AMMOTYPE>
-		<uiIndex>7</uiIndex> <!-- Monster ammo - hardcoded as ammo for monster class weapons -->
+		<uiIndex>7</uiIndex>
 		<fontColour>136</fontColour>
 		<grayed>4</grayed>
 		<offNormal>1</offNormal>
@@ -278,7 +278,7 @@ Attribute Field Reference:
 		<tracerEffect>0</tracerEffect>
 	</AMMOTYPE>
 	<AMMOTYPE>
-		<uiIndex>8</uiIndex> <!-- Knife ammo - hardcoded as ammo for throwing knives -->
+		<uiIndex>8</uiIndex>
 		<fontColour>136</fontColour>
 		<grayed>4</grayed>
 		<offNormal>1</offNormal>
@@ -309,7 +309,7 @@ Attribute Field Reference:
 		<tracerEffect>0</tracerEffect>
 	</AMMOTYPE>
 	<AMMOTYPE>
-		<uiIndex>9</uiIndex> <!-- HE ammo -->
+		<uiIndex>9</uiIndex>
 		<fontColour>75</fontColour>
 		<grayed>4</grayed>
 		<offNormal>1</offNormal>
@@ -340,7 +340,7 @@ Attribute Field Reference:
 		<tracerEffect>0</tracerEffect>
 	</AMMOTYPE>
 	<AMMOTYPE>
-		<uiIndex>10</uiIndex> <!-- HEAT ammo -->
+		<uiIndex>10</uiIndex>
 		<fontColour>76</fontColour>
 		<grayed>4</grayed>
 		<offNormal>1</offNormal>
@@ -371,7 +371,7 @@ Attribute Field Reference:
 		<tracerEffect>0</tracerEffect>
 	</AMMOTYPE>
 	<AMMOTYPE>
-		<uiIndex>11</uiIndex> <!-- Tranquilizer dart ammo -->
+		<uiIndex>11</uiIndex>
 		<fontColour>136</fontColour>
 		<grayed>4</grayed>
 		<offNormal>1</offNormal>
@@ -402,7 +402,7 @@ Attribute Field Reference:
 		<tracerEffect>0</tracerEffect>
 	</AMMOTYPE>
 	<AMMOTYPE>
-		<uiIndex>12</uiIndex> <!-- Flamethrower ammo -->
+		<uiIndex>12</uiIndex>
 		<fontColour>136</fontColour>
 		<grayed>4</grayed>
 		<offNormal>1</offNormal>
@@ -417,7 +417,7 @@ Attribute Field Reference:
 		<afterArmourDamageDivisor>1</afterArmourDamageDivisor>
 		<zeroMinimumDamage>0</zeroMinimumDamage>
 		<canGoThrough>1</canGoThrough>
-		<standardIssue>0</standardIssue>
+		<standardIssue>1</standardIssue>
 		<numberOfBullets>1</numberOfBullets>
 		<multipleBulletDamageMultiplier>1</multipleBulletDamageMultiplier>
 		<multipleBulletDamageDivisor>1</multipleBulletDamageDivisor>
@@ -428,7 +428,7 @@ Attribute Field Reference:
 		<knife>0</knife>
 		<monsterSpit>0</monsterSpit>
 		<acidic>0</acidic>
-		<ignoreArmour>0</ignoreArmour>
+		<ignoreArmour>1</ignoreArmour>
 		<lockBustingPower>0</lockBustingPower>
 		<tracerEffect>0</tracerEffect>
 	</AMMOTYPE>

Data/TableData/German.AmmoStrings.xml

@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<AMMOLIST xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<AMMO>
+		<AmmoCaliber>0</AmmoCaliber>
+		<BRCaliber>0</BRCaliber>
+	</AMMO>
+	<AMMO>
+		<AmmoCaliber>.38 Spc</AmmoCaliber>
+		<BRCaliber>.38 Spc</BRCaliber>
+	</AMMO>
+	<AMMO>
+		<AmmoCaliber>9x19mm</AmmoCaliber>
+		<BRCaliber>9x19mm</BRCaliber>
+	</AMMO>
+	<AMMO>
+		<AmmoCaliber>.45 ACP</AmmoCaliber>
+		<BRCaliber>.45 ACP</BRCaliber>
+	</AMMO>
+	<AMMO>
+		<AmmoCaliber>.357 Mag</AmmoCaliber>
+		<BRCaliber>.357 Mag</BRCaliber>
+	</AMMO>
+	<AMMO>
+		<AmmoCaliber>12 gauge</AmmoCaliber>
+		<BRCaliber>12 gauge</BRCaliber>
+	</AMMO>
+	<AMMO>
+		<AmmoCaliber>CAWS</AmmoCaliber>
+		<BRCaliber>CAWS</BRCaliber>
+	</AMMO>
+	<AMMO>
+		<AmmoCaliber>5.45x39mm</AmmoCaliber>
+		<BRCaliber>5.45x39mm</BRCaliber>
+	</AMMO>
+	<AMMO>
+		<AmmoCaliber>5.56x45mm</AmmoCaliber>
+		<BRCaliber>5.56x45mm</BRCaliber>
+	</AMMO>
+	<AMMO>
+		<AmmoCaliber>7.62x51mm</AmmoCaliber>
+		<BRCaliber>7.62x51mm</BRCaliber>
+	</AMMO>
+	<AMMO>
+		<AmmoCaliber>7.62x39mm</AmmoCaliber>
+		<BRCaliber>7.62x39mm</BRCaliber>
+	</AMMO>
+	<AMMO>
+		<AmmoCaliber>4.7x33mm</AmmoCaliber>
+		<BRCaliber>4.7x33mm</BRCaliber>
+	</AMMO>
+	<AMMO>
+		<AmmoCaliber>5.7x28mm</AmmoCaliber>
+		<BRCaliber>5.7x28mm</BRCaliber>
+	</AMMO>
+	<AMMO>
+		<AmmoCaliber>Monster</AmmoCaliber>
+		<BRCaliber>Monster</BRCaliber>
+	</AMMO>
+	<AMMO>
+		<AmmoCaliber>Rocket</AmmoCaliber>
+		<BRCaliber>Rocket</BRCaliber>
+	</AMMO>
+	<AMMO>
+		<AmmoCaliber>Dart</AmmoCaliber>
+		<BRCaliber>Dart</BRCaliber>
+	</AMMO>
+	<AMMO>
+		<AmmoCaliber>flame</AmmoCaliber>
+		<BRCaliber>flame</BRCaliber>
+	</AMMO>
+</AMMOLIST>