diff --git a/gamedir/Data-1.13/MercEdt/224.EDT b/gamedir/Data-1.13/MercEdt/224.EDT new file mode 100644 index 000000000..48ba6c40e Binary files /dev/null and b/gamedir/Data-1.13/MercEdt/224.EDT differ diff --git a/gamedir/Data-1.13/Speech/224_007.gap b/gamedir/Data-1.13/Speech/224_007.gap index a24a43d58..c49091157 100644 Binary files a/gamedir/Data-1.13/Speech/224_007.gap and b/gamedir/Data-1.13/Speech/224_007.gap differ diff --git a/gamedir/Data-1.13/Speech/224_007.wav b/gamedir/Data-1.13/Speech/224_007.wav index fa8bcf8e1..59fda9fca 100644 Binary files a/gamedir/Data-1.13/Speech/224_007.wav and b/gamedir/Data-1.13/Speech/224_007.wav differ diff --git a/gamedir/Data-1.13/Speech/224_015.WAV b/gamedir/Data-1.13/Speech/224_015.WAV new file mode 100644 index 000000000..170987a80 Binary files /dev/null and b/gamedir/Data-1.13/Speech/224_015.WAV differ diff --git a/gamedir/Data-1.13/Speech/224_015.gap b/gamedir/Data-1.13/Speech/224_015.gap new file mode 100644 index 000000000..171e7be51 Binary files /dev/null and b/gamedir/Data-1.13/Speech/224_015.gap differ diff --git a/gamedir/Data-1.13/Speech/224_016.gap b/gamedir/Data-1.13/Speech/224_016.gap index 2998a5da0..19ccbcd4e 100644 Binary files a/gamedir/Data-1.13/Speech/224_016.gap and b/gamedir/Data-1.13/Speech/224_016.gap differ diff --git a/gamedir/Data-1.13/Speech/224_016.wav b/gamedir/Data-1.13/Speech/224_016.wav index 09718a80c..d753885af 100644 Binary files a/gamedir/Data-1.13/Speech/224_016.wav and b/gamedir/Data-1.13/Speech/224_016.wav differ diff --git a/gamedir/Data-1.13/Speech/224_018.WAV b/gamedir/Data-1.13/Speech/224_018.WAV new file mode 100644 index 000000000..b5bb53600 Binary files /dev/null and b/gamedir/Data-1.13/Speech/224_018.WAV differ diff --git a/gamedir/Data-1.13/Speech/224_018.gap b/gamedir/Data-1.13/Speech/224_018.gap new file mode 100644 index 000000000..1a206ed4a Binary files /dev/null and b/gamedir/Data-1.13/Speech/224_018.gap differ diff --git a/gamedir/Data-1.13/Speech/224_022.WAV b/gamedir/Data-1.13/Speech/224_022.WAV index b5bb53600..1e9c358f0 100644 Binary files a/gamedir/Data-1.13/Speech/224_022.WAV and b/gamedir/Data-1.13/Speech/224_022.WAV differ diff --git a/gamedir/Data-1.13/Speech/224_022.gap b/gamedir/Data-1.13/Speech/224_022.gap index 1a206ed4a..b41501a8e 100644 Binary files a/gamedir/Data-1.13/Speech/224_022.gap and b/gamedir/Data-1.13/Speech/224_022.gap differ diff --git a/gamedir/Data-1.13/Speech/224_024.WAV b/gamedir/Data-1.13/Speech/224_024.WAV new file mode 100644 index 000000000..e9eb75106 Binary files /dev/null and b/gamedir/Data-1.13/Speech/224_024.WAV differ diff --git a/gamedir/Data-1.13/Speech/224_024.gap b/gamedir/Data-1.13/Speech/224_024.gap new file mode 100644 index 000000000..5429b9ae2 Binary files /dev/null and b/gamedir/Data-1.13/Speech/224_024.gap differ diff --git a/gamedir/Data-1.13/Speech/224_029.gap b/gamedir/Data-1.13/Speech/224_029.gap new file mode 100644 index 000000000..182986d3d Binary files /dev/null and b/gamedir/Data-1.13/Speech/224_029.gap differ diff --git a/gamedir/Data-1.13/Speech/224_029.wav b/gamedir/Data-1.13/Speech/224_029.wav new file mode 100644 index 000000000..053c53b53 Binary files /dev/null and b/gamedir/Data-1.13/Speech/224_029.wav differ diff --git a/gamedir/Data-1.13/Speech/224_032.gap b/gamedir/Data-1.13/Speech/224_032.gap new file mode 100644 index 000000000..d2794ca5d Binary files /dev/null and b/gamedir/Data-1.13/Speech/224_032.gap differ diff --git a/gamedir/Data-1.13/Speech/224_032.wav b/gamedir/Data-1.13/Speech/224_032.wav index f1eedb86e..e310d0232 100644 Binary files a/gamedir/Data-1.13/Speech/224_032.wav and b/gamedir/Data-1.13/Speech/224_032.wav differ diff --git a/gamedir/Data-1.13/Speech/224_033.gap b/gamedir/Data-1.13/Speech/224_033.gap index 83ce8ec50..e9335f91f 100644 Binary files a/gamedir/Data-1.13/Speech/224_033.gap and b/gamedir/Data-1.13/Speech/224_033.gap differ diff --git a/gamedir/Data-1.13/Speech/224_033.wav b/gamedir/Data-1.13/Speech/224_033.wav index 73922e837..7569b7fca 100644 Binary files a/gamedir/Data-1.13/Speech/224_033.wav and b/gamedir/Data-1.13/Speech/224_033.wav differ diff --git a/gamedir/Data-1.13/Speech/224_035.WAV b/gamedir/Data-1.13/Speech/224_035.WAV index e68791764..039b48e72 100644 Binary files a/gamedir/Data-1.13/Speech/224_035.WAV and b/gamedir/Data-1.13/Speech/224_035.WAV differ diff --git a/gamedir/Data-1.13/Speech/224_043.WAV b/gamedir/Data-1.13/Speech/224_043.WAV index 430560ba7..b71f1d1d8 100644 Binary files a/gamedir/Data-1.13/Speech/224_043.WAV and b/gamedir/Data-1.13/Speech/224_043.WAV differ diff --git a/gamedir/Data-1.13/Speech/224_043.gap b/gamedir/Data-1.13/Speech/224_043.gap index 4c8d4a37d..8685660ed 100644 Binary files a/gamedir/Data-1.13/Speech/224_043.gap and b/gamedir/Data-1.13/Speech/224_043.gap differ diff --git a/gamedir/Data-1.13/Speech/224_045.WAV b/gamedir/Data-1.13/Speech/224_045.WAV new file mode 100644 index 000000000..2f7f37059 Binary files /dev/null and b/gamedir/Data-1.13/Speech/224_045.WAV differ diff --git a/gamedir/Data-1.13/Speech/224_045.gap b/gamedir/Data-1.13/Speech/224_045.gap new file mode 100644 index 000000000..56d33d296 Binary files /dev/null and b/gamedir/Data-1.13/Speech/224_045.gap differ diff --git a/gamedir/Data-1.13/Speech/224_046.WAV b/gamedir/Data-1.13/Speech/224_046.WAV index 7569b7fca..f0ce09348 100644 Binary files a/gamedir/Data-1.13/Speech/224_046.WAV and b/gamedir/Data-1.13/Speech/224_046.WAV differ diff --git a/gamedir/Data-1.13/Speech/224_046.gap b/gamedir/Data-1.13/Speech/224_046.gap index e9335f91f..4cc075121 100644 Binary files a/gamedir/Data-1.13/Speech/224_046.gap and b/gamedir/Data-1.13/Speech/224_046.gap differ diff --git a/gamedir/Data-1.13/Speech/224_049.gap b/gamedir/Data-1.13/Speech/224_049.gap new file mode 100644 index 000000000..2998a5da0 Binary files /dev/null and b/gamedir/Data-1.13/Speech/224_049.gap differ diff --git a/gamedir/Data-1.13/Speech/224_049.wav b/gamedir/Data-1.13/Speech/224_049.wav new file mode 100644 index 000000000..09718a80c Binary files /dev/null and b/gamedir/Data-1.13/Speech/224_049.wav differ diff --git a/gamedir/Data-1.13/Speech/224_051.gap b/gamedir/Data-1.13/Speech/224_051.gap index 4cc075121..62b3ebe23 100644 Binary files a/gamedir/Data-1.13/Speech/224_051.gap and b/gamedir/Data-1.13/Speech/224_051.gap differ diff --git a/gamedir/Data-1.13/Speech/224_051.wav b/gamedir/Data-1.13/Speech/224_051.wav index f0ce09348..120a623aa 100644 Binary files a/gamedir/Data-1.13/Speech/224_051.wav and b/gamedir/Data-1.13/Speech/224_051.wav differ diff --git a/gamedir/Data-1.13/Speech/224_052.gap b/gamedir/Data-1.13/Speech/224_052.gap new file mode 100644 index 000000000..af71204cb Binary files /dev/null and b/gamedir/Data-1.13/Speech/224_052.gap differ diff --git a/gamedir/Data-1.13/Speech/224_052.wav b/gamedir/Data-1.13/Speech/224_052.wav new file mode 100644 index 000000000..729dc4190 Binary files /dev/null and b/gamedir/Data-1.13/Speech/224_052.wav differ diff --git a/gamedir/Data-1.13/Speech/224_056.gap b/gamedir/Data-1.13/Speech/224_056.gap new file mode 100644 index 000000000..e29f64098 Binary files /dev/null and b/gamedir/Data-1.13/Speech/224_056.gap differ diff --git a/gamedir/Data-1.13/Speech/224_056.wav b/gamedir/Data-1.13/Speech/224_056.wav new file mode 100644 index 000000000..e68791764 Binary files /dev/null and b/gamedir/Data-1.13/Speech/224_056.wav differ diff --git a/gamedir/Data-1.13/Speech/224_058.WAV b/gamedir/Data-1.13/Speech/224_058.WAV index 2f7f37059..c41f6430b 100644 Binary files a/gamedir/Data-1.13/Speech/224_058.WAV and b/gamedir/Data-1.13/Speech/224_058.WAV differ diff --git a/gamedir/Data-1.13/Speech/224_058.gap b/gamedir/Data-1.13/Speech/224_058.gap index 56d33d296..970c418f5 100644 Binary files a/gamedir/Data-1.13/Speech/224_058.gap and b/gamedir/Data-1.13/Speech/224_058.gap differ diff --git a/gamedir/Data-1.13/Speech/224_059.WAV b/gamedir/Data-1.13/Speech/224_059.WAV index f997658b9..73922e837 100644 Binary files a/gamedir/Data-1.13/Speech/224_059.WAV and b/gamedir/Data-1.13/Speech/224_059.WAV differ diff --git a/gamedir/Data-1.13/Speech/224_059.gap b/gamedir/Data-1.13/Speech/224_059.gap index 812df9a7f..83ce8ec50 100644 Binary files a/gamedir/Data-1.13/Speech/224_059.gap and b/gamedir/Data-1.13/Speech/224_059.gap differ diff --git a/gamedir/Data-1.13/Speech/224_060.WAV b/gamedir/Data-1.13/Speech/224_060.WAV index 1e9c358f0..f997658b9 100644 Binary files a/gamedir/Data-1.13/Speech/224_060.WAV and b/gamedir/Data-1.13/Speech/224_060.WAV differ diff --git a/gamedir/Data-1.13/Speech/224_060.gap b/gamedir/Data-1.13/Speech/224_060.gap index b41501a8e..812df9a7f 100644 Binary files a/gamedir/Data-1.13/Speech/224_060.gap and b/gamedir/Data-1.13/Speech/224_060.gap differ diff --git a/gamedir/Data-1.13/Speech/224_063.WAV b/gamedir/Data-1.13/Speech/224_063.WAV new file mode 100644 index 000000000..1e9c358f0 Binary files /dev/null and b/gamedir/Data-1.13/Speech/224_063.WAV differ diff --git a/gamedir/Data-1.13/Speech/224_063.gap b/gamedir/Data-1.13/Speech/224_063.gap new file mode 100644 index 000000000..b41501a8e Binary files /dev/null and b/gamedir/Data-1.13/Speech/224_063.gap differ diff --git a/gamedir/Data-1.13/Speech/224_066.gap b/gamedir/Data-1.13/Speech/224_066.gap new file mode 100644 index 000000000..ffff6f3d1 Binary files /dev/null and b/gamedir/Data-1.13/Speech/224_066.gap differ diff --git a/gamedir/Data-1.13/Speech/224_066.wav b/gamedir/Data-1.13/Speech/224_066.wav new file mode 100644 index 000000000..32356e209 Binary files /dev/null and b/gamedir/Data-1.13/Speech/224_066.wav differ diff --git a/gamedir/Data-1.13/Speech/224_073.WAV b/gamedir/Data-1.13/Speech/224_073.WAV new file mode 100644 index 000000000..cd3113be8 Binary files /dev/null and b/gamedir/Data-1.13/Speech/224_073.WAV differ diff --git a/gamedir/Data-1.13/Speech/224_073.gap b/gamedir/Data-1.13/Speech/224_073.gap new file mode 100644 index 000000000..de465cb64 Binary files /dev/null and b/gamedir/Data-1.13/Speech/224_073.gap differ diff --git a/gamedir/Data-1.13/Speech/224_074.WAV b/gamedir/Data-1.13/Speech/224_074.WAV index 7fdda6c2d..430560ba7 100644 Binary files a/gamedir/Data-1.13/Speech/224_074.WAV and b/gamedir/Data-1.13/Speech/224_074.WAV differ diff --git a/gamedir/Data-1.13/Speech/224_074.gap b/gamedir/Data-1.13/Speech/224_074.gap index 3dd91a14b..4c8d4a37d 100644 Binary files a/gamedir/Data-1.13/Speech/224_074.gap and b/gamedir/Data-1.13/Speech/224_074.gap differ diff --git a/gamedir/Data-1.13/Speech/224_075.WAV b/gamedir/Data-1.13/Speech/224_075.WAV index 86eb360db..7fdda6c2d 100644 Binary files a/gamedir/Data-1.13/Speech/224_075.WAV and b/gamedir/Data-1.13/Speech/224_075.WAV differ diff --git a/gamedir/Data-1.13/Speech/224_075.gap b/gamedir/Data-1.13/Speech/224_075.gap index 9b7e73119..3dd91a14b 100644 Binary files a/gamedir/Data-1.13/Speech/224_075.gap and b/gamedir/Data-1.13/Speech/224_075.gap differ diff --git a/gamedir/Data-1.13/TableData/MercOpinions.xml b/gamedir/Data-1.13/TableData/MercOpinions.xml index fb34e8b9c..ba91109a5 100644 --- a/gamedir/Data-1.13/TableData/MercOpinions.xml +++ b/gamedir/Data-1.13/TableData/MercOpinions.xml @@ -58954,14 +58954,14 @@ 3 1 2 - 25 + 0 0 -2 -4 0 0 25 - -4 + 25 4 2 2 diff --git a/gamedir/Data-1.13/TableData/MercProfiles.xml b/gamedir/Data-1.13/TableData/MercProfiles.xml index 8c536981d..aa29474c1 100644 --- a/gamedir/Data-1.13/TableData/MercProfiles.xml +++ b/gamedir/Data-1.13/TableData/MercProfiles.xml @@ -18861,13 +18861,13 @@ 0 0 46 - 255 + 47 255 255 255 255 0 - 225 + 223 12 255 0 diff --git a/gamedir/Data-1.13/TableData/MercQuote.xml b/gamedir/Data-1.13/TableData/MercQuote.xml index be8b909c3..2fa6fe302 100644 --- a/gamedir/Data-1.13/TableData/MercQuote.xml +++ b/gamedir/Data-1.13/TableData/MercQuote.xml @@ -2470,7 +2470,7 @@ 0 2 62 - 0 + 1 1 1 diff --git a/gamedir/Data-1.13/faces/233.sti b/gamedir/Data-1.13/faces/233.sti new file mode 100644 index 000000000..5c4088369 Binary files /dev/null and b/gamedir/Data-1.13/faces/233.sti differ diff --git a/gamedir/Data-1.13/faces/235.sti b/gamedir/Data-1.13/faces/235.sti new file mode 100644 index 000000000..4098e38cd Binary files /dev/null and b/gamedir/Data-1.13/faces/235.sti differ diff --git a/gamedir/Data-1.13/faces/33Face/233.sti b/gamedir/Data-1.13/faces/33Face/233.sti new file mode 100644 index 000000000..ee8a976a8 Binary files /dev/null and b/gamedir/Data-1.13/faces/33Face/233.sti differ diff --git a/gamedir/Data-1.13/faces/33Face/235.sti b/gamedir/Data-1.13/faces/33Face/235.sti new file mode 100644 index 000000000..3bd776dde Binary files /dev/null and b/gamedir/Data-1.13/faces/33Face/235.sti differ diff --git a/gamedir/Data-1.13/faces/65Face/233.sti b/gamedir/Data-1.13/faces/65Face/233.sti new file mode 100644 index 000000000..2b0468320 Binary files /dev/null and b/gamedir/Data-1.13/faces/65Face/233.sti differ diff --git a/gamedir/Data-1.13/faces/65Face/235.sti b/gamedir/Data-1.13/faces/65Face/235.sti new file mode 100644 index 000000000..15ba43bdf Binary files /dev/null and b/gamedir/Data-1.13/faces/65Face/235.sti differ diff --git a/gamedir/Data-1.13/faces/BigFaces/233.STI b/gamedir/Data-1.13/faces/BigFaces/233.STI new file mode 100644 index 000000000..661a8c193 Binary files /dev/null and b/gamedir/Data-1.13/faces/BigFaces/233.STI differ diff --git a/gamedir/Data-1.13/faces/BigFaces/235.STI b/gamedir/Data-1.13/faces/BigFaces/235.STI new file mode 100644 index 000000000..7b2d77a8d Binary files /dev/null and b/gamedir/Data-1.13/faces/BigFaces/235.STI differ diff --git a/gamedir/Data-1.13/faces/DESERTCAMO/233.sti b/gamedir/Data-1.13/faces/DESERTCAMO/233.sti new file mode 100644 index 000000000..4e962bf82 Binary files /dev/null and b/gamedir/Data-1.13/faces/DESERTCAMO/233.sti differ diff --git a/gamedir/Data-1.13/faces/DESERTCAMO/235.sti b/gamedir/Data-1.13/faces/DESERTCAMO/235.sti new file mode 100644 index 000000000..6c1e646ff Binary files /dev/null and b/gamedir/Data-1.13/faces/DESERTCAMO/235.sti differ diff --git a/gamedir/Data-1.13/faces/URBANCAMO/233.sti b/gamedir/Data-1.13/faces/URBANCAMO/233.sti new file mode 100644 index 000000000..edd86a250 Binary files /dev/null and b/gamedir/Data-1.13/faces/URBANCAMO/233.sti differ diff --git a/gamedir/Data-1.13/faces/URBANCAMO/235.sti b/gamedir/Data-1.13/faces/URBANCAMO/235.sti new file mode 100644 index 000000000..919ad840f Binary files /dev/null and b/gamedir/Data-1.13/faces/URBANCAMO/235.sti differ diff --git a/gamedir/Data-1.13/faces/WOODCAMO/233.sti b/gamedir/Data-1.13/faces/WOODCAMO/233.sti new file mode 100644 index 000000000..6e26eef9d Binary files /dev/null and b/gamedir/Data-1.13/faces/WOODCAMO/233.sti differ diff --git a/gamedir/Data-1.13/faces/WOODCAMO/235.sti b/gamedir/Data-1.13/faces/WOODCAMO/235.sti new file mode 100644 index 000000000..99a8c4930 Binary files /dev/null and b/gamedir/Data-1.13/faces/WOODCAMO/235.sti differ