7623 Commits
Author SHA1 Message Date
silversurfer 5acabf4a82 - added missing merc backgrounds calculation for BG_PERC_CTH_MAX to the reworked NCTH calculation
- changed skill handling for disarming bomb traps to rely more on explosives than mechanical in new skill system(old ratio 5:2, new 6:1). Mercs were blowing themselves up to often even when disarming own bombs (big bonus).
In the old skill system this ratio is 7:0.

- changed skill handling luck factor to make high skilled mercs rely less on luck and more on skill


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6361 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-05 09:35:36 +00:00
Flugente f13423d2c9 - aligned texts
- added <insurance> tag to backgrounds

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1755 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-04 23:33:03 +00:00
Flugente c78568cb2a added insurance cost modifier to backgrounds
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6360 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-04 23:31:34 +00:00
Flugente 251d96ccb6 Background additions:
- <no_male> and <no_female> prohibit specific backgrounds to show up on IMP generation
- <cth_vs_creatures> modifies gun CTH when aiming at creatures
- added wisdom stat modifier
- Fix: maximum cth can never exceed 100

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6359 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-04 21:13:40 +00:00
Flugente d4427fbd8e - added more backgrounds
- added new backgrounds to mercs
- <no_male> and <no_female> prohibit specific backgrounds to show up on IMP generation
- <cth_vs_creatures> modifies gun CTH when aiming at creatures

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1754 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-04 21:09:21 +00:00
silversurfer 5ca8da319c Bugfix: In OCTH iChance was calculated incorrectly when shooter was prone and shooting at standing target (analyzed by Kriplo)
Borrowed some functionality from NCTH to always calculate height penalty values.

Also includes a small bugfix for NCTH.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6358 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-04 18:32:59 +00:00
Wanne 90bb5da3df - Added new hints to LoadScreenHints.xml (by Off_Topic)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1753 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-04 17:17:24 +00:00
Wanne db7b59f742 - Adjustment: Now it is possible for merc to sleep only 3 hours (instead of 6) (by Buggler)
o e.g: Razor should sleep only 3 hours

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6357 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-04 16:56:10 +00:00
Wanne 3b8ba34ecf - Bugfix: Only init the profile xml filenames, if exist
o This fixes the crash when starting a "Vanilla" game (Vanilla 1.13 does not have any profile xml filenames)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6356 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-04 16:54:27 +00:00
Wanne 80bbbd367a - Turned on the new Feature "Merc Story Backgrounds" for the 1.13 Mod per default (-> awesome mini feature)
- Fixed crash on startup of "Vanilla" mod
o Missing Backgrounds.xml
o Made the initialization of the "SoldierProfileEnemy*.xml" files optional, because the "Vanilla" mod does not need it
- Updated Ja2_Settings.INI

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1751 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-04 10:45:26 +00:00
Wanne 89194ff11b - Expanded militia training to 6x6 square (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6355 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-04 10:28:12 +00:00
Wanne 92c04a4f60 - Translated "Story Backgrounds" to "Merc Story Backgrounds"
- Added missing translation from "Overheating Weapons" to "Merc Story Backgrounds" for non English Versions
- Added "// TODO.Translate" comments to the new texts

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6354 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-04 10:16:05 +00:00
Wanne 42c0a8fa76 - Added new hints and tips to the LoadScreenHints.xml (by Uriens)
- Added missing OVERHEATING property in "TableData/LoadScreenHints.xml"


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1749 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-04 10:06:21 +00:00
Flugente 4ccc6a5b2a - new feature: backgrounds allow more personalisation of mercenaries
- background feature replaces overheating on startup screen, moved overheating opion to ini

WARNING: GameDir revision >= 1748 is required.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6353 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-03 20:55:33 +00:00
Flugente b184a624e0 - new feature: backgrounds allow more personalisation of mercenaries
- background feature replaces overheating on startup screen, moved overheating opion to ini

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1748 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-03 20:40:56 +00:00
Wanne 0bff118f10 - Bugfix: If mercs "walks on water tiles", the game used the travel-swimming BP points instead of the travel-flat BP points
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6352 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-03 08:32:50 +00:00
Flugente d9e526bcc8 Added 'Ctrl' hotkey to add/remove 5 militia when assigning militia (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6347 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-02 18:03:04 +00:00
silversurfer 8ff9125b37 Bugfix: soldiers killed on roof edges should now properly fall down and not be stuck in dying state anymore
Enhancement: enemy troops should no longer attack empty player vehicles

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6346 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-02 15:33:55 +00:00
Wanne 858707a937 - Fixed unmovable dropoff icon when enemy took back SAM site due to initial DEFAULT_ARRIVAL_SECTOR set to hostile airspace sector (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6344 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-02 08:51:13 +00:00
Wanne e35feb6bf4 - Bugfix: Fixed issue with the Leather Shop Deed quest (by silversurfer)
o On modified maps Kyle couldn't reach the temp money for the reward. Now there is a new parameter in Mod_Settings.ini called KYLE_MONEY_POSITION = x. The default for x is 14952 which is for vanilla map.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1747 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-01 16:07:46 +00:00
Wanne 6794dcfbe0 - Bugfix: Fixed issue with the Leather Shop Deed quest (by silversurfer)
o On modified maps Kyle couldn't reach the temp money for the reward. Now there is a new parameter in Mod_Settings.ini called KYLE_MONEY_POSITION = x. The default for x is 14952 which is for vanilla map.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6343 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-08-31 16:48:37 +00:00
Kriplo f68f6131b9 Brief: //dnl ch64
- Fixing Tank bursting shells problem, and some other tank related bugs.
Details:
- There are several problem with Tank handling, main was forcing to use gun although already decide to use machinegun which lead to bursting shells.
- Another one was related to machinegun usage as current autofire handling is not supported by TANK BURST animation which had limit to 6 rounds, so decision to fire anything different then 6 lead to complete wrong APs deduction.
- Fix some invalid animation decision as current tank cannot raise gun or move or check for cover.
- Fix problem with wrong return (INT8) although after introduction of 100AP system APs variables are INT16 which create bad APs calculation for tank.
- Fix general problem with burst and autofire when soldier decide to when swap weapons.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6340 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-08-31 10:22:25 +00:00
Wanne c0f6e37770 - LUA Script Bugfix (by silversurfer)
o Added missing ProfileID parameter when calling the LUA method: CheckFact( fact, profileID )

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1746 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-08-30 20:40:20 +00:00
inshy 65eeb31297 Added new mercs for Russian language
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6339 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-08-30 18:31:28 +00:00
Wanne 1bb3f5a56a - Multiplayer Bugfix: Fixed crash in RELEASE version, when entering tactical insertion screen
o The game crashed in RELEASE version, because of uninitialized music variables which were introduced in revision 6296

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6338 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-08-30 18:21:01 +00:00
Wanne 49d078cdc2 - Corrected comments and ini references (by Faalagorn)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1745 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-08-30 14:09:18 +00:00
Flugente 25cfbd0c9e Fix: wrong game language
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6337 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-08-29 20:39:14 +00:00
Flugente 4f7f186580 Fix: moved function call to UB
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6336 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-08-29 20:38:18 +00:00
Wanne 71238326eb - UB Improvements / Cleanup (by Jazz)
o Added missing UB specific items


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6335 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-08-29 11:59:04 +00:00
Wanne dab6c6ed93 - UB Improvements / Cleanup (by Jazz)
o Deleted unused Inventory XML files

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1744 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-08-29 11:57:12 +00:00
Wanne 56b081d0ca - UB Improvements / Cleanup (by Jazz)
o added the lacking items of UB to files "the "Data\TableData\Items\Items.xml". 
o Necessary "Hand Cannon" were moved to the task Raul, to files H11_0_ExtraItems_xxx.xml. 
o The instruction Morrisa will be generated after destruction of Morrisa automatically. 
o All scripts lua were modified for UB

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1743 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-08-29 11:56:11 +00:00
Wanne 25dd0b084e - UB Improvements / Cleanup (by Jazz)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6334 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-08-29 11:53:39 +00:00
Flugente b5494fc168 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
Wanne 95e4826927 - UB Improvements / Cleanup (by Jazz)
o Deleted old files, added / updated files


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6331 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-08-28 17:12:10 +00:00
Wanne f8e30a5360 - UB Improvements / Cleanup (by Jazz)
o Deleted old / unused files and added / updated new files
o Fixed problems with the icons of objects laid on the ground (wrong ja2set.dat)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1741 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-08-28 17:09:45 +00:00
Wanne a5abf4d91a - UB Improvements / Cleanup (by Jazz)
o Now there are 2 ways to play UB (1.13 and Vanilla): vfs_config.UB113.ini, vfs_config.UBVanilla.ini
o UB: Source Code cleanup: Replaced hardcoded merc profiles with proper ENUMS, ...
o Updated / added UB-Config values


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6330 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-08-28 17:06:43 +00:00
Wanne 5c7c9ed851 - Added missing entries in EMAIL.EDT for John Kulba to the German Version
o The texts are still in English and need to be translated.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6328 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-08-28 16:36:33 +00:00
Flugente ee8d4f6eb9 Assassins use and loose uniforms if uncovered
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6326 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-08-27 22:48:02 +00:00
Flugente 18a55c89cc Fix: gear icons and assignment icons no longer overlap
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6325 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-08-27 20:04:36 +00:00
Flugente df7cb392c5 Forbid time compression if hostile civilians or bloodcats are in the sector. Otherwise all travelling squads are delayed over and over again.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6324 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-08-26 21:57:19 +00:00
Flugente 52b3ebcf75 soldier tooltips now display energy and morale
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1739 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-08-26 21:23:22 +00:00
Flugente 6ad228e91e soldier tooltips now display energy and morale
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6323 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-08-26 21:19:31 +00:00
Kriplo 44d98500f1 - in ch58 forget to check if pointer is null which of course lead to CTD, sorry ;-)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6322 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-08-25 20:55:59 +00:00
Kriplo 571a2940e6 Brief: //dnl ch63
- Fixing AI problems when they use launchers.
Details:
- Seems from implementation of 100AP system and new attachment system and new kind of GL launchers, AI use them improperly or not used at all. Bugs was:
- Bursting grenades from non burst launcher.
- Not use GL if grenade is already in it
- Not firing from rocket launcher if couldn't find hand grenade.
- Refusing to launch grenade from attached GL if couldn't find grenade in other pockets.
- Never fire from single rocket launchers like LAW.
- Incorrect chance to throw calculation for GLs which lead into no decision to throw.
- Whole cylinder of grenades was permanently remove from pocket after reloading launcher.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6321 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-08-25 20:30:46 +00:00
Flugente 29beae22d5 Fix: game clock patch caused compile errors in editor (by silversurfer)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6320 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-08-25 20:24:43 +00:00
Flugente 3612cb1279 Fix: face gear items were wrong
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6317 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-08-25 15:12:47 +00:00
Flugente 3375414e51 Game clock improvements (by Moa)
Before Patch:
Render region for the Game Time and Tooltip region for this region had different x/y coordinate formulas which resulted in missplaced ToolTip on screen resolutions higher then 3.

There where 4 different definitions of Clock position: INTERFACE_CLOCK_X, INTERFACE_CLOCK_TM_X, CLOCK_X, CLOCK_REGION_START_X. Also there where 2 different definitions of the region: CLOCK_STRING_WIDTH, CLOCK_REGION_WIDTH.

Pause Box had a fixed position on screen regardless of resolution mode or screen size.

Two different kinds of defines for the Font where used: CLOCKFONT and CLOCK_FONT

After Patch:
Only 2 different coords are existant for rendering the clock, of which 1 is currently redundant as it is off screen for NIV. The later can be used once the Teampanel in tactical screen can handle the clock while showing the inventory (currently the clock is not rendered when NIV is used), this however requires new graphics for 6/8/10 squatsizes. Once a new location for this case is determined simply update the RenderTEAMPanel(BOOLEAN) accordingly with new if clause for NIV (Offset of LOCATION_NAME_TM_X can be used, or what everis convinient).

Also 2 boundary boxes of the region are present, one for the actual area 66*14 (CLOCK_AREA_WIDTH) and one for a little gap of currently 1 pixel for the mouse region (CLOCK_REGION_OFFSET_X) the later one is kindof not neccessary since the String gets now centered in the Area. But maybe someone will make a mod with small render area but large mouseregion for the clock, who knows :)

Pause Box is now rendered in the center of the screen as intended.

Only one font for the clock! There was no need for a different define, also the CLOCKFONT.sti is not in GameFolder so I changed that and use the COMP font.

All globals are now located in Game Clock.cpp but still get initialized in Interface Panels.cpp since the init function in Game Clock.cpp is called too early and no globals for screen size and resolution are known at this point.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6316 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-08-25 13:38:21 +00:00
Flugente 127dbc2f90 moved face icons for assignments and various states to a separate library to be independent of face gear icons.
GameDir >= 1738 is required.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6315 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-08-25 11:58:22 +00:00
Kriplo 638de03d8d Brief: //dnl ch62
- Ignore firing into dying and breathless targets.
Details:
- AI will ignore attack breathless targets if there are other in better condition.
- AI will not fire into dying targets.
- AI should avoid go into creature gas.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6314 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-08-25 08:40:36 +00:00
Kriplo f06df7741f Brief: //dnl ch61
- Basic support for reducing AI friendly fire.
Details:
- Friendly fire grids are defined during best shot calculation then AI decide depending of soldier character to fire or take other action. Still in autofire accidentally friendly hits could be higher depending of bullets spreading.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6313 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-08-25 07:36:03 +00:00