Commit Graph
19 Commits
Author SHA1 Message Date
Wanne 0e17a15556 Merged from revision: 2137
Moved the vanilla Merc Edt files from "Data-1.13" to "Data" folder (thx to Sevenfm)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2138 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-09-01 04:24:55 +00:00
Wanne 0f8b6d9408 New Trait "Snitch" (by anv)
- Every midnight snitches will give you a report about their collegues' opinions
- All values configurable in Skills_Settings.ini, section [Snitch].
- Externalised Morale and Reputation Settings
  Morale_Settings.INI, Reputation_Settings.INI
  All values of events moved from code to Morale_Settings.ini and Reputation_Settings.ini.

Currently list of snitches (trait 22)
Beth (Data)
Bud (Data-1.13)
Buzz (Data-1.13)
Carp (Data-1.13)
Ears (Data-1.13)
Gary (Data-1.13)
Hurl (Data-1.13)
Lance (Data-1.13)
Leon (Data-1.13)
Weasel (Data-1.13)

- Separate traits limits for IMP and predefined mercs.
MAX_NUMBER_OF_TRAITS = 10
NUMBER_OF_MAJOR_TRAITS_ALLOWED = 5

MAX_NUMBER_OF_TRAITS_FOR_IMP = 3
NUMBER_OF_MAJOR_TRAITS_ALLOWED_FOR_IMP = 2

see: http://www.bears-pit.com/board/ubbthreads.php/topics/329412/Snitches_+_Externalised_morale.html

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1906 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-01-01 12:34:18 +00:00
Wanne 24be2cbd6a Reworked JA1/DG mercs (by anv)
- Animated new Smoke faces
- Revised Postie, Reuban, Leon and Bud's dialogues (replaced 11khz battle sounds with better quality equivalents, replaced some quotes with better fitting, unlocked 045s, etc.)
- Leon now immediately hates all of his progeny, including both drunk and sober Larry
- Replaced some default nationalities/sexism/racism values for DG mercs

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1853 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-11-01 13:21:51 +00:00
Flugente 894cc53692 - Updated faces and added missing camo faces for Spike and Leech (by anv)
- fixed Sparky relationships and quotes (by anv)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1737 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-08-24 23:08:25 +00:00
Wanne a4c2f079ed - Added playable mercs: John Kulba (the tourist) and 3 JA1 natives (Elio, Juan, Wahan) (by anv)
o Added faces (except camo faces), speech, bio, ...
o All those 4 mercs are available at M.E.R.C
o Added INI options for enabling/disabling recruitable Speck, Kulba and natives
-> RECRUITABLE_SPECK, RECRUITABLE_JOHN_KULBA, RECRUITABLE_JOHN_KULBA_DELAY, RECRUITABLE_JA1_NATIVES
o If enabled, Kulba becomes available as a MERC merc after finishing escort quest, delay is configurable (two weeks by default). He won't be available earlier even if MERC_WEBSITE_ALL_MERCS_AVAILABLE is set to TRUE
see: http://www.bears-pit.com/board/ubbthreads.php/topics/298288/47.html


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1715 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-07-29 11:55:20 +00:00
Wanne 9e9b3fa774 - Added possibility to create 7 IMP males instead of only 4 (by Parkan)
o Added profiles & other needed XML data for 3 new IMPs (MercProfiles.xml, ...)
o The 3 new IMPs use voice set (speech & edt) of IMP (51, 52, 53). All speeches are Russian currently, texts in English


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1713 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-07-23 13:14:06 +00:00
Wanne 6bb79e6b93 Added Speck to M.E.R.C (by anv)
o From now on, as long as Speck is hired (or dead, or POW, or travelling), he won't be sitting on Speck Com nor sending you emails. However, is he's able to, he'll comment on current situation from battlefield: player owing money, Flo getting married, MERC merc dying, etc., so keeping him alive might be a good idea. Also added quotes for MERC website:
- on recruiting Speck
- on trying to recruit unavailable Speck
- on trying to recruit unavailable Biff (present in game files and code, but previously unused)
- Speck advertising himself

Fixed Biggin's wrong ammo (by anv)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1701 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-07-11 19:44:24 +00:00
Wanne 1e1e226403 - Hireable Mike (by merc05)
http://www.bears-pit.com/board/ubbthreads.php/topics/322512/1/Improved_hireable_Mike_script.html

How to recruit Mike?
It doesn't matter if you have an AIM member and what you do in the initial dialogue with Mike. First you have to get him to around critical state, but not kill him. Now use the mouth icon to talk to him during combat. Choose recruit (you will need a merc with leadership skills >= 70). Mike will end combat and offer you his services for 10000$. If you decline he leaves for good, if you accept you get him as your merc.

Credits:
o Face: http://kermi.pp.fi/JA_2/Faces/Kazuya/Veterans/
o Soundset: http://www.chironkft.net/ja2mike.htm (not available anymore)


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1700 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-07-10 21:00:23 +00:00
Wanne 83a8bda8bb - Added the last missing DG mercs (by anv)
o Mitch (AIM), Carp (AIM), Lance (MERC), Raffi (MERC), Wink (MERC)
o added voice sets for above
o added love/hate talk for Spam, Vicki, Biff, Fidel, Bud 
o added gear kits for all MERC mercs, now everyone should have 5 choices (I hope they're somewhat balanced)
o added 2 signature weapons from DG: Postie's letter opener, Reuban's hedge trimmer, now in their kits

Notes:
o Carp has skill evolution set to 1/4 - as he "has slowed with age" according to his bio,
o hedge trimmer doubles up as wire cutter, so no puny fence will save you from getting chopped up,

see: http://www.bears-pit.com/board/ubbthreads.php/topics/321770.html#Post321770


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1680 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-06-20 19:38:57 +00:00
Wanne 7b142dd704 - Added new JA/DG Mercs to M.E.R.C: Pops, Wally, Eli (by Anv)
o Added speech for those mercs
o Updated Jimmy's Portraits


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1675 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-05-13 19:42:32 +00:00
Wanne bd8923e6bd - Added soundset for "Hector" (by merc05)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1668 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-05-04 14:36:55 +00:00
Flugente 60674b63da Changes (all by anv):
- added voicesets for It, Bernie and Ears
- added battle sounds for Elroy (previously overlooked somehow)
- added some hate talk to Spike, Boss, Leech, Rusty and Sidney
- fixed wrong ammo in Weasel's equipment
- added some cheap knives to Mouse's and Elroy's kits, so they can make use of their new traits right away
- unlocked extra banter dialogue for some mercs (quote 45)
- added new gargantuan MercOpinions.xml, containing 255 opinion records per merc. Most new ones are 0 by default, I changed those for buddies and foes to 25/-25.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1661 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-04-30 22:26:20 +00:00
Flugente 205aa6a852 added soundset for Stella (by merc05)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1659 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-04-29 23:02:52 +00:00
Flugente 8fd19010d7 - added soundset for Smoke (by merc05 & steggieav)
- fixed one sound for Moses (by merc05)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1657 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-04-27 02:22:12 +00:00
Flugente 9b9b3fc64a -added Mouse's soundset (nice!) by merc05, with slight edits (by anv)
-added soundsets for Elroy, Rev, Dyno, Skitz and Weasel (by anv)
-fixed few errors in Doc's and Hurl's dialogue (by anv)
-added Skitz and Weasel (by anv)
-improved Hurl's an Boss's face (by anv)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1652 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-04-18 22:44:43 +00:00
Wanne 9d42876b8b - Updated JA/DG Merc MOD (by Dimitri)
o Edited some lines for Spooky to make them better sounding and compressed too big ones, example 069. Made the GAP files.
o Edited Spooky's stats. Shadow is now Hated1 instead of Hated3. 033 line is now for HeadShot. No Meddeposit and weekly salaries. 
o Spooky moved to MERC. Edited his BIO files. From 63 AIM to 18 MERC. Edited his StartingGear because only one Kit is availible at MERC.
o Added a very old mini mod - "Dynamo and Shank cured faces".
o Added and fixed over 20 new lines for Reuban, Kelly and others.



git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1439 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-05-29 10:19:47 +00:00
Wanne 765c6221dc JA/DG Merc MOD v3.0 (by Dimitri)
- Fixed a lot of speech files
- Added some new speeches from JA1 series. (Spike, Snake, Vinny and many others)
- Fixed Ivan's quotes
- Organized merc's salaries
- Edited merc's stats and traits
- Gary moved to A.I.M. from M.E.R.C

see here: http://www.bears-pit.com/board/ubbthreads.php/topics/298288/1.html

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1424 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-05-15 22:00:38 +00:00
inshy 01e333d902 -Added missing sounds for WF mercs
-Small fixes in edts for WF mercs

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1267 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-02-04 20:58:49 +00:00
Wanne 0a62ebd22b ************************************************************
* Merged GameDir from Development Trunk: Revision 4063 *
************************************************************
- Merged from SVN: https://81.169.133.124/source/ja2/branches/Wanne/JA2%201.13%20MP

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1257 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-01-18 10:24:49 +00:00