Commit Graph
234 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
Flugente 82058270f1 added new scuba gear picture and pepper spray sounds (by Shanga)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1582 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-01-03 17:12:24 +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 32a792e36b Better pics for clothes (by Thor).
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1542 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-09-19 20:23:53 +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 408feb756f - Small gun pictures (MDGUNS.sti) correction/enhancement for 1.13 (by Nik)
Corrected so far: 14,21,24,25,28,29,84,86,87,88,110,115,117,135,136,137,155,165,179,180,243,272,304,305,306,315,316,317,325
see here: http://www.bears-pit.com/board/ubbthreads.php/ubb/showflat/Number/304511/Searchpage/1/Main/19888/Words/Nik/Search/true/Small_gun_pictures_correction_.html#Post304511

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1422 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-05-09 13:15:14 +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
MaddMugsy 1abfffd2aa Changes for HAM 5
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1389 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-10 23:16:43 +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
Starwalker 2395675a90 changed pics back to old pics, because the new BigItem pics had the wrong dimensions
reduced offset of Gun pic 100 in mdguns.sti to zero, because that offset might lead to a crash in the map-editor.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1313 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-07-13 11:58:56 +00:00
Starwalker 9e651f07fb added new graphics of Lasersight, LAM, Sniper Scope, ACOG, ACOG-Combo, and Reflex Sight (all made by Exurok22)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1303 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-06-08 09:58:08 +00:00
Starwalker 5b34d10f5e exchanged ammocrate pictures with better ones made by Smeagol
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1270 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-02-21 10:32:41 +00:00
Starwalker 60f75c8129 added interface pics of single 43mm grenades (ChrisL)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1254 4f8fa57e-7814-0410-bad4-adc449f26b7c
2010-12-06 09:47:18 +00:00
Starwalker c411289ce6 interface small pics for 9x18 Glaser ammo added
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1249 4f8fa57e-7814-0410-bad4-adc449f26b7c
2010-11-30 15:45:00 +00:00
Starwalker b096ca18dd added pics for new .38Spc ammunition.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1243 4f8fa57e-7814-0410-bad4-adc449f26b7c
2010-10-25 13:13:37 +00:00
Wanne acc2745efa - Fixed wrong Y offset of "P90" and "First Aid Kit" which leaded to a CTD im Map Editor when you select those items for merc inventory
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1240 4f8fa57e-7814-0410-bad4-adc449f26b7c
2010-09-22 10:27:04 +00:00
Starwalker 72805ea2fb The medium pics of the Beretta Storm and the AI AWM showed some non-transparent background in-game (though not in the XML-Editor), I fixed this.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1234 4f8fa57e-7814-0410-bad4-adc449f26b7c
2010-09-09 07:17:34 +00:00
Starwalker 600b5bfec3 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@1230 4f8fa57e-7814-0410-bad4-adc449f26b7c
2010-08-30 08:37:56 +00:00
Starwalker 5646a6fc6a added pic for Beretta Cx4 Storm
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1218 4f8fa57e-7814-0410-bad4-adc449f26b7c
2010-04-01 06:33:21 +00:00
Starwalker cbd218eab2 added pic of choke (Tbird)
added pics of subsonic 7.62x39mm ammo

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1199 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-10-22 07:47:38 +00:00
Starwalker e661de3f22 added some 5.45x39mm cold ammo pics
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1192 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-09-16 09:12:29 +00:00
Starwalker 44cac958a7 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@1167 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-07-07 11:15:10 +00:00
Starwalker f68bc80273 replaced AET pics for 5.7mm 50rnd mag and 9x19mm C-Mag (Kaerar)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1162 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-06-29 09:33:59 +00:00
Starwalker b6352379ce replaced MDP2ITEM pic of Glaser drum (used wrong pic the first time)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1153 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-06-24 08:19:17 +00:00
Starwalker fe8df883c6 adjusted HK 416 pic
added ammo pics made by Kaerar

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1150 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-06-24 08:09:04 +00:00
Starwalker 27b8541cf2 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@1143 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-06-09 11:18:52 +00:00
Starwalker 229584b8fa added pics for some ammo (9x18mm AP and 7.62x54mm Match)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1117 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-04-22 07:19:21 +00:00
Starwalker eebf6e28d6 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@1102 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-04-01 06:41:21 +00:00
Starwalker 5aa990f365 replaced two revolver pics and added two new ones, all by Coolberg
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1094 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-03-12 11:07:35 +00:00
Starwalker 58193a3616 replaced some launcher pics (Coolberg)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1081 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-02-02 12:20:50 +00:00
Starwalker 82d1249e94 added temporary pics for new illumination/smoke items
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1073 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-01-29 07:37:20 +00:00
Starwalker 43f116d99c New grenade/rocket launcher pics (Coolberg)
re-sized pics for new FN pistols (Jimmy)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1057 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-12-01 11:53:52 +00:00
Starwalker 9295edfa78 4 updated shotgun pics by Coolberg
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1046 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-10-30 07:58:27 +00:00
Starwalker 505c2ecec9 3 new FN pistol pics (Jimmy)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1041 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-10-02 09:14:38 +00:00
Starwalker 54a4b89336 New Thompson M1928 pics (Marlboro Man)
New Thompson Drums (KenNoOni)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1027 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-07-23 14:29:24 +00:00
Starwalker abd8e55e1d revolver pics added
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1021 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-07-01 15:13:11 +00:00
Starwalker 57d0d3cb3b added some item pics
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1011 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-05-31 15:00:16 +00:00
Starwalker 643cff4e80 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@990 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-04-24 09:18:24 +00:00
Starwalker b90373b8ee replaced SAW Pouch pic (Marlboro Man)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@978 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-04-09 06:41:38 +00:00
Starwalker 72622c17f4 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@975 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-04-04 11:10:26 +00:00
Starwalker a7d43f2805 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@962 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-03-17 09:11:19 +00:00