From 7b0b11675d75773d36f00154ba129c8719480b1e Mon Sep 17 00:00:00 2001
From: Flugente <Flugente@4f8fa57e-7814-0410-bad4-adc449f26b7c>
Date: Tue, 9 Apr 2013 21:11:39 +0000
Subject: [PATCH] new drug: M99 (#1634) uses the Etorphine drug effect (#22).
 Stuns a target, but can also kill it if overdosed.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1642 4f8fa57e-7814-0410-bad4-adc449f26b7c
---
 gamedir/Data-1.13/TableData/Items/Drugs.xml   | 11 ++++++++++
 gamedir/Data-1.13/TableData/Items/Items.xml   | 20 +++++++++++++++++++
 .../NPCInventory/HowardInventory.xml          |  5 +++++
 3 files changed, 36 insertions(+)

diff --git a/gamedir/Data-1.13/TableData/Items/Drugs.xml b/gamedir/Data-1.13/TableData/Items/Drugs.xml
index 382900c5f..b250c9143 100644
--- a/gamedir/Data-1.13/TableData/Items/Drugs.xml
+++ b/gamedir/Data-1.13/TableData/Items/Drugs.xml
@@ -47,6 +47,7 @@ How do you make a drug?
 	262144   DRUG_TUNNELVISION 		increases tunnelvison, side effect only
 	524288   DRUG_LIFEDAMAGE 		damages life, sideeffect only
 	1048576  DRUG_CUREPOISON		cures poison
+	2097152  DRUG_STUNANDKILL   stuns the target for its duration. Can be lethal if overdosed (depends on bodytype)
 
 You can combine "mix" different drug effects.
 For example, the new drug 'Occulin' has a <DrugType>425984</DrugType>. This gives it the effects of DRUG_BLIND, DRUG_VISION and DRUG_TUNNELVISION. I've set the effects so that
@@ -282,4 +283,14 @@ Note: The regeneration drug has no entries - that is intended, because this effe
 		<ubDrugSideEffectRate>0</ubDrugSideEffectRate>
 		<ubMoralBacklash>1</ubMoralBacklash>
 	</DRUG>
+	<DRUG>
+		<ubType>22</ubType>
+		<name>Etorphine</name>
+		<ubDrugTravelRate>10</ubDrugTravelRate>
+		<ubDrugWearoffRate>1</ubDrugWearoffRate>
+		<ubDrugEffect>10</ubDrugEffect>
+		<ubDrugSideEffect>0</ubDrugSideEffect>
+		<ubDrugSideEffectRate>0</ubDrugSideEffectRate>
+		<ubMoralBacklash>0</ubMoralBacklash>
+	</DRUG>
 </DRUGSLIST>
diff --git a/gamedir/Data-1.13/TableData/Items/Items.xml b/gamedir/Data-1.13/TableData/Items/Items.xml
index b8a580086..e00d67494 100644
--- a/gamedir/Data-1.13/TableData/Items/Items.xml
+++ b/gamedir/Data-1.13/TableData/Items/Items.xml
@@ -48885,4 +48885,24 @@
 		<CROUCH_MODIFIERS />
 		<PRONE_MODIFIERS />
 	</ITEM>
+	<ITEM>
+		<uiIndex>1634</uiIndex>
+		<szItemName>M99</szItemName>
+		<szLongItemName>M99</szLongItemName>
+		<szItemDesc>A very strong animal tranquilizer. Lethal if overdosed, and you are not an elephant.</szItemDesc>
+		<szBRName>M99</szBRName>
+		<szBRDesc>Not for sale through BR.</szBRDesc>
+		<usItemClass>268435456</usItemClass>
+		<nasLayoutClass>1</nasLayoutClass>
+		<ubGraphicType>1</ubGraphicType>
+		<ubGraphicNum>70</ubGraphicNum>
+		<ubWeight>1</ubWeight>
+		<ubPerPocket>8</ubPerPocket>
+		<ItemSize>16</ItemSize>
+		<usPrice>200</usPrice>
+		<ubCoolness>5</ubCoolness>
+		<Damageable>1</Damageable>
+		<Medical>1</Medical>
+		<DrugType>2097152</DrugType>
+	</ITEM>
 </ITEMLIST>
\ No newline at end of file
diff --git a/gamedir/Data-1.13/TableData/NPCInventory/HowardInventory.xml b/gamedir/Data-1.13/TableData/NPCInventory/HowardInventory.xml
index 3dad4b849..79674b677 100644
--- a/gamedir/Data-1.13/TableData/NPCInventory/HowardInventory.xml
+++ b/gamedir/Data-1.13/TableData/NPCInventory/HowardInventory.xml
@@ -95,4 +95,9 @@
 		<sItemIndex>1548</sItemIndex>
 		<ubOptimalNumber>3</ubOptimalNumber>
 	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>19</uiIndex>
+		<sItemIndex>1634</sItemIndex>
+		<ubOptimalNumber>5</ubOptimalNumber>
+	</INVENTORY>
 </INVENTORYLIST>
\ No newline at end of file