From 22f0f89b33cf221bf668e5e38fe8e28b83050efd Mon Sep 17 00:00:00 2001
From: MaddMugsy <MaddMugsy@4f8fa57e-7814-0410-bad4-adc449f26b7c>
Date: Fri, 25 May 2012 17:07:58 +0000
Subject: [PATCH] Updated Lookup table xmls

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1436 4f8fa57e-7814-0410-bad4-adc449f26b7c
---
 .../TableData/Lookup/AttachmentClass.xml      | 135 ++++++++++++++++++
 .../Data-1.13/TableData/Lookup/DrugType.xml   |  99 +++++++++++++
 .../Data-1.13/TableData/Lookup/ItemClass.xml  |   8 ++
 .../Data-1.13/TableData/Lookup/MergeType.xml  |  14 +-
 .../TableData/Lookup/Separability.xml         |  15 ++
 5 files changed, 270 insertions(+), 1 deletion(-)
 create mode 100644 gamedir/Data-1.13/TableData/Lookup/AttachmentClass.xml
 create mode 100644 gamedir/Data-1.13/TableData/Lookup/DrugType.xml
 create mode 100644 gamedir/Data-1.13/TableData/Lookup/Separability.xml

diff --git a/gamedir/Data-1.13/TableData/Lookup/AttachmentClass.xml b/gamedir/Data-1.13/TableData/Lookup/AttachmentClass.xml
new file mode 100644
index 000000000..25842e497
--- /dev/null
+++ b/gamedir/Data-1.13/TableData/Lookup/AttachmentClass.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="utf-8"?>
+<JA2Data>
+	<AttachmentClass>
+		<id>0</id>
+		<name>Default</name>
+	</AttachmentClass>
+	<AttachmentClass>
+		<id>1</id>
+		<name>Bipod</name>
+	</AttachmentClass>
+	<AttachmentClass>
+		<id>2</id>
+		<name>Suppressor</name>
+	</AttachmentClass>
+	<AttachmentClass>
+		<id>4</id>
+		<name>Laser</name>
+	</AttachmentClass>
+	<AttachmentClass>
+		<id>8</id>
+		<name>Sight</name>
+	</AttachmentClass>
+	<AttachmentClass>
+		<id>12</id>
+		<name>Laser + Sight</name>
+	</AttachmentClass>
+	<AttachmentClass>
+		<id>16</id>
+		<name>Scope</name>
+	</AttachmentClass>
+	<AttachmentClass>
+		<id>20</id>
+		<name>Laser + Scope</name>
+	</AttachmentClass>
+	<AttachmentClass>
+		<id>24</id>
+		<name>Sight + Scope</name>
+	</AttachmentClass>
+	<AttachmentClass>
+		<id>28</id>
+		<name>Laser + Sight + Scope</name>
+	</AttachmentClass>
+	<AttachmentClass>
+		<id>32</id>
+		<name>Stock</name>
+	</AttachmentClass>
+	<AttachmentClass>
+		<id>64</id>
+		<name>Magwell</name>
+	</AttachmentClass>
+	<AttachmentClass>
+		<id>128</id>
+		<name>Internal</name>
+	</AttachmentClass>
+	<AttachmentClass>
+		<id>256</id>
+		<name>External</name>
+	</AttachmentClass>
+	<AttachmentClass>
+		<id>512</id>
+		<name>Underbarrel</name>
+	</AttachmentClass>
+	<AttachmentClass>
+		<id>513</id>
+		<name>Bipod + Underbarrel</name>
+	</AttachmentClass>
+	<AttachmentClass>
+		<id>1024</id>
+		<name>Grenade</name>
+	</AttachmentClass>
+	<AttachmentClass>
+		<id>2048</id>
+		<name>Rocket</name>
+	</AttachmentClass>
+	<AttachmentClass>
+		<id>4096</id>
+		<name>Foregrip</name>
+	</AttachmentClass>
+	<AttachmentClass>
+		<id>4097</id>
+		<name>Bipod + Foregrip</name>
+	</AttachmentClass>
+	<AttachmentClass>
+		<id>4608</id>
+		<name>Foregrip + Underbarrel</name>
+	</AttachmentClass>
+	<AttachmentClass>
+		<id>8192</id>
+		<name>Helmet</name>
+	</AttachmentClass>
+	<AttachmentClass>
+		<id>16384</id>
+		<name>Vest</name>
+	</AttachmentClass>
+	<AttachmentClass>
+		<id>32768</id>
+		<name>Pants</name>
+	</AttachmentClass>
+	<AttachmentClass>
+		<id>65536</id>
+		<name>Detonator</name>
+	</AttachmentClass>
+	<AttachmentClass>
+		<id>131072</id>
+		<name>Battery</name>
+	</AttachmentClass>
+	<AttachmentClass>
+		<id>262144</id>
+		<name>Extender</name>
+	</AttachmentClass>
+	<AttachmentClass>
+		<id>524288</id>
+		<name>Sling</name>
+	</AttachmentClass>
+	<AttachmentClass>
+		<id>1048576</id>
+		<name>Remote Detonator</name>
+	</AttachmentClass>
+	<AttachmentClass>
+		<id>2097152</id>
+		<name>Defuser</name>
+	</AttachmentClass>
+	<AttachmentClass>
+		<id>2162688</id>
+		<name>Detonator + Defuser</name>
+	</AttachmentClass>
+	<AttachmentClass>
+		<id>3145728</id>
+		<name>Remote Detonator + Defuser</name>
+	</AttachmentClass>
+	<AttachmentClass>
+		<id>4194304</id>
+		<name>Iron Sight</name>
+	</AttachmentClass>
+</JA2Data>
\ No newline at end of file
diff --git a/gamedir/Data-1.13/TableData/Lookup/DrugType.xml b/gamedir/Data-1.13/TableData/Lookup/DrugType.xml
new file mode 100644
index 000000000..9e293561d
--- /dev/null
+++ b/gamedir/Data-1.13/TableData/Lookup/DrugType.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<JA2Data>
+	<DrugType>
+		<id>0</id>
+		<name>None</name>
+	</DrugType>
+	<DrugType>
+		<id>1</id>
+		<name>Adrenaline</name>
+	</DrugType>
+	<DrugType>
+		<id>2</id>
+		<name>Alcohol</name>
+	</DrugType>
+	<DrugType>
+		<id>4</id>
+		<name>Regeneration</name>
+	</DrugType>
+	<DrugType>
+		<id>8</id>
+		<name>Damage Resistance</name>
+	</DrugType>
+	<DrugType>
+		<id>16</id>
+		<name>Strength</name>
+	</DrugType>
+	<DrugType>
+		<id>32</id>
+		<name>Agility</name>
+	</DrugType>
+	<DrugType>
+		<id>64</id>
+		<name>Dexterity</name>
+	</DrugType>
+	<DrugType>
+		<id>128</id>
+		<name>Wisdom</name>
+	</DrugType>
+	<DrugType>
+		<id>256</id>
+		<name>Perception</name>
+	</DrugType>
+	<DrugType>
+		<id>512</id>
+		<name>Psychosis</name>
+	</DrugType>
+	<DrugType>
+		<id>1024</id>
+		<name>Nervousness</name>
+	</DrugType>
+	<DrugType>
+		<id>1280</id>
+		<name>Reflex</name>
+	</DrugType>
+	<DrugType>
+		<id>2048</id>
+		<name>Claustrophobia</name>
+	</DrugType>
+	<DrugType>
+		<id>4096</id>
+		<name>Heat Intolerance</name>
+	</DrugType>
+	<DrugType>
+		<id>8192</id>
+		<name>Fear of Insects</name>
+	</DrugType>
+	<DrugType>
+		<id>16384</id>
+		<name>Forgetfulness</name>
+	</DrugType>
+	<DrugType>
+		<id>30824</id>
+		<name>Stim</name>
+	</DrugType>
+	<DrugType>
+		<id>32768</id>
+		<name>Blindness</name>
+	</DrugType>
+	<DrugType>
+		<id>65536</id>
+		<name>Unconsciousness</name>
+	</DrugType>
+	<DrugType>
+		<id>66064</id>
+		<name>Barrage</name>
+	</DrugType>
+	<DrugType>
+		<id>131072</id>
+		<name>Vision</name>
+	</DrugType>
+	<DrugType>
+		<id>262144</id>
+		<name>Tunnel Vision</name>
+	</DrugType>
+	<DrugType>
+		<id>425984</id>
+		<name>Occulin</name>
+	</DrugType>
+</JA2Data>
\ No newline at end of file
diff --git a/gamedir/Data-1.13/TableData/Lookup/ItemClass.xml b/gamedir/Data-1.13/TableData/Lookup/ItemClass.xml
index 6ccc21c1b..edf3b3c51 100644
--- a/gamedir/Data-1.13/TableData/Lookup/ItemClass.xml
+++ b/gamedir/Data-1.13/TableData/Lookup/ItemClass.xml
@@ -44,6 +44,10 @@
 		<id>1024</id>
 		<name>Ammo</name>
 	</ItemClass>
+	<ItemClass>
+		<id>1280</id>
+		<name>Ammo / Grenade</name>
+	</ItemClass>
 	<ItemClass>
 		<id>2048</id>
 		<name>Armour</name>
@@ -72,6 +76,10 @@
 		<id>268435456</id>
 		<name>Misc</name>
 	</ItemClass>
+	<ItemClass>
+		<id>268435712</id>
+		<name>Grenade / Misc</name>
+	</ItemClass>
 	<ItemClass>
 		<id>536870912</id>
 		<name>Money</name>
diff --git a/gamedir/Data-1.13/TableData/Lookup/MergeType.xml b/gamedir/Data-1.13/TableData/Lookup/MergeType.xml
index 0222127f2..86181be45 100644
--- a/gamedir/Data-1.13/TableData/Lookup/MergeType.xml
+++ b/gamedir/Data-1.13/TableData/Lookup/MergeType.xml
@@ -14,7 +14,7 @@
 	</MergeType>
 	<MergeType>
 		<id>3</id>
-		<name>Explosive</name>
+		<name>Explosive (Hard)</name>
 	</MergeType>
 	<MergeType>
 		<id>4</id>
@@ -36,4 +36,16 @@
 		<id>8</id>
 		<name>Swap Barrel</name>
 	</MergeType>
+	<MergeType>
+		<id>9</id>
+		<name>Explosive (Easy)</name>
+	</MergeType>
+	<MergeType>
+		<id>10</id>
+		<name>Mechanical (Easy)</name>
+	</MergeType>
+	<MergeType>
+		<id>11</id>
+		<name>Mechanical (Hard)</name>
+	</MergeType>
 </JA2Data>
\ No newline at end of file
diff --git a/gamedir/Data-1.13/TableData/Lookup/Separability.xml b/gamedir/Data-1.13/TableData/Lookup/Separability.xml
new file mode 100644
index 000000000..eee64106e
--- /dev/null
+++ b/gamedir/Data-1.13/TableData/Lookup/Separability.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<JA2Data>
+	<Separability>
+		<id>0</id>
+		<name>Removable</name>
+	</Separability>
+	<Separability>
+		<id>1</id>
+		<name>Inseparable</name>
+	</Separability>
+	<Separability>
+		<id>2</id>
+		<name>Replaceable</name>
+	</Separability>
+</JA2Data>
\ No newline at end of file