From 919d2eb2d71532e7531e2258082a5066da7f0176 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
---
 gamedir/Data-1.13/TableData/Items/Weapons.xml   |  14 ++++++++++++--
 .../Data/Interface/ItemInfoAdvancedIcons.sti    | Bin 0 -> 14057 bytes
 gamedir/Data/TableData/Items/Weapons.xml        |   6 +++++-
 3 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 gamedir/Data/Interface/ItemInfoAdvancedIcons.sti

diff --git a/gamedir/Data-1.13/TableData/Items/Weapons.xml b/gamedir/Data-1.13/TableData/Items/Weapons.xml
index 0165140f2..c665884fa 100644
--- a/gamedir/Data-1.13/TableData/Items/Weapons.xml
+++ b/gamedir/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/gamedir/Data/Interface/ItemInfoAdvancedIcons.sti b/gamedir/Data/Interface/ItemInfoAdvancedIcons.sti
new file mode 100644
index 0000000000000000000000000000000000000000..bd2b9b731df3c14d6db5ccf77d1ad61915216f6c
GIT binary patch
literal 14057
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

literal 0
HcmV?d00001

diff --git a/gamedir/Data/TableData/Items/Weapons.xml b/gamedir/Data/TableData/Items/Weapons.xml
index 6dd822d32..5b2449d92 100644
--- a/gamedir/Data/TableData/Items/Weapons.xml
+++ b/gamedir/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>