Commit Graph
77 Commits
Author SHA1 Message Date
Flugente 052b3a9343 - 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
Flugente ea7b233e9c 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
Flugente cbcde9015d - 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
Flugente 465f999e65 added missing xml
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1578 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-12-20 01:23:11 +00:00
Flugente 799181efd8 New Feature: The number of merchants has increased, and their values have been externalised.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1577 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-12-20 00:29:33 +00:00
Flugente a89f7f6856 - The facility performance tag now determines the effectiveness of the interrogation assignment (100 = standard).
- If you set a handcuff's item to class from MISC (<usItemClass>268435456</usItemClass>)to KIT (<usItemClass>8192</usItemClass>), it will be treated as a stack of binders. Repeated use on enemies consumes the item (see item #1632).
- added 'stack of binders' item to Jake and Sam inventories.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1576 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-12-17 21:26:03 +00:00
Flugente 6d530a9971 - added an example clothes merge
- added clothes to Keith's merchant inventory

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1541 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-09-16 14:54:27 +00:00
Flugente 780ea2ec93 added 2 new food items (pics by Soto) that fit Arulco better
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1536 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-09-10 18:38:48 +00:00
Flugente 1c3d0de4e1 added repair kit to a few shopkeeper's inventories
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1497 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-08-18 00:23:20 +00:00
Flugente 71d7bea33b New feature: food system requires mercs to eat and drink in order to survive
- added food items
- added food items to various mechants, BR and as enemy item choice
- added cantina facility
- canteens can now be refilled in sectors by pressing 'Ctrl' + '.'. Map/SectorNames.xml determines wether this is possible, and wether the water will be poisonous
- added new icons related to the food system

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1471 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-07-21 16:47:16 +00:00
Wanne a080166161 New Feature: Traps made out of guns and a piece of tripwire (by Flugente)
- guns can now be attached to tripwire and then be used as tripwire-activatd traps
o To support this feature, some (already existing) xml-tags have been added to the weapons in Data-1.13\TableData\Items.xml (<nasAttachmentClass>, <AttachmentPoint>, <AttachToPointAPCost>, <Attachment>)
o see: http://www.bears-pit.com/board/ubbthreads.php/topics/305634.html#Post305634


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1451 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-06-06 08:30:54 +00:00
Wanne f1aed8775f - New drug: antidote cures poisoning (by Flugente)
o Item#: 1539


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1443 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-05-30 07:53:03 +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 ed025ce5da - Tripwire / Claymore / Makeshift Mines update (by Flugente)
o Items.xml: the tag <Directional>1</Directional> in Items.xml allows an explosive to be directional. Frags caused by its explosion will fly in the direction determined by the merc planting them.
o Items.xml: the tags <Detonator> and <RemoteDetonator> are not used anymore, as those properties can be set via flags in <AttachmentClass>. For now, they still remain in the xmls though.
o Explosives.xml: the tags <ubHorizontalDegree> and <ubVerticalDegree> in Explosives.xml determine the arc in which the frags will fly
o see 1st post: http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=303556&#Post303556



git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1409 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-20 10:44:46 +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 58e67791a8 XML Editor updated
- JMich fixed a possible crash scenario at start.  
- Fragmentation data values are now able to go above 100 in Item Data form.
Added fragments to Fragmentation Rocket and VOG Jumping Grenade
Allowed old Talon GL to be more than a paperweight if/when it is found on the vanilla maps

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1395 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-11 17:00:52 +00:00
MaddMugsy 2d4e4f76dc reverted tonyin pventory.xml and saminventory.xml to restore zero values
added attachment tag =1 to kac masterkey

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1382 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-08 17:47:18 +00:00
MaddMugsy d2ba98aa1f fixed uiIndex ordering in SamInventory.xml and TonyInventory.xml
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1381 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-02 16:34:39 +00:00
MaddMugsy 46d642022b Trimmed off items with 0 quantities from shopkeeper inventory xmls.
Replaced remaining magazines with ammo boxes in Sam's inventory

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1377 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-03-26 23:09:26 +00:00
MaddMugsy 967891046c -removed two unused entries from the end of TonyInventory.xml
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1372 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-03-24 02:32:13 +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 1c78675d13 Fix for NPC Inventory Tabledata (by Buggler)
- NPC Inventory Tabledata IndexNo sort according to ItemID
- Removed double entries for same Item ID


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1355 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-01-29 19:11:21 +00:00
Starwalker 432bd657bf gave NCTH-values to the HK LMGs with integral bipods where they were missing.
removed NCTH-values from LMGs (and SRs) that no longer have an integral bipod.
FN MAG can mount a Grippod now (found an after-market rail on the web...)
raised the number of 6.8mm SPC ammo at BR's and added a clip to Tony's inventory as well.
made Rifle-LAMs attachable to AICW (it has a rail on top).

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1287 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-05-17 06:49:08 +00:00
Starwalker 71760e4d79 added single 43mm grenades for use with NAS. May not be fully functional at this time and WILL NOT work without NAS. Item descriptions contain warning.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1256 4f8fa57e-7814-0410-bad4-adc449f26b7c
2010-12-06 09:54:14 +00:00
Starwalker 5facf05a0b added 9x18mm Glaser ammo.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1251 4f8fa57e-7814-0410-bad4-adc449f26b7c
2010-11-30 15:46:21 +00:00
Starwalker b8d5fe8d67 added .38 Match and HP Solid ammo (including ammo crates).
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1245 4f8fa57e-7814-0410-bad4-adc449f26b7c
2010-10-28 11:31:51 +00:00
Starwalker 1adbaa930e added some Unfinished Business items that were requested for modding work.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1237 4f8fa57e-7814-0410-bad4-adc449f26b7c
2010-09-15 10:05:58 +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 48406dcc56 - gave a volume of 5 to Tear Gas and Mustard Gas grenades (was 0 before)
- gave built-in bipods to many guns that are depicted with a bipod and cannot have a foregrip anyway (some with depicted bipod may not have this because a foregrip can be attached instead of the bipod).
-  allowed attachment of a bipod to the G36K

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1206 4f8fa57e-7814-0410-bad4-adc449f26b7c
2010-02-17 07:41:56 +00:00
Starwalker 82dbb4a404 added subsonic 7.62x39mm ammo
allowed AR suppressor on some 7.62x39mm assault rifles
corrected a few gun values

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1201 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-10-22 07:50:25 +00:00
Starwalker 08ae95e0d9 activated new G3A3 pic (Kaerar's color adjustment on Coolberg's pic)
activated new AI AWM pic (Kaerar)
activated chokes for shotguns as attachments
added a few new ammo crates
changed 'filled size' of the large backpacks to prevent unrealistic behavior (needs checking...)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1175 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-07-21 07:09:30 +00:00
Starwalker 3a1030bf44 added Kar 98k to Tony's Buy-List
changed RPD and RPK to 75 round ammo capacity

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1154 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-06-25 06:38:12 +00:00
Starwalker c02825b814 added Kimber Eclipse pistol
added a 9x19mm variant of the FN HP-35 pistol
raised range of Beowulf rifle
added a few ammo crates

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1145 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-06-09 11:22:31 +00:00
Starwalker 4cee30ec37 added ammo (9x18mm AP and 7.62x54mm Match)
decreased size of Extended Ears
changed Destruction-merges so that the result is a rag, to avoid CTDs

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1119 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-04-22 07:23:04 +00:00
Starwalker d384f16a34 added two new revolvers (pics by Coolberg)
added ammo crates for two calibers
corrected a few things

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1096 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-03-12 11:10:34 +00:00
Starwalker 5b1c8cc262 a few new ammo crates
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1090 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-02-12 10:40:33 +00:00
Starwalker 1075de1c99 updated inventories fo Devin and Tony
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1076 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-01-29 07:41:10 +00:00
Starwalker d3f9e6c0d6 added three new FN pistols (pics by Jimmy)
added a new standalone grenade launcher (pic by Coolberg)
decreased size of Super Shorty, so it fits into a MP-Holster
gave a 2-round burst to the Sawed-Off Shotgun

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1059 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-12-02 16:16:40 +00:00
Starwalker 926da54a7d Added a few ammo crates
Items not fitting their role are no longer taken by some dealers

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1035 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-09-03 09:02:01 +00:00
Starwalker 03d66051a7 added data for S&W M29, M29 SATAN, and Manurhin MR-73
added a few ammo crates
changed weight and size of C-18
changed weight of Alcohol
added grenade restriction to belt clip (for Molotov cocktail) and to ammobelt pocket

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1023 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-07-01 15:15:54 +00:00
Starwalker 80a69b55d5 added M14 EBR (pic by Kaerar)
added M21 EBR (pic by Kaerar)
added EBR stock
added .44 Magnum AET ammo
added 7.62x25mm AET ammo
changed 7.62x25mm coldloaded standard ammo to coldloaded AP/FMJ, to fit the ammo pics

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@981 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-04-09 06:57:15 +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 d25d96e97f added Colt Python and FR Ordnance MC51 (pics by Tbird)
added a Flare (pic by Kaerar), which has shorter duration than the breaklight
breaklights have smaller radius now

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@908 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-11-05 07:20:09 +00:00
Starwalker d9ae8a5ffe added Automag V, M1 Carbine, KAC PDW, and Magpul PDR
added 30 round AP and HP mags for the new PDW-type guns (6x35mm caliber)
added P-08 Parabellum pistol and M1 Carbine to EnemyGunChoices

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@900 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-10-22 06:39:37 +00:00
Starwalker 2c04ff0f5e added CETME Ameli
Changed HK MG36E to HK MG36 RAS
added HK MG36
added mergability of various G36 rifles with rail-kit or optics-grip to obtain other versions
disallowed Rifle LAM and Rifle LAM/Flashlight combo on Bundeswehr G36 versions as these have no forward rails.
added grippod attachability to G36 RAS versions
corrected price of Match Sights ($1 was much too cheap ;-)
changed vision bonus of attachable scopes to reflect effect of ambient light (or lack thereof)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@895 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-10-12 06:57:28 +00:00
Starwalker d334ff52dc more sound changes by Farmer Toby
description change of SIG MP41 by Farmer Toby
added three WW-II era scopes (M1 Garand, Mosin Nagant, and Kar 98k lose the ability to mount ACOG but get their respective original scopes instead), pics by Tbird
added Match Sights (pic by Tbird)
added Underarmor Shirt (pic by Marlboro Man)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@887 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-10-01 07:06:53 +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 5a0ff39d90 replaced Milkor pic with a new one made by Tbird
replaced Pistol Suppressor pic with a new one made by Tbird
replaced Rifle Suppressor pic with a new one (you guessed it: Tbird) and renamed it AR Suppressor, as it will no longer be available for sniper rifles
added a Sniper Suppressor (a sound suppressor for sniperrifles, not something that suppresses Snipers themselves), pic by Tbird.
change several sniper rifles to attach Sniper Suppressor instead of Rifle Suppressor
changed all sound suppressor to sink, they are made of metal, after all
added Ares M4 Shrike and HK 417 12", pics by Tbird
added OTs 39, pic by Coolberg
added missing built-in folding stock on Type 85
changed HK MG36E from assault rifle to LMG
changed 5.45x18mm standard ammo to AP/FMJ, because the round has a reputation for piercing soft body armor at shorter ranges (not enough to warrant XAP, though).

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@837 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-07-02 07:54:04 +00:00