7604 Commits
Author SHA1 Message Date
silversurfer 78b4e784b6 New trait bonus for Ranger
Oops. Forgot to copy two files.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6430 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-22 18:31:43 +00:00
silversurfer 810df5bce0 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/trunk/GameSource/ja2_v1.13/Build@6429 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-22 18:25:57 +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 f3a36ee7c6 New feature for UDB
It is now possible to see secondary attributes on the general tab for weapons. Just click on the tab a second time.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6428 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-21 16:03:47 +00:00
inshy 6f2c3bc833 French translation by hrvvillers
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6427 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-21 06:42:24 +00:00
silversurfer 9094283046 Bugfix for advanced repair system
The pSoldier that was passed to the ability check was the owner of the item and not the person that does the repairs.
So no Technician trait on the owner -> no repair...

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6426 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-20 19:10:56 +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
silversurfer 58f6e2d188 ATTENTION! This requires at least GameDir 1782!
More secondary attributes are now shown on general page of UDB. The following item tags were added:

<Damageable>0
<Metal>1
<Sinks>1
<TwoHanded>1
<BlockIronSight>1

The new icons were added to ItemInfoSecondaryIcons.sti.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6425 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-20 14:46:06 +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 8221472bc2 - Externalized Kingpin money sector and Hospital sector (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6423 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-20 08:19:56 +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
silversurfer 1e06d2a725 Bugfix for merc availability on M.E.R.C
When loading a savegame mercs that became available automatically where not enabled because they couldn't meet a condition anymore. This condition will not be checked anymore because it is not needed for functionality.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6421 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-19 16:57:53 +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 113e54b4b1 Fix for new repair ease display
- tooltip takes into account if MERCS_CAN_DO_ADVANCED_REPAIRS = TRUE/FALSE
- added forgotten tooltip for OCTH
- formatting changes

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6420 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-18 20:03:18 +00:00
silversurfer 6d431cd2e8 ATTENTION! This needs at least GameDir 1777!
Fix and Enhancement for Repair Ease display in UDB

- Repair Ease is now displayed for all items and not only for weapons because other items use the <bRepairEase> tag too
- fixed tooltip display for explosives, half the values didn't show tooltips

There are new icons for repair ease display (ID 34 and 35 in ItemInfoWeaponIcons.sti). The old icon was changed to green color (ID 10).

The colors are used to show if the item is repairable and by whom:

- green for items that can be repaired by anyone
- yellow for items that need a technician or 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/trunk/GameSource/ja2_v1.13/Build@6417 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-18 18:14:30 +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 8c643ef6fa Fix: background running speed bonus should only influence walking/running animations
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6416 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-18 16:57:46 +00:00
Kriplo 5ebe26bc29 Brief: //dnl ch71
- Fix more problems of deducting APs when try to shoot from different stances but need turn to your target.
Details:
- Problems raised after introduction of conditional APs charge in case that you need to rise gun and turn, so charging only higher of this to two value if not prone.
- Another problem is alternative fire mode from hip which is currently allowed only in stand so was missing such condition as well for change scope mode if going down.
- As run into problems from above for our merc, need adopt it to CalcBestShot for AI too.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6414 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-18 09:45:50 +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 fd2202be01 New feature: When more than one merc is selected, they will keep their current formation. This behaviour can be toggled via [CTRL] + [Shift]+ [g].
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6413 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-17 19:16:20 +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
silversurfer 3c3383540c Bugfix for laser performance bonus
The brightness modifier was calculated incorrectly. Also changed formula a bit to allow a better range of values.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6411 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-17 14:48:24 +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 b268d330ed - externalized samsite coordinates concerning strategic AI action and Skyrider dialogue (by Buggler)
- minor ENG language tweaks to traits popup help text (by Buggler)
- translated a few missing German Texts in _Ja25GermanText.cpp

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6410 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-17 14:44:55 +00:00
Kriplo 30cc0160cf Brief: //dnl ch70
- Some APs fixing for throwing knives and backpack, with doing some correction to my previous changes.
Details:
- Do some correction and missing parts to ch58 and ch69.
- Throwing knives will add you bonus for throwing knives to same target as was suppose from v1.12 but never works.
- Fix AI use gun calculation for throwing knives instead for throw.
- Fix incorrect showing and deducting APs when try to shoot from prone with backpack or throw from prone and crouch positions with turning in general.
- Fix cheating when sLastTarget is set just for raise gun in that direction, this was always done after you fire.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6409 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-17 11:33:47 +00:00
Wanne c3d88744b9 - Fixed mouse boundary to game window for multi-monitor setup in full screen mode (vanilla bug) (by Buggler)
- Freed 'Ctrl+y' hotkey in tactical & laptop screen for other uses (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6407 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-16 06:22:00 +00:00
Wanne 0f17320e8f - Fixed placement of money splitting icons in strategic screen for non-standard game resolutions (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6406 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-16 06:16:04 +00:00
silversurfer 2cc6233913 Bugfix for item repair
When ADVANCED_REPAIR was active it wasn't even possible for technicians to repair weapons and armor beyond repair threshold when MERCS_CAN_DO_ADVANCED_REPAIRS was set to TRUE.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6405 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-15 22:43:00 +00:00
Kriplo 569eba300a - small change to ch58 for change facing, so now will first try to turn to last target if exist then to closest enemy.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6404 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-15 18:45:45 +00:00
Kriplo d24b54cb5a Brief: //dnl ch69
- Add alternative fix for CalcBestShot which should remove existing APs problems maybe even create AI deadlier then ever ;-)
Details:
- Existing CalcBestShot simply became inadequate and buggier for so many add ons to game, so compiling with dnlCALCBESTSHOT is alternative option which calculate all turning, stance and raising gun cost for different stances and all available scopes, and after all hoping fix incorrect APs calculation as well, hitrate formula is adapt to 100AP system, also try to optimize a bit to get less AICalcChanceToHitGun calls and to use with different stance decisions.
- From ch58 aiming for burst and autofire was disabled as was causing invalid action handle due to incorrect APs calculation so from now aiming AI also use aiming before bursting.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6403 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-15 15:59:51 +00:00
silversurfer 2e4a12173a Bugfix for target tracking modifier <PercentTargetTrackingSpeed>
The description of this modifier says that "Higher is better."
Before this fix a higher value actually made target tracking worse. Now it should work like it was supposed to be.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6402 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-15 11:36:57 +00:00
silversurfer 728f7267e0 Bugfix for item handling
When you click at an item with a valid attachment at the hand cursor the game will no longer move that item to an empty slot and instead open the UDB.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6401 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-13 17:03:56 +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 2ee80f2be3 Mobile Militia Improvements (by moa)
Each setting in ini now has the effect that the user expects, he now sees the correct restrictions on the map, and is able to adjust manually as neccessary
- RESTRICT_ROAMING = TRUE
activates the manual adjustable restrictions based on exploration and/or conquest.
Any of the following settings can be mixed as you like
- ALLOW_MILITIA_MOVEMENT_THROUGH_EXPLORED_SECTORS = TRUE 
Exploration based: any liberated sector is potentially accessible for mobile militia.
You need to load the map and defeat all enemies. Walking through on strategic view is unsufficient!
- ALLOW_DYNAMIC_RESTRICTED_ROAMING = TRUE
Conquest based: Liberating a town will increase the accessible sector count. 
See Data-1.13/TableData/Map/DynamicRestrictions.XML
- ALLOW_MILITIA_MOVEMENT_THROUGH_MINOR_CITIES = TRUE
Mobile militia can move thru cities where militia training is not allowed(e.g. Tixa, San Mona, Omerta,...)
In earlier versions those cities where allready included in DynamicRestrictions.XML which rendered this setting allmost useless.

NOTE: 
  Older savegames have still the 'gray' sector restriction set.
  Those will be converted to 'red' according to the settings in Ja2_Options.INI on load.

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/trunk/GameSource/ja2_v1.13/Build@6400 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-13 06:32:46 +00:00
Wanne 156c414206 - Updated number of possible load screen hints from 200 to 1000
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6397 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-12 13:06:17 +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 aba5c67ec8 - Improved LoadScreenHint feature
o The load screen hint is now also shown in strategic log and tactical log

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6396 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-12 11:09:25 +00:00
Wanne 0c35c105db - Removed codepage file german.cp (it is now again in the SVN GameDir)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6395 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-12 11:06:03 +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
silversurfer 6b37cd418b Fixes for inventory handling since revision 6375
I had to remove some pieces of the code because they lead to problems with item stacks and access to UDB.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6394 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-11 13:40:07 +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 6edb7f9f33 - Added german.cp (CodePage File from SVN GameDir)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6392 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-11 08:42:56 +00:00
Wanne 604000517e - Improved creature cutscene not playing after liberating 3 mine sectors (by Jazz)
o see also GameDir Rev: 1764

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6388 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-11 07:31:51 +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