Commit Graph
79 Commits
Author SHA1 Message Date
silversurfer 2d3fc62bb6 Changed fragmentation explosives to emit fragments like they should. All values are experimental.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2161 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-10-03 10:51:35 +00:00
silversurfer 004cb3d482 Fix (by Ocular and Strohmann):
wrong aim levels and handling for Sphinx pistol
wrong Need for sleep values for Lance Fisher and Turtle

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2158 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-10-03 07:44:48 +00:00
Wanne d52318e636 - Fixed items lacking an outline in smp2 tilesets (by Off_Topic)
- Fixed 7rd Shotgun Pocket to hold 3x 2 Shells and 1x 4 Shells (by Off_Topic)
- A slight change to Rifle Sling Pocket also (by Off_Topic)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2148 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-09-15 18:15:09 +00:00
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
Flugente e8412f6d9d Lowered duration of Trip Flare and Break Lights from 35 to 10
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2139 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-09-02 20:15:16 +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 926be78f6b New xml: FoodOpinion.xml allows individual opinions on individual food items for each merc, the <bMoraleMod>-tag in Food.xml was removed.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2125 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-08-28 20:08:28 +00:00
Wanne 41a8afcb01 Bugfix: Pockets.xml (by Off_Topic)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2110 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-08-25 09:36:39 +00:00
Wanne b78bd5d6d1 Pocket Fixes (by Off_Topic)
1. Fixed Gen Misc. Pocket.
2. Removed excess pockets from newly added LBE.
3. Added silhouette of small revolver. (Just Aesthetic for R:Holster.
4. Added silhouette for rifle molle.
5. Minor changes to weight of newly added LBE.
6. Adjusted some pocket values to better suit their purpose.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2109 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-08-24 19:34:05 +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 2f741262b6 Adjusted aim level and gun handling values (by Strohmann)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2098 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-08-10 12:49:03 +00:00
Flugente e4c01d20ff Throwing knifes can get bloody again.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2071 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-07-14 21:02:12 +00:00
Flugente b8633434a5 Merged revision(s) 2026 from branches/ja2_data_official_2014:
AI will no longer choose illumination rounds for mortars and grenade launchers during the day

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2027 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-04-30 22:56:16 +00:00
Wanne 9c6c5d8326 Merged from revision: 2017
- Fixed wrong item updates from commit 2014 (custom souns for non-guns)
o Now the hedge trimmer has the correct new sound

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2018 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-04-21 06:58:21 +00:00
Wanne 6924efdf61 Updates/Fixes (by Sevenfm)
- Added grenade throwing range modifier to item_settings.ini:
RANGE_GRENADE_MODIFIER = 1.0
This modifier is applied to grenades and regular thrown items.
- Added xml tags for merge type <13>: you can use u.knife on tripwire roll to get 2 tripwires. Status of tripwire roll will be reduced by 2 points. 
Also lookup table for merges is updated for xml editor to work correctly.
- Added several new loadscreenhints.


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2000 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-03-24 20:06:38 +00:00
Flugente 7ff6a8cfa7 - New feature: Ammotype flag AMMO_ANTIMATERIEL (<ammoflag>4</ammoflag>) gives bullets the ability to destroy walls and other structures.
- Fix: Charlie's ammo was not fitting

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1984 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-03-15 17:55:11 +00:00
Flugente 679e443b42 Merged revision(s) 1980 from branches/ja2_data_official_2014:
- new background ability: disarm_trap alters effectivity at defusing bombs
- lowered signal shell light duration

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1981 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-03-12 22:32:22 +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 94988a2b84 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 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 df4cdfdab2 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 fd72b7fbee 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 e7a6adc1aa 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 74e0be1cce 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 59e6c62db4 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 b3d808f205 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 a45c56466f 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 a7d887b462 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 ebfb3c1e15 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 e00ed535a5 - 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 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
silversurfer 4dee3218aa - 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 1cca337fa0 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 210658e382 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 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
silversurfer 7e3d4e9a01 - 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 d9a709b1fe 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 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 79bf420306 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 d4d4578487 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 09fe9a59f8 - 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 6a31463608 - 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 698228eefb 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 8fbc9fc9d9 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 d917725477 - 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 50013990f8 - 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 d2363d32db 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 3d3bc9fb9c - 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 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