From 0316223f322bf17c25136d3ec44191b651947799 Mon Sep 17 00:00:00 2001
From: Flugente <Flugente@4f8fa57e-7814-0410-bad4-adc449f26b7c>
Date: Mon, 3 Dec 2012 23:29:11 +0000
Subject: [PATCH] - allowed to check militia in Tixa - added pepper spray to a
 few mercs

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1570 4f8fa57e-7814-0410-bad4-adc449f26b7c
---
 gamedir/Data-1.13/TableData/Map/Cities.xml    |  2 +-
 .../Data-1.13/TableData/MercStartingGear.xml  | 42 +++++++++----------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/gamedir/Data-1.13/TableData/Map/Cities.xml b/gamedir/Data-1.13/TableData/Map/Cities.xml
index 823fe1b70..d38bdb81c 100644
--- a/gamedir/Data-1.13/TableData/Map/Cities.xml
+++ b/gamedir/Data-1.13/TableData/Map/Cities.xml
@@ -127,7 +127,7 @@ Changes do not require starting of a new game.
 			<townName>Tixa</townName>
 			<townUsesLoyalty>0</townUsesLoyalty>
 			<townRebelSentiment>20</townRebelSentiment>
-			<townMilitiaAllowed>0</townMilitiaAllowed>
+			<townMilitiaAllowed>1</townMilitiaAllowed>
 			<hiddenTown>1</hiddenTown>
 			<townIcon>1</townIcon>
 			<szIconFile>interface\PRISON.sti</szIconFile>
diff --git a/gamedir/Data-1.13/TableData/MercStartingGear.xml b/gamedir/Data-1.13/TableData/MercStartingGear.xml
index 210d46415..6780982a0 100644
--- a/gamedir/Data-1.13/TableData/MercStartingGear.xml
+++ b/gamedir/Data-1.13/TableData/MercStartingGear.xml
@@ -4769,9 +4769,9 @@
 			<mBig3Status>0</mBig3Status>
 			<mBig3Quantity>1</mBig3Quantity>
 			<mBig3Drop>0</mBig3Drop>
-			<mSmall0>0</mSmall0>
-			<mSmall0Status>0</mSmall0Status>
-			<mSmall0Quantity>0</mSmall0Quantity>
+			<mSmall0>1627</mSmall0>
+			<mSmall0Status>98</mSmall0Status>
+			<mSmall0Quantity>1</mSmall0Quantity>
 			<mSmall1>0</mSmall1>
 			<mSmall1Status>0</mSmall1Status>
 			<mSmall1Quantity>0</mSmall1Quantity>
@@ -4834,9 +4834,9 @@
 			<mBig3Status>0</mBig3Status>
 			<mBig3Quantity>0</mBig3Quantity>
 			<mBig3Drop>0</mBig3Drop>
-			<mSmall0>0</mSmall0>
-			<mSmall0Status>0</mSmall0Status>
-			<mSmall0Quantity>0</mSmall0Quantity>
+			<mSmall0>1627</mSmall0>
+			<mSmall0Status>98</mSmall0Status>
+			<mSmall0Quantity>1</mSmall0Quantity>
 			<mSmall1>0</mSmall1>
 			<mSmall1Status>0</mSmall1Status>
 			<mSmall1Quantity>0</mSmall1Quantity>
@@ -4905,9 +4905,9 @@
 			<mSmall1>151</mSmall1>
 			<mSmall1Status>79</mSmall1Status>
 			<mSmall1Quantity>1</mSmall1Quantity>
-			<mSmall2>0</mSmall2>
-			<mSmall2Status>0</mSmall2Status>
-			<mSmall2Quantity>0</mSmall2Quantity>
+			<mSmall2>1627</mSmall2>
+			<mSmall2Status>93</mSmall2Status>
+			<mSmall2Quantity>1</mSmall2Quantity>
 			<mSmall3>0</mSmall3>
 			<mSmall3Status>0</mSmall3Status>
 			<mSmall3Quantity>0</mSmall3Quantity>
@@ -5756,9 +5756,9 @@
 			<mBig3Status>98</mBig3Status>
 			<mBig3Quantity>1</mBig3Quantity>
 			<mBig3Drop>0</mBig3Drop>
-			<mSmall0>0</mSmall0>
-			<mSmall0Status>0</mSmall0Status>
-			<mSmall0Quantity>0</mSmall0Quantity>
+			<mSmall0>1627</mSmall0>
+			<mSmall0Status>98</mSmall0Status>
+			<mSmall0Quantity>1</mSmall0Quantity>
 			<mSmall1>0</mSmall1>
 			<mSmall1Status>0</mSmall1Status>
 			<mSmall1Quantity>1</mSmall1Quantity>
@@ -6417,9 +6417,9 @@
 			<mSmall0>300</mSmall0>
 			<mSmall0Status>81</mSmall0Status>
 			<mSmall0Quantity>1</mSmall0Quantity>
-			<mSmall1>0</mSmall1>
-			<mSmall1Status>0</mSmall1Status>
-			<mSmall1Quantity>0</mSmall1Quantity>
+			<mSmall1>1627</mSmall1>
+			<mSmall1Status>95</mSmall1Status>
+			<mSmall1Quantity>1</mSmall1Quantity>
 			<mSmall2>0</mSmall2>
 			<mSmall2Status>0</mSmall2Status>
 			<mSmall2Quantity>0</mSmall2Quantity>
@@ -13474,9 +13474,9 @@
 			<mBig3Status>0</mBig3Status>
 			<mBig3Quantity>0</mBig3Quantity>
 			<mBig3Drop>0</mBig3Drop>
-			<mSmall0>0</mSmall0>
-			<mSmall0Status>0</mSmall0Status>
-			<mSmall0Quantity>0</mSmall0Quantity>
+			<mSmall0>1627</mSmall0>
+			<mSmall0Status>98</mSmall0Status>
+			<mSmall0Quantity>1</mSmall0Quantity>
 			<mSmall1>0</mSmall1>
 			<mSmall1Status>0</mSmall1Status>
 			<mSmall1Quantity>0</mSmall1Quantity>
@@ -28578,9 +28578,9 @@
 			<mBig3Status>0</mBig3Status>
 			<mBig3Quantity>0</mBig3Quantity>
 			<mBig3Drop>0</mBig3Drop>
-			<mSmall0>0</mSmall0>
-			<mSmall0Status>0</mSmall0Status>
-			<mSmall0Quantity>0</mSmall0Quantity>
+			<mSmall0>1627</mSmall0>
+			<mSmall0Status>98</mSmall0Status>
+			<mSmall0Quantity>1</mSmall0Quantity>
 			<mSmall1>0</mSmall1>
 			<mSmall1Status>0</mSmall1Status>
 			<mSmall1Quantity>0</mSmall1Quantity>