Commit Graph
2037 Commits
Author SHA1 Message Date
Wanne d3e92041ce Updated Merc Random Stats Feature (Jenilee)
- tweaked the stats generation so should see less super high level marks/agi, especially on low level mercs
- randomization will now only affect AIM/MERC mercs.
- randomized gear kits are now an ini setting: MERCS_RANDOM_GEAR_KITS = TRUE/FALSE.
I made the gear randomization optional because it seems to cause trouble for people that don't use AIMNAS. SO hopefully this still lets them enjoy the random merc feature!

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6686 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-06 17:54:37 +00:00
Wanne 6a538f1ef8 Added support for turnbased mode to extended disarm dialog (by Sevenfm)
- AP/BP costs:
o Disarm: AP_DISARM_MINE, BP_DISARM_MINE
o Inspect: AP_DISARM_MINE/2, BP_DISARM_MINE/2
o Remove Blue Flag: AP_DISARM_MINE/2, BP_DISARM_MINE/2
o Blow Up: AP_DISARM_MINE/4, BP_DISARM_MINE/4
- Note: AP_DISARM_MINE value is modified if merc has ambidextrous trait.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6685 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-06 16:53:01 +00:00
Wanne 0bae7724a0 New option ALTERNATE_MOUSE_COMMANDS in Ja2_Options.ini (by Sevenfm)
- With this option = TRUE, mousewheel is inverted for changing stance with ALT+mousewheel, also some new mouse actions are possible.
- Alternate mouse actions: see "Docs\Manual\JA2_113_Alternate_Mouse_Commands.xlsx"
  https://ja2svn.no-ip.org/source/ja2_v1.13_data/GameDir/Docs/Manuals/JA2_113_Alternate_Mouse_Commands.xlsx

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6684 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-06 16:47:10 +00:00
Wanne 4cf6aa49d2 New MOD-Setting (by Jazz)
- CREATURE_MEANWHILE_CUTSCENE: Play the meanwhile cutscene ordering the release of creatures?

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6683 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-05 08:24:46 +00:00
Wanne b9b58fe790 Ctrl + D in turnbased - skip player interrupts for that turn (by Sevenfm)
- This only works for singleplayer
- This only works for Old interrupt system

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6682 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-05 08:08:20 +00:00
Wanne 60d9fae2b0 Added new merge type "USE_ITEM_NEW" -> MergeType: 13 (by Sevenfm)
1.) USE_ITEM_NEW
- It creates new items with firstResultingItemIndex and secondResultingItemIndex (if defined) and deducts 1 point from firstItemIndex's status (for each new item).
- When firstItemIndex's status reaches 0, the item is destroyed.
- With this type of merge, you can use knife on tripwire roll, for example, to get 2 new tripwire items. So you can think of tripwire roll as container for 100 tripwires.
 
  <MERGE>
     <firstItemIndex>299</firstItemIndex>
     <secondItemIndex>1640</secondItemIndex>
     <firstResultingItemIndex>1524</firstResultingItemIndex>
     <secondResultingItemIndex>1524</secondResultingItemIndex>
     <mergeType>13</mergeType>
     <APCost>20</APCost>
  </MERGE>

2) USE_ITEM merge creates secondResultingItemIndex item if defined.
- With this secondResultingItemIndex defined, you can use knife on T-Shirt to get 2 rags.

  <MERGE>
     <firstItemIndex>299</firstItemIndex>
     <secondItemIndex>195</secondItemIndex>
     <firstResultingItemIndex>1022</firstResultingItemIndex>
     <secondResultingItemIndex>1022</secondResultingItemIndex>
     <mergeType>6</mergeType>
     <APCost>20</APCost>
   </MERGE>

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6681 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-05 08:05:27 +00:00
Wanne 39f32c2e71 - Bugfix: Fixed infinite loops that could occur in AI Actions (by Mae)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6680 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-05 07:55:26 +00:00
Wanne b7ee1b8979 Bugfix: "Merc Random Stats Feature" (by Jenilee)
- Fixed crash on initializing armor when starting a new game

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6679 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-03 21:14:58 +00:00
Wanne 689cbbc5ab - Fixed mouse cursor issue when calling sector inventory using hotkey in MovementPlottingMode and ChangeArrivalSectorMode (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6678 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-03 15:25:10 +00:00
Wanne 135e576d27 Re-Fixed mercs Files.cpp (by Buggler)
o I assumed it was a Chinese character, but Buggler told me it was Korean. Anyway, we removed it ...

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6677 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-03 10:29:20 +00:00
Wanne 5c062ff752 Extended "Merc Random Stats Feature" (by Jenilee)
- Added 4th option for MERCS_RANDOM_STATS (MERCS_RANDOM_STATS = 4)
  o full randomization of mercs, including traits, gear kits and all statistics
see: http://www.ja-galaxy-forum.com/board/ubbthreads.php/topics/328769.html#Post328769

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6676 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-03 10:14:15 +00:00
Wanne 8c4201e335 - Fixed wrong encoding and damaged content of mercs Files.cpp (by Buggler)
- Moved Chinese Character from mercs Files.cpp to _ChineseText.cpp, so we can have correct encoding of mercs Files.cpp


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6675 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-03 09:24:24 +00:00
Wanne c8f4108225 Hotkey Updates (by Buggler)
- Duplicate all applicable arrow hotkeys to WASD hotkeys in Laptop mode (w -> UP, a -> LEFT, s -> DOWN, d -> RIGHT)
- Remapped squad 14 to 'Ctrl + 4' in tactical screen

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6674 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-02 20:14:14 +00:00
Kriplo b2dbc3123b Brief: //dnl ch80
- Polishing and fixing mapeditor.
Details:
- Add scroll map editor items for mouse wheel.
- Fix selection of mapinfo light and smoothing buttons when switching between taskbars.
- UpdateRoofsView now will hide/show onroof tiles and back roof walls too.
- Fix fake light toggle which now will remain after switching to another taskbar also fix incorrect ambient light saving during toggling fake light with HOME key.
- Finish work on HandleMouseClicksInGameScreen function so most draw functions now are single clicked on same tile element instead rapid burst of events which in some situation create stacking tiles problem during save game.
- Fix incorrect value for exit grids if right click on map element without exit grid, also if changing same exit grid then will update same instead to define next available slot from exit grid array.
- Restricted scroll will now disable scrolling when enter in textbox at mapinfo taskbar for basement levels and for proper radar map creation.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6673 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-01 22:27:03 +00:00
Wanne 38be6a389b - Added missing #ifdef ENABLE_ZOMBIES for zombie exclusive code (by Jazz)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6672 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-01 19:17:52 +00:00
Kriplo 9a67e804c6 - fix to ch79, lights was not saved during automatic map conversion from mapeditor with -DOMAPSCNV command switch.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6670 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-30 19:13:41 +00:00
Kriplo 56b2260ff1 79. Brief: //dnl ch79
- Fix random item problems, add automatic maps conversion, fix some exceptions.
Details:
- Random items are now converted to proper real item if added through mapeditor as world or merc item. However random item will be permanently deleted after map is loaded if randomitemcoolnessmodificator not met expected game progress conditions rather then remain as random item.
- Add command line option -DOMAPSCNV to mapeditor which will automatically create radarmaps and convert all maps to the latest map version, all maps will be written to profile MAPS directory so be sure this folder is empty as any existing maps will be overwritten.
- Fix some exceptions for missing GAP files and strange CTD when we pass command line arguments through VS2010.
- Fix not opening items selection from merc inventory if we first do left and then right click for item choosing.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6668 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-29 22:49:48 +00:00
Flugente 72246a8a9a Fix: food/water consumption background property removed food/water consumption
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6666 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-29 18:44:28 +00:00
Flugente 1d49877137 - capped physical resistance at 95%
- mercs with the 'airdrop' background property do no get the interrupt penalty upon landing only if they have a positive bonus
- Fix: supression resistence wasn't applied as a percentage
- adjusted background min/max values

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6665 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-29 18:24:08 +00:00
Flugente 3d12b39d87 Fix: suppression resistance modifiers could exceed boundaries (by Sevenfm)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6664 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-29 17:49:23 +00:00
Wanne 2cba26ab07 Explosive improvements and fixes (by Sevenfm)
- New mine disarm dialogue (only for realtime): Disarm, Inspect, Remove Blue Flag, Blow up.
- You can now attach tripwire-activated explosives to tripwire.
- attached explosives volatility is now used in chain explosion calculation: added new function CalcTotalVolatility.
- new function CheckForBuriedBombsAndRemoveFlags removes MAPELEMENT_XXX_MINE_PRESENT flags if there is no buried bomb at checked tile. This should fix problems with flag not removed correctly after chain explosions and such.
- trip klaxon no longer calls enemies if it's activated as attached explosive (instead it makes some noise).
- added check to MineSpottedDialogueCallBack. It should fix problem with game crash with tiles that have MAPELEMENT_PLAYER_MINE_PRESENT flag set but no buried mine
- disarmed item will keep it's attachments if ALLOW_ATTACHED_EXPLOSIVES is TRUE.
- IMPROVED_BOMB_PLANTING feature can be used to auto-take tripwire items from inventory.
- see: http://www.ja-galaxy-forum.com/board/ubbthreads.php/topics/172712/15/Code_Snippets.html


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6663 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-29 07:38:41 +00:00
Wanne 18af587c75 - Bugfix: Fixed initialization error of enemy taunts. The file was not found in the new location (TableData\EnemyTaunts\EnemyTaunts.xml), because the game looked in the old one (TableData\EnemyTaunts.xml)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6662 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-28 16:06:51 +00:00
Wanne 4b7258f8b3 Updated Enemy Taunts (by anv)
- fixed crash due to same enemy taunting several times in a row (e.g. after being hit by a burst)
- prevent enemy from taunting again, before his previous taunt is finished
- taunt .xmls should be kept in subdirectory TableData\EnemyTaunts\ to avoid mess in TableData\
- added <szCensoredText>, if TAUNT_CENSORED_MODE set to TRUE and <szCensoredText> defined, it will be displayed instead of <szText>

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6659 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-28 08:23:03 +00:00
Kriplo e6e8cd75fd - addon to ch78, remove cursor and add any mouse click for exit from MAPUTILITY (radarmap) screen, also fix creation of radarmap without roofs.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6658 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-27 22:06:07 +00:00
Kriplo f0c6b73e24 Brief: //dnl ch78
- Some mapeditor cosmetic and CTD fixes.
Details:
- Fix sticky tooltip if perform scroll or go to 'Sector Summary' window.
- Fix accidental mercid delete from textbox if press any key while in 'Profile ID mode'.
- Fix CTD from release if several time swap from RND to any other item button.
- Disable some enabled buttons and mouse area from taskbar when 'Sector Summary' windows is active.
- Checkbox toggles from Mercs bar now remember their state after switching to another taskbar option.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6657 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-27 21:05:12 +00:00
Wanne 8e2d59efca - Check for FileExists() before calling the ReadInSpreadPatterns() method
o The "SpreadPatterns.xml" file is optional. If the file does not exist (e.g: "Data"), hardcoded values are taken from the game

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6656 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-27 14:22:49 +00:00
Wanne b76e9cca86 - Corrected Bugfix from Revision 6654 (thx to Sevenfm)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6655 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-26 16:59:08 +00:00
Wanne d3d14d2c47 Bugfix: This small patch fixes bug with remote explosives not being removed after activation, if they were armed in inventory and thrown afterwards (by Sevenfm)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6654 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-26 11:44:29 +00:00
Kriplo 614a56fe54 - addon to ch77, fix CTD when swap between random item with less then 12 items and any other item tab.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6653 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-25 23:01:48 +00:00
Kriplo e7455c445d Brief: //dnl ch77
- Couple mapeditor and game fixes and radar map creation for any screen resolution.
Details:
- Radarmap is now possible to create from any mapeditor screen resolution.
- Better fix to prevent memory corruption during gWorldItems resize.
- Fix problems with losing attached item because attachment slots was not exist when using NAS, also empty slots are removed which was prevent attaching in OAS.
- Fix tooltip popup for checkbox when button is disabled and prevent sticky tooltips from taskbar when SummaryWindow is active.
- Check if item is valid for 1.12 will be active only for mapeditor, but game will load all items regardless of map version.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6652 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-25 21:44:39 +00:00
Flugente 3e70a9d6dc mercs entering combat via air who do not have the 'airdrop' background receive a penalty on their interrupt level
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6651 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-25 19:43:07 +00:00
Flugente d1e68b5216 Fix: crash due to NULL-pointer
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6650 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-25 18:48:04 +00:00
Wanne ead725563f - Fixed Samsites & Helisites xml gridno tags resetting to 0 for big maps (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6649 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-25 08:53:31 +00:00
Wanne 8e4c2b74c1 Multiplayer Bugfix:
- Fixed problems after hosting game in strategy screen (crashes, options not clickable, ...)
o The problems seems to be the reworked taunts initialization from revision 6640. I did not trace down the exact problem, but taunts should anyway be disabled in a multiplayer game
o Now taunts are disabled in a multiplayer game which fixes the above problems

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6648 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-25 08:45:50 +00:00
Wanne 376b174d5b Small convenience feature - improved bomb planting (by Sevenfm)
- With new option IMPROVED_BOMB_PLANTING = TRUE, if you hold SHIFT key while planting new mine, then another mine with same item id will be taken automatically from your merc's inventory. If no such item found, any mine will be taken. If you plant tripwire-triggered mine, then only tripwire-triggered items will be taken. This new feature work only in realtime.
If you are making tripwire network, then this feature can be used to plant another tripwire item with network and hierarchy settings taken from previously planted tripwire. You just plant tripwire as usual, selecting it's settings from dialogue, then if you plant another one while holding SHIFT key, those settings will be used for new tripwire, instead of showing you dialogue
- I hope this small improvement will save you some time for building large and complicated defensive minefields.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6647 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-24 11:01:45 +00:00
Wanne bec015359a Fixes (by Sevenfm)
- Fixed small bug : SHIFT+ALT+C always showed enemy mines, even without metal detector.
- Fixed: incorrect tripwire hierarchy calculation.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6641 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-22 21:56:06 +00:00
Wanne ba5edad40c Enemy Taunts Updates (by anv)
- taunts will be loaded from any file in TableData/ that follows EnemyTaunts*.xml naming convention (and [LanguagePrefix]EnemyTaunts*.xml for translations)
o eg: EnemyTauntsKill.xml, EnemyTauntsComeback.xml, German.EnemyTauntsKill.xml, Chinese.EnemyTauntsComeback.xml, ...
- <uiIndex> for taunts in every file should start from 0 and increase normally
- see: http://www.bears-pit.com/board/ubbthreads.php/topics/327830/5.html

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6640 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-22 21:50:00 +00:00
Wanne 08236ee9f4 Added VS2013 solution and project files (by JMich)
- You can also open them with VS 2012
- I just changed the toolset for all projects to V100 (VS 2010) instead of V120 (VS 2013), because I don't have VS 2013 installed. If anyone can't compile with VS 2013, we simply switch back to V120 toolset

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6639 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-21 07:57:52 +00:00
Wanne 5168970f40 Enemy Taunts Update (by anv)
- replaced 5 different riposte tags with one <riposte_quote>XXX<riposte_quote>, where XXX can be any quote number, that taunt is supposed to be answer to. All but quotes 20-22 use random enemy witnessing quote to taunt, these three - last attacker.
- added above ripostes + some more.
- see: http://www.bears-pit.com/board/ubbthreads.php/topics/327830/4/Externalised_taunts.html


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6637 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-20 13:26:40 +00:00
Wanne 2dd7104354 Editor Bugfix: Added item stack no info for pre-placed map items (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6636 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-20 12:48:29 +00:00
Wanne af6fc83fd9 - Changed language back to ENGLISH
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6635 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-20 07:54:07 +00:00
Wanne 874193d197 Fixed VS 2012/2013 compilation errors (by JMich)
- Solution and Project files for VS 2013 will follow
- It still compiles and works in VS 2005/2008/2010 :-)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6634 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-20 07:52:55 +00:00
Wanne 9607922a07 Map Editor (by Buggler & Kriplo)
- Added tile index no info to editor selection window

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6633 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-20 07:13:11 +00:00
Wanne 47210f9b14 Updated Enemy taunts feature (by anv)
- ridiculous amount of tags: attack, hit, miss, kill, head pop, blinded, type of attack, is target a zombie...
- ripostes to merc quotes,
- taunts can now make noise,
- bumped up amount of taunts to respectable 733, mostly thanks to your contributions guys,
- accidently squashed bug with incorrect noise notifications ("hears scream" instead of "hears explosion" etc.)

Ripostes
At the moment enemies can react to quotes "enemy detected", "1st enemy detected", "multiple enemies detected", "bullet flew by", "under heavy fire", as these are most likely to be used in combat. In the first three cases, riposting enemy will be chosen randomly from all enemy witnesses, latter two - last enemy to attack this merc will taunt.
Enemy's riposte will come as soon as merc quote is finished.

Noisy taunts
Taunts can be handled like other noises in game - shots, explosions, etc., meaning:
- they will be displayed only if someone from our team is close enough to hear them,
- they can be heard even if you don't see enemy (with twist of his name changed to "unknown voice". Yay.)
- volume of taunts is configurable in .ini.

see: http://www.ja-galaxy-forum.com/board/ubbthreads.php/topics/327830/4.html



git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6628 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-19 07:52:51 +00:00
Wanne 496616a2bd Fixed screen not refreshing for '1' - '4' Bobby Ray hotkeys (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6625 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-18 19:42:33 +00:00
Wanne 2ebc9ae65b - Updated Chinese texts (by zwwooooo)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6624 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-18 19:39:00 +00:00
Wanne 79a62c1750 Fixes (by Buggler)
- Fixed CTD when displaying militia assignment box that has regions beyond sector P16
- Corrected variable for heli tile gridno calculation 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6623 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-18 08:26:42 +00:00
Wanne bee0294665 Updates (by Buggler)
- Added hotkeys in personnel screen
o 'LEFT ARROW' and 'RIGHTARROW' for merc scrolling; 
o 'UP ARROW' and 'DOWN ARROW' for switching between stats, employment and inventory;
o 'Shift + TAB' for switching between current team and departures
- Fixed hardcoded text in personnel screen

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6622 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-18 08:25:53 +00:00
Wanne e520ef186f - Updated texts for Chinese Version (by zwwooooo)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6618 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-17 10:56:35 +00:00
Wanne 9bc09aff3d - Multiplayer Bugfix: Fixed M.E.R.C inventory glitches on laptop site
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6615 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-16 18:35:55 +00:00