Commit Graph
35 Commits
Author SHA1 Message Date
Wanne c50f412e9a Merged from revision: 2084
- Fixed wrong decimal value instead of int value in GunChoices_*.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2085 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-07-30 18:04:00 +00:00
Flugente 7ff6a8cfa7 - New feature: Ammotype flag AMMO_ANTIMATERIEL (<ammoflag>4</ammoflag>) gives bullets the ability to destroy walls and other structures.
- Fix: Charlie's ammo was not fitting

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1984 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-03-15 17:55:11 +00:00
Flugente 99857261cd Merged revision(s) 1970 from branches/ja2_data_official_2014:
Added sleeping bag item (#1709), as <SleepModifier> was unused.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1971 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-03-01 22:26:43 +00:00
Flugente 47cbae3352 Merged revision(s) 1951 from branches/ja2_data_official_2014:
Fix: Sam Garver had wrong ammo in Kits 2 & 4

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1952 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-02-21 20:33:26 +00:00
Wanne c9d626d004 - Externalized heli refuel sites (Map/HeliSites.xml)
- Added more default tags to empty startinggearkits
- Added comments to minerals.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1871 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-11-15 19:37:06 +00:00
Flugente 210658e382 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
Wanne 3095bffa8a MOLLE Fixes (by Off_Topic)
- Fixed: PriceMod Missing for some Premium Kits
- Added: New Pocket & Silhouette Double Frag
- Added: New Pocket Single Flashbang
- Balanced Price/Coolness of MOLLE from 1-8
- Change TK Leg Rig Pocket General->Tiny
- Added Missing BRAY Text for Bomb Pouch
- Better Image for 7RD Bandolier

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1840 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-22 17:10:46 +00:00
Wanne 79bf420306 Molle Improvments / Fixes (by Off_Topic)
- Mini Grenade Size 14->13
- Mini Grenade Pocket 14x2->13x2
- New Pocket (Small Knife) for Nylon Knife Sheath Can't hold KCB or Rambo. 
o KCB & Rambo size 24->28
o Regular Knife Pocket Volume 13->15
- Carabiner
o New Item Class Armour/Face/LBE/Misc.
o Can now hold items 16 (Handcuffs) & 18 (Compact Binoculars)
There are still a few items that will go there that shouldn't (Syringes for example) but with the new item class restriction it's a lot less stuff.
- New ITEM: Carabiner
oCan be attached to MOLLE vests to add more Rings. -5 Stealth penalty to stop you going overboard.
- New Silhouette: Sniper Rifle
- New Pocket type: Sniper Rifle (Can now only hold one item sized 8 & 9, large sniper rifles and one item sized 5,6, or 7)
- Replaced this in Sniper Drag Bag
- General Drop Pouch can now hold more than small pouch (no restriction) and can hold bigger items. Volume increased from 2 to 8.
- New ITEM: Carabiner
o Can be attached to MOLLE vests to add more Rings. -5 Stealth penalty to stop you going overboard.
- Ammo Pockets now more flexible, they still only take Ammo. Other pockets tweaked.
- Mercstarting Gear: Wolf K2 Removed Leg Rig/Ice K3 Removed Combat Pack.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1834 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-19 12:18:37 +00:00
silversurfer d917725477 - fixed <ubClassIndex> in Items.xml. This was broken in rev 1818 with the addition of the Molle system
- added some missing tags in MercStartingGear.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1825 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-15 11:15:04 +00:00
Wanne 96f83d1387 Added Molle system to 1.13 (by Off_Topic)
- Several new MOLLE vests added along with three MOLLE leg RIGS and numerous MOLLE Pouches. (Most Images: IOV, Attachment slots based on Strohmanns, thanks to Depri/Parkan for help.)
- Only DG Mercs MOSES, BOb, Mitch Snake & BUD have been given MOLLE items in their starting gear for demonstration purposes.. MOLLE only available through BRAYs.
- MOLLE vest differ from regular vests in that an AR mag pocket/pouch etc... will only hold AR mags. I did this to make regular vests a viable option versus MOLLE vests, don't worry, you can customise the best MOLLE vests with up to 9 pockets and leg rigs with 5 pouches.
- There is also a new "Carabiner" pocket, this is for "hooking" on items with straps E.G. Helmets, Gasmasks, LBE etc... there are a few things that will still go there that shouldn't, but it's a minor thing. There is also a Carabiner that will only hold face items.
- In order for this to be implemented, i had to standardise LBE leg rigs, in most cases a size change from 21->22. I also had to change:
- Medkit:26->27, Toolkit26->27 but this won't change anything in game storage wise. TV, Golfclubs, & Chalice were also changed by one size.
- The first few vests you encounter will have limited MOLLE attachment points. 
- E.G. 3.11 Leg Rig has limited volume and can only take small MOLLE pouches. Later, you can purchase Larger Rigs/vests with greater volume and can hold both small/large pouches.
- Several new pockets/silhouettes added.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1818 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-13 17:57:21 +00:00
Wanne 1ba8990eef New Pocket Types and Silhouettes (by Off_Topic)
Large Pistol Holster
Shotgun Shells
Throwing Knife
General Misc
Small Explosive
Short Rifle Mag x2
Revolver Holster (Sideways)
Combat Pack Gun Sling
Combat Pack Small
Explosives
Sniper Mag

New LBE added:

Leg Throwing Knife Rig
SMG Mag Leg Rig
Pistol Mag Rig
Bomb Rig
Equipment Rig
Large Pistol Holster
12 G Shotgun Shell Holster
Small Shotgun Holster

Mercstarting gear:

Wolf (Shotgun Rig)
Blood/Hitman: Throwing Knife Leg Rig
Buns: Pistol Mag Rig
Ice: Smg Mag Rig
Red: Bomb Pouch
Bull: equipment pouch
grizzly: Large Pistol Holster.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1805 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-06 06:41:28 +00:00
Flugente 982f9db514 added rifle sling attachment to AI attachment choices
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1798 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-29 17:42:46 +00:00
Wanne df4d555a34 Merc Starting Gear adjustments (by Off_Topic)
- Sidney - Kit 4: Added mini grenade and mag to Kit 4
- Hector - Kit 3: He had a SIG PRO .40, it should be a HK P7M8
- Vinny -  Kit 4: He should have a TT 3 Day Pack.
- Blood -  Kit 2: He had .40 SMG mag, should be .40 pistol mag.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1790 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-26 06:35:24 +00:00
Wanne e4d62464dd - Addded missing gear kit name 5 ("Premium") for merc Lucky (by Off_Topic)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1779 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-20 08:11:49 +00:00
Wanne c0f0cb3959 - 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
silversurfer 250be62601 changed IMP starting gear
Expert Snipers won't get a 10x scope anymore. They get a 2x scope instead. A 10x scope is useless at the start and when we buy or find a sniper rifle it usually has a 10x scope anyway.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1760 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-08 19:25:11 +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 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
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 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 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 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
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
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 6ce154def2 - externalised squad names
- moved Pockets.xml an PocketPopups.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1608 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-02-25 22:18:32 +00:00
Wanne e386cb6484 - Fixed MERC <mAbsolutePrice> to -1 (by Buggler)
(only 1.13 xml is bugged, vanilla classic is working as it is.)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1592 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-01-13 17:51:51 +00:00
Flugente d846f9c7ac added finetuned specific gun selections for enemy and militia (by ClarkeW)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1591 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-01-13 16:23:12 +00:00
Flugente 864877846f - reordered xmls
- new feature: class specific gun and item choices allows finetuning of a soldier's equipment

More info under http://www.bears-pit.com/board/ubbthreads.php/topics/313782/Re_New_feature_Class_specific_.html#Post313782

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1584 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-01-04 23:22:41 +00:00