From ea79346cf3f74a78855eb19979982671b1cffca6 Mon Sep 17 00:00:00 2001
From: Flugente <Flugente@4f8fa57e-7814-0410-bad4-adc449f26b7c>
Date: Fri, 3 May 2013 23:29:01 +0000
Subject: [PATCH] new feature: dynamic flashlights allows useable flashlights

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1667 4f8fa57e-7814-0410-bad4-adc449f26b7c
---
 .../Data-1.13/TableData/Items/Attachments.xml | 360 ++++++++++++++++++
 .../TableData/Items/Item_Transformations.xml  |  68 ++++
 gamedir/Data-1.13/TableData/Items/Items.xml   | 112 ++++++
 gamedir/Data-1.13/TableData/Items/Weapons.xml |  20 +
 4 files changed, 560 insertions(+)

diff --git a/gamedir/Data-1.13/TableData/Items/Attachments.xml b/gamedir/Data-1.13/TableData/Items/Attachments.xml
index 71b38c2ba..41bfa7091 100644
--- a/gamedir/Data-1.13/TableData/Items/Attachments.xml
+++ b/gamedir/Data-1.13/TableData/Items/Attachments.xml
@@ -10276,6 +10276,11 @@
 		<itemIndex>873</itemIndex>
 		<APCost>8</APCost>
 	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>322</attachmentIndex>
+		<itemIndex>950</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
 	<ATTACHMENT>
 		<attachmentIndex>322</attachmentIndex>
 		<itemIndex>128</itemIndex>
@@ -10376,6 +10381,21 @@
 		<itemIndex>1626</itemIndex>
 		<APCost>20</APCost>
 	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>322</attachmentIndex>
+		<itemIndex>1635</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>322</attachmentIndex>
+		<itemIndex>1636</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>322</attachmentIndex>
+		<itemIndex>1637</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
 	<ATTACHMENT>
 		<attachmentIndex>592</attachmentIndex>
 		<itemIndex>674</itemIndex>
@@ -26717,4 +26737,344 @@
 		<itemIndex>784</itemIndex>
 		<APCost>20</APCost>
 	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1635</attachmentIndex>
+		<itemIndex>12</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1635</attachmentIndex>
+		<itemIndex>13</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1635</attachmentIndex>
+		<itemIndex>21</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1635</attachmentIndex>
+		<itemIndex>23</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1635</attachmentIndex>
+		<itemIndex>29</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1635</attachmentIndex>
+		<itemIndex>34</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1635</attachmentIndex>
+		<itemIndex>35</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1635</attachmentIndex>
+		<itemIndex>128</itemIndex>
+		<APCost>12</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1635</attachmentIndex>
+		<itemIndex>331</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1635</attachmentIndex>
+		<itemIndex>332</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1635</attachmentIndex>
+		<itemIndex>630</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1635</attachmentIndex>
+		<itemIndex>632</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1635</attachmentIndex>
+		<itemIndex>633</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1635</attachmentIndex>
+		<itemIndex>648</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1635</attachmentIndex>
+		<itemIndex>649</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1635</attachmentIndex>
+		<itemIndex>650</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1635</attachmentIndex>
+		<itemIndex>651</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1635</attachmentIndex>
+		<itemIndex>652</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1635</attachmentIndex>
+		<itemIndex>662</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1635</attachmentIndex>
+		<itemIndex>664</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1635</attachmentIndex>
+		<itemIndex>665</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1635</attachmentIndex>
+		<itemIndex>666</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1635</attachmentIndex>
+		<itemIndex>667</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1635</attachmentIndex>
+		<itemIndex>668</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1635</attachmentIndex>
+		<itemIndex>669</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1635</attachmentIndex>
+		<itemIndex>713</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1635</attachmentIndex>
+		<itemIndex>714</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1635</attachmentIndex>
+		<itemIndex>715</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1635</attachmentIndex>
+		<itemIndex>760</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1635</attachmentIndex>
+		<itemIndex>762</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1635</attachmentIndex>
+		<itemIndex>781</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1635</attachmentIndex>
+		<itemIndex>782</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1635</attachmentIndex>
+		<itemIndex>787</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1635</attachmentIndex>
+		<itemIndex>788</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1635</attachmentIndex>
+		<itemIndex>790</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1635</attachmentIndex>
+		<itemIndex>791</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1635</attachmentIndex>
+		<itemIndex>792</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1635</attachmentIndex>
+		<itemIndex>793</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1635</attachmentIndex>
+		<itemIndex>795</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1635</attachmentIndex>
+		<itemIndex>796</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1635</attachmentIndex>
+		<itemIndex>797</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1635</attachmentIndex>
+		<itemIndex>1066</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1635</attachmentIndex>
+		<itemIndex>1065</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1635</attachmentIndex>
+		<itemIndex>1070</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1635</attachmentIndex>
+		<itemIndex>1072</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1635</attachmentIndex>
+		<itemIndex>1074</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1635</attachmentIndex>
+		<itemIndex>1076</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1635</attachmentIndex>
+		<itemIndex>1077</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1635</attachmentIndex>
+		<itemIndex>1195</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1635</attachmentIndex>
+		<itemIndex>1201</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1635</attachmentIndex>
+		<itemIndex>896</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1635</attachmentIndex>
+		<itemIndex>897</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1635</attachmentIndex>
+		<itemIndex>1332</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1635</attachmentIndex>
+		<itemIndex>1333</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1635</attachmentIndex>
+		<itemIndex>1334</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1635</attachmentIndex>
+		<itemIndex>606</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1635</attachmentIndex>
+		<itemIndex>607</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1635</attachmentIndex>
+		<itemIndex>608</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1635</attachmentIndex>
+		<itemIndex>609</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1635</attachmentIndex>
+		<itemIndex>610</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1635</attachmentIndex>
+		<itemIndex>611</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1635</attachmentIndex>
+		<itemIndex>347</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1635</attachmentIndex>
+		<itemIndex>25</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1635</attachmentIndex>
+		<itemIndex>26</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1635</attachmentIndex>
+		<itemIndex>612</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1635</attachmentIndex>
+		<itemIndex>613</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1635</attachmentIndex>
+		<itemIndex>614</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1635</attachmentIndex>
+		<itemIndex>605</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
 </ATTACHMENTLIST>
\ No newline at end of file
diff --git a/gamedir/Data-1.13/TableData/Items/Item_Transformations.xml b/gamedir/Data-1.13/TableData/Items/Item_Transformations.xml
index b26b7bafd..acc59c002 100644
--- a/gamedir/Data-1.13/TableData/Items/Item_Transformations.xml
+++ b/gamedir/Data-1.13/TableData/Items/Item_Transformations.xml
@@ -221,4 +221,72 @@
 		<szMenuRowText>Combat mode</szMenuRowText>
 		<szTooltipText>Ready for combat.</szTooltipText>
 	</TRANSFORM>
+	<TRANSFORM>
+		<usItem>950</usItem>
+		<usResult1>1635</usResult1>
+		<usResult2>0</usResult2>
+		<usResult3>0</usResult3>
+		<usResult4>0</usResult4>
+		<usResult5>0</usResult5>
+		<usResult6>0</usResult6>
+		<usResult7>0</usResult7>
+		<usResult8>0</usResult8>
+		<usResult9>0</usResult9>
+		<usResult10>0</usResult10>
+		<usAPCost>1</usAPCost>
+		<iBPCost>0</iBPCost>
+		<szMenuRowText>ON</szMenuRowText>
+		<szTooltipText>Switch on flashlight.</szTooltipText>
+	</TRANSFORM>
+	<TRANSFORM>
+		<usItem>1635</usItem>
+		<usResult1>950</usResult1>
+		<usResult2>0</usResult2>
+		<usResult3>0</usResult3>
+		<usResult4>0</usResult4>
+		<usResult5>0</usResult5>
+		<usResult6>0</usResult6>
+		<usResult7>0</usResult7>
+		<usResult8>0</usResult8>
+		<usResult9>0</usResult9>
+		<usResult10>0</usResult10>
+		<usAPCost>1</usAPCost>
+		<iBPCost>0</iBPCost>
+		<szMenuRowText>OFF</szMenuRowText>
+		<szTooltipText>Switch off flashlight.</szTooltipText>
+	</TRANSFORM>
+	<TRANSFORM>
+		<usItem>1636</usItem>
+		<usResult1>1637</usResult1>
+		<usResult2>0</usResult2>
+		<usResult3>0</usResult3>
+		<usResult4>0</usResult4>
+		<usResult5>0</usResult5>
+		<usResult6>0</usResult6>
+		<usResult7>0</usResult7>
+		<usResult8>0</usResult8>
+		<usResult9>0</usResult9>
+		<usResult10>0</usResult10>
+		<usAPCost>1</usAPCost>
+		<iBPCost>0</iBPCost>
+		<szMenuRowText>ON</szMenuRowText>
+		<szTooltipText>Switch on flashlight.</szTooltipText>
+	</TRANSFORM>
+	<TRANSFORM>
+		<usItem>1637</usItem>
+		<usResult1>1636</usResult1>
+		<usResult2>0</usResult2>
+		<usResult3>0</usResult3>
+		<usResult4>0</usResult4>
+		<usResult5>0</usResult5>
+		<usResult6>0</usResult6>
+		<usResult7>0</usResult7>
+		<usResult8>0</usResult8>
+		<usResult9>0</usResult9>
+		<usResult10>0</usResult10>
+		<usAPCost>1</usAPCost>
+		<iBPCost>0</iBPCost>
+		<szMenuRowText>OFF</szMenuRowText>
+		<szTooltipText>Switch off flashlight.</szTooltipText>
+	</TRANSFORM>
 </TRANSFORMATIONS_LIST>
\ No newline at end of file
diff --git a/gamedir/Data-1.13/TableData/Items/Items.xml b/gamedir/Data-1.13/TableData/Items/Items.xml
index e00d67494..196164784 100644
--- a/gamedir/Data-1.13/TableData/Items/Items.xml
+++ b/gamedir/Data-1.13/TableData/Items/Items.xml
@@ -178,6 +178,7 @@
 		<clothestype>0</clothestype>
 		<randomitem>0</randomitem>
 		<randomitemcoolnessmodificator>0</randomitemcoolnessmodificator>
+		<FlashLightRange>0</FlashLightRange>
 		<STAND_MODIFIERS>
 			<FlatBase>0</FlatBase>
 			<PercentBase>0</PercentBase>
@@ -29542,6 +29543,7 @@
 		<Attachment>1</Attachment>
 		<BigGunList>1</BigGunList>
 		<Electronic>1</Electronic>
+		<NeedsBatteries>1</NeedsBatteries>
 		<BR_NewInventory>2</BR_NewInventory>
 		<BR_UsedInventory>1</BR_UsedInventory>
 		<ToHitBonus>20</ToHitBonus>
@@ -48905,4 +48907,114 @@
 		<Medical>1</Medical>
 		<DrugType>2097152</DrugType>
 	</ITEM>
+	<ITEM>
+		<uiIndex>1635</uiIndex>
+		<szItemName>LAM-Flashlight</szItemName>
+		<szLongItemName>Rifle LAM-Flashlight Combo</szLongItemName>
+		<szItemDesc>This Laser Aiming Module and tactical flashlight combination is meant to fit on modern rifle rail interface systems. Flashlight is ON.</szItemDesc>
+		<szBRName>Rifle LAM-Flashlight</szBRName>
+		<szBRDesc>Not for sale through BR.</szBRDesc>
+		<usItemClass>268435456</usItemClass>
+		<AttachmentClass>4</AttachmentClass>
+		<nasAttachmentClass>4</nasAttachmentClass>
+		<ubGraphicNum>341</ubGraphicNum>
+		<ubWeight>4</ubWeight>
+		<ubPerPocket>2</ubPerPocket>
+		<ItemSize>18</ItemSize>
+		<usPrice>2500</usPrice>
+		<ubCoolness>9</ubCoolness>
+		<bRepairEase>-2</bRepairEase>
+		<Damageable>1</Damageable>
+		<Repairable>1</Repairable>
+		<Metal>1</Metal>
+		<Attachment>1</Attachment>
+		<BigGunList>1</BigGunList>
+		<Electronic>1</Electronic>
+		<NeedsBatteries>1</NeedsBatteries>
+		<ToHitBonus>20</ToHitBonus>
+		<BestLaserRange>300</BestLaserRange>
+		<CamoBonus>-15</CamoBonus>
+		<UrbanCamoBonus>-15</UrbanCamoBonus>
+		<DesertCamoBonus>-15</DesertCamoBonus>
+		<SnowCamoBonus>-15</SnowCamoBonus>
+		<StealthBonus>-15</StealthBonus>
+		<NightVisionRangeBonus>20</NightVisionRangeBonus>
+		<CaveVisionRangeBonus>30</CaveVisionRangeBonus>
+		<ProjectionFactor>3.0</ProjectionFactor>
+		<FlashLightRange>15</FlashLightRange>
+		<STAND_MODIFIERS />
+		<CROUCH_MODIFIERS />
+		<PRONE_MODIFIERS />
+	</ITEM>
+	<ITEM>
+		<uiIndex>1636</uiIndex>
+		<szItemName>Flashlight</szItemName>
+		<szLongItemName>Flashlight</szLongItemName>
+		<szItemDesc>I am... the light! No wait, that ain't right. I'm just a flashlight. But I'm still useful. If everything else fails, use me to knock people over the hea.</szItemDesc>
+		<szBRName>Flashlight</szBRName>
+		<szBRDesc>We say: let there be light! Batteries included.</szBRDesc>
+		<usItemClass>128</usItemClass>
+		<nasLayoutClass>1</nasLayoutClass>
+		<ubClassIndex>49</ubClassIndex>
+		<ubCursor>2</ubCursor>
+		<ubGraphicType>2</ubGraphicType>
+		<ubGraphicNum>154</ubGraphicNum>
+		<ubWeight>5</ubWeight>
+		<ubPerPocket>1</ubPerPocket>
+		<ItemSize>13</ItemSize>
+		<usPrice>50</usPrice>
+		<ubCoolness>2</ubCoolness>
+		<bReliability>1</bReliability>
+		<bRepairEase>-1</bRepairEase>
+		<Damageable>1</Damageable>
+		<Repairable>1</Repairable>
+		<Metal>1</Metal>
+		<Sinks>1</Sinks>		
+		<Electronic>1</Electronic>
+		<NeedsBatteries>1</NeedsBatteries>
+		<ShowStatus>1</ShowStatus>
+		<DefaultAttachment>322</DefaultAttachment>
+		<BR_NewInventory>4</BR_NewInventory>
+		<BR_UsedInventory>3</BR_UsedInventory>
+		<BR_ROF>30</BR_ROF>
+		<BrassKnuckles>1</BrassKnuckles>
+		<STAND_MODIFIERS />
+		<CROUCH_MODIFIERS />
+		<PRONE_MODIFIERS />
+	</ITEM>
+	<ITEM>
+		<uiIndex>1637</uiIndex>
+		<szItemName>Flashlight</szItemName>
+		<szLongItemName>Flashlight</szLongItemName>
+		<szItemDesc>I am... the light! No wait, that ain't right. I'm just a flashlight. But I'm still useful. If everything else fails, use me to knock people over the head. Flashlight is ON.</szItemDesc>
+		<szBRName>Flashlight</szBRName>
+		<szBRDesc>Not for sale through BR.</szBRDesc>
+		<usItemClass>128</usItemClass>
+		<nasLayoutClass>1</nasLayoutClass>
+		<ubClassIndex>49</ubClassIndex>
+		<ubCursor>2</ubCursor>
+		<ubGraphicType>2</ubGraphicType>
+		<ubGraphicNum>154</ubGraphicNum>
+		<ubWeight>5</ubWeight>
+		<ubPerPocket>1</ubPerPocket>
+		<ItemSize>13</ItemSize>
+		<usPrice>50</usPrice>
+		<ubCoolness>2</ubCoolness>
+		<bReliability>1</bReliability>
+		<bRepairEase>-1</bRepairEase>
+		<Damageable>1</Damageable>
+		<Repairable>1</Repairable>
+		<Metal>1</Metal>
+		<Sinks>1</Sinks>		
+		<Electronic>1</Electronic>
+		<NeedsBatteries>1</NeedsBatteries>
+		<ShowStatus>1</ShowStatus>
+		<DefaultAttachment>322</DefaultAttachment>
+		<BR_ROF>30</BR_ROF>
+		<BrassKnuckles>1</BrassKnuckles>
+		<FlashLightRange>18</FlashLightRange>
+		<STAND_MODIFIERS />
+		<CROUCH_MODIFIERS />
+		<PRONE_MODIFIERS />
+	</ITEM>
 </ITEMLIST>
\ No newline at end of file
diff --git a/gamedir/Data-1.13/TableData/Items/Weapons.xml b/gamedir/Data-1.13/TableData/Items/Weapons.xml
index c737bba41..519115346 100644
--- a/gamedir/Data-1.13/TableData/Items/Weapons.xml
+++ b/gamedir/Data-1.13/TableData/Items/Weapons.xml
@@ -13162,4 +13162,24 @@
 		<MaxDistForMessyDeath>7</MaxDistForMessyDeath>
 		<ManualReloadSound>476</ManualReloadSound>
 	</WEAPON>
+	<WEAPON>
+		<uiIndex>1636</uiIndex>
+		<szWeaponName>Flashlight</szWeaponName>
+		<ubWeaponClass>6</ubWeaponClass>
+		<ubShotsPer4Turns>10</ubShotsPer4Turns>
+		<ubImpact>18</ubImpact>
+		<ubDeadliness>3</ubDeadliness>
+		<usReloadDelay>200</usReloadDelay>
+		<MaxDistForMessyDeath>7</MaxDistForMessyDeath>
+	</WEAPON>
+	<WEAPON>
+		<uiIndex>1637</uiIndex>
+		<szWeaponName>Flashlight</szWeaponName>
+		<ubWeaponClass>6</ubWeaponClass>
+		<ubShotsPer4Turns>10</ubShotsPer4Turns>
+		<ubImpact>18</ubImpact>
+		<ubDeadliness>3</ubDeadliness>
+		<usReloadDelay>200</usReloadDelay>
+		<MaxDistForMessyDeath>7</MaxDistForMessyDeath>
+	</WEAPON>
 </WEAPONLIST>
\ No newline at end of file