Commit Graph
33 Commits
Author SHA1 Message Date
Flugente 3bf5a1328b Merged revision(s) 1978 from branches/ja2_data_official_2014:
Improved faces for Bob, Doc and Skitz (by anv)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1979 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-03-10 19:57:01 +00:00
Wanne 2ea80d5ec4 Bugfix: Fixed crash when closing laptop and playing with vanilla settings ("Data" folder)
- The Game looked for files (Helicopter feature repair, GameDir rev. 1897) in the "Data" folder, but those files were only in the "Data-1.13" folder
- I moved the files in the "Data" folder


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1911 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-01-02 09:53:25 +00:00
Flugente 5e89f4e366 Helicopter features (by anv):
- Waldo can now repair the helicopter for money
- alternative fuel system
- damage to helicopter can damage passengers

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1897 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-12-19 22:00:52 +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
Wanne 04a2fda24b - Reworked Smoke face (by anv)
- Recolored Beth's clothes (by anv)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1816 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-12 20:51:48 +00:00
Wanne 795f23682a - Added "Eskimo" (aka "Mr. Removed") - big face + camo, basing on animated ones (by anv)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1794 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-29 13:06:04 +00:00
Wanne f8427e2ffd Fixed faces (by anv)
o Beth, Sam, Smoke, Postie, Bud, Needle, Stella, It, Ears
o Added missing camo faces

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1793 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-29 13:03:12 +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 62a16871e7 - Updated some JA DG faces and added missing camo faces for JA1 natives (by anv)
o Face improvements: Spam & Roachburn family members
o Added missing camo faces for the 3 JA1 natives

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1731 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-08-20 06:45:46 +00:00
Wanne b9b5abb11d - Fixed missing and placeholder face files for the 3 JA1 natives (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1727 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-08-14 11:20:06 +00:00
Wanne da041d4558 - Quickfix: Added the missing 33-faces for the 3 JA1 natives to fix the crash
o Currently all the 3 uses the face of John Kulba, until we get the correct ones

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1724 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-08-11 19:11:23 +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 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 fd257f1a55 - Updated Snakes Face (by anv)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1698 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-07-07 09:16:03 +00:00
Wanne cbe096ca58 - Updated faces (Elroy, Mouse) (by anv)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1695 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-07-05 14:53:00 +00:00
Wanne 8ffdddea79 - Updated faces (Snake, Reuban) (by anv)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1694 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-07-05 14:52:15 +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 3bb4f3ebad - Added reworked "Bernie" faces (now he looks older) (by anv)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1663 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-05-02 16:55:31 +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 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 0ae20c8271 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 7d40215eb3 - 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 73ba67f6ea - 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 44000a98b9 - 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 42a39082ab - Updated JA2 - DG Faces & added Camo Faces (by anv)
o Updated: Bud, Gary, Needle, Postie, Sparky
o New: Elroy, Mouse -> Added to the TODOs trunk (until we have valid entries in the XML files)
-> http://www.bears-pit.com/board/ubbthreads.php/topics/298288/25/Jagged_Alliance_Deadly_Games_M.html

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1612 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-03-04 09:24:28 +00:00
Wanne ac35024843 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 2fcbaabab6 - Fixed some frames for Wildfire IMP camo faces (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1283 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-05-01 18:43:43 +00:00
Wanne 06fb2d1ff2 - Added missing camo faces for IMP 218.sti and 219.sti (by Jazz)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1279 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-04-19 07:23:27 +00:00
Wanne 4389c13eb9 - Added missing camo faces for IMP 216.sti and 217.sti (by Jazz)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1278 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-04-16 16:13:30 +00:00
Wanne 31e90b8ed2 - Fixed a few face portraits (corrected some sti frames) (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1277 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-04-11 07:59:12 +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