Commit Graph
24 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 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
Starwalker 91bfd7ae30 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 0a62ebd22b ************************************************************
* 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 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 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
MaddMugsy e0e4700eab -Added xml version information to xml files
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@758 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-04-02 18:30:35 +00:00
MaddMugsy 32ea381e1a -removed entries 12 and 13 from EnemyGunChoices.xml, since they're not used in the game
-added some the new attachments and GLs to EnemyItemChoices.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@747 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-03-23 00:00:30 +00:00
Starwalker e314f555c1 added Mauser M-03 and AKMSU
added four Urban Chaos items: Old Aimpoint Projector, Rifle LAM, Rifle LAM-Flashlight Combo, and the A.L.I.C.E. Pack.
added 10mm ammo in 8rnd mags, but no pistol for it yet!
added SA-24 to enemygunchoices
added Compact Binoculars to enemyitemchoices
made Energy/Regeneration Boosters attachable to First Aid Kit.
made Lockpick Kit, Wirecutters, Superglue, and Duct Tape attachable to Toolkit
lowered attachment costs for attaching equipment to Shadowarrior's armors (except for armor attachments like Ceramic Plates), because it should be easier to pull/put something from/into those trousers and vests, compared to attaching other things.
corrected and/or changed some descriptions.
perhaps I did other things that I forgot now because this update took so long ;-)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@733 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-03-13 08:26:53 +00:00
MaddMugsy c5bcb17ea8 -xml files updated to work with xml editor
-fixed some IncompatibleAttachments.xml entries that didn't have corresponding reverse entries (fixed by editor)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@711 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-02-22 23:43:15 +00:00
MaddMugsy 901bfc755a -added sun goggles to elites
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@457 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-08-29 16:49:23 +00:00
MaddMugsy 925372216b -Fix for integrated bipods: changed Bipod tag in items.xml to an integer. It is now the to-hit bonus for the bipod. (exe to follow)
-added MAB PA-15
-FAMAS G2 now has integrated bipod and 3-rd burst (no more bipod or trigger group attachments)


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@360 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-08-14 16:02:37 +00:00
MaddMugsy 68b1842bd6 -added new ammo, knives and guns from Starwalker
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@346 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-08-13 20:49:30 +00:00
MaddMugsy bd0455ca72 -sorted merges so they'll actually work :p (duh)
-fixed rpgs in EnemyItemChoices.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@315 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-08-09 20:39:41 +00:00
Lisac2k cd975f717b -Updated images for wood/urban/desert camo kits (big, inventory, ground). Updated Attachments.xml, EnemyItemChoices.xml, FranzInventory.xml, Items.xml, Merges.xml
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@301 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-08-05 12:26:59 +00:00
MaddMugsy 097725e365 -new fn fal bigitem image
-enabled rpg27 for enemies

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@202 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-07-12 02:11:57 +00:00
MaddMugsy 895f800ed0 -added rod & spring and barrel extender as possible attachments for enemies
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@190 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-07-07 16:27:50 +00:00
MaddMugsy d2df652051 -minor adjustment to make attached GLs appear
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@117 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-06-10 16:06:43 +00:00
MaddMugsy 286f86dddf -added attached GLs to possible enemy attachments
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@114 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-06-10 07:12:04 +00:00
MaddMugsy 6f95020a49 -removed scope indexes from enemy item choices, since they're not really needed if the sniper rifles all have default scopes
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@108 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-06-08 21:19:23 +00:00
MaddMugsy a00449797f git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@9 4f8fa57e-7814-0410-bad4-adc449f26b7c 2006-05-26 00:08:14 +00:00
lalien 10864e1b44 Little Alien
- New Ja2_Options.INI files
- Removed comments from .xml files



git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@4 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-05-25 10:45:53 +00:00
lalien a384cfb5de Little Alien
- Added data files from 2006.05.23



git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@3 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-05-24 21:30:11 +00:00
lalien 05e8b50d9d Little Alien
Initial data import 2006.05.23


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-05-23 19:13:46 +00:00