Commit Graph
167 Commits
Author SHA1 Message Date
Flugente 360bac0909 Feature improvement:
- via StructureConstruct.xml and StructureDeconstruct.xml, one can now define which structures can be removed and created via items and the fortifications feature.
- added building materials to create wooden debris and walls

For more information, see http://www.ja-galaxy-forum.com/ubbthreads.php/topics/335557#Post335557

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2140 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-09-06 23:58:11 +00:00
Wanne ef8165db1a Bugfixes: "Carrier Bladder" (by Off_Topic)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2129 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-08-28 22:32:25 +00:00
Wanne cb8da2c6d7 "Carrier Bladder" (by Off_Topic)
1. Added a hydration system, the ArmorBak can be worn as a backpack, which allows you to place a "bladder" inside it. This carries twice as much water as a canteen.
The US ILBE Rucksack has an integral carrier but needs the bladder, it can be attached to certain MOLLE items also.
Created a new attachment point: 4 for the carrier and 7 to include all MOLLE and the hydration carrier. There is also a new food item.
2. There is a Tactical sling now that acts like a backpack pocket which allows you to carry ONE Rifle etc... on your back. (Need to get a different image, will upload soon.)
3. Added a better image for the MOLLE single pistol mag and Sniper Ammo.
4. Added 3 new MOLLE pouches: Speed Loader, Ammo Drum, and Single Rifle.
5 Added silhouettes for above and also for Throwing Knives.


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2128 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-08-28 21:13:18 +00:00
Flugente 3433ec6b1c New feature: Diseaes affect your mercenaries. They can be contracted in varíous ways and have varying effects.
For more info, see http://www.ja-galaxy-forum.com/ubbthreads.php/topics/334918#Post334918

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2099 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-08-10 13:05:18 +00:00
Flugente 99857261cd Merged revision(s) 1970 from branches/ja2_data_official_2014:
Added sleeping bag item (#1709), as <SleepModifier> was unused.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1971 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-03-01 22:26:43 +00:00
Wanne 33571338f0 Merged from revision: 1926
4 new MOLLE items (by Off_Topic)
- 1 MOLLE Backpack/Combat Combo, 
- 1 Stand alone MOLLE Combat pack and 1 stand alone MOLLE Backpack
see: http://www.bears-pit.com/board/ubbthreads.php/topics/329539/Creating_a_MOLLE_backpack_set_.html#Post329539

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1927 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-01-28 08:13:03 +00:00
Flugente 679c357c23 added picture for radio set (by smeagol)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1868 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-11-11 20:35:31 +00:00
Flugente 5e65fe45c1 Gun sling picture (from IOV by Off_Topic)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1846 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-29 21:34:14 +00:00
Wanne 3095bffa8a MOLLE Fixes (by Off_Topic)
- Fixed: PriceMod Missing for some Premium Kits
- Added: New Pocket & Silhouette Double Frag
- Added: New Pocket Single Flashbang
- Balanced Price/Coolness of MOLLE from 1-8
- Change TK Leg Rig Pocket General->Tiny
- Added Missing BRAY Text for Bomb Pouch
- Better Image for 7RD Bandolier

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1840 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-22 17:10:46 +00:00
silversurfer 236d7a8f7b Molle updates (by Off_Topic)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1836 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-21 06:26:41 +00:00
Wanne 96f83d1387 Added Molle system to 1.13 (by Off_Topic)
- Several new MOLLE vests added along with three MOLLE leg RIGS and numerous MOLLE Pouches. (Most Images: IOV, Attachment slots based on Strohmanns, thanks to Depri/Parkan for help.)
- Only DG Mercs MOSES, BOb, Mitch Snake & BUD have been given MOLLE items in their starting gear for demonstration purposes.. MOLLE only available through BRAYs.
- MOLLE vest differ from regular vests in that an AR mag pocket/pouch etc... will only hold AR mags. I did this to make regular vests a viable option versus MOLLE vests, don't worry, you can customise the best MOLLE vests with up to 9 pockets and leg rigs with 5 pouches.
- There is also a new "Carabiner" pocket, this is for "hooking" on items with straps E.G. Helmets, Gasmasks, LBE etc... there are a few things that will still go there that shouldn't, but it's a minor thing. There is also a Carabiner that will only hold face items.
- In order for this to be implemented, i had to standardise LBE leg rigs, in most cases a size change from 21->22. I also had to change:
- Medkit:26->27, Toolkit26->27 but this won't change anything in game storage wise. TV, Golfclubs, & Chalice were also changed by one size.
- The first few vests you encounter will have limited MOLLE attachment points. 
- E.G. 3.11 Leg Rig has limited volume and can only take small MOLLE pouches. Later, you can purchase Larger Rigs/vests with greater volume and can hold both small/large pouches.
- Several new pockets/silhouettes added.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1818 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-13 17:57:21 +00:00
Wanne 1ba8990eef New Pocket Types and Silhouettes (by Off_Topic)
Large Pistol Holster
Shotgun Shells
Throwing Knife
General Misc
Small Explosive
Short Rifle Mag x2
Revolver Holster (Sideways)
Combat Pack Gun Sling
Combat Pack Small
Explosives
Sniper Mag

New LBE added:

Leg Throwing Knife Rig
SMG Mag Leg Rig
Pistol Mag Rig
Bomb Rig
Equipment Rig
Large Pistol Holster
12 G Shotgun Shell Holster
Small Shotgun Holster

Mercstarting gear:

Wolf (Shotgun Rig)
Blood/Hitman: Throwing Knife Leg Rig
Buns: Pistol Mag Rig
Ice: Smg Mag Rig
Red: Bomb Pouch
Bull: equipment pouch
grizzly: Large Pistol Holster.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1805 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-06 06:41:28 +00:00
Wanne dbdaecd30a 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 83a8bda8bb - 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 e388ec4d3d 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 7356ae5411 - 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 7d650f5389 fix: item pic was missing
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1543 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-09-21 18:44:16 +00:00
Flugente ecfb6f46ad 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 3aa4718403 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 63a6fbb279 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 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