Commit Graph
68 Commits
Author SHA1 Message Date
Flugente f56c091014 - IMP slots are now purely defined by <Type>6</Type> in MercProfiles.xml. Removed MAX_IMP_CHARACTERS and IMP_XXX settings.
- Sounds/SoundsProfiles.xml
- Dynamic ammo weighting (DYNAMIC_AMMO_WEIGHT in JA2_Options.ini) now also applies to food, drugs, canteens and camo kits.


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2447 4f8fa57e-7814-0410-bad4-adc449f26b7c
2018-09-29 19:57:55 +00:00
Flugente 053f24e278 New merc (somewhat): Similar to Larry's two personalities, Buns now has an alternate personality as well.
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=tree&th=23806&goto=354149&#msg_354149

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2430 4f8fa57e-7814-0410-bad4-adc449f26b7c
2018-07-25 20:11:27 +00:00
Flugente fab21346a0 Fix: changed Vicki's disability from 'afraid of heights' to 'claustrophobia'
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2419 4f8fa57e-7814-0410-bad4-adc449f26b7c
2018-04-12 22:54:22 +00:00
Flugente 97d4d2a6c2 New feature: Getting and using intel allows for more spy-related roleplay
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2401 4f8fa57e-7814-0410-bad4-adc449f26b7c
2018-02-18 23:12:21 +00:00
Flugente a03e8b82fb - New feature: Voicesets are now independent fom profile slots. Voiceset is set in MercProfiles.xml with <usVoiceIndex>. IMP voices are defined in IMPVoices.xml.
- added 5 new IMP voicesets from Wizardy8 (by ratpaz and mec05)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2357 4f8fa57e-7814-0410-bad4-adc449f26b7c
2017-01-14 20:12:26 +00:00
Flugente 51c3f4255a added new character trait "Coward" (charrcter trait #13) and added it to Biff and Lance
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2356 4f8fa57e-7814-0410-bad4-adc449f26b7c
2017-01-12 23:25:08 +00:00
Flugente c151c09ce3 added new disability "Self-Harming" (disability #12)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2355 4f8fa57e-7814-0410-bad4-adc449f26b7c
2017-01-11 22:38:55 +00:00
Flugente 71eb36b662 added new disability "Fear of heights" (disability #11) and added it to Vicki, Sparky and Hector
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2352 4f8fa57e-7814-0410-bad4-adc449f26b7c
2016-12-31 12:07:28 +00:00
Flugente fff0790490 New disability: Hemophiliac causes mercs to bleed a lot faster, even for tiny wounds
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2321 4f8fa57e-7814-0410-bad4-adc449f26b7c
2016-05-16 15:03:52 +00:00
Flugente 37852521b8 Fixed typos (by Elestir)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2319 4f8fa57e-7814-0410-bad4-adc449f26b7c
2016-05-13 16:59:09 +00:00
Flugente 3fb767d276 The merc profile #71 (RPC71) is now used for all combat jeeps.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2306 4f8fa57e-7814-0410-bad4-adc449f26b7c
2016-03-21 21:29:40 +00:00
silversurfer 9c32d98d3c - modified spread pattern names to look better in EDB
- changed the mechanics attribute of some mercs with explosive skill to something higher than zero so they do not automatically blow themselves up anymore

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2243 4f8fa57e-7814-0410-bad4-adc449f26b7c
2015-05-14 23:30:43 +00:00
Flugente ed79a6dd06 - Fix: some vanilla mercs (Buzz, Biff, Flo, Haywire, Razor, Bubba) were absolutely incapable of certain conversation - they have been altered to be just very bad at it.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2239 4f8fa57e-7814-0410-bad4-adc449f26b7c
2015-05-08 18:53:37 +00:00
Flugente 944385f1db New Trait: SURVIVAL (new minor trait) gets the non-weapon parts of the ranger trait.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2213 4f8fa57e-7814-0410-bad4-adc449f26b7c
2015-02-27 23:06:41 +00:00
Flugente 28a3e7c218 Added missing property values
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2209 4f8fa57e-7814-0410-bad4-adc449f26b7c
2015-02-21 16:29:57 +00:00
Wanne e506d72f82 Merged from revision: 2198
Fixed a few errors in XMLs (thx to ATigersClaw)
- Fixed text "Combat instructor" -> "Combat Instructor"
- Fixed too long text "New Age Spiritualist" -> "Spiritualist"
- Changed Blood's nationality from American to South African

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2194 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-12-22 17:51:22 +00:00
silversurfer 12deb9ae5a Fix (by Ocular and Strohmann):
wrong aim levels and handling for Sphinx pistol
wrong Need for sleep values for Lance Fisher and Turtle

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2158 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-10-03 07:44:48 +00:00
Wanne 9c758c3b69 Merged from revision: 2075
- Fixed extra spaces in names and nicknames in MercProfiles.xml (by Buggler)

- Changed Ja2Options.ini settings (by Buggler & Sevenfm):
MAX_NUMBER_PLAYER_MERCS = 32
DIRT_SYSTEM = FALSE
AUTO_FAST_FORWARD_ENEMIES = 2
AUTO_FAST_FORWARD_MILITIA = 1
AUTO_FAST_FORWARD_CIVS = 1
AUTO_FAST_FORWARD_CREATURES = 1
CLOCK_SPEED_PERCENT = 120
ENEMY_CLOCK_SPEED_PERCENT = 120

- Removed unused Ja2Options.ini:
MIN_RANGE_FOR_FULL_COWERING_TARGET_PENALTY
STAMINA_HIT

- Updated ReadMe in Windows 8 Fix.zip (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2076 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-07-21 18:09:59 +00:00
Flugente 177e6450c3 Merged revision(s) 1965 from branches/ja2_data_official_2014:
Fix: wrong background number


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1966 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-02-27 00:42:45 +00:00
Flugente 905c6bec17 Merged revision(s) 1963 from branches/ja2_data_official_2014:
Mercs get individual backgrounds, with the same number as their profile number, which is not selectable by IMPs. This allows better ordering and finetuning descriptions.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1964 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-02-26 23:28:05 +00:00
Flugente 458695ae0e Merged revision(s) 1955 from branches/ja2_data_official_2014:
Trait adjustments
- Raven and Lynx are sharpshooters, so they get the 'sniper' trait
- Sidney and Wink are notable throwers, so get the 'throwing' trait
- Cliff is a Doctor without any other qualities, so gets the 'Paramedic (Expert)' trait

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1956 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-02-25 19:24:42 +00:00
Wanne 9888467c33 Merged from revision: 1917
- Added missing updated snitch traits for some mercs. This feature was added in GameDir revision: 1906 (by anv)
Beth
Bud
Buzz
Carp
Ears
Gary
Hurl
Lance
Leon
Weasel

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1919 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-01-13 16:32:19 +00:00
Wanne cfc7e94858 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 f18782a2bd New feature: radio operator trait allows calling in artillery, requesting reinforcements, scanning for enemies and a few other skills
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1848 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-30 22:20:39 +00:00
Flugente 15cae6313b added descriptions of values for racism/sexism/nationality etc.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1839 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-21 22:22:00 +00:00
Flugente a31be1fc36 - New (originally very old) feature: merc relations are influenced by appearance/refinement/racism/nationality/sexism. See http://www.bears-pit.com/board/ubbthreads.php/topics/326828.html#Post326828 for more info.
- fixed some default values

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1835 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-19 16:18:57 +00:00
silversurfer 9751c9f744 fixed Dr. Q's 4th trait. Somehow he lost his paramedic skills
new modifiers for item properties:
- APs to reload
- APs to reload manually
- max distance for messy death
- gun handling
- best laser range


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1806 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-06 12:21:54 +00:00
Wanne 2f8b400e7b - Restored missing Covert Ops-Traits for Mouse and Elroy (by Flugente)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1785 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-23 06:42:37 +00:00
Wanne 911a4105ce - Reworked GearKits for Merc and adjusted a few merc profiles (by Off_Topic)
These KITS are Limited to Merc Lvl and prices, it would be tempting to give them "the perfect loadout" but it would take away from the fun and balance of the game.

*List of Kits

Ammo: Extra ammo at the expense of an other item.
Gun Choice: an alternative weapon.
Combat: Mercs drop their Med/Tool Kits in favour of extra firepower.
Fast Rope: Only seen in upper tier Mercs. The idea was to create a basic kit for when you know you are landing in an enemy occupied sector. (Could be change to "Hot LZ")
CQC: Close Combat
HTH: Hand to Hand
LBE: If you feel like splashing the cash for some extra carry capacity.
Paramedic: A kit for Doctors on the front line, dropping their MEdkit for a FirstAid Kit and a Smoke Grenades.
Auto/Heavy WPNs: Skill specific kits.
Sapper: Desroying/Constructing stuff.
Breach: Using explosives or ballistics to open doors.
Covert: Silent weapons/ammo.
Night OPs: Flares etc... 

There are more KITS but they should be self explanatory. It's a lot of info to edit, so if there are any mistakes/oversights let me know and i'll change them. Same goes for any suggestions.

I tweaked these Mercs in order for OST/NST to match and to improve one or two.

Dyno & Smoke: Electronics added to OST to match Demo.
Mouse: Stealthy/Stealthy added to OST Melee removed from NST
Moses: Given Devolve evolution.
Hector:Knifing expert in OST.
Needle: Knifing OST.
Screw: HTH (OST) HTH/Tech (NST)
Elroy: Strealth/Lockpicking.
Carp: Removed Deputy and gave him Teacjng in OST/NST. He's pretty useless at the moment, at least this way he can be a Militia Trainer.
Doc: He had Teaching/Deputy in NST. Changed it to Doctor in NST and no skill in OST.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1778 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-19 11:54:53 +00:00
Flugente 3080a6d05a Shadow had wrong background
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1776 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-17 20:35:05 +00:00
Flugente 0987191f43 - added more backgrounds
- added new backgrounds to mercs
- <no_male> and <no_female> prohibit specific backgrounds to show up on IMP generation
- <cth_vs_creatures> modifies gun CTH when aiming at creatures

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1754 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-04 21:09:21 +00:00
Flugente baf0a60594 - new feature: backgrounds allow more personalisation of mercenaries
- background feature replaces overheating on startup screen, moved overheating opion to ini

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1748 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-03 20:40:56 +00:00
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 62b01d0637 - Bugfix: Fixed duplicated tags that were introduced in revision 1725 (thx to silversurfer)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1726 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-08-11 20:08:25 +00:00
Wanne 4fe527ca86 - Re-added missing buddies/hates for some merc that were overwritten in revision 1715
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1725 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-08-11 19:19:35 +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 26ab76245e - Bugfix: DG Mercs (fixed missing approaches values) (by anv)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1687 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-06-27 11:12:36 +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 5333f20dbd - changed disabilities for Sam, Kaboom and Needle
- externalised rocket rifle gridno

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1662 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-05-02 00:29:17 +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
Flugente 96dcc49d43 added covert ops trait to Elroy and Mouse
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1654 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-04-21 02:45:24 +00:00
Flugente cbbec28281 -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 24370ab679 - Updated MercProfiles.xml and MercStartingGear.xml (by Thor)
o Ira: Added compact binoculars to the gear
o Hurl: new paramedics skill
o A few other adjustments
o Cleaned MercStartingGear.xml file (removed tags with default values) which shrinks the xml file

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1646 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-04-11 20:07:27 +00:00