From a3e05a9412af75662ccf133946e480999943431b Mon Sep 17 00:00:00 2001
From: Flugente <Flugente@4f8fa57e-7814-0410-bad4-adc449f26b7c>
Date: Sat, 4 Jul 2015 20:24:00 +0000
Subject: [PATCH] - increased 'cigar' drug effects - neurotoxin darts now use
 the new drug system

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2258 4f8fa57e-7814-0410-bad4-adc449f26b7c
---
 .../Data-1.13/TableData/Items/AmmoTypes.xml   |  1 -
 gamedir/Data-1.13/TableData/Items/Drugs.xml   | 19 ++++++++++++++-----
 gamedir/Data-1.13/TableData/Items/Items.xml   |  2 ++
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/gamedir/Data-1.13/TableData/Items/AmmoTypes.xml b/gamedir/Data-1.13/TableData/Items/AmmoTypes.xml
index 8a3cfbe4c..839247c13 100644
--- a/gamedir/Data-1.13/TableData/Items/AmmoTypes.xml
+++ b/gamedir/Data-1.13/TableData/Items/AmmoTypes.xml
@@ -1136,7 +1136,6 @@
 		<spreadPattern />
 		<temperatureModificator>-0.1</temperatureModificator>
 		<dirtModificator>0</dirtModificator>
-		<ammoflag>1</ammoflag>
 		<dDamageModifierLife>1.0</dDamageModifierLife>
 		<dDamageModifierBreath>1.0</dDamageModifierBreath>
 	</AMMOTYPE>
diff --git a/gamedir/Data-1.13/TableData/Items/Drugs.xml b/gamedir/Data-1.13/TableData/Items/Drugs.xml
index c4c9dd46c..2101a5456 100644
--- a/gamedir/Data-1.13/TableData/Items/Drugs.xml
+++ b/gamedir/Data-1.13/TableData/Items/Drugs.xml
@@ -1,5 +1,5 @@
 <!--
-<uiIndex>				number referred to by DrugType in Items.xml
+<uiIndex>				number referred to by DrugType in Items.xml. 100 drugs may be defined.
 <szName>				name of drug
 <opinionevent>			if 1, other mercs will complain about drug use
 
@@ -473,20 +473,20 @@ If <chance> is set, this is the chance that this effect is applied when consumin
 		<DRUG_EFFECT>
 			<effect>1</effect>
 			<duration>3</duration>
-			<size>-100</size>
+			<size>-300</size>
 		</DRUG_EFFECT>
 		
-		<!-- slightly increased morale breath -->
+		<!-- slightly increased morale -->
 		<DRUG_EFFECT>
 			<effect>3</effect>
 			<duration>3</duration>
-			<size>1</size>
+			<size>21</size>
 		</DRUG_EFFECT>
 		
 		<!-- lung cancer -->
 		<DISEASE_EFFECT>
 			<disease>17</disease>
-			<size>100</size>
+			<size>150</size>
 		</DISEASE_EFFECT>	
 	</DRUG>
 	<DRUG>
@@ -764,4 +764,13 @@ If <chance> is set, this is the chance that this effect is applied when consumin
 			<size>-800</size>
 		</DISEASE_EFFECT>
 	</DRUG>
+	<DRUG>
+		<uiIndex>18</uiIndex>
+		<szName>Neurotoxin dart</szName>
+		<DRUG_EFFECT>
+			<effect>0</effect>
+			<duration>3</duration>
+			<size>-35</size>
+		</DRUG_EFFECT>
+	</DRUG>
 </DRUGSLIST>
diff --git a/gamedir/Data-1.13/TableData/Items/Items.xml b/gamedir/Data-1.13/TableData/Items/Items.xml
index 8da08d350..127fb1808 100644
--- a/gamedir/Data-1.13/TableData/Items/Items.xml
+++ b/gamedir/Data-1.13/TableData/Items/Items.xml
@@ -47374,6 +47374,7 @@
 		<ubCoolness>8</ubCoolness>
 		<HideMuzzleFlash>1</HideMuzzleFlash>
 		<usOverheatingCooldownFactor>100.0</usOverheatingCooldownFactor>
+		<DrugType>18</DrugType>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
 		<PRONE_MODIFIERS />
@@ -48917,6 +48918,7 @@
 		<Sinks>1</Sinks>
 		<TwoHanded>1</TwoHanded>
 		<usOverheatingCooldownFactor>100</usOverheatingCooldownFactor>
+		<DrugType>18</DrugType>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
 		<PRONE_MODIFIERS />