Commit Graph
1262 Commits
Author SHA1 Message Date
silversurfer 480321fd2f 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 ae6a97dbe6 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 67613cd472 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 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
silversurfer f6df15ea20 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 17d343524c - 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 79fc89036d 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 d99d74a9f4 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 69c26866af 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 b3da78a4b6 - 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 982f9db514 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 b85ae40af9 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 14333998a1 - 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 c0e61959d6 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 795f23682a - 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 f8427e2ffd 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 f81665cbba 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 211e406bb9 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 df4d555a34 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 d02f1acab2 - 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 b74d319e6c 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 14facdc6a8 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 9fa0723716 - 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 31aca9562b - 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 669c6b3bbf 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 7685f54e3b - 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
Wanne f10071e255 - 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 0c2c5945e2 - 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 e4d62464dd - 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 c0f0cb3959 - 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 7942f1e551 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 fad69885ab 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 24f143cce9 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 ea9490f1c0 - 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
Wanne 4853ee89c9 Mobile Militia Improvements (by moa)
o see: http://www.bears-pit.com/board/ubbthreads.php/topics/325133/Re_Fix_Catched_the_mobiles.html#Post325133


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1773 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-13 06:33:28 +00:00
Wanne 8ee68bc20f - Updated LoadScreenHints.xml
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1772 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-12 11:21:31 +00:00
Wanne eac0ba60c5 - Restored German code page file (german.cp)
o To use the german codepage, you cann add the entry CODE_PAGE = german.cp in your ja2.ini file

- Updated LoadScreenHints.xml
o Added a few new hints
o Reworked some existing hints

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1771 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-12 11:05:20 +00:00
Wanne 9ed1b51382 - Added new hints (by Faalagorn)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1770 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-12 07:22:29 +00:00
Wanne 776975b2ed - Added new hint (by DepressivesBrot)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1769 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-12 07:18:34 +00:00
Wanne db8c197c9f git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1768 4f8fa57e-7814-0410-bad4-adc449f26b7c 2013-09-11 09:33:48 +00:00
Wanne 5f44513ce1 - Added new hint (by Off_Topic)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1767 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-11 08:59:13 +00:00
Wanne 9c3437e727 - Deleted the Manuals from the "Docs" root folder
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1766 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-11 08:52:50 +00:00
Wanne 4ea594b2a3 Restructured / cleaned "Docs" folder
- The "Docs" folder now only contains the Manuals, Hotkeys, Compatibility Fixes ... and a link to the additional 1.13 Documents Folder
- Additional 1.13 SVN Documents: https://ja2svn.dyndns.org/source/ja2/trunk/Documents
- see: http://www.bears-pit.com/board/ubbthreads.php/topics/325007.html#Post325007






git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1765 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-11 08:46:37 +00:00
Wanne 371b24a82f - Fixed (Improved) create cutscene not playing after liberating 3 mine sectors (by Jazz)
o Reworked / optimized LUA script

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1764 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-11 07:30:18 +00:00
Wanne 762a939e59 - Bugfix: Creature Quest Cutscene was not triggered
o There was a wrong condition in LUA script (In the ja2 source code this condition works, but not in LUA!!!)
-> WRONG:   if ( giLairID )           -> this is always triggered as TRUE and therefore never starts the cutscene
-> CORRECT: if ( giLairID ~= 0 )      -> if the quest has not started ( value != 0), start the cutscene

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1763 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-10 11:24:11 +00:00
Wanne a36de16fd6 - Fixed X-Y coordinate mixed up for CheckConditionsForTriggeringCreatureQuest (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1762 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-10 07:25:38 +00:00
Wanne bc0112e95e - Added link to the new mercenary spreadsheet (by Faalagorn)
- Deleted old mercenary spreadsheets

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1761 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-09 08:48:03 +00:00
silversurfer 250be62601 changed IMP starting gear
Expert Snipers won't get a 10x scope anymore. They get a 2x scope instead. A 10x scope is useless at the start and when we buy or find a sniper rifle it usually has a 10x scope anyway.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1760 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-08 19:25:11 +00:00
silversurfer 19a3d9a1a5 New parameters in CTHConstants.ini:
IRON_SIGHT_PERFORMANCE_BONUS
This makes the base aperture in NCTH smaller by x percent when using Iron Sights or other 1x sights.

LASER_PERFORMANCE_BONUS_HIP
LASER_PERFORMANCE_BONUS_IRON
LASER_PERFORMANCE_BONUS_SCOPE
These also make the base aperture in NCTH smaller by x percent when a laser is used with the respective sight. This replaces the old Projection Factor if one of the values is != 0. To continue using Projection Factor leave these three parameters at 0.




git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1759 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-07 11:58:13 +00:00
Flugente 4af0ce6712 BACKPACKWEIGHT_LOWERS_AP controls wether backpack weight affects APs negatively
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1758 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-05 19:43:07 +00:00