diff --git a/Data-AIM/Skills_Settings.INI b/Data-AIM/Skills_Settings.INI
index 0f77bab..0f34786 100644
--- a/Data-AIM/Skills_Settings.INI
+++ b/Data-AIM/Skills_Settings.INI
@@ -764,6 +764,15 @@ COVERT_DETECTEDIFBLEEDING = FALSE
; and redisguise automatically after 3 turns not seen by the enemy
; COVERT_STRIPIFUNCOVERED = FALSE
+; if set to TRUE, we can try to coax enemy soldiers to become turncoats. If successful, we can order turncoats to defect to the militia later.
+COVERT_TURNCOATS = TRUE
+
+; if set to TRUE, activating all turncoats within a sector requires a radio operator
+COVERT_TURNCOATS_SECTOR_ACTIVATION_REQUIRES_RADIOOPERATOR = FALSE
+
+; a bonus to the player's rating when convincing soldiers to become turncoats. Higher is better, values in [-100; 100], default 0.
+COVERT_TURNCOATS_PLAYER_CONVINCTION_BONUS = 0
+
;******************************************************************************************************************************
;******************************************************************************************************************************
[Radio Operator]
diff --git a/Data-AIM/TableData/Items/AmmoTypes.xml b/Data-AIM/TableData/Items/AmmoTypes.xml
index 0a72563..7761ced 100644
--- a/Data-AIM/TableData/Items/AmmoTypes.xml
+++ b/Data-AIM/TableData/Items/AmmoTypes.xml
@@ -1,12 +1,65 @@
+
+
0
Ball small
- 136
- 4
- 1
- 3
+ 137
+ 137
+ 137
1
1
1
@@ -23,7 +76,6 @@
1
0
0
- 0
0
0
0
@@ -33,19 +85,21 @@
0
1
- 0
0
0
1.0
1.0
+ 0.0
+ 0.0
+ 1.0
+ 1.0
1
HP small
- 24
- 12
- 9
- 11
+ 69
+ 69
+ 224
2
1
3
@@ -62,7 +116,6 @@
1
0
0
- 0
0
0
0
@@ -72,19 +125,21 @@
0
1
- 0
0
0
1.0
1.0
+ 0.0
+ 0.0
+ 1.0
+ 1.0
2
AP/FMJ small
- 218
- 8
- 5
- 7
+ 204
+ 0
+ 0
3
4
3
@@ -101,7 +156,6 @@
1
0
0
- 0
0
0
0
@@ -111,19 +165,21 @@
0
1
- 0
0
0
1.0
1.0
+ 0.0
+ 0.1
+ 1.0
+ 1.0
3
SAP
- 163
- 8
- 5
- 7
+ 255
+ 0
+ 0
1
2
1
@@ -140,7 +196,6 @@
1
0
0
- 0
0
0
0
@@ -150,19 +205,21 @@
0
1
- 0
0
0
1.0
1.0
+ 0.0
+ 0.5
+ 1.0
+ 1.0
4
Buckshot
- 125
- 4
- 1
- 3
+ 214
+ 191
+ 137
1
1
1
@@ -179,7 +236,6 @@
4
0
0
- 0
0
0
0
@@ -189,19 +245,21 @@
0
BuckshotSpread
1
- 0
0
0
1.0
1.0
+ 0.0
+ 0.0
+ 1.0
+ 1.0
5
Flechette
- 218
- 8
- 5
- 7
+ 178
+ 15
+ 15
4
5
4
@@ -218,7 +276,6 @@
3
0
0
- 0
0
0
0
@@ -228,19 +285,21 @@
0
FlechetteSpread
1
- 0
0
0
1.0
1.0
+ 0.0
+ 0.0
+ 1.0
+ 1.0
6
Grenade
- 75
- 4
- 1
- 3
+ 255
+ 206
+ 30
1
1
1
@@ -257,7 +316,6 @@
1
19
1
- 0
0
0
0
@@ -267,19 +325,21 @@
0
1
- 0
0
0
1.0
1.0
+ 0.0
+ 0.5
+ 1.0
+ 1.0
7
Napalm
- 76
- 4
- 1
- 3
+ 244
+ 133
+ 42
1
1
1
@@ -296,7 +356,6 @@
1
0
0
- 0
0
0
1
@@ -306,19 +365,21 @@
0
1
- 0
0
0
1.0
1.0
+ 0.0
+ 0.1
+ 0.5
+ 1.0
8
Knife
- 136
- 4
- 1
- 3
+ 137
+ 137
+ 137
1
1
1
@@ -335,7 +396,6 @@
1
0
0
- 0
0
1
0
@@ -345,19 +405,21 @@
0
1
- 0
0
0
1.0
1.0
+ 0.0
+ 0.0
+ 1.0
+ 1.0
9
HE
- 75
- 4
- 1
- 3
+ 255
+ 178
+ 0
1
1
1
@@ -374,7 +436,6 @@
1
19
1
- 0
0
0
0
@@ -384,19 +445,21 @@
0
1
- 0
0
0
1.0
1.0
+ 0.2
+ 0.4
+ 1.0
+ 1.0
10
HEAT
- 76
- 4
- 1
- 3
+ 255
+ 123
+ 0
3
4
3
@@ -413,7 +476,6 @@
1
19
1
- 1
0
0
0
@@ -423,19 +485,21 @@
0
1
- 0
0
0
1.0
1.0
+ 0.75
+ 0.75
+ 1.0
+ 1.0
11
Dart
- 136
- 4
- 1
- 3
+ 230
+ 230
+ 230
1
1
1
@@ -452,7 +516,6 @@
1
0
0
- 0
1
0
0
@@ -462,19 +525,21 @@
0
1
- 0
0
0
1.0
1.0
+ 0.0
+ 0.0
+ 0.0
+ 1.0
12
Flame
- 76
- 4
- 1
- 3
+ 244
+ 133
+ 42
1
5
1
@@ -491,7 +556,6 @@
1
0
0
- 0
0
0
1
@@ -501,19 +565,21 @@
0
1
- 0
0
0
1.0
1.0
+ 0.1
+ 0.5
+ 0.5
+ 1.0
13
AET
- 160
- 8
- 25
- 27
+ 182
+ 35
+ 196
3
4
3
@@ -530,7 +596,6 @@
1
0
0
- 0
0
0
0
@@ -540,19 +605,21 @@
0
1
- 0
0
0
1.0
1.0
+ 0.0
+ 0.5
+ 1.0
+ 1.0
14
Glaser
- 185
- 12
- 21
- 23
+ 59
+ 178
+ 41
4
1
3
@@ -569,7 +636,6 @@
1
0
0
- 0
0
0
0
@@ -579,19 +645,21 @@
0
1
- 0
0
0
1.0
1.0
+ 0.0
+ 0.0
+ 0.1
+ 1.0
15
Tracer Ball
- 144
- 4
- 17
- 19
+ 235
+ 235
+ 0
1
1
1
@@ -608,7 +676,6 @@
1
0
0
- 0
0
0
0
@@ -618,19 +685,21 @@
1
1
- 0
0
0
1.0
1.0
+ 0.0
+ 0.1
+ 1.0
+ 1.0
16
Tracer FMJ
- 144
- 4
- 17
- 19
+ 255
+ 215
+ 63
3
4
3
@@ -647,7 +716,6 @@
1
0
0
- 0
0
0
0
@@ -657,19 +725,21 @@
1
1
- 0
0
0
1.0
1.0
+ 0.0
+ 0.3
+ 1.0
+ 1.0
17
Match Ball
- 133
- 4
- 13
- 15
+ 245
+ 245
+ 245
1
1
1
@@ -686,7 +756,6 @@
1
0
0
- 0
0
0
0
@@ -696,19 +765,21 @@
0
1
- 0
0
0
1.0
1.0
+ 0.0
+ 0.05
+ 1.0
+ 1.0
18
Match FMJ
- 133
- 4
- 13
- 15
+ 230
+ 230
+ 230
3
4
3
@@ -725,7 +796,6 @@
1
0
0
- 0
0
0
0
@@ -735,19 +805,21 @@
0
1
- 0
0
0
1.0
1.0
+ 0.0
+ 0.2
+ 1.0
+ 1.0
19
Cold Ball
- 135
- 4
- 1
- 3
+ 164
+ 164
+ 164
1
1
1
@@ -764,7 +836,6 @@
1
0
0
- 0
0
0
0
@@ -774,19 +845,21 @@
0
1
- 0
0
0
1.0
1.0
+ 0.0
+ 0.0
+ 1.0
+ 1.0
20
Cold HP
- 71
- 12
- 9
- 11
+ 85
+ 157
+ 224
2
1
3
@@ -803,8 +876,7 @@
1
0
0
- 0
- 0
+ 0
0
0
0
@@ -813,19 +885,21 @@
0
1
- 0
0
0
1.0
1.0
+ 0.0
+ 0.0
+ 1.0
+ 1.0
21
Cold AP/FMJ
- 162
- 8
- 5
- 7
+ 224
+ 27
+ 27
3
4
3
@@ -842,7 +916,6 @@
1
0
0
- 0
0
0
0
@@ -852,19 +925,21 @@
0
1
- 0
0
0
1.0
1.0
+ 0.0
+ 0.1
+ 1.0
+ 1.0
22
SAP Non Standard
- 163
- 8
- 5
- 7
+ 255
+ 0
+ 0
1
2
1
@@ -881,7 +956,6 @@
1
0
0
- 0
0
0
0
@@ -891,19 +965,21 @@
0
1
- 0
0
0
1.0
1.0
+ 0.05
+ 0.5
+ 1.0
+ 1.0
23
AP/FMJ small Handgun
- 218
- 8
- 5
- 7
+ 204
+ 0
+ 0
3
4
3
@@ -920,7 +996,6 @@
1
0
0
- 0
0
0
0
@@ -930,19 +1005,21 @@
0
1
- 0
0
0
1.0
1.0
+ 0.0
+ 0.1
+ 1.0
+ 1.0
24
Cold Glaser FMJ
- 184
- 12
- 21
- 23
+ 124
+ 237
+ 106
4
1
3
@@ -959,7 +1036,6 @@
1
0
0
- 0
0
0
0
@@ -969,19 +1045,21 @@
0
1
- 0
0
0
1.0
1.0
+ 0.0
+ 0.0
+ 0.4
+ 1.0
25
Brenneke
- 133
- 4
- 13
- 15
+ 167
+ 167
+ 167
1
1
1
@@ -998,7 +1076,6 @@
1
0
0
- 0
0
0
0
@@ -1008,19 +1085,21 @@
0
1
- 0
0
0
1.0
1.0
+ 0.0
+ 0.2
+ 1.0
+ 1.0
26
Depleted Uranium
- 184
- 12
- 21
- 23
+ 16
+ 204
+ 22
1
2
1
@@ -1037,7 +1116,6 @@
1
0
0
- 0
0
0
0
@@ -1047,19 +1125,21 @@
0
1
- 0
0
0
1.0
1.0
+ 0.5
+ 0.8
+ 1.0
+ 1.0
27
Crossbow Bolt
- 163
- 8
- 5
- 7
+ 137
+ 137
+ 137
3
5
3
@@ -1076,7 +1156,6 @@
1
0
0
- 0
0
0
0
@@ -1086,19 +1165,21 @@
0
1
- 0
0
0
1.0
1.0
+ 0.0
+ 0.0
+ 1.0
+ 1.0
28
HE Crossbow Bolt
- 75
- 4
- 1
- 3
+ 255
+ 178
+ 0
4
5
4
@@ -1115,7 +1196,6 @@
1
19
1
- 0
0
0
0
@@ -1125,19 +1205,21 @@
0
1
- 0
0
0
1.0
1.0
+ 0.2
+ 0.4
+ 1.0
+ 1.0
29
HP large
- 24
- 12
- 9
- 11
+ 69
+ 69
+ 224
16
10
6
@@ -1154,7 +1236,6 @@
1
0
0
- 0
0
0
0
@@ -1164,19 +1245,21 @@
0
1
- 0
0
0
1.0
1.0
+ 0.0
+ 0.0
+ 1.0
+ 1.0
30
SAP 12.7
- 163
- 8
- 5
- 7
+ 255
+ 0
+ 0
1
5
1
@@ -1193,7 +1276,6 @@
1
0
0
- 0
0
0
0
@@ -1203,19 +1285,21 @@
0
1
- 0
0
4
1.0
1.0
+ 0.6
+ 0.8
+ 1.0
+ 1.0
31
AP/FMJ large
- 218
- 8
- 5
- 7
+ 204
+ 0
+ 0
2
3
2
@@ -1232,7 +1316,6 @@
1
0
0
- 0
0
0
0
@@ -1242,19 +1325,21 @@
0
1
- 0
0
0
1.0
1.0
+ 0.0
+ 0.65
+ 1.0
+ 1.0
32
AP/FMJ medium
- 218
- 8
- 5
- 7
+ 204
+ 0
+ 0
7
10
7
@@ -1271,7 +1356,6 @@
1
0
0
- 0
0
0
0
@@ -1281,19 +1365,21 @@
0
1
- 0
0
0
1.0
1.0
+ 0.0
+ 0.5
+ 1.0
+ 1.0
33
HP medium
- 24
- 12
- 9
- 11
+ 69
+ 69
+ 224
18
10
5
@@ -1309,8 +1395,7 @@
1
1
0
- 0
- 0
+ 0
0
0
0
@@ -1319,20 +1404,22 @@
4
0
- 1
- 0
+ 1
0
0
1.0
1.0
+ 0.0
+ 0.0
+ 1.0
+ 1.0
34
Ball medium
- 136
- 4
- 1
- 3
+ 137
+ 137
+ 137
1
1
1
@@ -1349,7 +1436,6 @@
1
0
0
- 0
0
0
0
@@ -1359,19 +1445,21 @@
0
1
- 0
0
0
1.0
1.0
+ 0.0
+ 0.0
+ 1.0
+ 1.0
35
Ball large
- 136
- 4
- 1
- 3
+ 137
+ 137
+ 137
1
1
1
@@ -1388,7 +1476,6 @@
1
0
0
- 0
0
0
0
@@ -1398,19 +1485,21 @@
0
1
- 0
0
0
1.0
1.0
+ 0.0
+ 0.4
+ 1.0
+ 1.0
36
CAWS Slug
- 163
- 8
- 5
- 7
+ 204
+ 0
+ 0
1
2
2
@@ -1427,7 +1516,6 @@
1
0
0
- 0
0
0
0
@@ -1437,19 +1525,21 @@
0
1
- 0
0
0
1.0
1.0
+ 0.0
+ 0.6
+ 1.0
+ 1.0
37
CAWS Buckshot
- 125
- 4
- 1
- 3
+ 214
+ 191
+ 137
4
5
4
@@ -1466,7 +1556,6 @@
3
0
0
- 0
0
0
0
@@ -1476,19 +1565,21 @@
0
1
- 0
0
0
1.0
1.0
+ 0.0
+ 0.1
+ 1.0
+ 1.0
38
AP/FMJ x-large
- 218
- 8
- 5
- 7
+ 204
+ 0
+ 0
6
10
6
@@ -1505,7 +1596,6 @@
1
0
0
- 0
0
0
0
@@ -1515,19 +1605,21 @@
0
1
- 0
0
0
1.0
1.0
+ 0.0
+ 0.6
+ 1.0
+ 1.0
39
HP x-large
- 24
- 12
- 9
- 11
+ 69
+ 69
+ 224
15
10
6
@@ -1544,7 +1636,6 @@
1
0
0
- 0
0
0
0
@@ -1554,19 +1645,21 @@
0
1
- 0
0
0
1.0
1.0
+ 0.0
+ 0.0
+ 1.0
+ 1.0
40
Tracer FMJ x-large
- 144
- 4
- 17
- 19
+ 255
+ 215
+ 63
7
10
7
@@ -1583,7 +1676,6 @@
1
0
0
- 0
0
0
0
@@ -1593,19 +1685,21 @@
1
1
- 0
0
0
1.0
1.0
+ 0.0
+ 0.35
+ 1.0
+ 1.0
41
HE 12.7
- 75
- 4
- 1
- 3
+ 255
+ 178
+ 0
2
5
2
@@ -1622,7 +1716,6 @@
1
19
1
- 0
0
0
0
@@ -1632,19 +1725,21 @@
0
1
- 0
0
4
1.0
1.0
+ 0.8
+ 1.0
+ 1.0
+ 1.0
42
HEAT 12.7
- 76
- 4
- 1
- 3
+ 255
+ 123
+ 0
2
5
2
@@ -1661,7 +1756,6 @@
1
19
1
- 1
0
0
0
@@ -1671,19 +1765,21 @@
0
1
- 0
0
4
1.0
1.0
+ 1.0
+ 1.2
+ 1.2
+ 1.0
43
SAP 9x39 Match
- 133
- 4
- 13
- 15
+ 230
+ 230
+ 230
3
5
3
@@ -1700,7 +1796,6 @@
1
0
0
- 0
0
0
0
@@ -1710,19 +1805,21 @@
0
1
- 0
0
0
1.0
1.0
+ 0.0
+ 0.2
+ 1.0
+ 1.0
44
Polyshok
- 160
- 8
- 25
- 27
+ 182
+ 35
+ 196
1
1
1
@@ -1739,7 +1836,6 @@
1
0
0
- 0
0
0
0
@@ -1749,19 +1845,21 @@
0
1
- 0
0
0
1.0
1.0
+ 0.0
+ 0.0
+ 1.0
+ 1.0
45
BAT
- 193
- 12
- 21
- 23
+ 57
+ 211
+ 201
2
1
6
@@ -1778,7 +1876,6 @@
1
0
0
- 0
0
0
0
@@ -1788,19 +1885,21 @@
0
1
- 0
0
0
1.0
1.0
+ 0.0
+ 0.0
+ 1.0
+ 1.0
46
XP - x-large
- 160
- 8
- 25
- 27
+ 182
+ 35
+ 196
6
10
6
@@ -1817,7 +1916,6 @@
1
0
0
- 0
0
0
0
@@ -1827,19 +1925,21 @@
0
1
- 0
0
0
1.0
1.0
+ 0.0
+ 0.3
+ 1.0
+ 1.0
47
Hornet's Nest
- 185
- 12
- 21
- 23
+ 99
+ 181
+ 86
4
1
3
@@ -1856,7 +1956,6 @@
6
16
0
- 0
0
0
0
@@ -1866,19 +1965,21 @@
0
HornetSpread
1
- 0
0
0
0.4
1.6
+ 0.0
+ 0.0
+ 1.0
+ 1.0
48
AP/FMJ Beowulf
- 218
- 8
- 5
- 7
+ 204
+ 0
+ 0
6
10
6
@@ -1895,7 +1996,6 @@
1
0
0
- 0
0
0
0
@@ -1905,19 +2005,21 @@
0
1
- 0
0
0
1.0
1.0
+ 0.0
+ 0.5
+ 1.0
+ 1.0
49
HP Beowulf
- 24
- 12
- 9
- 11
+ 69
+ 69
+ 224
14
10
1
@@ -1934,7 +2036,6 @@
1
0
0
- 0
0
0
0
@@ -1944,19 +2045,21 @@
0
1
- 0
0
0
1.0
1.0
+ 0.0
+ 0.0
+ 1.0
+ 1.0
50
Ratshot
- 185
- 12
- 21
- 23
+ 59
+ 178
+ 41
4
1
2
@@ -1973,7 +2076,6 @@
6
0
0
- 0
0
0
0
@@ -1983,19 +2085,21 @@
0
FlechetteSpread
1
- 0
0
0
0.8
1.2
+ 0.0
+ 0.0
+ 0.0
+ 0.8
51
Match 12.7
- 133
- 4
- 13
- 15
+ 230
+ 230
+ 230
2
5
2
@@ -2012,7 +2116,6 @@
1
0
0
- 0
0
0
0
@@ -2022,19 +2125,21 @@
0
1
- 0
0
4
1.0
1.0
+ 0.0
+ 0.9
+ 1.0
+ 1.0
52
AP/FMJ medium Handgun
- 218
- 8
- 5
- 7
+ 204
+ 0
+ 0
7
10
7
@@ -2051,7 +2156,6 @@
1
0
0
- 0
0
0
0
@@ -2061,19 +2165,21 @@
0
1
- 0
0
0
1.0
1.0
+ 0.0
+ 0.3
+ 1.0
+ 1.0
53
AP/FMJ large Handgun
- 218
- 8
- 5
- 7
+ 204
+ 0
+ 0
2
3
2
@@ -2090,7 +2196,6 @@
1
0
0
- 0
0
0
0
@@ -2100,19 +2205,21 @@
0
1
- 0
0
0
1.0
1.0
+ 0.0
+ 0.4
+ 1.0
+ 1.0
54
HPJ small
- 148
- 4
- 1
- 3
+ 178
+ 133
+ 76
4
5
4
@@ -2129,7 +2236,6 @@
1
0
0
- 0
0
0
0
@@ -2139,19 +2245,21 @@
0
1
- 0
0
0
1.0
1.0
+ 0.0
+ 0.0
+ 1.0
+ 1.0
55
HPJ medium
- 148
- 4
- 1
- 3
+ 178
+ 133
+ 76
3
4
3
@@ -2168,7 +2276,6 @@
1
0
0
- 0
0
0
0
@@ -2178,19 +2285,21 @@
0
1
- 0
0
0
1.0
1.0
+ 0.0
+ 0.0
+ 1.0
+ 1.0
56
HPJ large
- 148
- 4
- 1
- 3
+ 178
+ 133
+ 76
3
4
3
@@ -2207,7 +2316,6 @@
1
0
0
- 0
0
0
0
@@ -2217,19 +2325,21 @@
0
1
- 0
0
0
1.0
1.0
+ 0.0
+ 0.0
+ 1.0
+ 1.0
57
Buckshot 40mm
- 125
- 4
- 1
- 3
+ 214
+ 191
+ 137
1
1
1
@@ -2246,7 +2356,6 @@
4
0
0
- 0
0
0
0
@@ -2256,19 +2365,21 @@
0
BuchshotSpread
1
- 0
0
0
1.0
1.0
+ 0.0
+ 0.0
+ 1.0
+ 1.0
58
SAP 12gauge
- 163
- 8
- 5
- 7
+ 255
+ 0
+ 0
1
2
1
@@ -2285,7 +2396,6 @@
1
0
0
- 0
0
0
0
@@ -2295,19 +2405,21 @@
0
1
- 0
0
0
1.0
1.0
+ 0.0
+ 0.5
+ 1.0
+ 1.0
59
Duplex 12gauge
- 184
- 12
- 21
- 23
+ 16
+ 204
+ 22
1
1
1
@@ -2324,7 +2436,6 @@
3
0
0
- 0
0
0
0
@@ -2333,20 +2444,22 @@
10
0
DuplexSpread
- 1
- 0
+ 1
0
0
1.0
1.0
+ 0.0
+ 0.25
+ 1.0
+ 1.0
60
Flechette 40mm
- 218
- 8
- 5
- 7
+ 178
+ 15
+ 15
4
5
4
@@ -2363,7 +2476,6 @@
3
0
0
- 0
0
0
0
@@ -2372,20 +2484,22 @@
5
0
FlechetteSpread
- 1
- 0
+ 1
0
0
1.0
1.0
+ 0.0
+ 0.0
+ 1.0
+ 1.0
61
HE 7.92x57mm
- 75
- 4
- 1
- 3
+ 255
+ 178
+ 0
8
10
8
@@ -2402,7 +2516,6 @@
1
19
1
- 0
0
0
0
@@ -2411,20 +2524,22 @@
30
0
- 1
- 0
+ 1
0
0
1.0
1.0
+ 0.0
+ 0.5
+ 1.0
+ 1.0
62
AP 9x39
- 218
- 8
- 5
- 7
+ 204
+ 0
+ 0
7
10
7
@@ -2441,7 +2556,6 @@
1
0
0
- 0
0
0
0
@@ -2451,19 +2565,21 @@
0
1
- 0
0
0
1.0
1.0
+ 0.0
+ 0.2
+ 1.0
+ 1.0
63
SAP 9x39
- 163
- 8
- 5
- 7
+ 255
+ 0
+ 0
1
2
1
@@ -2480,7 +2596,6 @@
1
0
0
- 0
0
0
0
@@ -2489,20 +2604,22 @@
20
0
- 1
- 0
+ 1
0
0
1.0
1.0
+ 0.0
+ 0.3
+ 1.0
+ 1.0
64
14.5x114mm
- 163
- 8
- 5
- 7
+ 255
+ 0
+ 0
1
10
1
@@ -2519,7 +2636,6 @@
1
0
0
- 1
0
0
0
@@ -2529,19 +2645,21 @@
0
1
- 0
0
4
1.0
1.0
+ 0.6
+ 1.0
+ 1.0
+ 1.0
65
Flechette 5.56
- 218
- 8
- 5
- 7
+ 178
+ 15
+ 15
4
5
1
@@ -2558,7 +2676,6 @@
1
0
0
- 0
0
0
0
@@ -2568,19 +2685,21 @@
0
1
- 0
0
0
1.0
1.0
+ 0.0
+ 0.0
+ 1.0
+ 1.0
66
Duplex 5.56
- 184
- 12
- 21
- 23
+ 16
+ 204
+ 22
9
10
9
@@ -2597,7 +2716,6 @@
4
0
0
- 0
0
0
0
@@ -2606,20 +2724,22 @@
5
0
DuplexSpread
- 1
- 0
+ 1
0
0
1.0
1.0
+ 0.0
+ 0.0
+ 1.0
+ 1.0
67
Crossbow Toxin
- 184
- 12
- 21
- 23
+ 0
+ 250
+ 0
4
5
4
@@ -2636,7 +2756,6 @@
1
0
0
- 0
0
0
0
@@ -2646,19 +2765,21 @@
0
1
- 40
0
1
1.0
1.0
+ 0.0
+ 0.0
+ 1.0
+ 1.0
68
XP small
- 160
- 8
- 25
- 27
+ 182
+ 35
+ 196
8
10
8
@@ -2675,7 +2796,6 @@
1
0
0
- 0
0
0
0
@@ -2684,20 +2804,22 @@
12
0
- 1
- 0
+ 1
0
0
1.0
1.0
+ 0.0
+ 0.0
+ 1.0
+ 1.0
69
Rubber 12gauge
- 155
- 12
- 21
- 23
+ 99
+ 181
+ 86
3
1
3
@@ -2714,7 +2836,6 @@
1
17
0
- 0
0
0
0
@@ -2724,19 +2845,21 @@
0
1
- 0
0
0
0.6
2.4
+ 0.0
+ 0.0
+ 0.0
+ 0.0
70
Piranha 12gauge
- 193
- 12
- 21
- 23
+ 57
+ 211
+ 201
2
1
2
@@ -2753,7 +2876,6 @@
6
0
0
- 0
0
0
0
@@ -2763,19 +2885,21 @@
0
PiranhaSpread
1
- 0
0
0
0.7
1.5
+ 0.0
+ 0.0
+ 1.0
+ 1.0
71
12gauge Mini Slug
- 136
- 4
- 1
- 3
+ 137
+ 137
+ 137
1
1
1
@@ -2792,7 +2916,6 @@
1
0
0
- 0
0
0
0
@@ -2802,19 +2925,21 @@
0
1
- 0
0
0
1
1
+ 0.0
+ 0.0
+ 0.8
+ 1.0
72
12gauge Mini Shot
- 125
- 4
- 1
- 3
+ 214
+ 191
+ 137
1
1
1
@@ -2831,7 +2956,6 @@
4
0
0
- 0
0
0
0
@@ -2841,19 +2965,21 @@
0
BuckshotSpread
1
- 0
0
0
1
1
+ 0.0
+ 0.0
+ 0.5
+ 1.0
73
Triplex .410
- 129
- 4
- 1
- 3
+ 16
+ 204
+ 22
1
1
1
@@ -2870,7 +2996,6 @@
3
0
0
- 0
0
0
0
@@ -2880,19 +3005,21 @@
0
FlechetteSpread
1
- 0
0
0
1
1
+ 0.0
+ 0.0
+ 1.0
+ 1.0
74
Birdshot .410
- 185
- 4
- 1
- 3
+ 59
+ 178
+ 41
7
5
7
@@ -2909,7 +3036,6 @@
4
0
0
- 0
0
0
0
@@ -2919,19 +3045,21 @@
0
FlechetteSpread
1
- 0
0
0
0.8
1
+ 0.0
+ 0.0
+ 0.0
+ 0.8
75
Buckshot .410
- 125
- 4
- 1
- 3
+ 214
+ 191
+ 137
6
5
6
@@ -2948,7 +3076,6 @@
2
0
0
- 0
0
0
0
@@ -2958,19 +3085,21 @@
0
FlechetteSpread
1
- 0
0
0
1
1
+ 0.0
+ 0.0
+ 1.0
+ 1.0
76
40mm Rubber
- 155
- 12
- 21
- 23
+ 99
+ 181
+ 86
3
1
3
@@ -2987,7 +3116,6 @@
1
0
0
- 0
0
0
0
@@ -2997,19 +3125,21 @@
0
1
- 0
0
0
0.2
4.0
+ 0.0
+ 0.0
+ 0.0
+ 0.5
77
40mm LB
- 75
- 4
- 1
- 3
+ 230
+ 230
+ 230
3
5
3
@@ -3026,7 +3156,6 @@
1
0
1
- 1
0
0
0
@@ -3036,10 +3165,13 @@
0
1
- 0
0
4
1
1
+ 0.0
+ 0.3
+ 1.0
+ 1.0
\ No newline at end of file
diff --git a/Data-AIM/TableData/NPCInventory/AdditionalDealer_42_Inventory.xml b/Data-AIM/TableData/NPCInventory/AdditionalDealer_42_Inventory.xml
index 87f8d36..525ef64 100644
--- a/Data-AIM/TableData/NPCInventory/AdditionalDealer_42_Inventory.xml
+++ b/Data-AIM/TableData/NPCInventory/AdditionalDealer_42_Inventory.xml
@@ -1,73 +1,73 @@
-
+
0
- 64
+ 5952
3
1
- 71
+ 7653
2
- 72
+ 7659
3
- 77
+ 6360
4
- 80
+ 6541
5
- 81
+ 6546
6
- 86
+ 6277
7
- 87
+ 6279
8
- 107
+ 6899
9
- 108
+ 6779
10
- 129
+ 7303
11
- 146
+ 2201
12
12
- 201
+ 373
3
13
- 203
+ 381
3
14
- 204
+ 388
4
15
- 214
+ 1901
5
@@ -82,12 +82,12 @@
18
- 243
+ 387
3
19
- 244
+ 1141
3
@@ -97,7 +97,7 @@
21
- 299
+ 5880
2
@@ -112,115 +112,110 @@
24
- 322
+ 292
10
25
- 352
+ 7649
26
- 401
+ 6544
27
- 489
+ 7298
28
- 504
+ 7621
29
- 508
+ 7624
30
- 512
+ 6412
31
- 523
+ 6510
32
- 527
+ 6512
33
- 531
+ 6735
34
- 538
+ 6931
35
- 539
+ 7940
36
- 547
+ 6699
37
- 600
+ 5878
1
38
- 1003
+ 1135
4
39
- 1026
+ 1282
2
40
- 1202
+ 5941
1
41
- 1576
+ 351
4
42
- 1632
+ 493
5
43
- 1639
- 2
-
-
- 44
- 1640
+ 2401
3
- 45
- 1709
+ 44
+ 1631
2
- 46
- 1724
+ 45
+ 1545
8
- 47
- 1725
+ 46
+ 1547
4
- 48
- 1726
+ 47
+ 322
10
\ No newline at end of file
diff --git a/Data-AIM/TableData/NPCInventory/AdditionalDealer_56_Inventory.xml b/Data-AIM/TableData/NPCInventory/AdditionalDealer_56_Inventory.xml
index 65086d1..e32b4ff 100644
--- a/Data-AIM/TableData/NPCInventory/AdditionalDealer_56_Inventory.xml
+++ b/Data-AIM/TableData/NPCInventory/AdditionalDealer_56_Inventory.xml
@@ -1,8 +1,8 @@
-
+
0
- 0
- 0
+ 1931
+ 30
\ No newline at end of file
diff --git a/Data-Bigmaps/Scripts/strategicmap.lua b/Data-Bigmaps/Scripts/strategicmap.lua
index a4a6d66..824fa89 100644
--- a/Data-Bigmaps/Scripts/strategicmap.lua
+++ b/Data-Bigmaps/Scripts/strategicmap.lua
@@ -425,7 +425,7 @@ function SetFactoryLeftoverProgress(sSectorX, sSectorY, bSectorZ, usFacilityType
if ( bSectorZ == 0 ) then
- if ( sSectorX == 13 and sSectorY == SectorY.MAP_ROW_C and usFacilityType == 23 ) then
+ if ( sSectorX == 13 and sSectorY == SectorY.MAP_ROW_C and usFacilityType == 37 ) then
SetModderLUAFact(ModSpecificFacts.FACTORY_PROGRESS_DRASSEN_TSHIRTFACTORY_1 + usProductionNumber, 1 + sProgressLeft)
@@ -436,19 +436,19 @@ function SetFactoryLeftoverProgress(sSectorX, sSectorY, bSectorZ, usFacilityType
end
- elseif ( sSectorX == 10 and sSectorY == SectorY.MAP_ROW_F and usFacilityType == 24 ) then
+ elseif ( sSectorX == 10 and sSectorY == SectorY.MAP_ROW_F and usFacilityType == 38 ) then
SetModderLUAFact(ModSpecificFacts.FACTORY_PROGRESS_CAMBRIA_HICKSFARM_1 + usProductionNumber, 1 + sProgressLeft)
- elseif ( sSectorX == 2 and sSectorY == SectorY.MAP_ROW_H and usFacilityType == 5 ) then
+ elseif ( sSectorX == 2 and sSectorY == SectorY.MAP_ROW_H and usFacilityType == 6 ) then
SetModderLUAFact(ModSpecificFacts.FACTORY_PROGRESS_GRUMM_MUNITIONSFACTORY_1 + usProductionNumber, 1 + sProgressLeft)
- elseif ( sSectorX == 2 and sSectorY == SectorY.MAP_ROW_G and usFacilityType == 25 ) then
+ elseif ( sSectorX == 2 and sSectorY == SectorY.MAP_ROW_G and usFacilityType == 39 ) then
SetModderLUAFact(ModSpecificFacts.FACTORY_PROGRESS_GRUMM_BOMBWORKSHOP_1 + usProductionNumber, 1 + sProgressLeft)
- elseif ( sSectorX == 4 and sSectorY == SectorY.MAP_ROW_K and usFacilityType == 15 ) then
+ elseif ( sSectorX == 4 and sSectorY == SectorY.MAP_ROW_K and usFacilityType == 17 ) then
SetModderLUAFact(ModSpecificFacts.FACTORY_PROGRESS_GRUMM_ORTAFACTORY + usProductionNumber, 1 + sProgressLeft)
@@ -466,7 +466,7 @@ function GetFactoryLeftoverProgress(sSectorX, sSectorY, bSectorZ, usFacilityType
if ( bSectorZ == 0 ) then
- if ( sSectorX == 13 and sSectorY == SectorY.MAP_ROW_C and usFacilityType == 23 ) then
+ if ( sSectorX == 13 and sSectorY == SectorY.MAP_ROW_C and usFacilityType == 37 ) then
-- The T-Shirt factory can only be used once Doreen is gone, one way or the other
if ( gubQuest( Quests.QUEST_FREE_CHILDREN ) == qStatus.QUESTDONE ) then
@@ -500,7 +500,7 @@ function GetFactoryLeftoverProgress(sSectorX, sSectorY, bSectorZ, usFacilityType
end
- elseif ( sSectorX == 10 and sSectorY == SectorY.MAP_ROW_F and usFacilityType == 24 ) then
+ elseif ( sSectorX == 10 and sSectorY == SectorY.MAP_ROW_F and usFacilityType == 38 ) then
-- the Hicks farm can only be used if the quest was solved by killing the Hicks family
if ( MercIsDead(Profil.DARREL) and MercIsDead(Profil.DARYL) ) then
@@ -513,15 +513,15 @@ function GetFactoryLeftoverProgress(sSectorX, sSectorY, bSectorZ, usFacilityType
end
- elseif ( sSectorX == 2 and sSectorY == SectorY.MAP_ROW_H and usFacilityType == 5 ) then
+ elseif ( sSectorX == 2 and sSectorY == SectorY.MAP_ROW_H and usFacilityType == 6 ) then
val = GetModderLUAFact(ModSpecificFacts.FACTORY_PROGRESS_GRUMM_MUNITIONSFACTORY_1 + usProductionNumber) - 1
- elseif ( sSectorX == 2 and sSectorY == SectorY.MAP_ROW_G and usFacilityType == 25 ) then
+ elseif ( sSectorX == 2 and sSectorY == SectorY.MAP_ROW_G and usFacilityType == 39 ) then
val = GetModderLUAFact(ModSpecificFacts.FACTORY_PROGRESS_GRUMM_BOMBWORKSHOP_1 + usProductionNumber) - 1
- elseif ( sSectorX == 4 and sSectorY == SectorY.MAP_ROW_K and usFacilityType == 15 ) then
+ elseif ( sSectorX == 4 and sSectorY == SectorY.MAP_ROW_K and usFacilityType == 17 ) then
-- the Orta factory can only be used once Ernest gave us the rifles (and presumably control over the assembly lines)
if ( (CheckFact( Facts.FACT_CONVO_ERNEST, 0 ) == true) ) then
@@ -854,10 +854,10 @@ function HandleSectorTacticalEntry( sSectorX, sSectorY, bSectorZ, fHasEverBeenPl
elseif ( sSectorX == 13 and sSectorY == SectorY.MAP_ROW_D) then
if ( GetTownLoyaltyRating(2) > 50 ) then
-- wine store
- CreateCivilian(17198, 0, 55, Bodytype.REGFEMALE, -1, -1, -1, -1, -1, -1, -1, -1)
+ CreateCivilian(26413, 0, 55, Bodytype.REGFEMALE, -1, -1, -1, -1, -1, -1, -1, -1)
end
-- general store
- CreateCivilian(10943, 0, 41, Bodytype.MANCIV, -1, -1, -1, -1, -1, -1, -1, -1)
+ CreateCivilian(44750, 0, 41, Bodytype.MANCIV, -1, -1, -1, -1, -1, -1, -1, -1)
-- Alma
elseif ( sSectorX == 14 and sSectorY == SectorY.MAP_ROW_I) then
-- wine store
diff --git a/Data-Bigmaps/TableData/Items/AmmoTypes.xml b/Data-Bigmaps/TableData/Items/AmmoTypes.xml
deleted file mode 100644
index 7761ced..0000000
--- a/Data-Bigmaps/TableData/Items/AmmoTypes.xml
+++ /dev/null
@@ -1,3177 +0,0 @@
-
-
-
-
-
- 0
- Ball small
- 137
- 137
- 137
- 1
- 1
- 1
- 1
- 1
- 1
- 104
- 100
- 0
- 1
- 1
- 1
- 1
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 5
- 0
-
- 1
- 0
- 0
- 1.0
- 1.0
- 0.0
- 0.0
- 1.0
- 1.0
-
-
- 1
- HP small
- 69
- 69
- 224
- 2
- 1
- 3
- 2
- 1
- 1
- 155
- 100
- 1
- 0
- 0
- 1
- 1
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 3
- 0
-
- 1
- 0
- 0
- 1.0
- 1.0
- 0.0
- 0.0
- 1.0
- 1.0
-
-
- 2
- AP/FMJ small
- 204
- 0
- 0
- 3
- 4
- 3
- 4
- 1
- 1
- 100
- 100
- 0
- 1
- 1
- 1
- 1
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 8
- 0
-
- 1
- 0
- 0
- 1.0
- 1.0
- 0.0
- 0.1
- 1.0
- 1.0
-
-
- 3
- SAP
- 255
- 0
- 0
- 1
- 2
- 1
- 2
- 1
- 1
- 110
- 100
- 0
- 1
- 1
- 1
- 1
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 25
- 0
-
- 1
- 0
- 0
- 1.0
- 1.0
- 0.0
- 0.5
- 1.0
- 1.0
-
-
- 4
- Buckshot
- 214
- 191
- 137
- 1
- 1
- 1
- 1
- 1
- 1
- 95
- 100
- 1
- 1
- 1
- 9
- 1
- 4
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 2
- 0
- BuckshotSpread
- 1
- 0
- 0
- 1.0
- 1.0
- 0.0
- 0.0
- 1.0
- 1.0
-
-
- 5
- Flechette
- 178
- 15
- 15
- 4
- 5
- 4
- 5
- 1
- 1
- 100
- 100
- 0
- 1
- 0
- 6
- 1
- 3
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 5
- 0
- FlechetteSpread
- 1
- 0
- 0
- 1.0
- 1.0
- 0.0
- 0.0
- 1.0
- 1.0
-
-
- 6
- Grenade
- 255
- 206
- 30
- 1
- 1
- 1
- 1
- 4
- 3
- 100
- 100
- 0
- 0
- 0
- 1
- 1
- 1
- 19
- 1
- 0
- 0
- 0
- 0
- 0
- 10
- 0
-
- 1
- 0
- 0
- 1.0
- 1.0
- 0.0
- 0.5
- 1.0
- 1.0
-
-
- 7
- Napalm
- 244
- 133
- 42
- 1
- 1
- 1
- 1
- 1
- 1
- 100
- 100
- 0
- 0
- 1
- 1
- 1
- 1
- 0
- 0
- 0
- 0
- 1
- 1
- 1
- 0
- 0
-
- 1
- 0
- 0
- 1.0
- 1.0
- 0.0
- 0.1
- 0.5
- 1.0
-
-
- 8
- Knife
- 137
- 137
- 137
- 1
- 1
- 1
- 1
- 1
- 1
- 100
- 100
- 0
- 0
- 1
- 1
- 1
- 1
- 0
- 0
- 0
- 1
- 0
- 0
- 1
- 0
- 0
-
- 1
- 0
- 0
- 1.0
- 1.0
- 0.0
- 0.0
- 1.0
- 1.0
-
-
- 9
- HE
- 255
- 178
- 0
- 1
- 1
- 1
- 1
- 4
- 3
- 100
- 100
- 0
- 0
- 1
- 1
- 1
- 1
- 19
- 1
- 0
- 0
- 0
- 0
- 0
- 30
- 0
-
- 1
- 0
- 0
- 1.0
- 1.0
- 0.2
- 0.4
- 1.0
- 1.0
-
-
- 10
- HEAT
- 255
- 123
- 0
- 3
- 4
- 3
- 4
- 4
- 3
- 100
- 100
- 0
- 0
- 0
- 1
- 1
- 1
- 19
- 1
- 0
- 0
- 0
- 0
- 0
- 65
- 0
-
- 1
- 0
- 0
- 1.0
- 1.0
- 0.75
- 0.75
- 1.0
- 1.0
-
-
- 11
- Dart
- 230
- 230
- 230
- 1
- 1
- 1
- 1
- 1
- 1
- 100
- 100
- 1
- 0
- 1
- 1
- 1
- 1
- 0
- 0
- 1
- 0
- 0
- 0
- 1
- 0
- 0
-
- 1
- 0
- 0
- 1.0
- 1.0
- 0.0
- 0.0
- 0.0
- 1.0
-
-
- 12
- Flame
- 244
- 133
- 42
- 1
- 5
- 1
- 1
- 1
- 1
- 100
- 100
- 0
- 0
- 1
- 1
- 1
- 1
- 0
- 0
- 0
- 0
- 1
- 1
- 1
- 0
- 0
-
- 1
- 0
- 0
- 1.0
- 1.0
- 0.1
- 0.5
- 0.5
- 1.0
-
-
- 13
- AET
- 182
- 35
- 196
- 3
- 4
- 3
- 4
- 1
- 1
- 145
- 100
- 0
- 1
- 0
- 1
- 1
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 25
- 0
-
- 1
- 0
- 0
- 1.0
- 1.0
- 0.0
- 0.5
- 1.0
- 1.0
-
-
- 14
- Glaser
- 59
- 178
- 41
- 4
- 1
- 3
- 1
- 1
- 1
- 250
- 100
- 1
- 0
- 0
- 1
- 1
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
-
- 1
- 0
- 0
- 1.0
- 1.0
- 0.0
- 0.0
- 0.1
- 1.0
-
-
- 15
- Tracer Ball
- 235
- 235
- 0
- 1
- 1
- 1
- 1
- 1
- 1
- 94
- 100
- 0
- 1
- 0
- 1
- 1
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 5
- 1
-
- 1
- 0
- 0
- 1.0
- 1.0
- 0.0
- 0.1
- 1.0
- 1.0
-
-
- 16
- Tracer FMJ
- 255
- 215
- 63
- 3
- 4
- 3
- 4
- 1
- 1
- 96
- 100
- 0
- 1
- 0
- 1
- 1
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 8
- 1
-
- 1
- 0
- 0
- 1.0
- 1.0
- 0.0
- 0.3
- 1.0
- 1.0
-
-
- 17
- Match Ball
- 245
- 245
- 245
- 1
- 1
- 1
- 1
- 1
- 1
- 95
- 100
- 0
- 1
- 0
- 1
- 1
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 5
- 0
-
- 1
- 0
- 0
- 1.0
- 1.0
- 0.0
- 0.05
- 1.0
- 1.0
-
-
- 18
- Match FMJ
- 230
- 230
- 230
- 3
- 4
- 3
- 4
- 1
- 1
- 95
- 100
- 0
- 1
- 0
- 1
- 1
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 8
- 0
-
- 1
- 0
- 0
- 1.0
- 1.0
- 0.0
- 0.2
- 1.0
- 1.0
-
-
- 19
- Cold Ball
- 164
- 164
- 164
- 1
- 1
- 1
- 1
- 1
- 1
- 95
- 100
- 0
- 1
- 0
- 1
- 1
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 4
- 0
-
- 1
- 0
- 0
- 1.0
- 1.0
- 0.0
- 0.0
- 1.0
- 1.0
-
-
- 20
- Cold HP
- 85
- 157
- 224
- 2
- 1
- 3
- 2
- 1
- 1
- 135
- 100
- 1
- 0
- 0
- 1
- 1
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 2
- 0
-
- 1
- 0
- 0
- 1.0
- 1.0
- 0.0
- 0.0
- 1.0
- 1.0
-
-
- 21
- Cold AP/FMJ
- 224
- 27
- 27
- 3
- 4
- 3
- 4
- 1
- 1
- 84
- 100
- 0
- 1
- 0
- 1
- 1
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 5
- 0
-
- 1
- 0
- 0
- 1.0
- 1.0
- 0.0
- 0.1
- 1.0
- 1.0
-
-
- 22
- SAP Non Standard
- 255
- 0
- 0
- 1
- 2
- 1
- 2
- 1
- 1
- 105
- 100
- 0
- 1
- 0
- 1
- 1
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 15
- 0
-
- 1
- 0
- 0
- 1.0
- 1.0
- 0.05
- 0.5
- 1.0
- 1.0
-
-
- 23
- AP/FMJ small Handgun
- 204
- 0
- 0
- 3
- 4
- 3
- 4
- 1
- 1
- 100
- 100
- 0
- 1
- 0
- 1
- 1
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 8
- 0
-
- 1
- 0
- 0
- 1.0
- 1.0
- 0.0
- 0.1
- 1.0
- 1.0
-
-
- 24
- Cold Glaser FMJ
- 124
- 237
- 106
- 4
- 1
- 3
- 1
- 1
- 1
- 175
- 100
- 1
- 0
- 0
- 1
- 1
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
-
- 1
- 0
- 0
- 1.0
- 1.0
- 0.0
- 0.0
- 0.4
- 1.0
-
-
- 25
- Brenneke
- 167
- 167
- 167
- 1
- 1
- 1
- 1
- 1
- 1
- 115
- 100
- 0
- 1
- 0
- 1
- 1
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 75
- 0
-
- 1
- 0
- 0
- 1.0
- 1.0
- 0.0
- 0.2
- 1.0
- 1.0
-
-
- 26
- Depleted Uranium
- 16
- 204
- 22
- 1
- 2
- 1
- 2
- 3
- 1
- 100
- 100
- 0
- 1
- 0
- 1
- 1
- 1
- 0
- 0
- 0
- 0
- 0
- 1
- 0
- 75
- 0
-
- 1
- 0
- 0
- 1.0
- 1.0
- 0.5
- 0.8
- 1.0
- 1.0
-
-
- 27
- Crossbow Bolt
- 137
- 137
- 137
- 3
- 5
- 3
- 5
- 1
- 1
- 100
- 100
- 0
- 1
- 1
- 1
- 1
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
-
- 1
- 0
- 0
- 1.0
- 1.0
- 0.0
- 0.0
- 1.0
- 1.0
-
-
- 28
- HE Crossbow Bolt
- 255
- 178
- 0
- 4
- 5
- 4
- 5
- 4
- 3
- 100
- 100
- 0
- 0
- 0
- 1
- 1
- 1
- 19
- 1
- 0
- 0
- 0
- 0
- 0
- 30
- 0
-
- 1
- 0
- 0
- 1.0
- 1.0
- 0.2
- 0.4
- 1.0
- 1.0
-
-
- 29
- HP large
- 69
- 69
- 224
- 16
- 10
- 6
- 5
- 1
- 1
- 162
- 100
- 0
- 0
- 0
- 1
- 1
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 5
- 0
-
- 1
- 0
- 0
- 1.0
- 1.0
- 0.0
- 0.0
- 1.0
- 1.0
-
-
- 30
- SAP 12.7
- 255
- 0
- 0
- 1
- 5
- 1
- 5
- 1
- 1
- 125
- 100
- 0
- 1
- 1
- 1
- 1
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 65
- 0
-
- 1
- 0
- 4
- 1.0
- 1.0
- 0.6
- 0.8
- 1.0
- 1.0
-
-
- 31
- AP/FMJ large
- 204
- 0
- 0
- 2
- 3
- 2
- 3
- 1
- 1
- 102
- 100
- 0
- 1
- 1
- 1
- 1
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 12
- 0
-
- 1
- 0
- 0
- 1.0
- 1.0
- 0.0
- 0.65
- 1.0
- 1.0
-
-
- 32
- AP/FMJ medium
- 204
- 0
- 0
- 7
- 10
- 7
- 10
- 1
- 1
- 101
- 100
- 0
- 1
- 1
- 1
- 1
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 10
- 0
-
- 1
- 0
- 0
- 1.0
- 1.0
- 0.0
- 0.5
- 1.0
- 1.0
-
-
- 33
- HP medium
- 69
- 69
- 224
- 18
- 10
- 5
- 4
- 1
- 1
- 159
- 100
- 0
- 0
- 0
- 1
- 1
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 4
- 0
-
- 1
- 0
- 0
- 1.0
- 1.0
- 0.0
- 0.0
- 1.0
- 1.0
-
-
- 34
- Ball medium
- 137
- 137
- 137
- 1
- 1
- 1
- 1
- 1
- 1
- 108
- 100
- 0
- 1
- 1
- 1
- 1
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 6
- 0
-
- 1
- 0
- 0
- 1.0
- 1.0
- 0.0
- 0.0
- 1.0
- 1.0
-
-
- 35
- Ball large
- 137
- 137
- 137
- 1
- 1
- 1
- 1
- 1
- 1
- 112
- 100
- 0
- 1
- 1
- 1
- 1
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 7
- 0
-
- 1
- 0
- 0
- 1.0
- 1.0
- 0.0
- 0.4
- 1.0
- 1.0
-
-
- 36
- CAWS Slug
- 204
- 0
- 0
- 1
- 2
- 2
- 5
- 1
- 1
- 105
- 100
- 0
- 1
- 1
- 1
- 1
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 75
- 0
-
- 1
- 0
- 0
- 1.0
- 1.0
- 0.0
- 0.6
- 1.0
- 1.0
-
-
- 37
- CAWS Buckshot
- 214
- 191
- 137
- 4
- 5
- 4
- 5
- 1
- 1
- 98
- 100
- 0
- 1
- 1
- 9
- 1
- 3
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 20
- 0
-
- 1
- 0
- 0
- 1.0
- 1.0
- 0.0
- 0.1
- 1.0
- 1.0
-
-
- 38
- AP/FMJ x-large
- 204
- 0
- 0
- 6
- 10
- 6
- 10
- 1
- 1
- 105
- 100
- 0
- 1
- 1
- 1
- 1
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 15
- 0
-
- 1
- 0
- 0
- 1.0
- 1.0
- 0.0
- 0.6
- 1.0
- 1.0
-
-
- 39
- HP x-large
- 69
- 69
- 224
- 15
- 10
- 6
- 5
- 1
- 1
- 165
- 100
- 0
- 0
- 0
- 1
- 1
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 8
- 0
-
- 1
- 0
- 0
- 1.0
- 1.0
- 0.0
- 0.0
- 1.0
- 1.0
-
-
- 40
- Tracer FMJ x-large
- 255
- 215
- 63
- 7
- 10
- 7
- 10
- 1
- 1
- 98
- 100
- 0
- 1
- 0
- 1
- 1
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 10
- 1
-
- 1
- 0
- 0
- 1.0
- 1.0
- 0.0
- 0.35
- 1.0
- 1.0
-
-
- 41
- HE 12.7
- 255
- 178
- 0
- 2
- 5
- 2
- 5
- 3
- 1
- 180
- 100
- 0
- 1
- 0
- 1
- 1
- 1
- 19
- 1
- 0
- 0
- 0
- 0
- 0
- 60
- 0
-
- 1
- 0
- 4
- 1.0
- 1.0
- 0.8
- 1.0
- 1.0
- 1.0
-
-
- 42
- HEAT 12.7
- 255
- 123
- 0
- 2
- 5
- 2
- 5
- 4
- 3
- 180
- 100
- 0
- 1
- 0
- 1
- 1
- 1
- 19
- 1
- 0
- 0
- 0
- 0
- 0
- 75
- 0
-
- 1
- 0
- 4
- 1.0
- 1.0
- 1.0
- 1.2
- 1.2
- 1.0
-
-
- 43
- SAP 9x39 Match
- 230
- 230
- 230
- 3
- 5
- 3
- 5
- 1
- 1
- 110
- 100
- 0
- 1
- 0
- 1
- 1
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 15
- 0
-
- 1
- 0
- 0
- 1.0
- 1.0
- 0.0
- 0.2
- 1.0
- 1.0
-
-
- 44
- Polyshok
- 182
- 35
- 196
- 1
- 1
- 1
- 1
- 1
- 1
- 175
- 100
- 0
- 0
- 0
- 1
- 1
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 8
- 0
-
- 1
- 0
- 0
- 1.0
- 1.0
- 0.0
- 0.0
- 1.0
- 1.0
-
-
- 45
- BAT
- 57
- 211
- 201
- 2
- 1
- 6
- 5
- 1
- 1
- 146
- 100
- 0
- 0
- 0
- 1
- 1
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 5
- 0
-
- 1
- 0
- 0
- 1.0
- 1.0
- 0.0
- 0.0
- 1.0
- 1.0
-
-
- 46
- XP - x-large
- 182
- 35
- 196
- 6
- 10
- 6
- 10
- 1
- 1
- 115
- 100
- 0
- 1
- 0
- 1
- 1
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 25
- 0
-
- 1
- 0
- 0
- 1.0
- 1.0
- 0.0
- 0.3
- 1.0
- 1.0
-
-
- 47
- Hornet's Nest
- 99
- 181
- 86
- 4
- 1
- 3
- 1
- 7
- 10
- 70
- 100
- 1
- 0
- 0
- 20
- 1
- 6
- 16
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- HornetSpread
- 1
- 0
- 0
- 0.4
- 1.6
- 0.0
- 0.0
- 1.0
- 1.0
-
-
- 48
- AP/FMJ Beowulf
- 204
- 0
- 0
- 6
- 10
- 6
- 10
- 1
- 1
- 118
- 100
- 0
- 1
- 1
- 1
- 1
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 40
- 0
-
- 1
- 0
- 0
- 1.0
- 1.0
- 0.0
- 0.5
- 1.0
- 1.0
-
-
- 49
- HP Beowulf
- 69
- 69
- 224
- 14
- 10
- 1
- 1
- 1
- 1
- 160
- 100
- 0
- 0
- 0
- 1
- 1
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 12
- 0
-
- 1
- 0
- 0
- 1.0
- 1.0
- 0.0
- 0.0
- 1.0
- 1.0
-
-
- 50
- Ratshot
- 59
- 178
- 41
- 4
- 1
- 2
- 1
- 1
- 1
- 100
- 100
- 1
- 0
- 0
- 6
- 1
- 6
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- FlechetteSpread
- 1
- 0
- 0
- 0.8
- 1.2
- 0.0
- 0.0
- 0.0
- 0.8
-
-
- 51
- Match 12.7
- 230
- 230
- 230
- 2
- 5
- 2
- 5
- 1
- 1
- 120
- 100
- 0
- 1
- 0
- 1
- 1
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 25
- 0
-
- 1
- 0
- 4
- 1.0
- 1.0
- 0.0
- 0.9
- 1.0
- 1.0
-
-
- 52
- AP/FMJ medium Handgun
- 204
- 0
- 0
- 7
- 10
- 7
- 10
- 1
- 1
- 101
- 100
- 0
- 1
- 0
- 1
- 1
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 6
- 0
-
- 1
- 0
- 0
- 1.0
- 1.0
- 0.0
- 0.3
- 1.0
- 1.0
-
-
- 53
- AP/FMJ large Handgun
- 204
- 0
- 0
- 2
- 3
- 2
- 3
- 1
- 1
- 102
- 100
- 0
- 1
- 0
- 1
- 1
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 8
- 0
-
- 1
- 0
- 0
- 1.0
- 1.0
- 0.0
- 0.4
- 1.0
- 1.0
-
-
- 54
- HPJ small
- 178
- 133
- 76
- 4
- 5
- 4
- 5
- 1
- 1
- 124
- 100
- 0
- 0
- 0
- 1
- 1
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 5
- 0
-
- 1
- 0
- 0
- 1.0
- 1.0
- 0.0
- 0.0
- 1.0
- 1.0
-
-
- 55
- HPJ medium
- 178
- 133
- 76
- 3
- 4
- 3
- 4
- 1
- 1
- 128
- 100
- 0
- 0
- 0
- 1
- 1
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 7
- 0
-
- 1
- 0
- 0
- 1.0
- 1.0
- 0.0
- 0.0
- 1.0
- 1.0
-
-
- 56
- HPJ large
- 178
- 133
- 76
- 3
- 4
- 3
- 4
- 1
- 1
- 132
- 100
- 0
- 0
- 0
- 1
- 1
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 10
- 0
-
- 1
- 0
- 0
- 1.0
- 1.0
- 0.0
- 0.0
- 1.0
- 1.0
-
-
- 57
- Buckshot 40mm
- 214
- 191
- 137
- 1
- 1
- 1
- 1
- 1
- 1
- 95
- 100
- 0
- 1
- 1
- 24
- 1
- 4
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 5
- 0
- BuchshotSpread
- 1
- 0
- 0
- 1.0
- 1.0
- 0.0
- 0.0
- 1.0
- 1.0
-
-
- 58
- SAP 12gauge
- 255
- 0
- 0
- 1
- 2
- 1
- 2
- 1
- 1
- 120
- 100
- 0
- 1
- 0
- 1
- 1
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 40
- 0
-
- 1
- 0
- 0
- 1.0
- 1.0
- 0.0
- 0.5
- 1.0
- 1.0
-
-
- 59
- Duplex 12gauge
- 16
- 204
- 22
- 1
- 1
- 1
- 1
- 1
- 1
- 100
- 100
- 1
- 1
- 0
- 2
- 2
- 3
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 10
- 0
- DuplexSpread
- 1
- 0
- 0
- 1.0
- 1.0
- 0.0
- 0.25
- 1.0
- 1.0
-
-
- 60
- Flechette 40mm
- 178
- 15
- 15
- 4
- 5
- 4
- 5
- 1
- 1
- 100
- 100
- 0
- 1
- 0
- 18
- 1
- 3
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 5
- 0
- FlechetteSpread
- 1
- 0
- 0
- 1.0
- 1.0
- 0.0
- 0.0
- 1.0
- 1.0
-
-
- 61
- HE 7.92x57mm
- 255
- 178
- 0
- 8
- 10
- 8
- 10
- 12
- 10
- 120
- 100
- 0
- 0
- 0
- 1
- 1
- 1
- 19
- 1
- 0
- 0
- 0
- 0
- 0
- 30
- 0
-
- 1
- 0
- 0
- 1.0
- 1.0
- 0.0
- 0.5
- 1.0
- 1.0
-
-
- 62
- AP 9x39
- 204
- 0
- 0
- 7
- 10
- 7
- 10
- 1
- 1
- 125
- 100
- 0
- 1
- 1
- 1
- 1
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 8
- 0
-
- 1
- 0
- 0
- 1.0
- 1.0
- 0.0
- 0.2
- 1.0
- 1.0
-
-
- 63
- SAP 9x39
- 255
- 0
- 0
- 1
- 2
- 1
- 2
- 1
- 1
- 120
- 100
- 0
- 1
- 0
- 1
- 1
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 20
- 0
-
- 1
- 0
- 0
- 1.0
- 1.0
- 0.0
- 0.3
- 1.0
- 1.0
-
-
- 64
- 14.5x114mm
- 255
- 0
- 0
- 1
- 10
- 1
- 10
- 1
- 1
- 150
- 100
- 0
- 1
- 1
- 1
- 1
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 90
- 0
-
- 1
- 0
- 4
- 1.0
- 1.0
- 0.6
- 1.0
- 1.0
- 1.0
-
-
- 65
- Flechette 5.56
- 178
- 15
- 15
- 4
- 5
- 1
- 2
- 1
- 1
- 100
- 100
- 0
- 1
- 1
- 1
- 1
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 5
- 0
-
- 1
- 0
- 0
- 1.0
- 1.0
- 0.0
- 0.0
- 1.0
- 1.0
-
-
- 66
- Duplex 5.56
- 16
- 204
- 22
- 9
- 10
- 9
- 10
- 1
- 1
- 100
- 100
- 0
- 1
- 1
- 2
- 3
- 4
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 5
- 0
- DuplexSpread
- 1
- 0
- 0
- 1.0
- 1.0
- 0.0
- 0.0
- 1.0
- 1.0
-
-
- 67
- Crossbow Toxin
- 0
- 250
- 0
- 4
- 5
- 4
- 5
- 1
- 1
- 100
- 100
- 0
- 0
- 0
- 1
- 1
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
-
- 1
- 0
- 1
- 1.0
- 1.0
- 0.0
- 0.0
- 1.0
- 1.0
-
-
- 68
- XP small
- 182
- 35
- 196
- 8
- 10
- 8
- 10
- 1
- 1
- 120
- 100
- 0
- 1
- 0
- 1
- 1
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 12
- 0
-
- 1
- 0
- 0
- 1.0
- 1.0
- 0.0
- 0.0
- 1.0
- 1.0
-
-
- 69
- Rubber 12gauge
- 99
- 181
- 86
- 3
- 1
- 3
- 1
- 10
- 10
- 100
- 100
- 1
- 0
- 0
- 1
- 1
- 1
- 17
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
-
- 1
- 0
- 0
- 0.6
- 2.4
- 0.0
- 0.0
- 0.0
- 0.0
-
-
- 70
- Piranha 12gauge
- 57
- 211
- 201
- 2
- 1
- 2
- 1
- 7
- 10
- 70
- 100
- 0
- 0
- 0
- 18
- 1
- 6
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 2
- 0
- PiranhaSpread
- 1
- 0
- 0
- 0.7
- 1.5
- 0.0
- 0.0
- 1.0
- 1.0
-
-
- 71
- 12gauge Mini Slug
- 137
- 137
- 137
- 1
- 1
- 1
- 1
- 1
- 1
- 112
- 100
- 0
- 1
- 1
- 1
- 1
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 5
- 0
-
- 1
- 0
- 0
- 1
- 1
- 0.0
- 0.0
- 0.8
- 1.0
-
-
- 72
- 12gauge Mini Shot
- 214
- 191
- 137
- 1
- 1
- 1
- 1
- 1
- 1
- 90
- 100
- 1
- 0
- 1
- 6
- 1
- 4
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 1
- 0
- BuckshotSpread
- 1
- 0
- 0
- 1
- 1
- 0.0
- 0.0
- 0.5
- 1.0
-
-
- 73
- Triplex .410
- 16
- 204
- 22
- 1
- 1
- 1
- 1
- 1
- 1
- 100
- 100
- 0
- 0
- 0
- 3
- 2
- 3
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 2
- 0
- FlechetteSpread
- 1
- 0
- 0
- 1
- 1
- 0.0
- 0.0
- 1.0
- 1.0
-
-
- 74
- Birdshot .410
- 59
- 178
- 41
- 7
- 5
- 7
- 5
- 1
- 1
- 100
- 100
- 1
- 0
- 0
- 12
- 1
- 4
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- FlechetteSpread
- 1
- 0
- 0
- 0.8
- 1
- 0.0
- 0.0
- 0.0
- 0.8
-
-
- 75
- Buckshot .410
- 214
- 191
- 137
- 6
- 5
- 6
- 5
- 1
- 1
- 95
- 100
- 1
- 0
- 1
- 6
- 1
- 2
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- FlechetteSpread
- 1
- 0
- 0
- 1
- 1
- 0.0
- 0.0
- 1.0
- 1.0
-
-
- 76
- 40mm Rubber
- 99
- 181
- 86
- 3
- 1
- 3
- 1
- 8
- 10
- 75
- 100
- 1
- 0
- 0
- 1
- 1
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
-
- 1
- 0
- 0
- 0.2
- 4.0
- 0.0
- 0.0
- 0.0
- 0.5
-
-
- 77
- 40mm LB
- 230
- 230
- 230
- 3
- 5
- 3
- 5
- 2
- 1
- 200
- 100
- 0
- 0
- 0
- 1
- 1
- 1
- 0
- 1
- 0
- 0
- 0
- 0
- 0
- 100
- 0
-
- 1
- 0
- 4
- 1
- 1
- 0.0
- 0.3
- 1.0
- 1.0
-
-
\ No newline at end of file
diff --git a/Data-Bigmaps/TableData/Map/FacilityTypes.xml b/Data-Bigmaps/TableData/Map/FacilityTypes.xml
index 81ef2c8..5419ef6 100644
--- a/Data-Bigmaps/TableData/Map/FacilityTypes.xml
+++ b/Data-Bigmaps/TableData/Map/FacilityTypes.xml
@@ -1830,7 +1830,7 @@
37
T-Shirt Factory
Factory
- 4
+ 0
- Requires: Doreen quest
@@ -1855,17 +1855,17 @@
376
35
44145
- 4
+ 4
15
311
- 1022
+ 336
2711
120
43785
- 7
+ 3
15
311
336
@@ -1876,7 +1876,7 @@
2712
120
50986
- 7
+ 3
15
311
336
@@ -1887,7 +1887,7 @@
1609
120
50985
- 7
+ 3
15
311
336
@@ -1897,7 +1897,7 @@
Upgrade
181
- 100
+ 100
15
@@ -1906,7 +1906,7 @@
2701
300
42347
- 25
+ 10
30
311
311
@@ -1920,7 +1920,7 @@
2701
180
42346
- 37
+ 15
30
311
311
@@ -1933,7 +1933,7 @@
38
Hicks Farm
Farm
- 4
+ 0
- Requires: Hicks dead