Commit Graph
651 Commits
Author SHA1 Message Date
Wanne dbdaecd30a Added / Updated Item graphics (by Bambusar)
o see: http://www.bears-pit.com/board/ubbthreads.php/ubb/showflat/Number/322670/Searchpage/1/Main/12303/Words/Bambusar+/Search/true/Re_BUGZILLA_report_all_bugs_he.html#Post322670

Pepper Spray      SM
Spray Canister    SM
Scuba Mask        SM
Diving Bottle     SM
Scuba Fins        SM
Binders           SM

Flashlight        SM MD BIG
Flashlight        SM MD BIG
Garotte           SM MD BIG
Body              SM MD BIG
Binders

TIMS Backpack     SM
ARUC Backpack     SM
MALICE3 Backpack  SM
TIMS Pack         SM
TT 3-Day Pack     SM
Patrol Pack       SM 

Light knife       MD



git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1708 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-07-17 19:07:33 +00:00
Wanne b1dcf5fb56 - Bugfix: Fixed missing <ubGraphicNum>245</ubGraphicNum> for uiIndex=445 (5.56x45mm Belt M) (by Bambusar)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1707 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-07-16 09:27:28 +00:00
Wanne 573370a302 - Bugfix: Added missing nAccuracy tag with value 6 for uiIndex = 675 (HK P7M8) (by Bambusar)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1705 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-07-16 06:25:14 +00:00
Wanne dbaecdda61 - Removed double (wrong) Speck Entry on index = 1
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1704 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-07-15 13:12:36 +00:00
Wanne d7b9542668 - 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 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
Flugente a6c3319156 Fix: corrected .50 BMG Mag AP size to 10 (by DepressivesBrot)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1699 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-07-08 16:28:28 +00:00
Wanne 9d686ada6a - Fixed wrong scope magnification factor for PS0-3 (by silversurfer)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1697 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-07-07 09:03:33 +00:00
Flugente 69d319810a - Darrel now sells farm products
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1696 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-07-05 21:48:45 +00:00
Wanne e84d5fcccf - Bugfix: MERC, Kit 5, Wrong ammo or no West/Bag to Carry Stuff : Flo, Gumpy, Sktiz
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1693 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-07-05 14:49:58 +00:00
Flugente 07e88add97 added enemy profiles from 'Modders to Backers Event' (by Shanga)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1692 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-07-02 19:44:12 +00:00
Wanne 57ab1e2378 - 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 19202a708b 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
Flugente b6b1504296 reverted unnecessary changes
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1682 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-06-23 21:52:11 +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
Flugente 3fde30a988 new feature: soldier profiles allows defining individual names/bodytypes/hair/skin/traits of soldiers and militia. The game will choose randomly from this pool.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1672 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-05-10 23:14:57 +00:00
Wanne e8d07c0656 Improved Random Stats Feature (by Buggler)
- Added random starting salaries in Ja2_options.ini
- Added more options for random stats & tweaked existing formula

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1671 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-05-10 20:37:53 +00:00
Flugente 04a92b0599 new feature: fixed bayonets (still in need of animation)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1670 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-05-05 21:26:40 +00:00
Wanne aeb7c7a46d - 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 ea79346cf3 new feature: dynamic flashlights allows useable flashlights
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1667 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-05-03 23:29:01 +00:00
Wanne 78ef37e487 - Added random stats for Bernie and It (by Thor)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1666 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-05-03 07:43:24 +00:00
Wanne 5ac8c86872 - Updated LoadScreenHints.xml
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1664 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-05-02 17:01:30 +00:00
Flugente 63bfdab9f0 - 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 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 86a6a5481c added a few hints
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1660 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-04-29 23:07:21 +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 6fbd96f538 new feature: load screen hints can now be defined in TableData/LoadScreenHints.xml.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1655 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-04-24 21:08:14 +00:00
Flugente 6df161cebb 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 2ddf45fe62 added soundset for Moses (by merc05)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1653 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-04-21 02:18:13 +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 8deab53621 - 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 cb9fc37cbc - 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
Wanne 90005cd800 - Added random stats for Hurl and Doc (by Thor)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1643 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-04-10 12:56:51 +00:00
Flugente 7b0b11675d new drug: M99 (#1634) uses the Etorphine drug effect (#22). Stuns a target, but can also kill it if overdosed.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1642 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-04-09 21:11:39 +00:00
Wanne 7505505102 - Added missing Reuban to OldAIMArchive.xml
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1639 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-04-04 22:22:41 +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 43b94abe4d - Updated "Data-1.13/TableData/RandomStats.xml" (by Thor)
o Added random stats for the new DG mercs

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1632 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-03-27 23:18:26 +00:00
Wanne 36df0731cb Fixes (by anv & Thor)
o Stella: Fixed salary
o Moses: Replaced "devolve" with "none"

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1630 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-03-27 22:08:33 +00:00
Flugente c2c1a667f0 added apbp constants and icons (by Thor) for the 'apply items to persons'-feature
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1629 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-03-27 22:03:05 +00:00
Wanne c52a56e1e8 - Added a few comments to the Email/EmailMercLevelUp.xml file
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1628 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-03-24 20:19:08 +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
Flugente ac2ad02b1c added stun gun to enemy item choices
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1626 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-03-24 19:33:26 +00:00
Flugente 664eb06bef - bodies are now twohanded
- removed admin shirts from npc inventory

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1625 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-03-24 18:58:29 +00:00
Wanne 028a325eda - Added starting gear for the 4 new DG merc (Stella, Smoke, Ears and Moses) (by anv)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1624 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-03-19 12:06:23 +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
Flugente 402470851e - Prisoners of war are now spawned in prison sectors. They have fitting dialogue etc. Harming them slightly lowers global loyalty. The roomnumbers are set in SectorNames.xml.
- Prisoner system: added ini options that allow display of surrender strength sum, and externalised surrender strength modifier. Proabilities for prisoner events were increased to more reasonable values.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1613 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-03-05 01:17:21 +00:00