Commit Graph
182 Commits
Author SHA1 Message Date
Wanne 27f51f779c Added / Updated Item graphics (by Bambusar)
o see: http://www.bears-pit.com/board/ubbthreads.php/ubb/showflat/Number/322670/Searchpage/1/Main/12303/Words/Bambusar+/Search/true/Re_BUGZILLA_report_all_bugs_he.html#Post322670

Pepper Spray      SM
Spray Canister    SM
Scuba Mask        SM
Diving Bottle     SM
Scuba Fins        SM
Binders           SM

Flashlight        SM MD BIG
Flashlight        SM MD BIG
Garotte           SM MD BIG
Body              SM MD BIG
Binders

TIMS Backpack     SM
ARUC Backpack     SM
MALICE3 Backpack  SM
TIMS Pack         SM
TT 3-Day Pack     SM
Patrol Pack       SM 

Light knife       MD



git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1708 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-07-17 19:07:33 +00:00
Wanne 2a63066464 - Added the last missing DG mercs (by anv)
o Mitch (AIM), Carp (AIM), Lance (MERC), Raffi (MERC), Wink (MERC)
o added voice sets for above
o added love/hate talk for Spam, Vicki, Biff, Fidel, Bud 
o added gear kits for all MERC mercs, now everyone should have 5 choices (I hope they're somewhat balanced)
o added 2 signature weapons from DG: Postie's letter opener, Reuban's hedge trimmer, now in their kits

Notes:
o Carp has skill evolution set to 1/4 - as he "has slowed with age" according to his bio,
o hedge trimmer doubles up as wire cutter, so no puny fence will save you from getting chopped up,

see: http://www.bears-pit.com/board/ubbthreads.php/topics/321770.html#Post321770


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1680 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-06-20 19:38:57 +00:00
Wanne aeafb3e4f5 Fixed X/Y coordinates of new items like sandbags, food etc & those with no coordinates specified in pickup menu (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1601 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-01-31 20:20:39 +00:00
Flugente 530d0d3d0a - added new pics for various items (by Shanga)
- enemy assassin feature is 'off' per default, in order not to freak out unwary new players


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1580 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-01-03 04:06:06 +00:00
Flugente de24e0c26f New feature: clothes items allow colouring of your mercs. See http://www.bears-pit.com/board/ubbthreads.php/topics/310208.html#Post310208 for more information.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1540 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-09-16 02:53:36 +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 d4f5eddff6 added pic for cleaning kit (pics by wil473)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1498 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-08-18 00:58:02 +00:00
Flugente 8a91a378f4 - updated food values (by Slax)
- new item flag (CAMO_REMOVAL, 1024) for camo-removing items, added to rag (item 1022)
- added xml with current ItemFlag-values (Lookup/ItemFlag.xml)
- added small and medium pics for the masterkey (by wil473)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1489 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-08-13 20:20:08 +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 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 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 2a4a71d0b1 - 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 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 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 5aa18a87a0 added small pics of single 43mm grenades
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1253 4f8fa57e-7814-0410-bad4-adc449f26b7c
2010-12-06 09:46:53 +00:00
Starwalker 5fb24cd0e5 small pics for 9x18 Glaser ammo added
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1248 4f8fa57e-7814-0410-bad4-adc449f26b7c
2010-11-30 15:44:40 +00:00
Starwalker ef20011a07 added pics for new .38Spc ammunition.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1242 4f8fa57e-7814-0410-bad4-adc449f26b7c
2010-10-25 13:13:23 +00:00
Starwalker c6bbb23d7a replaced small pic of First Aid Kit, because it was still the old 'white box' pic.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1241 4f8fa57e-7814-0410-bad4-adc449f26b7c
2010-09-24 10:15:56 +00:00
Starwalker c5692ae425 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@1231 4f8fa57e-7814-0410-bad4-adc449f26b7c
2010-08-30 08:38:05 +00:00
Starwalker 45401b4e26 added pic for Beretta Cx4 Storm
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1217 4f8fa57e-7814-0410-bad4-adc449f26b7c
2010-04-01 06:33:13 +00:00
Starwalker 29d051faae added pic of choke (Tbird)
added pics of subsonic 7.62x39mm ammo

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1198 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-10-22 07:47:23 +00:00
Starwalker d88bf8b8e4 added some 5.45x39mm cold ammo pics
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1191 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-09-16 09:12:14 +00:00
Starwalker e4c2f67c45 corrected background of a few modified armors
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1182 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-08-12 12:15:35 +00:00
Starwalker cd4b522950 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@1166 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-07-07 11:14:49 +00:00
Starwalker d0155669a5 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@1142 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-06-09 11:18:41 +00:00
Starwalker 1b119a70de added pics for some ammo (9x18mm AP and 7.62x54mm Match)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1116 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-04-22 07:19:11 +00:00
Starwalker 174ba66c9b 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@1101 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-04-01 06:41:06 +00:00
Starwalker 0c397f8253 replaced two revolver pics and added two new ones, all by Coolberg
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1093 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-03-12 11:07:23 +00:00
Starwalker 6cedcd70fd replaced some launcher pics (Coolberg)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1080 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-02-02 12:20:33 +00:00
Starwalker b68dbf3fca added pic pics for new illumination/smoke items
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1072 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-01-29 07:36:57 +00:00
Starwalker ba2f41d182 New grenade/rocket launcher pics (Coolberg)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1056 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-12-01 11:53:11 +00:00
Starwalker edca308d77 4 updated shotgun pics by Coolberg
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1045 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-10-30 07:58:12 +00:00
Starwalker db137abb2a 3 new FN pistol pics (Jimmy)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1042 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-10-02 09:14:50 +00:00
Starwalker 14118b44a9 revolver pics added
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1020 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-07-01 15:12:58 +00:00
Starwalker 301f013607 added some item pics
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1010 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-05-31 15:00:02 +00:00
Starwalker 56e5ddd92c replaced SAW Pouch pic (Marlboro Man)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@977 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-04-09 06:41:20 +00:00
Starwalker 99106c2672 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@974 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-04-04 11:10:03 +00:00
Starwalker bb9830e167 added three new LBE item graphics (re-assembled some of Marlboro Man's work)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@961 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-03-17 09:11:05 +00:00
Starwalker d4dfd63730 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@938 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-03-03 14:01:22 +00:00
Starwalker c401f02064 replaced Baikal MP-233 pic (Coolberg)
added 30rnd Veresk mag pic (Coolberg)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@931 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-02-12 08:09:19 +00:00
Starwalker 45469efd9d added Pipe Wrench pic (Kaerar)
added camoed Barret pic (Kaerar)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@923 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-01-21 09:26:47 +00:00
Starwalker 32b8a46a5a 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@917 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-12-11 08:42:30 +00:00
Starwalker 7284e95687 added new M224 mortar pic (Tbird)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@909 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-11-15 07:50:45 +00:00
Starwalker 91fadaee51 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@905 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-11-05 07:14:21 +00:00
Starwalker 0296d40828 added MC51 pic for later use
added Flare pic for later use

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@901 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-11-01 08:21:10 +00:00
Starwalker c1ab24d7d1 replaced HK SL8 pic (Coolberg)
added several gun pics for later use (Tbird)

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

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@894 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-10-12 06:53:12 +00:00
Starwalker 9f4d8ceb8b missing pics for new items :-(
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@889 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-10-01 12:01:34 +00:00