From df9999ded9e6cb2cdd91574cd43bfeb739067382 Mon Sep 17 00:00:00 2001
From: Flugente <Flugente@4f8fa57e-7814-0410-bad4-adc449f26b7c>
Date: Sun, 27 Jan 2019 19:21:04 +0000
Subject: [PATCH] The new <BarrelConfiguration>-tag specifies how many bullets
 a gun shoots at once. Several values can be used. If no value is set, 1 will
 be used. Toggling fire modes cycles between barrel configurations if several
 have been set.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2461 4f8fa57e-7814-0410-bad4-adc449f26b7c
---
 Data-1.13/TableData/Items/Weapons.xml    |  14 ++++++++++++--
 Data/Interface/ItemInfoAdvancedIcons.sti | Bin 13951 -> 14057 bytes
 Data/TableData/Items/Weapons.xml         |   6 +++++-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/Data-1.13/TableData/Items/Weapons.xml b/Data-1.13/TableData/Items/Weapons.xml
index 0165140f2..c665884fa 100644
--- a/Data-1.13/TableData/Items/Weapons.xml
+++ b/Data-1.13/TableData/Items/Weapons.xml
@@ -46,7 +46,11 @@
 		<usOverheatingDamageThreshold>5000</usOverheatingDamageThreshold>
 		<usOverheatingSingleShotTemperature>80</usOverheatingSingleShotTemperature>
 		<HeavyGun>0</HeavyGun>
-		<fBurstOnlyByFanTheHammer>0</fBurstOnlyByFanTheHammer>	<!-- any one-handed gun with this tag can access its burst mode only if the user is a gunslinger holding it in alternate aim mode (eye symbol on gun) -->
+		<fBurstOnlyByFanTheHammer>0</fBurstOnlyByFanTheHammer>	<!-- burst mode is accessible only if the user is a gunslinger holding it in hipfire (eye symbol on gun) -->
+		<!-- This tag allows setting how many bullets the gun can fire per shot -->
+		<!-- if no value is set, it is assumed the gun can fire from one barrel -->
+		<!-- this tag can be added multiple times -->
+		<BarrelConfiguration>0</BarrelConfiguration>
 	</WEAPON>
 	<WEAPON>
 		<uiIndex>1</uiIndex>
@@ -6533,6 +6537,9 @@
 		<usOverheatingJamThreshold>60000</usOverheatingJamThreshold>
 		<usOverheatingDamageThreshold>60000</usOverheatingDamageThreshold>
 		<usOverheatingSingleShotTemperature>45</usOverheatingSingleShotTemperature>
+		<BarrelConfiguration>4</BarrelConfiguration>
+		<BarrelConfiguration>6</BarrelConfiguration>
+		<BarrelConfiguration>8</BarrelConfiguration>
 	</WEAPON>
 	<WEAPON>
 		<uiIndex>687</uiIndex>
@@ -7464,7 +7471,6 @@
 		<ubCalibre>5</ubCalibre>
 		<ubReadyTime>1</ubReadyTime>
 		<ubShotsPer4Turns>11.99</ubShotsPer4Turns>
-		<ubShotsPerBurst>2</ubShotsPerBurst>
 		<ubBulletSpeed>22</ubBulletSpeed>
 		<ubImpact>36</ubImpact>
 		<ubDeadliness>25</ubDeadliness>
@@ -7489,6 +7495,8 @@
 		<usOverheatingJamThreshold>40000</usOverheatingJamThreshold>
 		<usOverheatingDamageThreshold>15000</usOverheatingDamageThreshold>
 		<usOverheatingSingleShotTemperature>150</usOverheatingSingleShotTemperature>
+		<BarrelConfiguration>1</BarrelConfiguration>
+		<BarrelConfiguration>2</BarrelConfiguration>
 	</WEAPON>
 	<WEAPON>
 		<uiIndex>712</uiIndex>
@@ -9128,6 +9136,8 @@
 		<usOverheatingJamThreshold>40000</usOverheatingJamThreshold>
 		<usOverheatingDamageThreshold>15000</usOverheatingDamageThreshold>
 		<usOverheatingSingleShotTemperature>150</usOverheatingSingleShotTemperature>
+		<BarrelConfiguration>1</BarrelConfiguration>
+		<BarrelConfiguration>2</BarrelConfiguration>
 	</WEAPON>
 	<WEAPON>
 		<uiIndex>755</uiIndex>
diff --git a/Data/Interface/ItemInfoAdvancedIcons.sti b/Data/Interface/ItemInfoAdvancedIcons.sti
index 07af301bfbe030f473956d188d4cdf6ef9b2baa8..bd2b9b731df3c14d6db5ccf77d1ad61915216f6c 100644
GIT binary patch
delta 150
zcmeyL^D<X9IK<hL0SGGfK_ml%1`t1BY+zzwWMFXKDC^A5FAtQ70?RQla4>Lfj%QcU
lk7AVvfktLKR;ES<E=4df0dg2P!Avf&I4c(jv@(#S7ytub6$StR

delta 43
tcmaEv`#(oEIK<hL0SM&vK_ml%1`t1BY+zzwWMFXGDC^9=xqw|>9{||}2)+OS

diff --git a/Data/TableData/Items/Weapons.xml b/Data/TableData/Items/Weapons.xml
index 6dd822d32..5b2449d92 100644
--- a/Data/TableData/Items/Weapons.xml
+++ b/Data/TableData/Items/Weapons.xml
@@ -46,7 +46,11 @@
 		<usOverheatingDamageThreshold>5000</usOverheatingDamageThreshold>
 		<usOverheatingSingleShotTemperature>80</usOverheatingSingleShotTemperature>
 		<HeavyGun>0</HeavyGun>
-		<fBurstOnlyByFanTheHammer>0</fBurstOnlyByFanTheHammer>	<!-- any one-handed gun with this tag can access its burst mode only if the user is a gunslinger holding it in alternate aim mode (eye symbol on gun) -->
+		<fBurstOnlyByFanTheHammer>0</fBurstOnlyByFanTheHammer>	<!-- burst mode is accessible only if the user is a gunslinger holding it in hipfire (eye symbol on gun) -->
+		<!-- This tag allows setting how many bullets the gun can fire per shot -->
+		<!-- if no value is set, it is assumed the gun can fire from one barrel -->
+		<!-- this tag can be added multiple times -->
+		<BarrelConfiguration>0</BarrelConfiguration>
 	</WEAPON>
 	<WEAPON>
 		<uiIndex>1</uiIndex>