From 4949893c166b4c59cc572bb8ed895cfd7abf02cf Mon Sep 17 00:00:00 2001
From: Flugente <Flugente@4f8fa57e-7814-0410-bad4-adc449f26b7c>
Date: Mon, 23 Jul 2012 19:33:37 +0000
Subject: [PATCH] =?UTF-8?q?New=20feature:=20guns=20can=20now=20be=20fed=20?=
 =?UTF-8?q?externally=20-=20added=20necessary=20face=20icons=20-=20added?=
 =?UTF-8?q?=20description=20in=20ini=20-=20as=20an=20example,=20the=20MG?=
 =?UTF-8?q?=C2=A7=20and=20the=20FN=20mag=20can=20now=20be=20fed=20external?=
 =?UTF-8?q?ly=20with=20any=20100-rnd=207.62=20NATO=20mag.=20Internal=20fee?=
 =?UTF-8?q?ding=20is=20possible=20from=20the=20LRAK=20vest=20-=20for=20mor?=
 =?UTF-8?q?e=20info,=20see=20http://www.bears-pit.com/board/ubbthreads.php?=
 =?UTF-8?q?/topics/307574/New=5Ffeature=5FExternally=5Ffed=5Fmac.html#Post?=
 =?UTF-8?q?307574?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1474 4f8fa57e-7814-0410-bad4-adc449f26b7c
---
 gamedir/Data-1.13/Ja2_Options.INI     |  7 +++++++
 gamedir/Data-1.13/TableData/Items.xml | 10 ++++++++++
 2 files changed, 17 insertions(+)

diff --git a/gamedir/Data-1.13/Ja2_Options.INI b/gamedir/Data-1.13/Ja2_Options.INI
index 316a07c87..b249c62ef 100644
--- a/gamedir/Data-1.13/Ja2_Options.INI
+++ b/gamedir/Data-1.13/Ja2_Options.INI
@@ -1207,6 +1207,13 @@ USE_SCOPE_MODES = TRUE
 ; Allow display of scope modes on weapon
 DISPLAY_SCOPE_MODES = TRUE
 
+;------------------------------------------------------------------------------------------------------------------------------
+; external feeding
+;------------------------------------------------------------------------------------------------------------------------------
+
+; determines wether we can allow to feed guns externally. 0 = no external feeding 1= only fro other mercs 2 = from other mercs and dedicated slots from ourself
+EXTERNAL_FEEDING = 2
+
 ;------------------------------------------------------------------------------------------------------------------------------
 ; Set the grid number for the initial merc arrival location.
 ; The JA2 default grid number is 4870 (Sector A9 Omerta).
diff --git a/gamedir/Data-1.13/TableData/Items.xml b/gamedir/Data-1.13/TableData/Items.xml
index f0504e216..92911ec42 100644
--- a/gamedir/Data-1.13/TableData/Items.xml
+++ b/gamedir/Data-1.13/TableData/Items.xml
@@ -3789,6 +3789,7 @@
 		<Metal>1</Metal>
 		<Sinks>1</Sinks>
 		<usOverheatingCooldownFactor>100.0</usOverheatingCooldownFactor>
+		<ItemFlag>256</ItemFlag>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
 		<PRONE_MODIFIERS />
@@ -3813,6 +3814,7 @@
 		<Sinks>1</Sinks>
 		<BigGunList>1</BigGunList>
 		<usOverheatingCooldownFactor>100.0</usOverheatingCooldownFactor>
+		<ItemFlag>256</ItemFlag>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
 		<PRONE_MODIFIERS />
@@ -13185,6 +13187,7 @@
 		<Sinks>1</Sinks>
 		<BigGunList>1</BigGunList>
 		<usOverheatingCooldownFactor>100.0</usOverheatingCooldownFactor>
+		<ItemFlag>256</ItemFlag>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
 		<PRONE_MODIFIERS />
@@ -13212,6 +13215,7 @@
 		<BurstToHitBonus>2</BurstToHitBonus>
 		<AutoFireToHitBonus>6</AutoFireToHitBonus>
 		<usOverheatingCooldownFactor>100.0</usOverheatingCooldownFactor>
+		<ItemFlag>256</ItemFlag>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
 		<PRONE_MODIFIERS />
@@ -13237,6 +13241,7 @@
 		<RangeBonus>120</RangeBonus>
 		<PercentAccuracyModifier>10</PercentAccuracyModifier>
 		<usOverheatingCooldownFactor>100.0</usOverheatingCooldownFactor>
+		<ItemFlag>256</ItemFlag>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
 		<PRONE_MODIFIERS />
@@ -13262,6 +13267,7 @@
 		<PercentNoiseReduction>40</PercentNoiseReduction>
 		<PercentRecoilModifier>-20</PercentRecoilModifier>
 		<usOverheatingCooldownFactor>100.0</usOverheatingCooldownFactor>
+		<ItemFlag>256</ItemFlag>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
 		<PRONE_MODIFIERS />
@@ -13287,6 +13293,7 @@
 		<PercentNoiseReduction>40</PercentNoiseReduction>
 		<PercentRecoilModifier>-20</PercentRecoilModifier>
 		<usOverheatingCooldownFactor>100.0</usOverheatingCooldownFactor>
+		<ItemFlag>256</ItemFlag>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
 		<PRONE_MODIFIERS />
@@ -18464,6 +18471,7 @@
 		<BR_ROF>950</BR_ROF>
 		<DefaultAttachment>209</DefaultAttachment>
 		<usOverheatingCooldownFactor>100.0</usOverheatingCooldownFactor>
+		<ItemFlag>128</ItemFlag>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
 		<PRONE_MODIFIERS />
@@ -32776,6 +32784,7 @@
 		<BR_ROF>1000</BR_ROF>
 		<DefaultAttachment>209</DefaultAttachment>
 		<usOverheatingCooldownFactor>100.0</usOverheatingCooldownFactor>
+		<ItemFlag>128</ItemFlag>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
 		<PRONE_MODIFIERS />
@@ -37113,6 +37122,7 @@
 		<BR_UsedInventory>1</BR_UsedInventory>
 		<CamoBonus>5</CamoBonus>
 		<usOverheatingCooldownFactor>100.0</usOverheatingCooldownFactor>
+		<ItemFlag>512</ItemFlag>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
 		<PRONE_MODIFIERS />