Commit Graph
1808 Commits
Author SHA1 Message Date
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
Wanne 66b1309246 Externalized (by Buggler)
- AWOL scientist location
- Brothel sector
- Call Kingpin over for boxing match
- fact Tony in building
- meet Carmen for reward
- moved John & Mary unescort sector from Mod_Settings.ini to LUA

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1822 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-14 11:57:51 +00:00
Wanne f3f6e8dca6 - Added rifle silencer burst sounds (by silversurfer)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1821 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-14 11:54:08 +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 9f2f4b9780 New ja2_ini value: USE_WINFONTS
o Set USE_WINFONTS = 1, if you play the Chinese version of the game, otherwise set to 0 (default)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1819 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-13 19:03:38 +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 dc666b6c42 - externalized noise threshold for silenced shots to Ja2_Options.ini (MAX_PERCENT_NOISE_SILENCED_SOUND)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1817 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-13 11:35:30 +00:00
Wanne 3cb62243b3 - Reworked Smoke face (by anv)
- Recolored Beth's clothes (by anv)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1816 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-12 20:51:48 +00:00
silversurfer 9db48861aa Fixed wrong recovery bonus values for facilities. They were upside down. Sleeping was worse than idling.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1815 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-12 14:44:40 +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 e74f0bb1c4 Externalizations (by Buggler)
- Queen Palace & Interrogate meanwhile stuff
- Initial POW stuff in Alma
- Sectors for triggering Meduna outskirts meanwhile scene
- Add Iggy to location when game progress condition met
- Add Rat to location after creature meanwhile scene

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1813 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-11 06:54:58 +00:00
Wanne 7f3de40b34 Externalizations (by Buggler)
- 'Kingpin wants his money' history log hardcoded location to his actual location
- John & Mary sector to disappear on quest completion
- Dynamo prison sector for Matt's quest
- Joey primary & alternate location to be found
- Spike sector relocation when assassins are sent
- Weapon cache locations

- Resort Mod_Settings.ini according to town order in cities.xml for easy referencing 

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1812 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-09 19:45:52 +00:00
Wanne 48547ef9b3 - Reverted Smoke's new face, because it should go in the BigFaces folder instead and not all new Smoke face graphics are finished yet (thx to Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1811 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-09 06:29:57 +00:00
Wanne 15f146c252 - Improved face of Smoke (by anv & Kaucukovnik)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1810 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-08 20:28:13 +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
silversurfer e8eb3c36d6 fixed wrong xml tags
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1808 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-06 19:18:33 +00:00
silversurfer 1353f9ee7d added missing .45 drum magazines to Tony's inventory
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1807 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-06 19:12:22 +00:00
silversurfer 9751c9f744 fixed Dr. Q's 4th trait. Somehow he lost his paramedic skills
new modifiers for item properties:
- APs to reload
- APs to reload manually
- max distance for messy death
- gun handling
- best laser range


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1806 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-06 12:21:54 +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
silversurfer 71e793e844 New weapon type modifiers for:
- damage
- single shot AP
- burst AP
- auto fire AP


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1804 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-05 15:02:59 +00:00
silversurfer 50224e9f67 - added weapon overheating modifiers for launchers
- added range modifiers for guns and launchers

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1803 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-04 18:47:41 +00:00
Flugente 41c2a722f3 Fix: missing merge lookup
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1802 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-02 21:42:01 +00:00
silversurfer b426cddc0e added missing items from Tony's inventory
- 1078 "Beretta Cx4 Storm"
- 927 "9x18mm Mag 12 AP"
- 928 "9x18mm Mag 20 AP"

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1801 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-02 14:48:28 +00:00
silversurfer baef780c7d New Ini for item property modifiers
The new Item_Settings.ini is there to host modifiers for item properties in the different XML files. For now it is only used for the Weapon Overheating feature to adjust parameters based on gun class.
The ini can hold any modifiers, for example modifiers for range, armor rating, damage, weight, AP to load/fire etc. Of course somebody has to add that to the game code first. ;)


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1800 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-02 12:30:21 +00:00
Wanne 6097e3e795 - Fixed Tixa explored sector name (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1799 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-30 17:49:04 +00:00
Flugente efdb0bfa40 added rifle sling attachment to AI attachment choices
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1798 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-29 17:42:46 +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 17a1773cf5 New trait modifier for Ranger
POSSIBLE_AIM_CLICK_ADDED_SHOTGUNS was added to adjust the number of aim clicks for shotguns. The default is 1.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1795 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-29 16:01:38 +00:00
Wanne 0c077c978f - Added "Eskimo" (aka "Mr. Removed") - big face + camo, basing on animated ones (by anv)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1794 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-29 13:06:04 +00:00
Wanne b2771938d0 Fixed faces (by anv)
o Beth, Sam, Smoke, Postie, Bud, Needle, Stella, It, Ears
o Added missing camo faces

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1793 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-29 13:03:12 +00:00
silversurfer 1f2dd0a359 Fixed LUA script for sex in brothel
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1792 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-26 18:20:24 +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
Wanne 75532a3e3c Merc Starting Gear adjustments (by Off_Topic)
- Sidney - Kit 4: Added mini grenade and mag to Kit 4
- Hector - Kit 3: He had a SIG PRO .40, it should be a HK P7M8
- Vinny -  Kit 4: He should have a TT 3 Day Pack.
- Blood -  Kit 2: He had .40 SMG mag, should be .40 pistol mag.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1790 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-26 06:35:24 +00:00
Kriplo 63340827f4 - add settings for enemy and militia reinforcements delay, and this option from now is turn off and by default.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1789 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-23 21:52:06 +00:00
Flugente 1448f460f0 Fix: wrong ini value location
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1788 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-23 20:33:45 +00:00
Flugente 6260b50d47 Missing ini values caused reinforcements to be delayed. Added default values simulating absence of this feature.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1787 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-23 20:04:39 +00:00
Wanne 17efff2861 - Deleted unused file A9_0_ExtraItems_Expert.xml
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1786 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-23 06:53:51 +00:00
Wanne 2f8b400e7b - Restored missing Covert Ops-Traits for Mouse and Elroy (by Flugente)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1785 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-23 06:42:37 +00:00
silversurfer ce684297ce New trait bonus for Ranger
FIRING_SPEED_BONUS_SHOTGUNS will reduce the APs needed to fire shotguns. Default is 10 (percent).


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1784 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-22 18:21:31 +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
silversurfer de58be843e New icons for secondary attributes
ItemInfoSecondaryIcons.sti holds 5 new icons.

ID 31 - item not damageable
ID 32 - item made of metal
ID 33 - items sinks
ID 34 - item two-handed
ID 35 - item blocks iron sights


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1782 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-20 14:40:02 +00:00
Wanne 8e2950b056 - Added new loadscreen hints (by Uriens)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1781 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-20 08:36:52 +00:00
Wanne 1b0a4456a9 - Externalized Kingpin money sector and Hospital sector (by Buggler)
[San Mona]
;Kingpin's private stash. He will come looking for you if stolen
KINGPIN_MONEY_SECTOR_X = 5
KINGPIN_MONEY_SECTOR_Y = 4
KINGPIN_MONEY_SECTOR_Z = 1

[Cambria]
;The Hospital sector
HOSPITAL_SECTOR_X = 8
HOSPITAL_SECTOR_Y = 6
HOSPITAL_SECTOR_Z = 0



git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1780 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-20 08:20:39 +00:00
Wanne e58e084da3 - Addded missing gear kit name 5 ("Premium") for merc Lucky (by Off_Topic)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1779 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-20 08:11:49 +00:00
Wanne 911a4105ce - Reworked GearKits for Merc and adjusted a few merc profiles (by Off_Topic)
These KITS are Limited to Merc Lvl and prices, it would be tempting to give them "the perfect loadout" but it would take away from the fun and balance of the game.

*List of Kits

Ammo: Extra ammo at the expense of an other item.
Gun Choice: an alternative weapon.
Combat: Mercs drop their Med/Tool Kits in favour of extra firepower.
Fast Rope: Only seen in upper tier Mercs. The idea was to create a basic kit for when you know you are landing in an enemy occupied sector. (Could be change to "Hot LZ")
CQC: Close Combat
HTH: Hand to Hand
LBE: If you feel like splashing the cash for some extra carry capacity.
Paramedic: A kit for Doctors on the front line, dropping their MEdkit for a FirstAid Kit and a Smoke Grenades.
Auto/Heavy WPNs: Skill specific kits.
Sapper: Desroying/Constructing stuff.
Breach: Using explosives or ballistics to open doors.
Covert: Silent weapons/ammo.
Night OPs: Flares etc... 

There are more KITS but they should be self explanatory. It's a lot of info to edit, so if there are any mistakes/oversights let me know and i'll change them. Same goes for any suggestions.

I tweaked these Mercs in order for OST/NST to match and to improve one or two.

Dyno & Smoke: Electronics added to OST to match Demo.
Mouse: Stealthy/Stealthy added to OST Melee removed from NST
Moses: Given Devolve evolution.
Hector:Knifing expert in OST.
Needle: Knifing OST.
Screw: HTH (OST) HTH/Tech (NST)
Elroy: Strealth/Lockpicking.
Carp: Removed Deputy and gave him Teacjng in OST/NST. He's pretty useless at the moment, at least this way he can be a Militia Trainer.
Doc: He had Teaching/Deputy in NST. Changed it to Doctor in NST and no skill in OST.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1778 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-19 11:54:53 +00:00
silversurfer 4f03cab39f New icons for repair ease
There are now 3 icons for the wrench:

- green for items that can be repaired by anyone
- yellow for items that need a technician of NPC to repair them beyond repair threshold
- red for items that have <Repairable> tag set to 0 in items.xml


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1777 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-18 18:06:53 +00:00
Flugente 3080a6d05a Shadow had wrong background
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1776 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-17 20:35:05 +00:00
Flugente ac3ffbd9e7 TOPTION_MERCENARY_FORMATIONS toggles wether mercenaries walk in formation when more than one is selected.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1775 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-17 19:09:35 +00:00
Wanne eb459db10b - Added comments to Samsites.xml (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1774 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-17 14:45:49 +00:00