Commit Graph
68 Commits
Author SHA1 Message Date
Flugente 57390e7da3 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 b9c273c25e 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 88dac110a3 - 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 d563881a4d 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 8004ec9387 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 dabb04f324 - 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 a598fb3011 - 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 b72b1f9262 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 443f1c7a70 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 ef220e65c1 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 fa20e1fdec 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 0f8bf8090e -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 ac35024843 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 425443ab37 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 9d2e6426db 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 826c4a2590 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 71f8bb0027 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 a8bfd5d906 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 8f2f3002ec 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 f7d5e736d7 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 03957471b0 - 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 f9c88ff2c1 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 963e7c170c 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 a49af32753 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 612a5fbbbb 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 d739afed6b 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 dbfd9ab591 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 d19cf3ac1c 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 53baca7a8b 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 ad0ab1ea25 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 54d55fad64 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 92c9e564aa 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 4bacd1e6a2 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 358ab665a9 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 f51fb510db 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 db3ce86a53 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 2f8563c97c 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 39391c3990 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 764523c045 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 dbf267dbcf 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 26a74d6050 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
Starwalker 6a7e44c9f4 replaced pics of SAR 21, RPK, LAR .45, and LAR .50 with new pics by Tbird
added HK 416 20", HK UCP, HEZI SM-1, and Rheinmetall MG3 (pics by Coolberg and Tbird)
added ammo for UCP and HEZI (pics by Coolberg)
added HK 417 pic for later use (Tbird)
changed Coolness on some ammo

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@821 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-06-07 06:44:28 +00:00
Starwalker b5a8638585 Stupid me had marked the wrong folder for commitment on revision 817, so the INSAS and Minimi pics were missing. So again:
replaced pics of INSAS and Minimi with new ones made by Tbird!
replaced SMP1ITEMS.STI with one that ChrisL repaired, because there was one armor pic too much
allowed Rifle Suppressor on Galil Sniper
uploaded new GermanItems.xml from a new translator, had to correct and add a few things, though

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@818 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-06-02 15:28:29 +00:00
Starwalker 4eb0b17d7d changed M1 Garand to .30-06 caliber
added Beretta M12, HK 416 10" (more to follow), and Steyr AUG-A3
added a lot of other gun pics for later use
replaced pics of Grach, M60E3, HK 416 14", Pecheneg, and Sterling L2A3
added a 40mm Grenade Panel
deleted wrong German descriptions of Thor's martial arts items

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@815 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-05-31 06:33:51 +00:00
Starwalker 4c9bc82795 Coolberg improved his SIG pistol pics
added Tbird's SIG SAS pistols and his Luger pistol

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@813 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-05-23 13:49:13 +00:00
MaddMugsy d1f2c96949 -removed three references to "Nothing" items from Tony's Inventory (462, 468, 474). File re-indexed :)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@804 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-05-18 18:43:44 +00:00
SpaceViking 102bfd1469 Another missing entry
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@802 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-05-18 01:30:15 +00:00
SpaceViking a62ac737bd Add missing line back so Tony has full inventory.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@801 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-05-17 23:14:11 +00:00
Starwalker 5eecc32027 added new guns and magazines to Tony's inventory
added First Responder Kit to Howard's inventory

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@800 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-05-15 14:36:35 +00:00
Starwalker c943b34c94 added/deleted some new items from inventories (deleted entries were due to copying items)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@788 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-05-06 08:23:52 +00:00