Commit Graph
37 Commits
Author SHA1 Message Date
rftr c89f006c8c update email text and clarify ghillie armour/attachments (by Antonia)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2653 4f8fa57e-7814-0410-bad4-adc449f26b7c
2022-08-12 04:29:45 +00:00
Flugente 05ed963535 Major rework of getting captured quests and mechanics. (by Shadooow)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2594 4f8fa57e-7814-0410-bad4-adc449f26b7c
2021-06-23 20:15:52 +00:00
Flugente 9ca94eae96 Chg: no insurance payout on suspicious deaths (no enemy presence during merc death, or merc died from friendly fire)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2556 4f8fa57e-7814-0410-bad4-adc449f26b7c
2020-07-05 12:04:43 +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 42153208bc New feature: individual militia creates small militia profiles that track a militia's history and allow it to be recreated, thereby maintaining the illusion of persistent militia.
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=tree&th=23044&goto=345324&#msg_345324

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2316 4f8fa57e-7814-0410-bad4-adc449f26b7c
2016-05-06 14:50:22 +00:00
inshy ca58abceb8 Restored broken text.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2264 4f8fa57e-7814-0410-bad4-adc449f26b7c
2015-07-20 17:57:45 +00:00
inshy c5252ccebe Fixed corrupted format of EDTs after last changes. Please, use EdtMegaEditor next time.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2261 4f8fa57e-7814-0410-bad4-adc449f26b7c
2015-07-16 17:06:14 +00:00
Flugente 1690e19f9c - New Quest: if Kingpin is unaware Maria escaped with the player's help, he enlists the player to kill the DaSilvas
- Moved civ factions for mod compatibility (UC)


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2252 4f8fa57e-7814-0410-bad4-adc449f26b7c
2015-06-13 17:18:29 +00:00
Wanne 494e369d98 Merged from revision: 2202
- Fixed typos in English AIM Bios (thx to ATigersClaw)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2203 4f8fa57e-7814-0410-bad4-adc449f26b7c
2015-02-04 19:25:42 +00:00
Wanne a6b04f465c Merged from revision: 2185
Fixed typos (thx to ATigersClaw)
- Dr. Mitch (AIM Bio)
- Backgrounds.xml
- LoadScreenHints.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2186 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-11-24 16:56:12 +00:00
Flugente daba2726e8 New Feauture: a private military company allows hiring of advanced militia. For more info, see http://www.ja-galaxy-forum.com/ubbthreads.php/topics/335279#Post335279
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2130 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-08-30 17:19:34 +00:00
Wanne beb8cbffd4 - Bugfix: Fixed too long sentences in Email.edt for John Kulba (thx to Inshy for reporting)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1740 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-08-28 16:34:03 +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 6682a6b315 - Fixed Speck Merc Bio (by Charlie_May )
- Removed empty lines in EncyclopediaQuests.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1702 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-07-11 20:39:48 +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 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
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 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 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 ced802412a - 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 8a4232a235 - Updated AIMBIOS.EDT for the JA/DG v3.0 MOD
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1425 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-05-16 14:44:58 +00:00
Wanne c3fcbfb55d 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
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 2ff1ef726c - Deleted old, unused files
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1341 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-10-22 07:49:51 +00:00
Wanne fa060e0db3 *** LockNLoad MOD v1 (by Off_Topic)
Link: http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=286021&page=1

#All Mercs now have their original 1.12 traits.

#STOMP traits revised to match original traits as closely as possible. Some Mercs have extra traits to make use of STOMP.

In some cases i used Demo instead of Throwing as this is how Grenades are linked now.

Raven and Lynx are the only AIM Mercs with Scouting as it is a very powerful trait. There are also 1 Merc & 1 RPC with this trait.

Because some traits have been made minor, a few Mercs like Igor have been given another trait. All STOMP traits have been used.

Electronics is a funny trait to translate into STOMP:

Old Trait: Improves chances (+15) of modifying/assembling electronics, picking electronic locks and disarming electronic traps, and attaching remote detonators.

So for some it means DEMO while for others it means Tech.

#All WF Mercs have been given their proper starting gear, minus the grenades and kevlar leggings etc...

#Every Merc has their 1.12 gear now, select *Kit 2 if you would like to experience how JA was originally released.

*Static,MD, & Spider kept their 1.12 gear, so for them it is Kit 1.

Kit 1 is their 1.13 gear. K2&3 are normally a choice of weapons/equipment etc... K5 is aimed at the Mid-Late game, but that's not to say you can't sacrifice manpower for equipment.

#All the 1.13 added weapons & equipment have had 100% condition replaced with how they would have shipped in 1.12 along with other minor fixes.

E.G. Malice MAT-49 100%->87%

#All Mercs now have 5 Kit to choose from.

#Corrected the Wildfire Mercs Bios.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1315 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-07-20 10:12:27 +00:00
Wanne 398578e475 - Fixed wrong mouth and eyes coordinates for Tex and Biggins in all the different Prof*.dat files
o Without the fix this leads to wrong face coordinates and then to blitter crashes when playing with READ_PROFILE_DATA_FROM_XML = FALSE


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1276 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-03-14 09:09:49 +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 c6632a20ff Added empty CREDITS_MOD.EDT. This file can be altered for mod makers in their own data folder\BinaryData to display the mod credits.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@839 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-07-12 08:04:51 +00:00
AcyForsythe 24f23295dc - Removed the partial ubtilesets addon until I can get the whole thing to upload.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@524 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-10-01 01:50:43 +00:00
Wanne b7bba0b621 - added JA2SET.DAT
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@522 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-09-30 22:59:55 +00:00
MaddMugsy 834d212e87 Updated prof.dats
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@46 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-05-30 19:49:01 +00:00
lalien 206aa20aff Little Alien
- Added data files from 2006.05.23



git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@3 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-05-24 21:30:11 +00:00
lalien cd70506add Little Alien
Initial data import 2006.05.23


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-05-23 19:13:46 +00:00