Commit Graph
33 Commits
Author SHA1 Message Date
Flugente 573a781a81 New feature: The M.E.R.C. website now also has gearkits (by JMich)
- in order have multiple gearkits for mercs, you have to create them

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1503 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-08-21 20:35:43 +00:00
Wanne 45e9b9988d New Feature: static fortifications can now be built by mercs (by Flugente)
- if the terrain allows it, an empty sandbag (item 1540) can be filled to a full sandbag (item 1541). You need to have a shovel (item 1015) in your second hand. You will notice the new hammer cursor
- by using a full sandbag, you can build a sandbag barrier
- by using a concertina stack, you can build a concertina wire barrier
- this only works if the current map has sandbags/concertina wire in its tileset
- with a shovel in your hand, you can remove a sandbag barrier
- changed the size of shovel so it can actually be put in inventories. It was also necessary to remove its ability to be used as a melee weapon.
- for further info, see this thread: http://www.bears-pit.com/board/ubbthreads.php/topics/305822.html#Post305822
o Fidel will have a shovel and a few sandbags in his kit #3 to test the feature.

- new code: added a new flagmask variable to items. This one is separately from the attachments index, and can be used to determine item properties without adding up to 32 BOOLEAN varaibles


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1455 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-06-11 08:34:38 +00:00
MaddMugsy a443e8d8e9 1. Bugfix - Vince's medkits had their statuses reset to zero with the new version of the JA:DG mercs
2. Bugfix - Dr. Q's 4th trait was removed with the new version of the JA:DG mercs
3. 7.62x51mm ammo box sizes increased to 22.
4. P4-P9Item files removed.
5. USE_XML_TILESETS and NUM_P_ITEMS options added to Ja2Options.ini
6. USE_XML_TILESETS removed from ja2.ini 


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1445 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-05-30 10:16:15 +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
MaddMugsy e385e2112b Vince's starting medkit and first aid kit no longer have 1% status
Temp file deleted
ACOG reference in INI file changed from saying it's a 10x scope to a 4x scope

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1426 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-05-17 17:30:28 +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
MaddMugsy bdeb2ef516 Added AttachmentPoint.xml
Set DrugType tags in Data\Items.xml
Removed extra type #18 from Drugs.xml

XML Editor v.90
- ja2data.xsd moved to XmlWorkingData folder
- Added DrugType field, Drug table, DrugType table, Drug Item filter
- Added AttachmentPoint table and related fields:  AttachmentPoint, AvailableAttachmentPoint, AttachToPointAPCost
- Updated ItemDataForm - moved all attachment related fields to attachment tabs


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1413 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-28 00:21:10 +00:00
Wanne 6f8e261ea3 New feature: new drug system (by Flugente)
- added many new drug effects. A drug can now have several effects, these can be set via the <DrugType>-tag in Items.xml. 
- Control effect magnitude in Drugs.xml. Added new drugs in Items.xml.
- gave Buns drugs in Kit 5 for demonstration reasons, added drugs to Howard's inventory.
- see also first post in http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=303950#Post303950


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1412 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-27 13:28:35 +00:00
Wanne 69c8109200 - Added gunsling to Reapers weapon (Gearkit 3) to test the new gun sling feature (by Flugente)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1404 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-13 22:43:32 +00:00
MaddMugsy 92d39c0cbd AttachmentClass.xml changed to NasAttachmentClass.xml. (New AttachmentClass.xml added to Lookup folder instead)
New version of XML Editor with above change, plus TripWire, TripWireActivation and new AttachmentClass tags added.
Cleanup of xml files in Data folder after running them through the editor.
Removed references to non-existant item id 1525.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1399 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-12 18:43:45 +00:00
Wanne e8079fccee - New Feature: Toggle scope modes (by Flugente)
o This allows you to toggle between a gun's different scopes via the '.' key. Y
o You get the boni for vison, tunnel vison, sight range, scope magnification etc. only for the scope you use. 
o 2 new ja2_options.ini properties: USE_SCOPE_MODES, DISPLAY_SCOPE_MODES: Allows the display of an icon on your gun, to tell what scope is currently in use. If it is a scope, the magnification factor also gets written. Both options can be found under the  [Tactical Gameplay Settings] section in the ja2_options.ini
o new tag in items.xml (<attachmentclass>) now enables to specifiy what an attachment can do. At the moment used by grenades/rockets/scopes/sights. Items.xml changed accordingly, modders need to add this tag for those items.
o More infos: First post in: http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=303038&#Post303038
- WARNING: This feature breaks savegame compatibility.

- New Feature: Tripwire-triggered mines (by Flugente)
o This allows creating complex networks of tripwire that can detonate multiple mines attached to them.
o 2 new Items.xml tags: tripwireactivation, tripwire
o More infos: http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=303205&#Post303205 

- Overheating addition (by Flugente)
o Severe overheating now temporarily reduces a gun's accuracy. This exact amount is displayed in the UDB.

- Bugfix (by Flugente)
o Removed foregrip as an attachment from the Saiga 12K

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1397 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-12 08:47:13 +00:00
MaddMugsy 41bd2a0802 1. AttachmentClass and Silhouette xml files moved from Lookup folder to main TableData folder
2. Added and updated some of the required files from HAM5.  Others will be added when the code is ready.  HAM5 XML changes have been included for use with the latest XML Editor code.  These changes will be ignored by the game.
3. AttachmentClass changes by Flugente applied to xml file.


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1383 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-09 22:35:54 +00:00
Wanne 531f4134c3 - New Feature: Allow attaching and using underbarrel weapons (by Flugente & JMich, Pics by smeagol)
o Updated XML files and added new KAC masterkey which can be used as an underbarrel weapon
o Raider and Kelly have one in their starting kit 4 

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1380 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-01 15:38:40 +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 e67213c2d6 - GameDir fixes (by Buggler)
o Removed error entries for GM-94 launchable attachments
o Corrected Hitman Kit 2 Ammo


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1354 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-01-27 11:52:10 +00:00
Wanne 9929567e88 - Fixed "Nada" item in Monk's Gearkit #5
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1342 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-10-26 12:43:50 +00:00
Wanne 8adfda48a3 - Minor update by Off_topic
o Dr. Q now has all his original traits
o WF mercs repriced according to skill/experience. No longer all bunched together.
o Attitudes tweaked after brainstorming with several Bear'spit members.







git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1320 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-08-11 14:55:06 +00:00
Wanne 712860a036 - LockNLoad MOD Update (by Off_Topic)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1317 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-07-21 08:02:05 +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 fcba207e52 - Fixed starting inventory for MD (thx to Off_Topic)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1309 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-06-30 10:18:17 +00:00
ChrisL d6d19b6a1b BUGFIX# 489 - Gave Shadow a woodland camo item by default to resolve a concern when playing with STOMP traits active.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1301 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-06-07 21:23:34 +00:00
Starwalker d467e6653a changed binoculars back to being one-handed, because ChrisL will implement code that stops the exploit of having one in each hand to get double the bonus...
added a 'Use Item'-merge to get a Fumble Pak out of a Portable TV by using the Utility Knife.
changed Bubba's ammo from magazines to speedloaders (was mentioned on Bugzilla).

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1284 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-05-02 14:00: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
Starwalker 0a1b7a692a added Beretta Cx4 Storm
corrected a few descriptions

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1220 4f8fa57e-7814-0410-bad4-adc449f26b7c
2010-04-01 06:46:16 +00:00
Starwalker 737fd4d3a7 changed Shadow's suppressor
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@984 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-04-15 14:16:37 +00:00
Starwalker f39c53eeb5 added three new LBE items
added two new shotguns (pics by Coolberg)
added several new ammo crates
changed the itemsize of the Heads to 23 to make them no longer fit into the canteen pocket (belt clip)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@964 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-03-17 09:14:14 +00:00
Starwalker 3b1efaefd6 update of XML-files for the New Inventory
added 7.62x39mm Drum adapter
added 5.56x45mm ammo crates
added 7.62x51mm ammo crates
added some 9x19mm ammo crates (coldloaded are still missing at this time)
added 30rnd magazine for the SR-2 Veresk
changed a few pockets on the MALICE3 backpack
added a Canteen pocket to two combat packs
Changed attachability of Sungoggles to SWAT-armor

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@945 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-03-11 12:35:58 +00:00
Starwalker 83a8be982c added mssing SCAR barrel merge (WP-version)
changed Russian caliber of UDAR-Revolver
changed/corrected a lot of other Russian stuff (names, weights, descriptions)
increased coolnes of HK G11-PDW and Mauser M-03
added data for a new NewInv LBE-item

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@920 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-12-11 08:57:17 +00:00
Starwalker 61d9c95744 changed graphics pointer of M224 in items.xml to 343 instead of 0 (got a new pic, but old pic still needed for NADA items)
changed some attachments on some machineguns
deleted cave vision bonus on NVG-I
replaced description of CAWS (Kensuke), but had to shorten BR-description
renamed Frag Grenade to Mk2 Defensive Grenade and changed description (Kensuke)
new German.Items.xml (Farmer Toby)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@912 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-11-15 07:58:32 +00:00
Starwalker 25099945ea corrected wrong index for Warden
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@880 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-09-19 08:49:35 +00:00
Starwalker c311690694 added three new SMGs (MAT-49, SIG MP41, Spectre M4), also to Tony's inventory
changed description of FN BDA
changed SMGs usable in one hand to machinepistol class, so they appear in that section in BR's now. Additionally, these are guns that will fit into the New Inventory 'MP-Holster'.
added six new thigh-packs and a single vest, but they are deactivated and still have stand-in graphics.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@872 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-09-09 12:16:25 +00:00
Starwalker 34cc9da34c changed MercStartingGear.xml and Pockets.xml to correct some mistakes, which is only useful to New Inventory testers at the moment.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@853 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-08-14 11:10:04 +00:00
Starwalker 161cb44b38 made NVGs incompatible to each other, so that they cannot be put on a helmet together
added/changed Sniper Suppressor on M21, M24, and M40A1
lowered stacking of Shuriken to 4
lowered Burst Penalty of HK G11 to 3
added three new XML-files for the inventory project. They are not needed yet, but do not do any harm either, they are here for the alpha and beta testers (and they'd later end up here anyway). They are also considered work-in-progress and will change. For example, Doreen is loaded down with LBE items just for testing purposes (item drops), some RPCs do not have the LBE items they'd need.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@849 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-08-08 07:10:53 +00:00