Commit Graph
147 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 ac173284c4 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 a80e4000cd 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 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 19fdfb0777 - New Feature: Rifle Sling (by Flugente)
o This attachment fits most ARs, Rifles and SMGs. When attached, moving the gun from the main hand to the rifle sling slot does not cost APs when 'Inventory Manipulation costs AP' is turned on.
o When a merc would drop his gun because of damage taken, it is instead moved to the rifle sling slot if possible.
o A gun in the main hand or rifle sling slot cannot be stolen when a rifle sling is attached.

- Proper picture for Tripwire (by smeagol)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1403 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-13 08:20:12 +00:00
Wanne 452a247d14 - 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 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 838b3f7b8d exchanged ammocrate pictures with better ones made by Smeagol
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1271 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-02-21 10:33:13 +00:00
Starwalker c01e28c826 added big pics of single 43mm grenades (ChrisL)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1255 4f8fa57e-7814-0410-bad4-adc449f26b7c
2010-12-06 09:47:54 +00:00
Starwalker 0edc07a88e big pics for 9x18 Glaser ammo added
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1250 4f8fa57e-7814-0410-bad4-adc449f26b7c
2010-11-30 15:45:24 +00:00
Starwalker 484dacc47a added pics for new .38Spc ammunition.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1244 4f8fa57e-7814-0410-bad4-adc449f26b7c
2010-10-25 13:13:56 +00:00
Starwalker dd97e56c89 added some item pics from Unfinished Business, for later addition of those items.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1229 4f8fa57e-7814-0410-bad4-adc449f26b7c
2010-08-30 08:37:41 +00:00
Starwalker 704326f1a5 added pic for Beretta Cx4 Storm
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1219 4f8fa57e-7814-0410-bad4-adc449f26b7c
2010-04-01 06:34:21 +00:00
Starwalker cfcbb5ff7e added pic of choke (Tbird)
added pics of subsonic 7.62x39mm ammo

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1200 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-10-22 07:47:57 +00:00
Starwalker 82402744bb added some 5.45x39mm cold ammo pics
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1193 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-09-16 09:13:03 +00:00
Starwalker 84f07a5630 repaired 9mm AP-Cold pic (had been missing asterisk)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1187 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-08-31 08:43:54 +00:00
Starwalker 5f599e4f87 replacement pics for some guns and ammo (Kaerar & Tbird)
pics for AR57-series (Kaerar)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1168 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-07-07 11:18:32 +00:00
Starwalker e2869b13a7 added ammo pics made by Kaerar
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1151 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-06-24 08:09:43 +00:00
Starwalker d135039c28 added pic of Kimber Eclipse (Tbird)
added pic of FN HP-35 (Coolberg)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1144 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-06-09 11:21:04 +00:00
Starwalker 985adf8d7e color correction on ammo pic
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1120 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-04-22 07:28:26 +00:00
Starwalker 1f938f9820 added pics for some ammo (9x18mm AP and 7.62x54mm Match)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1118 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-04-22 07:20:45 +00:00
Starwalker 1e8f07d2db new pics for 2 existing revolvers (Coolberg)
new pics for C1 and C4 (KenNoOni, adjusted by Coolberg)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1103 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-04-01 06:42:21 +00:00
Starwalker 439dbf9d68 replaced two revolver pics and added two new ones, all by Coolberg
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1095 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-03-12 11:08:06 +00:00
Starwalker d599ec2351 replaced some launcher pics (Coolberg)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1082 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-02-02 12:21:39 +00:00
Starwalker 294dc7e6ed added temporary pics for new illumination/smoke items
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1074 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-01-29 07:38:04 +00:00
Starwalker 9999506a6b New grenade/rocket launcher pics (Coolberg)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1058 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-12-01 11:54:23 +00:00
Starwalker b21e50a8f9 4 updated shotgun pics by Coolberg
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1047 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-10-30 07:58:51 +00:00
Starwalker bc7b8f6eae pics uploaded earlier contained artefacts :-(
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1043 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-10-02 09:20:23 +00:00
Starwalker adb719bc58 New Thompson M1928 pics (Marlboro Man)
New Thompson Drums (KenNoOni)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1028 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-07-23 14:29:57 +00:00
Starwalker 905cc972d8 double entry of gun277.sti deleted
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1015 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-05-31 16:21:27 +00:00
Starwalker 97de2451c7 added/replaced some gun/item pics
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1012 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-05-31 15:01:25 +00:00
Starwalker 97fcc92abe replaced Type 85 and 30rnd 7.62x25mm mag pictures with new ones made by Hruza
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@991 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-04-24 09:19:13 +00:00
Starwalker df9adc32dd replaced SAW Pouch pic (Marlboro Man)
replaced Triggergroup pic (Tbird)
added S&W M29 SATAN pic (Tbird)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@979 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-04-09 06:51:05 +00:00
Starwalker 1da55c793d replaced M14, M21 and Desert Eagle pics (Kaerar)
added gun pics for later use (Kaerar)
added item pics for later use
added red stripe to some 7.62x25mm ammo pics to better show their type

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@976 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-04-04 11:13:47 +00:00
Starwalker d09534a66c added three new LBE item graphics (re-assembled some of Marlboro Man's work)
removed some of the upper background of the Barrett M82A2, so that it is displayed higher at BR's

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@963 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-03-17 09:12:12 +00:00
Starwalker 8146daa390 replaced MP-133 pic (Coolberg)
added two Fabarm Shotgun pics for later use (Coolberg)
added 7.62x39mm Drum Adapter pic (KenNoOni)
added several ammo crate pics as stand-ins for testing purposes (not final pics)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@940 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-03-03 14:04:18 +00:00
Starwalker 7593674a4c replaced Baikal MP-233 pic (Coolberg)
added 30rnd Veresk mag pic (Coolberg)
added Veresk pic (Coolberg)
replace Ceramic and Titanium Plate pics (KenNoOni)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@933 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-02-12 08:16:18 +00:00
Starwalker d174aad3d3 added Pipe Wrench pic (Kaerar)
added camoed Barret pic (Kaerar)
added another SL8-version (Kaerar)
replaced HK G11 PDW pic (Kaerar)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@925 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-01-21 09:34:05 +00:00
Starwalker 2819990fc3 replaced pic of NADA items (Marlboro Man)
replaced pic of Retractable Baton (Marlboro Man)
replaced pic of Flash Suppressor (Tbird)
added pics for later use in NewInv (Marlboro Man)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@919 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-12-11 08:50:11 +00:00
Starwalker 91a7400b96 changed all Automag pics (new ones by Tbird)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@915 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-11-27 14:20:50 +00:00
Starwalker c8e1776901 replaced pics of HiCap Colt pistol, FR-F2, and M224 Mortar (Tbird)
NADA items will keep the old mortar pic.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@911 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-11-15 07:52:50 +00:00
Starwalker 423d4b82b0 replaced pics of Remington, Ithaca, and Street Sweeper shotguns (Coolberg)
added pic of another LBE-vest

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@907 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-11-05 07:16:24 +00:00
Starwalker 3135f70e0e added MC51 pic for later use (Tbird)
added Flare pic for later use (Kaerar)
replaced Sungoggles pic (Marlboro Man)
replaced M79 and Blaser pics (Marlboro Man)
replaced Franchi and Benelli Shotgun pics (Coolberg)
replaced PPsh41 pic (Coolberg)
replaced BigItem pics of G36 family (Coolberg)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@903 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-11-01 08:29:48 +00:00
Starwalker ee830d5b52 replaced HK SL8 pic (Coolberg)
added several gun pics for later use (Tbird)
added a new pic for Rifle LAM/Flashlight combo (but old pic stays as well, if needed for UC)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@898 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-10-18 07:07:07 +00:00
Starwalker 5824af525a replaced pics of Ruger Mini 14, Winchester 94, M1 Garand, Mosin-Nagant, Kar 98k, and Mauser M03 (Coolberg)
replaced pics of M72 LAW and HK SL9SD (Tbird)
replaced several LBE-item pics (Marlboro Man)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@892 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-10-12 06:52:15 +00:00
Starwalker 1d7b92dc20 missing pics for new items :-(
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@891 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-10-01 12:02:25 +00:00
Starwalker 247eb99d3a replaced G36 family pics (Coolberg)
added MG36 and MG36-RAS pics in addition to replacement mentioned above (Coolberg)
added pics of G36 kits for later use
changed name of G36/G36K Tactical to G36/G36K RAS
added pics of LBE-items
increased damage of .357M and 10mmAuto guns by 1, decreased damage of .45ACP guns by 1
updated New Inventory definition XML-files (same as on FTP-site)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@879 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-09-18 06:55:30 +00:00
Starwalker 1044142484 changed the new explosive internal item from #995 to #270, so I can use the same in the Data-folder for vanilla JA2 (a hardcoded pointer uses this item).
changed description of Beowulf Rifle
increased range of Mosin Nagant to 600m
replaced pics of SKS and AKMSU (Tbird) and of MG3 (Buren)
added several gun pics (Tbird) and LBE-item pics (Marlboro Man) for later use

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@875 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-09-13 08:28:29 +00:00
Starwalker b82949d4e5 Added three new SMG pics (MAT-49, SIG MP41, Spectre M4) by Tbird
changed BigItem pics of Luger and Alaskan

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@869 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-09-09 12:10:22 +00:00
Starwalker 1f2141f000 changed pics for 20mm and 25mm grenade magazines to new pics made by Briareos
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@855 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-08-17 06:45:12 +00:00