From 7d40215eb316c2dca0b244b18cdd0ce3c4379a01 Mon Sep 17 00:00:00 2001 From: Wanne Date: Sun, 24 Mar 2013 19:50:15 +0000 Subject: [PATCH] - Added Dyno and Turtle to M.E.R.C (by anv) - Reworked camo faces and created non camo face for Shadow and Monk (by anv) - Reworked Smoke animated portrait (by anv) - Added small 65 and 33 portraits for IMP 218 (previously she used the same as IMP 219) (by anv) - see: http://www.bears-pit.com/board/ubbthreads.php/topics/298288/28/Jagged_Alliance_Deadly_Games_M.html git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1627 4f8fa57e-7814-0410-bad4-adc449f26b7c --- .../TableData/Email/EmailMercLevelUp.xml | 10 +- gamedir/Data-1.13/TableData/HiddenNames.xml | 4 +- .../TableData/Inventory/MercStartingGear.xml | 386 ++++++++++++++---- .../Data-1.13/TableData/MercAvailability.xml | 54 ++- gamedir/Data-1.13/TableData/MercOpinions.xml | 4 +- gamedir/Data-1.13/TableData/MercProfiles.xml | 142 +++---- gamedir/Data-1.13/TableData/MercQuote.xml | 20 +- gamedir/Data-1.13/faces/10.STI | Bin 0 -> 6458 bytes gamedir/Data-1.13/faces/170.sti | Bin 17350 -> 7042 bytes gamedir/Data-1.13/faces/252.sti | Bin 0 -> 6427 bytes gamedir/Data-1.13/faces/33Face/218.sti | Bin 1226 -> 1086 bytes gamedir/Data-1.13/faces/33Face/252.STI | Bin 0 -> 1086 bytes gamedir/Data-1.13/faces/65Face/218.sti | Bin 1879 -> 1739 bytes gamedir/Data-1.13/faces/65Face/252.STI | Bin 0 -> 1739 bytes gamedir/Data-1.13/faces/BigFaces/252.sti | Bin 0 -> 14024 bytes gamedir/Data-1.13/faces/BigFaces/253.STI | Bin 0 -> 14024 bytes gamedir/Data-1.13/faces/DESERTCAMO/10.STI | Bin 0 -> 6452 bytes gamedir/Data-1.13/faces/DESERTCAMO/170.sti | Bin 0 -> 7042 bytes gamedir/Data-1.13/faces/DESERTCAMO/252.sti | Bin 0 -> 6427 bytes gamedir/Data-1.13/faces/URBANCAMO/10.STI | Bin 0 -> 6460 bytes gamedir/Data-1.13/faces/URBANCAMO/170.sti | Bin 0 -> 7042 bytes gamedir/Data-1.13/faces/URBANCAMO/252.sti | Bin 0 -> 6427 bytes gamedir/Data-1.13/faces/URBANCAMO/253.sti | Bin 0 -> 7088 bytes gamedir/Data-1.13/faces/WOODCAMO/10.STI | Bin 0 -> 6452 bytes gamedir/Data-1.13/faces/WOODCAMO/252.sti | Bin 0 -> 6427 bytes 25 files changed, 439 insertions(+), 181 deletions(-) create mode 100644 gamedir/Data-1.13/faces/10.STI create mode 100644 gamedir/Data-1.13/faces/252.sti create mode 100644 gamedir/Data-1.13/faces/33Face/252.STI create mode 100644 gamedir/Data-1.13/faces/65Face/252.STI create mode 100644 gamedir/Data-1.13/faces/BigFaces/252.sti create mode 100644 gamedir/Data-1.13/faces/BigFaces/253.STI create mode 100644 gamedir/Data-1.13/faces/DESERTCAMO/10.STI create mode 100644 gamedir/Data-1.13/faces/DESERTCAMO/170.sti create mode 100644 gamedir/Data-1.13/faces/DESERTCAMO/252.sti create mode 100644 gamedir/Data-1.13/faces/URBANCAMO/10.STI create mode 100644 gamedir/Data-1.13/faces/URBANCAMO/170.sti create mode 100644 gamedir/Data-1.13/faces/URBANCAMO/252.sti create mode 100644 gamedir/Data-1.13/faces/URBANCAMO/253.sti create mode 100644 gamedir/Data-1.13/faces/WOODCAMO/10.STI create mode 100644 gamedir/Data-1.13/faces/WOODCAMO/252.sti diff --git a/gamedir/Data-1.13/TableData/Email/EmailMercLevelUp.xml b/gamedir/Data-1.13/TableData/Email/EmailMercLevelUp.xml index caf213d91..b87f4fe90 100644 --- a/gamedir/Data-1.13/TableData/Email/EmailMercLevelUp.xml +++ b/gamedir/Data-1.13/TableData/Email/EmailMercLevelUp.xml @@ -1286,14 +1286,16 @@ Message: The email message body Message : None + 252 - Subject: None - Message : None + Notice of Fee Increase + Please consider yourself informed that due to improvement in Dyno's performance his salary requires reconsideration. ± ± Speck T. Kline ± + 253 - Subject: None - Message : None + Notice of Fee Increase + Please be advised that due to Turtle's exceptional performance his wages have been recalculated. ± ± Speck T. Kline ± 254 diff --git a/gamedir/Data-1.13/TableData/HiddenNames.xml b/gamedir/Data-1.13/TableData/HiddenNames.xml index 6961fe815..a257336b2 100644 --- a/gamedir/Data-1.13/TableData/HiddenNames.xml +++ b/gamedir/Data-1.13/TableData/HiddenNames.xml @@ -1261,12 +1261,12 @@ 252 - + Dyno 0 253 - + Turtle 0 diff --git a/gamedir/Data-1.13/TableData/Inventory/MercStartingGear.xml b/gamedir/Data-1.13/TableData/Inventory/MercStartingGear.xml index 87ec3e4b0..f2b39d600 100644 --- a/gamedir/Data-1.13/TableData/Inventory/MercStartingGear.xml +++ b/gamedir/Data-1.13/TableData/Inventory/MercStartingGear.xml @@ -34866,21 +34866,23 @@ 252 - + Dyno 0 + + -1 0 - 0 0 + 0 0 0 0 0 0 0 - 0 + 5 0 - 0 + 97 0 0 0 @@ -34897,12 +34899,12 @@ 0 0 0 - 0 - 0 - 0 - 0 - 0 - 0 + 77 + 100 + 2 + 1576 + 100 + 1 0 0 0 @@ -34925,6 +34927,200 @@ 0 0 0 + 1200 + 97 + 0 + 97 + 0 + 0 + + + -1 + 98 + 161 + 98 + 5 + 97 + 137 + 95 + 1 + 223 + 96 + 1 + 77 + 100 + 2 + 78 + 100 + 1 + 1576 + 100 + 1 + 1098 + 97 + + + -1 + 176 + 98 + 161 + 98 + 6 + 98 + 137 + 95 + 1 + 224 + 96 + 1 + 215 + 98 + 1 + 242 + 96 + 1 + 86 + 100 + 3 + 1576 + 100 + 1 + 95 + 1098 + 97 + + + -1 + 176 + 98 + 161 + 98 + 6 + 98 + 139 + 97 + 2 + 224 + 96 + 2 + 215 + 98 + 242 + 96 + 1 + 86 + 100 + 2 + 88 + 100 + 1 + 1576 + 100 + 1 + 95 + 1098 + 97 + + + -1 + 176 + 98 + 161 + 98 + 6 + 98 + 142 + 96 + 2 + 224 + 96 + 2 + 1526 + 100 + 2 + 215 + 98 + 1 + 242 + 96 + 1 + 86 + 100 + 2 + 88 + 100 + 2 + 1576 + 100 + 1 + 95 + 1098 + 97 + + + + 253 + Turtle + + 0 + + -1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 894 + 0 + 86 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 86 + 100 + 2 + 214 + 100 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1200 + 89 0 0 0 @@ -34932,74 +35128,110 @@ 0 0 - - - 253 - - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 + -1 + 894 + 90 + 297 + 78 + 1 + 86 + 100 + 1 + 88 + 100 + 1 + 214 + 100 + 1 + 1200 + 89 + 1172 + 92 + + + -1 + 161 + 90 + 783 + 99 + 297 + 78 + 1 + 71 + 100 + 2 + 214 + 100 + 1 + 1092 + 98 + 1172 + 95 + + + -1 + 161 + 90 + 783 + 99 + 297 + 78 + 71 + 100 + 2 + 73 + 100 + 1 + 214 + 100 + 1 + 1625 + 100 + 1 + 212 + 100 + 1 + 1092 + 98 + 1172 + 95 + + + -1 + 164 + 92 + 892 + 95 + 297 + 78 + 1 + 212 + 97 + 1 + 523 + 100 + 3 + 525 + 100 + 1 + 524 + 100 + 1 + 214 + 100 + 1 + 1625 + 98 + 1 + 241 + 95 + 1 + 1079 + 90 + 90 + 1172 + 92 diff --git a/gamedir/Data-1.13/TableData/MercAvailability.xml b/gamedir/Data-1.13/TableData/MercAvailability.xml index 8b429fbc7..529a76dca 100644 --- a/gamedir/Data-1.13/TableData/MercAvailability.xml +++ b/gamedir/Data-1.13/TableData/MercAvailability.xml @@ -155,6 +155,18 @@ If you want to hide any merc from M.E.R.C website, just delete the entry. 9 + Turtle + 0 + -1 + 1 + 0 + 26 + 253 + 0 + 0 + + + 10 Postie 0 -1 @@ -166,7 +178,7 @@ If you want to hide any merc from M.E.R.C website, just delete the entry. 2 - 10 + 11 Ears 0 -1 @@ -178,7 +190,19 @@ If you want to hide any merc from M.E.R.C website, just delete the entry. 5 - 11 + 12 + Dyno + 0 + -1 + 0 + 0 + 25 + 252 + 400 + 5 + + + 13 Leon 0 -1 @@ -190,7 +214,7 @@ If you want to hide any merc from M.E.R.C website, just delete the entry. 10 - 12 + 14 Sparky 0 -1 @@ -202,7 +226,7 @@ If you want to hide any merc from M.E.R.C website, just delete the entry. 2 - 13 + 15 Beth 0 -1 @@ -214,7 +238,7 @@ If you want to hide any merc from M.E.R.C website, just delete the entry. 2 - 14 + 16 Sam 0 -1 @@ -226,7 +250,7 @@ If you want to hide any merc from M.E.R.C website, just delete the entry. 10 - 15 + 17 Bubba 0 -1 @@ -238,7 +262,7 @@ If you want to hide any merc from M.E.R.C website, just delete the entry. 8 - 16 + 18 Larry 0 -1 @@ -250,7 +274,7 @@ If you want to hide any merc from M.E.R.C website, just delete the entry. 15 - 17 + 19 Larry 1 7 @@ -262,7 +286,7 @@ If you want to hide any merc from M.E.R.C website, just delete the entry. 0 - 18 + 20 Numb 0 -1 @@ -274,7 +298,7 @@ If you want to hide any merc from M.E.R.C website, just delete the entry. 20 - 19 + 21 Tex 0 -1 @@ -286,7 +310,7 @@ If you want to hide any merc from M.E.R.C website, just delete the entry. 21 - 20 + 22 Biggins 0 -1 @@ -298,7 +322,7 @@ If you want to hide any merc from M.E.R.C website, just delete the entry. 23 - 21 + 23 Cougar 0 -1 @@ -310,7 +334,7 @@ If you want to hide any merc from M.E.R.C website, just delete the entry. 25 - 22 + 24 Gaston 0 -1 @@ -322,7 +346,7 @@ If you want to hide any merc from M.E.R.C website, just delete the entry. 30 - 23 + 25 Stogie 0 -1 @@ -335,7 +359,7 @@ If you want to hide any merc from M.E.R.C website, just delete the entry.