diff --git a/gamedir/Data-1.13/TableData/AIMAvailability.xml b/gamedir/Data-1.13/TableData/AIMAvailability.xml index 5dd018d3e..e2d3df248 100644 --- a/gamedir/Data-1.13/TableData/AIMAvailability.xml +++ b/gamedir/Data-1.13/TableData/AIMAvailability.xml @@ -1067,7 +1067,6 @@ 177 47 - 178 Spooky @@ -1466,27 +1465,27 @@ 244 - - -1 - -1 + Elroy + 244 + 63 245 - - -1 - -1 + Mouse + 245 + 64 246 - - -1 - -1 + Hector + 246 + 65 247 - - -1 - -1 + Rev + 247 + 66 248 diff --git a/gamedir/Data-1.13/TableData/HiddenNames.xml b/gamedir/Data-1.13/TableData/HiddenNames.xml index e77dc2bb5..dcda365b9 100644 --- a/gamedir/Data-1.13/TableData/HiddenNames.xml +++ b/gamedir/Data-1.13/TableData/HiddenNames.xml @@ -1221,22 +1221,22 @@ 244 - + Elroy 0 245 - + Mouse 0 246 - + Hector 0 247 - + Rev 0 diff --git a/gamedir/Data-1.13/TableData/Inventory/MercStartingGear.xml b/gamedir/Data-1.13/TableData/Inventory/MercStartingGear.xml index f29d46237..a2590447b 100644 --- a/gamedir/Data-1.13/TableData/Inventory/MercStartingGear.xml +++ b/gamedir/Data-1.13/TableData/Inventory/MercStartingGear.xml @@ -33499,21 +33499,23 @@ 244 - + Elroy 0 + + -1 0 - 0 0 - 0 + 87 + 188 0 - 0 + 92 0 0 0 - 0 + 5 0 - 0 + 95 0 0 0 @@ -33530,12 +33532,12 @@ 0 0 0 - 0 - 0 - 0 - 0 - 0 - 0 + 77 + 100 + 1 + 77 + 100 + 1 0 0 0 @@ -33548,16 +33550,16 @@ 0 0 0 - 0 - 0 - 0 + 204 + 96 + 1 0 0 0 0 0 - 0 - 0 + 1200 + 92 0 0 0 @@ -33565,24 +33567,135 @@ 0 0 + + -1 + 188 + 92 + 5 + 95 + 203 + 95 + 1 + 77 + 100 + 1 + 77 + 100 + 1 + 299 + 92 + 1 + 1200 + 92 + 1098 + 92 + + + -1 + 281 + 92 + 188 + 94 + 31 + 97 + 107 + 100 + 1 + 107 + 100 + 1 + 204 + 96 + 1 + 151 + 99 + 1 + 1090 + 97 + 95 + 92 + + + -1 + 176 + 95 + 161 + 95 + 31 + 97 + 203 + 95 + 107 + 100 + 1 + 108 + 100 + 1 + 416 + 100 + 1 + 299 + 92 + 1 + 1090 + 97 + 95 + 1098 + 92 + + + -1 + 281 + 92 + 189 + 93 + 739 + 97 + 203 + 99 + 1 + 538 + 100 + 1 + 538 + 100 + 1 + 564 + 100 + 1 + 210 + 88 + 1 + 1027 + 96 + 1 + 1090 + 97 + 1200 + 92 + 1098 + 92 + 245 - + Mouse 0 + + -1 0 - 0 0 - 0 + 0 + 188 0 - 0 + 95 0 0 0 - 0 + 8 0 - 0 + 93 0 0 0 @@ -33599,12 +33712,12 @@ 0 0 0 - 0 - 0 - 0 - 0 - 0 - 0 + 80 + 100 + 1 + 80 + 100 + 1 0 0 0 @@ -33623,8 +33736,8 @@ 0 0 0 - 0 - 0 + 1090 + 95 0 0 0 @@ -33634,24 +33747,139 @@ 0 0 + + -1 + 96 + 161 + 95 + 8 + 93 + 80 + 100 + 1 + 82 + 100 + 1 + 38 + 1090 + 95 + 1091 + 92 + + + -1 + 176 + 96 + 161 + 95 + 631 + 98 + 401 + 100 + 1 + 402 + 100 + 1 + 38 + 99 + 1 + 1027 + 100 + 1 + 207 + 99 + 1 + 1090 + 95 + 1092 + 97 + + + -1 + 176 + 96 + 161 + 95 + 631 + 98 + 401 + 100 + 1 + 403 + 100 + 1 + 199 + 97 + 1 + 1028 + 100 + 1 + 207 + 99 + 1 + 1090 + 95 + 1092 + 97 + + + -1 + 176 + 96 + 161 + 95 + 631 + 96 + 401 + 100 + 1 + 403 + 100 + 1 + 402 + 100 + 1 + 1027 + 100 + 1 + 1028 + 100 + 1 + 207 + 99 + 1 + 38 + 95 + 1 + 151 + 97 + 1 + 1090 + 95 + 1092 + 97 + 99 + 246 - + Hector 0 + + -1 0 - 0 0 + 0 0 0 - 0 + 99 0 0 0 - 0 + 5 0 - 0 + 97 0 0 0 @@ -33668,15 +33896,15 @@ 0 0 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 + 77 + 100 + 1 + 77 + 100 + 1 + 37 + 97 + 1 0 0 0 @@ -33692,8 +33920,8 @@ 0 0 0 - 0 - 0 + 1090 + 99 0 0 0 @@ -33703,22 +33931,124 @@ 0 0 + + -1 + 161 + 99 + 5 + 97 + 600 + 97 + 77 + 100 + 1 + 77 + 100 + 1 + 212 + 96 + 1 + 1090 + 99 + 1200 + 95 + + + -1 + 176 + 97 + 161 + 99 + 707 + 95 + 600 + 97 + 523 + 100 + 1 + 523 + 100 + 1 + 212 + 96 + 1 + 214 + 97 + 1 + 1090 + 99 + + + -1 + 176 + 97 + 161 + 99 + 1178 + 92 + 600 + 97 + 1 + 72 + 100 + 1 + 72 + 100 + 1 + 214 + 100 + 1079 + 95 + + + -1 + 176 + 97 + 161 + 99 + 838 + 95 + 1178 + 92 + 54 + 99 + 1 + 72 + 100 + 1 + 72 + 100 + 1 + 74 + 100 + 1 + 214 + 100 + 1 + 212 + 96 + 1 + 1079 + 95 + 247 - + Rev 0 + + -1 0 - 0 0 + 0 0 0 0 0 0 0 - 0 + 8 0 0 0 @@ -33737,12 +34067,12 @@ 0 0 0 - 0 - 0 - 0 - 0 - 0 - 0 + 80 + 100 + 1 + 80 + 100 + 1 0 0 0 @@ -33772,6 +34102,90 @@ 0 0 + + -1 + 161 + 631 + 401 + 100 + 1 + 403 + 100 + 1 + 1090 + 1091 + + + -1 + 161 + 622 + 96 + 3 + 96 + 71 + 100 + 1 + 71 + 100 + 1 + 71 + 100 + 1 + 73 + 100 + 1 + 1092 + 99 + 1091 + 95 + + + -1 + 161 + 98 + 679 + 97 + 107 + 100 + 1 + 108 + 100 + 1 + 416 + 100 + 1 + 134 + 98 + 1 + 1090 + + + -1 + 161 + 98 + 711 + 97 + 711 + 94 + 545 + 100 + 3 + 546 + 100 + 1 + 559 + 100 + 1 + 412 + 100 + 1 + 255 + 134 + 99 + 1 + 1090 + 95 + 248 diff --git a/gamedir/Data-1.13/TableData/MercOpinions.xml b/gamedir/Data-1.13/TableData/MercOpinions.xml index e8a733b62..2af24e092 100644 --- a/gamedir/Data-1.13/TableData/MercOpinions.xml +++ b/gamedir/Data-1.13/TableData/MercOpinions.xml @@ -19277,7 +19277,7 @@ 244 - + Elroy 0 0 0 @@ -19356,7 +19356,7 @@ 245 - + Mouse 0 0 0 @@ -19435,7 +19435,7 @@ 246 - + Hector 0 0 0 @@ -19514,7 +19514,7 @@ 247 - + Rev 0 0 0 diff --git a/gamedir/Data-1.13/TableData/MercProfiles.xml b/gamedir/Data-1.13/TableData/MercProfiles.xml index 596c82229..81a5a0cea 100644 --- a/gamedir/Data-1.13/TableData/MercProfiles.xml +++ b/gamedir/Data-1.13/TableData/MercProfiles.xml @@ -20593,71 +20593,71 @@ 244 - 0 - - + 1 + Elroy B. Tolken + Elroy 244 - 0 - 0 - 0 - 0 + 8 + 8 + 8 + 29 0 0 - 0 - 0 - - - - + 3000 + 2000 + BEIGEPANTS + BROWNVEST + PINKSKIN + BROWNHEAD 0 0 0 - 0 - 0 + 2 + 2 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 + 7 + 101 + 101 + 63 + 63 + 68 + 54 + 88 + 50 + 55 + 6 + 15 + 12 + 81 + 1 0 - 0 - 0 - 0 - 0 + 9 + 1 + 14 + 8 0 - 0 - 0 - 0 - 0 - 0 - 0 + -1 + -1 + -1 + -1 + -1 + -1 0 - 0 + -1 0 - 0 + -1 0 - 0 + -1 0 - 0 + -1 0 - 0 + -1 0 - 0 + -1 0 - 0 - 0 - 0 + 350 + 2000 + 3800 0 0 0 @@ -20677,48 +20677,48 @@ 245 - 0 - - + 1 + Anita "Mouse" Backman + Mouse 245 - 0 - 0 - 0 - 0 + 8 + 11 + 7 + 28 0 0 - 0 - 0 - - - - - 0 - 0 + 3000 + 2000 + BLACKPANTS + WHITEVEST + TANSKIN + WHITEHEAD + 1 + 3 0 - 0 - 0 + 2 + 3 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 + 8 + 90 + 82 + 84 + 84 + 62 + 99 + 94 + 75 + 69 0 - 0 - 0 - 0 - 0 + 12 + 10 + 4 + 1 0 - 0 + 9 0 0 - 0 + 14 0 0 0 @@ -20727,8 +20727,8 @@ 0 0 0 - 0 - 0 + 14 + 16 0 0 0 @@ -20739,11 +20739,11 @@ 0 0 0 - 0 - 0 - 0 - 0 - 0 + 550 + 3300 + 6200 + 1 + 800 0 -1 -1 @@ -20761,50 +20761,50 @@ 246 - 0 - - + 1 + Hector Alvarez + Hector 246 - 0 - 0 - 0 - 0 + 8 + 7 + 8 + 21 0 0 - 0 - 0 - - - - + 3000 + 2000 + BEIGEPANTS + BLUEVEST + DARKSKIN + BROWNHEAD 0 - 0 + 1 0 0 - 0 + 1 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 + 8 + 78 + 90 + 79 + 79 + 83 + 84 + 88 + 72 + 61 + 17 + 28 + 6 + 38 + 1 0 - 0 + 13 0 - 0 - 0 + 11 + 15 0 - 0 + 63 0 0 0 @@ -20823,11 +20823,11 @@ 0 0 0 - 0 - 0 - 0 - 0 - 0 + 500 + 2300 + 5000 + 1 + 1000 0 -1 -1 @@ -20845,48 +20845,48 @@ 247 - 0 - - + 1 + Reverend Clyde Potter + Rev 247 - 0 - 0 - 0 - 0 + 8 + 7 + 8 + 23 0 0 - 0 - 0 - - - - + 3000 + 2000 + BLACKPANTS + BLACKSHIRT + BLACKSKIN + BROWNHEAD 0 - 0 + 2 0 - 0 - 0 + 7 + 1 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 + 6 + 12 + 101 + 74 + 74 + 67 + 46 + 41 + 54 + 64 + 41 + 62 + 15 + 15 + 1 0 - 0 - 0 - 0 - 0 + 6 + 10 + 18 + 10 0 0 0 @@ -20895,8 +20895,8 @@ 0 0 0 - 0 - 0 + 221 + 16 0 0 0 @@ -20907,9 +20907,9 @@ 0 0 0 - 0 - 0 - 0 + 350 + 2100 + 4000 0 0 0 diff --git a/gamedir/Data-1.13/TableData/MercQuote.xml b/gamedir/Data-1.13/TableData/MercQuote.xml index 7fd16ccb0..f03cf3f19 100644 --- a/gamedir/Data-1.13/TableData/MercQuote.xml +++ b/gamedir/Data-1.13/TableData/MercQuote.xml @@ -2685,47 +2685,47 @@ 244 - + Elroy 0 0 - 0 - 0 + 2 + 62 0 - 0 - 0 + 1 + 1 245 - + Mouse 0 0 - 0 - 0 + 2 + 62 0 - 0 - 0 + 1 + 1 246 - + Hector 0 0 - 0 - 0 + 2 + 62 0 - 0 - 0 + 1 + 1 247 - + Rev 0 0 - 0 - 0 + 2 + 62 0 - 0 - 0 + 1 + 1 248 diff --git a/gamedir/Data-1.13/faces/238.sti b/gamedir/Data-1.13/faces/238.sti new file mode 100644 index 000000000..0ff8c37bd Binary files /dev/null and b/gamedir/Data-1.13/faces/238.sti differ diff --git a/gamedir/Data-1.13/faces/243.sti b/gamedir/Data-1.13/faces/243.sti new file mode 100644 index 000000000..3ed2286e2 Binary files /dev/null and b/gamedir/Data-1.13/faces/243.sti differ diff --git a/gamedir/Data-1.13/faces/246.STI b/gamedir/Data-1.13/faces/246.STI new file mode 100644 index 000000000..493a16d34 Binary files /dev/null and b/gamedir/Data-1.13/faces/246.STI differ diff --git a/gamedir/Data-1.13/faces/247.STI b/gamedir/Data-1.13/faces/247.STI new file mode 100644 index 000000000..ef03a8011 Binary files /dev/null and b/gamedir/Data-1.13/faces/247.STI differ diff --git a/gamedir/Data-1.13/faces/33Face/238.sti b/gamedir/Data-1.13/faces/33Face/238.sti new file mode 100644 index 000000000..989d734c4 Binary files /dev/null and b/gamedir/Data-1.13/faces/33Face/238.sti differ diff --git a/gamedir/Data-1.13/faces/33Face/243.sti b/gamedir/Data-1.13/faces/33Face/243.sti new file mode 100644 index 000000000..f05ce9895 Binary files /dev/null and b/gamedir/Data-1.13/faces/33Face/243.sti differ diff --git a/gamedir/Data-1.13/faces/33Face/246.sti b/gamedir/Data-1.13/faces/33Face/246.sti new file mode 100644 index 000000000..1d531784e Binary files /dev/null and b/gamedir/Data-1.13/faces/33Face/246.sti differ diff --git a/gamedir/Data-1.13/faces/33Face/247.sti b/gamedir/Data-1.13/faces/33Face/247.sti new file mode 100644 index 000000000..8e4503e8b Binary files /dev/null and b/gamedir/Data-1.13/faces/33Face/247.sti differ diff --git a/gamedir/Data-1.13/faces/65Face/238.sti b/gamedir/Data-1.13/faces/65Face/238.sti new file mode 100644 index 000000000..e2cd205db Binary files /dev/null and b/gamedir/Data-1.13/faces/65Face/238.sti differ diff --git a/gamedir/Data-1.13/faces/65Face/243.sti b/gamedir/Data-1.13/faces/65Face/243.sti new file mode 100644 index 000000000..1e98f2e35 Binary files /dev/null and b/gamedir/Data-1.13/faces/65Face/243.sti differ diff --git a/gamedir/Data-1.13/faces/65Face/246.sti b/gamedir/Data-1.13/faces/65Face/246.sti new file mode 100644 index 000000000..95529b0bc Binary files /dev/null and b/gamedir/Data-1.13/faces/65Face/246.sti differ diff --git a/gamedir/Data-1.13/faces/65Face/247.sti b/gamedir/Data-1.13/faces/65Face/247.sti new file mode 100644 index 000000000..ac9828d56 Binary files /dev/null and b/gamedir/Data-1.13/faces/65Face/247.sti differ diff --git a/gamedir/Data-1.13/faces/BigFaces/238.STI b/gamedir/Data-1.13/faces/BigFaces/238.STI new file mode 100644 index 000000000..1eac5371a Binary files /dev/null and b/gamedir/Data-1.13/faces/BigFaces/238.STI differ diff --git a/gamedir/Data-1.13/faces/BigFaces/243.sti b/gamedir/Data-1.13/faces/BigFaces/243.sti new file mode 100644 index 000000000..74e4b12c0 Binary files /dev/null and b/gamedir/Data-1.13/faces/BigFaces/243.sti differ diff --git a/gamedir/Data-1.13/faces/BigFaces/246.sti b/gamedir/Data-1.13/faces/BigFaces/246.sti new file mode 100644 index 000000000..b6630fe54 Binary files /dev/null and b/gamedir/Data-1.13/faces/BigFaces/246.sti differ diff --git a/gamedir/Data-1.13/faces/DESERTCAMO/238.sti b/gamedir/Data-1.13/faces/DESERTCAMO/238.sti new file mode 100644 index 000000000..7d4f4c586 Binary files /dev/null and b/gamedir/Data-1.13/faces/DESERTCAMO/238.sti differ diff --git a/gamedir/Data-1.13/faces/DESERTCAMO/243.sti b/gamedir/Data-1.13/faces/DESERTCAMO/243.sti new file mode 100644 index 000000000..f4348a1d7 Binary files /dev/null and b/gamedir/Data-1.13/faces/DESERTCAMO/243.sti differ diff --git a/gamedir/Data-1.13/faces/DESERTCAMO/246.STI b/gamedir/Data-1.13/faces/DESERTCAMO/246.STI new file mode 100644 index 000000000..f5cd0f6c6 Binary files /dev/null and b/gamedir/Data-1.13/faces/DESERTCAMO/246.STI differ diff --git a/gamedir/Data-1.13/faces/DESERTCAMO/247.STI b/gamedir/Data-1.13/faces/DESERTCAMO/247.STI new file mode 100644 index 000000000..e16097b20 Binary files /dev/null and b/gamedir/Data-1.13/faces/DESERTCAMO/247.STI differ diff --git a/gamedir/Data-1.13/faces/URBANCAMO/238.sti b/gamedir/Data-1.13/faces/URBANCAMO/238.sti new file mode 100644 index 000000000..6d36e3c22 Binary files /dev/null and b/gamedir/Data-1.13/faces/URBANCAMO/238.sti differ diff --git a/gamedir/Data-1.13/faces/URBANCAMO/243.sti b/gamedir/Data-1.13/faces/URBANCAMO/243.sti new file mode 100644 index 000000000..4b61df4d2 Binary files /dev/null and b/gamedir/Data-1.13/faces/URBANCAMO/243.sti differ diff --git a/gamedir/Data-1.13/faces/URBANCAMO/246.STI b/gamedir/Data-1.13/faces/URBANCAMO/246.STI new file mode 100644 index 000000000..cc04a52ef Binary files /dev/null and b/gamedir/Data-1.13/faces/URBANCAMO/246.STI differ diff --git a/gamedir/Data-1.13/faces/URBANCAMO/247.STI b/gamedir/Data-1.13/faces/URBANCAMO/247.STI new file mode 100644 index 000000000..0bfcb3257 Binary files /dev/null and b/gamedir/Data-1.13/faces/URBANCAMO/247.STI differ diff --git a/gamedir/Data-1.13/faces/WOODCAMO/238.sti b/gamedir/Data-1.13/faces/WOODCAMO/238.sti new file mode 100644 index 000000000..69710b79c Binary files /dev/null and b/gamedir/Data-1.13/faces/WOODCAMO/238.sti differ diff --git a/gamedir/Data-1.13/faces/WOODCAMO/243.sti b/gamedir/Data-1.13/faces/WOODCAMO/243.sti new file mode 100644 index 000000000..e1728dd9a Binary files /dev/null and b/gamedir/Data-1.13/faces/WOODCAMO/243.sti differ diff --git a/gamedir/Data-1.13/faces/WOODCAMO/246.STI b/gamedir/Data-1.13/faces/WOODCAMO/246.STI new file mode 100644 index 000000000..e24915710 Binary files /dev/null and b/gamedir/Data-1.13/faces/WOODCAMO/246.STI differ diff --git a/gamedir/Data-1.13/faces/WOODCAMO/247.STI b/gamedir/Data-1.13/faces/WOODCAMO/247.STI new file mode 100644 index 000000000..7f79488b6 Binary files /dev/null and b/gamedir/Data-1.13/faces/WOODCAMO/247.STI differ