Commit Graph
19 Commits
Author SHA1 Message Date
Flugente 5763fe9d73 - 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 d3355d1c07 - Added optional profile names to the XML files (by silversurfer)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1735 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-08-21 22:25:16 +00:00
Wanne d299f4c115 - 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 b662474c9a - 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 91eeef7d4b 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 66739d1cf9 - 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 394c7e8506 DG Merc Bugfixes (by anv)
- fixed few quotes (Wink, Carp, Turtle, Sparky)
- changed Wink's throwing trait to demolitions
- changed incorrect zeroes in buddy/hate records to 255s
- changed Sparky opinion of Gary from buddy to hated

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1685 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-06-26 07:15:03 +00:00
Wanne 2a63066464 - 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 f458063659 - 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 dae9e09c35 - Minor fixes (by anv & merc05)
o Hector has bad MouthY coordinate (should be two numbers higher)
o Stella has Fox as a hated merc (should be Hurl)
o Reaper has Shadow as a buddy merc
o Reaper has Blood as "learn to like"
o Changed some GenderQuotes 
o fixing Larry's alumni page text

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1669 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-05-04 15:04:29 +00:00
Flugente 2695e597c8 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
Wanne a8fb1f0641 - Fixed wrong merc opinions for Blood
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1650 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-04-16 08:54:48 +00:00
Wanne 247c076478 New Mercs: Hurl (MERC) & Doc (AIM) (by anv)
- added Doc's voicepack (provided by steggieav), with slight edits
- added Hurl's and Turtle's voicepacks
- added hate talk for Fidel and Biff
- removed neon glow from Turtle face

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1638 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-04-04 22:17:07 +00:00
Wanne 4a4458a361 - 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
2013-03-24 19:50:15 +00:00
Wanne fa45f75d38 - Added 4 new DG-Merc: Stella, Ears, Smoke and Moses (by anv)
o AIM: Stella, Moses, Smoke
o MERC: Ears
- Moved Rev and Elroy to MERC

Missing stuff:
o Currently the 4 new merc do not have StartingGear. Will be done soon.
o There are no entries set in MercOpinions.xml
o Some texts are missing for the merc in EmailMercAvailable.xml
o Speech is missing

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1623 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-03-18 10:10:53 +00:00
Wanne 4b1aa519fc - Added 4 new JA/DG Merc to A.I.M (by anv)
o Hector, Elroy, Mouse and Rev
- Updated Portraits: Vinny, Bud, Screw (by anv)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1618 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-03-09 17:04:58 +00:00
Wanne b2caea497a MERGED source game dir files from development trunk revision 4890 up to latest current revision 5105
Development Trunk (now obsolete): https://ja2svn.dyndns.org/source/ja2/branches/Wanne/JA2%201.13%20MP
A detailed list of all the features (changes) is visible in the history log of the development trunk:

- New JA/DG Merc: Version 2.9
o Up to 20 new characters with complete speech from JA/DG
o see JA2_DG_Merc.txt for more infos

- A few more adjustments to the GameDir files

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1365 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-03-23 20:30:23 +00:00
Wanne 71cb695318 ************************************************************
* 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
Wanne 988e5789bd New EXE Release (Build: 3329) incl. HAM 3.6
Bugfixes
--------
- Fixed NPC and PC movement errors
- Fixed boxers in San Mona do not leave the boxing ring after the fight
- Fixed Darren does not pay the cash after you won the boxing fight
- Removed a line of code which fiddled with chance to hit calculation.
- Cover Display now works correctly with multiple enemies.
- Cover Display has no problems with stance anymore.
- Enhanced IMP Creation: When choosing female, after leaving color choosing, the "email" button is removed. That's because the code tries to remove a button which do not exist (for big/small body) so it grabs the first one around (fixed by Sandro)
- Fixed CTD when throwing item (grenade, rock, throwing knife, ...) in tactical when item description box is open

New Features
------------
- HAM 3.6 (by Headrock)
o For more infos see: http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=243620&page=1&fpart=1



git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1208 4f8fa57e-7814-0410-bad4-adc449f26b7c
2010-02-21 22:22:32 +00:00