Commit Graph
62 Commits
Author SHA1 Message Date
Flugente bd6204cc75 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 e366af5740 Replaced ` with ' in Items.xml (thx to hrvg)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1967 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-02-27 20:36:42 +00:00
Wanne 82d757ac55 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 bd8634308d Added transformations from map-editor tripwire to standard tripwire (#1524).
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1924 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-01-27 21:37:54 +00:00
Flugente fce86b8213 Radio set battery can now be bought from BR.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1908 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-01-01 14:17:46 +00:00
Flugente 2676a4b757 swapped vision boni of low-quality and high-quality binoculars
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1899 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-12-20 23:54:01 +00:00
Flugente 34212b4d37 New Feature: Spotter skill (available to every merc) allows a merc to be spotter for other snipers. Spotter items have to be in hands, spending APs cancels action.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1896 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-12-19 19:54:34 +00:00
Flugente cfc4e3ebfa Corrected radio set description.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1894 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-12-17 18:23:00 +00:00
Flugente 5fe78cb413 Improved overheating values (by Zundman7301)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1885 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-11-28 19:00:47 +00:00
silversurfer 7b7b796bbf fixed wrong item class for RPO-M launcher
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1880 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-11-24 09:15:37 +00:00
silversurfer 25ce457062 fixed RPG launchers with wrong item class
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1879 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-11-24 09:12:43 +00:00
silversurfer b88f43b888 fixed incorrect <usItemClass> for LAW (item 51)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1878 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-11-22 17:53:18 +00:00
silversurfer d71f5ea3cb - updated smoke dummies (by Sevenfm and wil473)
- added <NotBuyable> to item 1699

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1874 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-11-18 07:48:00 +00:00
Flugente 3eebd6c5c7 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
silversurfer abdd68adc2 - New camo handling:
Camo Kits can now only be used to paint naked skin which usually means face and hands. Clothing will take care of the rest Together they can reach 100% camo.
CAMO_KIT_USABLE_AREA = 5 in Ja2_Options.ini sets the area that can be painted.

CAMO_LBE_OVER_VEST_MODIFIER = 0.2
CAMO_LBE_OVER_PANTS_MODIFIER = 0.6
These two set the amount of camo that armor vest/pants can provide if LBE is worn over them.
http://www.ja-galaxy-forum.com/board/ubbthreads.php/topics/327902/Re_Code_Snippets.html#Post327902

- New Mine avoidance for civilians (by Sevenfm)
Civilians can now avoid player placed mines.
CIVILIANS_AVOID_PLAYER_MINES = TRUE in Ja2_Options.INI takes care of that. I set the default to TRUE which will allow players to use mine fields in city sectors.
http://www.ja-galaxy-forum.com/board/ubbthreads.php/topics/327817/Re_Code_Snippets.html#Post327817

- Smoke effects and explosive attachments (by Sevenfm)
Normal explosions can now cause a smoke effect. Explosives can be attached to other exlosives to create a more potent bundle. Ja2_Options.INI has some new options for that:
ADD_SMOKE_AFTER_EXPLOSION = FALSE
ALLOW_EXPLOSIVE_ATTACHMENTS = FALSE
ALLOW_SPECIAL_EXPLOSIVE_ATTACHMENTS = FALSE
http://www.ja-galaxy-forum.com/board/ubbthreads.php/topics/327918/Re_Code_Snippets.html#Post327918


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1866 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-11-11 12:50:06 +00:00
Wanne 06733fbb5b Reworked Encyclopedia (by Moa)
- Updated INI options, INIEditor xml files
- Updated other game dir files

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1849 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-31 09:22:42 +00:00
Flugente f18782a2bd New feature: radio operator trait allows calling in artillery, requesting reinforcements, scanning for enemies and a few other skills
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1848 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-30 22:20:39 +00:00
Flugente 8110005474 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
silversurfer cde047baa2 - removed ability to store the large Belts, C-Mags and Drums in small pockets in Old Inventory System
- updated description for LAW


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1845 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-27 16:54:31 +00:00
Wanne 60d2f35877 MOLLE Fixes (by Off_Topic)
- MOLLE Typos
- Wrong Bray Descs.
- Throwing Knife Pocket now holds 3 Shuriken.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1842 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-24 18:03:58 +00:00
Wanne 8bb1b092ce 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 bc0bb5ef57 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 132e0330ee Molle Improvments / Fixes (by Off_Topic)
- Mini Grenade Size 14->13
- Mini Grenade Pocket 14x2->13x2
- New Pocket (Small Knife) for Nylon Knife Sheath Can't hold KCB or Rambo. 
o KCB & Rambo size 24->28
o Regular Knife Pocket Volume 13->15
- Carabiner
o New Item Class Armour/Face/LBE/Misc.
o Can now hold items 16 (Handcuffs) & 18 (Compact Binoculars)
There are still a few items that will go there that shouldn't (Syringes for example) but with the new item class restriction it's a lot less stuff.
- New ITEM: Carabiner
oCan be attached to MOLLE vests to add more Rings. -5 Stealth penalty to stop you going overboard.
- New Silhouette: Sniper Rifle
- New Pocket type: Sniper Rifle (Can now only hold one item sized 8 & 9, large sniper rifles and one item sized 5,6, or 7)
- Replaced this in Sniper Drag Bag
- General Drop Pouch can now hold more than small pouch (no restriction) and can hold bigger items. Volume increased from 2 to 8.
- New ITEM: Carabiner
o Can be attached to MOLLE vests to add more Rings. -5 Stealth penalty to stop you going overboard.
- Ammo Pockets now more flexible, they still only take Ammo. Other pockets tweaked.
- Mercstarting Gear: Wolf K2 Removed Leg Rig/Ice K3 Removed Combat Pack.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1834 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-19 12:18:37 +00:00
silversurfer 119fca79b2 Bugfix for AttachmentSlots.xml:
- Molle leg rigs lower row small slots had the wrong attachment class

Bugfix for NAS layout class assignments for Molle:
- layout class is a bit mask so I had to reassign (leg rig = 4, vest = 8, combat pack = 16, backpack = 32)
- new file Lookup\NasLayoutClass.xml for reference


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1833 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-18 13:33:25 +00:00
Wanne 279bdf1321 - Removed special characters from xml texts (® and ™) cause they could lead to problems
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1832 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-18 07:01:24 +00:00
silversurfer a1555560e2 - new NAS Layout Classes for Molle System (Thigh Rigs = 3 and Vests = 4)
- fixed attachment slot layout for Molle items
- fixed wrong slots for Molle items
- fixed wrong BR dropoff grid in GameDir 1828


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1829 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-16 18:46:04 +00:00
silversurfer 36f6745f2a Russian Molle pistol holster had wrong pocket
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1827 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-15 18:02:25 +00:00
silversurfer 18afbf760c added new silhouette 46 for shotgun holster
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1826 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-15 17:59:40 +00:00
silversurfer 07147870e4 - fixed <ubClassIndex> in Items.xml. This was broken in rev 1818 with the addition of the Molle system
- added some missing tags in MercStartingGear.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1825 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-15 11:15:04 +00:00
silversurfer 5c5c86f750 - Talon Launcher was missing NAS attachment class
- moved OA-93 and CMMG 7.3 to pistol category

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1824 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-14 15:31:46 +00:00
silversurfer dbabc86a58 New silenced sound definitions for rifle type weapons
The old sound IDs used a sound that fits pistols but not rifles, ARs and sniper rifles

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1823 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-14 12:26:05 +00:00
silversurfer ef2fe10558 - fixed some tags that went missing with the new Molle system
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1820 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-13 19:46:22 +00:00
Wanne 7e8d94fa92 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
silversurfer 67f0ec3050 New item tag <SleepModifier>
This is a percentage bonus to breath regain while resting.
It could be applied to sleeping bags for example.
Reasonable values are from 0 (no bonus) to 100 (twice the regeneration).

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1814 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-12 13:57:04 +00:00
Wanne b3991c99f4 - Fixed typo in Items.xml
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1809 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-08 20:26:50 +00:00
Wanne 440bd7060f 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
Flugente 8c957a30db Forgot to merge tripwire rolls.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1797 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-29 17:35:21 +00:00
Flugente e1cfe963f0 - stacks of binders can be merged
- new item: when planting tripwire roll (Item# 1640), a tripwrie item is created, thereby making planting multiple wires much easier

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1796 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-29 17:03:58 +00:00
silversurfer 1750631953 Rifle Sling now uses external attachment slot which is more logical and doesn't block internal slot anymore.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1791 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-26 16:32:46 +00:00
silversurfer 18a8a13e5d - fixed attachment class of trigger group
- fixed coolness of 4x scope
- fixed coolness of 7x scope

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1783 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-20 15:03:05 +00:00
Flugente e9d3115ee7 Clothes can be cut into rags.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1742 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-08-28 19:55:49 +00:00
Flugente 1f42603859 made tripwire merges not that hard, thereby reducing the stat gain
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1729 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-08-16 22:27:29 +00:00
Flugente 65ef13b10a added and adjusted the following features by zwwooooo to help restoring IoV to a pure item mod:
- externalized the brightness vision range modifiers to allow for different ratios of day/night vision range
- added <PercentRangeBonus> as a complement to <Rangebonus>
- added the possibility for LBE vests to function as plate carriers

These were the missing features from IoV previously not in the 1.13 trunk. Thereby, IoV is now fully compatible to the current trunk (by DepressivesBrot)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1722 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-08-08 21:08:44 +00:00
Flugente df70dd50a5 R-Holster is now covert.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1721 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-08-06 20:44:38 +00:00
Flugente 2f705f83cb new item tag <ItemChoiceTimeSetting> forbids AI from picking an item at night if set to 1 and at day if set to 2
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1716 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-07-30 19:34:13 +00:00
Wanne ee7170e778 - Re-added the <ubGraphicNum>245</ubGraphicNum> for uiIndex=445 (5.56x45mm Belt M) which got lost in revision 1708 (thx to silversurfer for reporting)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1709 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-07-19 07:30:30 +00:00
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 507d9d3be3 - Bugfix: Fixed missing <ubGraphicNum>245</ubGraphicNum> for uiIndex=445 (5.56x45mm Belt M) (by Bambusar)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1707 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-07-16 09:27:28 +00:00
Wanne a5db19bccf - Bugfix: Added missing nAccuracy tag with value 6 for uiIndex = 675 (HK P7M8) (by Bambusar)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1705 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-07-16 06:25:14 +00:00
Flugente d9ebefaa70 Fix: corrected .50 BMG Mag AP size to 10 (by DepressivesBrot)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1699 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-07-08 16:28:28 +00:00